If both PGFX and GFX are set for an address, PGFX should take priority.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2182 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-11-11 02:38:53 +00:00
parent fca261c4e3
commit 747164b4c5
1 changed files with 3 additions and 2 deletions

View File

@ -223,7 +223,8 @@ void DiStella::disasm(uInt32 distart, int pass)
else else
myDisasmBuf << HEX4 << myPC+myOffset << "' '"; myDisasmBuf << HEX4 << myPC+myOffset << "' '";
const string& bit_string = check_bit(myPC, CartDebug::GFX) ? "\x7f" : "\x80"; bool isPGfx = check_bit(myPC, CartDebug::PGFX);
const string& bit_string = isPGfx ? "\x80" : "\x7f";
uInt8 byte = Debugger::debugger().peek(myPC+myOffset); uInt8 byte = Debugger::debugger().peek(myPC+myOffset);
myDisasmBuf << ".byte $" << HEX2 << (int)byte << " |"; myDisasmBuf << ".byte $" << HEX2 << (int)byte << " |";
for(uInt8 i = 0, c = byte; i < 8; ++i, c <<= 1) for(uInt8 i = 0, c = byte; i < 8; ++i, c <<= 1)
@ -233,7 +234,7 @@ void DiStella::disasm(uInt32 distart, int pass)
myDisasmBuf << Debugger::to_bin_8(byte); myDisasmBuf << Debugger::to_bin_8(byte);
else else
myDisasmBuf << HEX2 << (int)byte; myDisasmBuf << HEX2 << (int)byte;
addEntry(CartDebug::GFX); addEntry(isPGfx ? CartDebug::PGFX : CartDebug::GFX);
} }
myPC++; myPC++;
} }