From 3112c4deb03a95f147afb0d2108509c18d220c18 Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Tue, 27 Aug 2019 23:27:28 +0200 Subject: [PATCH] improve 'break' command output --- src/debugger/DebuggerParser.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/debugger/DebuggerParser.cxx b/src/debugger/DebuggerParser.cxx index b8d5593a4..045d7f326 100644 --- a/src/debugger/DebuggerParser.cxx +++ b/src/debugger/DebuggerParser.cxx @@ -730,6 +730,7 @@ void DebuggerParser::executeBreak() { uInt16 addr; uInt8 bank; + uInt32 bankCount = debugger.cartDebug().bankCount(); if(argCount == 0) addr = debugger.cpuDebug().pc(); @@ -741,7 +742,7 @@ void DebuggerParser::executeBreak() else { bank = args[1]; - if(bank >= debugger.cartDebug().bankCount() && bank != 0xff) + if(bank >= bankCount && bank != 0xff) { commandResult << red("invalid bank"); return; @@ -756,7 +757,9 @@ void DebuggerParser::executeBreak() else commandResult << "cleared"; - commandResult << " breakpoint at $" << Base::HEX4 << addr << " in bank #" << std::dec << int(bank); + commandResult << " breakpoint at $" << Base::HEX4 << addr << " + mirrors"; + if(bankCount > 1) + commandResult << " in bank #" << std::dec << int(bank); } else { @@ -772,7 +775,9 @@ void DebuggerParser::executeBreak() else commandResult << "cleared"; - commandResult << " breakpoint at $" << Base::HEX4 << addr << " in bank #" << std::dec << int(i); + commandResult << " breakpoint at $" << Base::HEX4 << addr << " + mirrors"; + if(bankCount > 1) + commandResult << " in bank #" << std::dec << int(bank); } } }