printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%d)\n", size);
#endif
-#if defined(GEN_HASKELL)
-#define def_thunk_size(str, size) /* nothing */
-#else
-#define def_thunk_size(str, size) \
- printf("#define SIZEOF_" str " (SIZEOF_StgThunkHeader+%d)\n", size);
-#endif
-
#define struct_size(s_type) \
def_size(#s_type, sizeof(s_type));
def_closure_size(#s_type, sizeof(s_type) - sizeof(StgHeader));
#define thunk_size(s_type) \
- def_size(#s_type "_NoHdr", sizeof(s_type) - sizeof(StgHeader)); \
- def_thunk_size(#s_type, sizeof(s_type) - sizeof(StgHeader));
+ def_size(#s_type "_NoThunkHdr", sizeof(s_type) - sizeof(StgThunkHeader)); \
+ closure_size(s_type)
/* An access macro for use in C-- sources. */
#define closure_field_macro(str) \
printf("#define " str "(__ptr__) REP_" str "[__ptr__+SIZEOF_StgHeader+OFFSET_" str "]\n");
-#define thunk_field_macro(str) \
- printf("#define " str "(__ptr__) REP_" str "[__ptr__+SIZEOF_StgThunkHeader+OFFSET_" str "]\n");
-
#define closure_field_offset_(str, s_type,field) \
def_offset(str, OFFSET(s_type,field) - sizeof(StgHeader));
-#define thunk_field_offset_(str, s_type, field) \
- closure_field_offset_(str, s_type, field)
-
#define closure_field_offset(s_type,field) \
closure_field_offset_(str(s_type,field),s_type,field)
-#define thunk_field_offset(s_type,field) \
- thunk_field_offset_(str(s_type,field),s_type,field)
-
#define closure_payload_macro(str) \
printf("#define " str "(__ptr__,__ix__) W_[__ptr__+SIZEOF_StgHeader+OFFSET_" str " + WDS(__ix__)]\n");
-#define thunk_payload_macro(str) \
- printf("#define " str "(__ptr__,__ix__) W_[__ptr__+SIZEOF_StgThunkHeader+OFFSET_" str " + WDS(__ix__)]\n");
-
#define closure_payload(s_type,field) \
closure_field_offset_(str(s_type,field),s_type,field); \
closure_payload_macro(str(s_type,field));
-#define thunk_payload(s_type,field) \
- thunk_field_offset_(str(s_type,field),s_type,field); \
- thunk_payload_macro(str(s_type,field));
-
/* Byte offset and MachRep for a closure field, minus the header */
#define closure_field(s_type, field) \
closure_field_offset(s_type,field) \
field_type(s_type, field); \
closure_field_macro(str(s_type,field))
-#define thunk_field(s_type, field) \
- thunk_field_offset(s_type,field) \
- field_type(s_type, field); \
- thunk_field_macro(str(s_type,field))
-
/* Byte offset and MachRep for a closure field, minus the header */
#define closure_field_(str, s_type, field) \
closure_field_offset_(str,s_type,field) \
field_type_(str, s_type, field); \
closure_field_macro(str)
-#define thunk_field_(str, s_type, field) \
- thunk_field_offset_(str,s_type,field) \
- field_type_(str, s_type, field); \
- thunk_field_macro(str)
-/*
- * Byte offset and MachRep for a TSO field, minus the header and
- * variable prof bit.
- */
-#define tso_offset(s_type, field) \
+/* Byte offset for a TSO field, minus the header and variable prof bit. */
+#define tso_payload_offset(s_type, field) \
def_offset(str(s_type,field), OFFSET(s_type,field) - sizeof(StgHeader) - sizeof(StgTSOProfInfo));
-#define tso_field_macro(str) \
- printf("#define " str "(__ptr__) REP_" str "[__ptr__+SIZEOF_StgHeader+SIZEOF_OPT_StgTSOProfInfo+SIZEOF_OPT_StgTSOParInfo+SIZEOF_OPT_StgTSOGranInfo+SIZEOF_OPT_StgTSODistInfo+OFFSET_" str "]\n");
+/* Full byte offset for a TSO field, for use from Cmm */
+#define tso_field_offset_macro(str) \
+ printf("#define TSO_OFFSET_" str " (SIZEOF_StgHeader+SIZEOF_OPT_StgTSOProfInfo+SIZEOF_OPT_StgTSOParInfo+SIZEOF_OPT_StgTSOGranInfo+SIZEOF_OPT_StgTSODistInfo+OFFSET_" str ")\n");
+
+#define tso_field_offset(s_type, field) \
+ tso_payload_offset(s_type, field); \
+ tso_field_offset_macro(str(s_type,field));
+#define tso_field_macro(str) \
+ printf("#define " str "(__ptr__) REP_" str "[__ptr__+TSO_OFFSET_" str "]\n")
#define tso_field(s_type, field) \
- tso_offset(s_type, field); \
field_type(s_type, field); \
+ tso_field_offset(s_type,field); \
tso_field_macro(str(s_type,field))
-
+
#define opt_struct_size(s_type, option) \
printf("#ifdef " #option "\n"); \
printf("#define SIZEOF_OPT_" #s_type " SIZEOF_" #s_type "\n"); \
field_offset(StgRegTable, rCurrentTSO);
field_offset(StgRegTable, rCurrentNursery);
field_offset(StgRegTable, rHpAlloc);
+ struct_field(StgRegTable, rRet);
// Needed for SMP builds
field_offset(StgRegTable, rmp_tmp_w);
closure_field(StgTSO, trec);
closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
tso_field(StgTSO, sp);
- tso_offset(StgTSO, stack);
+ tso_field_offset(StgTSO, stack);
tso_field(StgTSO, stack_size);
struct_size(StgTSOProfInfo);
closure_field(StgPAP, arity);
closure_payload(StgPAP, payload);
- closure_size(StgAP);
+ thunk_size(StgAP);
closure_field(StgAP, n_args);
closure_field(StgAP, fun);
closure_payload(StgAP, payload);
thunk_size(StgAP_STACK);
- thunk_field(StgAP_STACK, size);
- thunk_field(StgAP_STACK, fun);
- thunk_payload(StgAP_STACK, payload);
+ closure_field(StgAP_STACK, size);
+ closure_field(StgAP_STACK, fun);
+ closure_payload(StgAP_STACK, payload);
closure_field(StgInd, indirectee);
closure_field(StgMutVar, var);
closure_size(StgAtomicallyFrame);
- closure_field(StgAtomicallyFrame, waiting);
closure_field(StgAtomicallyFrame, code);
closure_size(StgCatchSTMFrame);