src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp

rev 47321 : [mq]: Atomic_loadstore

*** 25,47 ****
  #ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
  #define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
  
  // Implementation of class atomic
  
- inline void Atomic::store    (jbyte    store_value, jbyte*    dest) { *dest = store_value; }
- inline void Atomic::store    (jshort   store_value, jshort*   dest) { *dest = store_value; }
- inline void Atomic::store    (jint     store_value, jint*     dest) { *dest = store_value; }
- inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
- inline void Atomic::store_ptr(void*    store_value, void*     dest) { *(void**)dest = store_value; }
- 
- inline void Atomic::store    (jbyte    store_value, volatile jbyte*    dest) { *dest = store_value; }
- inline void Atomic::store    (jshort   store_value, volatile jshort*   dest) { *dest = store_value; }
- inline void Atomic::store    (jint     store_value, volatile jint*     dest) { *dest = store_value; }
- inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
- inline void Atomic::store_ptr(void*    store_value, volatile void*     dest) { *(void* volatile *)dest = store_value; }
- 
- 
  template<size_t byte_size>
  struct Atomic::PlatformAdd
    : Atomic::FetchAndAdd<Atomic::PlatformAdd<byte_size> >
  {
    template<typename I, typename D>
--- 25,34 ----
*** 100,111 ****
                      : "cc", "memory");
    return exchange_value;
  }
  
  #ifdef AMD64
- inline void Atomic::store    (jlong    store_value, jlong*    dest) { *dest = store_value; }
- inline void Atomic::store    (jlong    store_value, volatile jlong*    dest) { *dest = store_value; }
  
  template<>
  template<typename I, typename D>
  inline D Atomic::PlatformAdd<8>::fetch_and_add(I add_value, D volatile* dest) const {
    STATIC_ASSERT(8 == sizeof(I));
--- 87,96 ----
*** 142,153 ****
                          : "r" (exchange_value), "a" (compare_value), "r" (dest)
                          : "cc", "memory");
    return exchange_value;
  }
  
- inline jlong Atomic::load(const volatile jlong* src) { return *src; }
- 
  #else // !AMD64
  
  extern "C" {
    // defined in linux_x86.s
    jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong);
--- 127,136 ----
*** 162,183 ****
                                                  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);
!   return dest;
  }
  
! inline void Atomic::store(jlong store_value, jlong* dest) {
!   _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
! }
! 
! inline void Atomic::store(jlong store_value, volatile jlong* dest) {
!   _Atomic_move_long((volatile jlong*)&store_value, dest);
  }
  
  #endif // AMD64
  
  #endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
--- 145,169 ----
                                                  cmpxchg_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(T));
    return cmpxchg_using_helper<jlong>(_Atomic_cmpxchg_long, exchange_value, dest, compare_value);
  }
  
! template<>
! template<typename T>
! inline T Atomic::PlatformLoad<8>::operator()(T const volatile* src) const {
!   STATIC_ASSERT(8 == sizeof(T));
    volatile jlong dest;
!   _Atomic_move_long(reinterpret_cast<const volatile jlong*>(src), reinterpret_cast<volatile jlong*>(&dest));
!   return PrimitiveConversions::cast<T>(dest);
  }
  
! template<>
! template<typename T>
! inline void Atomic::PlatformStore<8>::operator()(T store_value,
!                                                  T volatile* dest) const {
!   STATIC_ASSERT(8 == sizeof(T));
!   _Atomic_move_long(reinterpret_cast<const volatile jlong*>(&store_value), reinterpret_cast<volatile jlong*>(dest));
  }
  
  #endif // AMD64
  
  #endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP