[project @ 2001-08-03 20:40:43 by sof]

[ghc-hetmet.git] / ghc / rts / BlockAlloc.c

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 652b629..6186671 100644 (file)
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.6 1999/07/01 13:48:22 panne Exp $
+ * $Id: BlockAlloc.c,v 1.9 2001/07/23 17:23:19 simonmar Exp $
  *
- * (c) The GHC Team 1998-1999
+ * (c) The GHC Team 1998-2000
  * 
  * The block allocator and free list manager.
  *
@@ -63,6 +63,8 @@ allocGroup(nat n)
   void *mblock;
   bdescr *bd, **last;
 
+  ASSERT(n != 0);
+
   if (n > BLOCKS_PER_MBLOCK) {
     return allocMegaGroup(BLOCKS_TO_MBLOCKS(n));
   }
@@ -73,6 +75,9 @@ allocGroup(nat n)
       *last = bd->link;
       /* no initialisation necessary - this is already a
        * self-contained block group. */
+#ifdef DEBUG
+      bd->free = bd->start;    /* block isn't free now */
+#endif
       return bd;
     }
     if (bd->blocks >  n) {     /* block too big... */
@@ -219,7 +224,7 @@ freeGroup(bdescr *p)
 #ifdef DEBUG
   p->free = (void *)-1;  /* indicates that this block is free */
   p->step = NULL;
-  p->gen  = NULL;
+  p->gen_no = 0;
   /* fill the block group with garbage if sanity checking is on */
   IF_DEBUG(sanity,memset(p->start, 0xaa, p->blocks * BLOCK_SIZE));
 #endif