X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FSMP.h;h=a91e5d56197783205fbbf2c98e61f870547bd344;hb=87c93cf56c83abf0148c91d5972dbe65dc72c38a;hp=04e4d1326b3885aec638716c00a4bf3724cc9f69;hpb=59c03ecb7fa69bf13647f0106e50748e90711176;p=ghc-hetmet.git

diff --git a/includes/SMP.h b/includes/SMP.h
index 04e4d13..a91e5d5 100644
--- a/includes/SMP.h
+++ b/includes/SMP.h
@@ -16,6 +16,14 @@
  *      Unregisterised builds are ok, but only 1 CPU supported.
  */
 
+#ifdef CMINUSMINUS
+
+#define unlockClosure(ptr,info)                 \
+    prim %write_barrier() [];                   \
+    StgHeader_info(ptr) = info;    
+
+#else
+
 #if defined(THREADED_RTS)
 
 #if  defined(TICKY_TICKY)
@@ -75,7 +83,7 @@ xchg(StgPtr p, StgWord w)
         "1:     lwarx     %0, 0, %2\n"
         "       stwcx.    %1, 0, %2\n"
         "       bne-      1b"
-        :"=r" (result)
+        :"=&r" (result)
         :"r" (w), "r" (p)
     );
 #elif sparc_HOST_ARCH
@@ -103,7 +111,7 @@ cas(StgVolatilePtr p, StgWord o, StgWord n)
 {
 #if i386_HOST_ARCH || x86_64_HOST_ARCH
     __asm__ __volatile__ (
- 	  "lock/cmpxchg %3,%1"
+ 	  "lock\ncmpxchg %3,%1"
           :"=a"(o), "=m" (*(volatile unsigned int *)p) 
           :"0" (o), "r" (n));
     return o;
@@ -175,7 +183,15 @@ write_barrier(void) {
 
 #define SPIN_COUNT 4000
 
-INLINE_HEADER StgInfoTable *
+#ifdef KEEP_LOCKCLOSURE
+// We want a callable copy of lockClosure() so that we can refer to it
+// from .cmm files compiled using the native codegen.
+extern StgInfoTable *lockClosure(StgClosure *p);
+INLINE_ME
+#else
+INLINE_HEADER
+#endif
+StgInfoTable *
 lockClosure(StgClosure *p)
 {
     StgWord info;
@@ -190,7 +206,7 @@ lockClosure(StgClosure *p)
 }
 
 INLINE_HEADER void
-unlockClosure(StgClosure *p, StgInfoTable *info)
+unlockClosure(StgClosure *p, const StgInfoTable *info)
 {
     // This is a strictly ordered write, so we need a write_barrier():
     write_barrier();
@@ -233,7 +249,7 @@ typedef lnat StgSyncCount;
 //  spin locks to check for contention. 
 
 // acquire spin lock
-INLINE_HEADER void acquireSpinLock(StgSync * p)
+INLINE_HEADER void ACQUIRE_SPIN_LOCK(StgSync * p)
 {
     StgWord32 r = 0;
     do {
@@ -244,7 +260,7 @@ INLINE_HEADER void acquireSpinLock(StgSync * p)
 }
 
 // release spin lock
-INLINE_HEADER void releaseSpinLock(StgSync * p)
+INLINE_HEADER void RELEASE_SPIN_LOCK(StgSync * p)
 {
     write_barrier();
     p->lock = 1;
@@ -261,7 +277,7 @@ INLINE_HEADER void initSpinLock(StgSync * p)
 #else
 
 // acquire spin lock
-INLINE_HEADER void acquireSpinLock(StgSync * p)
+INLINE_HEADER void ACQUIRE_SPIN_LOCK(StgSync * p)
 {
     StgWord32 r = 0;
     do {
@@ -270,7 +286,7 @@ INLINE_HEADER void acquireSpinLock(StgSync * p)
 }
 
 // release spin lock
-INLINE_HEADER void releaseSpinLock(StgSync * p)
+INLINE_HEADER void RELEASE_SPIN_LOCK(StgSync * p)
 {
     write_barrier();
     (*p) = 1;
@@ -303,14 +319,12 @@ lockClosure(StgClosure *p)
 { return (StgInfoTable *)p->header.info; }
 
 INLINE_HEADER void
-unlockClosure(StgClosure *p STG_UNUSED, StgInfoTable *info STG_UNUSED)
-{ /* nothing */ }
-
-INLINE_HEADER void acquireSpinLock(void * p STG_UNUSED)
+unlockClosure(StgClosure *p STG_UNUSED, const StgInfoTable *info STG_UNUSED)
 { /* nothing */ }
 
-INLINE_HEADER void releaseSpinLock(void * p STG_UNUSED)
-{ /* nothing */ }
+// Using macros here means we don't have to ensure the argument is in scope
+#define ACQUIRE_SPIN_LOCK(p) /* nothing */
+#define RELEASE_SPIN_LOCK(p) /* nothing */
 
 INLINE_HEADER void initSpinLock(void * p STG_UNUSED)
 { /* nothing */ }
@@ -322,6 +336,8 @@ INLINE_HEADER void lockTSO(StgTSO *tso)
 { lockClosure((StgClosure *)tso); }
 
 INLINE_HEADER void unlockTSO(StgTSO *tso)
-{ unlockClosure((StgClosure*)tso, (StgInfoTable*)&stg_TSO_info); }
+{ unlockClosure((StgClosure*)tso, (const StgInfoTable *)&stg_TSO_info); }
 
 #endif /* SMP_H */
+
+#endif /* CMINUSMINUS */