From c3389f14e1d72a99b8e91f2446897f06e4d9e369 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 30 Mar 2020 05:21:07 -0400 Subject: [PATCH] fix bulkread mistakes (see #1903) --- BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 2 +- .../Base Implementations/MemoryDomain.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index a3ced3bc67..19727f21e4 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -604,7 +604,7 @@ namespace BizHawk.Client.EmuHawk } Dictionary dict = new Dictionary(); - var range = new MutableRange(addresses[0], addresses[0] + addresses.Count); + var range = new MutableRange(addresses[0], addresses[0] + addresses.Count - 1); switch (DataSize) { diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs index 97c4cde7be..873da2167a 100644 --- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs @@ -111,7 +111,7 @@ namespace BizHawk.Emulation.Common throw new ArgumentException(); } - if (addresses.EndInclusive - addresses.Start != values.Length) + if (addresses.EndInclusive - addresses.Start + 1 != values.Length) { throw new InvalidOperationException("Invalid length of values array"); } @@ -147,14 +147,14 @@ namespace BizHawk.Emulation.Common throw new ArgumentException(); } - if (addresses.EndInclusive - addresses.Start != values.Length) + if (addresses.EndInclusive - addresses.Start + 1 != values.Length) { throw new InvalidOperationException("Invalid length of values array"); } - for (var i = addresses.Start; i < addresses.EndInclusive; i++) + for (var i = addresses.Start; i <= addresses.EndInclusive; i++) { - values[i] = PeekUint(i, bigEndian); + values[i - addresses.Start] = PeekUint(i, bigEndian); } } }