ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemoryDomains - rename CheatDomain to SystemBus

This commit is contained in:
adelikat 2015-01-24 15:49:02 +00:00
parent d3a9535ade
commit 7b87f666a1
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
View File

@ -38,9 +38,9 @@ namespace BizHawk.Client.EmuHawk
.Select(d => d.ToString()) .Select(d => d.ToString())
.ToArray()); .ToArray());
if (MemoryDomains.HasCheatDomain) if (MemoryDomains.HasSystemBus)
{ {
DomainDropDown.SelectedItem = MemoryDomains.CheatDomain.ToString(); DomainDropDown.SelectedItem = MemoryDomains.SystemBus.ToString();
} }
else else
{ {
@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk
if (MemoryDomains != null) if (MemoryDomains != null)
{ {
AddressBox.SetHexProperties(MemoryDomains.CheatDomain.Size); AddressBox.SetHexProperties(MemoryDomains.SystemBus.Size);
} }
ValueBox.ByteSize = ValueBox.ByteSize =

2
BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
View File

@ -122,7 +122,7 @@ namespace BizHawk.Client.EmuHawk.tools.Debugger
var b = new AddBreakpointDialog var b = new AddBreakpointDialog
{ {
// TODO: don't use Global.Emulator! Pass in an IMemoryDomains implementation from the parent tool // 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) if (b.ShowDialog() == DialogResult.OK)

6
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
{ {
get 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) for (int i = 0; i < line_count; ++i)
{ {
int advance; 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)); DisassemblyLines.Add(new DisasmOp(a, advance, line));
a += (uint)advance; a += (uint)advance;
if (a > BusMaxValue) if (a > BusMaxValue)
@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk
while (true) while (true)
{ {
int bytestoadvance; int bytestoadvance;
Disassembler.Disassemble(MemoryDomains.CheatDomain, newaddress, out bytestoadvance); Disassembler.Disassemble(MemoryDomains.SystemBus, newaddress, out bytestoadvance);
if (newaddress + bytestoadvance == currentDisassemblerAddress) if (newaddress + bytestoadvance == currentDisassemblerAddress)
{ {
break; break;

4
BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs
View File

@ -238,7 +238,7 @@ namespace BizHawk.Emulation.Common
} }
} }
public bool HasCheatDomain public bool HasSystemBus
{ {
get get
{ {
@ -246,7 +246,7 @@ namespace BizHawk.Emulation.Common
} }
} }
public MemoryDomain CheatDomain public MemoryDomain SystemBus
{ {
get get
{ {

4
BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs
View File

@ -15,8 +15,8 @@ namespace BizHawk.Emulation.Common
MemoryDomain MainMemory { get; } MemoryDomain MainMemory { get; }
bool HasCheatDomain { get; } bool HasSystemBus { get; }
MemoryDomain CheatDomain { get; } MemoryDomain SystemBus { get; }
} }
} }