X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2Fstg%2FMiscClosures.h;h=4e5667b32c76d8d85a82b755513654bea0c7e16d;hb=848797ebb9b60cf9c8a004c97afd008f5325c75f;hp=074ed314b78f241762519ecceac3208075543f98;hpb=3ce4cf858bbcae18ffc6989ca19522cb8887aab9;p=ghc-hetmet.git diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index 074ed31..4e5667b 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * - * (c) The GHC Team, 1998-2004 + * (c) The GHC Team, 1998-2009 * * Declarations for various symbols exported by the RTS. * @@ -10,6 +10,11 @@ * * See wiki:Commentary/Compiler/Backends/PprC#Prototypes * + * Do not #include this file directly: #include "Rts.h" instead. + * + * To understand the structure of the RTS headers, see the wiki: + * http://hackage.haskell.org/trac/ghc/wiki/Commentary/SourceTree/Includes + * * --------------------------------------------------------------------------*/ #ifndef STGMISCCLOSURES_H @@ -39,6 +44,7 @@ /* Stack frames */ RTS_RET_INFO(stg_upd_frame_info); +RTS_RET_INFO(stg_bh_upd_frame_info); RTS_RET_INFO(stg_marked_upd_frame_info); RTS_RET_INFO(stg_noupd_frame_info); RTS_RET_INFO(stg_catch_frame_info); @@ -49,6 +55,7 @@ RTS_RET_INFO(stg_catch_stm_frame_info); RTS_RET_INFO(stg_unblockAsyncExceptionszh_ret_info); RTS_ENTRY(stg_upd_frame_ret); +RTS_ENTRY(stg_bh_upd_frame_ret); RTS_ENTRY(stg_marked_upd_frame_ret); // RTS_FUN(stg_interp_constr_entry); @@ -85,12 +92,12 @@ RTS_INFO(stg_IND_STATIC_info); RTS_INFO(stg_IND_PERM_info); RTS_INFO(stg_IND_OLDGEN_info); RTS_INFO(stg_IND_OLDGEN_PERM_info); -RTS_INFO(stg_CAF_UNENTERED_info); -RTS_INFO(stg_CAF_ENTERED_info); -RTS_INFO(stg_WHITEHOLE_info); RTS_INFO(stg_BLACKHOLE_info); -RTS_INFO(__stg_EAGER_BLACKHOLE_info); RTS_INFO(stg_CAF_BLACKHOLE_info); +RTS_INFO(__stg_EAGER_BLACKHOLE_info); +RTS_INFO(stg_WHITEHOLE_info); +RTS_INFO(stg_BLOCKING_QUEUE_CLEAN_info); +RTS_INFO(stg_BLOCKING_QUEUE_DIRTY_info); RTS_FUN_INFO(stg_BCO_info); RTS_INFO(stg_EVACUATED_info); @@ -109,6 +116,11 @@ RTS_INFO(stg_MUT_ARR_PTRS_FROZEN0_info); RTS_INFO(stg_MUT_VAR_CLEAN_info); RTS_INFO(stg_MUT_VAR_DIRTY_info); RTS_INFO(stg_END_TSO_QUEUE_info); +RTS_INFO(stg_MSG_WAKEUP_info); +RTS_INFO(stg_MSG_TRY_WAKEUP_info); +RTS_INFO(stg_MSG_THROWTO_info); +RTS_INFO(stg_MSG_BLACKHOLE_info); +RTS_INFO(stg_MSG_NULL_info); RTS_INFO(stg_MUT_CONS_info); RTS_INFO(stg_catch_info); RTS_INFO(stg_PAP_info); @@ -135,12 +147,10 @@ RTS_ENTRY(stg_IND_STATIC_entry); RTS_ENTRY(stg_IND_PERM_entry); RTS_ENTRY(stg_IND_OLDGEN_entry); RTS_ENTRY(stg_IND_OLDGEN_PERM_entry); -RTS_ENTRY(stg_CAF_UNENTERED_entry); -RTS_ENTRY(stg_CAF_ENTERED_entry); RTS_ENTRY(stg_WHITEHOLE_entry); RTS_ENTRY(stg_BLACKHOLE_entry); -RTS_ENTRY(__stg_EAGER_BLACKHOLE_entry); RTS_ENTRY(stg_CAF_BLACKHOLE_entry); +RTS_ENTRY(__stg_EAGER_BLACKHOLE_entry); RTS_ENTRY(stg_BCO_entry); RTS_ENTRY(stg_EVACUATED_entry); RTS_ENTRY(stg_WEAK_entry); @@ -158,6 +168,11 @@ RTS_ENTRY(stg_MUT_ARR_PTRS_FROZEN0_entry); RTS_ENTRY(stg_MUT_VAR_CLEAN_entry); RTS_ENTRY(stg_MUT_VAR_DIRTY_entry); RTS_ENTRY(stg_END_TSO_QUEUE_entry); +RTS_ENTRY(stg_MSG_WAKEUP_entry); +RTS_ENTRY(stg_MSG_TRY_WAKEUP_entry); +RTS_ENTRY(stg_MSG_THROWTO_entry); +RTS_ENTRY(stg_MSG_BLACKHOLE_entry); +RTS_ENTRY(stg_MSG_NULL_entry); RTS_ENTRY(stg_MUT_CONS_entry); RTS_ENTRY(stg_catch_entry); RTS_ENTRY(stg_PAP_entry); @@ -186,9 +201,6 @@ RTS_ENTRY(stg_catch_retry_frame_ret); RTS_ENTRY(stg_atomically_frame_ret); RTS_ENTRY(stg_atomically_waiting_frame_ret); RTS_ENTRY(stg_catch_stm_frame_ret); -RTS_ENTRY(stg_catch_frame_ret); -RTS_ENTRY(stg_catch_entry); -RTS_ENTRY(stg_raise_entry); /* closures */ @@ -203,8 +215,6 @@ RTS_CLOSURE(stg_END_STM_CHUNK_LIST_closure); RTS_CLOSURE(stg_NO_TREC_closure); RTS_ENTRY(stg_NO_FINALIZER_entry); -RTS_ENTRY(stg_END_EXCEPTION_LIST_entry); -RTS_ENTRY(stg_EXCEPTION_CONS_entry); #if IN_STG_CODE extern DLL_IMPORT_RTS StgWordArray stg_CHARLIKE_closure; @@ -235,7 +245,6 @@ RTS_ENTRY(stg_sel_ret_5_upd_ret); RTS_ENTRY(stg_sel_ret_6_upd_ret); RTS_ENTRY(stg_sel_ret_7_upd_ret); RTS_ENTRY(stg_sel_ret_8_upd_ret); -RTS_ENTRY(stg_sel_ret_8_upd_ret); RTS_ENTRY(stg_sel_ret_9_upd_ret); RTS_ENTRY(stg_sel_ret_10_upd_ret); RTS_ENTRY(stg_sel_ret_11_upd_ret); @@ -287,7 +296,6 @@ RTS_ENTRY(stg_sel_ret_5_noupd_ret); RTS_ENTRY(stg_sel_ret_6_noupd_ret); RTS_ENTRY(stg_sel_ret_7_noupd_ret); RTS_ENTRY(stg_sel_ret_8_noupd_ret); -RTS_ENTRY(stg_sel_ret_8_noupd_ret); RTS_ENTRY(stg_sel_ret_9_noupd_ret); RTS_ENTRY(stg_sel_ret_10_noupd_ret); RTS_ENTRY(stg_sel_ret_11_noupd_ret); @@ -402,6 +410,8 @@ RTS_FUN(stg_PAP_apply); RTS_RET_INFO(stg_enter_info); RTS_ENTRY(stg_enter_ret); +RTS_RET_INFO(stg_enter_checkbh_info); +RTS_ENTRY(stg_enter_checkbh_ret); RTS_RET_INFO(stg_gc_void_info); RTS_ENTRY(stg_gc_void_ret); @@ -593,6 +603,7 @@ RTS_FUN(stg_getSparkzh); RTS_FUN(stg_noDuplicatezh); RTS_FUN(stg_traceCcszh); +RTS_FUN(stg_traceEventzh); /* Other misc stuff */ // See wiki:Commentary/Compiler/Backends/PprC#Prototypes @@ -617,7 +628,7 @@ extern StgWord stg_ap_stack_entries[]; extern StgWord stg_stack_save_entries[]; // Storage.c -extern unsigned int RTS_VAR(alloc_blocks); +extern unsigned int RTS_VAR(g0); extern unsigned int RTS_VAR(alloc_blocks_lim); extern StgWord RTS_VAR(weak_ptr_list); extern StgWord RTS_VAR(atomic_modify_mutvar_mutex);