src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.hpp

rev 13466 : imported patch linux_aarch64
rev 13472 : imported patch coleen_review1

*** 83,116 ****
  {
    return (void *) xchg_ptr((intptr_t) exchange_value,
                             (volatile intptr_t*) dest);
  }
  
! template <typename T> T generic_cmpxchg(T exchange_value, volatile T* dest,
!                                         T compare_value, cmpxchg_memory_order order)
! {
    if (order == memory_order_relaxed) {
      T value = compare_value;
      __atomic_compare_exchange(dest, &value, &exchange_value, /*weak*/false,
                                __ATOMIC_RELAXED, __ATOMIC_RELAXED);
      return value;
    } else {
      return __sync_val_compare_and_swap(dest, compare_value, exchange_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 generic_cmpxchg(exchange_value, dest, compare_value, order);
- }
- 
- inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order)
- {
-   return generic_cmpxchg(exchange_value, dest, compare_value, order);
- }
- 
  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; }
  
  inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest)
  {
--- 83,109 ----
  {
    return (void *) xchg_ptr((intptr_t) exchange_value,
                             (volatile intptr_t*) dest);
  }
  
! template<size_t byte_size>
! template<typename T>
! inline T Atomic::PlatformCmpxchg<byte_size>::operator()(T exchange_value,
!                                                         T volatile* dest,
!                                                         T compare_value,
!                                                         cmpxchg_memory_order) const {
!   STATIC_ASSERT(byte_size == sizeof(T));
    if (order == memory_order_relaxed) {
      T value = compare_value;
      __atomic_compare_exchange(dest, &value, &exchange_value, /*weak*/false,
                                __ATOMIC_RELAXED, __ATOMIC_RELAXED);
      return value;
    } else {
      return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
    }
  }
  
  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; }
  
  inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest)
  {
*** 137,162 ****
    intptr_t res = __sync_lock_test_and_set (dest, exchange_value);
    FULL_MEM_BARRIER;
    return res;
  }
  
- inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order)
- {
-   return generic_cmpxchg(exchange_value, dest, compare_value, order);
- }
- 
- inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order)
- {
-   return generic_cmpxchg(exchange_value, dest, compare_value, order);
- }
- 
- inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order)
- {
-   return (void *) cmpxchg_ptr((intptr_t) exchange_value,
-                               (volatile intptr_t*) dest,
-                               (intptr_t) compare_value,
-                               order);
- }
- 
  inline jlong Atomic::load(const volatile jlong* src) { return *src; }
  
  #endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
--- 130,137 ----