src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp

rev 10933 : 8154736: enhancement of cmpxchg and copy_to_survivor for ppc64
Reviewed-by:
Contributed-by: HORII@jp.ibm.com, mdoerr

*** 87,106 ****
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
  #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
! inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value) {
    int mp = os::is_MP();
    __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
                      : "=a" (exchange_value)
                      : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                      : "cc", "memory");
    return exchange_value;
  }
  
! inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value) {
    int mp = os::is_MP();
    __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
                      : "=a" (exchange_value)
                      : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                      : "cc", "memory");
--- 87,106 ----
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
  #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
! inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, memory_order order) {
    int mp = os::is_MP();
    __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
                      : "=a" (exchange_value)
                      : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                      : "cc", "memory");
    return exchange_value;
  }
  
! inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, memory_order order) {
    int mp = os::is_MP();
    __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
                      : "=a" (exchange_value)
                      : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                      : "cc", "memory");
*** 147,171 ****
                          : "0" (exchange_value), "r" (dest)
                          : "memory");
    return exchange_value;
  }
  
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
    bool mp = os::is_MP();
    __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
                          : "=a" (exchange_value)
                          : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                          : "cc", "memory");
    return exchange_value;
  }
  
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
!   return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
  }
  
! inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
!   return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
  }
  
  inline jlong Atomic::load(volatile jlong* src) { return *src; }
  
  #else // !AMD64
--- 147,171 ----
                          : "0" (exchange_value), "r" (dest)
                          : "memory");
    return exchange_value;
  }
  
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, memory_order order) {
    bool mp = os::is_MP();
    __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
                          : "=a" (exchange_value)
                          : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
                          : "cc", "memory");
    return exchange_value;
  }
  
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, memory_order order) {
!   return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
  }
  
! inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, memory_order order) {
!   return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
  }
  
  inline jlong Atomic::load(volatile jlong* src) { return *src; }
  
  #else // !AMD64
*** 195,214 ****
    // defined in bsd_x86.s
    jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
    void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
  }
  
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value) {
    return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
  }
  
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
!   return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
  }
  
! inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
!   return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
  }
  
  inline jlong Atomic::load(volatile jlong* src) {
    volatile jlong dest;
    _Atomic_move_long(src, &dest);
--- 195,214 ----
    // defined in bsd_x86.s
    jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
    void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
  }
  
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, memory_order order) {
    return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
  }
  
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, memory_order order) {
!   return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
  }
  
! inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value, memory_order order) {
!   return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
  }
  
  inline jlong Atomic::load(volatile jlong* src) {
    volatile jlong dest;
    _Atomic_move_long(src, &dest);