X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgStorage.h;h=5c0ca12a5160ee574aab1ab150e26f50d3f92299;hb=fa092c29d011e70a5658e726bbf523149f4dfbe2;hp=86dd60b3d622e24f7a425479cc2bc7534267354f;hpb=30681e796f707fa109aaf756d4586049f595195d;p=ghc-hetmet.git

diff --git a/ghc/includes/StgStorage.h b/ghc/includes/StgStorage.h
index 86dd60b..5c0ca12 100644
--- a/ghc/includes/StgStorage.h
+++ b/ghc/includes/StgStorage.h
@@ -1,9 +1,9 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStorage.h,v 1.6 1999/11/09 15:47:09 simonmar Exp $
+ * $Id: StgStorage.h,v 1.12 2003/03/26 17:40:58 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
- * STG Storage Manger Interface
+ * STG Storage Manager Interface
  *
  * ---------------------------------------------------------------------------*/
 
@@ -48,35 +48,40 @@
  */
 
 typedef struct _step {
-  unsigned int no;		/* step number */
-  bdescr *blocks;		/* blocks in this step */
-  unsigned int n_blocks;	/* number of blocks */
-  struct _step *to;		/* where collected objects from this step go */
-  struct _generation *gen;	/* generation this step belongs to */
-  bdescr *large_objects;	/* large objects (doubly linked) */
+  unsigned int         no;		/* step number */
+  bdescr *             blocks;		/* blocks in this step */
+  unsigned int         n_blocks;	/* number of blocks */
+  struct _step *       to;		/* destination step for live objects */
+  struct _generation * gen;		/* generation this step belongs to */
+  unsigned int         gen_no;          /* generation number (cached) */
+  bdescr *             large_objects;	/* large objects (doubly linked) */
+  unsigned int         n_large_blocks;  /* no. of blocks used by large objs */
+  int                  is_compacted;	/* compact this step? (old gen only) */
 
   /* temporary use during GC: */
-  StgPtr  hp;			/* next free locn in to-space */
-  StgPtr  hpLim;		/* end of current to-space block */
-  bdescr *hp_bd;		/* bdescr of current to-space block */
-  bdescr *to_space;		/* bdescr of first to-space block */
-  unsigned int to_blocks;		/* number of blocks in to-space */
-  bdescr *scan_bd;		/* block currently being scanned */
-  StgPtr  scan;			/* scan pointer in current block */
-  bdescr *new_large_objects;    /* large objects collected so far */
-  bdescr *scavenged_large_objects; /* live large objects after GC (dbl link) */
+  StgPtr       hp;			/* next free locn in to-space */
+  StgPtr       hpLim;			/* end of current to-space block */
+  bdescr *     hp_bd;			/* bdescr of current to-space block */
+  bdescr *     to_blocks;		/* bdescr of first to-space block */
+  unsigned int n_to_blocks;		/* number of blocks in to-space */
+  bdescr *     scan_bd;			/* block currently being scanned */
+  StgPtr       scan;			/* scan pointer in current block */
+  bdescr *     new_large_objects;    	/* large objects collected so far */
+  bdescr *     scavenged_large_objects; /* live large objs after GC (d-link) */
+  unsigned int n_scavenged_large_blocks;/* size of above */
+  bdescr *     bitmap;  		/* bitmap for compacting collection */
 } step;
 
 typedef struct _generation {
-  unsigned int no;		/* generation number */
-  step *steps;			/* steps */
-  unsigned int n_steps;		/* number of steps */
-  unsigned int max_blocks;	/* max blocks in step 0 */
-  StgMutClosure *mut_list;      /* mutable objects in this generation (not G0)*/
-  StgMutClosure *mut_once_list; /* objects that point to younger generations */
+  unsigned int   no;			/* generation number */
+  step *         steps;			/* steps */
+  unsigned int   n_steps;		/* number of steps */
+  unsigned int   max_blocks;		/* max blocks in step 0 */
+  StgMutClosure *mut_list;      	/* mut objects in this gen (not G0)*/
+  StgMutClosure *mut_once_list; 	/* objects that point to younger gens */
 
   /* temporary use during GC: */
-  StgMutClosure *saved_mut_list;
+  StgMutClosure * saved_mut_list;
 
   /* stats information */
   unsigned int collections;
@@ -91,23 +96,26 @@ typedef struct _generation {
 
    CloseNursery(hp)		Closes the allocation area.
 
-   PleaseStopAllocating(void)   Arranges that the next call to
-   				ExtendNursery() will fail, triggering
-				a return to the scheduler.  This is
-				useful for asynchronous interupts etc.
    -------------------------------------------------------------------------- */
 
 #define OpenNursery(hp,hplim)				\
   (hp    = CurrentNursery->free-1,			\
-   hplim = CurrentNursery->start + BLOCK_SIZE_W - 1)
+   hplim = CurrentNursery->start + CurrentNursery->blocks*BLOCK_SIZE_W - 1)
   
 #define CloseNursery(hp)  (CurrentNursery->free = (P_)(hp)+1)
 
 /* -----------------------------------------------------------------------------
+   Prototype for an evacuate-like function
+   -------------------------------------------------------------------------- */
+
+typedef void (*evac_fn)(StgClosure **);
+
+/* -----------------------------------------------------------------------------
    Trigger a GC from Haskell land.
    -------------------------------------------------------------------------- */
 
 extern void performGC(void);
-extern void performGCWithRoots(void (*get_roots)(void));
+extern void performMajorGC(void);
+extern void performGCWithRoots(void (*get_roots)(evac_fn));
 
 #endif /* STGSTORAGE_H */