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

Revert "Change ToRawInt to ToRawUInt" 

This reverts commit 542e043261.
This commit is contained in:
YoshiRulz 2024-08-15 01:51:08 +10:00
parent 0184bcd0af
commit 0f22ef2ad0
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
15 changed files with 128 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BizHawk.Client.Common/Api/Classes/MemoryApi.cs
View File

@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
@ -288,7 +287,7 @@ namespace BizHawk.Client.Common
LogCallback($"Warning: Attempted read {addr} outside memory size of {d.Size}"); LogCallback($"Warning: Attempted read {addr} outside memory size of {d.Size}");
return default; return default;
} }
return NumberExtensions.ReinterpretAsF32(d.PeekUint(addr, _isBigEndian)); return BitConverter.ToSingle(BitConverter.GetBytes(d.PeekUint(addr, _isBigEndian)), 0);
} }
public void WriteFloat(long addr, double value, string domain = null) public void WriteFloat(long addr, double value, string domain = null)
@ -304,7 +303,7 @@ namespace BizHawk.Client.Common
LogCallback($"Warning: Attempted write {addr} outside memory size of {d.Size}"); LogCallback($"Warning: Attempted write {addr} outside memory size of {d.Size}");
return; return;
} }
d.PokeUint(addr, NumberExtensions.ReinterpretAsUInt32((float) value), _isBigEndian); d.PokeUint(addr, BitConverter.ToUInt32(BitConverter.GetBytes((float) value), 0), _isBigEndian);
} }
public int ReadS8(long addr, string domain = null) => (sbyte) ReadUnsigned(addr, 1, domain); public int ReadS8(long addr, string domain = null) => (sbyte) ReadUnsigned(addr, 1, domain);

16
src/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs
View File

@ -8,8 +8,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
internal interface IMiniWatch internal interface IMiniWatch
{ {
long Address { get; } long Address { get; }
uint Previous { get; } long Previous { get; } // do not store sign extended variables in here.
uint Current { get; } long Current { get; }
int ChangeCount { get; } int ChangeCount { get; }
void ClearChangeCount(); void ClearChangeCount();
void SetPreviousToCurrent(); void SetPreviousToCurrent();
@ -35,8 +35,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
_previous = _current; _previous = _current;
} }
public uint Previous => _previous; public long Previous => _previous;
public uint Current => _current; public long Current => _current;
public int ChangeCount { get; private set; } public int ChangeCount { get; private set; }
@ -87,8 +87,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
_previous = _current; _previous = _current;
} }
public uint Previous => _previous; public long Previous => _previous;
public uint Current => _current; public long Current => _current;
public int ChangeCount { get; private set; } public int ChangeCount { get; private set; }
@ -139,8 +139,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
_previous = _current; _previous = _current;
} }
public uint Previous => _previous; public long Previous => _previous;
public uint Current => _current; public long Current => _current;
public int ChangeCount { get; private set; } public int ChangeCount { get; private set; }

41
src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
View File

