X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=b0bd3c975824b127f090ac04cba18bade3172c66;hb=1041f9abb1e0c117dab3b1f7e3e1960dfb0efe0d;hp=2626304bd3fe0081c23aa72edc98b2de03773ed0;hpb=5c633f42b55cb4d7851e6c6e80532acc232e8f42;p=ghc-hetmet.git diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c index 2626304..b0bd3c9 100644 --- a/ghc/rts/MBlock.c +++ b/ghc/rts/MBlock.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.c,v 1.12 1999/09/16 08:37:08 sof Exp $ + * $Id: MBlock.c,v 1.24 2001/10/26 11:49:19 sewardj Exp $ * * (c) The GHC Team 1998-1999 * @@ -9,7 +9,8 @@ * * ---------------------------------------------------------------------------*/ -#define NON_POSIX_SOURCE +/* This is non-posix compliant. */ +/* #include "PosixSource.h" */ #include "Rts.h" #include "RtsUtils.h" @@ -39,39 +40,6 @@ #include #endif -#if freebsd2_TARGET_OS || freebsd3_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 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 * @@ -84,7 +52,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; @@ -98,6 +66,9 @@ getMBlocks(nat n) #elif hpux_TARGET_OS ret = mmap(next_request, size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); +#elif macosx_TARGET_OS + ret = mmap(next_request, size, PROT_READ | PROT_WRITE, + MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); #else ret = mmap(next_request, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); @@ -112,10 +83,10 @@ getMBlocks(nat n) } if (((W_)ret & MBLOCK_MASK) != 0) { - barf("GetMBlock: misaligned block returned"); + barf("GetMBlock: misaligned block %p returned when allocating %d megablock(s) at %p", ret, n, next_request); } - IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at %x\n",n,(nat)ret)); + IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at %p\n",n,ret)); next_request += size; @@ -144,15 +115,16 @@ getMBlocks(nat n) char* base_non_committed = (char*)0; -/* Reserve VM 128M at the time to try to minimise the slop cost. */ -#define SIZE_RESERVED_POOL ( 128 * 1024 * 1024 ) +/* Reserve VM 256M at the time to try to minimise the slop cost. */ +#define SIZE_RESERVED_POOL ( 256 * 1024 * 1024 ) /* This predicate should be inlined, really. */ +/* TODO: this only works for a single chunk */ int is_heap_alloced(const void* x) { return (((char*)(x) >= base_non_committed) && - ((char*)(x) <= (base_non_committed + 128 * 1024 * 1024))); + ((char*)(x) <= (base_non_committed + SIZE_RESERVED_POOL))); } void * @@ -166,28 +138,26 @@ getMBlocks(nat n) if ( (base_non_committed == 0) || (next_request + size > base_non_committed + SIZE_RESERVED_POOL) ) { + if (base_non_committed) + barf("Windows programs can only use 256Mb of heap; sorry!"); base_non_committed = VirtualAlloc ( NULL , SIZE_RESERVED_POOL , MEM_RESERVE , PAGE_READWRITE ); if ( base_non_committed == 0 ) { -# if 1 /*def DEBUG*/ - fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %d\n", GetLastError()); -# endif + fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); ret=(void*)-1; } else { /* The returned pointer is not aligned on a mega-block boundary. Make it. */ base_mblocks = (char*)((unsigned long)base_non_committed & (unsigned long)0xfff00000) + MBLOCK_SIZE; -# if 0 - fprintf(stderr, "Dropping %d bytes off of 128M chunk\n", +# if 0 + fprintf(stderr, "getMBlocks: Dropping %d bytes off of 256M chunk\n", (unsigned)base_mblocks - (unsigned)base_non_committed); -# endif +# endif if ( ((char*)base_mblocks + size) > ((char*)base_non_committed + SIZE_RESERVED_POOL) ) { -# if 1 /*def DEBUG*/ - fprintf(stderr, "oops, committed too small a region to start with."); -# endif + fprintf(stderr, "getMBlocks: oops, committed too small a region to start with."); ret=(void*)-1; } else { next_request = base_mblocks; @@ -198,19 +168,20 @@ getMBlocks(nat n) if ( ret != (void*)-1 ) { ret = VirtualAlloc(next_request, size, MEM_COMMIT, PAGE_READWRITE); if (ret == NULL) { -# if 1 /*def DEBUG*/ - fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %d\n", GetLastError()); -# endif + fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); ret=(void*)-1; } } if (((W_)ret & MBLOCK_MASK) != 0) { - barf("GetMBlock: misaligned block returned"); + barf("getMBlocks: misaligned block returned"); } - IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at %x\n",n,(nat)ret)); + if (ret == (void*)-1) { + barf("getMBlocks: unknown memory allocation failure on Win32."); + } + IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at 0x%x\n",n,(nat)ret)); next_request = (char*)next_request + size; mblocks_allocated += n; @@ -233,9 +204,9 @@ freeMBlock(void* p, nat n) rc = VirtualFree(p, n * MBLOCK_SIZE , MEM_DECOMMIT ); if (rc == FALSE) { -# ifdef DEBUG +# ifdef DEBUG fprintf(stderr, "freeMBlocks: VirtualFree failed with: %d\n", GetLastError()); -# endif +# endif } }