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

Fixed bug in 'WD' scheme; bankswitching is only supposed to trigger on 

reads from $30 - $3F, whereas it was triggering on *all* TIA reads.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3124 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-12-29 20:17:35 +00:00
parent 1a62c3a424
commit 3da47efe59
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emucore/CartWD.cxx
View File

@ -83,11 +83,9 @@ void CartridgeWD::install(System& system)
mySystem->setPageAccess(j >> System::PAGE_SHIFT, write);
}
// Set the page accessing methods for the hot spots
// These mirror the TIA addresses, so accesses must be chained
System::PageAccess hotspot(this, System::PA_READWRITE);
for(uInt32 i = 0x30; i < 0x40; i += (1 << System::PAGE_SHIFT))
mySystem->setPageAccess(i >> System::PAGE_SHIFT, hotspot);
// Mirror all access in TIA; by doing so we're taking responsibility
// for that address space in peek and poke below.
mySystem->tia().install(system, *this);
// Setup segments to some default slices
bank(myStartBank);
@ -109,13 +107,13 @@ uInt8 CartridgeWD::peek(uInt16 address)
// Hotspots at $30 - $3F
// Note that a hotspot read triggers a bankswitch after at least 3 cycles
// have passed, so we only initiate the switch here
if(!bankLocked())
if(!bankLocked() && (address & 0x00FF) >= 0x30 && (address & 0x00FF) <= 0x3F)
{
myCyclesAtBankswitchInit = mySystem->cycles();
myPendingBank = address & 0x000F;
if(!mySystem->autodetectMode())
cerr << "BS init: " << dec << myPendingBank << " @ " << dec << mySystem->cycles() << endl;
cerr << "BS init: " << dec << myPendingBank << " (" << hex << address << ") @ " << dec << mySystem->cycles() << endl;
}
return mySystem->tia().peek(address);