/* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.14 2002/07/17 09:21:49 simonmar Exp $
+ * $Id: BlockAlloc.c,v 1.18 2004/09/03 15:28:19 simonmar Exp $
*
* (c) The GHC Team 1998-2000
*
static bdescr *allocMegaGroup(nat mblocks);
static void freeMegaGroup(bdescr *bd);
-static bdescr *free_list;
+static bdescr *free_list = NULL;
/* -----------------------------------------------------------------------------
Initialisation
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;
* pointer to the newly enlarged group p.
*/
-static inline bdescr *
+STATIC_INLINE bdescr *
coalesce(bdescr *p)
{
bdescr *bd, *q;
n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
- initMBlock((void *)((W_)p & ~MBLOCK_MASK));
+ initMBlock(MBLOCK_ROUND_DOWN(p));
initGroup(BLOCKS_PER_MBLOCK, p);
freeGroup(p);
}
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) {