@ -1,16 +1,23 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.CollectionExtensions; using BizHawk.Common.CollectionExtensions;
using BizHawk.Common.NumberExtensions; using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using static BizHawk.Common.NumberExtensions.NumberExtensions;
// ReSharper disable PossibleInvalidCastExceptionInForeachLoop
namespace BizHawk.Client.Common.RamSearchEngine namespace BizHawk.Client.Common.RamSearchEngine
{ {
public class RamSearchEngine public class RamSearchEngine
{ {
/// <remarks>TODO move to BizHawk.Common</remarks>
private static float ReinterpretAsF32(long l)
{
return Unsafe.As<long, float>(ref l);
}
private Compare _compareTo = Compare.Previous; private Compare _compareTo = Compare.Previous;
private IMiniWatch[] _watchList = [ ]; private IMiniWatch[] _watchList = [ ];
@ -31,7 +38,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
}; };
} }
public RamSearchEngine(SearchEngineSettings settings, IMemoryDomains memoryDomains, Compare compareTo, uint? compareValue, uint? differentBy) public RamSearchEngine(SearchEngineSettings settings, IMemoryDomains memoryDomains, Compare compareTo, long? compareValue, int? differentBy)
: this(settings, memoryDomains) : this(settings, memoryDomains)
{ {
_compareTo = compareTo; _compareTo = compareTo;
@ -149,7 +156,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
} }
} }
public uint? CompareValue { get; set; } public long? CompareValue { get; set; }
public ComparisonOperator Operator { get; set; } public ComparisonOperator Operator { get; set; }
@ -157,7 +164,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
/// zero 07-sep-2014 - this isn't ideal. but don't bother changing it (to a long, for instance) until it can support floats. maybe store it as a double here.<br/> /// zero 07-sep-2014 - this isn't ideal. but don't bother changing it (to a long, for instance) until it can support floats. maybe store it as a double here.<br/>
/// it already supported floats by way of reinterpret-cast, it just wasn't implemented correctly on this side --yoshi /// it already supported floats by way of reinterpret-cast, it just wasn't implemented correctly on this side --yoshi
/// </remarks> /// </remarks>
public uint? DifferentBy { get; set; } public int? DifferentBy { get; set; }
public void Update(bool updatePrevious) public void Update(bool updatePrevious)
{ {
@ -311,7 +318,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
case ComparisonOperator.LessThanEqual: case ComparisonOperator.LessThanEqual:
return watchList.Where(w => SignExtendAsNeeded(w.Current) <= SignExtendAsNeeded(w.Previous)); return watchList.Where(w => SignExtendAsNeeded(w.Current) <= SignExtendAsNeeded(w.Previous));
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
return watchList.Where(w => return watchList.Where(w =>
differentBy == Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous))); differentBy == Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous)));
} }
@ -342,7 +349,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
return val < prev || val.HawkFloatEquality(prev); return val < prev || val.HawkFloatEquality(prev);
}); });
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
var differentByF = ReinterpretAsF32(differentBy); var differentByF = ReinterpretAsF32(differentBy);
return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - ReinterpretAsF32(w.Previous)) return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - ReinterpretAsF32(w.Previous))
.HawkFloatEquality(differentByF)); .HawkFloatEquality(differentByF));
@ -351,7 +358,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
private IEnumerable<IMiniWatch> CompareSpecificValue(IEnumerable<IMiniWatch> watchList) private IEnumerable<IMiniWatch> CompareSpecificValue(IEnumerable<IMiniWatch> watchList)
{ {
if (CompareValue is not uint compareValue) throw new InvalidOperationException(); if (CompareValue is not long compareValue) throw new InvalidOperationException();
if (_settings.Type is not WatchDisplayType.Float) if (_settings.Type is not WatchDisplayType.Float)
{ {
switch (Operator) switch (Operator)
@ -370,7 +377,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
case ComparisonOperator.LessThanEqual: case ComparisonOperator.LessThanEqual:
return watchList.Where(w => SignExtendAsNeeded(w.Current) <= SignExtendAsNeeded(compareValue)); return watchList.Where(w => SignExtendAsNeeded(w.Current) <= SignExtendAsNeeded(compareValue));
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
return watchList.Where(w => return watchList.Where(w =>
differentBy == Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(compareValue))); differentBy == Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(compareValue)));
} }
@ -400,7 +407,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
return val < compareValueF || val.HawkFloatEquality(compareValueF); return val < compareValueF || val.HawkFloatEquality(compareValueF);
}); });
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
var differentByF = ReinterpretAsF32(differentBy); var differentByF = ReinterpretAsF32(differentBy);
return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - compareValueF) return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - compareValueF)
.HawkFloatEquality(differentByF)); .HawkFloatEquality(differentByF));
@ -409,7 +416,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
private IEnumerable<IMiniWatch> CompareSpecificAddress(IEnumerable<IMiniWatch> watchList) private IEnumerable<IMiniWatch> CompareSpecificAddress(IEnumerable<IMiniWatch> watchList)
{ {
if (CompareValue is not uint compareValue) throw new InvalidOperationException(); if (CompareValue is not long compareValue) throw new InvalidOperationException();
switch (Operator) switch (Operator)
{ {
default: default:
@ -426,14 +433,14 @@ namespace BizHawk.Client.Common.RamSearchEngine
case ComparisonOperator.LessThanEqual: case ComparisonOperator.LessThanEqual:
return watchList.Where(w => w.Address <= compareValue); return watchList.Where(w => w.Address <= compareValue);
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
return watchList.Where(w => Math.Abs(w.Address - compareValue) == differentBy); return watchList.Where(w => Math.Abs(w.Address - compareValue) == differentBy);
} }
} }
private IEnumerable<IMiniWatch> CompareChanges(IEnumerable<IMiniWatch> watchList) private IEnumerable<IMiniWatch> CompareChanges(IEnumerable<IMiniWatch> watchList)
{ {
if (CompareValue is not uint compareValue) throw new InvalidOperationException(); if (CompareValue is not long compareValue) throw new InvalidOperationException();
switch (Operator) switch (Operator)
{ {
default: default:
@ -450,14 +457,14 @@ namespace BizHawk.Client.Common.RamSearchEngine
case ComparisonOperator.LessThanEqual: case ComparisonOperator.LessThanEqual:
return watchList.Where(w => w.ChangeCount <= compareValue); return watchList.Where(w => w.ChangeCount <= compareValue);
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
return watchList.Where(w => Math.Abs(w.ChangeCount - compareValue) == differentBy); return watchList.Where(w => Math.Abs(w.ChangeCount - compareValue) == differentBy);
} }
} }
private IEnumerable<IMiniWatch> CompareDifference(IEnumerable<IMiniWatch> watchList) private IEnumerable<IMiniWatch> CompareDifference(IEnumerable<IMiniWatch> watchList)
{ {
if (CompareValue is not uint compareValue) throw new InvalidCastException(); //TODO typo for IOE? if (CompareValue is not long compareValue) throw new InvalidCastException(); //TODO typo for IOE?
if (_settings.Type is not WatchDisplayType.Float) if (_settings.Type is not WatchDisplayType.Float)
{ {
switch (Operator) switch (Operator)
@ -476,9 +483,9 @@ namespace BizHawk.Client.Common.RamSearchEngine
case ComparisonOperator.LessThanEqual: case ComparisonOperator.LessThanEqual:
return watchList.Where(w => SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous) <= compareValue); return watchList.Where(w => SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous) <= compareValue);
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
return watchList.Where(w => return watchList.Where(w =>
differentBy == Math.Abs(Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous)) - compareValue)); differentBy == Math.Abs(SignExtendAsNeeded(w.Current) - SignExtendAsNeeded(w.Previous) - compareValue));
} }
} }
var compareValueF = ReinterpretAsF32(compareValue); var compareValueF = ReinterpretAsF32(compareValue);
@ -506,7 +513,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
return diff < compareValueF || diff.HawkFloatEquality(compareValueF); return diff < compareValueF || diff.HawkFloatEquality(compareValueF);
}); });
case ComparisonOperator.DifferentBy: case ComparisonOperator.DifferentBy:
if (DifferentBy is not uint differentBy) throw new InvalidOperationException(); if (DifferentBy is not int differentBy) throw new InvalidOperationException();
var differentByF = ReinterpretAsF32(differentBy); var differentByF = ReinterpretAsF32(differentBy);
return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - ReinterpretAsF32(w.Previous) - compareValueF) return watchList.Where(w => Math.Abs(ReinterpretAsF32(w.Current) - ReinterpretAsF32(w.Previous) - compareValueF)
.HawkFloatEquality(differentByF)); .HawkFloatEquality(differentByF));

