Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register
authorSimon Marlow <marlowsd@gmail.com>
Wed, 4 Jan 2012 15:13:23 +0000 (15:13 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Thu, 5 Jan 2012 15:20:16 +0000 (15:20 +0000)
Needed by #5357

compiler/codeGen/CgForeignCall.hs
compiler/codeGen/StgCmmForeign.hs
includes/mkDerivedConstants.c
includes/rts/storage/TSO.h
rts/RaiseAsync.c
rts/Threads.c

index 8d8b97d..bdc9e50 100644 (file)
@@ -271,7 +271,7 @@ nursery_bdescr_blocks = cmmOffset stgCurrentNursery oFFSET_bdescr_blocks
 
 tso_stackobj, tso_CCCS, stack_STACK, stack_SP :: ByteOff
 tso_stackobj = closureField oFFSET_StgTSO_stackobj
-tso_CCCS     = closureField oFFSET_StgTSO_CCCS
+tso_CCCS     = closureField oFFSET_StgTSO_cccs
 stack_STACK  = closureField oFFSET_StgStack_stack
 stack_SP     = closureField oFFSET_StgStack_sp
 
index 7c739c6..af88ba8 100644 (file)
@@ -246,7 +246,7 @@ nursery_bdescr_blocks = cmmOffset stgCurrentNursery oFFSET_bdescr_blocks
 
 tso_stackobj, tso_CCCS, stack_STACK, stack_SP :: ByteOff
 tso_stackobj = closureField oFFSET_StgTSO_stackobj
-tso_CCCS     = closureField oFFSET_StgTSO_CCCS
+tso_CCCS     = closureField oFFSET_StgTSO_cccs
 stack_STACK  = closureField oFFSET_StgStack_stack
 stack_SP     = closureField oFFSET_StgStack_sp
 
index 6688330..0c3e9c0 100644 (file)
@@ -297,7 +297,7 @@ main(int argc, char *argv[])
     closure_field(StgTSO, flags);
     closure_field(StgTSO, dirty);
     closure_field(StgTSO, bq);
-    closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS);
+    closure_field_("StgTSO_cccs", StgTSO, prof.cccs);
     closure_field(StgTSO, stackobj);
 
     closure_field(StgStack, sp);
index 20c6ebf..5e54bff 100644 (file)
@@ -13,7 +13,7 @@
  * PROFILING info in a TSO
  */
 typedef struct {
-  CostCentreStack *CCCS;       /* thread's current CCS */
+  CostCentreStack *cccs;       /* thread's current CCS */
 } StgTSOProfInfo;
 
 /*
index c7b10b8..2887617 100644 (file)
@@ -739,7 +739,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception,
      */
     if (RtsFlags.ProfFlags.showCCSOnException)
     {
-        fprintCCS_stderr(tso->prof.CCCS,exception,tso);
+        fprintCCS_stderr(tso->prof.cccs,exception,tso);
     }
 #endif
     // ASSUMES: the thread is not already complete or dead
index 7e660d6..5488a32 100644 (file)
@@ -113,7 +113,7 @@ createThread(Capability *cap, nat size)
     tso->trec = NO_TREC;
 
 #ifdef PROFILING
-    tso->prof.CCCS = CCS_MAIN;
+    tso->prof.cccs = CCS_MAIN;
 #endif
     
     // put a stop frame on the stack