[project @ 1996-07-25 20:43:49 by partain]

[ghc-hetmet.git] / ghc / runtime / storage / SMmarking.lc

diff --git a/ghc/runtime/storage/SMmarking.lc b/ghc/runtime/storage/SMmarking.lc
index d1eb76e..7297222 100644 (file)
--- a/ghc/runtime/storage/SMmarking.lc
+++ b/ghc/runtime/storage/SMmarking.lc
@@ -47,12 +47,10 @@ EXTDATA(_PRMarking_MarkNextClosureInFetchBuffer_closure);
 EXTFUN(_PRMarking_MarkNextGA);
 EXTDATA(_PRMarking_MarkNextGA_closure);
 #else
 EXTFUN(_PRMarking_MarkNextGA);
 EXTDATA(_PRMarking_MarkNextGA_closure);
 #else

-# if 1 /* !defined(GRAN) */ /* HWL */

 EXTFUN(_PRMarking_MarkNextAStack);
 EXTFUN(_PRMarking_MarkNextBStack);
 EXTDATA(_PRMarking_MarkNextAStack_closure);
 EXTDATA(_PRMarking_MarkNextBStack_closure);
 EXTFUN(_PRMarking_MarkNextAStack);
 EXTFUN(_PRMarking_MarkNextBStack);
 EXTDATA(_PRMarking_MarkNextAStack_closure);
 EXTDATA(_PRMarking_MarkNextBStack_closure);

-# endif

 #endif /* not parallel */
 
 P_ sm_roots_end;
 #endif /* not parallel */
 
 P_ sm_roots_end;

@@ -157,7 +155,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
     } while (!found && MRoot != NULL);
 
     DEBUG_STRING("Marking Sparks (GRAN):");
     } while (!found && MRoot != NULL);
 
     DEBUG_STRING("Marking Sparks (GRAN):");

-    /* ToDo: Check this code */

     for(proc = 0; proc < RTSflags.GranFlags.proc; ++proc) {
       for(pool = 0; pool < SPARK_POOLS; pool++) {
         MRoot = (P_) PendingSparksHd[proc][pool];
     for(proc = 0; proc < RTSflags.GranFlags.proc; ++proc) {
       for(pool = 0; pool < SPARK_POOLS; pool++) {
         MRoot = (P_) PendingSparksHd[proc][pool];

@@ -195,7 +192,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
        miniInterpret((StgFunPtr) _startMarkWorld);
     }
 #else
        miniInterpret((StgFunPtr) _startMarkWorld);
     }
 #else

-# if 1  /* !defined(GRAN) */  /* HWL */

     /* Note: no *external* stacks in parallel/concurrent world */
 
     DEBUG_STRING("Marking A Stack:");
     /* Note: no *external* stacks in parallel/concurrent world */
 
     DEBUG_STRING("Marking A Stack:");

@@ -214,7 +210,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
        MStack = (P_) _PRMarking_MarkNextBStack_closure;
        miniInterpret((StgFunPtr)_startMarkWorld);
     }
        MStack = (P_) _PRMarking_MarkNextBStack_closure;
        miniInterpret((StgFunPtr)_startMarkWorld);
     }

-# endif /* ! CONCURRENT */

 #endif /* PAR */
 
     DEBUG_STRING("Marking & Updating CAFs:");
 #endif /* PAR */
 
     DEBUG_STRING("Marking & Updating CAFs:");