Massive patch for the first months work adding System FC to GHC #35

[ghc-hetmet.git] / includes / mkDerivedConstants.c

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 27d4fa9..05bf373 100644 (file)
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -18,6 +18,7 @@
  * doesn't affect the offsets of anything else.
  */
 #define PROFILING
+#define THREADED_RTS
 
 #include "Rts.h"
 #include "RtsFlags.h"
@@ -227,6 +228,8 @@ main(int argc, char *argv[])
     def_offset("stgGCFun", FUN_OFFSET(stgGCFun));
 
     field_offset(Capability, r);
+    field_offset(Capability, lock);
+    struct_field(Capability, mut_lists);
 
     struct_field(bdescr, start);
     struct_field(bdescr, free);
@@ -276,8 +279,10 @@ main(int argc, char *argv[])
     closure_field(StgTSO, block_info);
     closure_field(StgTSO, blocked_exceptions);
     closure_field(StgTSO, id);
+    closure_field(StgTSO, cap);
     closure_field(StgTSO, saved_errno);
     closure_field(StgTSO, trec);
+    closure_field(StgTSO, flags);
     closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
     tso_field(StgTSO, sp);
     tso_field_offset(StgTSO, stack);
@@ -314,6 +319,8 @@ main(int argc, char *argv[])
     closure_field(StgAP_STACK, fun);
     closure_payload(StgAP_STACK, payload);
 
+    thunk_size(StgSelector);
+
     closure_field(StgInd, indirectee);
 
     closure_size(StgMutVar);
@@ -367,6 +374,8 @@ main(int argc, char *argv[])
                  RTS_FLAGS, DebugFlags.weak);
     struct_field_("RtsFlags_GcFlags_initialStkSize",
                  RTS_FLAGS, GcFlags.initialStkSize);
+    struct_field_("RtsFlags_MiscFlags_tickInterval",
+                 RTS_FLAGS, MiscFlags.tickInterval);
 
     struct_size(StgFunInfoExtraFwd);
     struct_field(StgFunInfoExtraFwd, slow_apply);