[project @ 2005-02-03 11:21:03 by simonmar]

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

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 2209285..ae87fcc 100644 (file)
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.11 2001/11/08 10:18:49 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  * 
@@ -23,11 +22,13 @@
 #include "BlockAlloc.h"
 #include "MBlock.h"
 
+#include <string.h>
+
 static void    initMBlock(void *mblock);
 static bdescr *allocMegaGroup(nat mblocks);
 static void    freeMegaGroup(bdescr *bd);
 
-static bdescr *free_list;
+static bdescr *free_list = NULL;
 
 /* -----------------------------------------------------------------------------
    Initialisation
@@ -35,14 +36,14 @@ static bdescr *free_list;
 
 void initBlockAllocator(void)
 {
-  free_list = NULL;
+    // The free list starts off NULL
 }
 
 /* -----------------------------------------------------------------------------
    Allocation
    -------------------------------------------------------------------------- */
 
-static inline void
+STATIC_INLINE void
 initGroup(nat n, bdescr *head)
 {
   bdescr *bd;
@@ -192,19 +193,21 @@ allocMegaGroup(nat n)
  * pointer to the newly enlarged group p.
  */
 
-static inline bdescr *
+STATIC_INLINE bdescr *
 coalesce(bdescr *p)
 {
   bdescr *bd, *q;
-  nat i;
+  nat i, blocks;
 
   q = p->link;
   if (q != NULL && p->start + p->blocks * BLOCK_SIZE_W == q->start) {
     /* can coalesce */
     p->blocks += q->blocks;
     p->link    = q->link;
-    for (i = 0, bd = q; i < q->blocks; bd++, i++) {
+    blocks = q->blocks;
+    for (i = 0, bd = q; i < blocks; bd++, i++) {
        bd->free = 0;
+       bd->blocks = 0;
        bd->link = p;
     }
     return p;
@@ -258,12 +261,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((void *)((W_)p & ~MBLOCK_MASK));
-    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);
   }
 }
 
@@ -292,7 +296,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;
   }
 }
@@ -302,6 +306,18 @@ initMBlock(void *mblock)
    -------------------------------------------------------------------------- */
 
 #ifdef DEBUG
+static void
+checkWellFormedGroup( bdescr *bd )
+{
+    nat i;
+
+    for (i = 1; i < bd->blocks; i++) {
+       ASSERT(bd[i].blocks == 0);
+       ASSERT(bd[i].free   == 0);
+       ASSERT(bd[i].link   == bd);
+    }
+}
+
 void
 checkFreeListSanity(void)
 {
@@ -309,9 +325,10 @@ 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) {
       /* make sure we're fully coalesced */
       ASSERT(bd->start + bd->blocks * BLOCK_SIZE_W != bd->link->start);