From e8145af463500d8886f1a0369e7b13a2c7c8933b Mon Sep 17 00:00:00 2001 From: nattthebear Date: Sat, 12 May 2018 12:55:42 -0400 Subject: [PATCH] i hope this breaks something --- .../lua/EmuLuaLibrary.Emu.cs | 2 +- .../Interfaces/Services/IDebuggable.cs | 2 +- .../CPUs/MOS 6502X/MOS6502X.cs | 2 +- .../Calculator/TI83.IDebuggable.cs | 2 +- .../Computers/AppleII/AppleII.IDebuggable.cs | 2 +- .../Computers/Commodore64/C64.IDebuggable.cs | 2 +- .../Commodore64/MOS/Chip6510.IDebuggable.cs | 2 +- .../Serial/Drive1541.IDebuggable.cs | 2 +- .../ZXSpectrum.IDebuggable.cs | 2 +- .../Atari/2600/Atari2600.IDebuggable.cs | 2 +- .../Consoles/Atari/2600/Tia/TIA.cs | 2 +- .../Atari/A7800Hawk/A7800Hawk.IDebuggable.cs | 2 +- .../Coleco/ColecoVision.IDebuggable.cs | 2 +- .../Intellivision.IDebuggable.cs | 2 +- .../Nintendo/GBA/MGBAHawk.IDebuggable.cs | 2 +- .../Nintendo/GBA/VBANext.IDebuggable.cs | 2 +- .../Nintendo/GBHawk/GBHawk.IDebuggable.cs | 4 +-- .../Nintendo/Gameboy/Gambatte.IDebuggable.cs | 4 +-- .../Gameboy/GambatteLink.IDebuggable.cs | 2 +- .../Consoles/Nintendo/N64/N64.IDebuggable.cs | 2 +- .../Consoles/Nintendo/NES/NES.IDebuggable.cs | 2 +- .../Nintendo/QuickNES/QuickNES.IDebuggable.cs | 2 +- .../Nintendo/SNES/LibsnesCore.IDebuggable.cs | 2 +- .../PC Engine/PCEngine.IDebuggable.cs | 2 +- .../Consoles/Sega/SMS/SMS.IDebuggable.cs | 4 +-- .../Consoles/Sega/gpgx64/GPGX.IDebuggable.cs | 2 +- .../Sony/PSX/Octoshock.IDebuggable.cs | 2 +- .../Consoles/WonderSwan/WonderSwan.cs | 2 +- .../Libretro/LibretroCore.cs | 36 +++++++++---------- 29 files changed, 49 insertions(+), 49 deletions(-) diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs index 60c0eb6164..2ce9d776f3 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs @@ -169,7 +169,7 @@ namespace BizHawk.Client.Common [LuaMethodExample("local inemutot = emu.totalexecutedcycles( );")] [LuaMethod("totalexecutedcycles", "gets the total number of executed cpu cycles")] - public int TotalExecutedycles() + public long TotalExecutedycles() { try { diff --git a/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs index 69d140890a..e1655b888a 100644 --- a/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs +++ b/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs @@ -41,7 +41,7 @@ namespace BizHawk.Emulation.Common /// Gets the total number of CPU cycles since the beginning of the core's lifecycle /// Note that the CPU in this case is the "main" CPU, for some cores that may be somewhat subjective /// - int TotalExecutedCycles { get; } // TODO: this should probably be a long, but most cores were using int, oh well + long TotalExecutedCycles { get; } // TODO: this should probably be a long, but most cores were using int, oh well } public class RegisterValue diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs index bcfa5a80a3..c92ff5db95 100644 --- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs +++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs @@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502 private set { P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00)); } } - public int TotalExecutedCycles; + public long TotalExecutedCycles; public Func ReadMemory; public Func DummyReadMemory; diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs index d4e292ad18..e6477b56fd 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs @@ -145,6 +145,6 @@ namespace BizHawk.Emulation.Cores.Calculators return false; } - public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; + public long TotalExecutedCycles => _cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs index f36cef6f8a..1284ab2dd0 100644 --- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs @@ -104,7 +104,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII } } - public int TotalExecutedCycles => (int)_machine.Cpu.Cycles; + public long TotalExecutedCycles => _machine.Cpu.Cycles; private RegisterValue GetRegisterValue(KeyValuePair reg) { diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs index 29ae7368c5..29d110c705 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs @@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 _selectedDebuggable.Step(type); } - public int TotalExecutedCycles => _selectedDebuggable.TotalExecutedCycles; + public long TotalExecutedCycles => _selectedDebuggable.TotalExecutedCycles; private readonly IMemoryCallbackSystem _memoryCallbacks; diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs index b64b70cb3e..67ba9a45c1 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs @@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS } } - int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; + long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; private void StepInto() { diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs index 8f51fa55c0..e869a3ecfb 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs @@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial } } - int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; + long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; private void StepInto() { diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs index e086ad09e3..caa161e0d7 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs @@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum throw new NotImplementedException(); } - public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; + public long TotalExecutedCycles => _cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs index 75c16f62ff..1a5068cb10 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs @@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 } - public int TotalExecutedCycles => Cpu.TotalExecutedCycles; + public long TotalExecutedCycles => Cpu.TotalExecutedCycles; private int JSRCount = 0; diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs index af5ea5f124..bb6aa0783d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs @@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 private bool _doTicks; private byte _hsyncCnt; - private int _capChargeStart; + private long _capChargeStart; private bool _capCharging; private bool _vblankEnabled; private bool _vsyncEnabled; diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs index afdc4168bd..343f831e5e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs @@ -67,7 +67,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk throw new NotImplementedException(); } - public int TotalExecutedCycles + public long TotalExecutedCycles { get { return cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs index 8739d2d616..73ca2c072e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs @@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.ColecoVision throw new NotImplementedException(); } - public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; + public long TotalExecutedCycles => _cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs index c80c5832a2..78d5f9a4e7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs @@ -95,6 +95,6 @@ namespace BizHawk.Emulation.Cores.Intellivision throw new NotImplementedException(); } - public int TotalExecutedCycles => _cpu.TotalExecutedCycles; + public long TotalExecutedCycles => _cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs index 57809282b0..eb97242ded 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs @@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.IDebuggable.cs index 2b9424e729..71592fbc3d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.IDebuggable.cs @@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs index 8d5be5a227..a1323f8564 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs @@ -69,9 +69,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk throw new NotImplementedException(); } - public int TotalExecutedCycles + public long TotalExecutedCycles { - get { return (int)cpu.TotalExecutedCycles; } + get { return (long)cpu.TotalExecutedCycles; } } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs index f9d8d42534..075ee71d27 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs @@ -44,9 +44,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy throw new NotImplementedException(); } - public int TotalExecutedCycles + public long TotalExecutedCycles { - get { return (int)Math.Max(_cycleCount, callbackCycleCount); } + get { return Math.Max((long)_cycleCount, (long)callbackCycleCount); } } private MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem(new[] { "System Bus" }); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs index d6b4d8d276..363895ef05 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs @@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy public void Step(StepType type) { throw new NotImplementedException(); } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs index 5aadf2b2d5..6a7b66d383 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs @@ -100,7 +100,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs index d1fe787ab8..58b920f85e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs @@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } - public int TotalExecutedCycles + public long TotalExecutedCycles { get { return cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs index e78ef46cb3..d2bb1f5212 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs @@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs index 92fa298885..37ad308671 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs @@ -69,7 +69,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs index 5fa09dfe3b..5b74440545 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs @@ -46,6 +46,6 @@ namespace BizHawk.Emulation.Cores.PCEngine throw new NotImplementedException(); } - public int TotalExecutedCycles => (int)Cpu.TotalExecutedCycles; + public long TotalExecutedCycles => Cpu.TotalExecutedCycles; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs index 3a9bf83be6..2f142e92da 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs @@ -142,9 +142,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem throw new NotImplementedException(); } - public int TotalExecutedCycles + public long TotalExecutedCycles { - get { return (int)Cpu.TotalExecutedCycles; } + get { return Cpu.TotalExecutedCycles; } } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs index ba82d0ff1a..9b5e7363d9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs @@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx public void Step(StepType type) { throw new NotImplementedException(); } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs index 47cc4221e9..b71f3223f5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs @@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX public void Step(StepType type) { throw new NotImplementedException(); } [FeatureNotImplemented] - public int TotalExecutedCycles + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index e1defde253..49f91a1824 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -131,7 +131,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan public void Step(StepType type) { throw new NotImplementedException(); } [FeatureNotImplemented] - public int TotalExecutedCycles { get { throw new NotImplementedException(); } } + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } BizSwan.MemoryCallback ReadCallbackD; BizSwan.MemoryCallback WriteCallbackD; diff --git a/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs b/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs index 243688c6f0..f52709963b 100644 --- a/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs +++ b/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs @@ -17,9 +17,9 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Libretro { - [Core("Libretro", "zeromus")] - [ServiceNotApplicable(typeof(IDriveLight))] - public unsafe partial class LibretroCore : IEmulator, ISettable, + [Core("Libretro", "zeromus")] + [ServiceNotApplicable(typeof(IDriveLight))] + public unsafe partial class LibretroCore : IEmulator, ISettable, ISaveRam, IStatable, IVideoProvider, IInputPollable { private LibretroApi api; @@ -92,23 +92,23 @@ namespace BizHawk.Emulation.Cores.Libretro public bool LoadData(byte[] data, string id) { - bool ret = api.CMD_LoadData(data, id); - LoadHandler(); + bool ret = api.CMD_LoadData(data, id); + LoadHandler(); return ret; } - public bool LoadPath(string path) - { - bool ret = api.CMD_LoadPath(path); - LoadHandler(); - return ret; - } - - public bool LoadNoGame() - { - bool ret = api.CMD_LoadNoGame(); - LoadHandler(); - return ret; + public bool LoadPath(string path) + { + bool ret = api.CMD_LoadPath(path); + LoadHandler(); + return ret; + } + + public bool LoadNoGame() + { + bool ret = api.CMD_LoadNoGame(); + LoadHandler(); + return ret; } void LoadHandler() @@ -150,7 +150,7 @@ namespace BizHawk.Emulation.Cores.Libretro [FeatureNotImplemented] public void SetCpuRegister(string register, int value) { throw new NotImplementedException(); } [FeatureNotImplemented] - public int TotalExecutedCycles { get { throw new NotImplementedException(); } } + public long TotalExecutedCycles { get { throw new NotImplementedException(); } } private IController _controller;