projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge in new code generator branch.
[ghc-hetmet.git]
/
compiler
/
llvmGen
/
LlvmCodeGen
/
Ppr.hs
diff --git
a/compiler/llvmGen/LlvmCodeGen/Ppr.hs
b/compiler/llvmGen/LlvmCodeGen/Ppr.hs
index
853f1b1
..
911592b
100644
(file)
--- a/
compiler/llvmGen/LlvmCodeGen/Ppr.hs
+++ b/
compiler/llvmGen/LlvmCodeGen/Ppr.hs
@@
-13,7
+13,7
@@
import LlvmCodeGen.Base
import LlvmCodeGen.Data
import CLabel
import LlvmCodeGen.Data
import CLabel
-import Cmm
+import OldCmm
import FastString
import qualified Outputable
import FastString
import qualified Outputable
@@
-82,7
+82,7
@@
pprLlvmCmmTop :: LlvmEnv -> Int -> LlvmCmmTop -> (Doc, [LlvmVar])
pprLlvmCmmTop _ _ (CmmData _ lmdata)
= (vcat $ map pprLlvmData lmdata, [])
pprLlvmCmmTop _ _ (CmmData _ lmdata)
= (vcat $ map pprLlvmData lmdata, [])
-pprLlvmCmmTop env count (CmmProc info lbl _ (ListGraph blks))
+pprLlvmCmmTop env count (CmmProc info lbl (ListGraph blks))
= let static = CmmDataLabel lbl : info
(idoc, ivar) = if not (null info)
then pprInfoTable env count lbl static
= let static = CmmDataLabel lbl : info
(idoc, ivar) = if not (null info)
then pprInfoTable env count lbl static