projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-10-21 14:02:17 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
mkDerivedConstants.c
diff --git
a/ghc/includes/mkDerivedConstants.c
b/ghc/includes/mkDerivedConstants.c
index
bea1055
..
d782d04
100644
(file)
--- a/
ghc/includes/mkDerivedConstants.c
+++ b/
ghc/includes/mkDerivedConstants.c
@@
-22,6
+22,8
@@
#include "Rts.h"
#include "RtsFlags.h"
#include "Storage.h"
#include "Rts.h"
#include "RtsFlags.h"
#include "Storage.h"
+#include "OSThreads.h"
+#include "Capability.h"
#include <stdio.h>
#include <stdio.h>
@@
-91,6
+93,13
@@
printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%d)\n", size);
#endif
printf("#define SIZEOF_" str " (SIZEOF_StgHeader+%d)\n", size);
#endif
+#if defined(GEN_HASKELL)
+#define def_thunk_size(str, size) /* nothing */
+#else
+#define def_thunk_size(str, size) \
+ printf("#define SIZEOF_" str " (SIZEOF_StgThunkHeader+%d)\n", size);
+#endif
+
#define struct_size(s_type) \
def_size(#s_type, sizeof(s_type));
#define struct_size(s_type) \
def_size(#s_type, sizeof(s_type));
@@
-102,35
+111,64
@@
def_size(#s_type "_NoHdr", sizeof(s_type) - sizeof(StgHeader)); \
def_closure_size(#s_type, sizeof(s_type) - sizeof(StgHeader));
def_size(#s_type "_NoHdr", sizeof(s_type) - sizeof(StgHeader)); \
def_closure_size(#s_type, sizeof(s_type) - sizeof(StgHeader));
+#define thunk_size(s_type) \
+ def_size(#s_type "_NoHdr", sizeof(s_type) - sizeof(StgHeader)); \
+ def_thunk_size(#s_type, sizeof(s_type) - sizeof(StgHeader));
+
/* 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");
/* 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");
+#define thunk_field_macro(str) \
+ printf("#define " str "(__ptr__) REP_" str "[__ptr__+SIZEOF_StgThunkHeader+OFFSET_" str "]\n");
+
#define closure_field_offset_(str, s_type,field) \
def_offset(str, OFFSET(s_type,field) - sizeof(StgHeader));
#define closure_field_offset_(str, s_type,field) \
def_offset(str, OFFSET(s_type,field) - sizeof(StgHeader));
+#define thunk_field_offset_(str, s_type, field) \
+ closure_field_offset_(str, s_type, field)
+
#define closure_field_offset(s_type,field) \
#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 thunk_field_offset(s_type,field) \
+ thunk_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");
#define closure_payload_macro(str) \
printf("#define " str "(__ptr__,__ix__) W_[__ptr__+SIZEOF_StgHeader+OFFSET_" str " + WDS(__ix__)]\n");
+#define thunk_payload_macro(str) \
+ printf("#define " str "(__ptr__,__ix__) W_[__ptr__+SIZEOF_StgThunkHeader+OFFSET_" str " + WDS(__ix__)]\n");
+
#define closure_payload(s_type,field) \
closure_field_offset_(str(s_type,field),s_type,field); \
closure_payload_macro(str(s_type,field));
#define closure_payload(s_type,field) \
closure_field_offset_(str(s_type,field),s_type,field); \
closure_payload_macro(str(s_type,field));
+#define thunk_payload(s_type,field) \
+ thunk_field_offset_(str(s_type,field),s_type,field); \
+ thunk_payload_macro(str(s_type,field));
+
/* 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 */
#define closure_field(s_type, field) \
closure_field_offset(s_type,field) \
field_type(s_type, field); \
closure_field_macro(str(s_type,field))
+#define thunk_field(s_type, field) \
+ thunk_field_offset(s_type,field) \
+ field_type(s_type, field); \
+ thunk_field_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)
/* 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 thunk_field_(str, s_type, field) \
+ thunk_field_offset_(str,s_type,field) \
+ field_type_(str, s_type, field); \
+ thunk_field_macro(str)
/*
* Byte offset and MachRep for a TSO field, minus the header and
* variable prof bit.
/*
* Byte offset and MachRep for a TSO field, minus the header and
* variable prof bit.
@@
-205,6
+243,13
@@
main(int argc, char *argv[])
field_offset(StgRegTable, rCurrentNursery);
field_offset(StgRegTable, rHpAlloc);
field_offset(StgRegTable, rCurrentNursery);
field_offset(StgRegTable, rHpAlloc);
+ // 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));
def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
def_offset("stgGCFun", FUN_OFFSET(stgGCFun));
@@
-232,6
+277,8
@@
main(int argc, char *argv[])
struct_field_("StgHeader_ccs", StgHeader, prof.ccs);
struct_field_("StgHeader_ldvw", StgHeader, prof.hp.ldvw);
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);
closure_payload(StgClosure,payload);
struct_field(StgEntCounter, allocs);
@@
-289,10
+336,10
@@
main(int argc, char *argv[])
closure_field(StgAP, fun);
closure_payload(StgAP, payload);
closure_field(StgAP, fun);
closure_payload(StgAP, payload);
- closure_size(StgAP_STACK);
- closure_field(StgAP_STACK, size);
- closure_field(StgAP_STACK, fun);
- closure_payload(StgAP_STACK, payload);
+ thunk_size(StgAP_STACK);
+ thunk_field(StgAP_STACK, size);
+ thunk_field(StgAP_STACK, fun);
+ thunk_payload(StgAP_STACK, payload);
closure_field(StgInd, indirectee);
closure_field(StgInd, indirectee);
@@
-312,9
+359,6
@@
main(int argc, char *argv[])
closure_field(StgCatchRetryFrame, alt_code);
closure_field(StgCatchRetryFrame, first_code_trec);
closure_field(StgCatchRetryFrame, alt_code);
closure_field(StgCatchRetryFrame, first_code_trec);
- closure_size(StgForeignObj);
- closure_field(StgForeignObj,data);
-
closure_size(StgWeak);
closure_field(StgWeak,link);
closure_field(StgWeak,key);
closure_size(StgWeak);
closure_field(StgWeak,link);
closure_field(StgWeak,key);
@@
-329,10
+373,6
@@
main(int argc, char *argv[])
closure_field(StgMVar,tail);
closure_field(StgMVar,value);
closure_field(StgMVar,tail);
closure_field(StgMVar,value);
- closure_size(StgTVar);
- closure_field(StgTVar,current_value);
- closure_field(StgTVar,first_wait_queue_entry);
-
closure_size(StgBCO);
closure_field(StgBCO, instrs);
closure_field(StgBCO, literals);
closure_size(StgBCO);
closure_field(StgBCO, instrs);
closure_field(StgBCO, literals);
@@
-360,13
+400,13
@@
main(int argc, char *argv[])
struct_field(StgFunInfoExtraFwd, slow_apply);
struct_field(StgFunInfoExtraFwd, fun_type);
struct_field(StgFunInfoExtraFwd, arity);
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_offset);
struct_field(StgFunInfoExtraRev, fun_type);
struct_field(StgFunInfoExtraRev, arity);
struct_size(StgFunInfoExtraRev);
struct_field(StgFunInfoExtraRev, slow_apply_offset);
struct_field(StgFunInfoExtraRev, fun_type);
struct_field(StgFunInfoExtraRev, arity);
- struct_field(StgFunInfoExtraRev, b.bitmap);
+ struct_field_("StgFunInfoExtraRev_bitmap", StgFunInfoExtraRev, b.bitmap);
struct_field(StgLargeBitmap, size);
field_offset(StgLargeBitmap, bitmap);
struct_field(StgLargeBitmap, size);
field_offset(StgLargeBitmap, bitmap);