diff --git a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
index dc7a45f738..6dd4199475 100644
--- a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
+++ b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs
@@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Common
/// Returns a list of Cpu registers and their current state
///
///
- IDictionary GetCpuFlagsAndRegisters();
+ IDictionary GetCpuFlagsAndRegisters();
///
/// Sets a given Cpu register to the given value
@@ -29,68 +29,68 @@ namespace BizHawk.Emulation.Common
void Step(StepType type);
}
- public class Register
+ public class RegisterValue
{
public ulong Value { get; set; }
public byte BitSize { get; set; }
- public static implicit operator Register(bool val)
+ public static implicit operator RegisterValue(bool val)
{
- return new Register
+ return new RegisterValue
{
Value = (ulong)(val ? 1 : 0),
BitSize = 1
};
}
- public static implicit operator Register(byte val)
+ public static implicit operator RegisterValue(byte val)
{
- return new Register
+ return new RegisterValue
{
Value = val,
BitSize = 8
};
}
- public static implicit operator Register(ushort val)
+ public static implicit operator RegisterValue(ushort val)
{
- return new Register
+ return new RegisterValue
{
Value = val,
BitSize = 16
};
}
- public static implicit operator Register(int val)
+ public static implicit operator RegisterValue(int val)
{
- return new Register
+ return new RegisterValue
{
Value = (ulong)val,
BitSize = 32
};
}
- public static implicit operator Register(uint val)
+ public static implicit operator RegisterValue(uint val)
{
- return new Register
+ return new RegisterValue
{
Value = val,
BitSize = 32
};
}
- public static implicit operator Register(long val)
+ public static implicit operator RegisterValue(long val)
{
- return new Register
+ return new RegisterValue
{
Value = (ulong)val,
BitSize = 64
};
}
- public static implicit operator Register(ulong val)
+ public static implicit operator RegisterValue(ulong val)
{
- return new Register
+ return new RegisterValue
{
Value = val,
BitSize = 64
diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs
index 99d42e9441..b13f06f3f6 100644
--- a/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs
@@ -8,9 +8,9 @@ namespace BizHawk.Emulation.Cores.Calculators
{
public partial class TI83 : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", cpu.RegisterA },
{ "AF", cpu.RegisterAF },
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
index b070460509..be108b0166 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
@@ -7,9 +7,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
public partial class C64 : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", board.cpu.A },
{ "X", board.cpu.X },
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
index db8751a9a5..40afdb2499 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
@@ -7,9 +7,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
public partial class Atari2600 : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", Cpu.A },
{ "X", Cpu.X },
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs
index e6da1f51f5..9985f35a20 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IDebuggable.cs
@@ -7,9 +7,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
{
public partial class Atari7800 : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", theMachine.CPU.A },
{ "P", theMachine.CPU.P },
diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs
index 4d1873f356..2201bd7d49 100644
--- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs
@@ -9,9 +9,9 @@ namespace BizHawk.Emulation.Cores.ColecoVision
{
public partial class ColecoVision : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", Cpu.RegisterA },
{ "AF", Cpu.RegisterAF },
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
index d6b620e057..06656ec7ec 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
@@ -17,9 +17,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
[ServiceNotApplicable(typeof(IDriveLight))]
public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider, IGBAGPUViewable, IMemoryDomains, ISaveRam, IDebuggable, IStatable, IInputPollable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- var ret = new Dictionary();
+ var ret = new Dictionary();
int[] data = new int[LibMeteor.regnames.Length];
LibMeteor.libmeteor_getregs(data);
for (int i = 0; i < data.Length; i++)
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
index 821d37b241..9399f38cc0 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
@@ -411,7 +411,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
regs = new VBARegisterHelper(Core);
}
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
return regs.GetAllRegisters();
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBARegisterHelper.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBARegisterHelper.cs
index b6667ef068..58ca665b36 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBARegisterHelper.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBARegisterHelper.cs
@@ -32,9 +32,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
int* p = (int*)_locs[name];
*p = val;
}
- public Dictionary GetAllRegisters()
+ public Dictionary GetAllRegisters()
{
- var ret = new Dictionary();
+ var ret = new Dictionary();
foreach (var kvp in _locs)
{
ret[kvp.Key] = GetRegister(kvp.Key);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index f6e47e0456..43e46fa1e3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -238,12 +238,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
#region debug
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
int[] data = new int[10];
LibGambatte.gambatte_getregs(GambatteState, data);
- return new Dictionary
+ return new Dictionary
{
{ "PC", (ushort)(data[(int)LibGambatte.RegIndicies.PC] & 0xffff) },
{ "SP", (ushort)(data[(int)LibGambatte.RegIndicies.SP] & 0xffff) },
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
index ae575529e0..45dc23d781 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
@@ -413,13 +413,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public MemoryDomainList MemoryDomains { get; private set; }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
var left = L.GetCpuFlagsAndRegisters()
- .Select(reg => new KeyValuePair("Left " + reg.Key, reg.Value));
+ .Select(reg => new KeyValuePair("Left " + reg.Key, reg.Value));
var right = R.GetCpuFlagsAndRegisters()
- .Select(reg => new KeyValuePair("Right " + reg.Key, reg.Value));
+ .Select(reg => new KeyValuePair("Right " + reg.Key, reg.Value));
return left.Union(right).ToList().ToDictionary(pair => pair.Key, pair => pair.Value);
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs
index 198b3d9cd2..0f93924e44 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs
@@ -8,10 +8,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public partial class N64 : IDebuggable
{
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
// note: the approach this code takes is highly bug-prone
- var ret = new Dictionary();
+ var ret = new Dictionary();
var data = new byte[32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + 32 * 8];
api.getRegisters(data);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
index f76afd9d9c..1e7eb3483d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
@@ -899,9 +899,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public bool BinarySaveStatesPreferred { get { return false; } }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", cpu.A },
{ "X", cpu.X },
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
index 82336b085b..65490d518b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
@@ -377,10 +377,10 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
public MemoryDomainList MemoryDomains { get; private set; }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
int[] regs = new int[6];
- var ret = new Dictionary();
+ var ret = new Dictionary();
LibQuickNES.qn_get_cpuregs(Context, regs);
ret["A"] = (byte)regs[0];
ret["X"] = (byte)regs[1];
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
index ea19eaf5c3..051d095836 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
@@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
api.Dispose();
}
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
LibsnesApi.CpuRegs regs;
api.QUERY_peek_cpu_regs(out regs);
@@ -218,7 +218,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
bool fz = (regs.p & 0x02)!=0;
bool fc = (regs.p & 0x01)!=0;
- return new Dictionary
+ return new Dictionary
{
{ "PC", regs.pc },
{ "A", regs.a },
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index ceb86b6204..5a9a3b1389 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
@@ -546,9 +546,9 @@ namespace BizHawk.Emulation.Cores.PCEngine
MemoryDomainList memoryDomains;
public MemoryDomainList MemoryDomains { get { return memoryDomains; } }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", Cpu.A },
{ "X", Cpu.X },
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
index a5aa4165c4..04d0d0b8a0 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
@@ -260,9 +260,9 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis
#endif
}
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A-0", MainCPU.A[0].s32 },
{ "A-1", MainCPU.A[1].s32 },
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
index 0839220213..40c9be4e6c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
@@ -488,9 +488,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
public MemoryDomainList MemoryDomains { get { return memoryDomains; } }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- return new Dictionary
+ return new Dictionary
{
{ "A", Cpu.RegisterA },
{ "AF", Cpu.RegisterAF },
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
index d732229515..175d089b7e 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
@@ -629,14 +629,14 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
MemoryDomains = new MemoryDomainList(mm, 0);
}
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
LibGPGX.RegisterInfo[] regs = new LibGPGX.RegisterInfo[LibGPGX.gpgx_getmaxnumregs()];
int n = LibGPGX.gpgx_getregs(regs);
if (n > regs.Length)
throw new InvalidOperationException("A buffer overrun has occured!");
- var ret = new Dictionary();
+ var ret = new Dictionary();
for (int i = 0; i < n; i++)
{
// el hacko
@@ -645,7 +645,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
if (name.Contains("68K SR") || name.StartsWith("Z80"))
size = 16;
ret[Marshal.PtrToStringAnsi(regs[i].Name)] =
- new Register { BitSize = size, Value = (ulong)regs[i].Value };
+ new RegisterValue { BitSize = size, Value = (ulong)regs[i].Value };
}
return ret;
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 25c966cbdd..254deac233 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -926,9 +926,9 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
#region IDebuggable
// TODO: don't cast to int, and are any of these not 32 bit?
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- Dictionary ret = new Dictionary();
+ Dictionary ret = new Dictionary();
var regs = new OctoshockDll.ShockRegisters_CPU();
OctoshockDll.shock_GetRegisters_CPU(psx, ref regs);
diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
index 5c92fbc4ef..f443fbd9a2 100644
--- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
+++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
@@ -333,9 +333,9 @@ namespace BizHawk.Emulation.Cores.WonderSwan
public MemoryDomainList MemoryDomains { get; private set; }
- public IDictionary GetCpuFlagsAndRegisters()
+ public IDictionary GetCpuFlagsAndRegisters()
{
- var ret = new Dictionary();
+ var ret = new Dictionary();
for (int i = (int)BizSwan.NecRegsMin; i <= (int)BizSwan.NecRegsMax; i++)
{
BizSwan.NecRegs en = (BizSwan.NecRegs)i;