diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt index 6980cc03..697d5945 100644 --- a/docs/Debugger_Changelog.txt +++ b/docs/Debugger_Changelog.txt @@ -1,5 +1,6 @@ /* +2.9.1.6 Added: Branch instructions now show target address 2.9.1.5 Added: Disassembly window now shows signed decimal values for immediate values. 2.9.1.4 Changed: Show symbol warnings in Orange, and length of symbols in light blue. 2.9.1.3 Added: DB commanoptionally supports = diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index dc754901..f47cd823 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define ALLOW_INPUT_LOWERCASE 1 // See /docs/Debugger_Changelog.txt for full details - const int DEBUGGER_VERSION = MAKE_VERSION(2,9,1,5); + const int DEBUGGER_VERSION = MAKE_VERSION(2,9,1,6); // Public _________________________________________________________________________________________ diff --git a/source/Debugger/Debugger_Disassembler.cpp b/source/Debugger/Debugger_Disassembler.cpp index 64420b79..5f64f889 100644 --- a/source/Debugger/Debugger_Disassembler.cpp +++ b/source/Debugger/Debugger_Disassembler.cpp @@ -245,14 +245,14 @@ int GetDisassemblyLine(WORD nBaseAddress, DisasmLine_t& line_) if (nTarget < nBaseAddress) sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorUp[g_iConfigDisasmBranchType]); else - if (nTarget > nBaseAddress) - { - sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorDown[g_iConfigDisasmBranchType]); - } - else - { - sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorEqual[g_iConfigDisasmBranchType]); - } + if (nTarget > nBaseAddress) + sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorDown[g_iConfigDisasmBranchType]); + else + sprintf(line_.sBranch, "%s", g_sConfigBranchIndicatorEqual[g_iConfigDisasmBranchType]); + + bDisasmFormatFlags |= DISASM_FORMAT_TARGET_POINTER; + if (g_iConfigDisasmTargets & DISASM_TARGET_ADDR) + sprintf(line_.sTargetPointer, "%04X", nTarget & 0xFFFF); } // intentional re-test AM_R ...