* src/threads/native/generic-primitives.h

(MEMORY_BARRIER_BEFORE_ATOMIC): Removed.
* src/vm/jit/alpha/machine-instr.h,
src/vm/jit/arm/machine-instr.h,
src/vm/jit/i386/machine-instr.h,
src/vm/jit/m68k/machine-instr.h,
src/vm/jit/mips/machine-instr.h,
src/vm/jit/powerpc/machine-instr.h,
src/vm/jit/powerpc64/machine-instr.h,
src/vm/jit/s390/machine-instr.h,
src/vm/jit/sparc64/machine-instr.h,
src/vm/jit/x86_64/machine-instr.h: Likewise.

diff --git a/src/threads/native/generic-primitives.h b/src/threads/native/generic-primitives.h
index eee516d79d177da841ef909f36ca1fa49a0d3711..5541a447b2aea26af07745c35b8f5a213ba42d78 100644 (file)
--- a/src/threads/native/generic-primitives.h
+++ b/src/threads/native/generic-primitives.h
@@ -65,7 +65,6 @@ static inline long compare_and_swap(volatile long *p, long oldval, long newval)
 #define MEMORY_BARRIER()                  (pthread_mutex_lock(&_mb_lock), \
                                            pthread_mutex_unlock(&_mb_lock))
 #define STORE_ORDER_BARRIER()             MEMORY_BARRIER()
-#define MEMORY_BARRIER_BEFORE_ATOMIC()    /* nothing */
 #define MEMORY_BARRIER_AFTER_ATOMIC()     /* nothing */
 
 #endif /* _MACHINE_INSTR_H */

