[commit: ghc] ghc-7.4: Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register (647f8a2)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/647f8a20e66fc3d11d7bdd8e1eaa3a9c25ab31d9

>---------------------------------------------------------------

commit 647f8a20e66fc3d11d7bdd8e1eaa3a9c25ab31d9
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jan 4 15:13:23 2012 +0000

    Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register
    
    Needed by #5357

>---------------------------------------------------------------

 compiler/codeGen/CgForeignCall.hs |    2 +-
 compiler/codeGen/StgCmmForeign.hs |    2 +-
 includes/mkDerivedConstants.c     |    2 +-
 includes/rts/storage/TSO.h        |    2 +-
 rts/RaiseAsync.c                  |    2 +-
 rts/Threads.c                     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs
index 8d8b97d..bdc9e50 100644
--- a/compiler/codeGen/CgForeignCall.hs
+++ b/compiler/codeGen/CgForeignCall.hs
@@ -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
 
diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs
index 7c739c6..af88ba8 100644
--- a/compiler/codeGen/StgCmmForeign.hs
+++ b/compiler/codeGen/StgCmmForeign.hs
@@ -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
 
diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c
index 6688330..0c3e9c0 100644
--- a/includes/mkDerivedConstants.c
+++ b/includes/mkDerivedConstants.c
@@ -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);
diff --git a/includes/rts/storage/TSO.h b/includes/rts/storage/TSO.h
index 20c6ebf..5e54bff 100644
--- a/includes/rts/storage/TSO.h
+++ b/includes/rts/storage/TSO.h
@@ -13,7 +13,7 @@
  * PROFILING info in a TSO
  */
 typedef struct {
-  CostCentreStack *CCCS;	/* thread's current CCS */
+  CostCentreStack *cccs;       /* thread's current CCS */
 } StgTSOProfInfo;
 
 /*
diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c
index c7b10b8..2887617 100644
--- a/rts/RaiseAsync.c
+++ b/rts/RaiseAsync.c
@@ -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
diff --git a/rts/Threads.c b/rts/Threads.c
index 7e660d6..5488a32 100644
--- a/rts/Threads.c
+++ b/rts/Threads.c
@@ -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