Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/ByteCode/Show.hs
    ... ... @@ -37,7 +37,7 @@ import GHC.Types.SrcLoc (noSrcSpan)
    37 37
     import GHC.Types.Name (Name)
    
    38 38
     import GHC.Types.Name.Occurrence (OccName)
    
    39 39
     import GHC.Types.Tickish (BreakTickIndex, BreakpointId (..))
    
    40
    -import GHC.Types.SptEntry (SptEntry)
    
    40
    +import GHC.Types.SptEntry (SptEntry (..))
    
    41 41
     import GHC.Types.Error (MessageClass (MCDump))
    
    42 42
     import GHC.Utils.Logger (Logger, logMsg)
    
    43 43
     import GHC.Utils.Binary (BinSrcSpan (..))
    
    ... ... @@ -260,10 +260,6 @@ pprDataConstructorInfoTable dataConstrName ConInfoTable {..}
    260 260
                    pprPointerTag          $ conItblPtrTag,
    
    261 261
                    pprDescription         $ conItblDescr
    
    262 262
                ]
    
    263
    -{-FIXME:
    
    264
    -    Check based on any answers to my message on 4 June 2026, 13:17 EEST whether
    
    265
    -    the current handling of `conItblPtrs` and `conItblNPtrs` is correct.
    
    266
    --}
    
    267 263
     
    
    268 264
     -- | […]
    
    269 265
     pprTablePositioning :: Bool -> SDoc
    
    ... ... @@ -404,7 +400,7 @@ pprBreakpointInByteCode currentModule ix CgBreakInfo {..}
    404 400
         -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' using one of its arguments and
    
    405 401
         -- 'dehydrateCgBreakInfo' is always invoked with this argument set to the
    
    406 402
         -- extension field of 'Breakpoint', which in turn holds the type of the
    
    407
    -    -- breakpoint, according to Note [Tickish passes] and the comment on the
    
    403
    +    -- breakpoint according to Note [Tickish passes] and the comment on the
    
    408 404
         -- instance declaration of @XBreakpoint 'TickishPassStg@.
    
    409 405
     
    
    410 406
     pprType :: IfaceType -> SDoc
    
    ... ... @@ -449,7 +445,7 @@ pprOrigin currentModule = entry (text "origin:") .
    449 445
                               pprBreakpointID currentModule .
    
    450 446
                               either internalBreakLoc id
    
    451 447
     
    
    452
    --- | […] [analogous to 'pprInternalBreakpointID' but the meanging of the index is different]
    
    448
    +-- | […] [analogous to 'pprInternalBreakpointID' but the meaning of the index is different]
    
    453 449
     pprBreakpointID :: Module -> BreakpointId -> SDoc
    
    454 450
     pprBreakpointID currentModule BreakpointId {..}
    
    455 451
         | bi_tick_mod == currentModule = indexDoc
    
    ... ... @@ -462,7 +458,13 @@ pprBreakpointID currentModule BreakpointId {..}
    462 458
     -- | […]
    
    463 459
     pprStaticPointerTableEntries :: [SptEntry] -> SDoc
    
    464 460
     pprStaticPointerTableEntries = entry (text "static-pointer table entries:") .
    
    465
    -                               pprStaticPointerTableEntries
    
    461
    +                               vcatOrNone                                   .
    
    462
    +                               map pprStaticPointerTableEntry
    
    463
    +
    
    464
    +-- | […]
    
    465
    +pprStaticPointerTableEntry :: SptEntry -> SDoc
    
    466
    +pprStaticPointerTableEntry (SptEntry name fingerprint)
    
    467
    +    = ppr fingerprint <> text ":" <+> ppr name
    
    466 468
     
    
    467 469
     -- | […]
    
    468 470
     pprHPCInfo :: Strict.Maybe ByteCodeHpcInfo -> SDoc