src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp

*** 32,68 ****
  
  template<size_t byte_size>
  struct Atomic::PlatformAdd
    : Atomic::AddAndFetch<Atomic::PlatformAdd<byte_size> >
  {
!   template<typename I, typename D>
!   D add_and_fetch(I add_value, D volatile* dest, atomic_memory_order order) const;
  };
  
  template<>
! template<typename I, typename D>
! inline D Atomic::PlatformAdd<4>::add_and_fetch(I add_value, D volatile* dest,
                                                 atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(I));
    STATIC_ASSERT(4 == sizeof(D));
  
    return __sync_add_and_fetch(dest, add_value);
  }
  
  template<>
! template<typename I, typename D>
! inline D Atomic::PlatformAdd<8>::add_and_fetch(I add_value, D volatile* dest,
                                                 atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(I));
    STATIC_ASSERT(8 == sizeof(D));
    return __sync_add_and_fetch(dest, add_value);
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<4>::operator()(T exchange_value,
!                                              T volatile* dest,
                                               atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(T));
    // __sync_lock_test_and_set is a bizarrely named atomic exchange
    // operation.  Note that some platforms only support this with the
    // limitation that the only valid value to store is the immediate
--- 32,68 ----
  
  template<size_t byte_size>
  struct Atomic::PlatformAdd
    : Atomic::AddAndFetch<Atomic::PlatformAdd<byte_size> >
  {
!   template<typename D, typename I>
!   D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
  };
  
  template<>
! template<typename D, typename I>
! inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
                                                 atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(I));
    STATIC_ASSERT(4 == sizeof(D));
  
    return __sync_add_and_fetch(dest, add_value);
  }
  
  template<>
! template<typename D, typename I>
! inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I add_value,
                                                 atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(I));
    STATIC_ASSERT(8 == sizeof(D));
    return __sync_add_and_fetch(dest, add_value);
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<4>::operator()(T volatile* dest,
!                                              T exchange_value,
                                               atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(T));
    // __sync_lock_test_and_set is a bizarrely named atomic exchange
    // operation.  Note that some platforms only support this with the
    // limitation that the only valid value to store is the immediate
*** 76,87 ****
    return result;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<8>::operator()(T exchange_value,
!                                              T volatile* dest,
                                               atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(T));
    T result = __sync_lock_test_and_set (dest, exchange_value);
    __sync_synchronize();
    return result;
--- 76,87 ----
    return result;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<8>::operator()(T volatile* dest,
!                                              T exchange_value,
                                               atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(T));
    T result = __sync_lock_test_and_set (dest, exchange_value);
    __sync_synchronize();
    return result;
*** 91,113 ****
  template<>
  struct Atomic::PlatformCmpxchg<1> : Atomic::CmpxchgByteUsingInt {};
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<4>::operator()(T exchange_value,
!                                                 T volatile* dest,
                                                  T compare_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(T));
    return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<8>::operator()(T exchange_value,
!                                                 T volatile* dest,
                                                  T compare_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(T));
    return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
  }
  
--- 91,113 ----
  template<>
  struct Atomic::PlatformCmpxchg<1> : Atomic::CmpxchgByteUsingInt {};
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<4>::operator()(T volatile* dest,
                                                  T compare_value,
+                                                 T exchange_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(4 == sizeof(T));
    return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<8>::operator()(T volatile* dest,
                                                  T compare_value,
+                                                 T exchange_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(8 == sizeof(T));
    return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
  }
  
*** 120,131 ****
    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));
    os::atomic_copy64(reinterpret_cast<const volatile int64_t*>(&store_value), reinterpret_cast<volatile int64_t*>(dest));
  }
  
  #endif // OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
--- 120,131 ----
    return PrimitiveConversions::cast<T>(dest);
  }
  
  template<>
  template<typename T>
! inline void Atomic::PlatformStore<8>::operator()(T volatile* dest,
!                                                  T store_value) const {
    STATIC_ASSERT(8 == sizeof(T));
    os::atomic_copy64(reinterpret_cast<const volatile int64_t*>(&store_value), reinterpret_cast<volatile int64_t*>(dest));
  }
  
  #endif // OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP