From 11a8a009c5d74888eb6cc8cc53d31ce36d71bf71 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 5 Dec 2014 01:01:58 +0000 Subject: [PATCH] AsDebuggable() --- .../lua/EmuLuaLibrary.Emu.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs index 9f39bd6839..6af9429891 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Emu.cs @@ -65,11 +65,13 @@ namespace BizHawk.Client.Common { try { - var debuggable = Global.Emulator as IDebuggable; - if (debuggable == null) + var debuggable = Global.Emulator.AsDebuggable(); + if (!Global.Emulator.CanDebug()) + { throw new NotImplementedException(); + } - var registers = debuggable.GetCpuFlagsAndRegisters(); + var registers = debuggable.AsDebuggable().GetCpuFlagsAndRegisters(); return registers.ContainsKey(name) ? registers[name] : 0; @@ -94,9 +96,11 @@ namespace BizHawk.Client.Common try { - var debuggable = Global.Emulator as IDebuggable; - if (debuggable == null) + var debuggable = Global.Emulator.AsDebuggable(); + if (!Global.Emulator.CanDebug()) + { throw new NotImplementedException(); + } foreach (var kvp in debuggable.GetCpuFlagsAndRegisters()) { @@ -121,9 +125,11 @@ namespace BizHawk.Client.Common { try { - var debuggable = Global.Emulator as IDebuggable; - if (debuggable == null) + var debuggable = Global.Emulator.AsDebuggable(); + if (!Global.Emulator.CanDebug()) + { throw new NotImplementedException(); + } debuggable.SetCpuRegister(register, value); }