Add several new record features

[ghc-hetmet.git] / includes / SMP.h

diff --git a/includes/SMP.h b/includes/SMP.h
index 04e4d13..74fbf9a 100644 (file)
--- a/includes/SMP.h
+++ b/includes/SMP.h
@@ -75,7 +75,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 +103,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;
@@ -233,7 +233,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 +244,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 +261,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 +270,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;
@@ -306,11 +306,9 @@ INLINE_HEADER void
 unlockClosure(StgClosure *p STG_UNUSED, StgInfoTable *info STG_UNUSED)
 { /* nothing */ }
 
-INLINE_HEADER void acquireSpinLock(void * p 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 */ }