From 1832894405221fac43a6f7040bc666100a450062 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 23 Nov 2014 16:22:02 +0000 Subject: [PATCH] IDebuggable - GetCpuFlagsAndRegisters() - refactor to make it an IDictionary instead of Dictionary --- BizHawk.Emulation.Common/Interfaces/IDebuggable.cs | 2 +- BizHawk.Emulation.Cores/Calculator/TI83.cs | 2 +- BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs | 2 +- .../Consoles/Nintendo/Gameboy/GambatteLink.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs | 2 +- BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs | 2 +- BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs b/BizHawk.Emulation.Common/Interfaces/IDebuggable.cs index d9ce1cdf88..c7fb7c8466 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 /// /// - Dictionary GetCpuFlagsAndRegisters(); + IDictionary GetCpuFlagsAndRegisters(); /// /// Sets a given Cpu register to the given value diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs index 68f3dcac4b..895c7cac01 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.cs +++ b/BizHawk.Emulation.Cores/Calculator/TI83.cs @@ -1008,7 +1008,7 @@ namespace BizHawk.Emulation.Cores.Calculators public object GetSyncSettings() { return null; } public bool PutSyncSettings(object o) { return false; } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs index 23358a238e..df2b1b4a68 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs @@ -83,7 +83,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 //disk.HardReset(); } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index 9923bd90a3..262c2d09d2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -122,7 +122,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 }; } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs index 28a6c87e83..38569cad23 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800 EMU7800.Win.GameProgram GameInfo; public byte[] hsram = new byte[2048]; - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index d19239d851..278a3defd9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs @@ -259,7 +259,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision } } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs index f5af0c9210..f380274d58 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA )] public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider, IGBAGPUViewable, IMemoryDomains, IDebuggable { - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { var ret = new Dictionary(); int[] data = new int[LibMeteor.regnames.Length]; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs index 430fba4976..e14cdeadb5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs @@ -394,7 +394,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA regs = new VBARegisterHelper(Core); } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return regs.GetAllRegisters(); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 22ee617f7a..a3ad8cd236 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -231,7 +231,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy #region debug - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { int[] data = new int[10]; LibGambatte.gambatte_getregs(GambatteState, data); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index 4c6cb1bfd7..fece273935 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -402,7 +402,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy public MemoryDomainList MemoryDomains { get; private set; } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { var left = L.GetCpuFlagsAndRegisters() .Select(reg => new KeyValuePair("Left " + reg.Key, reg.Value)); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index c1eed87a5f..f77bf3c231 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -406,7 +406,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 #region Debugging Hooks - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { //note: the approach this code takes is highly bug-prone var ret = new Dictionary(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index 114bb87714..39a7825820 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -883,7 +883,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public bool BinarySaveStatesPreferred { get { return false; } } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index f882a6be3c..34adf713f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -379,7 +379,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES public MemoryDomainList MemoryDomains { get; private set; } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { int[] regs = new int[6]; var ret = new Dictionary(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index bec3aa7ec9..621126047a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -199,7 +199,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES api.Dispose(); } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { LibsnesApi.CpuRegs regs; api.QUERY_peek_cpu_regs(out regs); diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 04dbe04478..7268d0b24f 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -534,7 +534,7 @@ namespace BizHawk.Emulation.Cores.PCEngine MemoryDomainList memoryDomains; public MemoryDomainList MemoryDomains { get { return memoryDomains; } } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs index f3ead0e4e3..58741306fd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs @@ -248,7 +248,7 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis #endif } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index fbe81b7982..c0ff46c0d5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -480,7 +480,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem public MemoryDomainList MemoryDomains { get { return memoryDomains; } } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { return new Dictionary { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index 74d5930880..d0422b1918 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -627,7 +627,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { LibGPGX.RegisterInfo[] regs = new LibGPGX.RegisterInfo[LibGPGX.gpgx_getmaxnumregs()]; diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index 11effbd27f..6d43a53e54 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -324,7 +324,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan public MemoryDomainList MemoryDomains { get; private set; } - public Dictionary GetCpuFlagsAndRegisters() + public IDictionary GetCpuFlagsAndRegisters() { var ret = new Dictionary(); for (int i = (int)BizSwan.NecRegsMin; i <= (int)BizSwan.NecRegsMax; i++)