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

Implement ICycleTiming on neshawk

This commit is contained in:
nattthebear 2017-08-11 19:59:10 -04:00
parent 5e3cdba869
commit 77a535a7d8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
View File

@ -9,7 +9,7 @@ using BizHawk.Emulation.Cores.Components.M6502;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
public partial class NES : IEmulator
public partial class NES : IEmulator, ICycleTiming
{
//hardware/state
public MOS6502X cpu;
@ -216,6 +216,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
cpuclockrate = 1662607;
cpu_sequence = cpu_sequence_PAL;
_display_type = DisplayType.PAL;
ClockRate = 5320342.5;
break;
case Common.DisplayType.NTSC:
apu = new APU(this, apu, false);
@ -224,6 +225,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
VsyncDen = 655171;
cpuclockrate = 1789773;
cpu_sequence = cpu_sequence_NTSC;
ClockRate = 5369318.1818181818181818181818182;
break;
// this is in bootgod, but not used at all
case Common.DisplayType.Dendy:
@ -234,6 +236,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
cpuclockrate = 1773448;
cpu_sequence = cpu_sequence_NTSC;
_display_type = DisplayType.Dendy;
ClockRate = 5320342.5;
break;
default:
throw new Exception("Unknown displaytype!");
@ -296,6 +299,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
public long CycleCount => ppu.TotalCycles;
public double ClockRate { get; private set; }
private int VsyncNum { get; set; }
private int VsyncDen { get; set; }

6
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -203,6 +203,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public byte[] OAM;
public byte[] PALRAM;
private long _totalCycles;
public long TotalCycles => _totalCycles;
public void SyncState(Serializer ser)
{
ser.Sync("cpu_step", ref cpu_step);
@ -248,6 +251,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//don't sync framebuffer into binary (rewind) states
if(ser.IsText)
ser.Sync("xbuf", ref xbuf, false);
ser.Sync("_totalCycles", ref _totalCycles);
}
public void Reset()
@ -345,6 +350,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
nes.Board.ClockPPU();
}
}
_totalCycles += x;
}
}
}