diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-07-19 20:38:05 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-07-19 20:38:05 +0100 |
| commit | 322044b2670fe9dca22122dbf4cc79fa29b4442c (patch) | |
| tree | e3226359676fab1cc0560f6ed827d598fb2ddfc5 /compiler/cmm/PprCmm.hs | |
| parent | fb0769b62e3ea4392ad970f8913a76187fead79f (diff) | |
| parent | 0f693381e356ec90ee72ab40b21b74cbf4e20eb3 (diff) | |
| download | haskell-322044b2670fe9dca22122dbf4cc79fa29b4442c.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'compiler/cmm/PprCmm.hs')
| -rw-r--r-- | compiler/cmm/PprCmm.hs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/compiler/cmm/PprCmm.hs b/compiler/cmm/PprCmm.hs index 31c1794887..132f291540 100644 --- a/compiler/cmm/PprCmm.hs +++ b/compiler/cmm/PprCmm.hs @@ -231,13 +231,18 @@ pprNode node = pp_node <+> pp_debug CmmCall tgt k regs out res updfr_off -> hcat [ ptext (sLit "call"), space , pprFun tgt, parens (interpp'SP regs), space - , ptext (sLit "returns to") <+> ppr k <+> parens (ppr out) - <+> parens (ppr res) - , ptext (sLit " with update frame") <+> ppr updfr_off + , returns <+> + ptext (sLit "args: ") <> ppr out <> comma <+> + ptext (sLit "res: ") <> ppr res <> comma <+> + ptext (sLit "upd: ") <> ppr updfr_off , semi ] where pprFun f@(CmmLit _) = ppr f pprFun f = parens (ppr f) + returns + | Just r <- k = ptext (sLit "returns to") <+> ppr r <> comma + | otherwise = empty + CmmForeignCall {tgt=t, res=rs, args=as, succ=s, updfr=u, intrbl=i} -> hcat $ if i then [ptext (sLit "interruptible"), space] else [] ++ [ ptext (sLit "foreign call"), space @@ -245,7 +250,7 @@ pprNode node = pp_node <+> pp_debug , ptext (sLit "returns to") <+> ppr s <+> ptext (sLit "args:") <+> parens (ppr as) <+> ptext (sLit "ress:") <+> parens (ppr rs) - , ptext (sLit " with update frame") <+> ppr u + , ptext (sLit "upd:") <+> ppr u , semi ] pp_debug :: SDoc |