diff --git a/macaw-arm/src/Data/Macaw/ARM/Disassemble.hs b/macaw-arm/src/Data/Macaw/ARM/Disassemble.hs index 6d553acc..136b65d6 100644 --- a/macaw-arm/src/Data/Macaw/ARM/Disassemble.hs +++ b/macaw-arm/src/Data/Macaw/ARM/Disassemble.hs @@ -201,6 +201,8 @@ disassembleBlock lookupSemantics gs curPCAddr maxOffset = do let lineStr = printf "%s: %s" (show curPCAddr) (show (case i of A32I i' -> ARMD.ppInstruction i' T32I i' -> ThumbD.ppInstruction i')) + let Just addrWord = MM.segoffAsAbsoluteAddr curPCAddr + addStmt (InstructionStart addrWord (T.pack lineStr)) addStmt (Comment (T.pack lineStr)) asAtomicStateUpdate (MM.relativeSegmentAddr curPCAddr) transformer diff --git a/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs b/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs index c8941942..f2d5c08c 100644 --- a/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs +++ b/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs @@ -136,6 +136,8 @@ disassembleBlock lookupSemantics gs curIPAddr maxOffset = do -- a result from the state of the 'Generator'. egs1 <- liftST $ ET.runExceptT (runGenerator genResult gs $ do let lineStr = printf "%s: %s" (show curIPAddr) (show (D.ppInstruction i)) + let Just addrWord = MM.segoffAsAbsoluteAddr curIPAddr + addStmt (InstructionStart addrWord (T.pack lineStr)) addStmt (Comment (T.pack lineStr)) asAtomicStateUpdate (MM.segoffAddr curIPAddr) transformer