projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort the output of :show packages
[ghc-hetmet.git]
/
compiler
/
codeGen
/
CgProf.hs
diff --git
a/compiler/codeGen/CgProf.hs
b/compiler/codeGen/CgProf.hs
index
6fd6e01
..
c2a8a1b
100644
(file)
--- a/
compiler/codeGen/CgProf.hs
+++ b/
compiler/codeGen/CgProf.hs
@@
-74,7
+74,7
@@
curCCS = CmmLoad curCCSAddr wordRep
-- Address of current CCS variable, for storing into
curCCSAddr :: CmmExpr
-- Address of current CCS variable, for storing into
curCCSAddr :: CmmExpr
-curCCSAddr = CmmLit (CmmLabel (mkRtsDataLabel SLIT("CCCS")))
+curCCSAddr = CmmLit (CmmLabel (mkRtsDataLabel (sLit "CCCS")))
mkCCostCentre :: CostCentre -> CmmLit
mkCCostCentre cc = CmmLabel (mkCCLabel cc)
mkCCostCentre :: CostCentre -> CmmLit
mkCCostCentre cc = CmmLabel (mkCCLabel cc)
@@
-267,7
+267,7
@@
enterCostCentreThunk closure =
ifProfiling $ do
stmtC $ CmmStore curCCSAddr (costCentreFrom closure)
ifProfiling $ do
stmtC $ CmmStore curCCSAddr (costCentreFrom closure)
-enter_ccs_fun stack = emitRtsCall SLIT("EnterFunCCS") [(stack,PtrHint)] False
+enter_ccs_fun stack = emitRtsCall (sLit "EnterFunCCS") [CmmKinded stack PtrHint] False
-- ToDo: vols
enter_ccs_fsub = enteringPAP 0
-- ToDo: vols
enter_ccs_fsub = enteringPAP 0
@@
-279,7
+279,7
@@
enter_ccs_fsub = enteringPAP 0
-- entering via a PAP.
enteringPAP :: Integer -> Code
enteringPAP n
-- entering via a PAP.
enteringPAP :: Integer -> Code
enteringPAP n
- = stmtC (CmmStore (CmmLit (CmmLabel (mkRtsDataLabel SLIT("entering_PAP"))))
+ = stmtC (CmmStore (CmmLit (CmmLabel (mkRtsDataLabel (sLit "entering_PAP"))))
(CmmLit (CmmInt n cIntRep)))
ifProfiling :: Code -> Code
(CmmLit (CmmInt n cIntRep)))
ifProfiling :: Code -> Code
@@
-392,11
+392,11
@@
emitRegisterCCS ccs = do
ccs_lit = CmmLit (CmmLabel (mkCCSLabel ccs))
ccs_lit = CmmLit (CmmLabel (mkCCSLabel ccs))
-cC_LIST = CmmLit (CmmLabel (mkRtsDataLabel SLIT("CC_LIST")))
-cC_ID = CmmLit (CmmLabel (mkRtsDataLabel SLIT("CC_ID")))
+cC_LIST = CmmLit (CmmLabel (mkRtsDataLabel (sLit "CC_LIST")))
+cC_ID = CmmLit (CmmLabel (mkRtsDataLabel (sLit "CC_ID")))
-cCS_LIST = CmmLit (CmmLabel (mkRtsDataLabel SLIT("CCS_LIST")))
-cCS_ID = CmmLit (CmmLabel (mkRtsDataLabel SLIT("CCS_ID")))
+cCS_LIST = CmmLit (CmmLabel (mkRtsDataLabel (sLit "CCS_LIST")))
+cCS_ID = CmmLit (CmmLabel (mkRtsDataLabel (sLit "CCS_ID")))
-- ---------------------------------------------------------------------------
-- Set the current cost centre stack
-- ---------------------------------------------------------------------------
-- Set the current cost centre stack
@@
-415,8
+415,8
@@
emitSetCCC cc
pushCostCentre :: LocalReg -> CmmExpr -> CostCentre -> Code
pushCostCentre result ccs cc
= emitRtsCallWithResult result PtrHint
pushCostCentre :: LocalReg -> CmmExpr -> CostCentre -> Code
pushCostCentre result ccs cc
= emitRtsCallWithResult result PtrHint
- SLIT("PushCostCentre") [(ccs,PtrHint),
- (CmmLit (mkCCostCentre cc), PtrHint)]
+ (sLit "PushCostCentre") [CmmKinded ccs PtrHint,
+ CmmKinded (CmmLit (mkCCostCentre cc)) PtrHint]
False
bumpSccCount :: CmmExpr -> CmmStmt
False
bumpSccCount :: CmmExpr -> CmmStmt
@@
-481,7
+481,7
@@
ldvEnter cl_ptr
loadEra :: CmmExpr
loadEra = CmmMachOp (MO_U_Conv cIntRep wordRep)
loadEra :: CmmExpr
loadEra = CmmMachOp (MO_U_Conv cIntRep wordRep)
- [CmmLoad (mkLblExpr (mkRtsDataLabel SLIT("era"))) cIntRep]
+ [CmmLoad (mkLblExpr (mkRtsDataLabel (sLit "era"))) cIntRep]
ldvWord :: CmmExpr -> CmmExpr
-- Takes the address of a closure, and returns
ldvWord :: CmmExpr -> CmmExpr
-- Takes the address of a closure, and returns