From 1721e4f9eaf616d16f06b8b424b61832669df7ba Mon Sep 17 00:00:00 2001 From: scrimpeh Date: Wed, 24 Jun 2020 15:42:36 +0200 Subject: [PATCH] ram watch - add IsValid method --- .../tools/Watch/ByteWatch.cs | 6 +++ .../tools/Watch/DWordWatch.cs | 39 +++++++++------- .../tools/Watch/SeparatorWatch.cs | 5 +++ .../tools/Watch/Watch.cs | 45 ++++++++----------- .../tools/Watch/WordWatch.cs | 6 +++ .../BizHawk.Client.DiscoHawk.csproj | 6 +-- .../tools/Watch/RamWatch.cs | 8 ++-- 7 files changed, 65 insertions(+), 50 deletions(-) diff --git a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs index aa1aacd7b0..94427b0559 100644 --- a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs @@ -170,6 +170,7 @@ namespace BizHawk.Client.Common { return Type switch { + _ when !IsValid => "-", DisplayType.Unsigned => val.ToString(), DisplayType.Signed => ((sbyte) val).ToString(), DisplayType.Hex => $"{val:X2}", @@ -184,6 +185,11 @@ namespace BizHawk.Client.Common /// public override string Diff => $"{_value - (short)_previous:+#;-#;0}"; + /// + /// Returns true if the Watch is valid, false otherwise + /// + public override bool IsValid => Domain.Size == 0 || Address < Domain.Size; + /// /// Get the maximum possible value /// diff --git a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs index bcab9289f1..00426f4e3e 100644 --- a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs @@ -194,24 +194,24 @@ namespace BizHawk.Client.Common // TODO: Implements IFormattable public string FormatValue(uint val) { - switch (Type) + string FormatFloat() { - default: - case DisplayType.Unsigned: - return val.ToString(); - case DisplayType.Signed: - return ((int)val).ToString(); - case DisplayType.Hex: - return $"{val:X8}"; - case DisplayType.FixedPoint_20_12: - return $"{(int)val / 4096.0:0.######}"; - case DisplayType.FixedPoint_16_16: - return $"{(int)val / 65536.0:0.######}"; - case DisplayType.Float: - var bytes = BitConverter.GetBytes(val); - var _float = BitConverter.ToSingle(bytes, 0); - return _float.ToString(); // adelikat: decided that we like sci notation instead of spooky rounding - } + var bytes = BitConverter.GetBytes(val); + var _float = BitConverter.ToSingle(bytes, 0); + return _float.ToString(); + }; + + return Type switch + { + _ when !IsValid => "-", + DisplayType.Unsigned => val.ToString(), + DisplayType.Signed => ((int)val).ToString(), + DisplayType.Hex => $"{val:X8}", + DisplayType.FixedPoint_20_12 => $"{(int)val / 4096.0:0.######}", + DisplayType.FixedPoint_16_16 => $"{(int)val / 65536.0:0.######}", + DisplayType.Float => FormatFloat(), + _ => val.ToString() + }; } /// @@ -220,6 +220,11 @@ namespace BizHawk.Client.Common /// public override string Diff => $"{_value - (long)_previous:+#;-#;0}"; + /// + /// Returns true if the Watch is valid, false otherwise + /// + public override bool IsValid => Domain.Size == 0 || Address < (Domain.Size - 3); + /// /// Get the maximum possible value /// diff --git a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs index bda0702575..caf2789629 100644 --- a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs @@ -91,6 +91,11 @@ namespace BizHawk.Client.Common { } + /// + /// Ignore that stuff + /// + public override bool IsValid => true; + /// /// Ignore that stuff /// diff --git a/src/BizHawk.Client.Common/tools/Watch/Watch.cs b/src/BizHawk.Client.Common/tools/Watch/Watch.cs index e20563d538..1d092b3b0e 100644 --- a/src/BizHawk.Client.Common/tools/Watch/Watch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/Watch.cs @@ -267,67 +267,55 @@ namespace BizHawk.Client.Common protected byte GetByte() { - if (_domain.Size == 0) + if (!IsValid) { - return _domain.PeekByte(Address); + return 0; } - return _domain.PeekByte(Address % _domain.Size); + return _domain.PeekByte(Address); } protected ushort GetWord() { - if (_domain.Size == 0) + if (!IsValid) { - return _domain.PeekUshort(Address, BigEndian); + return 0; } - return _domain.PeekUshort(Address % _domain.Size, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain + return _domain.PeekUshort(Address, BigEndian); } protected uint GetDWord() { - if (_domain.Size == 0) + if (!IsValid) { - return _domain.PeekUint(Address, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain + return 0; } - return _domain.PeekUint(Address % _domain.Size, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain + return _domain.PeekUint(Address, BigEndian); } protected void PokeByte(byte val) { - if (_domain.Size == 0) + if (IsValid) { _domain.PokeByte(Address, val); } - else - { - _domain.PokeByte(Address % _domain.Size, val); - } } protected void PokeWord(ushort val) { - if (_domain.Size == 0) + if (IsValid) { - _domain.PokeUshort(Address, val, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain - } - else - { - _domain.PokeUshort(Address % _domain.Size, val, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain + _domain.PokeUshort(Address, val, BigEndian); } } protected void PokeDWord(uint val) { - if (_domain.Size == 0) + if (IsValid) { - _domain.PokeUint(Address, val, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain - } - else - { - _domain.PokeUint(Address % _domain.Size, val, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain + _domain.PokeUint(Address, val, BigEndian); } } @@ -472,6 +460,11 @@ namespace BizHawk.Client.Common /// public abstract string ValueString { get; } + /// + /// Returns true if the Watch is valid, false otherwise + /// + public abstract bool IsValid { get; } + /// /// Try to sets the value into the /// at the current address diff --git a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs index afbf6abd01..6886e0b7b3 100644 --- a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs @@ -180,6 +180,7 @@ namespace BizHawk.Client.Common { return Type switch { + _ when !IsValid => "-", DisplayType.Unsigned => val.ToString(), DisplayType.Signed => ((short) val).ToString(), DisplayType.Hex => $"{val:X4}", DisplayType.FixedPoint_12_4 => $"{val / 16.0:F4}", @@ -199,6 +200,11 @@ namespace BizHawk.Client.Common /// public override string Diff => $"{_value - (int)_previous:+#;-#;0}"; + /// + /// Returns true if the Watch is valid, false otherwise + /// + public override bool IsValid => Domain.Size == 0 || Address < (Domain.Size - 1); + /// /// Get the maximum possible value /// diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj index 9019cd7be1..6d35b5cc47 100755 --- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj +++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj @@ -70,13 +70,13 @@ - + - + - + diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 7e06858da8..3acf0a3030 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -404,7 +404,6 @@ namespace BizHawk.Client.EmuHawk var result = we.ShowHawkDialog(this); if (result == DialogResult.OK) { - Changes(); if (duplicate) { _watches.AddRange(we.Watches); @@ -418,6 +417,7 @@ namespace BizHawk.Client.EmuHawk _watches[indexes[i]] = we.Watches[i]; } } + Changes(); } GeneralUpdate(); @@ -587,7 +587,7 @@ namespace BizHawk.Client.EmuHawk } } - ErrorIconButton.Visible = _watches.Where(watch => !watch.IsSeparator).Any(watch => watch.Address >= watch.Domain.Size); + ErrorIconButton.Visible = _watches.Where(watch => !watch.IsSeparator).Any(watch => !watch.IsValid); MessageLabel.Text = message; } @@ -608,7 +608,7 @@ namespace BizHawk.Client.EmuHawk { color = BackColor; } - else if (_watches[index].Address >= _watches[index].Domain.Size) + else if (!_watches[index].IsValid) { color = Color.PeachPuff; } @@ -1230,7 +1230,7 @@ namespace BizHawk.Client.EmuHawk private void ErrorIconButton_Click(object sender, EventArgs e) { var items = _watches - .Where(watch => watch.Address >= watch.Domain.Size) + .Where(watch => !watch.IsValid) .ToList(); // enumerate because _watches is about to be changed foreach (var item in items)