improve 'break' command output

This commit is contained in:
Thomas Jentzsch 2019-08-27 23:27:28 +02:00
parent 5dbb5b8957
commit 3112c4deb0
1 changed files with 8 additions and 3 deletions

View File

@ -730,6 +730,7 @@ void DebuggerParser::executeBreak()
{ {
uInt16 addr; uInt16 addr;
uInt8 bank; uInt8 bank;
uInt32 bankCount = debugger.cartDebug().bankCount();
if(argCount == 0) if(argCount == 0)
addr = debugger.cpuDebug().pc(); addr = debugger.cpuDebug().pc();
@ -741,7 +742,7 @@ void DebuggerParser::executeBreak()
else else
{ {
bank = args[1]; bank = args[1];
if(bank >= debugger.cartDebug().bankCount() && bank != 0xff) if(bank >= bankCount && bank != 0xff)
{ {
commandResult << red("invalid bank"); commandResult << red("invalid bank");
return; return;
@ -756,7 +757,9 @@ void DebuggerParser::executeBreak()
else else
commandResult << "cleared"; 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 else
{ {
@ -772,7 +775,9 @@ void DebuggerParser::executeBreak()
else else
commandResult << "cleared"; 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);
} }
} }
} }