X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStorage.h;h=caa7c1d16d1f9119c80482cd6edc22956a81ec8a;hb=393f26621b762225b204b3dc78b05a3ecf08871e;hp=ae066c1c9ef5ccf5790ae023d690e6317cf3f2e0;hpb=4e79709df545c16812b85f2c27ab3411f5a7b54f;p=ghc-hetmet.git

diff --git a/includes/Storage.h b/includes/Storage.h
index ae066c1..caa7c1d 100644
--- a/includes/Storage.h
+++ b/includes/Storage.h
@@ -55,7 +55,6 @@
 typedef struct step_ {
     unsigned int         no;		// step number in this generation
     unsigned int         abs_no;	// absolute step number
-    int                  is_compacted;	// compact this step? (old gen only)
 
     struct generation_ * gen;		// generation this step belongs to
     unsigned int         gen_no;        // generation number (cached)
@@ -87,8 +86,12 @@ typedef struct step_ {
                                         //    and scavenged_large_objects
 #endif
 
+    int          mark;			// mark (not copy)? (old gen only)
+    int          compact;		// compact (not sweep)? (old gen only)
+
     bdescr *     old_blocks;	        // bdescr of first from-space block
     unsigned int n_old_blocks;		// number of blocks in from-space
+    unsigned int live_estimate;         // for sweeping: estimate of live data
     
     bdescr *     todos;		        // blocks waiting to be scavenged
     bdescr *     todos_last;
@@ -181,10 +184,10 @@ extern void freeStorage(void);
 
    -------------------------------------------------------------------------- */
 
-extern StgPtr  allocate        ( nat n );
-extern StgPtr  allocateInGen   ( generation *g, nat n );
-extern StgPtr  allocateLocal   ( Capability *cap, nat n );
-extern StgPtr  allocatePinned  ( nat n );
+extern StgPtr  allocate        ( lnat n );
+extern StgPtr  allocateInGen   ( generation *g, lnat n );
+extern StgPtr  allocateLocal   ( Capability *cap, lnat n );
+extern StgPtr  allocatePinned  ( lnat n );
 extern lnat    allocatedBytes  ( void );
 
 extern bdescr * RTS_VAR(small_alloc_list);