X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fruntime%2Fstorage%2FSMmarkDefs.lh;h=6a0ece5a3fa34dcc3542ebd1807d1c822bbfe956;hb=967cc47f37cb93a5e2b6df7822c9a646f0428247;hp=fccce1aaa25035999b93850695a280b0c9ee0420;hpb=e7d21ee4f8ac907665a7e170c71d59e13a01da09;p=ghc-hetmet.git

diff --git a/ghc/runtime/storage/SMmarkDefs.lh b/ghc/runtime/storage/SMmarkDefs.lh
index fccce1a..6a0ece5 100644
--- a/ghc/runtime/storage/SMmarkDefs.lh
+++ b/ghc/runtime/storage/SMmarkDefs.lh
@@ -9,6 +9,9 @@
 Describe how to set the mark bit for a closure.
 
 \begin{code}
+#ifndef SMMARKDEFS_H
+#define SMMARKDEFS_H
+
 #if defined(GCgn)
 
 #define SET_MARK_BIT(closure) 					\
@@ -239,65 +242,65 @@ a closure.
 Define some debugging macros.
 
 \begin{code}
-#if defined(_GC_DEBUG)
+#if defined(DEBUG)
 
 #define DEBUG_PRSTART(type, ptrsvar) \
-    if (SM_trace & 8)                         \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)                         \
         fprintf(stderr, "PRMark Start (%s): 0x%lx, info 0x%lx ptrs %ld\n", \
                 type, Mark, INFO_PTR(Mark), ptrsvar)
 
 #define DEBUG_PRIN(type, posvar) \
-    if (SM_trace & 8)                     \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)                     \
         fprintf(stderr, "PRRet  In    (%s): 0x%lx, info 0x%lx pos %ld\n", \
                 type, MStack, INFO_PTR(MStack), posvar)
 
 #define DEBUG_PRLAST(type, ptrvar) \
-    if (SM_trace & 8)                       \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)                       \
         fprintf(stderr, "PRRet  Last  (%s): 0x%lx, info 0x%lx ptrs %ld\n", \
                 type, MStack, INFO_PTR(MStack), ptrvar)
 
 #define DEBUG_PR_MARKED \
-    if (SM_trace & 8)   \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)   \
         fprintf(stderr, "PRMark Marked      : 0x%lx, info 0x%lx\n", \
 		Mark, INFO_PTR(Mark))
 
 #define DEBUG_PR_STAT \
-    if (SM_trace & 8) \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING) \
         fprintf(stderr, "PRMark Static      : 0x%lx, info 0x%lx\n", \
 		Mark, INFO_PTR(Mark))
 
 #define DEBUG_PR_IND  \
-    if (SM_trace & 8) \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING) \
         fprintf(stderr, "PRMark Ind : 0x%lx -> PRMark(0x%lx), info 0x%lx\n", \
 		Mark, IND_CLOSURE_PTR(Mark), INFO_PTR(Mark))
 
 #define DEBUG_PR_CAF  \
-    if (SM_trace & 8) \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING) \
         fprintf(stderr, "PRMark Caf : 0x%lx -> PRMark(0x%lx), info 0x%lx\n", \
 		Mark, IND_CLOSURE_PTR(Mark), INFO_PTR(Mark))
 
 #define DEBUG_PR_CONST \
-    if (SM_trace & 8)  \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)  \
         fprintf(stderr, "PRMark Const : 0x%lx -> 0x%lx, info 0x%lx\n", \
 		Mark, CONST_STATIC_CLOSURE(INFO_PTR(Mark)), INFO_PTR(Mark))
 
 #define DEBUG_PR_CHARLIKE \
-    if (SM_trace & 8)  \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)  \
         fprintf(stderr, "PRMark CharLike (%lx) : 0x%lx -> 0x%lx, info 0x%lx\n", \
 		CHARLIKE_VALUE(Mark), Mark, CHARLIKE_CLOSURE(CHARLIKE_VALUE(Mark)), INFO_PTR(Mark))
 
 #define	DEBUG_PR_INTLIKE_TO_STATIC \
-    if (SM_trace & 8)  \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)  \
         fprintf(stderr, "PRMark IntLike to Static (%ld) : 0x%lx -> 0x%lx, info 0x%lx\n", \
 		INTLIKE_VALUE(Mark), Mark, INTLIKE_CLOSURE(INTLIKE_VALUE(Mark)), INFO_PTR(Mark))
 
 #define	DEBUG_PR_INTLIKE_IN_HEAP \
-    if (SM_trace & 8)  \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING)  \
         fprintf(stderr, "PRMark IntLike in Heap   (%ld) : 0x%lx, info 0x%lx\n", \
 		INTLIKE_VALUE(Mark), Mark, INFO_PTR(Mark))
 
 #define DEBUG_PR_OLDIND \
-    if (SM_trace & 8) \
+    if (RTSflags.GcFlags.trace & DEBUG_TRACE_MARKING) \
         fprintf(stderr, "PRMark OldRoot Ind : 0x%lx -> PRMark(0x%lx), info 0x%lx\n", \
 		Mark, IND_CLOSURE_PTR(Mark), INFO_PTR(Mark))
 
@@ -318,5 +321,6 @@ Define some debugging macros.
 
 #endif
 
+#endif /* SMMARKDEFS_H */
 \end{code}