X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FmkDerivedConstants.c;h=27d4fa9e7b052663c59fc50dee314598431a21ed;hb=e6218fe7eff4e34e1a3c823cd4b7aebe09d2d4fb;hp=b7ecda43103edad5a904d20f29d8755527c5be8b;hpb=f13f904ae903d363367ca979163b6e27b309c002;p=ghc-hetmet.git

diff --git a/ghc/includes/mkDerivedConstants.c b/ghc/includes/mkDerivedConstants.c
index b7ecda4..27d4fa9 100644
--- a/ghc/includes/mkDerivedConstants.c
+++ b/ghc/includes/mkDerivedConstants.c
@@ -22,6 +22,8 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "Storage.h"
+#include "OSThreads.h"
+#include "Capability.h"
 
 #include <stdio.h>
 
@@ -91,13 +93,6 @@
     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));
 
@@ -110,78 +105,57 @@
     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));
+    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");
 
-#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 thunk_field_offset_(str, s_type, field) \
-    closure_field_offset_(str, s_type, field)
-
 #define closure_field_offset(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 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 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))
 
-#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)
 
-#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.
- */
-#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_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");	\
@@ -240,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));
@@ -298,7 +280,7 @@ main(int argc, char *argv[])
     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);
@@ -322,15 +304,15 @@ 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);
 
     thunk_size(StgAP_STACK);
-    thunk_field(StgAP_STACK, size);
-    thunk_field(StgAP_STACK, fun);
-    thunk_payload(StgAP_STACK, payload);
+    closure_field(StgAP_STACK, size);
+    closure_field(StgAP_STACK, fun);
+    closure_payload(StgAP_STACK, payload);
 
     closure_field(StgInd, indirectee);
 
@@ -338,7 +320,6 @@ main(int argc, char *argv[])
     closure_field(StgMutVar, var);
 
     closure_size(StgAtomicallyFrame);
-    closure_field(StgAtomicallyFrame, waiting);
     closure_field(StgAtomicallyFrame, code);
 
     closure_size(StgCatchSTMFrame);
@@ -350,9 +331,6 @@ main(int argc, char *argv[])
     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);
@@ -367,10 +345,6 @@ main(int argc, char *argv[])
     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);