From 97beecc4c9d4f43bf9c272fa1017a0ec0804378a Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 30 Mar 2020 17:18:16 -0400
Subject: [PATCH] fix more mixups in bulk reading (fixes #1903)

---
 .../Base Implementations/MemoryDomain.cs         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs
index 873da2167a..f9a5785f4e 100644
--- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs	
@@ -129,14 +129,16 @@ namespace BizHawk.Emulation.Common
 				throw new ArgumentException();
 			}
 
-			if (addresses.EndInclusive - addresses.Start != values.Length)
+			long start = addresses.Start;
+			long nAddresses = addresses.EndInclusive - addresses.Start + 1;
+			if (nAddresses != values.Length)
 			{
 				throw new InvalidOperationException("Invalid length of values array");
 			}
 
-			for (var i = addresses.Start; i < addresses.EndInclusive; i++)
+			for (var i = 0; i<nAddresses; i++)
 			{
-				values[i] = PeekUshort(i, bigEndian);
+				values[i] = PeekUshort(start + i*2, bigEndian);
 			}
 		}
 
@@ -147,14 +149,16 @@ namespace BizHawk.Emulation.Common
 				throw new ArgumentException();
 			}
 
-			if (addresses.EndInclusive - addresses.Start + 1 != values.Length)
+			long start = addresses.Start;
+			long nAddresses = addresses.EndInclusive - addresses.Start + 1;
+			if (nAddresses != values.Length)
 			{
 				throw new InvalidOperationException("Invalid length of values array");
 			}
 
-			for (var i = addresses.Start; i <= addresses.EndInclusive; i++)
+			for (var i = 0; i<nAddresses; i++)
 			{
-				values[i - addresses.Start] = PeekUint(i, bigEndian);
+				values[i] = PeekUint(start + i*4, bigEndian);
 			}
 		}
 	}