diff options
| -rw-r--r-- | compiler/codeGen/CgForeignCall.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 2 | ||||
| -rw-r--r-- | includes/mkDerivedConstants.c | 2 | ||||
| -rw-r--r-- | includes/rts/storage/TSO.h | 2 | ||||
| -rw-r--r-- | rts/RaiseAsync.c | 2 | ||||
| -rw-r--r-- | rts/Threads.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs index 8d8b97d76a..bdc9e50c11 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 7c739c61b6..af88ba848a 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 6688330a8c..0c3e9c0d16 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 20c6ebf4f2..5e54bff72c 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 c7b10b856e..2887617c34 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 7e660d63f6..5488a320fe 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 |