X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgMiscClosures.h;h=a4281c84069b6beb83addb72332d5b2810a95a5c;hb=22584fda405fbf88eed7132d372ce2b404a96329;hp=9ccc5dc3c94e6446b8b516a8b5eb556ff1d1e4ed;hpb=d5a626e4bf05037070bd3812794cf2cabd25f07b;p=ghc-hetmet.git diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h index 9ccc5dc..a4281c8 100644 --- a/ghc/includes/StgMiscClosures.h +++ b/ghc/includes/StgMiscClosures.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: StgMiscClosures.h,v 1.31 2000/12/20 15:26:50 rrt Exp $ + * $Id: StgMiscClosures.h,v 1.40 2001/11/08 12:46:31 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -21,8 +21,8 @@ STGFUN(stg_IND_OLDGEN_entry); STGFUN(stg_IND_OLDGEN_PERM_entry); STGFUN(stg_CAF_UNENTERED_entry); STGFUN(stg_CAF_ENTERED_entry); -STGFUN(stg_CAF_BLACKHOLE_entry); STGFUN(stg_BLACKHOLE_entry); +STGFUN(stg_CAF_BLACKHOLE_entry); STGFUN(stg_BLACKHOLE_BQ_entry); #ifdef SMP STGFUN(stg_WHITEHOLE_entry); @@ -34,9 +34,7 @@ STGFUN(stg_SE_CAF_BLACKHOLE_entry); #if defined(PAR) || defined(GRAN) STGFUN(stg_RBH_entry); #endif -#ifdef GHCI STGFUN(stg_BCO_entry); -#endif STGFUN(stg_EVACUATED_entry); STGFUN(stg_FOREIGN_entry); STGFUN(stg_WEAK_entry); @@ -55,7 +53,6 @@ STGFUN(stg_MUT_CONS_entry); STGFUN(stg_END_MUT_LIST_entry); STGFUN(stg_dummy_ret_entry); -#ifdef GHCI /* entry code for constructors created by the bytecode interpreter */ STGFUN(stg_interp_constr_entry); STGFUN(stg_interp_constr1_entry); @@ -68,24 +65,30 @@ STGFUN(stg_interp_constr7_entry); STGFUN(stg_interp_constr8_entry); /* Magic glue code for when compiled code returns a value in R1/F1/D1 - to the interpreter. */ -extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1_info; + or a VoidRep to the interpreter. */ +extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1p_info; +extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1n_info; extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_F1_info; extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_D1_info; +extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_V_info; /* Used by the interpreter to return an unboxed value on the stack to compiled code. */ -extern DLL_IMPORT_RTS const StgInfoTable stg_gc_unbx_r1_info; -extern DLL_IMPORT_RTS const StgInfoTable stg_gc_f1_info; -extern DLL_IMPORT_RTS const StgInfoTable stg_gc_d1_info; -#endif +extern DLL_IMPORT_RTS const StgInfoTable stg_gc_unbx_r1_ret_info; +extern DLL_IMPORT_RTS const StgInfoTable stg_gc_f1_ret_info; +extern DLL_IMPORT_RTS const StgInfoTable stg_gc_d1_ret_info; +/* this is the NIL ptr for a TSO queue (e.g. runnable queue) */ +#define END_TSO_QUEUE ((StgTSO *)(void*)&stg_END_TSO_QUEUE_closure) +/* this is the NIL ptr for a list CAFs */ +#define END_ECAF_LIST ((StgCAF *)(void*)&stg_END_TSO_QUEUE_closure) #if defined(PAR) || defined(GRAN) /* this is the NIL ptr for a blocking queue */ -# define END_BQ_QUEUE ((StgBlockingQueueElement *)(void*)&END_TSO_QUEUE_closure) +# define END_BQ_QUEUE ((StgBlockingQueueElement *)(void*)&stg_END_TSO_QUEUE_closure) /* this is the NIL ptr for a blocked fetch queue (as in PendingFetches in GUM) */ -# define END_BF_QUEUE ((StgBlockedFetch *)(void*)&END_TSO_QUEUE_closure) +# define END_BF_QUEUE ((StgBlockedFetch *)(void*)&stg_END_TSO_QUEUE_closure) #endif +/* ToDo?: different name for end of sleeping queue ? -- HWL */ /* info tables */ @@ -96,8 +99,8 @@ extern DLL_IMPORT_RTS const StgInfoTable stg_IND_OLDGEN_info; extern DLL_IMPORT_RTS const StgInfoTable stg_IND_OLDGEN_PERM_info; extern DLL_IMPORT_RTS const StgInfoTable stg_CAF_UNENTERED_info; extern DLL_IMPORT_RTS const StgInfoTable stg_CAF_ENTERED_info; -extern DLL_IMPORT_RTS const StgInfoTable stg_CAF_BLACKHOLE_info; extern DLL_IMPORT_RTS const StgInfoTable stg_BLACKHOLE_info; +extern DLL_IMPORT_RTS const StgInfoTable stg_CAF_BLACKHOLE_info; extern DLL_IMPORT_RTS const StgInfoTable stg_BLACKHOLE_BQ_info; #ifdef SMP extern DLL_IMPORT_RTS const StgInfoTable stg_WHITEHOLE_info; @@ -109,6 +112,9 @@ extern DLL_IMPORT_RTS const StgInfoTable stg_SE_CAF_BLACKHOLE_info; #if defined(PAR) || defined(GRAN) extern DLL_IMPORT_RTS const StgInfoTable stg_RBH_info; #endif +#if defined(PAR) +extern DLL_IMPORT_RTS const StgInfoTable stg_FETCH_ME_BQ_info; +#endif extern DLL_IMPORT_RTS const StgInfoTable stg_BCO_info; extern DLL_IMPORT_RTS const StgInfoTable stg_EVACUATED_info; extern DLL_IMPORT_RTS const StgInfoTable stg_FOREIGN_info; @@ -130,14 +136,6 @@ extern DLL_IMPORT_RTS const StgInfoTable stg_catch_info; extern DLL_IMPORT_RTS const StgInfoTable stg_seq_info; extern DLL_IMPORT_RTS const StgInfoTable stg_dummy_ret_info; -#ifdef INTERPRETER - -EXTFUN(Hugs_CONSTR_entry); - -extern const vec_info_8 stg_ret_bco_info; - -#endif /* INTERPRETER */ - /* closures */ extern DLL_IMPORT_RTS StgClosure stg_END_TSO_QUEUE_closure; @@ -240,3 +238,60 @@ EXTINFO_RTS stg_ap_6_upd_info; EXTINFO_RTS stg_ap_7_upd_info; EXTINFO_RTS stg_ap_8_upd_info; +/* standard GC & stack check entry points */ + +EXTFUN(stg_gc_entertop); +EXTFUN(stg_gc_enter_1_hponly); +EXTFUN(__stg_gc_enter_1); +EXTFUN(stg_gc_enter_2); +EXTFUN(stg_gc_enter_3); +EXTFUN(stg_gc_enter_4); +EXTFUN(stg_gc_enter_5); +EXTFUN(stg_gc_enter_6); +EXTFUN(stg_gc_enter_7); +EXTFUN(stg_gc_enter_8); +EXTFUN(stg_gc_seq_1); + +EI_(stg_gc_noregs_ret_info); +EF_(stg_gc_noregs); + +EI_(stg_gc_unpt_r1_ret_info); +EF_(stg_gc_unpt_r1); + +EI_(stg_gc_unbx_r1_ret_info); +EF_(stg_gc_unbx_r1); + +EI_(stg_gc_f1_ret_info); +EF_(stg_gc_f1); + +EI_(stg_gc_d1_ret_info); +EF_(stg_gc_d1); + +EI_(stg_gc_ut_1_0_ret_info); +EF_(stg_gc_ut_1_0); + +EI_(stg_gc_ut_0_1_ret_info); +EF_(stg_gc_ut_0_1); + +EXTFUN(__stg_chk_0); +EXTFUN(__stg_chk_1); +EXTFUN(stg_chk_1n); +EXTFUN(stg_chk_2); +EXTFUN(stg_chk_3); +EXTFUN(stg_chk_4); +EXTFUN(stg_chk_5); +EXTFUN(stg_chk_6); +EXTFUN(stg_chk_7); +EXTFUN(stg_chk_8); +EXTFUN(stg_gen_chk_ret); +EXTFUN(stg_gen_chk); +EXTFUN(stg_gen_hp); +EXTFUN(stg_gen_yield); +EXTFUN(stg_yield_noregs); +EXTFUN(stg_yield_to_interpreter); +EXTFUN(stg_gen_block); +EXTFUN(stg_block_noregs); +EXTFUN(stg_block_1); +EXTFUN(stg_block_takemvar); +EXTFUN(stg_block_putmvar); +