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

C64 - refactor 6510 and subclassess to not use SyncObject

This commit is contained in:
adelikat 2017-05-13 08:25:50 -05:00
parent ee183d3505
commit 4d37e8b4e4
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,4 @@
using System.Reflection;
using BizHawk.Common;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge;
using BizHawk.Emulation.Cores.Computers.Commodore64.Cassette;
@ -294,7 +292,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
ColorRam.SyncState(ser);
ser.EndSection();
ser.BeginSection("Cpu"); SaveState.SyncObject(ser, Cpu); ser.EndSection();
ser.BeginSection("Cpu");
Cpu.SyncState(ser);
ser.EndSection();
ser.BeginSection("KernalRom"); SaveState.SyncObject(ser, KernalRom); ser.EndSection();
ser.BeginSection("Pla"); SaveState.SyncObject(ser, Pla); ser.EndSection();
ser.BeginSection("Ram"); SaveState.SyncObject(ser, Ram); ser.EndSection();

5
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs
View File

@ -36,5 +36,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{
return _rom[addr & 0x3FFF];
}
public void SyncState(Serializer ser)
{
SaveState.SyncObject(ser, this);
}
}
}

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

@ -222,7 +222,15 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void SyncState(Serializer ser)
{
SaveState.SyncObject(ser, this);
_cpu.SyncState(ser);
ser.Sync("_pinNmiLast", ref _pinNmiLast);
ser.BeginSection("_port");
_port.SyncState(ser);
ser.EndSection();
ser.Sync("_thisNmi", ref _thisNmi);
ser.Sync("LagCycles", ref LagCycles);
}
public void Write(int addr, int val)

6
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs
View File

@ -39,7 +39,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void SyncState(Serializer ser)
{
SaveState.SyncObject(ser, this);
ser.Sync("Direction", ref Direction);
ser.Sync("Latch", ref Latch);
}
}
@ -79,7 +80,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public void SyncState(Serializer ser)
{
SaveState.SyncObject(ser, this);
ser.Sync("Direction", ref Direction);
ser.Sync("Latch", ref Latch);
}
}
}