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

Fixed off-by-one-tstate frame timing issue

This commit is contained in:
Asnivor 2018-02-16 08:49:41 +00:00
parent ec7445669c
commit c8ea81bfd8
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
View File

@ -123,7 +123,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
PollInput();
while (CurrentFrameCycle <= ULADevice.FrameLength) // UlaFrameCycleCount)
while (CurrentFrameCycle < ULADevice.FrameLength) // UlaFrameCycleCount)
{
// check for interrupt
ULADevice.CheckForInterrupt(CurrentFrameCycle);

8
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULABase.cs
View File

@ -254,7 +254,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// <summary>
/// The longest instruction cycle count
/// </summary>
protected const int LONGEST_OP_CYCLES = 23;
protected int LongestOperationCycles = 23;
/// <summary>
/// Signs that an interrupt has been raised in this frame.
@ -288,19 +288,19 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
return;
}
if (currentCycle < InterruptPeriod)
if (currentCycle < LongestOperationCycles)// InterruptPeriod)
{
// interrupt does not need to be raised yet
return;
}
if (currentCycle > InterruptPeriod + LONGEST_OP_CYCLES)
if (currentCycle >= InterruptPeriod + LongestOperationCycles)
{
// interrupt should have already been raised and the cpu may or
// may not have caught it. The time has passed so revoke the signal
InterruptRevoked = true;
_machine.CPU.FlagI = false;
return;
}
if (InterruptRaised)

1
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.ULA.cs
View File

@ -9,6 +9,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
: base(machine)
{
InterruptPeriod = 36;
LongestOperationCycles = 23;
FrameLength = 70908;
ClockSpeed = 3546900;

1
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.ULA.cs
View File

@ -9,6 +9,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
: base(machine)
{
InterruptPeriod = 32;
LongestOperationCycles = 23;
FrameLength = 69888;
ClockSpeed = 3500000;