#define OFFSET(s_type, field) ((size_t)&(((s_type*)0)->field))
-#ifdef mingw32_HOST_OS
-#define SIZET_FMT "d"
-#else
-#define SIZET_FMT "zd"
-#endif
-
#if defined(GEN_HASKELL)
#define def_offset(str, offset) \
printf("oFFSET_" str " :: Int\n"); \
- printf("oFFSET_" str " = %" SIZET_FMT "\n", offset);
+ printf("oFFSET_" str " = %lu\n", (unsigned long)offset);
#else
#define def_offset(str, offset) \
- printf("#define OFFSET_" str " %" SIZET_FMT "\n", offset);
+ printf("#define OFFSET_" str " %lu\n", (unsigned long)offset);
#endif
#if defined(GEN_HASKELL)
field_offset(Capability, lock);
struct_field(Capability, mut_lists);
struct_field(Capability, context_switch);
+ struct_field(Capability, sparks);
struct_field(bdescr, start);
struct_field(bdescr, free);
struct_size(generation);
struct_field(generation, mut_list);
-
- struct_field(step, n_large_blocks);
+ struct_field(generation, n_new_large_blocks);
struct_size(CostCentreStack);
struct_field(CostCentreStack, ccsID);
closure_size(StgMutArrPtrs);
closure_field(StgMutArrPtrs, ptrs);
+ closure_field(StgMutArrPtrs, size);
closure_size(StgArrWords);
- closure_field(StgArrWords, words);
+ closure_field(StgArrWords, bytes);
closure_payload(StgArrWords, payload);
closure_field(StgTSO, _link);
closure_field(StgTSO, trec);
closure_field(StgTSO, flags);
closure_field(StgTSO, dirty);
+ closure_field(StgTSO, bq);
closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
tso_field(StgTSO, sp);
tso_field_offset(StgTSO, stack);
closure_field(StgMVar,tail);
closure_field(StgMVar,value);
+ closure_size(StgMVarTSOQueue);
+ closure_field(StgMVarTSOQueue, link);
+ closure_field(StgMVarTSOQueue, tso);
+
closure_size(StgBCO);
closure_field(StgBCO, instrs);
closure_field(StgBCO, literals);
closure_size(StgStableName);
closure_field(StgStableName,sn);
+ closure_size(StgBlockingQueue);
+ closure_field(StgBlockingQueue, bh);
+ closure_field(StgBlockingQueue, owner);
+ closure_field(StgBlockingQueue, queue);
+ closure_field(StgBlockingQueue, link);
+
+ closure_size(MessageBlackHole);
+ closure_field(MessageBlackHole, link);
+ closure_field(MessageBlackHole, tso);
+ closure_field(MessageBlackHole, bh);
+
struct_field_("RtsFlags_ProfFlags_showCCSOnException",
RTS_FLAGS, ProfFlags.showCCSOnException);
struct_field_("RtsFlags_DebugFlags_apply",