X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FPprCmm.hs;h=2d3fd6a7465bd3a9e96f6e8f85330de9d8826f5b;hb=1c5499d4d5d506ce0cc971e98c09bfbf7bc290a1;hp=602f51ce4d384962ce6462387418694c271737fe;hpb=1f8efd5d6214c490ef4942134abf5de9f468d29c;p=ghc-hetmet.git diff --git a/compiler/cmm/PprCmm.hs b/compiler/cmm/PprCmm.hs index 602f51c..2d3fd6a 100644 --- a/compiler/cmm/PprCmm.hs +++ b/compiler/cmm/PprCmm.hs @@ -130,14 +130,14 @@ instance Outputable CmmSafety where -- style of C--'s 'stackdata' declaration, just inside the proc body, -- and were labelled with the procedure name ++ "_info". pprInfo (CmmInfo gc_target update_frame CmmNonInfoTable) = - vcat [ptext SLIT("gc_target: ") <> - maybe (ptext SLIT("")) pprBlockId gc_target, + vcat [{-ptext SLIT("gc_target: ") <> + maybe (ptext SLIT("")) pprBlockId gc_target,-} ptext SLIT("update_frame: ") <> maybe (ptext SLIT("")) pprUpdateFrame update_frame] pprInfo (CmmInfo gc_target update_frame (CmmInfoTable (ProfilingInfo closure_type closure_desc) tag info)) = - vcat [ptext SLIT("gc_target: ") <> - maybe (ptext SLIT("")) pprBlockId gc_target, + vcat [{-ptext SLIT("gc_target: ") <> + maybe (ptext SLIT("")) pprBlockId gc_target,-} ptext SLIT("update_frame: ") <> maybe (ptext SLIT("")) pprUpdateFrame update_frame, ptext SLIT("type: ") <> pprLit closure_type, @@ -156,7 +156,7 @@ pprTypeInfo (FunInfo layout srt fun_type arity args slow_entry) = ptext SLIT("srt: ") <> ppr srt, ptext SLIT("fun_type: ") <> integer (toInteger fun_type), ptext SLIT("arity: ") <> integer (toInteger arity), - --ppr args, -- TODO: needs to be printed + --ptext SLIT("args: ") <> ppr args, -- TODO: needs to be printed ptext SLIT("slow: ") <> pprLit slow_entry ] pprTypeInfo (ThunkInfo layout srt) = @@ -212,7 +212,7 @@ pprStmt stmt = case stmt of -- call "ccall" foo(x, y)[r1, r2]; -- ToDo ppr volatile - CmmCall (CmmForeignCall fn cconv) results args safety -> + CmmCall (CmmCallee fn cconv) results args safety -> hcat [ if null results then empty else parens (commafy $ map ppr results) <> @@ -226,7 +226,7 @@ pprStmt stmt = case stmt of target fn' = parens (ppr fn') CmmCall (CmmPrim op) results args safety -> - pprStmt (CmmCall (CmmForeignCall (CmmLit lbl) CCallConv) + pprStmt (CmmCall (CmmCallee (CmmLit lbl) CCallConv) results args safety) where lbl = CmmLabel (mkForeignLabel (mkFastString (show op)) Nothing False)