Rename Register to RegisterValue

BizHawk.Emulation.Common/Interfaces/IDebuggable.cs

@@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Common
 		/// Returns a list of Cpu registers and their current state
 		/// </summary>
 		/// <returns></returns>
-		IDictionary<string, Register> GetCpuFlagsAndRegisters();
+		IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters();
 
 		/// <summary>
 		/// 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

BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs

@@ -8,9 +8,9 @@ namespace BizHawk.Emulation.Cores.Calculators
 {
 	public partial class TI83 : IDebuggable
 	{
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", cpu.RegisterA },
 				{ "AF", cpu.RegisterAF },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", board.cpu.A },
 				{ "X", board.cpu.X },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", Cpu.A },
 				{ "X", Cpu.X },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", theMachine.CPU.A },
 				{ "P", theMachine.CPU.P },

BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs

@@ -9,9 +9,9 @@ namespace BizHawk.Emulation.Cores.ColecoVision
 {
 	public partial class ColecoVision : IDebuggable
 	{
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", Cpu.RegisterA },
 				{ "AF", Cpu.RegisterAF },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			var ret = new Dictionary<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			int[] data = new int[LibMeteor.regnames.Length];
 			LibMeteor.libmeteor_getregs(data);
 			for (int i = 0; i < data.Length; i++)

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs

@@ -411,7 +411,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			regs = new VBARegisterHelper(Core);
 		}
 
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
 			return regs.GetAllRegisters();
 		}

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<string, Register> GetAllRegisters()
+		public Dictionary<string, RegisterValue> GetAllRegisters()
 		{
-			var ret = new Dictionary<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			foreach (var kvp in _locs)
 			{
 				ret[kvp.Key] = GetRegister(kvp.Key);

BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs

@@ -238,12 +238,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 
 		#region debug
 
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
 			int[] data = new int[10];
 			LibGambatte.gambatte_getregs(GambatteState, data);
 
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "PC", (ushort)(data[(int)LibGambatte.RegIndicies.PC] & 0xffff) },
 				{ "SP", (ushort)(data[(int)LibGambatte.RegIndicies.SP] & 0xffff) },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
 			var left = L.GetCpuFlagsAndRegisters()
-				.Select(reg => new KeyValuePair<string, Register>("Left " + reg.Key, reg.Value));
+				.Select(reg => new KeyValuePair<string, RegisterValue>("Left " + reg.Key, reg.Value));
 
 			var right = R.GetCpuFlagsAndRegisters()
-				.Select(reg => new KeyValuePair<string, Register>("Right " + reg.Key, reg.Value));
+				.Select(reg => new KeyValuePair<string, RegisterValue>("Right " + reg.Key, reg.Value));
 
 			return left.Union(right).ToList().ToDictionary(pair => pair.Key, pair => pair.Value);
 		}

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
 			// note: the approach this code takes is highly bug-prone
-			var ret = new Dictionary<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			var data = new byte[32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + 32 * 8];
 			api.getRegisters(data);
 

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", cpu.A },
 				{ "X", cpu.X },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
 			int[] regs = new int[6];
-			var ret = new Dictionary<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			LibQuickNES.qn_get_cpuregs(Context, regs);
 			ret["A"] = (byte)regs[0];
 			ret["X"] = (byte)regs[1];

BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs

@@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 			api.Dispose();
 		}
 
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> 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<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "PC", regs.pc },
 				{ "A", regs.a },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", Cpu.A },
 				{ "X", Cpu.X },

BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs

@@ -260,9 +260,9 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis
 #endif
 		}
 
-		public IDictionary<string, BizHawk.Emulation.Common.Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, BizHawk.Emulation.Common.Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A-0", MainCPU.A[0].s32 },
 				{ "A-1", MainCPU.A[1].s32 },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			return new Dictionary<string, Register>
+			return new Dictionary<string, RegisterValue>
 			{
 				{ "A", Cpu.RegisterA },
 				{ "AF", Cpu.RegisterAF },

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> 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<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			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;
 		}

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<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			Dictionary<string, Register> ret = new Dictionary<string, Register>();
+			Dictionary<string, RegisterValue> ret = new Dictionary<string, RegisterValue>();
 			var regs = new OctoshockDll.ShockRegisters_CPU();
 
 			OctoshockDll.shock_GetRegisters_CPU(psx, ref regs);

BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs

@@ -333,9 +333,9 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 
 		public MemoryDomainList MemoryDomains { get; private set; }
 	
-		public IDictionary<string, Register> GetCpuFlagsAndRegisters()
+		public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
 		{
-			var ret = new Dictionary<string, Register>();
+			var ret = new Dictionary<string, RegisterValue>();
 			for (int i = (int)BizSwan.NecRegsMin; i <= (int)BizSwan.NecRegsMax; i++)
 			{
 				BizSwan.NecRegs en = (BizSwan.NecRegs)i;