Commit 3478213a authored by Simon Marlow's avatar Simon Marlow

Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register

Needed by #5357
parent 6a9e5217
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -13,7 +13,7 @@
* PROFILING info in a TSO
*/
typedef struct {
CostCentreStack *CCCS; /* thread's current CCS */
CostCentreStack *cccs; /* thread's current CCS */
} StgTSOProfInfo;
/*
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment