X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FmkDerivedConstants.c;h=d993643a4cecc447cb80a1ff2cbe42feef252a5d;hb=54e6de853bd5260389006e75d661877ef1ea951d;hp=2fe99b6ba552ebd3903cc5637b9332348b8c39e5;hpb=e7c08550be472eb94a383d4c6115c83e103fcd28;p=ghc-hetmet.git

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 2fe99b6..d993643 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -40,8 +40,9 @@
 #endif
 
 #if defined(GEN_HASKELL)
-#define def_offset(str, offset) \
-    printf("oFFSET_" str " = %" SIZET_FMT "::Int\n", offset);
+#define def_offset(str, offset)                          \
+    printf("oFFSET_" str " :: Int\n");                   \
+    printf("oFFSET_" str " = %" SIZET_FMT "\n", offset);
 #else
 #define def_offset(str, offset) \
     printf("#define OFFSET_" str " %" SIZET_FMT "\n", offset);
@@ -56,10 +57,19 @@
 
 #if defined(GEN_HASKELL)
 #define field_type_(str, s_type, field) /* nothing */
+#define field_type_gcptr_(str, s_type, field) /* nothing */
 #else
+/* Defining REP_x to be b32 etc
+   These are both the C-- types used in a load
+      e.g.  b32[addr]
+   and the names of the CmmTypes in the compiler
+      b32 :: CmmType
+*/
 #define field_type_(str, s_type, field) \
-    printf("#define REP_" str " I"); \
+    printf("#define REP_" str " b"); \
     printf("%d\n", sizeof (__typeof__(((((s_type*)0)->field)))) * 8);
+#define field_type_gcptr_(str, s_type, field) \
+    printf("#define REP_" str " gcptr\n");
 #endif
 
 #define field_type(s_type, field) \
@@ -87,8 +97,9 @@
     struct_field_macro(str)
 
 #if defined(GEN_HASKELL)
-#define def_size(str, size) \
-    printf("sIZEOF_" str " = %d::Int\n", size);
+#define def_size(str, size)                \
+    printf("sIZEOF_" str " :: Int\n");     \
+    printf("sIZEOF_" str " = %d\n", size);
 #else
 #define def_size(str, size) \
     printf("#define SIZEOF_" str " %d\n", size);
@@ -134,17 +145,23 @@
     closure_payload_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 closure_field(s_type, field) \
-    closure_field_offset(s_type,field) \
-    field_type(s_type, field); \
-    closure_field_macro(str(s_type,field))
+    closure_field_(str(s_type,field),s_type,field)
 
 /* Byte offset and MachRep for a closure field, minus the header */
-#define closure_field_(str, s_type, field) \
+#define closure_field_gcptr_(str, s_type, field) \
     closure_field_offset_(str,s_type,field) \
-    field_type_(str, s_type, field); \
+    field_type_gcptr_(str, s_type, field); \
     closure_field_macro(str)
 
+#define closure_field_gcptr(s_type, field) \
+    closure_field_gcptr_(str(s_type,field),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));
@@ -224,12 +241,14 @@ main(int argc, char *argv[])
     field_offset(StgRegTable, rmp_result1);
     field_offset(StgRegTable, rmp_result2);
 
+    def_offset("stgEagerBlackholeInfo", FUN_OFFSET(stgEagerBlackholeInfo));
     def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
     def_offset("stgGCFun", FUN_OFFSET(stgGCFun));
 
     field_offset(Capability, r);
     field_offset(Capability, lock);
     struct_field(Capability, mut_lists);
+    struct_field(Capability, context_switch);
 
     struct_field(bdescr, start);
     struct_field(bdescr, free);
@@ -273,7 +292,7 @@ main(int argc, char *argv[])
     closure_field(StgArrWords, words);
     closure_payload(StgArrWords, payload);
 
-    closure_field(StgTSO, link);
+    closure_field(StgTSO, _link);
     closure_field(StgTSO, global_link);
     closure_field(StgTSO, what_next);
     closure_field(StgTSO, why_blocked);
@@ -306,23 +325,23 @@ main(int argc, char *argv[])
 
     closure_size(StgPAP);
     closure_field(StgPAP, n_args);
-    closure_field(StgPAP, fun);
+    closure_field_gcptr(StgPAP, fun);
     closure_field(StgPAP, arity);
     closure_payload(StgPAP, payload);
 
     thunk_size(StgAP);
     closure_field(StgAP, n_args);
-    closure_field(StgAP, fun);
+    closure_field_gcptr(StgAP, fun);
     closure_payload(StgAP, payload);
 
     thunk_size(StgAP_STACK);
     closure_field(StgAP_STACK, size);
-    closure_field(StgAP_STACK, fun);
+    closure_field_gcptr(StgAP_STACK, fun);
     closure_payload(StgAP_STACK, payload);
 
     thunk_size(StgSelector);
 
-    closure_field(StgInd, indirectee);
+    closure_field_gcptr(StgInd, indirectee);
 
     closure_size(StgMutVar);
     closure_field(StgMutVar, var);
@@ -350,11 +369,14 @@ main(int argc, char *argv[])
     closure_field(StgTVarWatchQueue, next_queue_entry);
     closure_field(StgTVarWatchQueue, prev_queue_entry);
 
+    closure_field(StgTVar, current_value);
+
     closure_size(StgWeak);
     closure_field(StgWeak,link);
     closure_field(StgWeak,key);
     closure_field(StgWeak,value);
     closure_field(StgWeak,finalizer);
+    closure_field(StgWeak,cfinalizer);
 
     closure_size(StgDeadWeak);
     closure_field(StgDeadWeak,link);