X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgMiscClosures.h;h=eeaaf3ad4da6fd4d314d765c6a2834db351c8599;hb=49d6688668fbe6ee72e429a53e3239d517ff9afe;hp=7d6058c802f000acb899bcc008afb3a0c30c799a;hpb=4d116e5dab7aebe49abd77dfca6c14f38dc049f7;p=ghc-hetmet.git diff --git a/ghc/includes/StgMiscClosures.h b/ghc/includes/StgMiscClosures.h index 7d6058c..eeaaf3a 100644 --- a/ghc/includes/StgMiscClosures.h +++ b/ghc/includes/StgMiscClosures.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: StgMiscClosures.h,v 1.37 2001/02/15 14:27:36 sewardj Exp $ + * $Id: StgMiscClosures.h,v 1.39 2001/07/09 19:45:16 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -74,16 +74,21 @@ 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; - +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 */ @@ -107,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;