projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2006-01-10 13:35:04 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
profiling
/
CostCentre.lhs
diff --git
a/ghc/compiler/profiling/CostCentre.lhs
b/ghc/compiler/profiling/CostCentre.lhs
index
f4a6ba9
..
3ee46a8
100644
(file)
--- a/
ghc/compiler/profiling/CostCentre.lhs
+++ b/
ghc/compiler/profiling/CostCentre.lhs
@@
-33,7
+33,7
@@
module CostCentre (
import Var ( Id )
import Name ( getOccName, occNameFS )
import Var ( Id )
import Name ( getOccName, occNameFS )
-import Module ( Module )
+import Module ( Module, moduleFS )
import Outputable
import FastTypes
import FastString
import Outputable
import FastTypes
import FastString
@@
-339,12
+339,12
@@
instance Outputable CostCentre where
-- Printing in an interface file or in Core generally
pprCostCentreCore (AllCafsCC {cc_mod = m})
-- Printing in an interface file or in Core generally
pprCostCentreCore (AllCafsCC {cc_mod = m})
- = text "__sccC" <+> braces (ppr m)
+ = text "__sccC" <+> braces (ppr_mod m)
pprCostCentreCore (NormalCC {cc_name = n, cc_mod = m,
cc_is_caf = caf, cc_is_dupd = dup})
= text "__scc" <+> braces (hsep [
pprCostCentreCore (NormalCC {cc_name = n, cc_mod = m,
cc_is_caf = caf, cc_is_dupd = dup})
= text "__scc" <+> braces (hsep [
- ftext n,
- ppr m,
+ ftext (zEncodeFS n),
+ ppr_mod m,
pp_dup dup,
pp_caf caf
])
pp_dup dup,
pp_caf caf
])
@@
-355,12
+355,13
@@
pp_dup other = empty
pp_caf CafCC = text "__C"
pp_caf other = empty
pp_caf CafCC = text "__C"
pp_caf other = empty
+ppr_mod m = ftext (zEncodeFS (moduleFS m))
-- Printing as a C label
ppCostCentreLbl (NoCostCentre) = text "NONE_cc"
ppCostCentreLbl (AllCafsCC {cc_mod = m}) = ppr m <> text "_CAFs_cc"
ppCostCentreLbl (NormalCC {cc_name = n, cc_mod = m, cc_is_caf = is_caf})
-- Printing as a C label
ppCostCentreLbl (NoCostCentre) = text "NONE_cc"
ppCostCentreLbl (AllCafsCC {cc_mod = m}) = ppr m <> text "_CAFs_cc"
ppCostCentreLbl (NormalCC {cc_name = n, cc_mod = m, cc_is_caf = is_caf})
- = ppr m <> ftext n <>
+ = ppr_mod m <> ftext (zEncodeFS n) <>
text (case is_caf of { CafCC -> "_CAF"; _ -> "" }) <> text "_cc"
-- This is the name to go in the user-displayed string,
text (case is_caf of { CafCC -> "_CAF"; _ -> "" }) <> text "_cc"
-- This is the name to go in the user-displayed string,