src/os_cpu/linux_sparc/vm/atomic_linux_sparc.hpp

rev 13452 : imported patch Atomic_cmpxchg
rev 13453 : imported patch Atomic_add
rev 13454 : [mq]: Atomic_add_v2

*** 49,60 ****
  inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
  inline void Atomic::dec_ptr(volatile void*     dest) { (void)add_ptr(-1, dest); }
  
  inline jlong Atomic::load(const volatile jlong* src) { return *src; }
  
! inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
!   intptr_t rv;
    __asm__ volatile(
      "1: \n\t"
      " ld     [%2], %%o2\n\t"
      " add    %1, %%o2, %%o3\n\t"
      " cas    [%2], %%o2, %%o3\n\t"
--- 49,73 ----
  inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
  inline void Atomic::dec_ptr(volatile void*     dest) { (void)add_ptr(-1, dest); }
  
  inline jlong Atomic::load(const volatile jlong* src) { return *src; }
  
! 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) const;
! };
! 
! template<>
! template<typename I, typename D>
! inline D Atomic::PlatformAdd<4>::add_and_fetch(I add_value, D volatile* dest) const {
!   STATIC_CAST(4 == sizeof(I));
!   STATIC_CAST(4 == sizeof(D));
! 
!   D rv;
    __asm__ volatile(
      "1: \n\t"
      " ld     [%2], %%o2\n\t"
      " add    %1, %%o2, %%o3\n\t"
      " cas    [%2], %%o2, %%o3\n\t"
*** 66,77 ****
      : "r" (add_value), "r" (dest)
      : "memory", "o2", "o3");
    return rv;
  }
  
! inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
!   intptr_t rv;
    __asm__ volatile(
      "1: \n\t"
      " ldx    [%2], %%o2\n\t"
      " add    %1, %%o2, %%o3\n\t"
      " casx   [%2], %%o2, %%o3\n\t"
--- 79,94 ----
      : "r" (add_value), "r" (dest)
      : "memory", "o2", "o3");
    return rv;
  }
  
! template<typename I, typename D>
! inline D Atomic::PlatformAdd<8>::add_and_fetch(I add_value, D volatile* dest) const {
!   STATIC_CAST(8 == sizeof(I));
!   STATIC_CAST(8 == sizeof(D));
! 
!   D rv;
    __asm__ volatile(
      "1: \n\t"
      " ldx    [%2], %%o2\n\t"
      " add    %1, %%o2, %%o3\n\t"
      " casx   [%2], %%o2, %%o3\n\t"
*** 83,96 ****
      : "r" (add_value), "r" (dest)
      : "memory", "o2", "o3");
    return rv;
  }
  
- inline void*    Atomic::add_ptr(intptr_t add_value, volatile void*     dest) {
-   return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest);
- }
  
  
  inline jint     Atomic::xchg    (jint     exchange_value, volatile jint*     dest) {
    intptr_t rv = exchange_value;
    __asm__ volatile(
      " swap   [%2],%1\n\t"
--- 100,112 ----
      : "r" (add_value), "r" (dest)
      : "memory", "o2", "o3");
    return rv;
  }
  
  
+ template<>
+ struct Atomic::PlatformAdd<2>: Atomic::AddShortUsingInt {};
  
  inline jint     Atomic::xchg    (jint     exchange_value, volatile jint*     dest) {
    intptr_t rv = exchange_value;
    __asm__ volatile(
      " swap   [%2],%1\n\t"