From e64dbac62758a2c95d0d8faea37b22287d585479 Mon Sep 17 00:00:00 2001 From: Norman Ramsey Date: Thu, 13 Sep 2007 17:34:46 +0000 Subject: [PATCH] tidying cmm/CmmLiveZ.hs --- compiler/cmm/CmmLiveZ.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/cmm/CmmLiveZ.hs b/compiler/cmm/CmmLiveZ.hs index 2b502d5..9b2fa56 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 -- 1.7.10.4