From 528b7ea104fc1dcc1b3f4d9625059f5b1e007fa6 Mon Sep 17 00:00:00 2001 From: scepheo Date: Tue, 16 Dec 2014 00:41:47 +0000 Subject: [PATCH] RAM Search: Fix issues with signed values. Resolves issue 340. --- .../tools/RamSearchEngine.cs | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs index 4e577474c9..12a43b1338 100644 --- a/BizHawk.Client.Common/tools/RamSearchEngine.cs +++ b/BizHawk.Client.Common/tools/RamSearchEngine.cs @@ -192,7 +192,7 @@ namespace BizHawk.Client.Common if (_settings.PreviousType == Watch.PreviousType.LastSearch) { - SetPrevousToCurrent(); + SetPreviousToCurrent(); } if (_keepHistory) @@ -328,7 +328,7 @@ namespace BizHawk.Client.Common _settings.PreviousType = type; } - public void SetPrevousToCurrent() + public void SetPreviousToCurrent() { _watchList.ForEach(x => x.SetPreviousToCurrent(_settings.Domain, _settings.BigEndian)); } @@ -645,28 +645,28 @@ namespace BizHawk.Client.Common return watchList.Where(x => ToFloat(GetValue(x.Address)) > ToFloat(_compareValue.Value)); } - return watchList.Where(x => GetValue(x.Address) > _compareValue.Value); + return watchList.Where(x => SignExtendAsNeeded(GetValue(x.Address)) > _compareValue.Value); case ComparisonOperator.GreaterThanEqual: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => ToFloat(GetValue(x.Address)) >= ToFloat(_compareValue.Value)); } - return watchList.Where(x => GetValue(x.Address) >= _compareValue.Value); + return watchList.Where(x => SignExtendAsNeeded(GetValue(x.Address)) >= _compareValue.Value); case ComparisonOperator.LessThan: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => ToFloat(GetValue(x.Address)) < ToFloat(_compareValue.Value)); } - return watchList.Where(x => GetValue(x.Address) < _compareValue.Value); + return watchList.Where(x => SignExtendAsNeeded(GetValue(x.Address)) < _compareValue.Value); case ComparisonOperator.LessThanEqual: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => ToFloat(GetValue(x.Address)) <= ToFloat(_compareValue.Value)); } - return watchList.Where(x => GetValue(x.Address) <= _compareValue.Value); + return watchList.Where(x => SignExtendAsNeeded(GetValue(x.Address)) <= _compareValue.Value); case ComparisonOperator.DifferentBy: if (_differentBy.HasValue) { @@ -676,7 +676,9 @@ namespace BizHawk.Client.Common (ToFloat(GetValue(x.Address)) - _differentBy.Value == _compareValue.Value)); } - return watchList.Where(x => (GetValue(x.Address) + _differentBy.Value == _compareValue.Value) || (GetValue(x.Address) - _differentBy.Value == _compareValue.Value)); + return watchList.Where(x + => (SignExtendAsNeeded(GetValue(x.Address)) + _differentBy.Value == _compareValue.Value) + || (SignExtendAsNeeded(GetValue(x.Address)) - _differentBy.Value == _compareValue.Value)); } else { @@ -796,42 +798,42 @@ namespace BizHawk.Client.Common return watchList.Where(x => (ToFloat(GetValue(x.Address)) - ToFloat(x.Previous)) == _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) == _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) == _compareValue.Value); case ComparisonOperator.NotEqual: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => (ToFloat(GetValue(x.Address)) - x.Previous) != _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) != _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) != _compareValue.Value); case ComparisonOperator.GreaterThan: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => (ToFloat(GetValue(x.Address)) - x.Previous) > _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) > _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) > _compareValue.Value); case ComparisonOperator.GreaterThanEqual: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => (ToFloat(GetValue(x.Address)) - x.Previous) >= _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) >= _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) >= _compareValue.Value); case ComparisonOperator.LessThan: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => (ToFloat(GetValue(x.Address)) - x.Previous) < _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) < _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) < _compareValue.Value); case ComparisonOperator.LessThanEqual: if (_settings.Type == Watch.DisplayType.Float) { return watchList.Where(x => (ToFloat(GetValue(x.Address)) - x.Previous) <= _compareValue.Value); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous) <= _compareValue.Value); + return watchList.Where(x => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous)) <= _compareValue.Value); case ComparisonOperator.DifferentBy: if (_differentBy.HasValue) { @@ -841,7 +843,9 @@ namespace BizHawk.Client.Common (ToFloat(GetValue(x.Address)) - x.Previous - _differentBy.Value == x.Previous)); } - return watchList.Where(x => (GetValue(x.Address) - x.Previous + _differentBy.Value == _compareValue) || (GetValue(x.Address) - x.Previous - _differentBy.Value == x.Previous)); + return watchList.Where(x + => (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous) + _differentBy.Value == _compareValue) + || (SignExtendAsNeeded(GetValue(x.Address)) - SignExtendAsNeeded(x.Previous) - _differentBy.Value == _compareValue)); } else {