projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings
[ghc-hetmet.git]
/
includes
/
mkDerivedConstants.c
diff --git
a/includes/mkDerivedConstants.c
b/includes/mkDerivedConstants.c
index
e9bff95
..
344b426
100644
(file)
--- a/
includes/mkDerivedConstants.c
+++ b/
includes/mkDerivedConstants.c
@@
-21,10
+21,8
@@
#define THREADED_RTS
#include "Rts.h"
#define THREADED_RTS
#include "Rts.h"
-#include "RtsFlags.h"
-#include "Storage.h"
+
#include "Stable.h"
#include "Stable.h"
-#include "OSThreads.h"
#include "Capability.h"
#include <stdio.h>
#include "Capability.h"
#include <stdio.h>
@@
-168,7
+166,7
@@
/* Full byte offset for a TSO field, for use from Cmm */
#define tso_field_offset_macro(str) \
/* 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");
+ printf("#define TSO_OFFSET_" str " (SIZEOF_StgHeader+SIZEOF_OPT_StgTSOProfInfo+OFFSET_" str ")\n");
#define tso_field_offset(s_type, field) \
tso_payload_offset(s_type, field); \
#define tso_field_offset(s_type, field) \
tso_payload_offset(s_type, field); \
@@
-200,7
+198,6
@@
main(int argc, char *argv[])
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 %lu\n", (unsigned long)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 %lu\n", (unsigned long)sizeofW(StgProfHeader));
- printf("#define GRAN_HDR_SIZE %lu\n", (unsigned long)sizeofW(StgGranHeader));
printf("#define BLOCK_SIZE %u\n", BLOCK_SIZE);
printf("#define MBLOCK_SIZE %u\n", MBLOCK_SIZE);
printf("#define BLOCK_SIZE %u\n", BLOCK_SIZE);
printf("#define MBLOCK_SIZE %u\n", MBLOCK_SIZE);
@@
-233,13
+230,7
@@
main(int argc, char *argv[])
field_offset(StgRegTable, rCurrentNursery);
field_offset(StgRegTable, rHpAlloc);
struct_field(StgRegTable, rRet);
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);
+ struct_field(StgRegTable, rNursery);
def_offset("stgEagerBlackholeInfo", FUN_OFFSET(stgEagerBlackholeInfo));
def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
def_offset("stgEagerBlackholeInfo", FUN_OFFSET(stgEagerBlackholeInfo));
def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
@@
-258,6
+249,7
@@
main(int argc, char *argv[])
struct_size(generation);
struct_field(generation, mut_list);
struct_size(generation);
struct_field(generation, mut_list);
+ struct_field(generation, n_new_large_blocks);
struct_size(CostCentreStack);
struct_field(CostCentreStack, ccsID);
struct_size(CostCentreStack);
struct_field(CostCentreStack, ccsID);
@@
-287,6
+279,7
@@
main(int argc, char *argv[])
closure_size(StgMutArrPtrs);
closure_field(StgMutArrPtrs, ptrs);
closure_size(StgMutArrPtrs);
closure_field(StgMutArrPtrs, ptrs);
+ closure_field(StgMutArrPtrs, size);
closure_size(StgArrWords);
closure_field(StgArrWords, words);
closure_size(StgArrWords);
closure_field(StgArrWords, words);
@@
-303,20
+296,15
@@
main(int argc, char *argv[])
closure_field(StgTSO, saved_errno);
closure_field(StgTSO, trec);
closure_field(StgTSO, flags);
closure_field(StgTSO, saved_errno);
closure_field(StgTSO, trec);
closure_field(StgTSO, flags);
+ closure_field(StgTSO, dirty);
closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
tso_field(StgTSO, sp);
tso_field_offset(StgTSO, stack);
tso_field(StgTSO, stack_size);
struct_size(StgTSOProfInfo);
closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
tso_field(StgTSO, sp);
tso_field_offset(StgTSO, stack);
tso_field(StgTSO, stack_size);
struct_size(StgTSOProfInfo);
- struct_size(StgTSOParInfo);
- struct_size(StgTSOGranInfo);
- struct_size(StgTSODistInfo);
opt_struct_size(StgTSOProfInfo,PROFILING);
opt_struct_size(StgTSOProfInfo,PROFILING);
- opt_struct_size(StgTSOParInfo,PAR);
- opt_struct_size(StgTSOGranInfo,GRAN);
- opt_struct_size(StgTSODistInfo,DIST);
closure_field(StgUpdateFrame, updatee);
closure_field(StgUpdateFrame, updatee);
@@
-349,6
+337,7
@@
main(int argc, char *argv[])
closure_size(StgAtomicallyFrame);
closure_field(StgAtomicallyFrame, code);
closure_field(StgAtomicallyFrame, next_invariant_to_check);
closure_size(StgAtomicallyFrame);
closure_field(StgAtomicallyFrame, code);
closure_field(StgAtomicallyFrame, next_invariant_to_check);
+ closure_field(StgAtomicallyFrame, result);
closure_field(StgInvariantCheckQueue, invariant);
closure_field(StgInvariantCheckQueue, my_execution);
closure_field(StgInvariantCheckQueue, invariant);
closure_field(StgInvariantCheckQueue, my_execution);
@@
-356,6
+345,8
@@
main(int argc, char *argv[])
closure_field(StgAtomicInvariant, code);
closure_field(StgAtomicInvariant, code);
+ closure_field(StgTRecHeader, enclosing_trec);
+
closure_size(StgCatchSTMFrame);
closure_field(StgCatchSTMFrame, handler);
closure_field(StgCatchSTMFrame, code);
closure_size(StgCatchSTMFrame);
closure_field(StgCatchSTMFrame, handler);
closure_field(StgCatchSTMFrame, code);
@@
-436,11
+427,5
@@
main(int argc, char *argv[])
struct_field(StgAsyncIOResult, errCode);
#endif
struct_field(StgAsyncIOResult, errCode);
#endif
- struct_size(MP_INT);
- struct_field(MP_INT,_mp_alloc);
- struct_field(MP_INT,_mp_size);
- struct_field(MP_INT,_mp_d);
-
- ctype(mp_limb_t);
return 0;
}
return 0;
}