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

Second pass at integrating .sym labels into disassembly output. 

There's currently a problem in the internal code I have, so I need
to submit in pieces until it's tracked down.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2040 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-06-03 12:54:45 +00:00
parent 88f7f656e6
commit befafd5d62
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/debugger/DiStella.cxx
View File

@ -93,6 +93,10 @@ void DiStella::disasm(uInt32 distart, int pass)
{
#define HEX4 uppercase << hex << setw(4) << setfill('0')
#define HEX2 uppercase << hex << setw(2) << setfill('0')
#define USER_OR_AUTO_LABEL(pre, address, post) \
const string& l = myDbg.getLabel(address, true); \
if(l != EmptyString) nextline << pre << l << post; \
else nextline << pre << "L" << HEX4 << address << post;
uInt8 op, d1, opsrc;
uInt16 ad;
@ -306,7 +310,7 @@ void DiStella::disasm(uInt32 distart, int pass)
if (labfound == 1)
{
nextline << "L" << HEX4 << ad;
USER_OR_AUTO_LABEL("", ad, "");
nextlinebytes << HEX2 << (int)(ad&0xff) << " " << HEX2 << (int)(ad>>8);
}
else if (labfound == 3)
@ -317,7 +321,7 @@ void DiStella::disasm(uInt32 distart, int pass)
else if (labfound == 4)
{
int tmp = (ad & myAppData.end)+myOffset;
nextline << "L" << HEX4 << tmp;
USER_OR_AUTO_LABEL("", tmp, "");
nextlinebytes << HEX2 << (int)(tmp&0xff) << " " << HEX2 << (int)(tmp>>8);
}
else
@ -370,7 +374,7 @@ void DiStella::disasm(uInt32 distart, int pass)
if (labfound == 1)
{
nextline << "L" << HEX4 << ad << ",X";
USER_OR_AUTO_LABEL("", ad, ",X");
nextlinebytes << HEX2 << (int)(ad&0xff) << " " << HEX2 << (int)(ad>>8);
}
else if (labfound == 3)
@ -381,7 +385,7 @@ void DiStella::disasm(uInt32 distart, int pass)
else if (labfound == 4)
{
int tmp = (ad & myAppData.end)+myOffset;
nextline << "L" << HEX4 << tmp << ",X";
USER_OR_AUTO_LABEL("", tmp, ",X");
nextlinebytes << HEX2 << (int)(tmp&0xff) << " " << HEX2 << (int)(tmp>>8);
}
else
@ -406,7 +410,7 @@ void DiStella::disasm(uInt32 distart, int pass)
if (labfound == 1)
{
nextline << "L" << HEX4 << ad << ",Y";
USER_OR_AUTO_LABEL("", ad, ",Y");
nextlinebytes << HEX2 << (int)(ad&0xff) << " " << HEX2 << (int)(ad>>8);
}
else if (labfound == 3)
@ -417,7 +421,7 @@ void DiStella::disasm(uInt32 distart, int pass)
else if (labfound == 4)
{
int tmp = (ad & myAppData.end)+myOffset;
nextline << "L" << HEX4 << tmp << ",Y";
USER_OR_AUTO_LABEL("", tmp, ",Y");
nextlinebytes << HEX2 << (int)(tmp&0xff) << " " << HEX2 << (int)(tmp>>8);
}
else
@ -493,7 +497,7 @@ void DiStella::disasm(uInt32 distart, int pass)
d1 = Debugger::debugger().peek(myPC+myOffset); myPC++;
ad = ((myPC + (Int8)d1) & 0xfff) + myOffset;
labfound = mark(ad+myOffset, REFERENCED);
labfound = mark(ad, REFERENCED);
if (pass == 1)
{
if ((addbranch) && !check_bit(labels[ad-myOffset], REACHABLE))
@ -505,7 +509,9 @@ void DiStella::disasm(uInt32 distart, int pass)
else if (pass == 3)
{
if (labfound == 1)
nextline << " L" << HEX4 << ad;
{
USER_OR_AUTO_LABEL(" ", ad, "");
}
else
nextline << " $" << HEX4 << ad;
@ -526,7 +532,9 @@ void DiStella::disasm(uInt32 distart, int pass)
nextline << " ";
}
if (labfound == 1)
nextline << "(L" << HEX4 << ad << ")";
{
USER_OR_AUTO_LABEL("(", ad, ")");
}
else if (labfound == 3)
nextline << "(" << CartDebug::ourIOMnemonic[ad-0x280] << ")";
else