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

Hex editor - some more simplifications

This commit is contained in:
adelikat 2019-12-31 13:18:12 -06:00
parent 12a3552bdd
commit 15f1432462
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ namespace BizHawk.Client.EmuHawk
private byte[] _rom;
private MemoryDomain _romDomain;
private HexFind _hexFind;
private string _lastRom = "";
[ConfigPersist]
private string LastDomain { get; set; }
@ -121,10 +122,7 @@ namespace BizHawk.Client.EmuHawk
public bool UpdateBefore => false;
public bool AskSaveChanges()
{
return true;
}
public bool AskSaveChanges() => true;
public void NewUpdate(ToolFormUpdateType type) { }
@ -144,8 +142,6 @@ namespace BizHawk.Client.EmuHawk
// Do nothing
}
private string _lastRom = "";
public void Restart()
{
if (!(MainForm.CurrentlyOpenRomArgs.OpenAdvanced is OpenAdvanced_MAME))
@ -192,7 +188,7 @@ namespace BizHawk.Client.EmuHawk
var addrList = addresses.ToList();
if (addrList.Any())
{
SetDomain(domain);
SetMemoryDomain(domain.Name);
SetHighlighted(addrList[0]);
_secondaryHighlightedAddresses.Clear();
_secondaryHighlightedAddresses.AddRange(addrList.Where(addr => addr != addrList[0]));
@ -218,28 +214,6 @@ namespace BizHawk.Client.EmuHawk
return str.Select(Convert.ToByte).ToArray();
}
public byte[] ConvertHexStringToByteArray(string str)
{
if (string.IsNullOrWhiteSpace(str)) {
return new byte[0];
}
// TODO: Better method of handling this?
if (str.Length % 2 == 1)
{
str += "0";
}
byte[] bytes = new byte[str.Length / 2];
for (int i = 0; i < str.Length; i += 2)
{
bytes[i / 2] = Convert.ToByte(str.Substring(i, 2), 16);
}
return bytes;
}
public void FindNext(string value, bool wrap)
{
long found = -1;
@ -349,6 +323,28 @@ namespace BizHawk.Client.EmuHawk
#endregion
private byte[] ConvertHexStringToByteArray(string str)
{
if (string.IsNullOrWhiteSpace(str)) {
return new byte[0];
}
// TODO: Better method of handling this?
if (str.Length % 2 == 1)
{
str += "0";
}
byte[] bytes = new byte[str.Length / 2];
for (int i = 0; i < str.Length; i += 2)
{
bytes[i / 2] = Convert.ToByte(str.Substring(i, 2), 16);
}
return bytes;
}
private char Remap(byte val)
{
if (_textTable.Any())
@ -628,11 +624,6 @@ namespace BizHawk.Client.EmuHawk
LastDomain = _domain.Name;
}
private void SetDomain(MemoryDomain domain)
{
SetMemoryDomain(domain.Name);
}
private void UpdateGroupBoxTitle()
{
var addressesString = "0x" + $"{_domain.Size / DataSize:X8}".TrimStart('0');