Make allocatePinned use local storage, and other refactorings

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

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 89b9b1f..ddd2e65 100644 (file)
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -21,10 +21,8 @@
 #define THREADED_RTS
 
 #include "Rts.h"
-#include "RtsFlags.h"
-#include "Storage.h"
+
 #include "Stable.h"
-#include "OSThreads.h"
 #include "Capability.h"
 
 #include <stdio.h>
@@ -232,6 +230,7 @@ main(int argc, char *argv[])
     field_offset(StgRegTable, rCurrentNursery);
     field_offset(StgRegTable, rHpAlloc);
     struct_field(StgRegTable, rRet);
+    struct_field(StgRegTable, rNursery);
 
     def_offset("stgEagerBlackholeInfo", FUN_OFFSET(stgEagerBlackholeInfo));
     def_offset("stgGCEnter1", FUN_OFFSET(stgGCEnter1));
@@ -251,6 +250,8 @@ main(int argc, char *argv[])
     struct_size(generation);
     struct_field(generation, mut_list);
 
+    struct_field(step, n_large_blocks);
+
     struct_size(CostCentreStack);
     struct_field(CostCentreStack, ccsID);
     struct_field(CostCentreStack, mem_alloc);
@@ -295,6 +296,7 @@ main(int argc, char *argv[])
     closure_field(StgTSO, saved_errno);
     closure_field(StgTSO, trec);
     closure_field(StgTSO, flags);
+    closure_field(StgTSO, dirty);
     closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
     tso_field(StgTSO, sp);
     tso_field_offset(StgTSO, stack);
@@ -335,6 +337,7 @@ main(int argc, char *argv[])
     closure_size(StgAtomicallyFrame);
     closure_field(StgAtomicallyFrame, code);
     closure_field(StgAtomicallyFrame, next_invariant_to_check);
+    closure_field(StgAtomicallyFrame, result);
 
     closure_field(StgInvariantCheckQueue, invariant);
     closure_field(StgInvariantCheckQueue, my_execution);
@@ -342,6 +345,8 @@ main(int argc, char *argv[])
 
     closure_field(StgAtomicInvariant, code);
 
+    closure_field(StgTRecHeader, enclosing_trec);
+
     closure_size(StgCatchSTMFrame);
     closure_field(StgCatchSTMFrame, handler);
     closure_field(StgCatchSTMFrame, code);