X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMBlock.c;h=76645e25d42011adb854ed6550734e20edda7879;hb=35a38acc6010d97b349092f9179c14d18f129e9b;hp=fa8fd49d886daa62d1f8e71d7d8c31b7cc32959e;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/rts/MBlock.c b/rts/MBlock.c index fa8fd49..76645e2 100644 --- a/rts/MBlock.c +++ b/rts/MBlock.c @@ -16,6 +16,7 @@ #include "RtsFlags.h" #include "MBlock.h" #include "BlockAlloc.h" +#include "Trace.h" #ifdef HAVE_STDLIB_H #include @@ -287,7 +288,7 @@ getMBlocks(nat n) // ToDo: check that we haven't already grabbed the memory at next_request next_request = ret + size; - IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at %p\n",n,ret)); + debugTrace(DEBUG_gc, "allocated %d megablock(s) at %p",n,ret); // fill in the table for (i = 0; i < n; i++) { @@ -394,15 +395,15 @@ getMBlocks(nat n) } } - if (((W_)ret & MBLOCK_MASK) != 0) { - barf("getMBlocks: misaligned block returned"); - } - if (ret == (void*)-1) { barf("getMBlocks: unknown memory allocation failure on Win32."); } - IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at 0x%x\n",n,(nat)ret)); + if (((W_)ret & MBLOCK_MASK) != 0) { + barf("getMBlocks: misaligned block returned"); + } + + debugTrace(DEBUG_gc, "allocated %d megablock(s) at 0x%x",n,(nat)ret); next_request = (char*)next_request + size; mblocks_allocated += n;