Widen Watch.Value and related props in RAM Search to ulong/long

Author: YoshiRulz

src/BizHawk.Client.Common/tools/Cheat.cs

@@ -17,10 +17,17 @@ public enum CompareType
 
 		private readonly Watch _watch;
 		private int? _compare;
-		private int _val;
+
+		private long _val;
+
 		private bool _enabled;
 
-		public Cheat(Watch watch, int value, int? compare = null, bool enabled = true, CompareType comparisonType = CompareType.None)
+		public Cheat(
+			Watch watch,
+			long value,
+			int? compare = null,
+			bool enabled = true,
+			CompareType comparisonType = CompareType.None)
 		{
 			_enabled = enabled;
 			_watch = watch;
@@ -67,7 +74,8 @@ public Cheat(Cheat cheat)
 
 		public long? Address => _watch.Address;
 
-		public int? Value => IsSeparator ? null : _val;
+		public long? Value
+			=> IsSeparator ? null : _val;
 
 		public bool? BigEndian => IsSeparator ? null : _watch.BigEndian;
 
@@ -232,7 +240,7 @@ public bool Contains(long addr)
 			}
 		}
 
-		public void PokeValue(int val)
+		public void PokeValue(long val)
 		{
 			if (!IsSeparator)
 			{
@@ -245,7 +253,7 @@ public void Increment()
 			if (!IsSeparator)
 			{
 				_val++;
-				if (_val > _watch.MaxValue)
+				if (unchecked((ulong) _val) > _watch.MaxValue)
 				{
 					_val = 0;
 				}
@@ -260,10 +268,7 @@ public void Decrement()
 			if (!IsSeparator)
 			{
 				_val--;
-				if ((uint)_val > _watch.MaxValue)
-				{
-					_val = (int)_watch.MaxValue;
-				}
+				if (unchecked((ulong) _val) > _watch.MaxValue) _val = unchecked((long) _watch.MaxValue);
 
 				Pulse();
 				Changes();

src/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatch.cs

@@ -9,9 +9,10 @@ namespace BizHawk.Client.Common.RamSearchEngine
 	internal interface IMiniWatch
 	{
 		long Address { get; }
-		uint Previous { get; }
 
-		uint GetValue(MemoryDomain domain, bool bigEndian);
+		ulong Previous { get; }
+
+		ulong GetValue(MemoryDomain domain, bool bigEndian);
 
 		void SetPreviousToCurrent(MemoryDomain domain, bool bigEndian);
 		bool IsValid(MemoryDomain domain);
@@ -21,18 +22,18 @@ internal abstract class MiniWatchBase : IMiniWatch
 	{
 		public long Address { get; }
 
-		public uint Previous { get; protected set; }
+		public ulong Previous { get; protected set; }
 
-		protected MiniWatchBase(long addr, uint prevValue)
+		protected MiniWatchBase(long addr, ulong prevValue)
 		{
 			Address = addr;
 			Previous = prevValue;
 		}
 
-		public uint GetValue(MemoryDomain domain, bool bigEndian)
+		public ulong GetValue(MemoryDomain domain, bool bigEndian)
 			=> IsValid(domain) ? GetValueInner(Address, domain, bigEndian: bigEndian) : default;
 
-		protected abstract uint GetValueInner(long address, MemoryDomain domain, bool bigEndian);
+		protected abstract ulong GetValueInner(long address, MemoryDomain domain, bool bigEndian);
 
 		public bool IsValid(MemoryDomain domain)
 			=> IsValid(Address, domain);
@@ -48,7 +49,7 @@ internal class MiniByteWatch : MiniWatchBase
 		public MiniByteWatch(MemoryDomain domain, long addr)
 			: base(addr: addr, prevValue: domain.PeekByte(addr)) {}
 
-		protected override uint GetValueInner(long address, MemoryDomain domain, bool bigEndian)
+		protected override ulong GetValueInner(long address, MemoryDomain domain, bool bigEndian)
 			=> domain.PeekByte(address);
 
 		protected override bool IsValid(long address, MemoryDomain domain)
@@ -60,7 +61,7 @@ internal class MiniWordWatch : MiniWatchBase
 		public MiniWordWatch(MemoryDomain domain, long addr, bool bigEndian)
 			: base(addr: addr, prevValue: domain.PeekUshort(addr, bigEndian: bigEndian)) {}
 
-		protected override uint GetValueInner(long address, MemoryDomain domain, bool bigEndian)
+		protected override ulong GetValueInner(long address, MemoryDomain domain, bool bigEndian)
 			=> domain.PeekUshort(address, bigEndian);
 
 		protected override bool IsValid(long address, MemoryDomain domain)
@@ -72,7 +73,7 @@ internal class MiniDWordWatch : MiniWatchBase
 		public MiniDWordWatch(MemoryDomain domain, long addr, bool bigEndian)
 			: base(addr: addr, prevValue: domain.PeekUint(addr, bigEndian: bigEndian)) {}
 
-		protected override uint GetValueInner(long address, MemoryDomain domain, bool bigEndian)
+		protected override ulong GetValueInner(long address, MemoryDomain domain, bool bigEndian)
 			=> domain.PeekUint(address, bigEndian);
 
 		protected override bool IsValid(long address, MemoryDomain domain)

src/BizHawk.Client.Common/tools/RamSearchEngine/IMiniWatchDetails.cs

@@ -9,7 +9,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
 	/// </summary>
 	internal interface IMiniWatchDetails : IMiniWatch
 	{
-		uint Current { get; }
+		ulong Current { get; }
+
 		int ChangeCount { get; }
 		void ClearChangeCount();
 		void Update(PreviousType type, MemoryDomain domain, bool bigEndian);
@@ -25,7 +26,7 @@ public MiniByteWatchDetailed(MemoryDomain domain, long addr) : base(domain, addr
 		public override void SetPreviousToCurrent(MemoryDomain domain, bool bigEndian)
 			=> Previous = _current;
 
-		public uint Current => _current;
+		public ulong Current => _current;
 
 		public int ChangeCount { get; private set; }
 
@@ -62,7 +63,7 @@ public MiniWordWatchDetailed(MemoryDomain domain, long addr, bool bigEndian) : b
 		public override void SetPreviousToCurrent(MemoryDomain domain, bool bigEndian)
 			=> Previous = _current;
 
-		public uint Current => _current;
+		public ulong Current => _current;
 
 		public int ChangeCount { get; private set; }
 
@@ -94,18 +95,18 @@ internal sealed class MiniDWordWatchDetailed : MiniDWordWatch, IMiniWatchDetails
 		private uint _current;
 
 		public MiniDWordWatchDetailed(MemoryDomain domain, long addr, bool bigEndian) : base(domain, addr, bigEndian)
-			=> Previous = _current = GetValueInner(Address, domain, bigEndian: bigEndian);
+			=> Previous = _current = unchecked((uint) GetValueInner(Address, domain, bigEndian: bigEndian));
 
 		public override void SetPreviousToCurrent(MemoryDomain domain, bool bigEndian)
 			=> Previous = _current;
 
-		public uint Current => _current;
+		public ulong Current => _current;
 
 		public int ChangeCount { get; private set; }
 
 		public void Update(PreviousType type, MemoryDomain domain, bool bigEndian)
 		{
-			var newValue = GetValueInner(Address, domain, bigEndian: bigEndian);
+			var newValue = unchecked((uint) GetValueInner(Address, domain, bigEndian: bigEndian));
 			if (newValue != _current)
 			{
 				ChangeCount++;