diff --git a/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs b/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
index 64ce6bf3b4..a95ed0d625 100644
--- a/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
@@ -34,11 +34,11 @@ namespace BizHawk.Emulation.Common
}
///
- /// does santiy checking on Cpu parameters
+ /// does sanity checking on CPU parameters
///
public abstract class VerifiedDisassembler : IDisassemblable
{
- protected string _cpu;
+ private string _cpu;
public virtual string Cpu
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
index 2362a919e3..ce30c3d638 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
@@ -1,33 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components.ARM;
namespace BizHawk.Emulation.Cores.Nintendo.GBA
{
public class ArmV4Disassembler : VerifiedDisassembler
{
- public override IEnumerable AvailableCpus
+ public override IEnumerable AvailableCpus => new[]
{
- get
- {
- return new[] { "ARM v4", "ARM v4 (Thumb)" };
- }
- }
+ "ARM v4",
+ "ARM v4 (Thumb)"
+ };
- public override string PCRegisterName
- {
- get { return "R15"; }
- }
+ public override string PCRegisterName => "R15";
public override string Disassemble(MemoryDomain m, uint addr, out int length)
{
- if (_cpu == "ARM v4 (Thumb)")
+ if (Cpu == "ARM v4 (Thumb)")
{
addr &= unchecked((uint)~1);
int op = m.PeekByte((int)addr) | m.PeekByte((int)addr + 1) << 8;
- string ret = Emulation.Cores.Components.ARM.Darm.DisassembleStuff(addr | 1, (uint)op);
+ string ret = Darm.DisassembleStuff(addr | 1, (uint)op);
length = 2;
return ret;
}
@@ -38,7 +31,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
| m.PeekByte((int)addr + 1) << 8
| m.PeekByte((int)addr + 2) << 16
| m.PeekByte((int)addr + 3) << 24;
- string ret = Emulation.Cores.Components.ARM.Darm.DisassembleStuff(addr, (uint)op);
+ string ret = Darm.DisassembleStuff(addr, (uint)op);
length = 4;
return ret;
}