From d62ba4e2b4f778a4ef78c242a91ff6a4d2355394 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 13 Jan 2015 22:18:07 +0000 Subject: [PATCH] Change IMemoryDomains to have an IMemoryDomainList instead of a MemoryDomainList, this is an incremental step into eventually having IMemoryDomains take over the properties of IMemoryDomainList, still todo: reduce the amount of needed functionality in IMemoryDomainList from old and not good code --- .../lua/EmuLuaLibrary.Memory.cs | 1 + BizHawk.Client.Common/lua/LuaMemoryBase.cs | 2 +- .../Extensions/ToolExtensions.cs | 2 +- .../tools/Debugger/BreakpointControl.cs | 2 +- .../tools/Debugger/GenericDebugger.IToolForm.cs | 2 +- BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs | 2 +- .../tools/Genesis/GenGameGenie.cs | 2 +- .../tools/HexEditor/HexEditor.cs | 2 +- BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs | 2 +- BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs | 2 +- .../tools/SNES/SNESGameGenie.cs | 2 +- .../Interfaces/IMemoryDomains.cs | 16 ++++++++++++++-- BizHawk.Emulation.Common/MemoryDomain.cs | 2 +- BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs | 2 +- .../Calculator/TI83.IMemoryDomains.cs | 2 +- .../Computers/Commodore64/C64.IMemoryDomains.cs | 2 +- .../Atari/2600/Atari2600.IMemoryDomains.cs | 2 +- .../Atari/7800/Atari7800.IMemoryDomains.cs | 2 +- .../Consoles/Atari/lynx/Lynx.cs | 2 +- .../Coleco/ColecoVision.IMemoryDomains.cs | 2 +- .../Consoles/Nintendo/GBA/Meteor.cs | 2 +- .../Consoles/Nintendo/GBA/VBANext.cs | 2 +- .../Consoles/Nintendo/Gameboy/Gambatte.cs | 2 +- .../Consoles/Nintendo/Gameboy/GambatteLink.cs | 2 +- .../Consoles/Nintendo/N64/N64.IMemoryDomains.cs | 2 +- .../Consoles/Nintendo/NES/NES.cs | 2 +- .../Consoles/Nintendo/QuickNES/QuickNES.cs | 2 +- .../Consoles/Nintendo/SNES/LibsnesCore.cs | 2 +- .../Consoles/PC Engine/PCEngine.cs | 2 +- .../Consoles/Sega/Genesis/Genesis.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs | 2 +- .../Sega/Saturn/Yabause.IMemoryDomains.cs | 2 +- .../Consoles/Sega/gpgx/GPGX.cs | 2 +- .../Consoles/Sony/PSX/Octoshock.cs | 2 +- .../Consoles/WonderSwan/WonderSwan.cs | 2 +- 35 files changed, 48 insertions(+), 35 deletions(-) diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs index c3787882bb..4a4262fe9a 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs @@ -60,6 +60,7 @@ namespace BizHawk.Client.Common public LuaTable GetMemoryDomainList() { var table = Lua.NewTable(); + for (int i = 0; i < DomainList.Count; i++) { table[i] = DomainList[i].Name; diff --git a/BizHawk.Client.Common/lua/LuaMemoryBase.cs b/BizHawk.Client.Common/lua/LuaMemoryBase.cs index f3eabed122..045bfb233e 100644 --- a/BizHawk.Client.Common/lua/LuaMemoryBase.cs +++ b/BizHawk.Client.Common/lua/LuaMemoryBase.cs @@ -24,7 +24,7 @@ namespace BizHawk.Client.Common protected abstract MemoryDomain Domain { get; } - protected MemoryDomainList DomainList + protected IMemoryDomainList DomainList { get { diff --git a/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs index 76f601da39..028fa010b6 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs @@ -218,7 +218,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions Global.CheatList.RemoveRange(watches.Where(watch => !watch.IsSeparator)); } - public static IEnumerable MenuItems(this MemoryDomainList domains, Action setCallback, string selected = "", int? maxSize = null) + public static IEnumerable MenuItems(this IMemoryDomainList domains, Action setCallback, string selected = "", int? maxSize = null) { foreach (var domain in domains) { diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs index 66cf47fb05..2d9733d72a 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger public IDebuggable Core { get; set; } public IMemoryCallbackSystem MCS { get; set; } public GenericDebugger ParentDebugger { get; set; } - public MemoryDomainList MemoryDomains { get; set; } + public IMemoryDomainList MemoryDomains { get; set; } private readonly BreakpointList Breakpoints = new BreakpointList(); public BreakpointControl() diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs index 621fa1b180..c663fc6fe7 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk private IMemoryCallbackSystem MemoryCallbacks { get { return Debuggable.MemoryCallbacks; } } - private MemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } private uint PC { diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs index ec68b26899..525052029d 100644 --- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs @@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk [RequiredService] private IMemoryDomains MemoryDomainSource { get; set; } - private MemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } private readonly Dictionary _gameGenieTable = new Dictionary(); private bool _processing; diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs index 76579f314f..c8d8cec4c0 100644 --- a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs @@ -26,7 +26,7 @@ namespace BizHawk.Client.EmuHawk [RequiredService] private IMemoryDomains MemoryDomainService { get; set; } - private MemoryDomainList MemoryDomains { get { return MemoryDomainService.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return MemoryDomainService.MemoryDomains; } } private readonly Dictionary _gameGenieTable = new Dictionary { diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index f55f3d80a5..824f40e5a4 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -24,7 +24,7 @@ namespace BizHawk.Client.EmuHawk { [RequiredService] private IMemoryDomains MemoryDomainSource { get; set; } - private MemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return MemoryDomainSource.MemoryDomains; } } [RequiredService] private IEmulator Emulator { get; set; } diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs index 341a10b496..bdaa61351d 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk [RequiredService] private IMemoryDomains MemoryDomainService { get; set; } - private MemoryDomainList MemoryDomains { get { return MemoryDomainService.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return MemoryDomainService.MemoryDomains; } } private readonly Dictionary _gameGenieTable = new Dictionary { diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs index f82832de4c..0d11f5c9d7 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs @@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk } } - private MemoryDomainList MemoryDomains { get { return _emu.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return _emu.MemoryDomains; } } private string _currentFileName = string.Empty; diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs index 048eb4b1e8..84425e8246 100644 --- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs @@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk [RequiredService] public LibsnesCore Emulator { get; set; } - private MemoryDomainList MemoryDomains { get { return Emulator.MemoryDomains; } } + private IMemoryDomainList MemoryDomains { get { return Emulator.MemoryDomains; } } // including transposition // Code: D F 4 7 0 9 1 5 6 B C 8 A 2 3 E diff --git a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs index 6958b2455c..e7121e0ca5 100644 --- a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs +++ b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs @@ -1,4 +1,5 @@ -namespace BizHawk.Emulation.Common +using System.Collections.Generic; +namespace BizHawk.Emulation.Common { public interface IMemoryDomains : IEmulatorService { @@ -10,6 +11,17 @@ /// Other chips, and ram spaces can be added as well. /// Subdomains of another domain are also welcome. /// The MainMemory identifier will be 0 if not set - MemoryDomainList MemoryDomains { get; } + IMemoryDomainList MemoryDomains { get; } + } + + public interface IMemoryDomainList : IList + { + MemoryDomain this[string name] { get; } + + MemoryDomain MainMemory { get; } + + bool HasCheatDomain { get; } + + MemoryDomain CheatDomain { get; } } } diff --git a/BizHawk.Emulation.Common/MemoryDomain.cs b/BizHawk.Emulation.Common/MemoryDomain.cs index a9cd99706b..cfb910a06a 100644 --- a/BizHawk.Emulation.Common/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/MemoryDomain.cs @@ -184,7 +184,7 @@ namespace BizHawk.Emulation.Common } } - public class MemoryDomainList : ReadOnlyCollection + public class MemoryDomainList : ReadOnlyCollection, IMemoryDomainList { private readonly int _mainMemoryIndex; diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs index 3ad54bfa62..826c606e90 100644 --- a/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs +++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/CDL.cs @@ -52,7 +52,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280 w.Flush(); } - public void Disassemble(Stream s, MemoryDomainList mem) + public void Disassemble(Stream s, IMemoryDomainList mem) { var w = new StreamWriter(s); w.WriteLine("; Bizhawk CDL Disassembly"); diff --git a/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs index 64a8de78cd..362c82077a 100644 --- a/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Calculators { public partial class TI83 : IMemoryDomains { - public MemoryDomainList MemoryDomains + public IMemoryDomainList MemoryDomains { get { return _memoryDomains; } } diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs index e6d3925fb3..1235e0b407 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 { public partial class C64 : IMemoryDomains { - public MemoryDomainList MemoryDomains + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs index 24bf7d3e6b..cf7b898679 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 { public partial class Atari2600 : IMemoryDomains { - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } private void SetupMemoryDomains() { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IMemoryDomains.cs index 33276c265d..c2f92b9527 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IMemoryDomains.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800 { private List _MemoryDomains; - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } public void SetupMemoryDomains(HSC7800 hsc7800) { diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs b/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs index e4e71188f7..7a91cb5ce6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs @@ -390,7 +390,7 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx } - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } #endregion } diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs index d8516bae1b..071880958a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision { public partial class ColecoVision : IMemoryDomains { - public MemoryDomainList MemoryDomains + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs index e8030ad2be..e1f9ab264b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs @@ -235,7 +235,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA #region memorydomains List _MemoryDomains = new List(); - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } void AddMemoryDomain(LibMeteor.MemoryArea which, int size, string name) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs index 7a5c2a2853..7e7aa51035 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs @@ -403,7 +403,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA MemoryDomains = new MemoryDomainList(mm, 0); } - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } VBARegisterHelper regs; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index c5c19832be..ffcbbeb541 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -782,7 +782,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy } private List _MemoryDomains = new List(); - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } #endregion diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index 680caf827a..faad9e03da 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -405,7 +405,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy #region debugging - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } public IDictionary GetCpuFlagsAndRegisters() { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs index 29ac280585..f8176dbeb2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 { private List _memoryDomains = new List(); - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } private void MakeMemoryDomain(string name, mupen64plusApi.N64_MEMORY id, MemoryDomain.Endian endian, bool swizzled = false) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index 88102f96ab..86d7a8810c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -446,7 +446,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } public string SystemId { get { return "NES"; } } - public MemoryDomainList MemoryDomains { get { return memoryDomains; } } + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } public string GameName { get { return game_name; } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 39a85399f0..b354e76741 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -381,7 +381,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES MemoryDomains = new MemoryDomainList(mm, 0); } - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } public IDictionary GetCpuFlagsAndRegisters() { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 5167db6404..7c1d69ac9a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -1145,7 +1145,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES private MemoryDomain MainMemory; private List _memoryDomains = new List(); - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } #region audio stuff diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index bdab94b22f..7609df61c8 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -566,7 +566,7 @@ namespace BizHawk.Emulation.Cores.PCEngine } MemoryDomainList memoryDomains; - public MemoryDomainList MemoryDomains { get { return memoryDomains; } } + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } public IDictionary GetCpuFlagsAndRegisters() { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs index 94a99d60a5..c9e9309e40 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs @@ -489,7 +489,7 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis memoryDomains = new MemoryDomainList(domains); } - public MemoryDomainList MemoryDomains { get { return memoryDomains; } } + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } public void Dispose() { } } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 42631f8f3b..3a761a355d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -487,7 +487,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem memoryDomains = new MemoryDomainList(domains); } - public MemoryDomainList MemoryDomains { get { return memoryDomains; } } + public IMemoryDomainList MemoryDomains { get { return memoryDomains; } } public IDictionary GetCpuFlagsAndRegisters() { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.IMemoryDomains.cs index b3059ed362..12b8ebe240 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.IMemoryDomains.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn { public partial class Yabause : IMemoryDomains { - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } private void InitMemoryDomains() { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index 9ca357258a..c71e1f94f9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -583,7 +583,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx #region debugging tools - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } unsafe void SetMemoryDomains() { diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index 5a8b5611b1..2b34890891 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -622,7 +622,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX MemoryDomains = new MemoryDomainList(mmd, 0); } - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } #endregion diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index a34a5687e9..33cd5d1662 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -322,7 +322,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan private readonly MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem(); public IMemoryCallbackSystem MemoryCallbacks { get { return _memorycallbacks; } } - public MemoryDomainList MemoryDomains { get; private set; } + public IMemoryDomainList MemoryDomains { get; private set; } public IDictionary GetCpuFlagsAndRegisters() {