projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minimize impact on PrelNames
[ghc-hetmet.git]
/
compiler
/
codeGen
/
CgInfoTbls.hs
diff --git
a/compiler/codeGen/CgInfoTbls.hs
b/compiler/codeGen/CgInfoTbls.hs
index
5b989f8
..
2745832
100644
(file)
--- a/
compiler/codeGen/CgInfoTbls.hs
+++ b/
compiler/codeGen/CgInfoTbls.hs
@@
-31,15
+31,14
@@
import CgCallConv
import CgUtils
import CgMonad
import CgUtils
import CgMonad
-import CmmUtils
-import Cmm
+import OldCmmUtils
+import OldCmm
import CLabel
import Name
import DataCon
import Unique
import StaticFlags
import CLabel
import Name
import DataCon
import Unique
import StaticFlags
-import Maybes
import Constants
import Util
import Outputable
import Constants
import Util
import Outputable
@@
-54,7
+53,7
@@
import Outputable
-- representation as a list of 'CmmAddr' is handled later
-- in the pipeline by 'cmmToRawCmm'.
-- representation as a list of 'CmmAddr' is handled later
-- in the pipeline by 'cmmToRawCmm'.
-emitClosureCodeAndInfoTable :: ClosureInfo -> CmmFormals -> CgStmts -> Code
+emitClosureCodeAndInfoTable :: ClosureInfo -> [CmmFormal] -> CgStmts -> Code
emitClosureCodeAndInfoTable cl_info args body
= do { blks <- cgStmtsToBlocks body
; info <- mkCmmInfo cl_info
emitClosureCodeAndInfoTable cl_info args body
= do { blks <- cgStmtsToBlocks body
; info <- mkCmmInfo cl_info
@@
-413,7
+412,7
@@
funInfoTable info_ptr
emitInfoTableAndCode
:: CLabel -- Label of entry or ret
-> CmmInfo -- ...the info table
emitInfoTableAndCode
:: CLabel -- Label of entry or ret
-> CmmInfo -- ...the info table
- -> CmmFormals -- ...args
+ -> [CmmFormal] -- ...args
-> [CmmBasicBlock] -- ...and body
-> Code
-> [CmmBasicBlock] -- ...and body
-> Code