diff options
| author | Karel Gardas <karel.gardas@centrum.cz> | 2011-07-09 17:35:56 +0200 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2011-08-10 22:03:41 +1000 |
| commit | b0538fd43a8d813dff50dbdde493d099b753e0e8 (patch) | |
| tree | dba5e798b6b2472aec7707093ccf71e62831845a /includes/stg/SMP.h | |
| parent | 1e85268bdbd58ed070cb20add469b2f5b9bfe6e6 (diff) | |
| download | haskell-b0538fd43a8d813dff50dbdde493d099b753e0e8.tar.gz | |
implement ARMv7 specific memory barriers
This patch provides implementation of ARMv7 specific memory barriers.
It uses dmb sy isn (or shortly dmb) for store/load and load/load barriers
and dmb st isn for store/store barrier.
Diffstat (limited to 'includes/stg/SMP.h')
| -rw-r--r-- | includes/stg/SMP.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/includes/stg/SMP.h b/includes/stg/SMP.h index 4770db960d..df62e56016 100644 --- a/includes/stg/SMP.h +++ b/includes/stg/SMP.h @@ -20,6 +20,10 @@ #define PRE_ARMv6 #endif +#if defined(PRE_ARMv6) || defined(__ARM_ARCH_6__) +#define PRE_ARMv7 +#endif + #if defined(THREADED_RTS) #if arm_HOST_ARCH && defined(PRE_ARMv6) @@ -310,8 +314,10 @@ write_barrier(void) { #elif sparc_HOST_ARCH /* Sparc in TSO mode does not require store/store barriers. */ __asm__ __volatile__ ("" : : : "memory"); -#elif arm_HOST_ARCH +#elif arm_HOST_ARCH && PRE_ARMv7 __asm__ __volatile__ ("" : : : "memory"); +#elif arm_HOST_ARCH && !PRE_ARMv7 + __asm__ __volatile__ ("dmb st" : : : "memory"); #elif !defined(WITHSMP) return; #else @@ -329,6 +335,8 @@ store_load_barrier(void) { __asm__ __volatile__ ("sync" : : : "memory"); #elif sparc_HOST_ARCH __asm__ __volatile__ ("membar #StoreLoad" : : : "memory"); +#elif arm_HOST_ARCH && !PRE_ARMv7 + __asm__ __volatile__ ("dmb" : : : "memory"); #elif !defined(WITHSMP) return; #else @@ -347,6 +355,8 @@ load_load_barrier(void) { #elif sparc_HOST_ARCH /* Sparc in TSO mode does not require load/load barriers. */ __asm__ __volatile__ ("" : : : "memory"); +#elif arm_HOST_ARCH && !PRE_ARMv7 + __asm__ __volatile__ ("dmb" : : : "memory"); #elif !defined(WITHSMP) return; #else |