From 16ee704332c307fb9e249112502c2b8d89593cf6 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 8 Jan 2023 07:54:20 +1000
Subject: [PATCH] Deduplicate `MemoryDomainDelegateSysBusNES`

---
 .../Base Implementations/MemoryDomainImpls.cs | 81 +------------------
 1 file changed, 4 insertions(+), 77 deletions(-)

diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs
index 41534954e6..6393101dd3 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs	
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs	
@@ -397,74 +397,9 @@ namespace BizHawk.Emulation.Common
 			=> _monitor.Exit();
 	}
 
-	public class MemoryDomainDelegateSysBusNES : MemoryDomain
+	public class MemoryDomainDelegateSysBusNES : MemoryDomainDelegate
 	{
-		private Action<long, byte> _poke;
-
-		// TODO: use an array of Ranges
-		private Action<Range<long>, byte[]> _bulkPeekByte { get; set; }
-		private Action<Range<long>, bool, ushort[]> _bulkPeekUshort { get; set; }
-		private Action<Range<long>, bool, uint[]> _bulkPeekUint { get; set; }
-
-		public Func<long, byte> Peek { get; set; }
-
-		public Action<long, byte> Poke
-		{
-			get => _poke;
-			set
-			{
-				_poke = value;
-				Writable = value != null;
-			}
-		}
-
-		private Action<int, byte, int, int> sendcheattocore { get; set; }
-
-		public override byte PeekByte(long addr)
-		{
-			return Peek(addr);
-		}
-
-		public override void PokeByte(long addr, byte val)
-		{
-			_poke?.Invoke(addr, val);
-		}
-
-		public override void BulkPeekByte(Range<long> addresses, byte[] values)
-		{
-			if (_bulkPeekByte != null)
-			{
-				_bulkPeekByte.Invoke(addresses, values);
-			}
-			else
-			{
-				base.BulkPeekByte(addresses, values);
-			}
-		}
-
-		public override void BulkPeekUshort(Range<long> addresses, bool bigEndian, ushort[] values)
-		{
-			if (_bulkPeekUshort != null)
-			{
-				_bulkPeekUshort.Invoke(addresses, bigEndian, values);
-			}
-			else
-			{
-				base.BulkPeekUshort(addresses, bigEndian, values);
-			}
-		}
-
-		public override void BulkPeekUint(Range<long> addresses, bool bigEndian, uint[] values)
-		{
-			if (_bulkPeekUint != null)
-			{
-				_bulkPeekUint.Invoke(addresses, bigEndian, values);
-			}
-			else
-			{
-				base.BulkPeekUint(addresses, bigEndian, values);
-			}
-		}
+		private readonly Action<int, byte, int, int> sendcheattocore;
 
 		public override void SendCheatToCore(int addr, byte value, int compare, int comparetype)
 		{
@@ -486,15 +421,7 @@ namespace BizHawk.Emulation.Common
 			Action<long, byte> poke,
 			int wordSize,
 			Action<int, byte, int, int> nescheatpoke = null)
-		{
-			Name = name;
-			EndianType = endian;
-			Size = size;
-			Peek = peek;
-			_poke = poke;
-			Writable = poke != null;
-			WordSize = wordSize;
-			sendcheattocore = nescheatpoke;
-		}
+				: base(name, size, endian, peek, poke, wordSize)
+					=> sendcheattocore = nescheatpoke;
 	}
 }