src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp

rev 13442 : imported patch windows_x86
rev 13452 : [mq]: coleen_review1
rev 13458 : imported patch cmpxchg_using_helper

*** 107,136 ****
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void *)(os::atomic_xchg_ptr_func)((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
! inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
!   return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
! }
! 
! #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
! inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
!     return (*os::atomic_cmpxchg_byte_func)(exchange_value, dest, compare_value);
! }
! 
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
!   return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
! }
! 
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_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, cmpxchg_memory_order order) {
!   return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
! }
  
  inline jlong Atomic::load(const volatile jlong* src) { return *src; }
  
  #else // !AMD64
  
--- 107,132 ----
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void *)(os::atomic_xchg_ptr_func)((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
! #define DEFINE_STUB_CMPXCHG(ByteSize, StubType, StubName)               \
!   template<>                                                            \
!   template<typename T>                                                  \
!   inline T Atomic::PlatformCmpxchg<ByteSize>::operator()(T exchange_value, \
!                                                          T volatile* dest, \
!                                                          T compare_value, \
!                                                          cmpxchg_memory_order order) const { \
!     STATIC_ASSERT(ByteSize == sizeof(T));                               \
!     return cmpxchg_using_helper<StubType>(StubName, exchange_value, dest, compare_value); \
!   }
! 
! DEFINE_STUB_CMPXCHG(1, jbyte, os::atomic_cmpxchg_byte_func)
! DEFINE_STUB_CMPXCHG(4, jint,  os::atomic_cmpxchg_func)
! DEFINE_STUB_CMPXCHG(8, jlong, os::atomic_cmpxchg_long_func)
  
! #undef DEFINE_STUB_CMPXCHG
  
  inline jlong Atomic::load(const volatile jlong* src) { return *src; }
  
  #else // !AMD64
  
*** 199,230 ****
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
  }
  
! #define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
! inline jbyte    Atomic::cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value, cmpxchg_memory_order order) {
    // alternative for InterlockedCompareExchange
    __asm {
      mov edx, dest
      mov cl, exchange_value
      mov al, compare_value
      lock cmpxchg byte ptr [edx], cl
    }
  }
  
! inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
    // alternative for InterlockedCompareExchange
    __asm {
      mov edx, dest
      mov ecx, exchange_value
      mov eax, compare_value
      lock cmpxchg dword ptr [edx], ecx
    }
  }
  
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
    jint ex_lo  = (jint)exchange_value;
    jint ex_hi  = *( ((jint*)&exchange_value) + 1 );
    jint cmp_lo = (jint)compare_value;
    jint cmp_hi = *( ((jint*)&compare_value) + 1 );
    __asm {
--- 195,243 ----
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
  }
  
! template<>
! template<typename T>
! inline T Atomic::PlatformCmpxchg<1>::operator()(T exchange_value,
!                                                 T volatile* dest,
!                                                 T compare_value,
!                                                 cmpxchg_memory_order order) const {
!   STATIC_ASSERT(1 == sizeof(T));
    // alternative for InterlockedCompareExchange
    __asm {
      mov edx, dest
      mov cl, exchange_value
      mov al, compare_value
      lock cmpxchg byte ptr [edx], cl
    }
  }
  
! template<>
! template<typename T>
! inline T Atomic::PlatformCmpxchg<4>::operator()(T exchange_value,
!                                                 T volatile* dest,
!                                                 T compare_value,
!                                                 cmpxchg_memory_order order) const {
!   STATIC_ASSERT(4 == sizeof(T));
    // alternative for InterlockedCompareExchange
    __asm {
      mov edx, dest
      mov ecx, exchange_value
      mov eax, compare_value
      lock cmpxchg dword ptr [edx], ecx
    }
  }
  
! template<>
! template<typename T>
! inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
!                                                 T volatile* dest,
!                                                 T compare_value,
!                                                 cmpxchg_memory_order order) const {
!   STATIC_ASSERT(8 == sizeof(T));
    jint ex_lo  = (jint)exchange_value;
    jint ex_hi  = *( ((jint*)&exchange_value) + 1 );
    jint cmp_lo = (jint)compare_value;
    jint cmp_hi = *( ((jint*)&compare_value) + 1 );
    __asm {
*** 239,256 ****
      pop edi
      pop ebx
    }
  }
  
- inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_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, cmpxchg_memory_order order) {
-   return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
- }
- 
  inline jlong Atomic::load(const volatile jlong* src) {
    volatile jlong dest;
    volatile jlong* pdest = &dest;
    __asm {
      mov eax, src
--- 252,261 ----