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

commodore64: unconnected pin values in the 6510 I/O port $01 register fade over time (Aurora90%), need to verify the TTL on that sometime

This commit is contained in:
saxxonpike 2012-11-27 20:23:27 +00:00
parent 91f3e27e84
commit ccc332f8e2
3 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BizHawk.Emulation/Computers/Commodore64/C64.Core.cs
View File

@ -96,15 +96,15 @@ namespace BizHawk.Emulation.Computers.Commodore64
chips.HardReset(); chips.HardReset();
} }
private byte Peek(int addr) //private byte Peek(int addr)
{ //{
return chips.cpu.Peek(addr); // return chips.cpu.Peek(addr);
} //}
private void Poke(int addr, byte val) //private void Poke(int addr, byte val)
{ //{
chips.cpu.Poke(addr, val); // chips.cpu.Poke(addr, val);
} //}
// ------------------------------------ // ------------------------------------
} }

10
BizHawk.Emulation/Computers/Commodore64/C64.cs
View File

@ -17,12 +17,12 @@ namespace BizHawk.Emulation.Computers.Commodore64
{ {
inputFile = rom; inputFile = rom;
extension = romextension; extension = romextension;
SetupMemoryDomains();
CoreOutputComm = new CoreOutputComm(); CoreOutputComm = new CoreOutputComm();
CoreInputComm = new CoreInputComm(); CoreInputComm = new CoreInputComm();
Init(Region.PAL); Init(Region.PAL);
cyclesPerFrame = (uint)chips.vic.CyclesPerFrame; cyclesPerFrame = (uint)chips.vic.CyclesPerFrame;
CoreOutputComm.UsesDriveLed = true; CoreOutputComm.UsesDriveLed = true;
SetupMemoryDomains();
} }
// internal variables // internal variables
@ -117,8 +117,14 @@ namespace BizHawk.Emulation.Computers.Commodore64
private void SetupMemoryDomains() private void SetupMemoryDomains()
{ {
// chips must be initialized before this code runs!
var domains = new List<MemoryDomain>(1); var domains = new List<MemoryDomain>(1);
domains.Add(new MemoryDomain("System Bus", 0x10000, Endian.Little, new Func<int, byte>(Peek), new Action<int, byte>(Poke))); domains.Add(new MemoryDomain("System Bus", 0x10000, Endian.Little, new Func<int, byte>(chips.cpu.Peek), new Action<int, byte>(chips.cpu.Poke)));
domains.Add(new MemoryDomain("RAM", 0x10000, Endian.Little, new Func<int, byte>(chips.ram.Peek), new Action<int, byte>(chips.ram.Poke)));
domains.Add(new MemoryDomain("CIA0", 0x10, Endian.Little, new Func<int, byte>(chips.cia0.Peek), new Action<int, byte>(chips.cia0.Poke)));
domains.Add(new MemoryDomain("CIA1", 0x10, Endian.Little, new Func<int, byte>(chips.cia1.Peek), new Action<int, byte>(chips.cia1.Poke)));
domains.Add(new MemoryDomain("VIC", 0x40, Endian.Little, new Func<int, byte>(chips.vic.Peek), new Action<int, byte>(chips.vic.Poke)));
domains.Add(new MemoryDomain("SID", 0x20, Endian.Little, new Func<int, byte>(chips.sid.Peek), new Action<int, byte>(chips.sid.Poke)));
memoryDomains = domains.AsReadOnly(); memoryDomains = domains.AsReadOnly();
} }
} }

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

@ -26,6 +26,11 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
private bool pinNMI; private bool pinNMI;
private bool pinRDY; private bool pinRDY;
private byte portDir; private byte portDir;
private bool unusedPin0;
private bool unusedPin1;
private uint unusedPinTTL0;
private uint unusedPinTTL1;
private uint unusedPinTTLCycles;
// ------------------------------------ // ------------------------------------
@ -42,6 +47,11 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
// configure data port defaults // configure data port defaults
portDir = 0x2F; portDir = 0x2F;
SetPortData(0x37); SetPortData(0x37);
// todo: verify this value (I only know that unconnected bits fade after a number of cycles)
unusedPinTTLCycles = 40;
unusedPinTTL0 = 0;
unusedPinTTL1 = 0;
} }
public void HardReset() public void HardReset()
@ -71,6 +81,17 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
cpu.IRQ = !pinIRQ; cpu.IRQ = !pinIRQ;
cpu.ExecuteOne(); cpu.ExecuteOne();
} }
// process unused pin TTL
if (unusedPinTTL0 == 0)
unusedPin0 = false;
else
unusedPinTTL0--;
if (unusedPinTTL1 == 0)
unusedPin1 = false;
else
unusedPinTTL1--;
} }
private void UpdatePins() private void UpdatePins()
@ -102,8 +123,7 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
portDir = val; portDir = val;
else if (addr == 0x0001) else if (addr == 0x0001)
SetPortData(val); SetPortData(val);
else chips.pla.Poke(addr, val);
chips.pla.Poke(addr, val);
} }
public byte Read(ushort addr) public byte Read(ushort addr)
@ -126,8 +146,7 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
PortDirection = val; PortDirection = val;
else if (addr == 0x0001) else if (addr == 0x0001)
PortData = val; PortData = val;
else chips.pla.Write(addr, val);
chips.pla.Write(addr, val);
} }
// ------------------------------------ // ------------------------------------
@ -164,7 +183,8 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
result |= pinCassetteOutput ? (byte)0x08 : (byte)0x00; result |= pinCassetteOutput ? (byte)0x08 : (byte)0x00;
result |= pinCassetteButton ? (byte)0x10 : (byte)0x00; result |= pinCassetteButton ? (byte)0x10 : (byte)0x00;
result |= pinCassetteMotor ? (byte)0x20 : (byte)0x00; result |= pinCassetteMotor ? (byte)0x20 : (byte)0x00;
result |= unusedPin0 ? (byte)0x40 : (byte)0x00;
result |= unusedPin1 ? (byte)0x80 : (byte)0x00;
return result; return result;
} }
set set
@ -195,6 +215,11 @@ namespace BizHawk.Emulation.Computers.Commodore64.MOS
chips.pla.HiRam = pinHiram; chips.pla.HiRam = pinHiram;
chips.pla.Charen = pinCharen; chips.pla.Charen = pinCharen;
} }
unusedPin0 = ((val & 0x40) != 0);
unusedPin1 = ((val & 0x80) != 0);
unusedPinTTL0 = unusedPinTTLCycles;
unusedPinTTL1 = unusedPinTTLCycles;
} }
// ------------------------------------ // ------------------------------------