[project @ 2002-07-17 09:21:48 by simonmar]

[ghc-hetmet.git] / ghc / rts / Storage.c

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index f1120b0..f7a321d 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.59 2002/02/04 20:21:22 sof Exp $
+ * $Id: Storage.c,v 1.67 2002/07/17 09:21:51 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -26,6 +26,25 @@
 
 #include "RetainerProfile.h"   // for counting memory blocks (memInventory)
 
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef darwin_TARGET_OS
+#include <mach-o/getsect.h>
+unsigned long macho_etext = 0;
+unsigned long macho_edata = 0;
+
+static void macosx_get_memory_layout(void)
+{
+  struct segment_command *seg;
+
+  seg = getsegbyname("__TEXT");
+  macho_etext = seg->vmaddr + seg->vmsize;
+  seg = getsegbyname("__DATA");
+  macho_edata = seg->vmaddr + seg->vmsize;
+}
+#endif
+
 StgClosure    *caf_list         = NULL;
 
 bdescr *small_alloc_list;      /* allocate()d small objects */
@@ -66,6 +85,30 @@ initStorage( void )
   step *stp;
   generation *gen;
 
+#if defined(darwin_TARGET_OS)
+    macosx_get_memory_layout();
+#endif
+
+    /* Sanity check to make sure we are able to make the distinction
+     * between closures and infotables
+     */
+  if (!LOOKS_LIKE_GHC_INFO(&stg_BLACKHOLE_info)) {
+    barf("LOOKS_LIKE_GHC_INFO+ is incorrectly defined");
+    exit(0);
+  }
+  if (LOOKS_LIKE_GHC_INFO(&stg_dummy_ret_closure)) {
+    barf("LOOKS_LIKE_GHC_INFO- is incorrectly defined");
+    exit(0);
+  }
+  if (LOOKS_LIKE_STATIC_CLOSURE(&stg_BLACKHOLE_info)) {
+    barf("LOOKS_LIKE_STATIC_CLOSURE- is incorrectly defined");
+    exit(0);
+  }
+  if (!LOOKS_LIKE_STATIC_CLOSURE(&stg_dummy_ret_closure)) {
+    barf("LOOKS_LIKE_STATIC_CLOSURE+ is incorrectly defined");
+    exit(0);
+  }
+
   if (RtsFlags.GcFlags.maxHeapSize != 0 &&
       RtsFlags.GcFlags.heapSizeSuggestion > 
       RtsFlags.GcFlags.maxHeapSize) {
@@ -536,6 +579,13 @@ allocatePinned( nat n )
        return allocate(n);
     }
 
+    // we always return 8-byte aligned memory.  bd->free must be
+    // 8-byte aligned to begin with, so we just round up n to
+    // the nearest multiple of 8 bytes.
+    if (sizeof(StgWord) == 4) {
+       n = (n+1) & ~1;
+    }
+
     // If we don't have a block of pinned objects yet, or the current
     // one isn't large enough to hold the new object, allocate a new one.
     if (bd == NULL || (bd->free + n) > (bd->start + BLOCK_SIZE_W)) {
@@ -571,10 +621,8 @@ stgAllocForGMP (size_t size_in_bytes)
   StgArrWords* arr;
   nat data_size_in_words, total_size_in_words;
   
-  /* should be a multiple of sizeof(StgWord) (whole no. of limbs) */
-  ASSERT(size_in_bytes % sizeof(W_) == 0);
-  
-  data_size_in_words  = size_in_bytes / sizeof(W_);
+  /* round up to a whole number of words */
+  data_size_in_words  = (size_in_bytes + sizeof(W_) + 1) / sizeof(W_);
   total_size_in_words = sizeofW(StgArrWords) + data_size_in_words;
   
   /* allocate and fill it in. */