From 0cc1ac573174c511fe7d29484500e41ee87c437d Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Sun, 20 Dec 2020 14:29:04 +0100 Subject: [PATCH] debugger: PPC disassembler uses MMU instruction path. --- debugger/debugger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debugger/debugger.cpp b/debugger/debugger.cpp index b7abb20..7ddeead 100644 --- a/debugger/debugger.cpp +++ b/debugger/debugger.cpp @@ -30,6 +30,7 @@ along with this program. If not, see . #include "../cpu/ppc/ppcdisasm.h" #include "../cpu/ppc/ppcemu.h" #include "../cpu/ppc/ppcmmu.h" +#include "memreadwrite.h" #ifdef ENABLE_68K_DEBUGGER // optionally defined in CMakeLists.txt #include @@ -322,7 +323,7 @@ static void disasm(uint32_t count, uint32_t address) { ctx.simplified = true; for (int i = 0; i < count; i++) { - ctx.instr_code = mem_read_dbg(ctx.instr_addr, 4); + ctx.instr_code = READ_DWORD_BE_A(quickinstruction_translate(ctx.instr_addr)); cout << uppercase << hex << ctx.instr_addr; cout << " " << disassemble_single(&ctx) << endl; }