Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
3478213a
Commit
3478213a
authored
Jan 04, 2012
by
Simon Marlow
Browse files
Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register
Needed by #5357
parent
6a9e5217
Changes
6
Hide whitespace changes
Inline
Side-by-side
compiler/codeGen/CgForeignCall.hs
View file @
3478213a
...
...
@@ -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
...
...
compiler/codeGen/StgCmmForeign.hs
View file @
3478213a
...
...
@@ -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
...
...
includes/mkDerivedConstants.c
View file @
3478213a
...
...
@@ -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
);
...
...
includes/rts/storage/TSO.h
View file @
3478213a
...
...
@@ -13,7 +13,7 @@
* PROFILING info in a TSO
*/
typedef
struct
{
CostCentreStack
*
CCCS
;
/* thread's current CCS */
CostCentreStack
*
cccs
;
/* thread's current CCS */
}
StgTSOProfInfo
;
/*
...
...
rts/RaiseAsync.c
View file @
3478213a
...
...
@@ -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
...
...
rts/Threads.c
View file @
3478213a
...
...
@@ -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
...
...
Simon Marlow
@simonmar
mentioned in issue
#5357 (closed)
·
Jul 30, 2011
mentioned in issue
#5357 (closed)
mentioned in issue #5357
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment