src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.hpp

rev 13437 : imported patch solaris_sparc
rev 13452 : [mq]: coleen_review1

*** 23,34 ****
   */
  
  #ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
  #define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
  
- #include "runtime/os.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; }
--- 23,32 ----
*** 62,75 ****
  // omits the instruction set check.
  
  extern "C" jint     _Atomic_swap32(jint     exchange_value, volatile jint*     dest);
  extern "C" intptr_t _Atomic_swap64(intptr_t exchange_value, volatile intptr_t* dest);
  
- extern "C" jint     _Atomic_cas32(jint     exchange_value, volatile jint*     dest, jint     compare_value);
- extern "C" intptr_t _Atomic_cas64(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value);
- extern "C" jlong    _Atomic_casl (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value);
- 
  extern "C" jint     _Atomic_add32(jint     inc,       volatile jint*     dest);
  extern "C" intptr_t _Atomic_add64(intptr_t add_value, volatile intptr_t* dest);
  
  
  inline jint     Atomic::add     (jint    add_value, volatile jint*     dest) {
--- 60,69 ----
*** 95,118 ****
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
! 
! inline jint     Atomic::cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value, cmpxchg_memory_order order) {
!   return _Atomic_cas32(exchange_value, dest, compare_value);
! }
! 
! inline jlong    Atomic::cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value, cmpxchg_memory_order order) {
!   // Return 64 bit value in %o0
!   return _Atomic_cas64((intptr_t)exchange_value, (intptr_t *)dest, (intptr_t)compare_value);
! }
! 
! inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
!   return _Atomic_cas64(exchange_value, dest, compare_value);
! }
! 
! 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);
  }
  
  #endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
--- 89,130 ----
  
  inline void*    Atomic::xchg_ptr(void*    exchange_value, volatile void*     dest) {
    return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
  }
  
! // No direct support for cmpxchg of bytes; emulate using int.
! 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,
!                                                 cmpxchg_memory_order order) const {
!   STATIC_ASSERT(4 == sizeof(T));
!   T rv;
!   __asm__ volatile(
!     " cas    [%2], %3, %0"
!     : "=r" (rv)
!     : "0" (exchange_value), "r" (dest), "r" (compare_value)
!     : "memory");
!   return rv;
! }
! 
! template<>
! 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));
!   T rv;
!   __asm__ volatile(
!     " casx   [%2], %3, %0"
!     : "=r" (rv)
!     : "0" (exchange_value), "r" (dest), "r" (compare_value)
!     : "memory");
!   return rv;
  }
  
  #endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP