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

remove MemDomain CanPoke() extension method now that all it does is check the Writable flag which is better named and more conscise

This commit is contained in:
adelikat 2020-02-15 12:37:39 -06:00
parent 656f2b814e
commit 4b50ea36e1
5 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.Common/Api/Classes/MemApi.cs
View File

@ -95,7 +95,7 @@ namespace BizHawk.Client.Common
private void WriteUnsignedByte(long addr, uint v, string domain = null) private void WriteUnsignedByte(long addr, uint v, string domain = null)
{ {
var d = NamedDomainOrCurrent(domain); var d = NamedDomainOrCurrent(domain);
if (!d.CanPoke()) if (!d.Writable)
{ {
LogCallback($"Error: the domain {d.Name} is not writable"); LogCallback($"Error: the domain {d.Name} is not writable");
return; return;
@ -235,7 +235,7 @@ namespace BizHawk.Client.Common
public void WriteByteRange(long addr, List<byte> memoryblock, string domain = null) public void WriteByteRange(long addr, List<byte> memoryblock, string domain = null)
{ {
var d = NamedDomainOrCurrent(domain); var d = NamedDomainOrCurrent(domain);
if (!d.CanPoke()) if (!d.Writable)
{ {
LogCallback($"Error: the domain {d.Name} is not writable"); LogCallback($"Error: the domain {d.Name} is not writable");
return; return;
@ -261,7 +261,7 @@ namespace BizHawk.Client.Common
public void WriteFloat(long addr, double value, string domain = null) public void WriteFloat(long addr, double value, string domain = null)
{ {
var d = NamedDomainOrCurrent(domain); var d = NamedDomainOrCurrent(domain);
if (!d.CanPoke()) if (!d.Writable)
{ {
LogCallback($"Error: the domain {Domain.Name} is not writable"); LogCallback($"Error: the domain {Domain.Name} is not writable");
return; return;

30
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -629,7 +629,7 @@ namespace BizHawk.Client.EmuHawk
HexScrollBar.Value = 0; HexScrollBar.Value = 0;
} }
AddressesLabel.ForeColor = _domain.CanPoke() AddressesLabel.ForeColor = _domain.Writable
? SystemColors.ControlText ? SystemColors.ControlText
: SystemColors.ControlDarkDark; : SystemColors.ControlDarkDark;
@ -649,7 +649,7 @@ namespace BizHawk.Client.EmuHawk
private void UpdateGroupBoxTitle() private void UpdateGroupBoxTitle()
{ {
var addressesString = "0x" + $"{_domain.Size / DataSize:X8}".TrimStart('0'); var addressesString = "0x" + $"{_domain.Size / DataSize:X8}".TrimStart('0');
var viewerText = $"{Emulator.SystemId} {_domain}{(_domain.CanPoke() ? string.Empty : " (READ-ONLY)")} - {addressesString} addresses"; var viewerText = $"{Emulator.SystemId} {_domain}{(_domain.Writable ? string.Empty : " (READ-ONLY)")} - {addressesString} addresses";
if (_nibbles.Any()) if (_nibbles.Any())
{ {
viewerText += $" Typing: ({MakeNibbles()})"; viewerText += $" Typing: ({MakeNibbles()})";
@ -1245,7 +1245,7 @@ namespace BizHawk.Client.EmuHawk
private void importAsBinaryToolStripMenuItem_Click(object sender, EventArgs e) private void importAsBinaryToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if(!_domain.CanPoke()) if(!_domain.Writable)
{ {
MessageBox.Show("This Memory Domain can't be Poked; so importing can't work"); MessageBox.Show("This Memory Domain can't be Poked; so importing can't work");
return; return;
@ -1360,10 +1360,10 @@ namespace BizHawk.Client.EmuHawk
{ {
var data = Clipboard.GetDataObject(); var data = Clipboard.GetDataObject();
PasteMenuItem.Enabled = PasteMenuItem.Enabled =
_domain.CanPoke() && _domain.Writable
(_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) && && (_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any())
data != null && && data != null
data.GetDataPresent(DataFormats.Text); && data.GetDataPresent(DataFormats.Text);
FindNextMenuItem.Enabled = !string.IsNullOrWhiteSpace(_findStr); FindNextMenuItem.Enabled = !string.IsNullOrWhiteSpace(_findStr);
} }
@ -1536,7 +1536,7 @@ namespace BizHawk.Client.EmuHawk
PokeAddressMenuItem.Enabled = PokeAddressMenuItem.Enabled =
FreezeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled =
_highlightedAddress.HasValue && _highlightedAddress.HasValue &&
_domain.CanPoke(); _domain.Writable;
} }
private void MemoryDomainsMenuItem_DropDownOpened(object sender, EventArgs e) private void MemoryDomainsMenuItem_DropDownOpened(object sender, EventArgs e)
@ -1619,7 +1619,7 @@ namespace BizHawk.Client.EmuHawk
private void FreezeAddressMenuItem_Click(object sender, EventArgs e) private void FreezeAddressMenuItem_Click(object sender, EventArgs e)
{ {
if (!_domain.CanPoke()) if (!_domain.Writable)
{ {
return; return;
} }
@ -1648,7 +1648,7 @@ namespace BizHawk.Client.EmuHawk
private void PokeAddressMenuItem_Click(object sender, EventArgs e) private void PokeAddressMenuItem_Click(object sender, EventArgs e)
{ {
if (!_domain.CanPoke()) if (!_domain.Writable)
{ {
return; return;
} }
@ -1933,7 +1933,7 @@ namespace BizHawk.Client.EmuHawk
return; return;
} }
if (!_domain.CanPoke() || !_highlightedAddress.HasValue) if (!_domain.Writable || !_highlightedAddress.HasValue)
{ {
return; return;
} }
@ -1984,10 +1984,10 @@ namespace BizHawk.Client.EmuHawk
DecrementContextItem.Visible = DecrementContextItem.Visible =
ContextSeparator2.Visible = ContextSeparator2.Visible =
(_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) && (_highlightedAddress.HasValue || _secondaryHighlightedAddresses.Any()) &&
_domain.CanPoke(); _domain.Writable;
UnfreezeAllContextItem.Visible = Global.CheatList.ActiveCount > 0; UnfreezeAllContextItem.Visible = Global.CheatList.ActiveCount > 0;
PasteContextItem.Visible = _domain.CanPoke() && data != null && data.GetDataPresent(DataFormats.Text); PasteContextItem.Visible = _domain.Writable && data != null && data.GetDataPresent(DataFormats.Text);
ContextSeparator1.Visible = ContextSeparator1.Visible =
_highlightedAddress.HasValue || _highlightedAddress.HasValue ||
@ -2011,7 +2011,7 @@ namespace BizHawk.Client.EmuHawk
private void IncrementContextItem_Click(object sender, EventArgs e) private void IncrementContextItem_Click(object sender, EventArgs e)
{ {
if (!_domain.CanPoke()) if (!_domain.Writable)
{ {
return; return;
} }
@ -2028,7 +2028,7 @@ namespace BizHawk.Client.EmuHawk
private void DecrementContextItem_Click(object sender, EventArgs e) private void DecrementContextItem_Click(object sender, EventArgs e)
{ {
if (!_domain.CanPoke()) if (!_domain.Writable)
{ {
return; return;
} }

12
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -440,8 +440,8 @@ namespace BizHawk.Client.EmuHawk
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any()
_searches.Domain.CanPoke(); && _searches.Domain.Writable;
} }
private long? CompareToValue private long? CompareToValue
@ -1227,7 +1227,7 @@ namespace BizHawk.Client.EmuHawk
PokeAddressMenuItem.Enabled = PokeAddressMenuItem.Enabled =
FreezeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke()); SelectedWatches.All(w => w.Domain.Writable);
UndoMenuItem.Enabled = UndoMenuItem.Enabled =
ClearUndoMenuItem.Enabled = ClearUndoMenuItem.Enabled =
@ -1439,7 +1439,7 @@ namespace BizHawk.Client.EmuHawk
PokeContextMenuItem.Enabled = PokeContextMenuItem.Enabled =
FreezeContextMenuItem.Visible = FreezeContextMenuItem.Visible =
SelectedIndices.Any() && SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke()); SelectedWatches.All(w => w.Domain.Writable);
UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0; UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0;
@ -1742,8 +1742,8 @@ namespace BizHawk.Client.EmuHawk
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any()
_searches.Domain.CanPoke(); && _searches.Domain.Writable;
} }
private void WatchListView_Enter(object sender, EventArgs e) private void WatchListView_Enter(object sender, EventArgs e)

18
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -193,8 +193,8 @@ namespace BizHawk.Client.EmuHawk
UpdateValues(); UpdateValues();
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any()
SelectedWatches.All(w => w.Domain.CanPoke()); && SelectedWatches.All(w => w.Domain.Writable);
} }
} }
} }
@ -496,7 +496,7 @@ namespace BizHawk.Client.EmuHawk
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke()); SelectedWatches.All(w => w.Domain.Writable);
} }
} }
@ -712,7 +712,7 @@ namespace BizHawk.Client.EmuHawk
PokeAddressMenuItem.Enabled = PokeAddressMenuItem.Enabled =
FreezeAddressMenuItem.Enabled = FreezeAddressMenuItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke()); SelectedWatches.All(w => w.Domain.Writable);
PauseMenuItem.Text = _paused ? "Unpause" : "Pause"; PauseMenuItem.Text = _paused ? "Unpause" : "Pause";
} }
@ -1059,7 +1059,7 @@ namespace BizHawk.Client.EmuHawk
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke()); SelectedWatches.All(w => w.Domain.Writable);
} }
private void ColumnToggleCallback() private void ColumnToggleCallback()
@ -1109,8 +1109,8 @@ namespace BizHawk.Client.EmuHawk
PokeContextMenuItem.Enabled = PokeContextMenuItem.Enabled =
FreezeContextMenuItem.Visible = FreezeContextMenuItem.Visible =
SelectedIndices.Any() && SelectedIndices.Any()
SelectedWatches.All(w => w.Domain.CanPoke()); && SelectedWatches.All(w => w.Domain.Writable);
var allCheats = SelectedWatches.All(x => Global.CheatList.IsActive(x.Domain, x.Address)); var allCheats = SelectedWatches.All(x => Global.CheatList.IsActive(x.Domain, x.Address));
@ -1209,8 +1209,8 @@ namespace BizHawk.Client.EmuHawk
{ {
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled = FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() && SelectedIndices.Any()
SelectedWatches.All(w => w.Domain.CanPoke()); && SelectedWatches.All(w => w.Domain.Writable);
} }
private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e) private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e)

5
BizHawk.Emulation.Common/Extensions.cs
View File

@ -201,11 +201,6 @@ namespace BizHawk.Emulation.Common
return core.ServiceProvider.GetService<IDisassemblable>(); return core.ServiceProvider.GetService<IDisassemblable>();
} }
public static bool CanPoke(this MemoryDomain d)
{
return d.Writable;
}
public static bool HasRegions(this IEmulator core) public static bool HasRegions(this IEmulator core)
{ {
return core != null && core.ServiceProvider.HasService<IRegionable>(); return core != null && core.ServiceProvider.HasService<IRegionable>();