X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FGCUtils.c;fp=rts%2Fsm%2FGCUtils.c;h=6a4596e0e2a4de3d8096bf0b67fbf0da43969b46;hb=aa8efe32ce8eebc2fe25f13a11cf214cdcac229f;hp=2a31e2358b2e565be02b9946e7f3e0b802fb83d1;hpb=30387408c5e471e8f8ff61f80754ad2c07880a7d;p=ghc-hetmet.git

diff --git a/rts/sm/GCUtils.c b/rts/sm/GCUtils.c
index 2a31e23..6a4596e 100644
--- a/rts/sm/GCUtils.c
+++ b/rts/sm/GCUtils.c
@@ -35,6 +35,7 @@ allocBlock_sync(void)
 }
 
 
+#if 0
 static void
 allocBlocks_sync(nat n, bdescr **hd, bdescr **tl, 
                  nat gen_no, step *stp,
@@ -56,6 +57,7 @@ allocBlocks_sync(nat n, bdescr **hd, bdescr **tl,
     *tl = &bd[n-1];
     RELEASE_SPIN_LOCK(&gc_alloc_block_sync);
 }
+#endif
 
 void
 freeChain_sync(bdescr *bd)
@@ -204,7 +206,7 @@ todo_block_full (nat size, step_workspace *ws)
 StgPtr
 alloc_todo_block (step_workspace *ws, nat size)
 {
-    bdescr *bd, *hd, *tl;
+    bdescr *bd/*, *hd, *tl*/;
 
     // Grab a part block if we have one, and it has enough room
     if (ws->part_list != NULL && 
@@ -216,14 +218,22 @@ alloc_todo_block (step_workspace *ws, nat size)
     }
     else
     {
-        allocBlocks_sync(4, &hd, &tl, 
-                         ws->step->gen_no, ws->step, BF_EVACUATED);
-
-        tl->link = ws->part_list;
-        ws->part_list = hd->link;
-        ws->n_part_blocks += 3;
-
-        bd = hd;
+        // blocks in to-space get the BF_EVACUATED flag.
+
+//        allocBlocks_sync(4, &hd, &tl, 
+//                         ws->step->gen_no, ws->step, BF_EVACUATED);
+//
+//        tl->link = ws->part_list;
+//        ws->part_list = hd->link;
+//        ws->n_part_blocks += 3;
+//
+//        bd = hd;
+
+        bd = allocBlock_sync();
+        bd->step = ws->step;
+        bd->gen_no = ws->step->gen_no;
+        bd->flags = BF_EVACUATED;
+        bd->u.scan = bd->free = bd->start;
     }
 
     bd->link = NULL;