From 4751f0c6373c3e4ca265176d8087369c40c38786 Mon Sep 17 00:00:00 2001 From: Jorge Gorbe Moya Date: Fri, 12 Sep 2008 19:30:21 +0200 Subject: [PATCH] Disassembly of next instruction is back to the debugger --- gbcore.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gbcore.cc b/gbcore.cc index a208899..4187d93 100644 --- a/gbcore.cc +++ b/gbcore.cc @@ -4,6 +4,7 @@ #include "MBC.h" #include "Logger.h" #include "util.h" +#include "wendi/disasm.h" #include #include #include @@ -1444,14 +1445,12 @@ GameBoy::run_status GameBoy::run() std::string GameBoy::status_string() { - std::string disassembled_instruction; - //int length; - //disassemble_opcode(regs.PC, disassembled_instruction, length); + Instruction ins(disassemble_opcode(*this, regs.PC)); std::ostringstream result; result << "t = " << std::dec << cycle_count << "\tPC = " << std::hex << std::setw(4) << std::setfill('0') << regs.PC << - "\t" << disassembled_instruction << std::endl << + "\t" << ins.all << std::endl << "A = " << std::hex << std::setw(2) << std::setfill('0') << int(regs.A) << " B = " << std::hex << std::setw(2) << std::setfill('0') << int(regs.B) << " C = " << std::hex << std::setw(2) << std::setfill('0') << int(regs.C) << -- 2.34.1