[project @ 2000-05-15 12:53:39 by rrt]

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

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 7c7dcae..6819463 100644 (file)
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.4 1999/02/05 16:02:35 simonm Exp $
+ * $Id: BlockAlloc.c,v 1.7 2000/01/30 10:17:44 simonmar Exp $
  *
- * (c) The GHC Team 1998-1999
+ * (c) The GHC Team 1998-2000
  * 
  * The block allocator and free list manager.
  *
@@ -73,6 +73,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... */
@@ -88,8 +91,10 @@ allocGroup(nat n)
   initMBlock(mblock);          /* initialise the start fields */
   bd = FIRST_BDESCR(mblock);
   initGroup(n,bd);             /* we know the group will fit */
-  initGroup(BLOCKS_PER_MBLOCK-n, bd+n);
-  freeGroup(bd+n);             /* add the rest on to the free list */
+  if (n < BLOCKS_PER_MBLOCK) {
+    initGroup(BLOCKS_PER_MBLOCK-n, bd+n);
+    freeGroup(bd+n);           /* add the rest on to the free list */
+  }
   return bd;
 }
 
@@ -126,7 +131,9 @@ allocMegaGroup(nat n)
 
     if (bd->blocks == BLOCKS_PER_MBLOCK) {     /* whole megablock found */
 
-      if (grp_start == NULL) { /* is it the first one we've found? */
+      /* is it the first one we've found or a non-contiguous megablock? */
+      if (grp_start == NULL ||
+          bd->start != last->start + MBLOCK_SIZE/sizeof(W_)) {
        grp_start = bd;
        grp_prev  = last;
        mbs_found = 1;