projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
855444f
)
tidying cmm/CmmLiveZ.hs
author
Norman Ramsey
<nr@eecs.harvard.edu>
Thu, 13 Sep 2007 17:34:46 +0000
(17:34 +0000)
committer
Norman Ramsey
<nr@eecs.harvard.edu>
Thu, 13 Sep 2007 17:34:46 +0000
(17:34 +0000)
compiler/cmm/CmmLiveZ.hs
patch
|
blob
|
history
diff --git
a/compiler/cmm/CmmLiveZ.hs
b/compiler/cmm/CmmLiveZ.hs
index
2b502d5
..
9b2fa56
100644
(file)
--- a/
compiler/cmm/CmmLiveZ.hs
+++ b/
compiler/cmm/CmmLiveZ.hs
@@
-11,13
+11,14
@@
import Cmm
import CmmExpr
import CmmTx
import DFMonad
import CmmExpr
import CmmTx
import DFMonad
-import Maybes
import PprCmm()
import PprCmmZ()
import PprCmm()
import PprCmmZ()
-import UniqSet
import ZipDataflow
import ZipCfgCmmRep
import ZipDataflow
import ZipCfgCmmRep
+import Maybes
+import UniqSet
+
-----------------------------------------------------------------------------
-- Calculating what variables are live on entry to a basic block
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-- Calculating what variables are live on entry to a basic block
-----------------------------------------------------------------------------
@@
-40,10
+41,8
@@
type BlockEntryLiveness = BlockEnv CmmLive
-----------------------------------------------------------------------------
cmmLivenessZ :: CmmGraph -> BlockEntryLiveness
cmmLivenessZ g = env
-----------------------------------------------------------------------------
cmmLivenessZ :: CmmGraph -> BlockEntryLiveness
cmmLivenessZ g = env
- where env = runDFA liveLattice $
- do run_b_anal transfer g
- allFacts
- transfer = BComp "liveness analysis" exit last middle first
+ where env = runDFA liveLattice $ do { run_b_anal transfer g; allFacts }
+ transfer = BComp "liveness analysis" exit last middle first
exit = emptyUniqSet
first live _ = live
middle = flip middleLiveness
exit = emptyUniqSet
first live _ = live
middle = flip middleLiveness
@@
-63,7
+62,7
@@
middleLiveness m = middle m
middle (MidStore addr rval) = gen addr . gen rval
middle (MidUnsafeCall tgt ress args) = gen tgt . gen args . kill ress
middle (CopyIn _ formals _) = kill formals
middle (MidStore addr rval) = gen addr . gen rval
middle (MidUnsafeCall tgt ress args) = gen tgt . gen args . kill ress
middle (CopyIn _ formals _) = kill formals
- middle (CopyOut _ formals) = gen formals
+ middle (CopyOut _ actuals) = gen actuals
lastLiveness :: Last -> (BlockId -> CmmLive) -> CmmLive
lastLiveness l env = last l
lastLiveness :: Last -> (BlockId -> CmmLive) -> CmmLive
lastLiveness l env = last l