[project @ 1998-08-24 10:47:52 by sof]

[ghc-hetmet.git] / ghc / includes / GranSim.lh

diff --git a/ghc/includes/GranSim.lh b/ghc/includes/GranSim.lh
index ea92718..2b81dea 100644 (file)
--- a/ghc/includes/GranSim.lh
+++ b/ghc/includes/GranSim.lh
@@ -40,7 +40,7 @@ ullong msTime(STG_NO_ARGS);
 
 #if defined(GRAN)
 
-#if !defined(COMPILING_GHC)
+#if !defined(COMPILING_NCG)
 #include "RtsFlags.h"
 #endif
 
@@ -384,11 +384,11 @@ void PerformReschedule              PROTO((W_, rtsBool));
 #define GRAN_FETCH()                      /*nothing */
 
 #define GRAN_FETCH_AND_RESCHEDULE(liveness_mask,reenter)       \
-       do { if(liveness_mask&LIVENESS_R1)                      \
-            SaveAllStgRegs();                                  \
-             GranSimFetch(Node);                               \
-            PerformReschedule(liveness_mask,reenter);          \
-            RestoreAllStgRegs();                               \
+       do { if(liveness_mask&LIVENESS_R1){                     \
+             SaveAllStgRegs();                                 \
+              GranSimFetch(Node);                              \
+             PerformReschedule(liveness_mask,reenter);         \
+             RestoreAllStgRegs();}                             \
           } while(0)
 
 #define GRAN_RESCHEDULE(liveness_mask,reenter)  GRAN_FETCH_AND_RESCHEDULE(liveness_mask,reenter)