From 7b87f666a1f8feadbe0c99c876bf8ae43eff2ce5 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 24 Jan 2015 15:49:02 +0000 Subject: [PATCH] MemoryDomains - rename CheatDomain to SystemBus --- BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs | 6 +++--- BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs | 2 +- .../tools/Debugger/GenericDebugger.Disassembler.cs | 6 +++--- .../Base Implementations/MemoryDomain.cs | 4 ++-- BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index 415ff9b45a..dfed83c90d 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -38,9 +38,9 @@ namespace BizHawk.Client.EmuHawk .Select(d => d.ToString()) .ToArray()); - if (MemoryDomains.HasCheatDomain) + if (MemoryDomains.HasSystemBus) { - DomainDropDown.SelectedItem = MemoryDomains.CheatDomain.ToString(); + DomainDropDown.SelectedItem = MemoryDomains.SystemBus.ToString(); } else { @@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk if (MemoryDomains != null) { - AddressBox.SetHexProperties(MemoryDomains.CheatDomain.Size); + AddressBox.SetHexProperties(MemoryDomains.SystemBus.Size); } ValueBox.ByteSize = diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs index fa6edc4c2c..3cb167fc16 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs @@ -122,7 +122,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger var b = new AddBreakpointDialog { // TODO: don't use Global.Emulator! Pass in an IMemoryDomains implementation from the parent tool - MaxAddressSize = Global.Emulator.AsMemoryDomains().CheatDomain.Size - 1 + MaxAddressSize = Global.Emulator.AsMemoryDomains().SystemBus.Size - 1 }; if (b.ShowDialog() == DialogResult.OK) diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs index f9313b321f..c3f5b35eea 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs @@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk { get { - return MemoryDomains.CheatDomain.Size; + return MemoryDomains.SystemBus.Size; } } @@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk for (int i = 0; i < line_count; ++i) { int advance; - string line = Disassembler.Disassemble(MemoryDomains.CheatDomain, a, out advance); + string line = Disassembler.Disassemble(MemoryDomains.SystemBus, a, out advance); DisassemblyLines.Add(new DisasmOp(a, advance, line)); a += (uint)advance; if (a > BusMaxValue) @@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk while (true) { int bytestoadvance; - Disassembler.Disassemble(MemoryDomains.CheatDomain, newaddress, out bytestoadvance); + Disassembler.Disassemble(MemoryDomains.SystemBus, newaddress, out bytestoadvance); if (newaddress + bytestoadvance == currentDisassemblerAddress) { break; diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs index ac14f6223d..92e76c66d1 100644 --- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs @@ -238,7 +238,7 @@ namespace BizHawk.Emulation.Common } } - public bool HasCheatDomain + public bool HasSystemBus { get { @@ -246,7 +246,7 @@ namespace BizHawk.Emulation.Common } } - public MemoryDomain CheatDomain + public MemoryDomain SystemBus { get { diff --git a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs index c1ebe7b8ee..8e114f0790 100644 --- a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs +++ b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs @@ -15,8 +15,8 @@ namespace BizHawk.Emulation.Common MemoryDomain MainMemory { get; } - bool HasCheatDomain { get; } + bool HasSystemBus { get; } - MemoryDomain CheatDomain { get; } + MemoryDomain SystemBus { get; } } }