X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FmkDerivedConstants.c;h=d00e428394fc3cdf9740ce3ea1614ac902153b3c;hb=f14f1daa67546643b49902c56829d13ec641f21c;hp=7efcf47d48161e6ecdf295f568b140342a08abb7;hpb=f4692220c7cbdadaa633f50eb2b30b59edb30183;p=ghc-hetmet.git

diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 7efcf47..d00e428 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -195,6 +195,8 @@ main(int argc, char *argv[])
 
     printf("#define BLOCK_SIZE   %u\n", BLOCK_SIZE);
     printf("#define MBLOCK_SIZE   %u\n", MBLOCK_SIZE);
+    printf("#define BLOCKS_PER_MBLOCK  %lu\n", (lnat)BLOCKS_PER_MBLOCK);
+    // could be derived, but better to save doing the calculation twice
 
     printf("\n\n");
 #endif
@@ -234,6 +236,7 @@ main(int argc, char *argv[])
     field_offset(Capability, lock);
     struct_field(Capability, mut_lists);
     struct_field(Capability, context_switch);
+    struct_field(Capability, sparks);
 
     struct_field(bdescr, start);
     struct_field(bdescr, free);
@@ -243,7 +246,7 @@ main(int argc, char *argv[])
 
     struct_size(generation);
     struct_field(generation, mut_list);
-    struct_field(generation, n_new_large_blocks);
+    struct_field(generation, n_new_large_words);
 
     struct_size(CostCentreStack);
     struct_field(CostCentreStack, ccsID);
@@ -276,7 +279,7 @@ main(int argc, char *argv[])
     closure_field(StgMutArrPtrs, size);
 
     closure_size(StgArrWords);
-    closure_field(StgArrWords, words);
+    closure_field(StgArrWords, bytes);
     closure_payload(StgArrWords, payload);
 
     closure_field(StgTSO, _link);
@@ -293,9 +296,12 @@ main(int argc, char *argv[])
     closure_field(StgTSO, dirty);
     closure_field(StgTSO, bq);
     closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
-    tso_field(StgTSO, sp);
-    tso_field_offset(StgTSO, stack);
-    tso_field(StgTSO, stack_size);
+    closure_field(StgTSO, stackobj);
+
+    closure_field(StgStack, sp);
+    closure_field_offset(StgStack, stack);
+    closure_field(StgStack, stack_size);
+    closure_field(StgStack, dirty);
 
     struct_size(StgTSOProfInfo);