#define str(a,b) #a "_" #b
-#define OFFSET(s_type, field) ((unsigned int)&(((s_type*)0)->field))
+#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 " = %d::Int\n", offset);
+#define def_offset(str, offset) \
+ printf("oFFSET_" str " :: Int\n"); \
+ printf("oFFSET_" str " = %" SIZET_FMT "\n", offset);
#else
#define def_offset(str, offset) \
- printf("#define OFFSET_" str " %d\n", offset);
+ printf("#define OFFSET_" str " %" SIZET_FMT "\n", offset);
#endif
#if defined(GEN_HASKELL)
#define ctype(type) /* nothing */
#else
#define ctype(type) \
- printf("#define SIZEOF_" #type " %d\n", sizeof(type));
+ printf("#define SIZEOF_" #type " %lu\n", (unsigned long)sizeof(type));
#endif
#if defined(GEN_HASKELL)
#define field_type_(str, s_type, field) /* nothing */
+#define field_type_gcptr_(str, s_type, field) /* nothing */
#else
+/* Defining REP_x to be b32 etc
+ These are both the C-- types used in a load
+ e.g. b32[addr]
+ and the names of the CmmTypes in the compiler
+ b32 :: CmmType
+*/
#define field_type_(str, s_type, field) \
- printf("#define REP_" str " I"); \
- printf("%d\n", sizeof (__typeof__(((((s_type*)0)->field)))) * 8);
+ printf("#define REP_" str " b"); \
+ printf("%lu\n", (unsigned long)sizeof (__typeof__(((((s_type*)0)->field)))) * 8);
+#define field_type_gcptr_(str, s_type, field) \
+ printf("#define REP_" str " gcptr\n");
#endif
#define field_type(s_type, field) \
struct_field_macro(str)
#if defined(GEN_HASKELL)
-#define def_size(str, size) \
- printf("sIZEOF_" str " = %d::Int\n", size);
+#define def_size(str, size) \
+ printf("sIZEOF_" str " :: Int\n"); \
+ printf("sIZEOF_" str " = %lu\n", (unsigned long)size);
#else
#define def_size(str, size) \
- printf("#define SIZEOF_" str " %d\n", size);
+ printf("#define SIZEOF_" str " %lu\n", (unsigned long)size);
#endif
#if defined(GEN_HASKELL)
#define def_closure_size(str, size) /* nothing */
#else
#define def_closure_size(str, size) \
- printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%d)\n", size);
+ printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%lu)\n", (unsigned long)size);
#endif
#define struct_size(s_type) \
closure_payload_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 closure_field(s_type, field) \
- closure_field_offset(s_type,field) \
- field_type(s_type, field); \
- closure_field_macro(str(s_type,field))
+ closure_field_(str(s_type,field),s_type,field)
/* Byte offset and MachRep for a closure field, minus the header */
-#define closure_field_(str, s_type, field) \
+#define closure_field_gcptr_(str, s_type, field) \
closure_field_offset_(str,s_type,field) \
- field_type_(str, s_type, field); \
+ field_type_gcptr_(str, s_type, field); \
closure_field_macro(str)
+#define closure_field_gcptr(s_type, field) \
+ closure_field_gcptr_(str(s_type,field),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));
#ifndef GEN_HASKELL
printf("/* This file is created automatically. Do not edit by hand.*/\n\n");
- printf("#define STD_HDR_SIZE %d\n", sizeofW(StgHeader) - sizeofW(StgProfHeader));
+ printf("#define STD_HDR_SIZE %lu\n", (unsigned long)sizeofW(StgHeader) - sizeofW(StgProfHeader));
/* grrr.. PROFILING is on so we need to subtract sizeofW(StgProfHeader) */
- printf("#define PROF_HDR_SIZE %d\n", sizeofW(StgProfHeader));
- printf("#define GRAN_HDR_SIZE %d\n", sizeofW(StgGranHeader));
+ printf("#define PROF_HDR_SIZE %lu\n", (unsigned long)sizeofW(StgProfHeader));
+ printf("#define GRAN_HDR_SIZE %lu\n", (unsigned long)sizeofW(StgGranHeader));
- printf("#define BLOCK_SIZE %d\n", BLOCK_SIZE);
- printf("#define MBLOCK_SIZE %d\n", MBLOCK_SIZE);
+ printf("#define BLOCK_SIZE %u\n", BLOCK_SIZE);
+ printf("#define MBLOCK_SIZE %u\n", MBLOCK_SIZE);
printf("\n\n");
#endif
field_offset(StgRegTable, rmp_result1);
field_offset(StgRegTable, rmp_result2);
+ def_offset("stgEagerBlackholeInfo", FUN_OFFSET(stgEagerBlackholeInfo));
def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
def_offset("stgGCFun", FUN_OFFSET(stgGCFun));
field_offset(Capability, r);
field_offset(Capability, lock);
struct_field(Capability, mut_lists);
+ struct_field(Capability, context_switch);
struct_field(bdescr, start);
struct_field(bdescr, free);
closure_field(StgArrWords, words);
closure_payload(StgArrWords, payload);
- closure_field(StgTSO, link);
+ closure_field(StgTSO, _link);
closure_field(StgTSO, global_link);
closure_field(StgTSO, what_next);
closure_field(StgTSO, why_blocked);
closure_size(StgPAP);
closure_field(StgPAP, n_args);
- closure_field(StgPAP, fun);
+ closure_field_gcptr(StgPAP, fun);
closure_field(StgPAP, arity);
closure_payload(StgPAP, payload);
thunk_size(StgAP);
closure_field(StgAP, n_args);
- closure_field(StgAP, fun);
+ closure_field_gcptr(StgAP, fun);
closure_payload(StgAP, payload);
thunk_size(StgAP_STACK);
closure_field(StgAP_STACK, size);
- closure_field(StgAP_STACK, fun);
+ closure_field_gcptr(StgAP_STACK, fun);
closure_payload(StgAP_STACK, payload);
thunk_size(StgSelector);
- closure_field(StgInd, indirectee);
+ closure_field_gcptr(StgInd, indirectee);
closure_size(StgMutVar);
closure_field(StgMutVar, var);
closure_field(StgTVarWatchQueue, next_queue_entry);
closure_field(StgTVarWatchQueue, prev_queue_entry);
+ closure_field(StgTVar, current_value);
+
closure_size(StgWeak);
closure_field(StgWeak,link);
closure_field(StgWeak,key);
closure_field(StgWeak,value);
closure_field(StgWeak,finalizer);
+ closure_field(StgWeak,cfinalizer);
closure_size(StgDeadWeak);
closure_field(StgDeadWeak,link);