diff options
| author | Norman Ramsey <nr@eecs.harvard.edu> | 2007-09-13 17:34:46 +0000 |
|---|---|---|
| committer | Norman Ramsey <nr@eecs.harvard.edu> | 2007-09-13 17:34:46 +0000 |
| commit | e64dbac62758a2c95d0d8faea37b22287d585479 (patch) | |
| tree | 429c87d428e04f65b8a82b730a659096c8d2269c /compiler/cmm/CmmLiveZ.hs | |
| parent | 855444fb5b955353a59e7062a3563f6a9324e676 (diff) | |
| download | haskell-e64dbac62758a2c95d0d8faea37b22287d585479.tar.gz | |
tidying cmm/CmmLiveZ.hs
Diffstat (limited to 'compiler/cmm/CmmLiveZ.hs')
| -rw-r--r-- | compiler/cmm/CmmLiveZ.hs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/compiler/cmm/CmmLiveZ.hs b/compiler/cmm/CmmLiveZ.hs index 2b502d500c..9b2fa56d5b 100644 --- a/compiler/cmm/CmmLiveZ.hs +++ b/compiler/cmm/CmmLiveZ.hs @@ -11,13 +11,14 @@ import Cmm import CmmExpr import CmmTx import DFMonad -import Maybes import PprCmm() import PprCmmZ() -import UniqSet import ZipDataflow import ZipCfgCmmRep +import Maybes +import UniqSet + ----------------------------------------------------------------------------- -- 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 - 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 @@ -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 (CopyOut _ formals) = gen formals + middle (CopyOut _ actuals) = gen actuals lastLiveness :: Last -> (BlockId -> CmmLive) -> CmmLive lastLiveness l env = last l |