6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-23 00:29:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MoleskiCoder/EightBit

Browse Source
This commit is contained in:
Adrian.Conlon 2017-08-25 10:33:31 +01:00
commit c6df5ba775
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LR35902/src/Bus.cpp
View File

@ -42,15 +42,14 @@ void EightBit::Bus::loadGameRom(const std::string& path) {
uint8_t& EightBit::Bus::reference(uint16_t address, bool& rom) {
rom = true;
auto effective = effectiveAddress(address);
if ((effective < 0x100) && bootRomEnabled())
return m_bootRom[effective];
if ((effective < 0x4000) && gameRomEnabled())
return m_gameRom[effective];
if ((effective < 0x8000) && gameRomEnabled())
return m_gameRom[(effective - RomPageSize) + (m_romBank * RomPageSize)];
if ((address < 0x100) && bootRomEnabled())
return m_bootRom[address];
if ((address < 0x4000) && gameRomEnabled())
return m_gameRom[address];
if ((address < 0x8000) && gameRomEnabled())
return m_gameRom[(address - RomPageSize) + (m_romBank * RomPageSize)];
rom = false;
return m_bus[effective];
return m_bus[address];
}
void EightBit::Bus::Bus_WrittenByte(const AddressEventArgs& e) {