From b3dc408195a4e3bb77b7a68b4352fffbe0110e8b Mon Sep 17 00:00:00 2001 From: michaelangel007 Date: Mon, 3 Jan 2022 22:47:25 -0800 Subject: [PATCH] Debugger: Cleanup --- source/Debugger/Debugger_Disassembler.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/source/Debugger/Debugger_Disassembler.cpp b/source/Debugger/Debugger_Disassembler.cpp index 6d2554d5..64420b79 100644 --- a/source/Debugger/Debugger_Disassembler.cpp +++ b/source/Debugger/Debugger_Disassembler.cpp @@ -243,9 +243,7 @@ int GetDisassemblyLine(WORD nBaseAddress, DisasmLine_t& line_) bDisasmFormatFlags |= DISASM_FORMAT_BRANCH; if (nTarget < nBaseAddress) - { sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorUp[g_iConfigDisasmBranchType]); - } else if (nTarget > nBaseAddress) { @@ -258,19 +256,19 @@ int GetDisassemblyLine(WORD nBaseAddress, DisasmLine_t& line_) } // intentional re-test AM_R ... -// if ((iOpmode >= AM_A) && (iOpmode <= AM_NA)) - if ((iOpmode == AM_A) || // Absolute - (iOpmode == AM_Z) || // Zeropage - (iOpmode == AM_AX) || // Absolute, X - (iOpmode == AM_AY) || // Absolute, Y - (iOpmode == AM_ZX) || // Zeropage, X - (iOpmode == AM_ZY) || // Zeropage, Y - (iOpmode == AM_R) || // Relative +// if ((iOpmode >= AM_A ) && (iOpmode <= AM_NA)) + if ((iOpmode == AM_A ) || // Absolute + (iOpmode == AM_Z ) || // Zeropage + (iOpmode == AM_AX ) || // Absolute, X + (iOpmode == AM_AY ) || // Absolute, Y + (iOpmode == AM_ZX ) || // Zeropage, X + (iOpmode == AM_ZY ) || // Zeropage, Y + (iOpmode == AM_R ) || // Relative (iOpmode == AM_IZX) || // Indexed (Zeropage Indirect, X) (iOpmode == AM_IAX) || // Indexed (Absolute Indirect, X) (iOpmode == AM_NZY) || // Indirect (Zeropage) Index, Y - (iOpmode == AM_NZ) || // Indirect (Zeropage) - (iOpmode == AM_NA)) //(Indirect Absolute) + (iOpmode == AM_NZ ) || // Indirect (Zeropage) + (iOpmode == AM_NA )) //(Indirect Absolute) { line_.nTarget = nTarget;