src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp

*** 94,110 ****
  
  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));
  
    D result;
--- 94,110 ----
  
  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));
  
    D result;
*** 125,136 ****
    return result;
  }
  
  
  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));
  
    D result;
--- 125,136 ----
    return result;
  }
  
  
  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));
  
    D result;
*** 151,162 ****
    return result;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<4>::operator()(T exchange_value,
!                                              T volatile* dest,
                                               atomic_memory_order order) const {
    // Note that xchg doesn't necessarily do an acquire
    // (see synchronizer.cpp).
  
    T old_value;
--- 151,162 ----
    return result;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformXchg<4>::operator()(T volatile* dest,
!                                              T exchange_value,
                                               atomic_memory_order order) const {
    // Note that xchg doesn't necessarily do an acquire
    // (see synchronizer.cpp).
  
    T old_value;
*** 190,201 ****
    return old_value;
  }
  
  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));
    // Note that xchg doesn't necessarily do an acquire
    // (see synchronizer.cpp).
  
--- 190,201 ----
    return old_value;
  }
  
  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));
    // Note that xchg doesn't necessarily do an acquire
    // (see synchronizer.cpp).
  
*** 230,242 ****
    return old_value;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<1>::operator()(T exchange_value,
!                                                 T volatile* dest,
                                                  T compare_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(1 == sizeof(T));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
--- 230,242 ----
    return old_value;
  }
  
  template<>
  template<typename T>
! inline T Atomic::PlatformCmpxchg<1>::operator()(T volatile* dest,
                                                  T compare_value,
+                                                 T exchange_value,
                                                  atomic_memory_order order) const {
    STATIC_ASSERT(1 == sizeof(T));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
*** 300,312 ****
    return PrimitiveConversions::cast<T>((unsigned char)old_value);
  }
  
  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));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
--- 300,312 ----
    return PrimitiveConversions::cast<T>((unsigned char)old_value);
  }
  
  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));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
*** 350,362 ****
    return old_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));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
--- 350,362 ----
    return old_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));
  
    // Note that cmpxchg guarantees a two-way memory barrier across
    // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not