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
/
CodeGen.hs
diff --git
a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index
cd135de
..
f5dd3bb
100644
(file)
--- a/
compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/
compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@
-13,8
+13,8
@@
import LlvmCodeGen.Regs
import BlockId
import CgUtils ( activeStgRegs, callerSaves )
import CLabel
import BlockId
import CgUtils ( activeStgRegs, callerSaves )
import CLabel
-import Cmm
-import qualified PprCmm
+import OldCmm
+import qualified OldPprCmm as PprCmm
import OrdList
import BasicTypes
import OrdList
import BasicTypes
@@
-39,14
+39,14
@@
genLlvmProc :: LlvmEnv -> RawCmmTop -> UniqSM (LlvmEnv, [LlvmCmmTop])
genLlvmProc env (CmmData _ _)
= return (env, [])
genLlvmProc env (CmmData _ _)
= return (env, [])
-genLlvmProc env (CmmProc _ _ _ (ListGraph []))
+genLlvmProc env (CmmProc _ _ (ListGraph []))
= return (env, [])
= return (env, [])
-genLlvmProc env (CmmProc info lbl params (ListGraph blocks))
+genLlvmProc env (CmmProc info lbl (ListGraph blocks))
= do
(env', lmblocks, lmdata) <- basicBlocksCodeGen env blocks ([], [])
= do
(env', lmblocks, lmdata) <- basicBlocksCodeGen env blocks ([], [])
- let proc = CmmProc info lbl params (ListGraph lmblocks)
+ let proc = CmmProc info lbl (ListGraph lmblocks)
let tops = lmdata ++ [proc]
return (env', tops)
let tops = lmdata ++ [proc]
return (env', tops)