i hope this breaks something

This commit is contained in:
nattthebear 2018-05-12 12:55:42 -04:00
parent 38b84fce09
commit e8145af463
29 changed files with 49 additions and 49 deletions

View File

@ -169,7 +169,7 @@ namespace BizHawk.Client.Common
[LuaMethodExample("local inemutot = emu.totalexecutedcycles( );")] [LuaMethodExample("local inemutot = emu.totalexecutedcycles( );")]
[LuaMethod("totalexecutedcycles", "gets the total number of executed cpu cycles")] [LuaMethod("totalexecutedcycles", "gets the total number of executed cpu cycles")]
public int TotalExecutedycles() public long TotalExecutedycles()
{ {
try try
{ {

View File

@ -41,7 +41,7 @@ namespace BizHawk.Emulation.Common
/// Gets the total number of CPU cycles since the beginning of the core's lifecycle /// 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 /// Note that the CPU in this case is the "main" CPU, for some cores that may be somewhat subjective
/// </summary> /// </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 public class RegisterValue

View File

@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502
private set { P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00)); } private set { P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00)); }
} }
public int TotalExecutedCycles; public long TotalExecutedCycles;
public Func<ushort, byte> ReadMemory; public Func<ushort, byte> ReadMemory;
public Func<ushort, byte> DummyReadMemory; public Func<ushort, byte> DummyReadMemory;

View File

@ -145,6 +145,6 @@ namespace BizHawk.Emulation.Cores.Calculators
return false; return false;
} }
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
} }
} }

View File

@ -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) private RegisterValue GetRegisterValue(KeyValuePair<string, int> reg)
{ {

View File

@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
_selectedDebuggable.Step(type); _selectedDebuggable.Step(type);
} }
public int TotalExecutedCycles => _selectedDebuggable.TotalExecutedCycles; public long TotalExecutedCycles => _selectedDebuggable.TotalExecutedCycles;
private readonly IMemoryCallbackSystem _memoryCallbacks; private readonly IMemoryCallbackSystem _memoryCallbacks;

View File

@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
} }
} }
int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
private void StepInto() private void StepInto()
{ {

View File

@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
} }
} }
int IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles; long IDebuggable.TotalExecutedCycles => _cpu.TotalExecutedCycles;
private void StepInto() private void StepInto()
{ {

View File

@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
} }
} }

View File

@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
} }
public int TotalExecutedCycles => Cpu.TotalExecutedCycles; public long TotalExecutedCycles => Cpu.TotalExecutedCycles;
private int JSRCount = 0; private int JSRCount = 0;

View File

@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
private bool _doTicks; private bool _doTicks;
private byte _hsyncCnt; private byte _hsyncCnt;
private int _capChargeStart; private long _capChargeStart;
private bool _capCharging; private bool _capCharging;
private bool _vblankEnabled; private bool _vblankEnabled;
private bool _vsyncEnabled; private bool _vsyncEnabled;

View File

@ -67,7 +67,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { return cpu.TotalExecutedCycles; } get { return cpu.TotalExecutedCycles; }
} }

View File

@ -142,6 +142,6 @@ namespace BizHawk.Emulation.Cores.ColecoVision
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles => (int)_cpu.TotalExecutedCycles; public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
} }
} }

View File

@ -95,6 +95,6 @@ namespace BizHawk.Emulation.Cores.Intellivision
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles => _cpu.TotalExecutedCycles; public long TotalExecutedCycles => _cpu.TotalExecutedCycles;
} }
} }

View File

@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
} }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
} }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -69,9 +69,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { return (int)cpu.TotalExecutedCycles; } get { return (long)cpu.TotalExecutedCycles; }
} }
} }
} }

View File

@ -44,9 +44,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
throw new NotImplementedException(); 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" }); private MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem(new[] { "System Bus" });

View File

