X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=3c7fcaf41a589510d27702a01428ff209474dc08;hb=f9232b8d6071f163796663ca04d65ec168f739dc;hp=eae83d2dc5fb1647454f998876c442044f8d26f5;hpb=e349469ca9cd46ffcf279bad1819ef6c44dd20bb;p=ghc-hetmet.git diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c index eae83d2..3c7fcaf 100644 --- a/ghc/rts/MBlock.c +++ b/ghc/rts/MBlock.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.c,v 1.18 2000/09/06 11:12:07 rrt Exp $ + * $Id: MBlock.c,v 1.19 2000/12/04 12:31:21 simonmar Exp $ * * (c) The GHC Team 1998-1999 * @@ -39,45 +39,6 @@ #include #endif -#if freebsd2_TARGET_OS || freebsd_TARGET_OS -/* Executable is loaded from 0x0 - * Shared libraries are loaded at 0x2000000 - * Stack is at the top of the address space. The kernel probably owns - * 0x8000000 onwards, so we'll pick 0x5000000. - */ -#define ASK_FOR_MEM_AT 0x50000000 - -#elif netbsd_TARGET_OS -/* NetBSD i386 shared libs are at 0x40000000 - */ -#define ASK_FOR_MEM_AT 0x50000000 -#elif openbsd_TARGET_OS -#define ASK_FOR_MEM_AT 0x50000000 -#elif linux_TARGET_OS -/* Any ideas? - */ -#define ASK_FOR_MEM_AT 0x50000000 - -#elif solaris2_TARGET_OS -/* guess */ -#define ASK_FOR_MEM_AT 0x50000000 - -#elif osf3_TARGET_OS -/* guess */ -#define ASK_FOR_MEM_AT 0x50000000 - -#elif hpux_TARGET_OS -/* guess */ -#define ASK_FOR_MEM_AT 0x50000000 - -#elif _WIN32 -/* doesn't matter, we use a reserve/commit algorithm */ - -#else -#error Dont know where to get memory from on this architecture -/* ToDo: memory locations on other architectures */ -#endif - lnat mblocks_allocated = 0; void * @@ -90,7 +51,7 @@ getMBlock(void) void * getMBlocks(nat n) { - static caddr_t next_request = (caddr_t)ASK_FOR_MEM_AT; + static caddr_t next_request = (caddr_t)HEAP_BASE; caddr_t ret; lnat size = MBLOCK_SIZE * n;