MERGE: Fix a few uses of the wrong return convention for the scheduler

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

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index efb6c4a..c797941 100644 (file)
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -23,6 +23,7 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "Storage.h"
+#include "Stable.h"
 #include "OSThreads.h"
 #include "Capability.h"
 
@@ -260,7 +261,8 @@ main(int argc, char *argv[])
     struct_field(StgEntCounter, allocs);
     struct_field(StgEntCounter, registeredp);
     struct_field(StgEntCounter, link);
-    
+    struct_field(StgEntCounter, entry_count);
+
     closure_size(StgUpdateFrame);
     closure_size(StgCatchFrame);
     closure_size(StgStopFrame);
@@ -328,15 +330,26 @@ main(int argc, char *argv[])
 
     closure_size(StgAtomicallyFrame);
     closure_field(StgAtomicallyFrame, code);
+    closure_field(StgAtomicallyFrame, next_invariant_to_check);
+
+    closure_field(StgInvariantCheckQueue, invariant);
+    closure_field(StgInvariantCheckQueue, my_execution);
+    closure_field(StgInvariantCheckQueue, next_queue_entry);
+
+    closure_field(StgAtomicInvariant, code);
 
     closure_size(StgCatchSTMFrame);
     closure_field(StgCatchSTMFrame, handler);
+    closure_field(StgCatchSTMFrame, code);
 
     closure_size(StgCatchRetryFrame);
     closure_field(StgCatchRetryFrame, running_alt_code);
     closure_field(StgCatchRetryFrame, first_code);
     closure_field(StgCatchRetryFrame, alt_code);
-    closure_field(StgCatchRetryFrame, first_code_trec);
+
+    closure_field(StgTVarWatchQueue, closure);
+    closure_field(StgTVarWatchQueue, next_queue_entry);
+    closure_field(StgTVarWatchQueue, prev_queue_entry);
 
     closure_size(StgWeak);
     closure_field(StgWeak,link);
@@ -356,7 +369,6 @@ main(int argc, char *argv[])
     closure_field(StgBCO, instrs);
     closure_field(StgBCO, literals);
     closure_field(StgBCO, ptrs);
-    closure_field(StgBCO, itbls);
     closure_field(StgBCO, arity);
     closure_field(StgBCO, size);
     closure_payload(StgBCO, bitmap);
@@ -374,6 +386,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);