src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp

*** 27,109 ****
  
  #include "runtime/orderAccess.hpp"
  
  // Implementation of class OrderAccess.
  
  // Assume TSO.
  
! inline void OrderAccess::loadload()   { acquire(); }
! inline void OrderAccess::storestore() { release(); }
! inline void OrderAccess::loadstore()  { acquire(); }
  inline void OrderAccess::storeload()  { fence(); }
  
! inline void OrderAccess::acquire() {
!   __asm__ volatile ("nop" : : :);
! }
! 
! inline void OrderAccess::release() {
!   jint* local_dummy = (jint*)&local_dummy;
!   __asm__ volatile("stw %%g0, [%0]" : : "r" (local_dummy) : "memory");
! }
  
  inline void OrderAccess::fence() {
!   __asm__ volatile ("membar  #StoreLoad" : : :);
  }
  
! inline jbyte    OrderAccess::load_acquire(volatile jbyte*   p) { return *p; }
! inline jshort   OrderAccess::load_acquire(volatile jshort*  p) { return *p; }
! inline jint     OrderAccess::load_acquire(volatile jint*    p) { return *p; }
! inline jlong    OrderAccess::load_acquire(volatile jlong*   p) { return *p; }
! inline jubyte   OrderAccess::load_acquire(volatile jubyte*  p) { return *p; }
! inline jushort  OrderAccess::load_acquire(volatile jushort* p) { return *p; }
! inline juint    OrderAccess::load_acquire(volatile juint*   p) { return *p; }
! inline julong   OrderAccess::load_acquire(volatile julong*  p) { return *p; }
! inline jfloat   OrderAccess::load_acquire(volatile jfloat*  p) { return *p; }
! inline jdouble  OrderAccess::load_acquire(volatile jdouble* p) { return *p; }
! 
! inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t*   p) { return *p; }
! inline void*    OrderAccess::load_ptr_acquire(volatile void*       p) { return *(void* volatile *)p; }
! inline void*    OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; }
! 
! inline void     OrderAccess::release_store(volatile jbyte*   p, jbyte   v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jshort*  p, jshort  v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jint*    p, jint    v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jlong*   p, jlong   v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jubyte*  p, jubyte  v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; }
! inline void     OrderAccess::release_store(volatile juint*   p, juint   v) { *p = v; }
! inline void     OrderAccess::release_store(volatile julong*  p, julong  v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jfloat*  p, jfloat  v) { *p = v; }
! inline void     OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; }
! 
! inline void     OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; }
! inline void     OrderAccess::release_store_ptr(volatile void*     p, void*    v) { *(void* volatile *)p = v; }
! 
! inline void     OrderAccess::store_fence(jbyte*   p, jbyte   v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jshort*  p, jshort  v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jint*    p, jint    v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jlong*   p, jlong   v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jubyte*  p, jubyte  v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(juint*   p, juint   v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(julong*  p, julong  v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jfloat*  p, jfloat  v) { *p = v; fence(); }
! inline void     OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); }
! 
! inline void     OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); }
! inline void     OrderAccess::store_ptr_fence(void**    p, void*    v) { *p = v; fence(); }
! 
! inline void     OrderAccess::release_store_fence(volatile jbyte*   p, jbyte   v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jshort*  p, jshort  v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jint*    p, jint    v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jlong*   p, jlong   v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jubyte*  p, jubyte  v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile juint*   p, juint   v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile julong*  p, julong  v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jfloat*  p, jfloat  v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); }
! 
! inline void     OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
! inline void     OrderAccess::release_store_ptr_fence(volatile void*     p, void*    v) { *(void* volatile *)p = v; fence(); }
  
  #endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP
--- 27,53 ----
  
  #include "runtime/orderAccess.hpp"
  
  // Implementation of class OrderAccess.
  
+ // A compiler barrier, forcing the C++ compiler to invalidate all memory assumptions
+ static inline void compiler_barrier() {
+   __asm__ volatile ("" : : : "memory");
+ }
+ 
  // Assume TSO.
  
! inline void OrderAccess::loadload()   { compiler_barrier(); }
! inline void OrderAccess::storestore() { compiler_barrier(); }
! inline void OrderAccess::loadstore()  { compiler_barrier(); }
  inline void OrderAccess::storeload()  { fence();            }
  
! inline void OrderAccess::acquire()    { compiler_barrier(); }
! inline void OrderAccess::release()    { compiler_barrier(); }
  
  inline void OrderAccess::fence() {
!   __asm__ volatile ("membar  #StoreLoad" : : : "memory");
  }
  
! #define VM_HAS_GENERALIZED_ORDER_ACCESS 1
  
  #endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP