X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FPprCmmZ.hs;h=075f0e457b2161039d508b62c8c4e96e9f497d6e;hb=a02e7f40afc1aab7fe466f949f505c1d7250713d;hp=c588466051bd15b8dc1cc8078ddaaa77bd82b3b4;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69;p=ghc-hetmet.git

diff --git a/compiler/cmm/PprCmmZ.hs b/compiler/cmm/PprCmmZ.hs
index c588466..075f0e4 100644
--- a/compiler/cmm/PprCmmZ.hs
+++ b/compiler/cmm/PprCmmZ.hs
@@ -6,15 +6,13 @@ where
 
 import BlockId
 import Cmm
-import CmmExpr
 import PprCmm
 import Outputable
 import qualified ZipCfgCmmRep as G
 import qualified ZipCfg as Z
 import CmmZipUtil
 
-import Maybe
-import UniqSet
+import Data.Maybe
 import FastString
 
 ----------------------------------------------------------------
@@ -27,50 +25,48 @@ pprCmmGraphLikeCmm g = vcat (swallow blocks)
     where blocks = Z.postorder_dfs g
           swallow :: [G.CmmBlock] -> [SDoc]
           swallow [] = []
-          swallow (Z.Block id off t : rest) = tail (id, off) [] Nothing t rest
+          swallow (Z.Block id t : rest) = tail id [] Nothing t rest
           tail id prev' out (Z.ZTail m t) rest = tail id (mid m : prev') out t rest
           tail id prev' out (Z.ZLast (Z.LastOther l)) rest = last id prev' out l rest
           tail id prev' _   (Z.ZLast Z.LastExit)      rest = exit id prev' rest
           mid m = ppr m
-          block' (id, off) prev'
+          block' id prev'
               | id == Z.lg_entry g, entry_has_no_pred =
-                            vcat (text "<entry>" <> parens (ppr off) : reverse prev')
-              | otherwise = hang (ppr id <> parens (ppr off) <> colon) 4 (vcat (reverse prev'))
+                            vcat (text "<entry>" : reverse prev')
+              | otherwise = hang (ppr id <> colon) 4 (vcat (reverse prev'))
           last id prev' out l n =
               let endblock stmt = block' id (stmt : prev') : swallow n in
               case l of
                 G.LastBranch tgt ->
                     case n of
-                      Z.Block id' _ t : bs
+                      Z.Block id' t : bs
                           | tgt == id', unique_pred id' 
                           -> tail id prev' out t bs  -- optimize out redundant labels
                       _ -> endblock (ppr $ CmmBranch tgt)
                 l@(G.LastCondBranch expr tid fid) ->
                   let ft id = text "// fall through to " <> ppr id in
                   case n of
-                    Z.Block id' _ t : bs
+                    Z.Block id' t : bs
                       | id' == fid, isNothing out ->
                           tail id (ft fid : ppr (CmmCondBranch expr tid) : prev') Nothing t bs
                       | id' == tid, Just e' <- maybeInvertCmmExpr expr, isNothing out->
                           tail id (ft tid : ppr (CmmCondBranch e'   fid) : prev') Nothing t bs
                     _ -> endblock $ with_out out l
-                l@(G.LastJump   {}) -> endblock $ with_out out l
-                l@(G.LastReturn {}) -> endblock $ with_out out l
-                l@(G.LastSwitch {}) -> endblock $ with_out out l
-                l@(G.LastCall _ _ _)-> endblock $ with_out out l
+                l@(G.LastSwitch {})      -> endblock $ with_out out l
+                l@(G.LastCall _ _ _ _ _) -> endblock $ with_out out l
           exit id prev' n = -- highly irregular (assertion violation?)
               let endblock stmt = block' id (stmt : prev') : swallow n in
               endblock (text "// <exit>")
           preds = zipPreds g
           entry_has_no_pred = case lookupBlockEnv preds (Z.lg_entry g) of
                                 Nothing -> True
-                                Just s -> isEmptyUniqSet s
+                                Just s -> isEmptyBlockSet s
           single_preds =
               let add b single =
                     let id = Z.blockId b
                     in  case lookupBlockEnv preds id of
                           Nothing -> single
-                          Just s -> if sizeUniqSet s == 1 then
+                          Just s -> if sizeBlockSet s == 1 then
                                         extendBlockSet single id
                                     else single
               in  Z.fold_blocks add emptyBlockSet g
@@ -79,21 +75,14 @@ pprCmmGraphLikeCmm g = vcat (swallow blocks)
 with_out :: Maybe (G.Convention, CmmActuals) -> G.Last -> SDoc
 with_out Nothing l = ptext (sLit "??no-arguments??") <+> ppr l
 with_out (Just (conv, args)) l = last l
-    where last (G.LastCall e k _) =
+    where last (G.LastCall e k _ _ _) =
               hcat [ptext (sLit "... = foreign "),
                     doubleQuotes(ppr conv), space,
                     ppr_target e, parens ( commafy $ map ppr args ),
                     ptext (sLit " \"safe\""),
-                    case k of Nothing -> ptext (sLit " never returns")
-                              Just _ -> empty,
+                    text " returns to " <+> ppr k,
                     semi ]
-          last (G.LastReturn _) = ppr (CmmReturn $ noHints args)
-          last (G.LastJump e _) = ppr (CmmJump e $ noHints args)
           last l = ppr l
           ppr_target (CmmLit lit) = pprLit lit
           ppr_target fn'          = parens (ppr fn')
           commafy xs = hsep $ punctuate comma xs
-
--- Anything that uses this is bogus!
-noHints :: [a] -> [CmmHinted a]
-noHints = map (\v -> CmmHinted v NoHint)