i hope this breaks something
This commit is contained in:
parent
38b84fce09
commit
e8145af463
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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
|
||||
/// </summary>
|
||||
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
|
||||
|
|
|
@ -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<ushort, byte> ReadMemory;
|
||||
public Func<ushort, byte> DummyReadMemory;
|
||||
|
|
|
@ -145,6 +145,6 @@ namespace BizHawk.Emulation.Cores.Calculators
|
|||
return false;
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<string, int> reg)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
|
|||
}
|
||||
}
|
||||
|
||||
int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
|
||||
private void StepInto()
|
||||
{
|
||||
|
|
|
@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
|
|||
}
|
||||
}
|
||||
|
||||
int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
|
||||
private void StepInto()
|
||||
{
|
||||
|
|
|
@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
|
|||
}
|
||||
|
||||
|
||||
public int TotalExecutedCycles => Cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => Cpu.TotalExecutedCycles;
|
||||
|
||||
private int JSRCount = 0;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -67,7 +67,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { return cpu.TotalExecutedCycles; }
|
||||
}
|
||||
|
|
|
@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.ColecoVision
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -95,6 +95,6 @@ namespace BizHawk.Emulation.Cores.Intellivision
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
|
|||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { throw new NotImplementedException(); }
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
|
|||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { throw new NotImplementedException(); }
|
||||
}
|
||||
|
|
|
@ -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; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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" });
|
||||
|
|
|
@ -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(); }
|
||||
}
|
||||
|
|
|
@ -100,7 +100,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
|
|||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { throw new NotImplementedException(); }
|
||||
}
|
||||
|
|
|
@ -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; }
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
|
|||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { throw new NotImplementedException(); }
|
||||
}
|
||||
|
|
|
@ -69,7 +69,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
|
|||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public int TotalExecutedCycles
|
||||
public long TotalExecutedCycles
|
||||
{
|
||||
get { throw new NotImplementedException(); }
|
||||
}
|
||||
|
|
|
@ -46,6 +46,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
|
|||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public int TotalExecutedCycles => (int)Cpu.TotalExecutedCycles;
|
||||
public long TotalExecutedCycles => Cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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(); }
|
||||
}
|
||||
|
|
|
@ -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(); }
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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<LibretroCore.Settings, LibretroCore.SyncSettings>,
|
||||
[Core("Libretro", "zeromus")]
|
||||
[ServiceNotApplicable(typeof(IDriveLight))]
|
||||
public unsafe partial class LibretroCore : IEmulator, ISettable<LibretroCore.Settings, LibretroCore.SyncSettings>,
|
||||
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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue