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

C64: IRQ is implemented as a delay line; no delay added (yet)

This commit is contained in:
SaxxonPike 2019-07-13 12:51:39 -05:00
parent d39f3e2e61
commit 3369dbf43f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
View File

@ -103,7 +103,7 @@
(_intSpriteDataCollision ? 0x02 : 0x00) |
(_intSpriteCollision ? 0x04 : 0x00) |
(_intLightPen ? 0x08 : 0x00) |
(_pinIrq ? 0x00 : 0x80);
((_irqBuffer & 1) << 7);
case 0x1A:
return 0xF0 | (_enableIntRaster ? 0x01 : 0x00) |
(_enableIntSpriteDataCollision ? 0x02 : 0x00) |

5
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.State.cs
View File

@ -46,7 +46,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
private bool _multicolorMode;
private bool _pinAec = true;
private bool _pinBa = true;
private bool _pinIrq = true;
private int _pointerCb;
private int _pointerVm;
private int _rasterInterruptLine;
@ -85,7 +84,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
{
_pinAec = true;
_pinBa = true;
_pinIrq = true;
_irqBuffer = 0;
_ba = true;
_bufOffset = 0;
@ -203,7 +202,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
ser.Sync(nameof(_multicolorMode), ref _multicolorMode);
ser.Sync(nameof(_pinAec), ref _pinAec);
ser.Sync(nameof(_pinBa), ref _pinBa);
ser.Sync(nameof(_pinIrq), ref _pinIrq);
ser.Sync(nameof(_irqBuffer), ref _irqBuffer);
ser.Sync(nameof(_pointerCb), ref _pointerCb);
ser.Sync(nameof(_pointerVm), ref _pointerVm);
ser.Sync(nameof(_rasterInterruptLine), ref _rasterInterruptLine);

8
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
View File

@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public bool ReadAec() { return _pinAec; }
public bool ReadBa() { return _pinBa; }
public bool ReadIrq() { return _pinIrq; }
public bool ReadIrq() { return (_irqBuffer & 1) != 0; }
private readonly int _cyclesPerSec;
private readonly int[] _rasterXPipeline;
@ -35,6 +35,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
private readonly int[] _actPipeline;
private readonly int _totalCycles;
private readonly int _totalLines;
private int _irqBuffer;
private int _hblankStartCheckXRaster;
private int _hblankEndCheckXRaster;
@ -224,7 +225,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
_rasterLine = 0;
_vcbase = 0;
_vc = 0;
_badlineEnable = false;
_refreshCounter = 0xFF;
}
}
@ -340,7 +340,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
(_enableIntSpriteCollision & _intSpriteCollision) |
(_enableIntLightPen & _intLightPen));
_pinIrq = irqTemp;
// IRQ buffer is treated as a delay line
_irqBuffer >>= 1;
_irqBuffer |= irqTemp ? 0x1 : 0;
_pinAec = _ba || _baCount >= 0;
_pinBa = _ba;
}