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

refactor Via.Port from an abstract class to interface, require inheriting classes to implement SyncState, and of course, don't use SyncObject

This commit is contained in:
adelikat 2017-05-13 11:10:37 -05:00
parent 4d7afaa70a
commit 2840b69e41
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.Port.cs
View File

@ -1,51 +1,49 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64.Media;
namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{ {
public sealed partial class Via public sealed partial class Via
{ {
private abstract class Port private interface IPort
{ {
public abstract int ReadPra(int pra, int ddra); int ReadPra(int pra, int ddra);
public abstract int ReadPrb(int prb, int ddrb); int ReadPrb(int prb, int ddrb);
public abstract int ReadExternalPra(); int ReadExternalPra();
public abstract int ReadExternalPrb(); int ReadExternalPrb();
public void SyncState(Serializer ser) void SyncState(Serializer ser);
{
SaveState.SyncObject(ser, this);
}
} }
private sealed class DisconnectedPort : Port private sealed class DisconnectedPort : IPort
{ {
public override int ReadPra(int pra, int ddra) public int ReadPra(int pra, int ddra)
{ {
return (pra | ~ddra) & 0xFF; return (pra | ~ddra) & 0xFF;
} }
public override int ReadPrb(int prb, int ddrb) public int ReadPrb(int prb, int ddrb)
{ {
return (prb | ~ddrb) & 0xFF; return (prb | ~ddrb) & 0xFF;
} }
public override int ReadExternalPra() public int ReadExternalPra()
{ {
return 0xFF; return 0xFF;
} }
public override int ReadExternalPrb() public int ReadExternalPrb()
{ {
return 0xFF; return 0xFF;
} }
public void SyncState(Serializer ser)
{
// Do nothing
}
} }
private sealed class DriverPort : Port private sealed class DriverPort : IPort
{ {
private readonly Func<int> _readPrA; private readonly Func<int> _readPrA;
private readonly Func<int> _readPrB; private readonly Func<int> _readPrB;
@ -56,33 +54,39 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_readPrB = readPrB; _readPrB = readPrB;
} }
public override int ReadPra(int pra, int ddra) public int ReadPra(int pra, int ddra)
{ {
return _readPrA(); return _readPrA();
} }
public override int ReadPrb(int prb, int ddrb) public int ReadPrb(int prb, int ddrb)
{ {
return (prb & ddrb) | (_readPrB() & ~ddrb); return (prb & ddrb) | (_readPrB() & ~ddrb);
} }
public override int ReadExternalPra() public int ReadExternalPra()
{ {
return _readPrA(); return _readPrA();
} }
public override int ReadExternalPrb() public int ReadExternalPrb()
{ {
return _readPrB(); return _readPrB();
} }
public void SyncState(Serializer ser)
{
// Do nothing
}
} }
private sealed class IecPort : Port private sealed class IecPort : IPort
{ {
private readonly Func<bool> _readClock; private readonly Func<bool> _readClock;
private readonly Func<bool> _readData; private readonly Func<bool> _readData;
private readonly Func<bool> _readAtn; private readonly Func<bool> _readAtn;
private readonly int _driveNumber;
private int _driveNumber;
public IecPort(Func<bool> readClock, Func<bool> readData, Func<bool> readAtn, int driveNumber) public IecPort(Func<bool> readClock, Func<bool> readData, Func<bool> readAtn, int driveNumber)
{ {
@ -92,12 +96,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_driveNumber = (driveNumber & 0x3) << 5; _driveNumber = (driveNumber & 0x3) << 5;
} }
public override int ReadPra(int pra, int ddra) public int ReadPra(int pra, int ddra)
{ {
return (pra | ~ddra) & 0xFF; return (pra | ~ddra) & 0xFF;
} }
public override int ReadPrb(int prb, int ddrb) public int ReadPrb(int prb, int ddrb)
{ {
return (prb & ddrb) | return (prb & ddrb) |
(~ddrb & 0xE5 & ( (~ddrb & 0xE5 & (
@ -108,12 +112,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
); );
} }
public override int ReadExternalPra() public int ReadExternalPra()
{ {
return 0xFF; return 0xFF;
} }
public override int ReadExternalPrb() public int ReadExternalPrb()
{ {
return return
(_readClock() ? 0x04 : 0x00) | (_readClock() ? 0x04 : 0x00) |
@ -121,6 +125,11 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
(_readAtn() ? 0x80 : 0x00) | (_readAtn() ? 0x80 : 0x00) |
_driveNumber; _driveNumber;
} }
public void SyncState(Serializer ser)
{
ser.Sync("_driveNumber", ref _driveNumber);
}
} }
} }
} }

4
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs
View File

@ -61,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
[SaveState.SaveWithName("InterruptEnableRegister")] [SaveState.SaveWithName("InterruptEnableRegister")]
private int _ier; private int _ier;
[SaveState.SaveWithName("Port")] [SaveState.SaveWithName("Port")]
private readonly Port _port; private readonly IPort _port;
[SaveState.SaveWithName("PortLatchA")] [SaveState.SaveWithName("PortLatchA")]
private int _paLatch; private int _paLatch;
@ -421,7 +421,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
ser.Sync("InterruptEnableRegister", ref _ier); ser.Sync("InterruptEnableRegister", ref _ier);
ser.BeginSection("Port"); ser.BeginSection("Port");
_port.SyncState(ser); // TODO _port.SyncState(ser);
ser.EndSection(); ser.EndSection();