X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FInfoMacros.h;h=ecbd793af1e6e6823b643ebbcb78f7c22f4ec101;hb=459c7e36729f593aa09e813a47a61a8ea0c81d4f;hp=a503d4ad379bf01fd8220004f8f61f6da4e64161;hpb=589b7946b0847a47d1a5493dcec0976c84814312;p=ghc-hetmet.git diff --git a/ghc/includes/InfoMacros.h b/ghc/includes/InfoMacros.h index a503d4a..ecbd793 100644 --- a/ghc/includes/InfoMacros.h +++ b/ghc/includes/InfoMacros.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: InfoMacros.h,v 1.6 1999/05/13 17:31:06 simonm Exp $ + * $Id: InfoMacros.h,v 1.20 2002/09/25 20:43:34 wolfgang Exp $ * * (c) The GHC Team, 1998-1999 * @@ -20,14 +20,83 @@ srt_len : srt_len_, \ type : type_ -#ifdef USE_MINIINTERPRETER -#define INIT_VECTOR {} +#define CONSTR_INFO(type_,tag_) \ + srt : 0, \ + srt_len : tag_, \ + type : type_ + +#ifdef PROFILING +#define PROF_INFO(type_str, desc_str) \ + prof: { \ + closure_type: type_str, \ + closure_desc: desc_str, \ + }, #else -#define INIT_VECTOR +#define PROF_INFO(type_str, desc_str) #endif +/* + On the GranSim/GUM specific parts of the InfoTables (GRAN/PAR): + + In both GranSim and GUM we use revertible black holes (RBH) when putting + an updatable closure into a packet for communication. The entry code for + an RBH performs standard blocking (as with any kind of BH). The info + table for the RBH resides just before the one for the std info + table. (NB: there is one RBH ITBL for every ITBL of an updatable + closure.) The @rbh_infoptr@ field in the ITBL points from the std ITBL to + the RBH ITBL and vice versa. This is used by the RBH_INFOPTR and + REVERT_INFOPTR macros to turn an updatable node into an RBH and vice + versa. Note, that the only case where we have to revert the RBH in its + original form is when a packet is sent back because of garbage collection + on another PE. In the RTS for GdH we will use this reversion mechanism in + order to deal with faults in the system. + ToDo: Check that RBHs are needed for all the info tables below. From a quick + check of the macros generated in the libs it seems that all of them are used + for generating THUNKs. + Possible optimisation: Note that any RBH ITBL is a fixed distance away from + the actual ITBL. We could inline this offset as a constant into the RTS and + avoid the rbh_infoptr fields altogether (Jim did that in the old RTS). + -- HWL +*/ + + /* function/thunk info tables --------------------------------------------- */ +#if defined(GRAN) || defined(PAR) + +#define \ +INFO_TABLE_SRT(info, /* info-table label */ \ + entry, /* entry code label */ \ + ptrs, nptrs, /* closure layout info */\ + srt_, srt_off_, srt_len_, /* SRT info */ \ + type, /* closure type */ \ + info_class, entry_class, /* C storage classes */ \ + prof_descr, prof_type) /* profiling info */ \ + entry_class(stg_RBH_##entry); \ + entry_class(entry); \ + ED_RO_ StgInfoTable info; \ + info_class INFO_TBL_CONST StgInfoTable stg_RBH_##info = { \ + layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ + SRT_INFO(RBH,srt_,srt_off_,srt_len_), \ + INCLUDE_RBH_INFO(info), \ + INIT_ENTRY(stg_RBH_##entry) \ + } ; \ + StgFunPtr stg_RBH_##entry (void) { \ + FB_ \ + JMP_(stg_RBH_entry); \ + FE_ \ + } ; \ + info_class INFO_TBL_CONST StgInfoTable info = { \ + layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ + SRT_INFO(type,srt_,srt_off_,srt_len_), \ + INCLUDE_RBH_INFO(stg_RBH_##info), \ + INIT_ENTRY(entry) \ + } + +#else + #define \ INFO_TABLE_SRT(info, /* info-table label */ \ entry, /* entry code label */ \ @@ -39,64 +108,160 @@ INFO_TABLE_SRT(info, /* info-table label */ \ entry_class(entry); \ info_class INFO_TBL_CONST StgInfoTable info = { \ layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(entry), \ - INIT_VECTOR \ + INIT_ENTRY(entry) \ } +#endif /* direct-return address info tables --------------------------------------*/ +#if defined(GRAN) || defined(PAR) + +#define \ +INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_, \ + type, info_class, entry_class, \ + prof_descr, prof_type) \ + entry_class(stg_RBH_##entry); \ + entry_class(entry); \ + ED_RO_ StgInfoTable info; \ + info_class INFO_TBL_CONST StgInfoTable stg_RBH_##info = { \ + layout : { bitmap : (StgWord)bitmap_ }, \ + PROF_INFO(prof_type, prof_descr) \ + SRT_INFO(RBH,srt_,srt_off_,srt_len_), \ + INCLUDE_RBH_INFO(info), \ + INIT_ENTRY(stg_RBH_##entry) \ + }; \ + StgFunPtr stg_RBH_##entry (void) { \ + FB_ \ + JMP_(stg_RBH_entry); \ + FE_ \ + } ; \ + info_class INFO_TBL_CONST StgInfoTable info = { \ + layout : { bitmap : (StgWord)bitmap_ }, \ + PROF_INFO(prof_type, prof_descr) \ + SRT_INFO(type,srt_,srt_off_,srt_len_), \ + INCLUDE_RBH_INFO(stg_RBH_##info), \ + INIT_ENTRY(entry) \ + } + +#else + #define \ INFO_TABLE_SRT_BITMAP(info, entry, bitmap_, srt_, srt_off_, srt_len_, \ type, info_class, entry_class, \ prof_descr, prof_type) \ entry_class(entry); \ info_class INFO_TBL_CONST StgInfoTable info = { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ + PROF_INFO(prof_type, prof_descr) \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(entry), \ - INIT_VECTOR \ + INIT_ENTRY(entry) \ } +#endif /* info-table without an SRT -----------------------------------------------*/ +#if defined(GRAN) || defined(PAR) + +#define \ +INFO_TABLE(info, entry, ptrs, nptrs, type, info_class, \ + entry_class, prof_descr, prof_type) \ + entry_class(stg_RBH_##entry); \ + entry_class(entry); \ + ED_ StgInfoTable info; \ + info_class INFO_TBL_CONST StgInfoTable stg_RBH_##info = { \ + layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ + STD_INFO(RBH), \ + INCLUDE_RBH_INFO(info), \ + INIT_ENTRY(stg_RBH_##entry) \ + } ; \ + StgFunPtr stg_RBH_##entry (void) { \ + FB_ \ + JMP_(stg_RBH_entry); \ + FE_ \ + } ; \ + info_class INFO_TBL_CONST StgInfoTable info = { \ + layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ + STD_INFO(type), \ + INCLUDE_RBH_INFO(stg_RBH_##info), \ + INIT_ENTRY(entry) \ + } + +#else + #define \ INFO_TABLE(info, entry, ptrs, nptrs, type, info_class, \ entry_class, prof_descr, prof_type) \ entry_class(entry); \ info_class INFO_TBL_CONST StgInfoTable info = { \ layout : { payload : {ptrs,nptrs} }, \ + PROF_INFO(prof_type, prof_descr) \ STD_INFO(type), \ - INIT_ENTRY(entry), \ - INIT_VECTOR \ + INIT_ENTRY(entry) \ } +#endif + /* special selector-thunk info table ---------------------------------------*/ +#if defined(GRAN) || defined(PAR) + +#define \ +INFO_TABLE_SELECTOR(info, entry, offset, info_class, \ + entry_class, prof_descr, prof_type) \ + entry_class(stg_RBH_##entry); \ + entry_class(entry); \ + ED_RO_ StgInfoTable info; \ + info_class INFO_TBL_CONST StgInfoTable stg_RBH_##info = { \ + layout : { selector_offset : offset }, \ + PROF_INFO(prof_type, prof_descr) \ + STD_INFO(RBH), \ + INCLUDE_RBH_INFO(info), \ + INIT_ENTRY(stg_RBH_##entry) \ + }; \ + StgFunPtr stg_RBH_##entry (void) { \ + FB_ \ + JMP_(stg_RBH_entry); \ + FE_ \ + } ; \ + info_class INFO_TBL_CONST StgInfoTable info = { \ + layout : { selector_offset : offset }, \ + PROF_INFO(prof_type, prof_descr) \ + STD_INFO(THUNK_SELECTOR), \ + INCLUDE_RBH_INFO(stg_RBH_##info), \ + INIT_ENTRY(entry) \ + } + +#else + #define \ INFO_TABLE_SELECTOR(info, entry, offset, info_class, \ entry_class, prof_descr, prof_type) \ entry_class(entry); \ info_class INFO_TBL_CONST StgInfoTable info = { \ layout : { selector_offset : offset }, \ + PROF_INFO(prof_type, prof_descr) \ STD_INFO(THUNK_SELECTOR), \ - INIT_ENTRY(entry), \ - INIT_VECTOR \ + INIT_ENTRY(entry) \ } +#endif + /* constructor info table --------------------------------------------------*/ -#define \ +#define \ INFO_TABLE_CONSTR(info, entry, ptrs, nptrs, tag_,type_,info_class, \ entry_class, prof_descr, prof_type) \ entry_class(entry); \ info_class INFO_TBL_CONST StgInfoTable info = { \ layout : { payload : {ptrs,nptrs} }, \ - srt_len : tag_, \ - type : type_, \ - INIT_ENTRY(entry), \ - INIT_VECTOR \ + PROF_INFO(prof_type, prof_descr) \ + CONSTR_INFO(type_,tag_), \ + INIT_ENTRY(entry) \ } #define constrTag(con) (get_itbl(con)->srt_len) @@ -110,7 +275,7 @@ INFO_TABLE_CONSTR(info, entry, ptrs, nptrs, tag_,type_,info_class, \ * layout field, so we only need one macro for these. */ -#ifndef USE_MINIINTERPRETER +#ifdef TABLES_NEXT_TO_CODE typedef struct { StgFunPtr vec[2]; @@ -153,7 +318,7 @@ typedef struct { info_class INFO_TBL_CONST vec_info_2 info = { \ { alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -165,7 +330,7 @@ typedef struct { info_class INFO_TBL_CONST vec_info_3 info = { \ { alt_3, alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -177,7 +342,7 @@ typedef struct { info_class INFO_TBL_CONST vec_info_4 info = { \ { alt_4, alt_3, alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -191,7 +356,7 @@ typedef struct { { alt_5, alt_4, alt_3, alt_2, \ alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -205,7 +370,7 @@ typedef struct { { alt_6, alt_5, alt_4, alt_3, \ alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -219,7 +384,7 @@ typedef struct { { alt_7, alt_6, alt_5, alt_4, \ alt_3, alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -233,7 +398,7 @@ typedef struct { { alt_8, alt_7, alt_6, alt_5, \ alt_4, alt_3, alt_2, alt_1 }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_) \ } \ } @@ -286,9 +451,9 @@ typedef struct { type, info_class, \ alt_1, alt_2) \ info_class INFO_TBL_CONST vec_info_2 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2 } \ } @@ -298,9 +463,9 @@ typedef struct { alt_1, alt_2, alt_3 \ ) \ info_class INFO_TBL_CONST vec_info_3 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3 } \ } @@ -310,9 +475,9 @@ typedef struct { alt_1, alt_2, alt_3, alt_4 \ ) \ info_class INFO_TBL_CONST vec_info_4 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3, alt_4 } \ } @@ -323,9 +488,9 @@ typedef struct { alt_5 \ ) \ info_class INFO_TBL_CONST vec_info_5 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3, alt_4, \ alt_5 } \ @@ -337,9 +502,9 @@ typedef struct { alt_5, alt_6 \ ) \ info_class INFO_TBL_CONST vec_info_6 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3, alt_4, \ alt_5, alt_6 } \ @@ -351,9 +516,9 @@ typedef struct { alt_5, alt_6, alt_7 \ ) \ info_class INFO_TBL_CONST vec_info_7 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3, alt_4, \ alt_5, alt_6, alt_7 } \ @@ -365,15 +530,15 @@ typedef struct { alt_5, alt_6, alt_7, alt_8 \ ) \ info_class INFO_TBL_CONST vec_info_8 info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(NULL), \ + INIT_ENTRY(NULL) \ }, \ vec : { alt_1, alt_2, alt_3, alt_4, \ alt_5, alt_6, alt_7, alt_8 } \ } -#endif /* MINI_INTERPRETER */ +#endif /* TABLES_NEXT_TO_CODE */ /* For polymorphic activation records, we need both a direct return * address and a return vector: @@ -381,17 +546,16 @@ typedef struct { typedef vec_info_8 StgPolyInfoTable; -#ifdef USE_MINIINTERPRETER +#ifndef TABLES_NEXT_TO_CODE #define VEC_POLY_INFO_TABLE(nm, bitmap_, \ srt_, srt_off_, srt_len_, \ type, info_class, entry_class \ ) \ info_class INFO_TBL_CONST vec_info_8 nm##_info = { \ - i : { layout : { bitmap : (StgWord32)bitmap_ }, \ + i : { layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ - INIT_ENTRY(nm##_entry), \ - INIT_VECTOR \ + INIT_ENTRY(nm##_entry) \ }, \ vec : { \ (F_) nm##_0_entry, \ @@ -422,7 +586,7 @@ typedef vec_info_8 StgPolyInfoTable; (F_) nm##_0_entry \ }, \ i : { \ - layout : { bitmap : (StgWord32)bitmap_ }, \ + layout : { bitmap : (StgWord)bitmap_ }, \ SRT_INFO(type,srt_,srt_off_,srt_len_), \ INIT_ENTRY(nm##_entry) \ } \ @@ -433,8 +597,20 @@ typedef vec_info_8 StgPolyInfoTable; #define SRT(lbl) \ static const StgSRT lbl = { -#define BITMAP(lbl,size) \ - static const StgLargeBitmap lbl = { size, { +#define BITMAP(lbl,size,contents) \ + static const StgLargeBitmap lbl = { \ + (size*4+SIZEOF_VOID_P-1)/SIZEOF_VOID_P, { contents } }; + +#if SIZEOF_VOID_P == 8 +#define BITMAP_SWITCH64(small, large) small +#define BITMAP64(first, second) \ + (((StgWord32)(first)) | ((StgWord)(StgWord32)(second) << 32)) +#else +#define BITMAP_SWITCH64(small, large) large +#define BITMAP64(first, second) first, second +#endif +#define BITMAP32(x) ((StgWord32)(x)) +#define COMMA , /* DLL_SRT_ENTRY is used on the Win32 side when filling initialising an entry in an SRT table with a reference to a closure that's @@ -442,7 +618,7 @@ typedef vec_info_8 StgPolyInfoTable; to distinguish these kinds of references. (ToDo: fill in a more precise href.) */ -#ifdef HAVE_WIN32_DLL_SUPPORT +#ifdef ENABLE_WIN32_DLL_SUPPORT /* mingw DietHEP doesn't seem to care either way */ #define DLL_SRT_ENTRY(x) ((StgClosure*)(((char*)&DLL_IMPORT_DATA_VAR(x)) + 1)) #else #define DLL_SRT_ENTRY(x) no-can-do