X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FBlockAlloc.c;h=baa096a61a8ac570064afc321ede0beca242d550;hb=58150db00f8f75d098b7e9deb5cb5555e8a5ab58;hp=63da2a2b630a80819e7268b2b85f1a6c88887c47;hpb=20593d1d1cf47050d9430895a1c2ada6c39dfb98;p=ghc-hetmet.git

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 63da2a2..baa096a 100644
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.17 2003/11/12 17:49:05 sof Exp $
  *
  * (c) The GHC Team 1998-2000
  * 
@@ -52,7 +51,8 @@ initGroup(nat n, bdescr *head)
 
   if (n != 0) {
     head->blocks = n;
-    head->free = head->start;
+    head->free   = head->start;
+    head->link   = NULL;
     for (i=1, bd = head+1; i < n; i++, bd++) {
       bd->free = 0;
       bd->blocks = 0;
@@ -79,9 +79,8 @@ 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
+      bd->link = NULL;
       return bd;
     }
     if (bd->blocks >  n) {	/* block too big... */
@@ -227,13 +226,12 @@ freeGroup(bdescr *p)
     return;
   }
 
-#ifdef DEBUG
+
   p->free = (void *)-1;  /* indicates that this block is free */
   p->step = 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
 
   /* find correct place in free list to place new group */
   last = NULL;
@@ -262,12 +260,13 @@ static void
 freeMegaGroup(bdescr *p)
 {
   nat n;
+  void *q = p;
 
-  n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
-  for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
-    initMBlock(MBLOCK_ROUND_DOWN(p));
-    initGroup(BLOCKS_PER_MBLOCK, p);
-    freeGroup(p);
+  n = ((bdescr *)q)->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
+  for (; n > 0; q += MBLOCK_SIZE, n--) {
+    initMBlock(MBLOCK_ROUND_DOWN(q));
+    initGroup(BLOCKS_PER_MBLOCK, (bdescr *)q);
+    freeGroup((bdescr *)q);
   }
 }
 
@@ -296,7 +295,7 @@ initMBlock(void *mblock)
 
   /* Initialise the start field of each block descriptor
    */
-  for (; block <= LAST_BLOCK(mblock); bd += 1, (lnat)block += BLOCK_SIZE) {
+  for (; block <= LAST_BLOCK(mblock); bd += 1, block += BLOCK_SIZE) {
     bd->start = block;
   }
 }
@@ -325,8 +324,8 @@ checkFreeListSanity(void)
 
   for (bd = free_list; bd != NULL; bd = bd->link) {
     IF_DEBUG(block_alloc,
-	     fprintf(stderr,"group at 0x%x, length %d blocks\n", 
-		     (nat)bd->start, bd->blocks));
+	     debugBelch("group at 0x%x, length %d blocks\n", 
+			(nat)bd->start, bd->blocks));
     ASSERT(bd->blocks > 0);
     checkWellFormedGroup(bd);
     if (bd->link != NULL) {