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

C64: Use Chip6522 factory.

This commit is contained in:
Anthony Konzel 2016-03-03 18:03:48 -06:00
parent 28ced70f28
commit a435cc912c
6 changed files with 107 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -228,6 +228,7 @@
<Compile Include="Computers\Commodore64\MOS\Chip4864.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip6510.IDebuggable.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip6510.IDisassemblable.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip6522.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip6581R3.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip6581R4AR.cs" />
<Compile Include="Computers\Commodore64\MOS\Chip8580R5.cs" />

20
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6522.cs Normal file
View File

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{
public static class Chip6522
{
public static Via Create(Func<int> readPrA, Func<int> readPrB)
{
return new Via(readPrA, readPrB);
}
public static Via Create(Func<bool> readClock, Func<bool> readData, Func<bool> readAtn, int driveNumber)
{
return new Via(readClock, readData, readAtn, driveNumber);
}
}
}

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

@ -124,9 +124,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_t1L = (_t1L & 0xFF) | ((val & 0xFF) << 8);
_ifr &= 0xBF;
_t1C = _t1L;
_t1CLoaded = true;
_t1Delayed = 1;
break;
case 0x7:
_t1L = (_t1L & 0xFF) | ((val & 0xFF) << 8);
_ifr &= 0xBF;
break;
case 0x8:
_t2L = (_t2L & 0xFF00) | (val & 0xFF);
@ -134,7 +137,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
case 0x9:
_t2L = (_t2L & 0xFF) | ((val & 0xFF) << 8);
_ifr &= 0xDF;
_t2C = _t2L;
if (_acrT2Control == ACR_T2_CONTROL_TIMED)
{
_t2C = _t2L;
_t2CLoaded = true;
}
_t2Delayed = 1;
break;
case 0xA:
_ifr &= 0xFB;

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

@ -122,6 +122,17 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
[SaveState.SaveWithName("PB6")]
private bool _pb6;
[SaveState.SaveWithName("InterruptNextClock")]
private int _interruptNextClock;
[SaveState.SaveWithName("T1Loaded")]
private bool _t1CLoaded;
[SaveState.SaveWithName("T2Loaded")]
private bool _t2CLoaded;
[SaveState.SaveWithName("T1Delayed")]
private int _t1Delayed;
[SaveState.SaveWithName("T2Delayed")]
private int _t2Delayed;
public Via()
{
_port = new DisconnectedPort();
@ -183,10 +194,17 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_resetCb2NextClock = false;
_handshakeCa2NextClock = false;
_handshakeCb2NextClock = false;
_interruptNextClock = 0;
_t1CLoaded = false;
_t2CLoaded = false;
}
public void ExecutePhase()
{
// Process delayed interrupts
_ifr |= _interruptNextClock;
_interruptNextClock = 0;
// Process 'pulse' and 'handshake' outputs on CA2 and CB2
if (_resetCa2NextClock)
@ -215,48 +233,70 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
// Count timers
_t1C--;
if (_t1C < 0)
if (_t1Delayed > 0)
{
switch (_acrT1Control)
_t1Delayed--;
}
else
{
_t1C--;
if (_t1C < 0)
{
case ACR_T1_CONTROL_CONTINUOUS_INTERRUPTS:
_t1C = _t1L;
break;
case ACR_T1_CONTROL_CONTINUOUS_INTERRUPTS_AND_OUTPUT_ON_PB7:
_t1C = _t1L;
_prb ^= 0x80;
break;
default:
_t1C = 0xFFFF;
break;
if (_t1CLoaded)
{
_interruptNextClock |= 0x40;
_t1CLoaded = false;
}
switch (_acrT1Control)
{
case ACR_T1_CONTROL_CONTINUOUS_INTERRUPTS:
_t1C = _t1L;
_t1CLoaded = true;
break;
case ACR_T1_CONTROL_CONTINUOUS_INTERRUPTS_AND_OUTPUT_ON_PB7:
_t1C = _t1L;
_prb ^= 0x80;
_t1CLoaded = true;
break;
}
_t1C &= 0xFFFF;
}
_ifr |= 0x40;
}
switch (_acrT2Control)
if (_t2Delayed > 0)
{
case ACR_T2_CONTROL_TIMED:
_t2C--;
if (_t2C < 0)
{
_ifr |= 0x20;
_t2C = 0xFFFF;
}
break;
case ACR_T2_CONTROL_COUNT_ON_PB6:
_pb6L = _pb6;
_pb6 = (_port.ReadExternalPrb() & 0x40) != 0;
if (!_pb6 && _pb6L)
{
_t2Delayed--;
}
else
{
switch (_acrT2Control)
{
case ACR_T2_CONTROL_TIMED:
_t2C--;
if (_t2C < 0)
{
_ifr |= 0x20;
_t2C = 0xFFFF;
if (_t2CLoaded)
{
_interruptNextClock |= 0x20;
_t2CLoaded = false;
}
_t2C = _t2L;
}
}
break;
break;
case ACR_T2_CONTROL_COUNT_ON_PB6:
_pb6L = _pb6;
_pb6 = (_port.ReadExternalPrb() & 0x40) != 0;
if (!_pb6 && _pb6L)
{
_t2C--;
if (_t2C < 0)
{
_ifr |= 0x20;
_t2C = 0xFFFF;
}
}
break;
}
}
// Process CA2

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

@ -71,8 +71,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
};
_ram = new int[0x800];
Via0 = new Via(ViaReadClock, ViaReadData, ViaReadAtn, 8);
Via1 = new Via(ReadVia1PrA, ReadVia1PrB);
Via0 = Chip6522.Create(ViaReadClock, ViaReadData, ViaReadAtn, 8);
Via1 = Chip6522.Create(ReadVia1PrA, ReadVia1PrB);
_cpuClockNum = clockNum;
_driveCpuClockNum = clockDen*1000000; // 1mhz

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

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