[project @ 2002-12-19 14:33:22 by simonmar]

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

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index d0cbb1e..137796f 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.65 2002/04/30 09:26:14 simonmar Exp $
+ * $Id: Storage.c,v 1.73 2002/12/19 14:33:23 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -26,26 +26,12 @@
 
 #include "RetainerProfile.h"   // for counting memory blocks (memInventory)
 
-#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
+#include <stdlib.h>
+#include <string.h>
 
 StgClosure    *caf_list         = NULL;
 
 bdescr *small_alloc_list;      /* allocate()d small objects */
-bdescr *large_alloc_list;      /* allocate()d large objects */
 bdescr *pinned_object_block;    /* allocate pinned objects into this block */
 nat alloc_blocks;              /* number of allocate()d blocks since GC */
 nat alloc_blocks_lim;          /* approximate limit on alloc_blocks */
@@ -82,29 +68,12 @@ 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
+    /* Sanity check to make sure the LOOKS_LIKE_ macros appear to be
+     * doing something reasonable.
      */
-  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);
-  }
+    ASSERT(LOOKS_LIKE_INFO_PTR(&stg_BLACKHOLE_info));
+    ASSERT(LOOKS_LIKE_CLOSURE_PTR(&stg_dummy_ret_closure));
+    ASSERT(!HEAP_ALLOCED(&stg_dummy_ret_closure));
 
   if (RtsFlags.GcFlags.maxHeapSize != 0 &&
       RtsFlags.GcFlags.heapSizeSuggestion > 
@@ -228,7 +197,6 @@ initStorage( void )
    
   /* initialise the allocate() interface */
   small_alloc_list = NULL;
-  large_alloc_list = NULL;
   alloc_blocks = 0;
   alloc_blocks_lim = RtsFlags.GcFlags.minAllocAreaSize;
 
@@ -301,15 +269,9 @@ newCAF(StgClosure* caf)
    */
   ACQUIRE_SM_LOCK;
 
-  if (is_dynamically_loaded_rwdata_ptr((StgPtr)caf)) {
-      ((StgIndStatic *)caf)->saved_info  = (StgInfoTable *)caf->header.info;
-      ((StgIndStatic *)caf)->static_link = caf_list;
-      caf_list = caf;
-  } else {
-      ((StgIndStatic *)caf)->saved_info = NULL;
-      ((StgMutClosure *)caf)->mut_link = oldest_gen->mut_once_list;
-      oldest_gen->mut_once_list = (StgMutClosure *)caf;
-  }
+  ((StgIndStatic *)caf)->saved_info = NULL;
+  ((StgMutClosure *)caf)->mut_link = oldest_gen->mut_once_list;
+  oldest_gen->mut_once_list = (StgMutClosure *)caf;
 
   RELEASE_SM_LOCK;
 
@@ -323,6 +285,25 @@ newCAF(StgClosure* caf)
 #endif /* PAR */
 }
 
+// An alternate version of newCaf which is used for dynamically loaded
+// object code in GHCi.  In this case we want to retain *all* CAFs in
+// the object code, because they might be demanded at any time from an
+// expression evaluated on the command line.
+//
+// The linker hackily arranges that references to newCaf from dynamic
+// code end up pointing to newDynCAF.
+void
+newDynCAF(StgClosure *caf)
+{
+    ACQUIRE_SM_LOCK;
+
+    ((StgIndStatic *)caf)->saved_info  = (StgInfoTable *)caf->header.info;
+    ((StgIndStatic *)caf)->static_link = caf_list;
+    caf_list = caf;
+
+    RELEASE_SM_LOCK;
+}
+
 /* -----------------------------------------------------------------------------
    Nursery management.
    -------------------------------------------------------------------------- */
@@ -532,7 +513,25 @@ allocate( nat n )
 lnat
 allocated_bytes( void )
 {
-  return (alloc_blocks * BLOCK_SIZE_W - (alloc_HpLim - alloc_Hp));
+    lnat allocated;
+
+    allocated = alloc_blocks * BLOCK_SIZE_W - (alloc_HpLim - alloc_Hp);
+    if (pinned_object_block != NULL) {
+       allocated -= (pinned_object_block->start + BLOCK_SIZE_W) - 
+           pinned_object_block->free;
+    }
+       
+    return allocated;
+}
+
+void
+tidyAllocateLists (void)
+{
+    if (small_alloc_list != NULL) {
+       ASSERT(alloc_Hp >= small_alloc_list->start && 
+              alloc_Hp <= small_alloc_list->start + BLOCK_SIZE);
+       small_alloc_list->free = alloc_Hp;
+    }
 }
 
 /* ---------------------------------------------------------------------------
@@ -618,10 +617,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. */
@@ -826,9 +823,6 @@ memInventory(void)
   for (bd = small_alloc_list; bd; bd = bd->link) {
     total_blocks += bd->blocks;
   }
-  for (bd = large_alloc_list; bd; bd = bd->link) {
-    total_blocks += bd->blocks;
-  }
 
 #ifdef PROFILING
   if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_RETAINER) {