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

Commodore64: Move I/O port init into HardReset and fix default direction bits.

This commit is contained in:
saxxonpike 2013-08-12 07:00:31 +00:00
parent 842ead8c7e
commit 481e915aff
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
BizHawk.Emulation/Computers/Commodore64/MOS/MOS6510.cs
View File

@ -51,17 +51,11 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
cpu.ReadMemory = Read;
cpu.WriteMemory = Write;
// configure data port defaults
portDir = 0x00;
SetPortData(0x17);
// todo: verify this value (I only know that unconnected bits fade after a number of cycles)
unusedPinTTLCycles = 40;
unusedPinTTL0 = 0;
unusedPinTTL1 = 0;
// NMI is high on startup (todo: verify)
pinNMILast = true;
// perform hard reset
HardReset();
}
~MOS6510()
@ -74,11 +68,24 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
public void HardReset()
{
// configure CPU defaults
cpu.Reset();
cpu.FlagI = true;
cpu.BCD_Enabled = true;
cpu.PC = (ushort)(ReadMemory(0xFFFC) | (ReadMemory(0xFFFD) << 8));
}
if (ReadMemory != null)
cpu.PC = (ushort)(ReadMemory(0xFFFC) | (ReadMemory(0xFFFD) << 8));
// configure data port defaults
portDir = 0x00;
SetPortData(0x1F);
// NMI is high on startup (todo: verify)
pinNMILast = true;
// reset unused IO pin TTLs
unusedPinTTL0 = 0;
unusedPinTTL1 = 0;
}
// ------------------------------------

6
BizHawk.Emulation/Computers/Commodore64/MOS/MOS6522.cs
View File

@ -46,10 +46,10 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
private bool[] lastcb;
private byte lastpb;
private byte paLatch;
private byte pbLatch;
private bool paLatchEnable;
private bool pbLatchEnable;
private byte paOut;
private byte paOut;
private byte pbLatch;
private bool pbLatchEnable;
private byte pbOut;
private readonly bool[] pbPulse;
private readonly uint[] pcrControlA;