From: Christian Thalinger <twisti@complang.tuwien.ac.at>
Date: Wed, 19 Mar 2008 09:40:48 +0000 (+0100)
Subject: * src/threads/native/generic-primitives.h
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0420fc30db24ad1ca6b11d4650fb7f754e821f24;p=cacao.git

* 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 eee516d79..5541a447b 100644
--- 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 64b982a3c..3d054e195 100644
--- 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 18b333e87..82fba2952 100644
--- 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 995d1d02a..1499e961f 100644
--- 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 2f9fa6fae..021e723b9 100644
--- 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 60d71f90f..848a16480 100644
--- 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 84a1008e0..8c7ba6ea4 100644
--- 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 cb36c085d..5e3390c19 100644
--- 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 ae8886ba5..b470961aa 100644
--- 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 7190087b6..cc07238e7 100644
--- 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 0f3c6ff9d..3afe548eb 100644
--- 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" );