X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStoragePriv.h;h=033b06cf4242cecfd0e0473d8712d8eedf0f8e42;hb=7fe540d8c382712d2eab02a05556ed168311ae2e;hp=bcd221c82c3ac38cab8c0f7b2e4a99ec96b03ff5;hpb=9ac55e08e159d7a4647ab01e7872e69dd762f275;p=ghc-hetmet.git

diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h
index bcd221c..033b06c 100644
--- a/ghc/rts/StoragePriv.h
+++ b/ghc/rts/StoragePriv.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StoragePriv.h,v 1.13 2000/12/04 12:31:22 simonmar Exp $
+ * $Id: StoragePriv.h,v 1.19 2001/11/08 12:46:31 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -10,6 +10,8 @@
 #ifndef STORAGEPRIV_H
 #define STORAGEPRIV_H
 
+#include <stddef.h>
+
 #define END_OF_STATIC_LIST stgCast(StgClosure*,1)
 
 extern generation *generations;
@@ -19,20 +21,25 @@ extern step *g0s0;
 extern generation *oldest_gen;
 
 extern void newCAF(StgClosure*);
-extern StgTSO *relocate_TSO(StgTSO *src, StgTSO *dest);
+
+extern void move_TSO(StgTSO *src, StgTSO *dest);
+extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff);
+
+extern StgClosure *static_objects;
+extern StgClosure *scavenged_static_objects;
 
 extern StgWeak    *weak_ptr_list;
 extern StgClosure *caf_list;
 
 extern bdescr *small_alloc_list;
 extern bdescr *large_alloc_list;
+extern bdescr *pinned_object_block;
 
 extern StgPtr alloc_Hp;
 extern StgPtr alloc_HpLim;
 
 extern bdescr *nursery;
 
-extern nat nursery_blocks;
 extern nat alloc_blocks;
 extern nat alloc_blocks_lim;
 
@@ -53,9 +60,9 @@ static inline void
 dbl_link_onto(bdescr *bd, bdescr **list)
 {
   bd->link = *list;
-  bd->back = NULL;
+  bd->u.back = NULL;
   if (*list) {
-    (*list)->back = bd; /* double-link the list */
+    (*list)->u.back = bd; /* double-link the list */
   }
   *list = bd;
 }
@@ -68,7 +75,8 @@ dbl_link_onto(bdescr *bd, bdescr **list)
 
 #ifdef DEBUG
 extern void memInventory(void);
-extern void checkSanity(nat N);
+extern void checkSanity(void);
+extern nat  countBlocks(bdescr *);
 #endif
 
 /* 
@@ -77,8 +85,14 @@ extern void checkSanity(nat N);
  * IS_CODE_PTR etc.). 
  * Defined in Linker.c.
  */
-int is_dynamically_loaded_code_or_rodata_ptr ( char* p );
-int is_dynamically_loaded_rwdata_ptr ( char* p );
-int is_not_dynamically_loaded_ptr ( char* p );
+int is_dynamically_loaded_code_or_rodata_ptr ( void* p );
+int is_dynamically_loaded_rwdata_ptr         ( void* p );
+int is_not_dynamically_loaded_ptr            ( void* p );
+
+/* Functions from GC.c 
+ */
+extern void         threadPaused ( StgTSO * );
+extern StgClosure * isAlive      ( StgClosure *p );
+extern void         markCAFs     ( evac_fn evac );
 
 #endif /* STORAGEPRIV_H */