6
src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
View File

@ -1,6 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
@ -80,7 +79,7 @@ namespace BizHawk.Client.Common
WatchDisplayType.Hex => uint.Parse(value, NumberStyles.HexNumber), WatchDisplayType.Hex => uint.Parse(value, NumberStyles.HexNumber),
WatchDisplayType.FixedPoint_20_12 => (uint)(double.Parse(value, NumberFormatInfo.InvariantInfo) * 4096.0), WatchDisplayType.FixedPoint_20_12 => (uint)(double.Parse(value, NumberFormatInfo.InvariantInfo) * 4096.0),
WatchDisplayType.FixedPoint_16_16 => (uint)(double.Parse(value, NumberFormatInfo.InvariantInfo) * 65536.0), WatchDisplayType.FixedPoint_16_16 => (uint)(double.Parse(value, NumberFormatInfo.InvariantInfo) * 65536.0),
WatchDisplayType.Float => NumberExtensions.ReinterpretAsUInt32(float.Parse(value, NumberFormatInfo.InvariantInfo)), WatchDisplayType.Float => BitConverter.ToUInt32(BitConverter.GetBytes(float.Parse(value, NumberFormatInfo.InvariantInfo)), 0),
_ => 0 _ => 0
}; };
@ -129,7 +128,8 @@ namespace BizHawk.Client.Common
{ {
string FormatFloat() string FormatFloat()
{ {
var _float = NumberExtensions.ReinterpretAsF32(val); var bytes = BitConverter.GetBytes(val);
var _float = BitConverter.ToSingle(bytes, 0);
return _float.ToString(NumberFormatInfo.InvariantInfo); return _float.ToString(NumberFormatInfo.InvariantInfo);
} }

24
src/BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
View File

@ -10,8 +10,8 @@ namespace BizHawk.Client.EmuHawk
public interface INumberBox public interface INumberBox
{ {
bool Nullable { get; } bool Nullable { get; }
uint? ToRawUInt(); int? ToRawInt();
void SetFromRawUInt(uint? rawUInt); void SetFromRawInt(int? rawInt);
} }
public class HexTextBox : ClipboardEventTextBox, INumberBox public class HexTextBox : ClipboardEventTextBox, INumberBox
@ -85,7 +85,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Text.IsHex() && !string.IsNullOrEmpty(_addressFormatStr)) if (Text.IsHex() && !string.IsNullOrEmpty(_addressFormatStr))
{ {
var val = ToRawUInt(); var val = (uint)ToRawInt();
if (val == GetMax()) if (val == GetMax())
{ {
@ -103,7 +103,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Text.IsHex() && !string.IsNullOrEmpty(_addressFormatStr)) if (Text.IsHex() && !string.IsNullOrEmpty(_addressFormatStr))
{ {
var val = ToRawUInt(); var val = (uint)ToRawInt();
if (val == 0) if (val == 0)
{ {
val = (uint)GetMax(); // int to long todo val = (uint)GetMax(); // int to long todo
@ -146,7 +146,7 @@ namespace BizHawk.Client.EmuHawk
base.OnPaste(e); base.OnPaste(e);
} }
public uint? ToRawUInt() public int? ToRawInt()
{ {
if (string.IsNullOrWhiteSpace(Text)) if (string.IsNullOrWhiteSpace(Text))
{ {
@ -158,10 +158,10 @@ namespace BizHawk.Client.EmuHawk
return 0; return 0;
} }
return uint.Parse(Text, NumberStyles.HexNumber); return int.Parse(Text, NumberStyles.HexNumber);
} }
public void SetFromRawUInt(uint? val) public void SetFromRawInt(int? val)
{ {
Text = val.HasValue ? string.Format(_addressFormatStr, val) : ""; Text = val.HasValue ? string.Format(_addressFormatStr, val) : "";
} }
@ -230,7 +230,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Text.IsHex()) if (Text.IsHex())
{ {
var val = ToRawUInt().Value; var val = (uint)ToRawInt();
if (val == uint.MaxValue) if (val == uint.MaxValue)
{ {
val = 0; val = 0;
@ -247,7 +247,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Text.IsHex()) if (Text.IsHex())
{ {
var val = ToRawUInt().Value; var val = (uint)ToRawInt();
if (val == 0) if (val == 0)
{ {
@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
base.OnTextChanged(e); base.OnTextChanged(e);
} }
public uint? ToRawUInt() public int? ToRawInt()
{ {
if (string.IsNullOrWhiteSpace(Text) || !Text.IsHex()) if (string.IsNullOrWhiteSpace(Text) || !Text.IsHex())
{ {
@ -291,10 +291,10 @@ namespace BizHawk.Client.EmuHawk
return 0; return 0;
} }
return uint.Parse(Text); return (int)uint.Parse(Text);
} }
public void SetFromRawUInt(uint? val) public void SetFromRawInt(int? val)
{ {
Text = val?.ToString() ?? ""; Text = val?.ToString() ?? "";
} }

2
src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -593,7 +593,7 @@ namespace BizHawk.Client.EmuHawk
if (StopOnFrameCheckbox.Checked) if (StopOnFrameCheckbox.Checked)
{ {
if (LastFrameCheckbox.Checked) _mainForm.PauseOnFrame = _movieSession.Movie.InputLogLength; if (LastFrameCheckbox.Checked) _mainForm.PauseOnFrame = _movieSession.Movie.InputLogLength;
else if (StopOnFrameTextBox.ToRawUInt() is uint i) _mainForm.PauseOnFrame = (int)i; else if (StopOnFrameTextBox.ToRawInt() is int i) _mainForm.PauseOnFrame = i;
} }
Close(); Close();
} }

12
src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
View File

@ -93,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
CheckFormState(); CheckFormState();
if (!_cheat.Compare.HasValue) if (!_cheat.Compare.HasValue)
{ {
CompareBox.Text = ""; // Necessary hack until WatchValueBox.ToRawUInt() becomes nullable CompareBox.Text = ""; // Necessary hack until WatchValueBox.ToRawInt() becomes nullable
} }
_loading = false; _loading = false;
@ -132,7 +132,7 @@ namespace BizHawk.Client.EmuHawk
SetTypeSelected(WatchDisplayType.Hex); SetTypeSelected(WatchDisplayType.Hex);
CheckFormState(); CheckFormState();
CompareBox.Text = ""; // TODO: A needed hack until WatchValueBox.ToRawUInt() becomes nullable CompareBox.Text = ""; // TODO: A needed hack until WatchValueBox.ToRawInt() becomes nullable
_loading = false; _loading = false;
} }
@ -310,7 +310,7 @@ namespace BizHawk.Client.EmuHawk
public Cheat GetCheat() public Cheat GetCheat()
{ {
var domain = MemoryDomains[DomainDropDown.SelectedItem.ToString()]!; var domain = MemoryDomains[DomainDropDown.SelectedItem.ToString()]!;
var address = AddressBox.ToRawUInt().Value; var address = AddressBox.ToRawInt().Value;
if (address < domain.Size) if (address < domain.Size)
{ {
var watch = Watch.GenerateWatch( var watch = Watch.GenerateWatch(
@ -333,11 +333,11 @@ namespace BizHawk.Client.EmuHawk
_ => Cheat.CompareType.None _ => Cheat.CompareType.None
}; };
var compare = CompareBox.ToRawUInt(); var compare = CompareBox.ToRawInt();
return new Cheat( return new Cheat(
watch, watch,
value: (int)ValueBox.ToRawUInt().Value, value: ValueBox.ToRawInt().Value,
compare: (int?)compare, compare: compare,
enabled: true, enabled: true,
comparisonType); comparisonType);
} }

4
src/BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
View File

@ -100,13 +100,13 @@ namespace BizHawk.Client.EmuHawk
public uint Address public uint Address
{ {
get => AddressBox.ToRawUInt().Value & AddressMask; get => (uint)AddressBox.ToRawInt().Value & AddressMask;
set => AddressBox.SetFromLong(value & AddressMask); set => AddressBox.SetFromLong(value & AddressMask);
} }
public uint AddressMask public uint AddressMask
{ {
get => AddressMaskBox.ToRawUInt().Value; get => (uint)AddressMaskBox.ToRawInt().Value;
set => AddressMaskBox.SetFromLong(value); set => AddressMaskBox.SetFromLong(value);
} }

4
src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.Client.EmuHawk
var pc = PCRegister; var pc = PCRegister;
SeekToBox.Nullable = false; SeekToBox.Nullable = false;
SeekToBox.SetHexProperties((long)Math.Pow(2, pc.BitSize)); SeekToBox.SetHexProperties((long)Math.Pow(2, pc.BitSize));
SeekToBox.SetFromRawUInt(0); SeekToBox.SetFromRawInt(0);
} }
else else
{ {
@ -263,7 +263,7 @@ namespace BizHawk.Client.EmuHawk
private void SeekToBtn_Click(object sender, EventArgs e) private void SeekToBtn_Click(object sender, EventArgs e)
{ {
CancelSeekBtn.Enabled = true; CancelSeekBtn.Enabled = true;
var pcVal = SeekToBox.ToRawUInt() ?? 0; var pcVal = (uint)(SeekToBox.ToRawInt() ?? 0);
var pcBitSize = PCRegister.BitSize; var pcBitSize = PCRegister.BitSize;
BreakPointControl1.RemoveCurrentSeek(); BreakPointControl1.RemoveCurrentSeek();

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/FramesPrompt.cs
View File

@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk
this.label1.Text = bodyMessage; this.label1.Text = bodyMessage;
} }
public int Frames => (int)(NumFramesBox.ToRawUInt() ?? 0); public int Frames => NumFramesBox.ToRawInt() ?? 0;
private void FramesPrompt_Load(object sender, EventArgs e) private void FramesPrompt_Load(object sender, EventArgs e)
{ {

28
src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -421,7 +421,7 @@ namespace BizHawk.Client.EmuHawk
WatchListView.AnyRowsSelected && _searches.Domain.Writable; WatchListView.AnyRowsSelected && _searches.Domain.Writable;
} }
private uint? CompareToValue private long? CompareToValue
{ {
get get
{ {
@ -432,29 +432,29 @@ namespace BizHawk.Client.EmuHawk
if (SpecificValueRadio.Checked) if (SpecificValueRadio.Checked)
{ {
return SpecificValueBox.ToRawUInt(); return (long)SpecificValueBox.ToRawInt() & 0x00000000FFFFFFFF;
} }
if (SpecificAddressRadio.Checked) if (SpecificAddressRadio.Checked)
{ {
return SpecificAddressBox.ToRawUInt(); return SpecificAddressBox.ToRawInt();
} }
if (NumberOfChangesRadio.Checked) if (NumberOfChangesRadio.Checked)
{ {
return NumberOfChangesBox.ToRawUInt(); return NumberOfChangesBox.ToRawInt();
} }
if (DifferenceRadio.Checked) if (DifferenceRadio.Checked)
{ {
return DifferenceBox.ToRawUInt(); return DifferenceBox.ToRawInt();
} }
return null; return null;
} }
} }
private uint? DifferentByValue => DifferentByRadio.Checked ? DifferentByBox.ToRawUInt() : null; private int? DifferentByValue => DifferentByRadio.Checked ? DifferentByBox.ToRawInt() : null;
private ComparisonOperator Operator private ComparisonOperator Operator
{ {
@ -737,7 +737,7 @@ namespace BizHawk.Client.EmuHawk
WatchListView.Refresh(); WatchListView.Refresh();
} }
private void SetCompareValue(uint? value) private void SetCompareValue(int? value)
{ {
_searches.CompareValue = value; _searches.CompareValue = value;
WatchListView.Refresh(); WatchListView.Refresh();
@ -1441,7 +1441,7 @@ namespace BizHawk.Client.EmuHawk
SpecificAddressBox.ResetText(); SpecificAddressBox.ResetText();
} }
_searches.CompareValue = SpecificValueBox.ToRawUInt(); _searches.CompareValue = SpecificValueBox.ToRawInt();
if (Focused) if (Focused)
{ {
@ -1463,7 +1463,7 @@ namespace BizHawk.Client.EmuHawk
SpecificAddressBox.ResetText(); SpecificAddressBox.ResetText();
} }
_searches.CompareValue = SpecificAddressBox.ToRawUInt(); _searches.CompareValue = SpecificAddressBox.ToRawInt();
if (Focused) if (Focused)
{ {
@ -1485,7 +1485,7 @@ namespace BizHawk.Client.EmuHawk
NumberOfChangesBox.ResetText(); NumberOfChangesBox.ResetText();
} }
_searches.CompareValue = NumberOfChangesBox.ToRawUInt(); _searches.CompareValue = NumberOfChangesBox.ToRawInt();
if (Focused) if (Focused)
{ {
@ -1507,7 +1507,7 @@ namespace BizHawk.Client.EmuHawk
DifferenceBox.ResetText(); DifferenceBox.ResetText();
} }
_searches.CompareValue = DifferenceBox.ToRawUInt(); _searches.CompareValue = DifferenceBox.ToRawInt();
if (Focused) if (Focused)
{ {
@ -1519,7 +1519,7 @@ namespace BizHawk.Client.EmuHawk
private void CompareToValue_TextChanged(object sender, EventArgs e) private void CompareToValue_TextChanged(object sender, EventArgs e)
{ {
SetCompareValue(((INumberBox)sender).ToRawUInt()); SetCompareValue(((INumberBox)sender).ToRawInt());
} }
private void EqualToRadio_Click(object sender, EventArgs e) private void EqualToRadio_Click(object sender, EventArgs e)
@ -1567,7 +1567,7 @@ namespace BizHawk.Client.EmuHawk
DifferentByBox.ResetText(); DifferentByBox.ResetText();
} }
_searches.DifferentBy = DifferenceBox.ToRawUInt(); _searches.DifferentBy = DifferenceBox.ToRawInt();
if (Focused) if (Focused)
{ {
@ -1579,7 +1579,7 @@ namespace BizHawk.Client.EmuHawk
private void DifferentByBox_TextChanged(object sender, EventArgs e) private void DifferentByBox_TextChanged(object sender, EventArgs e)
{ {
_searches.DifferentBy = !string.IsNullOrWhiteSpace(DifferentByBox.Text) ? DifferentByBox.ToRawUInt() : null; _searches.DifferentBy = !string.IsNullOrWhiteSpace(DifferentByBox.Text) ? DifferentByBox.ToRawInt() : null;
WatchListView.Refresh(); WatchListView.Refresh();
} }

2
src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
View File

@ -275,7 +275,7 @@ namespace BizHawk.Client.EmuHawk
Watches[i] = Watch.GenerateWatch( Watches[i] = Watch.GenerateWatch(
Watches[i].Domain, Watches[i].Domain,
Watches.Count == 1 ? AddressBox.ToRawUInt() ?? 0 : Watches[i].Address, Watches.Count == 1 ? AddressBox.ToRawInt() ?? 0 : Watches[i].Address,
size, size,
_changedDisplayType ? displayType : Watches[i].Type, _changedDisplayType ? displayType : Watches[i].Type,
Watches[i].BigEndian, Watches[i].BigEndian,

49
src/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
View File

@ -55,10 +55,10 @@ namespace BizHawk.Client.EmuHawk
get => _type; get => _type;
set set
{ {
var val = ToRawUInt(); var val = ToRawInt();
_type = value; _type = value;
SetMaxLength(); SetMaxLength();
SetFromRawUInt(val); SetFromRawInt(val);
} }
} }
@ -196,7 +196,7 @@ namespace BizHawk.Client.EmuHawk
{ {
default: default:
case WatchDisplayType.Signed: case WatchDisplayType.Signed:
int val = (int)(ToRawUInt() ?? 0); int val = ToRawInt() ?? 0;
if (val == MaxSignedInt) if (val == MaxSignedInt)
{ {
val = MinSignedInt; val = MinSignedInt;
@ -209,7 +209,7 @@ namespace BizHawk.Client.EmuHawk
Text = val.ToString(); Text = val.ToString();
break; break;
case WatchDisplayType.Unsigned: case WatchDisplayType.Unsigned:
var uval = ToRawUInt() ?? 0; var uval = (uint)(ToRawInt() ?? 0);
if (uval == MaxUnsignedInt) if (uval == MaxUnsignedInt)
{ {
uval = 0; uval = 0;
@ -222,7 +222,7 @@ namespace BizHawk.Client.EmuHawk
Text = uval.ToString(); Text = uval.ToString();
break; break;
case WatchDisplayType.Binary: case WatchDisplayType.Binary:
var bVal = ToRawUInt() ?? 0; var bVal = (uint)(ToRawInt() ?? 0);
if (bVal == MaxUnsignedInt) if (bVal == MaxUnsignedInt)
{ {
bVal = 0; bVal = 0;
@ -236,7 +236,7 @@ namespace BizHawk.Client.EmuHawk
Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0'); Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0');
break; break;
case WatchDisplayType.Hex: case WatchDisplayType.Hex:
var hexVal = ToRawUInt() ?? 0; var hexVal = (uint)(ToRawInt() ?? 0);
if (hexVal == MaxUnsignedInt) if (hexVal == MaxUnsignedInt)
{ {
hexVal = 0; hexVal = 0;
@ -308,7 +308,7 @@ namespace BizHawk.Client.EmuHawk
{ {
default: default:
case WatchDisplayType.Signed: case WatchDisplayType.Signed:
int val = (int)(ToRawUInt() ?? 0); int val = ToRawInt() ?? 0;
if (val == MinSignedInt) if (val == MinSignedInt)
{ {
val = MaxSignedInt; val = MaxSignedInt;
@ -321,7 +321,7 @@ namespace BizHawk.Client.EmuHawk
Text = val.ToString(); Text = val.ToString();
break; break;
case WatchDisplayType.Unsigned: case WatchDisplayType.Unsigned:
var uval = ToRawUInt() ?? 0; var uval = (uint)(ToRawInt() ?? 0);
if (uval == 0) if (uval == 0)
{ {
uval = MaxUnsignedInt; uval = MaxUnsignedInt;
@ -334,7 +334,7 @@ namespace BizHawk.Client.EmuHawk
Text = uval.ToString(); Text = uval.ToString();
break; break;
case WatchDisplayType.Binary: case WatchDisplayType.Binary:
var bVal = ToRawUInt() ?? 0; var bVal = (uint)(ToRawInt() ?? 0);
if (bVal == 0) if (bVal == 0)
{ {
bVal = MaxUnsignedInt; bVal = MaxUnsignedInt;
@ -348,7 +348,7 @@ namespace BizHawk.Client.EmuHawk
Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0'); Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0');
break; break;
case WatchDisplayType.Hex: case WatchDisplayType.Hex:
var hexVal = ToRawUInt() ?? 0; var hexVal = (uint)(ToRawInt() ?? 0);
if (hexVal == 0) if (hexVal == 0)
{ {
hexVal = MaxUnsignedInt; hexVal = MaxUnsignedInt;
@ -444,21 +444,21 @@ namespace BizHawk.Client.EmuHawk
base.OnPaste(e); base.OnPaste(e);
} }
public uint? ToRawUInt() public int? ToRawInt()
{ {
try try
{ {
return _type switch return _type switch
{ {
WatchDisplayType.Signed => (uint)int.Parse(Text), WatchDisplayType.Signed => int.Parse(Text),
WatchDisplayType.Unsigned => uint.Parse(Text), WatchDisplayType.Unsigned => (int)uint.Parse(Text),
WatchDisplayType.Binary => Convert.ToUInt32(Text, 2), WatchDisplayType.Binary => Convert.ToInt32(Text, 2),
WatchDisplayType.Hex => uint.Parse(Text, NumberStyles.HexNumber), WatchDisplayType.Hex => int.Parse(Text, NumberStyles.HexNumber),
WatchDisplayType.FixedPoint_12_4 => (uint)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 16.0), WatchDisplayType.FixedPoint_12_4 => (int)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 16.0),
WatchDisplayType.FixedPoint_20_12 => (uint)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 4096.0), WatchDisplayType.FixedPoint_20_12 => (int)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 4096.0),
WatchDisplayType.FixedPoint_16_16 => (uint)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 65536.0), WatchDisplayType.FixedPoint_16_16 => (int)(double.Parse(Text, NumberFormatInfo.InvariantInfo) * 65536.0),
WatchDisplayType.Float => NumberExtensions.ReinterpretAsUInt32(float.Parse(Text, NumberFormatInfo.InvariantInfo)), WatchDisplayType.Float => BitConverter.ToInt32(BitConverter.GetBytes(float.Parse(Text, NumberFormatInfo.InvariantInfo)), 0),
_ => uint.Parse(Text) _ => int.Parse(Text)
}; };
} }
catch catch
@ -469,7 +469,7 @@ namespace BizHawk.Client.EmuHawk
return Nullable ? null : 0; return Nullable ? null : 0;
} }
public void SetFromRawUInt(uint? val) public void SetFromRawInt(int? val)
{ {
if (val.HasValue) if (val.HasValue)
{ {
@ -480,11 +480,11 @@ namespace BizHawk.Client.EmuHawk
Text = val.Value.ToString(); Text = val.Value.ToString();
break; break;
case WatchDisplayType.Unsigned: case WatchDisplayType.Unsigned:
var uval = val.Value; var uval = (uint)val.Value;
Text = uval.ToString(); Text = uval.ToString();
break; break;
case WatchDisplayType.Binary: case WatchDisplayType.Binary:
var bVal = val.Value; var bVal = (uint)val.Value;
var numBits = ((int)ByteSize) * 8; var numBits = ((int)ByteSize) * 8;
Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0'); Text = Convert.ToString(bVal, 2).PadLeft(numBits, '0');
break; break;
@ -501,7 +501,8 @@ namespace BizHawk.Client.EmuHawk
Text = (val.Value / 65536.0).ToString("F5", NumberFormatInfo.InvariantInfo); Text = (val.Value / 65536.0).ToString("F5", NumberFormatInfo.InvariantInfo);
break; break;
case WatchDisplayType.Float: case WatchDisplayType.Float:
float _float = NumberExtensions.ReinterpretAsF32(val.Value); var bytes = BitConverter.GetBytes(val.Value);
float _float = BitConverter.ToSingle(bytes, 0);
Text = _float.ToString("F6", NumberFormatInfo.InvariantInfo); Text = _float.ToString("F6", NumberFormatInfo.InvariantInfo);
break; break;
} }

6
src/BizHawk.Common/Extensions/NumberExtensions.cs
View File

@ -155,11 +155,5 @@ namespace BizHawk.Common.NumberExtensions
/// <remarks>don't use this in cores without picking a suitable ε</remarks> /// <remarks>don't use this in cores without picking a suitable ε</remarks>
public static bool HawkFloatEquality(this float f, float other, float ε = ReallySmallNumber) => Math.Abs(other - f) < ε; public static bool HawkFloatEquality(this float f, float other, float ε = ReallySmallNumber) => Math.Abs(other - f) < ε;
/// <summary> Reinterprets the byte representation of <paramref name="value"/> as a float</summary>
public static float ReinterpretAsF32(uint value) => Unsafe.As<uint, float>(ref value);
/// <summary> Reinterprets the byte representation of <paramref name="value"/> as a uint</summary>
public static uint ReinterpretAsUInt32(float value) => Unsafe.As<float, uint>(ref value);
} }
} }

39
src/BizHawk.Tests/Common/ConversionTests.cs
View File

@ -1,24 +1,39 @@
using BizHawk.Common.NumberExtensions; using System.Buffers.Binary;
using System.Runtime.CompilerServices;
namespace BizHawk.Tests.Common; namespace BizHawk.Tests.Common;
// test for RamSearchEngine.ReinterpretAsF32
[TestClass] [TestClass]
public class ConversionTests public class ConversionTests
{ {
[TestMethod] private static float ReinterpretAsF32Unsafe(long l)
[DataRow(0U, 0)]
[DataRow(1U, 1.401298E-45F)]
[DataRow(1109917696U, 42)]
[DataRow(1123477881U, 123.456F)]
[DataRow(3212836864U, -1)]
public void TestReinterpretAsF32(uint input, float expected)
{ {
float converted = NumberExtensions.ReinterpretAsF32(input); return Unsafe.As<long, float>(ref l);
}
Assert.AreEqual(expected, converted); private static readonly byte[] ScratchSpace = new byte[8];
uint restoredInput = NumberExtensions.ReinterpretAsUInt32(converted); private static float ReinterpretAsF32BitConverter(long l)
{
BinaryPrimitives.WriteInt64LittleEndian(ScratchSpace, l);
return BitConverter.ToSingle(ScratchSpace, startIndex: 0);
}
Assert.AreEqual(input, restoredInput); [TestMethod]
[DoNotParallelize] // old implementation is not thread safe
[DataRow(0, 0)]
[DataRow(1, 1.401298E-45F)]
[DataRow(1109917696, 42)]
[DataRow(1123477881, 123.456F)]
[DataRow(3212836864, -1)]
[DataRow(0x7fffffffbf800000, -1)]
public void TestReinterpretAsF32(long input, float expected)
{
float f32BitConverter = ReinterpretAsF32BitConverter(input);
float f32Unsafe = ReinterpretAsF32Unsafe(input);
Assert.AreEqual(expected, f32BitConverter);
Assert.AreEqual(expected, f32Unsafe);
} }
} }