ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added index to conditional trapif/breakif/savestateif display

This commit is contained in:
thrust26 2017-12-18 13:28:23 +01:00
parent 50c8c5c266
commit e5216d4f90
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/emucore/M6502.cxx
View File

@ -21,6 +21,7 @@
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "PackedBitArray.hxx" #include "PackedBitArray.hxx"
#include "TIA.hxx" #include "TIA.hxx"
#include "Base.hxx"
#include "M6532.hxx" #include "M6532.hxx"
// Flags for disassembly types // Flags for disassembly types
@ -142,8 +143,9 @@ inline uInt8 M6502::peek(uInt16 address, uInt8 flags)
if(cond > -1) if(cond > -1)
{ {
myJustHitReadTrapFlag = true; myJustHitReadTrapFlag = true;
myHitTrapInfo.message = "RTrap" stringstream msg;
+ (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} "); msg << "RTrap[" << Common::Base::HEX2 << cond << "]" << (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
myHitTrapInfo.message = msg.str();
myHitTrapInfo.address = address; myHitTrapInfo.address = address;
} }
} }
@ -176,8 +178,9 @@ inline void M6502::poke(uInt16 address, uInt8 value, uInt8 flags)
if(cond > -1) if(cond > -1)
{ {
myJustHitWriteTrapFlag = true; myJustHitWriteTrapFlag = true;
myHitTrapInfo.message = "WTrap" stringstream msg;
+ (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} "); msg << "WTrap[" << Common::Base::HEX2 << cond << "]" << (myTrapCondNames[cond].empty() ? ": " : "If: {" + myTrapCondNames[cond] + "} ");
myHitTrapInfo.message = msg.str();
myHitTrapInfo.address = address; myHitTrapInfo.address = address;
} }
} }
@ -240,15 +243,18 @@ bool M6502::execute(uInt32 number)
int cond = evalCondBreaks(); int cond = evalCondBreaks();
if(cond > -1) if(cond > -1)
{ {
string buf = "CBP: " + myCondBreakNames[cond]; stringstream msg;
if(myDebugger && myDebugger->start(buf)) msg << "CBP[" << Common::Base::HEX2 << cond << "]: " << myCondBreakNames[cond];
if(myDebugger && myDebugger->start(msg.str()))
return true; return true;
} }
cond = evalCondSaveStates(); cond = evalCondSaveStates();
if(cond > -1) if(cond > -1)
{ {
myDebugger->addState("conditional savestate"); stringstream msg;
msg << "conditional savestate [" << Common::Base::HEX2 << cond << "]";
myDebugger->addState(msg.str());
} }
#endif // DEBUGGER_SUPPORT #endif // DEBUGGER_SUPPORT