From 2da9650be5626566bd7d4ecd9166190fb1fc9b4c Mon Sep 17 00:00:00 2001
From: scrimpey <scrimpey@gmail.com>
Date: Fri, 19 Jun 2015 18:34:52 +0000
Subject: [PATCH] Apple II Debugger - Add Stepping ability

---
 .../Computers/AppleII/AppleII.IDebuggable.cs  | 111 +++++++++++++++++-
 1 file changed, 108 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs
index a4e58cdf85..aca9fdda26 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs
@@ -74,10 +74,115 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
 			}
 		}
 
-		public bool CanStep(StepType type) { return false; }
+		public bool CanStep(StepType type)
+		{
+			switch (type)
+			{
+				case StepType.Into:
+				case StepType.Over:
+				case StepType.Out:
+					return true;
+				default:
+					return false;
+			}
+		}
 
-		[FeatureNotImplemented]
-		public void Step(StepType type) { throw new NotImplementedException(); }
+
+		public void Step(StepType type) 
+		{
+			switch (type)
+			{
+				case StepType.Into:
+					StepInto();
+					break;
+				case StepType.Out:
+					StepOut();
+					break;
+				case StepType.Over:
+					StepOver();
+					break;
+			}
+		}
+
+		private void StepInto()
+		{
+			var machineInVblank = _machine.Video.IsVBlank;
+
+			_machine.Events.HandleEvents(_machine.Cpu.Execute());
+
+			if (!machineInVblank && _machine.Video.IsVBlank) // Check if a frame has passed while stepping
+			{
+				Frame++;
+				if (_machine.Lagged)
+				{
+					LagCount++;
+				}
+
+				_machine.Lagged = true;
+				_machine.DriveLight = false;
+			}
+		}
+
+		private void StepOver()
+		{
+			var instruction = _machine.Memory.Read(_machine.Cpu.RPC);
+
+			if (instruction == JSR)
+			{
+				var destination = _machine.Cpu.RPC + JSRSize;
+				while (_machine.Cpu.RPC != destination)
+				{
+					StepInto();
+				}
+			}
+			else
+			{
+				StepInto();
+			}
+		}
+
+		private void StepOut()
+		{
+			var instr = _machine.Memory.Read(_machine.Cpu.RPC);
+
+			JSRCount = instr == JSR ? 1 : 0;
+
+			var bailOutFrame = Frame + 1;
+
+			while (true)
+			{
+				StepInto();
+				instr = _machine.Memory.Read(_machine.Cpu.RPC);
+				if (instr == JSR)
+				{
+					JSRCount++;
+				}
+				else if (instr == RTS && JSRCount <= 0)
+				{
+					StepInto();
+					JSRCount = 0;
+					break;
+				}
+				else if (instr == RTS)
+				{
+					JSRCount--;
+				}
+				else //Emergency Bailout Logic
+				{
+					if (Frame == bailOutFrame)
+					{
+						break;
+					}
+				}
+			}
+		}
+
+		private int JSRCount = 0;
+
+		private const byte JSR = 0x20;
+		private const byte RTS = 0x60;
+
+		private const byte JSRSize = 3;
 
 		public IMemoryCallbackSystem MemoryCallbacks
 		{