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

C64: implement memory callbacks

This commit is contained in:
alyosha-tas 2021-05-17 15:10:09 -04:00
parent 270ee700fb
commit 12b5ea62eb
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
View File

@ -65,7 +65,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
public long TotalExecutedCycles => _selectedDebuggable.TotalExecutedCycles;
private readonly IMemoryCallbackSystem _memoryCallbacks;
public IMemoryCallbackSystem _memoryCallbacks;
IMemoryCallbackSystem IDebuggable.MemoryCallbacks => _memoryCallbacks;
}

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

@ -78,6 +78,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
Ram = new Chip4864();
Serial = new SerialPort();
Cpu.c64 = c64;
switch (sidType)
{
case C64.SidType.OldR2:

9
src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
View File

@ -67,6 +67,15 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
SetupMemoryDomains();
}
public void ExecFetch(ushort addr)
{
if (_memoryCallbacks.HasExecutes)
{
uint flags = (uint)(MemoryCallbackFlags.CPUZero | MemoryCallbackFlags.AccessExecute);
_memoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
}
}
private CoreComm CoreComm { get; }
public string RomDetails { get; }

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

@ -14,6 +14,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
private LatchedPort _port;
private int _irqDelay;
private int _nmiDelay;
public C64 c64;
private struct CpuLink : IMOS6502XLink
{
@ -26,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public byte DummyReadMemory(ushort address) => unchecked((byte)_chip.Read(address));
public void OnExecFetch(ushort address) { }
public void OnExecFetch(ushort address) => _chip.c64.ExecFetch(address);
public byte PeekMemory(ushort address) => unchecked((byte)_chip.Peek(address));
@ -128,18 +129,31 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public int Read(int addr)
{
int ret = 0;
switch (addr)
{
case 0x0000:
return _port.Direction;
ret = _port.Direction;
break;
case 0x0001:
return PortData;
ret = PortData;
break;
default:
if (ReadAec())
return ReadMemory(addr);
ret = ReadMemory(addr);
else
return ReadBus();
ret = ReadBus();
break;
}
if (c64._memoryCallbacks.HasReads)
{
uint flags = (uint)(MemoryCallbackFlags.CPUZero | MemoryCallbackFlags.AccessRead);
c64._memoryCallbacks.CallMemoryCallbacks((uint)addr, (uint)ret, flags, "System Bus");
}
return ret;
}
public void SyncState(Serializer ser)
@ -173,6 +187,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
WriteMemory(addr, val);
break;
}
if (c64._memoryCallbacks.HasWrites)
{
uint flags = (uint)(MemoryCallbackFlags.CPUZero | MemoryCallbackFlags.AccessWrite | MemoryCallbackFlags.SizeByte);
c64._memoryCallbacks.CallMemoryCallbacks((uint)addr, (uint)val, flags, "System Bus");
}
}
}
}