From b939c47de6ecbf831762add6bf2beda6c3d5114f Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Mon, 19 Mar 2018 16:21:15 +0000
Subject: [PATCH] Added reset methods

---
 .../SinclairSpectrum/Machine/SpectrumBase.cs  | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
index 92c48065bc..ac557b4c99 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
@@ -207,8 +207,31 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// </summary>
         public virtual void HardReset()
         {
-            //ResetBorder();
             ULADevice.ResetInterrupt();
+            ROMPaged = 0;
+            SpecialPagingMode = false;
+            RAMPaged = 0;
+            CPU.RegPC = 0;
+
+            Spectrum.SetCpuRegister("SP", 0xFFFF);
+            Spectrum.SetCpuRegister("IY", 0xFFFF);
+            Spectrum.SetCpuRegister("IX", 0xFFFF);
+            Spectrum.SetCpuRegister("AF", 0xFFFF);
+            Spectrum.SetCpuRegister("BC", 0xFFFF);
+            Spectrum.SetCpuRegister("DE", 0xFFFF);
+            Spectrum.SetCpuRegister("HL", 0xFFFF);
+            Spectrum.SetCpuRegister("SP", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow AF", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow BC", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow DE", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow HL", 0xFFFF);
+
+            CPU.Regs[CPU.I] = 0;
+            CPU.Regs[CPU.R] = 0;
+
+            TapeDevice.Reset();
+            if (AYDevice != null)
+                AYDevice.Reset();
         }
 
         /// <summary>
@@ -216,9 +239,31 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// </summary>
         public virtual void SoftReset()
         {
-            //ResetBorder();
-            ULADevice.ResetInterrupt();
+             ULADevice.ResetInterrupt();
+            ROMPaged = 0;
+            SpecialPagingMode = false;
+            RAMPaged = 0;
             CPU.RegPC = 0;
+
+            Spectrum.SetCpuRegister("SP", 0xFFFF);
+            Spectrum.SetCpuRegister("IY", 0xFFFF);
+            Spectrum.SetCpuRegister("IX", 0xFFFF);
+            Spectrum.SetCpuRegister("AF", 0xFFFF);
+            Spectrum.SetCpuRegister("BC", 0xFFFF);
+            Spectrum.SetCpuRegister("DE", 0xFFFF);
+            Spectrum.SetCpuRegister("HL", 0xFFFF);
+            Spectrum.SetCpuRegister("SP", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow AF", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow BC", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow DE", 0xFFFF);
+            Spectrum.SetCpuRegister("Shadow HL", 0xFFFF);
+
+            CPU.Regs[CPU.I] = 0;
+            CPU.Regs[CPU.R] = 0;
+
+            TapeDevice.Reset();
+            if (AYDevice != null)
+                AYDevice.Reset();
         }
 
         #endregion