From 09f9d50f46339a06daa9892333aca8555a76e501 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 14 Dec 2014 17:17:22 +0000 Subject: [PATCH] IDisassemblable changes. can't compile right now, so might not work --- BizHawk.Emulation.Common/Interfaces/IDisassemblable.cs | 7 +++---- .../Consoles/Nintendo/GBA/ArmV4Disassembler.cs | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Common/Interfaces/IDisassemblable.cs b/BizHawk.Emulation.Common/Interfaces/IDisassemblable.cs index d3611faacd..4d53d34362 100644 --- a/BizHawk.Emulation.Common/Interfaces/IDisassemblable.cs +++ b/BizHawk.Emulation.Common/Interfaces/IDisassemblable.cs @@ -44,10 +44,9 @@ namespace BizHawk.Emulation.Common } } - public abstract IEnumerable AvailableCpus - { - get; - } + public abstract IEnumerable AvailableCpus { get; } + + public abstract string PCRegisterName { get; } public abstract string Disassemble(MemoryDomain m, uint addr, out int length); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs index af09c8ab90..2362a919e3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs @@ -16,6 +16,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA } } + public override string PCRegisterName + { + get { return "R15"; } + } + public override string Disassemble(MemoryDomain m, uint addr, out int length) { if (_cpu == "ARM v4 (Thumb)")