projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #2205, which I introduced recently
[ghc-hetmet.git]
/
includes
/
Rts.h
diff --git
a/includes/Rts.h
b/includes/Rts.h
index
eba8146
..
cec93e6
100644
(file)
--- a/
includes/Rts.h
+++ b/
includes/Rts.h
@@
-18,6
+18,9
@@
extern "C" {
#endif
#include "Stg.h"
#endif
#include "Stg.h"
+// ToDo: move RtsExternal stuff elsewhere
+#include "RtsExternal.h"
+
// Turn off inlining when debugging - it obfuscates things
#ifdef DEBUG
# undef STATIC_INLINE
// Turn off inlining when debugging - it obfuscates things
#ifdef DEBUG
# undef STATIC_INLINE
@@
-165,7
+168,8
@@
TAG_CLOSURE(StgWord tag,StgClosure * p)
/* Parallel information */
#include "Parallel.h"
#include "OSThreads.h"
/* Parallel information */
#include "Parallel.h"
#include "OSThreads.h"
-#include "SMP.h"
+#include "SMPClosureOps.h"
+#include "SpinLock.h"
/* GNU mp library */
#if defined(HAVE_FRAMEWORK_GMP)
/* GNU mp library */
#if defined(HAVE_FRAMEWORK_GMP)
@@
-258,7
+262,11
@@
TICK_VAR(2)
-------------------------------------------------------------------------- */
#ifdef DEBUG
-------------------------------------------------------------------------- */
#ifdef DEBUG
+#if IN_STG_CODE
+#define IF_DEBUG(c,s) if (RtsFlags[0].DebugFlags.c) { s; }
+#else
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
+#endif
#else
#define IF_DEBUG(c,s) doNothing()
#endif
#else
#define IF_DEBUG(c,s) doNothing()
#endif