projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[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
0f15aa0
..
a1f14e4
100644
(file)
--- a/
ghc/includes/SMP.h
+++ b/
ghc/includes/SMP.h
@@
-1,5
+1,5
@@
/* ----------------------------------------------------------------------------
/* ----------------------------------------------------------------------------
- * $Id: SMP.h,v 1.3 2001/02/09 13:09:17 simonmar Exp $
+ * $Id: SMP.h,v 1.5 2005/01/28 12:55:52 simonmar Exp $
*
* (c) The GHC Team, 1999
*
*
* (c) The GHC Team, 1999
*
@@
-31,7
+31,7
@@
* (because another thread is altering it in parallel), we just jump
* to the new entry point.
*/
* (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" \
#define CMPXCHG(p, cmp, new) \
__asm__ __volatile__ ( \
"lock ; cmpxchg %1, %0\n" \
@@
-74,15
+74,10
@@
#define LOCK_THUNK(__info) \
CMPXCHG(R1.cl->header.info, __info, &stg_WHITEHOLE_info);
#define LOCK_THUNK(__info) \
CMPXCHG(R1.cl->header.info, __info, &stg_WHITEHOLE_info);
-#define ACQUIRE_LOCK(mutex) pthread_mutex_lock(mutex);
-#define RELEASE_LOCK(mutex) pthread_mutex_unlock(mutex);
-
#else /* !SMP */
#define LOCK_CLOSURE(c) /* nothing */
#define LOCK_THUNK(__info) /* nothing */
#else /* !SMP */
#define LOCK_CLOSURE(c) /* nothing */
#define LOCK_THUNK(__info) /* nothing */
-#define ACQUIRE_LOCK(mutex) /* nothing */
-#define RELEASE_LOCK(mutex) /* nothing */
#endif /* SMP */
#endif /* SMP */