src/os_cpu/bsd_x86/vm/atomic_bsd_x86.hpp

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

*** 83,92 ****
--- 83,93 ----
  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));
    __asm__ volatile (  "lock cmpxchgb %1,(%3)"
                      : "=a" (exchange_value)
                      : "q" (exchange_value), "a" (compare_value), "r" (dest)
                      : "cc", "memory");
    return exchange_value;
*** 96,105 ****
--- 97,107 ----
  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));
    __asm__ volatile (  "lock cmpxchgl %1,(%3)"
                      : "=a" (exchange_value)
                      : "r" (exchange_value), "a" (compare_value), "r" (dest)
                      : "cc", "memory");
    return exchange_value;
*** 148,157 ****
--- 150,160 ----
  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));
    __asm__ __volatile__ (  "lock cmpxchgq %1,(%3)"
                          : "=a" (exchange_value)
                          : "r" (exchange_value), "a" (compare_value), "r" (dest)
                          : "cc", "memory");
    return exchange_value;
*** 192,202 ****
  template<typename T>
  inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
                                                  T volatile* dest,
                                                  T compare_value,
                                                  cmpxchg_memory_order order) const {
!   return cmpxchg_using_stub<jlong>(_Atomic_cmpxchg_long, exchange_value, dest, compare_value);
  }
  
  inline jlong Atomic::load(const volatile jlong* src) {
    volatile jlong dest;
    _Atomic_move_long(src, &dest);
--- 195,206 ----
  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));
!   return cmpxchg_using_helper<jlong>(_Atomic_cmpxchg_long, exchange_value, dest, compare_value);
  }
  
  inline jlong Atomic::load(const volatile jlong* src) {
    volatile jlong dest;
    _Atomic_move_long(src, &dest);