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

View File

@ -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 =

View File

@ -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)

View File

@ -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;

View File

@ -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
{

View File

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