Refactor IDebuggable StepInto/Over/Out methods into void Step(StepType type);

BizHawk.Emulation.Common/Interfaces/IDebuggable.cs

@@ -22,8 +22,12 @@ namespace BizHawk.Emulation.Common
 		IMemoryCallbackSystem MemoryCallbacks { get; }
 
 		// Advanced Navigation
-		void StepInto();
+		//void StepInto();
-		void StepOut();
+		//void StepOut();
-		void StepOver();
+		//void StepOver();
+
+		void Step(StepType type);
 	}
+
+	public enum StepType { Into, Out, Over }
 }

BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs

@@ -129,12 +129,6 @@ namespace BizHawk.Emulation.Cores.Calculators
 		public IMemoryCallbackSystem MemoryCallbacks { get; private set; }
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 	}
 }

BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs

@@ -128,13 +128,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		public ITracer Tracer
 		{

BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs

@@ -61,12 +61,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 		public IMemoryCallbackSystem MemoryCallbacks { get; private set; }
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 	}
 }

BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs

@@ -67,12 +67,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 	}
 }

BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs

@@ -134,12 +134,6 @@ namespace BizHawk.Emulation.Cores.ColecoVision
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 	}
 }

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs

@@ -28,13 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs

@@ -422,13 +422,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		#endregion
 

BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs

@@ -290,13 +290,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		#endregion
 

BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs

@@ -448,9 +448,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			MemoryDomains = new MemoryDomainList(mm);
 		}
 
-		public void StepInto() { throw new NotImplementedException(); }
+		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-		public void StepOver() { throw new NotImplementedException(); }
 
 		#endregion
 

BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs

@@ -72,13 +72,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 		public IMemoryCallbackSystem MemoryCallbacks { get; private set; }
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		private mupen64plusApi.MemoryCallback _readcb;
 		private mupen64plusApi.MemoryCallback _writecb;

BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs

@@ -943,13 +943,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		public ITracer Tracer { get; private set; }
 		public IMemoryCallbackSystem MemoryCallbacks { get; private set; }

BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs

@@ -395,13 +395,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		public ITracer Tracer
 		{

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs

@@ -255,13 +255,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 		public IMemoryCallbackSystem MemoryCallbacks { get; private set; }
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)

BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs

@@ -566,13 +566,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)

BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs

@@ -293,13 +293,7 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)

BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs

@@ -601,13 +601,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		public void Dispose() { }
 

BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs

@@ -644,13 +644,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		[FeatureNotImplemented]
 		public void SetCpuRegister(string register, int value)

BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs

@@ -765,11 +765,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 		public IMemoryCallbackSystem MemoryCallbacks { get { throw new NotImplementedException(); } }
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		#endregion //IDebuggable
 	}

BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs

@@ -349,13 +349,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 		}
 
 		[FeatureNotImplemented]
-		public void StepInto() { throw new NotImplementedException(); }
+		public void Step(StepType type) { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOut() { throw new NotImplementedException(); }
-
-		[FeatureNotImplemented]
-		public void StepOver() { throw new NotImplementedException(); }
 
 		BizSwan.MemoryCallback ReadCallbackD;
 		BizSwan.MemoryCallback WriteCallbackD;