X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStoragePriv.h;h=556c6129dbc92e9218f3ba572ed514a3183e3106;hb=371b4d98a140f98a05633106076b36b993a586cf;hp=033b06cf4242cecfd0e0473d8712d8eedf0f8e42;hpb=0671ef05dd65137d501cb97f0e42be3b78d4004d;p=ghc-hetmet.git diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h index 033b06c..556c612 100644 --- 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.24 2002/12/19 14:33:23 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; @@ -50,6 +55,7 @@ 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 ); @@ -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 * );