X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FmkDerivedConstants.c;h=8587fa70904c4dccdca69a3707b5f75705707332;hb=25d3ecc4ebe5eb9a2f76f5de50496aba47e22795;hp=a1b59f707476d61277fe7d02f82e686e8b41b9ba;hpb=8504635323bc4c2d7ade98771a4e281c2d56761c;p=ghc-hetmet.git

diff --git a/ghc/includes/mkDerivedConstants.c b/ghc/includes/mkDerivedConstants.c
index a1b59f7..8587fa7 100644
--- a/ghc/includes/mkDerivedConstants.c
+++ b/ghc/includes/mkDerivedConstants.c
@@ -11,8 +11,6 @@
  *
  * ------------------------------------------------------------------------*/
 
-#include <stdio.h>
-
 #define IN_STG_CODE 0
 
 // We need offsets of profiled things... better be careful that this
@@ -23,6 +21,8 @@
 #include "RtsFlags.h"
 #include "Storage.h"
 
+#include <stdio.h>
+
 #define str(a,b) #a "_" #b
 
 #define OFFSET(s_type, field) ((unsigned int)&(((s_type*)0)->field))
@@ -213,7 +213,7 @@ main(int argc, char *argv[])
     struct_field(bdescr, link);
 
     struct_size(generation);
-    struct_field(generation, mut_once_list);
+    struct_field(generation, mut_list);
 
     struct_field(CostCentreStack, ccsID);
     struct_field(CostCentreStack, mem_alloc);
@@ -245,7 +245,6 @@ main(int argc, char *argv[])
     closure_payload(StgArrWords, payload);
 
     closure_field(StgTSO, link);
-    closure_field(StgTSO, mut_link);
     closure_field(StgTSO, global_link);
     closure_field(StgTSO, what_next);
     closure_field(StgTSO, why_blocked);
@@ -253,6 +252,7 @@ main(int argc, char *argv[])
     closure_field(StgTSO, blocked_exceptions);
     closure_field(StgTSO, id);
     closure_field(StgTSO, saved_errno);
+    closure_field(StgTSO, trec);
     closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
     tso_field(StgTSO, sp);
     tso_offset(StgTSO, stack);
@@ -293,11 +293,23 @@ main(int argc, char *argv[])
     closure_payload(StgAP_STACK, payload);
 
     closure_field(StgInd, indirectee);
-    closure_field(StgMutClosure, mut_link);
 
     closure_size(StgMutVar);
     closure_field(StgMutVar, var);
 
+    closure_size(StgAtomicallyFrame);
+    closure_field(StgAtomicallyFrame, waiting);
+    closure_field(StgAtomicallyFrame, code);
+
+    closure_size(StgCatchSTMFrame);
+    closure_field(StgCatchSTMFrame, handler);
+
+    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_size(StgForeignObj);
     closure_field(StgForeignObj,data);
 
@@ -315,6 +327,10 @@ main(int argc, char *argv[])
     closure_field(StgMVar,tail);
     closure_field(StgMVar,value);
 
+    closure_size(StgTVar);
+    closure_field(StgTVar,current_value);
+    closure_field(StgTVar,first_wait_queue_entry);
+
     closure_size(StgBCO);
     closure_field(StgBCO, instrs);
     closure_field(StgBCO, literals);
@@ -357,7 +373,7 @@ main(int argc, char *argv[])
     struct_field(snEntry,sn_obj);
     struct_field(snEntry,addr);
 
-#ifdef mingw32_TARGET_OS
+#ifdef mingw32_HOST_OS
     struct_size(StgAsyncIOResult);
     struct_field(StgAsyncIOResult, reqID);
     struct_field(StgAsyncIOResult, len);