projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the link to the ghc docs in libraries/prologue.txt
[ghc-hetmet.git]
/
includes
/
mkDerivedConstants.c
diff --git
a/includes/mkDerivedConstants.c
b/includes/mkDerivedConstants.c
index
323a7d4
..
94157f0
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>
@@
-33,19
+31,13
@@
#define OFFSET(s_type, field) ((size_t)&(((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 " :: Int\n"); \
#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) \
#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)
#endif
#if defined(GEN_HASKELL)
@@
-232,13
+224,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));
@@
-257,6
+243,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);
@@
-286,6
+273,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);
@@
-302,6
+290,7
@@
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);
closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
tso_field(StgTSO, sp);
tso_field_offset(StgTSO, stack);
@@
-342,6
+331,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);
@@
-349,6
+339,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);
@@
-429,11
+421,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;
}