@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public void Step(StepType type) { throw new NotImplementedException(); } public void Step(StepType type) { throw new NotImplementedException(); }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -100,7 +100,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
} }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
[FeatureNotImplemented] [FeatureNotImplemented]
public void Step(StepType type) { throw new NotImplementedException(); } public void Step(StepType type) { throw new NotImplementedException(); }
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { return cpu.TotalExecutedCycles; } get { return cpu.TotalExecutedCycles; }
} }

View File

@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
} }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -69,7 +69,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
} }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -46,6 +46,6 @@ namespace BizHawk.Emulation.Cores.PCEngine
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles => (int)Cpu.TotalExecutedCycles; public long TotalExecutedCycles => Cpu.TotalExecutedCycles;
} }
} }

View File

@ -142,9 +142,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
throw new NotImplementedException(); throw new NotImplementedException();
} }
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { return (int)Cpu.TotalExecutedCycles; } get { return Cpu.TotalExecutedCycles; }
} }
} }
} }

View File

@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
public void Step(StepType type) { throw new NotImplementedException(); } public void Step(StepType type) { throw new NotImplementedException(); }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public void Step(StepType type) { throw new NotImplementedException(); } public void Step(StepType type) { throw new NotImplementedException(); }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles public long TotalExecutedCycles
{ {
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }

View File

@ -131,7 +131,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan
public void Step(StepType type) { throw new NotImplementedException(); } public void Step(StepType type) { throw new NotImplementedException(); }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles { get { throw new NotImplementedException(); } } public long TotalExecutedCycles { get { throw new NotImplementedException(); } }
BizSwan.MemoryCallback ReadCallbackD; BizSwan.MemoryCallback ReadCallbackD;
BizSwan.MemoryCallback WriteCallbackD; BizSwan.MemoryCallback WriteCallbackD;

View File

@ -17,9 +17,9 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Libretro namespace BizHawk.Emulation.Cores.Libretro
{ {
[Core("Libretro", "zeromus")] [Core("Libretro", "zeromus")]
[ServiceNotApplicable(typeof(IDriveLight))] [ServiceNotApplicable(typeof(IDriveLight))]
public unsafe partial class LibretroCore : IEmulator, ISettable<LibretroCore.Settings, LibretroCore.SyncSettings>, public unsafe partial class LibretroCore : IEmulator, ISettable<LibretroCore.Settings, LibretroCore.SyncSettings>,
ISaveRam, IStatable, IVideoProvider, IInputPollable ISaveRam, IStatable, IVideoProvider, IInputPollable
{ {
private LibretroApi api; private LibretroApi api;
@ -92,23 +92,23 @@ namespace BizHawk.Emulation.Cores.Libretro
public bool LoadData(byte[] data, string id) public bool LoadData(byte[] data, string id)
{ {
bool ret = api.CMD_LoadData(data, id); bool ret = api.CMD_LoadData(data, id);
LoadHandler(); LoadHandler();
return ret; return ret;
} }
public bool LoadPath(string path) public bool LoadPath(string path)
{ {
bool ret = api.CMD_LoadPath(path); bool ret = api.CMD_LoadPath(path);
LoadHandler(); LoadHandler();
return ret; return ret;
} }
public bool LoadNoGame() public bool LoadNoGame()
{ {
bool ret = api.CMD_LoadNoGame(); bool ret = api.CMD_LoadNoGame();
LoadHandler(); LoadHandler();
return ret; return ret;
} }
void LoadHandler() void LoadHandler()
@ -150,7 +150,7 @@ namespace BizHawk.Emulation.Cores.Libretro
[FeatureNotImplemented] [FeatureNotImplemented]
public void SetCpuRegister(string register, int value) { throw new NotImplementedException(); } public void SetCpuRegister(string register, int value) { throw new NotImplementedException(); }
[FeatureNotImplemented] [FeatureNotImplemented]
public int TotalExecutedCycles { get { throw new NotImplementedException(); } } public long TotalExecutedCycles { get { throw new NotImplementedException(); } }
private IController _controller; private IController _controller;