[project @ 2004-07-21 10:47:28 by simonmar]

[ghc-hetmet.git] / ghc / rts / StoragePriv.h

diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h
index 033b06c..c829e78 100644 (file)
--- a/ghc/rts/StoragePriv.h
+++ b/ghc/rts/StoragePriv.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StoragePriv.h,v 1.19 2001/11/08 12:46:31 simonmar Exp $
+ * $Id: StoragePriv.h,v 1.26 2004/07/21 10:47:29 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -21,6 +21,7 @@ extern step *g0s0;
 extern generation *oldest_gen;
 
 extern void newCAF(StgClosure*);
+extern void newDynCAF(StgClosure *);
 
 extern void move_TSO(StgTSO *src, StgTSO *dest);
 extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff);
@@ -28,9 +29,13 @@ extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff);
 extern StgClosure *static_objects;
 extern StgClosure *scavenged_static_objects;
 
+extern StgWeak *old_weak_ptr_list;
+
 extern StgWeak    *weak_ptr_list;
 extern StgClosure *caf_list;
 
+extern StgTSO *resurrected_threads;
+
 extern bdescr *small_alloc_list;
 extern bdescr *large_alloc_list;
 extern bdescr *pinned_object_block;
@@ -43,20 +48,21 @@ extern bdescr *nursery;
 extern nat alloc_blocks;
 extern nat alloc_blocks_lim;
 
-extern lnat total_allocated;
+extern ullong total_allocated;
 
 /* Nursery manipulation */
 extern void     allocNurseries ( void );
 extern void     resetNurseries ( void );
 extern bdescr * allocNursery   ( bdescr *last_bd, nat blocks );
 extern void     resizeNursery  ( nat blocks );
+extern void     tidyAllocateLists ( void );
 
 /* Stats 'n' stuff */
 extern lnat calcAllocated  ( void );
 extern lnat calcLive       ( void );
 extern lnat calcNeeded     ( void );
 
-static inline void
+INLINE_HEADER void
 dbl_link_onto(bdescr *bd, bdescr **list)
 {
   bd->link = *list;
@@ -79,16 +85,6 @@ extern void checkSanity(void);
 extern nat  countBlocks(bdescr *);
 #endif
 
-/* 
- * These three are used by the garbage collector when we have
- * dynamically-linked object modules.  (see ClosureMacros.h,
- * IS_CODE_PTR etc.). 
- * Defined in Linker.c.
- */
-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 * );