[project @ 2003-01-29 10:28:56 by simonmar]

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

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index 911e432..a1bfc5e 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.69 2002/10/15 11:02:32 simonmar Exp $
+ * $Id: Storage.c,v 1.75 2003/01/29 10:28:56 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -29,22 +29,6 @@
 #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 */
@@ -55,10 +39,10 @@ nat alloc_blocks_lim;               /* approximate limit on alloc_blocks */
 StgPtr alloc_Hp    = NULL;     /* next free byte in small_alloc_list */
 StgPtr alloc_HpLim = NULL;     /* end of block at small_alloc_list   */
 
-generation *generations;       /* all the generations */
-generation *g0;                        /* generation 0, for convenience */
-generation *oldest_gen;                /* oldest generation, for convenience */
-step *g0s0;                    /* generation 0, step 0, for convenience */
+generation *generations = NULL;        /* all the generations */
+generation *g0         = NULL; /* generation 0, for convenience */
+generation *oldest_gen  = NULL; /* oldest generation, for convenience */
+step *g0s0             = NULL; /* generation 0, step 0, for convenience */
 
 lnat total_allocated = 0;      /* total memory allocated during run */
 
@@ -84,29 +68,17 @@ initStorage( void )
   step *stp;
   generation *gen;
 
-#if defined(darwin_TARGET_OS)
-    macosx_get_memory_layout();
-#endif
+  if (generations != NULL) {
+      // multi-init protection
+      return;
+  }
 
-    /* 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 > 
@@ -302,15 +274,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;
 
@@ -324,6 +290,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.
    -------------------------------------------------------------------------- */
@@ -498,7 +483,7 @@ allocate( nat n )
     bd->gen_no  = 0;
     bd->step = g0s0;
     bd->flags = BF_LARGE;
-    bd->free = bd->start;
+    bd->free = bd->start + n;
     /* don't add these blocks to alloc_blocks, since we're assuming
      * that large objects are likely to remain live for quite a while
      * (eg. running threads), so garbage collecting early won't make
@@ -544,6 +529,16 @@ allocated_bytes( void )
     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;
+    }
+}
+
 /* ---------------------------------------------------------------------------
    Allocate a fixed/pinned object.