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

C64: CPU reads open bus when !AEC is asserted

This commit is contained in:
SaxxonPike 2019-07-13 15:25:40 -05:00
parent 894adbb610
commit f22c9b7abd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
View File

@ -234,6 +234,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
Cpu.ReadMemory = Pla.Read; Cpu.ReadMemory = Pla.Read;
Cpu.WriteMemory = Pla.Write; Cpu.WriteMemory = Pla.Write;
Cpu.WriteMemoryPort = Cpu_WriteMemoryPort; Cpu.WriteMemoryPort = Cpu_WriteMemoryPort;
Cpu.ReadBus = ReadOpenBus;
Pla.PeekBasicRom = BasicRom.Peek; Pla.PeekBasicRom = BasicRom.Peek;
Pla.PeekCartridgeHi = CartPort.PeekHiRom; Pla.PeekCartridgeHi = CartPort.PeekHiRom;

3
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
View File

@ -41,6 +41,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public Func<bool> ReadIrq; public Func<bool> ReadIrq;
public Func<bool> ReadNmi; public Func<bool> ReadNmi;
public Func<bool> ReadRdy; public Func<bool> ReadRdy;
public Func<int> ReadBus;
public Func<int, int> ReadMemory; public Func<int, int> ReadMemory;
public Func<int> ReadPort; public Func<int> ReadPort;
public Action<int, int> WriteMemory; public Action<int, int> WriteMemory;
@ -136,7 +137,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
case 0x0001: case 0x0001:
return PortData; return PortData;
default: default:
return ReadAec() ? ReadMemory(addr) : 0xFF; return ReadAec() ? ReadMemory(addr) : ReadBus();
} }
} }