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

fixed disassembling of ZP-RAM code (fixes #890)

This commit is contained in:
Thomas Jentzsch 2022-04-30 21:24:36 +02:00
parent efb2a9f299
commit 06f42252fa
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/debugger/CartDebug.cxx
View File

@ -245,14 +245,11 @@ string CartDebug::toString()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool CartDebug::disassembleAddr(uInt16 address, bool force) bool CartDebug::disassembleAddr(uInt16 address, bool force)
{ {
Cartridge& cart = myConsole.cartridge(); const Cartridge& cart = myConsole.cartridge();
const int segCount = cart.segmentCount(); const int segCount = cart.segmentCount();
// ROM/RAM bank or ZP-RAM? // ROM/RAM bank or ZP-RAM?
const int addrBank = (address & 0x1000) ? getBank(address) : int(myBankInfo.size()) - 1; const int addrBank = (address & 0x1000) ? getBank(address) : int(myBankInfo.size()) - 1;
myDisassembly.list.clear();
myAddrToLineList.clear();
if(segCount > 1) if(segCount > 1)
{ {
bool changed = false; bool changed = false;
@ -272,7 +269,16 @@ bool CartDebug::disassembleAddr(uInt16 address, bool force)
else else
segAddress = info.offset; segAddress = info.offset;
// disassemble segment // disassemble segment
changed |= disassemble(bank, segAddress, disassembly, addrToLineList, force); const bool newChanged = disassemble(bank, segAddress, disassembly, addrToLineList, force);
if(!changed && newChanged)
{
// clear lists at first change
changed = true;
myDisassembly.list.clear();
myAddrToLineList.clear();
}
// add extra empty line between segments // add extra empty line between segments
if(seg < segCount - 1) if(seg < segCount - 1)
{ {
@ -323,7 +329,6 @@ bool CartDebug::disassemble(int bank, uInt16 PC, Disassembly& disassembly,
(disassembly.list[pcline].disasm[0] != '.'); (disassembly.list[pcline].disasm[0] != '.');
const bool pagedirty = (PC & 0x1000) ? mySystem.isPageDirty(0x1000, 0x1FFF) : const bool pagedirty = (PC & 0x1000) ? mySystem.isPageDirty(0x1000, 0x1FFF) :
mySystem.isPageDirty(0x80, 0xFF); mySystem.isPageDirty(0x80, 0xFF);
const bool changed = !mySystem.autodetectMode() && const bool changed = !mySystem.autodetectMode() &&
(force || bankChanged || !pcfound || pagedirty); (force || bankChanged || !pcfound || pagedirty);
if(changed) if(changed)
@ -336,7 +341,7 @@ bool CartDebug::disassemble(int bank, uInt16 PC, Disassembly& disassembly,
// If the offset has changed, all old addresses must be 'converted' // If the offset has changed, all old addresses must be 'converted'
// For example, if the list contains any $fxxx and the address space is now // For example, if the list contains any $fxxx and the address space is now
// $bxxx, it must be changed // $bxxx, it must be changed
uInt16 offset = myConsole.cartridge().bankOrigin(bank, PC); const uInt16 offset = PC & 0x1000 ? myConsole.cartridge().bankOrigin(bank, PC) : 0;
AddressList& addresses = info.addressList; AddressList& addresses = info.addressList;
for(auto& i: addresses) for(auto& i: addresses)
i = (i & 0xFFF) + offset; i = (i & 0xFFF) + offset;