diff --git a/src/vm/jit/alpha/machine-instr.h b/src/vm/jit/alpha/machine-instr.h
index 64b982a3c8c6ec95b17e025c49cb443808433fa1..3d054e195cd163039f1b1df75c3e53eed82a9771 100644 (file)
--- a/src/vm/jit/alpha/machine-instr.h
+++ b/src/vm/jit/alpha/machine-instr.h
@@ -23,7 +23,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("wmb" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("mb" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("mb" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ( \
                "mb" : : : "memory" );

diff --git a/src/vm/jit/arm/machine-instr.h b/src/vm/jit/arm/machine-instr.h
index 18b333e875a9963e31e8d5985f4e1812e24bbe6d..82fba2952ff330c3cfc1549e3a6b6dabb5b43d7a 100644 (file)
--- a/src/vm/jit/arm/machine-instr.h
+++ b/src/vm/jit/arm/machine-instr.h
@@ -27,7 +27,6 @@ static inline long compare_and_swap(long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ("" : : : "memory" );
 

diff --git a/src/vm/jit/i386/machine-instr.h b/src/vm/jit/i386/machine-instr.h
index 995d1d02ab1f7f5baac8715152a5bf05c3d3479e..1499e961fffae64cf15b5e6646eaee7f8c6e586f 100644 (file)
--- a/src/vm/jit/i386/machine-instr.h
+++ b/src/vm/jit/i386/machine-instr.h
@@ -14,7 +14,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() /* nothing */
 #define MEMORY_BARRIER_AFTER_ATOMIC() /* nothing */
 #define MEMORY_BARRIER() __asm__ __volatile__ ( \
                "lock; add $0, 0(%%esp)" : : : "memory" );

diff --git a/src/vm/jit/m68k/machine-instr.h b/src/vm/jit/m68k/machine-instr.h
index 2f9fa6fae4ca0c223459c3eaf01872664737e51d..021e723b91d0030bc07dd663c8853b9d820e2765 100644 (file)
--- a/src/vm/jit/m68k/machine-instr.h
+++ b/src/vm/jit/m68k/machine-instr.h
@@ -41,7 +41,6 @@ static inline long compare_and_swap(long *p, long oldval, long newval)
 
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ( "" : : : "memory" );
 

diff --git a/src/vm/jit/mips/machine-instr.h b/src/vm/jit/mips/machine-instr.h
index 60d71f90f4f1bbeb05136579991f89430e8ae93d..848a16480d242011033f312426a5e68d8334d45d 100644 (file)
--- a/src/vm/jit/mips/machine-instr.h
+++ b/src/vm/jit/mips/machine-instr.h
@@ -39,7 +39,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 long compare_and_swap (long *p, long oldval, long newval);
 
 #define STORE_ORDER_BARRIER()
-#define MEMORY_BARRIER_BEFORE_ATOMIC()
 #define MEMORY_BARRIER_AFTER_ATOMIC()
 #define MEMORY_BARRIER()
 

diff --git a/src/vm/jit/powerpc/machine-instr.h b/src/vm/jit/powerpc/machine-instr.h
index 84a1008e08702cde3029f8271dfcd6ff4433bd68..8c7ba6ea41c975433a55d1edf673a9d4993c804d 100644 (file)
--- a/src/vm/jit/powerpc/machine-instr.h
+++ b/src/vm/jit/powerpc/machine-instr.h
@@ -20,7 +20,6 @@ static inline long compare_and_swap(long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("sync" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("isync" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ( "sync" : : : "memory" );
 

diff --git a/src/vm/jit/powerpc64/machine-instr.h b/src/vm/jit/powerpc64/machine-instr.h
index cb36c085d8588732b051c403dc1351791c2afc23..5e3390c19fd48fc58408b0545a781096f26ba28a 100644 (file)
--- a/src/vm/jit/powerpc64/machine-instr.h
+++ b/src/vm/jit/powerpc64/machine-instr.h
@@ -20,7 +20,6 @@ static inline long compare_and_swap(long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("sync" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("isync" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ( "sync" : : : "memory" );
 

diff --git a/src/vm/jit/s390/machine-instr.h b/src/vm/jit/s390/machine-instr.h
index ae8886ba57b5984f68e6d89e33a051010c34c908..b470961aa0d1eb754d90f88572da55afc08d8d67 100644 (file)
--- a/src/vm/jit/s390/machine-instr.h
+++ b/src/vm/jit/s390/machine-instr.h
@@ -52,7 +52,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 
 /* TODO not sure if the following two can't be just empty. */
 
-#define MEMORY_BARRIER_BEFORE_ATOMIC() eieio()
 #define MEMORY_BARRIER_AFTER_ATOMIC() eieio()
 
 #endif

diff --git a/src/vm/jit/sparc64/machine-instr.h b/src/vm/jit/sparc64/machine-instr.h
index 7190087b6adfb27e02c409e6a264a6c623650983..cc07238e70a5f40efe1f8e913916325690fe44ff 100644 (file)
--- a/src/vm/jit/sparc64/machine-instr.h
+++ b/src/vm/jit/sparc64/machine-instr.h
@@ -21,7 +21,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("wmb" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() __asm__ __volatile__ ("mb" : : : "memory");
 #define MEMORY_BARRIER_AFTER_ATOMIC() __asm__ __volatile__ ("mb" : : : "memory");
 #define MEMORY_BARRIER() __asm__ __volatile__ ( \
                "membar 0x0F" : : : "memory" );

diff --git a/src/vm/jit/x86_64/machine-instr.h b/src/vm/jit/x86_64/machine-instr.h
index 0f3c6ff9df64c8c8e17881be6683bada3d09bd64..3afe548ebb8c5d1698bec4faac90f51cfa056717 100644 (file)
--- a/src/vm/jit/x86_64/machine-instr.h
+++ b/src/vm/jit/x86_64/machine-instr.h
@@ -14,7 +14,6 @@ compare_and_swap (volatile long *p, long oldval, long newval)
 }
 
 #define STORE_ORDER_BARRIER() __asm__ __volatile__ ("" : : : "memory");
-#define MEMORY_BARRIER_BEFORE_ATOMIC() /* nothing */
 #define MEMORY_BARRIER_AFTER_ATOMIC() /* nothing */
 #define MEMORY_BARRIER() __asm__ __volatile__ ( \
                "mfence" : : : "memory" );