diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2022-09-16 17:40:51 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-22 09:26:05 -0400 |
| commit | 615e22789a04e74d7e02239b4580b95b077c3ae0 (patch) | |
| tree | 01ddd6e717b2f4dc2e17ac293546dd8a1a781ab8 /compiler/GHC/Cmm | |
| parent | 9034fadaf641c3821db6e066faaf1a62ed236c13 (diff) | |
| download | haskell-615e22789a04e74d7e02239b4580b95b077c3ae0.tar.gz | |
Minor refactor around Outputable
* Replace 'text . show' and 'ppr' with 'int'.
* Remove Outputable.hs-boot, no longer needed
* Use pprWithCommas
* Factor out instructions in AArch64 codegen
Diffstat (limited to 'compiler/GHC/Cmm')
| -rw-r--r-- | compiler/GHC/Cmm/CLabel.hs | 8 | ||||
| -rw-r--r-- | compiler/GHC/Cmm/DebugBlock.hs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs index 4d5aebe052..cf004d02cb 100644 --- a/compiler/GHC/Cmm/CLabel.hs +++ b/compiler/GHC/Cmm/CLabel.hs @@ -1481,28 +1481,28 @@ pprCLabel !platform !sty lbl = -- see Note [Bangs in CLabel] -> maybe_underscore $ ftext str <> text "_fast" RtsLabel (RtsSelectorInfoTable upd_reqd offset) - -> maybe_underscore $ hcat [ text "stg_sel_", text (show offset) + -> maybe_underscore $ hcat [ text "stg_sel_", int offset , if upd_reqd then text "_upd_info" else text "_noupd_info" ] RtsLabel (RtsSelectorEntry upd_reqd offset) - -> maybe_underscore $ hcat [ text "stg_sel_", text (show offset) + -> maybe_underscore $ hcat [ text "stg_sel_", int offset , if upd_reqd then text "_upd_entry" else text "_noupd_entry" ] RtsLabel (RtsApInfoTable upd_reqd arity) - -> maybe_underscore $ hcat [ text "stg_ap_", text (show arity) + -> maybe_underscore $ hcat [ text "stg_ap_", int arity , if upd_reqd then text "_upd_info" else text "_noupd_info" ] RtsLabel (RtsApEntry upd_reqd arity) - -> maybe_underscore $ hcat [ text "stg_ap_", text (show arity) + -> maybe_underscore $ hcat [ text "stg_ap_", int arity , if upd_reqd then text "_upd_entry" else text "_noupd_entry" diff --git a/compiler/GHC/Cmm/DebugBlock.hs b/compiler/GHC/Cmm/DebugBlock.hs index 6eca29e722..3a7ceb7746 100644 --- a/compiler/GHC/Cmm/DebugBlock.hs +++ b/compiler/GHC/Cmm/DebugBlock.hs @@ -524,7 +524,7 @@ instance OutputableP Platform UnwindExpr where pprUnwindExpr :: Rational -> Platform -> UnwindExpr -> SDoc pprUnwindExpr p env = \case - UwConst i -> ppr i + UwConst i -> int i UwReg g 0 -> ppr g UwReg g x -> pprUnwindExpr p env (UwPlus (UwReg g 0) (UwConst x)) UwDeref e -> char '*' <> pprUnwindExpr 3 env e |