projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace _scc_'s in the GHC source with SCC pragmas
[ghc-hetmet.git]
/
compiler
/
cmm
/
PprC.hs
diff --git
a/compiler/cmm/PprC.hs
b/compiler/cmm/PprC.hs
index
77d337d
..
238fd61
100644
(file)
--- a/
compiler/cmm/PprC.hs
+++ b/
compiler/cmm/PprC.hs
@@
-199,7
+199,7
@@
pprStmt stmt = case stmt of
where
rep = cmmExprRep src
where
rep = cmmExprRep src
- CmmCall (CmmForeignCall fn cconv) results args safety ->
+ CmmCall (CmmCallee fn cconv) results args safety ->
-- Controversial: leave this out for now.
-- pprUndef fn $$
-- Controversial: leave this out for now.
-- pprUndef fn $$
@@
-322,8
+322,9
@@
pprExpr e = case e of
-> char '*' <> pprAsPtrReg r
CmmLoad (CmmRegOff r off) rep
-> char '*' <> pprAsPtrReg r
CmmLoad (CmmRegOff r off) rep
- | isPtrReg r && rep == wordRep
+ | isPtrReg r && rep == wordRep && (off `rem` wORD_SIZE == 0)
-- ToDo: check that the offset is a word multiple?
-- ToDo: check that the offset is a word multiple?
+ -- (For tagging to work, I had to avoid unaligned loads. --ARY)
-> pprAsPtrReg r <> brackets (ppr (off `shiftR` wordShift))
CmmLoad expr rep ->
-> pprAsPtrReg r <> brackets (ppr (off `shiftR` wordShift))
CmmLoad expr rep ->
@@
-794,12
+795,8
@@
pprExternDecl in_srt lbl
| not (needsCDecl lbl) = empty
| otherwise =
hcat [ visibility, label_type (labelType lbl),
| not (needsCDecl lbl) = empty
| otherwise =
hcat [ visibility, label_type (labelType lbl),
- lparen, dyn_wrapper (pprCLabel lbl), text ");" ]
+ lparen, pprCLabel lbl, text ");" ]
where
where
- dyn_wrapper d
- | in_srt && labelDynamic lbl = text "DLL_IMPORT_DATA_VAR" <> parens d
- | otherwise = d
-
label_type CodeLabel = ptext SLIT("F_")
label_type DataLabel = ptext SLIT("I_")
label_type CodeLabel = ptext SLIT("F_")
label_type DataLabel = ptext SLIT("I_")