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

Apply savestate changes to disk subsystem.

This commit is contained in:
Anthony Konzel 2016-03-01 14:01:56 -06:00
parent 70e1a2ca29
commit 43ac625a95
5 changed files with 96 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.FluxTransitions.cs
View File

@ -8,18 +8,29 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
{ {
public sealed partial class Drive1541 public sealed partial class Drive1541
{ {
[SaveState.DoNotSave]
private const long LEHMER_RNG_PRIME = 48271; private const long LEHMER_RNG_PRIME = 48271;
[SaveState.SaveWithName("DiskDensityCounter")]
private int _diskDensityCounter; // density .. 16 private int _diskDensityCounter; // density .. 16
[SaveState.SaveWithName("DiskSupplementaryCounter")]
private int _diskSupplementaryCounter; // 0 .. 16 private int _diskSupplementaryCounter; // 0 .. 16
[SaveState.SaveWithName("DiskFluxReversalDetected")]
private bool _diskFluxReversalDetected; private bool _diskFluxReversalDetected;
[SaveState.SaveWithName("DiskBitsRemainingInDataEntry")]
private int _diskBitsLeft; private int _diskBitsLeft;
[SaveState.SaveWithName("DiskDataEntryIndex")]
private int _diskByteOffset; private int _diskByteOffset;
[SaveState.SaveWithName("DiskDataEntry")]
private int _diskBits; private int _diskBits;
[SaveState.SaveWithName("DiskCurrentCycle")]
private int _diskCycle; private int _diskCycle;
[SaveState.SaveWithName("DiskDensityConfig")]
private int _diskDensity; private int _diskDensity;
[SaveState.SaveWithName("PreviousCA1")]
private bool _previousCa1; private bool _previousCa1;
[SaveState.SaveWithName("CountsBeforeRandomTransition")]
private int _countsBeforeRandomTransition; private int _countsBeforeRandomTransition;
[SaveState.SaveWithName("CurrentRNG")]
private int _rngCurrent; private int _rngCurrent;
// Lehmer RNG // Lehmer RNG

3
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
View File

@ -8,11 +8,13 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
{ {
public sealed partial class Drive1541 : IDisassemblable public sealed partial class Drive1541 : IDisassemblable
{ {
[SaveState.DoNotSave]
IEnumerable<string> IDisassemblable.AvailableCpus IEnumerable<string> IDisassemblable.AvailableCpus
{ {
get { yield return "Disk Drive 6502"; } get { yield return "Disk Drive 6502"; }
} }
[SaveState.DoNotSave]
string IDisassemblable.Cpu string IDisassemblable.Cpu
{ {
get { return "Disk Drive 6502"; } get { return "Disk Drive 6502"; }
@ -21,6 +23,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
} }
} }
[SaveState.DoNotSave]
string IDisassemblable.PCRegisterName string IDisassemblable.PCRegisterName
{ {
get { return "PC"; } get { return "PC"; }

27
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
View File

@ -13,28 +13,49 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
{ {
public sealed partial class Drive1541 : SerialPortDevice public sealed partial class Drive1541 : SerialPortDevice
{ {
[SaveState.SaveWithName("Disk")]
private Disk _disk; private Disk _disk;
[SaveState.SaveWithName("BitHistory")]
private int _bitHistory; private int _bitHistory;
[SaveState.SaveWithName("BitsRemainingInLatchedByte")]
private int _bitsRemainingInLatchedByte; private int _bitsRemainingInLatchedByte;
[SaveState.SaveWithName("Sync")]
private bool _sync; private bool _sync;
[SaveState.SaveWithName("ByteReady")]
private bool _byteReady; private bool _byteReady;
[SaveState.DoNotSave] private readonly int _driveCpuClockNum; [SaveState.SaveWithName("DriveCpuClockNumerator")]
private readonly int _driveCpuClockNum;
[SaveState.SaveWithName("TrackNumber")]
private int _trackNumber; private int _trackNumber;
[SaveState.SaveWithName("MotorEnabled")]
private bool _motorEnabled; private bool _motorEnabled;
[SaveState.SaveWithName("LedEnabled")]
private bool _ledEnabled; private bool _ledEnabled;
[SaveState.SaveWithName("MotorStep")]
private int _motorStep; private int _motorStep;
[SaveState.DoNotSave]
private int _via0PortBtemp; private int _via0PortBtemp;
[SaveState.SaveWithName("CPU")]
private readonly MOS6502X _cpu; private readonly MOS6502X _cpu;
[SaveState.SaveWithName("RAM")]
private readonly int[] _ram; private readonly int[] _ram;
[SaveState.SaveWithName("VIA0")]
public readonly Via Via0; public readonly Via Via0;
[SaveState.SaveWithName("VIA1")]
public readonly Via Via1; public readonly Via Via1;
[SaveState.SaveWithName("SystemCpuClockNumerator")]
private readonly int _cpuClockNum; private readonly int _cpuClockNum;
[SaveState.SaveWithName("SystemDriveCpuRatioDifference")]
private int _ratioDifference; private int _ratioDifference;
[SaveState.SaveWithName("DriveLightOffTime")]
private int _driveLightOffTime; private int _driveLightOffTime;
[SaveState.DoNotSave] private int[] _trackImageData = new int[1]; [SaveState.DoNotSave]
private int[] _trackImageData = new int[1];
[SaveState.DoNotSave]
public Func<int> ReadIec = () => 0xFF; public Func<int> ReadIec = () => 0xFF;
[SaveState.DoNotSave]
public Action DebuggerStep; public Action DebuggerStep;
[SaveState.DoNotSave]
public readonly Chip23128 DriveRom; public readonly Chip23128 DriveRom;
public Drive1541(int clockNum, int clockDen) public Drive1541(int clockNum, int clockDen)

7
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs
View File

@ -10,11 +10,16 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
{ {
public sealed class SerialPort : IDriveLight public sealed class SerialPort : IDriveLight
{ {
[SaveState.DoNotSave]
public Func<bool> ReadMasterAtn = () => true; public Func<bool> ReadMasterAtn = () => true;
[SaveState.DoNotSave]
public Func<bool> ReadMasterClk = () => true; public Func<bool> ReadMasterClk = () => true;
[SaveState.DoNotSave]
public Func<bool> ReadMasterData = () => true; public Func<bool> ReadMasterData = () => true;
[SaveState.SaveWithName("Device")]
private SerialPortDevice _device; private SerialPortDevice _device;
[SaveState.SaveWithName("Connected")]
private bool _connected; private bool _connected;
public void HardReset() public void HardReset()
@ -75,7 +80,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
_device.ReadMasterData = () => ReadMasterData(); _device.ReadMasterData = () => ReadMasterData();
} }
[SaveState.DoNotSave]
public bool DriveLightEnabled { get { return true; } } public bool DriveLightEnabled { get { return true; } }
[SaveState.DoNotSave]
public bool DriveLightOn { get { return ReadDeviceLight(); } } public bool DriveLightOn { get { return ReadDeviceLight(); } }
} }
} }

3
BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPortDevice.cs
View File

@ -8,8 +8,11 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
{ {
public abstract class SerialPortDevice public abstract class SerialPortDevice
{ {
[SaveState.DoNotSave]
public Func<bool> ReadMasterAtn; public Func<bool> ReadMasterAtn;
[SaveState.DoNotSave]
public Func<bool> ReadMasterClk; public Func<bool> ReadMasterClk;
[SaveState.DoNotSave]
public Func<bool> ReadMasterData; public Func<bool> ReadMasterData;
public virtual void ExecutePhase() public virtual void ExecutePhase()