diff --git a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs index 6dd4199475..484d5e239f 100644 --- a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs +++ b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs @@ -21,11 +21,15 @@ namespace BizHawk.Emulation.Common IMemoryCallbackSystem MemoryCallbacks { get; } - // Advanced Navigation - //void StepInto(); - //void StepOut(); - //void StepOver(); + /// + /// Informs the calling code whether or not the given step type is implemented, + /// if false, a NotImplementedException will be thrown if Step is called with the given value + /// + bool CanStep(StepType type); + /// + /// Advances the core based on the given Step type + /// void Step(StepType type); } diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs index b13f06f3f6..ed17ba22c6 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs @@ -130,5 +130,7 @@ namespace BizHawk.Emulation.Cores.Calculators [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } + + public bool CanStep(StepType type) { return false; } } } diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs index be108b0166..a6a032bcbc 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs @@ -65,5 +65,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } + + public bool CanStep(StepType type) { return false; } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs index 40afdb2499..b3e09f8dd3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs @@ -60,6 +60,19 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 public IMemoryCallbackSystem MemoryCallbacks { get; private set; } + public bool CanStep(StepType type) + { + switch (type) + { + case StepType.Into: + return true; + default: + case StepType.Out: + case StepType.Over: + return false; + } + } + [FeatureNotImplemented] public void Step(StepType type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs index 9985f35a20..c89d31ffd3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs @@ -66,6 +66,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800 get { throw new NotImplementedException(); } } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs index 2201bd7d49..66fa9a60d3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs @@ -133,6 +133,8 @@ namespace BizHawk.Emulation.Cores.ColecoVision get { throw new NotImplementedException(); } } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs index 06656ec7ec..75b2d4e243 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs @@ -27,6 +27,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA return ret; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs index 9399f38cc0..e4cd61eb3a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs @@ -421,6 +421,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA regs.SetRegister(register, value); } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 43e46fa1e3..c74f7c1a7f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -289,6 +289,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy _inputCallbacks = ics; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index 45dc23d781..548449b466 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -448,6 +448,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy MemoryDomains = new MemoryDomainList(mm); } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { 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 0f93924e44..2fd7e90d5e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs @@ -71,6 +71,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 public IMemoryCallbackSystem MemoryCallbacks { get; private set; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index 1e7eb3483d..669bde0de7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -946,6 +946,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 65490d518b..4749c8eff4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -397,6 +397,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES throw new NotImplementedException(); } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 051d095836..1d0275b89b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -254,6 +254,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES public ITracer Tracer { get; private set; } public IMemoryCallbackSystem MemoryCallbacks { get; private set; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 5a9a3b1389..27e1ef0bd4 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -566,6 +566,8 @@ namespace BizHawk.Emulation.Cores.PCEngine }; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs index 04d0d0b8a0..8f09c612c0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs @@ -292,6 +292,8 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis }; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 40c9be4e6c..70fce301b3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -600,6 +600,8 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem } } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index 175d089b7e..6c1066dbf1 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -650,6 +650,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx return ret; } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 254deac233..1f34964ec4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -1007,6 +1007,8 @@ namespace BizHawk.Emulation.Cores.Sony.PSX [FeatureNotImplemented] public IMemoryCallbackSystem MemoryCallbacks { get { throw new NotImplementedException(); } } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); } diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index f443fbd9a2..e88e64445d 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -351,6 +351,8 @@ namespace BizHawk.Emulation.Cores.WonderSwan throw new NotImplementedException(); } + public bool CanStep(StepType type) { return false; } + [FeatureNotImplemented] public void Step(StepType type) { throw new NotImplementedException(); }