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

working on formatting

This commit is contained in:
thrust26 2017-10-07 19:30:21 +02:00
parent ffacd7a5e7
commit 15925c313c
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/debugger/DebuggerParser.cxx
View File

@ -1152,10 +1152,7 @@ void DebuggerParser::executeListtraps()
for(uInt32 i = 0; i < names.size(); i++) for(uInt32 i = 0; i < names.size(); i++)
{ {
commandResult << Base::toString(i) << ": " << names[i]; commandResult << Base::toString(i) << ": " << names[i];
//commandResult << "|" << Base::toString(myTraps[i]->begin) << " " << Base::toString(myTraps[i]->end);
commandResult << "|" << Base::toString(myTraps[i]->begin) << Base::toString(myTraps[i]->end);
if(i != (names.size() - 1)) commandResult << endl; if(i != (names.size() - 1)) commandResult << endl;
} }
} }
@ -1597,10 +1594,28 @@ void DebuggerParser::executeTraps(bool read, bool write, string command, bool ha
{ {
displayBuf << "write"; displayBuf << "write";
} }
string label;
stringstream beginLabel, endLabel;
label = debugger.cartDebug().getLabel(beg, !write);
if(label != "")
{
beginLabel << " (";
beginLabel << label;
beginLabel << ")";
}
label = debugger.cartDebug().getLabel(end, !write);
if(label != "")
{
endLabel << " (";
endLabel << label;
endLabel << ")";
}
displayBuf << " " << Base::toString(beg) << beginLabel.str();
if(beg != end) if(beg != end)
displayBuf << " " << Base::toString(beg) << " " << Base::toString(end); displayBuf << " " << Base::toString(end) << endLabel.str();
else
displayBuf << " " << Base::toString(beg);
displayBuf << " + mirrors"; displayBuf << " + mirrors";
// TODO: mirrors // TODO: mirrors
@ -1631,8 +1646,8 @@ void DebuggerParser::executeTraps(bool read, bool write, string command, bool ha
// TODO: duplicates // TODO: duplicates
bool add = true; bool add = true;
string parserCondition = parserBuf.str(); const string parserCondition = parserBuf.str();
string displayCondition = displayBuf.str(); const string displayCondition = displayBuf.str();
int res = YaccParser::parse(parserCondition.c_str()); int res = YaccParser::parse(parserCondition.c_str());
if(res == 0) if(res == 0)
@ -1655,7 +1670,7 @@ void DebuggerParser::executeTraps(bool read, bool write, string command, bool ha
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// wrapper function for trap/trapread/trapwrite commands // wrapper function for trap(if)/trapread(if)/trapwrite(if) commands
void DebuggerParser::executeTrapRW(uInt32 addr, bool read, bool write, bool add) void DebuggerParser::executeTrapRW(uInt32 addr, bool read, bool write, bool add)
{ {
switch(debugger.cartDebug().addressType(addr)) switch(debugger.cartDebug().addressType(addr))