projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge _stub.o files into the main .o file (Fixes #3687 and #706)
[ghc-hetmet.git]
/
compiler
/
codeGen
/
StgCmmUtils.hs
diff --git
a/compiler/codeGen/StgCmmUtils.hs
b/compiler/codeGen/StgCmmUtils.hs
index
9cfb241
..
48416e3
100644
(file)
--- a/
compiler/codeGen/StgCmmUtils.hs
+++ b/
compiler/codeGen/StgCmmUtils.hs
@@
-20,7
+20,7
@@
module StgCmmUtils (
tagToClosure, mkTaggedObjectLoad,
tagToClosure, mkTaggedObjectLoad,
- callerSaveVolatileRegs, get_GlobalReg_addr,
+ callerSaves, callerSaveVolatileRegs, get_GlobalReg_addr,
cmmAndWord, cmmOrWord, cmmNegate, cmmEqWord, cmmNeWord,
cmmUGtWord,
cmmAndWord, cmmOrWord, cmmNegate, cmmEqWord, cmmNeWord,
cmmUGtWord,
@@
-49,11
+49,11
@@
module StgCmmUtils (
import StgCmmMonad
import StgCmmClosure
import BlockId
import StgCmmMonad
import StgCmmClosure
import BlockId
-import Cmm
-import MkZipCfgCmm
+import CmmDecl
+import CmmExpr hiding (regUsedIn)
+import MkGraph
import CLabel
import CmmUtils
import CLabel
import CmmUtils
-import PprCmm ( {- instances -} )
import ForeignCall
import IdInfo
import ForeignCall
import IdInfo
@@
-596,7
+596,6
@@
reg `regUsedIn` CmmRegOff (CmmLocal reg') _ = reg == reg'
reg `regUsedIn` CmmMachOp _ es = any (reg `regUsedIn`) es
_reg `regUsedIn` _other = False -- The CmmGlobal cases
reg `regUsedIn` CmmMachOp _ es = any (reg `regUsedIn`) es
_reg `regUsedIn` _other = False -- The CmmGlobal cases
-
-------------------------------------------------------------------------
-- mkSwitch
-------------------------------------------------------------------------
-------------------------------------------------------------------------
-- mkSwitch
-------------------------------------------------------------------------