[project @ 2005-01-28 12:55:17 by simonmar]

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

diff --git a/ghc/includes/SMP.h b/ghc/includes/SMP.h
index fa24798..a1f14e4 100644 (file)
--- a/ghc/includes/SMP.h
+++ b/ghc/includes/SMP.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: SMP.h,v 1.1 1999/11/02 15:05:52 simonmar Exp $
+ * $Id: SMP.h,v 1.5 2005/01/28 12:55:52 simonmar Exp $
  *
  * (c) The GHC Team, 1999
  *
@@ -20,9 +20,7 @@
 
 #if defined(SMP)
 
-#if    defined(INTERPRETER) \
-     || defined(PROFILING)  \
-     || defined(TICKY_TICKY)
+#if  defined(PROFILING)  || defined(TICKY_TICKY)
 #error Build options incompatible with SMP.
 #endif
 
@@ -33,7 +31,7 @@
  * (because another thread is altering it in parallel), we just jump
  * to the new entry point.
  */
-#if defined(i386_TARGET_ARCH) && defined(TABLES_NEXT_TO_CODE)
+#if defined(i386_HOST_ARCH) && defined(TABLES_NEXT_TO_CODE)
 #define CMPXCHG(p, cmp, new)                   \
   __asm__ __volatile__ (                       \
          "lock ; cmpxchg %1, %0\n"             \
@@ -66,25 +64,20 @@
 #define LOCK_CLOSURE(c)                                        \
   ({                                                   \
     const StgInfoTable *__info;                                \
-    __info = &WHITEHOLE_info;                          \
+    __info = &stg_WHITEHOLE_info;                      \
     do {                                               \
       XCHG(__info,((StgClosure *)(c))->header.info);   \
-    } while (__info == &WHITEHOLE_info);               \
+    } while (__info == &stg_WHITEHOLE_info);           \
     __info;                                            \
   })
 
 #define LOCK_THUNK(__info)                             \
-  CMPXCHG(R1.cl->header.info, __info, &WHITEHOLE_info);
-
-#define ACQUIRE_LOCK(mutex) pthread_mutex_lock(mutex);
-#define RELEASE_LOCK(mutex) pthread_mutex_unlock(mutex);
+  CMPXCHG(R1.cl->header.info, __info, &stg_WHITEHOLE_info);
 
 #else /* !SMP */
 
 #define LOCK_CLOSURE(c)     /* nothing */
 #define LOCK_THUNK(__info)  /* nothing */
-#define ACQUIRE_LOCK(mutex) /* nothing */
-#define RELEASE_LOCK(mutex) /* nothing */
 
 #endif /* SMP */