/* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.15 2003/01/28 17:04:58 simonmar Exp $
*
* (c) The GHC Team 1998-2000
*
Allocation
-------------------------------------------------------------------------- */
-static inline void
+STATIC_INLINE void
initGroup(nat n, bdescr *head)
{
bdescr *bd;
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;
*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... */
* pointer to the newly enlarged group p.
*/
-static inline bdescr *
+STATIC_INLINE bdescr *
coalesce(bdescr *p)
{
bdescr *bd, *q;
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;
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);
}
}
/* 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;
}
}
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) {