projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up pretty-printing of InlinePragma
[ghc-hetmet.git]
/
includes
/
mkDerivedConstants.c
diff --git
a/includes/mkDerivedConstants.c
b/includes/mkDerivedConstants.c
index
ddd2e65
..
94157f0
100644
(file)
--- a/
includes/mkDerivedConstants.c
+++ b/
includes/mkDerivedConstants.c
@@
-31,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)
@@
-249,8
+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(step, n_large_blocks);
+ struct_field(generation, n_new_large_blocks);
struct_size(CostCentreStack);
struct_field(CostCentreStack, ccsID);
struct_size(CostCentreStack);
struct_field(CostCentreStack, ccsID);
@@
-280,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);