X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FmkDerivedConstants.c;h=27d4fa9e7b052663c59fc50dee314598431a21ed;hb=a0f46309637779ccc141ec531e9b128596a5bba0;hp=f5d62139329bda858d761d340a3b06144406b20f;hpb=1a65116f9317f73e2a49f714c00fb1353d155444;p=ghc-hetmet.git diff --git a/ghc/includes/mkDerivedConstants.c b/ghc/includes/mkDerivedConstants.c index f5d6213..27d4fa9 100644 --- a/ghc/includes/mkDerivedConstants.c +++ b/ghc/includes/mkDerivedConstants.c @@ -11,17 +11,21 @@ * * ------------------------------------------------------------------------*/ -#include - #define IN_STG_CODE 0 -// We need offsets of profiled things... better be careful that this -// doesn't affect the offsets of anything else. +/* + * We need offsets of profiled things... better be careful that this + * doesn't affect the offsets of anything else. + */ #define PROFILING #include "Rts.h" #include "RtsFlags.h" #include "Storage.h" +#include "OSThreads.h" +#include "Capability.h" + +#include #define str(a,b) #a "_" #b @@ -59,11 +63,11 @@ #define field_offset(s_type, field) \ field_offset_(str(s_type,field),s_type,field); -// An access macro for use in C-- sources. +/* An access macro for use in C-- sources. */ #define struct_field_macro(str) \ printf("#define " str "(__ptr__) REP_" str "[__ptr__+OFFSET_" str "]\n"); -// Outputs the byte offset and MachRep for a field +/* Outputs the byte offset and MachRep for a field */ #define struct_field(s_type, field) \ field_offset(s_type, field); \ field_type(s_type, field); \ @@ -92,13 +96,19 @@ #define struct_size(s_type) \ def_size(#s_type, sizeof(s_type)); -// Size of a closure type, minus the header, named SIZEOF__NoHdr -// Also, we #define SIZEOF_ to be the size of the whole closure for .cmm. +/* + * Size of a closure type, minus the header, named SIZEOF__NoHdr + * Also, we #define SIZEOF_ to be the size of the whole closure for .cmm. + */ #define closure_size(s_type) \ def_size(#s_type "_NoHdr", sizeof(s_type) - sizeof(StgHeader)); \ def_closure_size(#s_type, sizeof(s_type) - sizeof(StgHeader)); -// An access macro for use in C-- sources. +#define thunk_size(s_type) \ + 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"); @@ -106,7 +116,7 @@ def_offset(str, OFFSET(s_type,field) - sizeof(StgHeader)); #define closure_field_offset(s_type,field) \ - closure_field_offset_(str(s_type,field),s_type,field); + closure_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"); @@ -115,31 +125,37 @@ closure_field_offset_(str(s_type,field),s_type,field); \ closure_payload_macro(str(s_type,field)); -// Byte offset and MachRep for a closure field, minus the header +/* 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)) -// Byte offset and MachRep for a closure field, minus the header +/* 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) -// 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_StgTSOTickyInfo+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"); \ @@ -157,15 +173,16 @@ main(int argc, char *argv[]) printf("/* This file is created automatically. Do not edit by hand.*/\n\n"); printf("#define STD_HDR_SIZE %d\n", sizeofW(StgHeader) - sizeofW(StgProfHeader)); - // grrr.. PROFILING is on so we need to subtract 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 STD_ITBL_SIZE %d\n", sizeofW(StgInfoTable)); printf("#define RET_ITBL_SIZE %d\n", sizeofW(StgRetInfoTable) - sizeofW(StgInfoTable)); printf("#define PROF_ITBL_SIZE %d\n", sizeofW(StgProfInfo)); + printf("#define GRAN_ITBL_SIZE %d\n", 0); - printf("#define TICKY_ITBL_SIZE %d\n", sizeofW(StgTickyInfo)); + printf("#define TICKY_ITBL_SIZE %d\n", 0); printf("#define BLOCK_SIZE %d\n", BLOCK_SIZE); printf("#define MBLOCK_SIZE %d\n", MBLOCK_SIZE); @@ -189,9 +206,7 @@ main(int argc, char *argv[]) field_offset(StgRegTable, rF4); field_offset(StgRegTable, rD1); field_offset(StgRegTable, rD2); -#ifdef SUPPORT_LONG_LONGS field_offset(StgRegTable, rL1); -#endif field_offset(StgRegTable, rSp); field_offset(StgRegTable, rSpLim); field_offset(StgRegTable, rHp); @@ -199,6 +214,14 @@ main(int argc, char *argv[]) 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); + field_offset(StgRegTable, rmp_tmp1); + field_offset(StgRegTable, rmp_tmp2); + field_offset(StgRegTable, rmp_result1); + field_offset(StgRegTable, rmp_result2); def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1)); def_offset("stgGCFun", FUN_OFFSET(stgGCFun)); @@ -212,8 +235,9 @@ main(int argc, char *argv[]) struct_field(bdescr, link); struct_size(generation); - struct_field(generation, mut_once_list); + struct_field(generation, mut_list); + struct_size(CostCentreStack); struct_field(CostCentreStack, ccsID); struct_field(CostCentreStack, mem_alloc); struct_field(CostCentreStack, scc_count); @@ -226,6 +250,8 @@ main(int argc, char *argv[]) struct_field_("StgHeader_ccs", StgHeader, prof.ccs); struct_field_("StgHeader_ldvw", StgHeader, prof.hp.ldvw); + struct_size(StgSMPThunkHeader); + closure_payload(StgClosure,payload); struct_field(StgEntCounter, allocs); @@ -244,7 +270,6 @@ main(int argc, char *argv[]) closure_payload(StgArrWords, payload); closure_field(StgTSO, link); - closure_field(StgTSO, mut_link); closure_field(StgTSO, global_link); closure_field(StgTSO, what_next); closure_field(StgTSO, why_blocked); @@ -252,26 +277,22 @@ main(int argc, char *argv[]) closure_field(StgTSO, blocked_exceptions); closure_field(StgTSO, id); closure_field(StgTSO, saved_errno); + 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); - struct_size(StgTSOTickyInfo); struct_size(StgTSOParInfo); struct_size(StgTSOGranInfo); struct_size(StgTSODistInfo); opt_struct_size(StgTSOProfInfo,PROFILING); - opt_struct_size(StgTSOTickyInfo,TICKY_TICKY); opt_struct_size(StgTSOParInfo,PAR); opt_struct_size(StgTSOGranInfo,GRAN); opt_struct_size(StgTSODistInfo,DIST); - closure_size(StgBlockingQueue); - closure_field(StgBlockingQueue, blocking_queue); - closure_field(StgUpdateFrame, updatee); closure_field(StgCatchFrame, handler); @@ -283,24 +304,32 @@ main(int argc, char *argv[]) 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); - closure_size(StgAP_STACK); + thunk_size(StgAP_STACK); closure_field(StgAP_STACK, size); closure_field(StgAP_STACK, fun); closure_payload(StgAP_STACK, payload); closure_field(StgInd, indirectee); - closure_field(StgMutClosure, mut_link); closure_size(StgMutVar); closure_field(StgMutVar, var); - closure_size(StgForeignObj); - closure_field(StgForeignObj,data); + closure_size(StgAtomicallyFrame); + closure_field(StgAtomicallyFrame, code); + + closure_size(StgCatchSTMFrame); + closure_field(StgCatchSTMFrame, handler); + + closure_size(StgCatchRetryFrame); + closure_field(StgCatchRetryFrame, running_alt_code); + closure_field(StgCatchRetryFrame, first_code); + closure_field(StgCatchRetryFrame, alt_code); + closure_field(StgCatchRetryFrame, first_code_trec); closure_size(StgWeak); closure_field(StgWeak,link); @@ -343,13 +372,13 @@ main(int argc, char *argv[]) struct_field(StgFunInfoExtraFwd, slow_apply); struct_field(StgFunInfoExtraFwd, fun_type); struct_field(StgFunInfoExtraFwd, arity); - struct_field(StgFunInfoExtraFwd, bitmap); + struct_field_("StgFunInfoExtraFwd_bitmap", StgFunInfoExtraFwd, b.bitmap); struct_size(StgFunInfoExtraRev); - struct_field(StgFunInfoExtraRev, slow_apply); + struct_field(StgFunInfoExtraRev, slow_apply_offset); struct_field(StgFunInfoExtraRev, fun_type); struct_field(StgFunInfoExtraRev, arity); - struct_field(StgFunInfoExtraRev, bitmap); + struct_field_("StgFunInfoExtraRev_bitmap", StgFunInfoExtraRev, b.bitmap); struct_field(StgLargeBitmap, size); field_offset(StgLargeBitmap, bitmap); @@ -358,7 +387,7 @@ main(int argc, char *argv[]) struct_field(snEntry,sn_obj); struct_field(snEntry,addr); -#ifdef mingw32_TARGET_OS +#ifdef mingw32_HOST_OS struct_size(StgAsyncIOResult); struct_field(StgAsyncIOResult, reqID); struct_field(StgAsyncIOResult, len);