From d7809d0f5228f6bcd5dfa377d0a11787c7e94fd9 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Wed, 14 Jun 2017 19:51:43 -0400 Subject: [PATCH] mapheap: fix some bugs that weren't exercised (nothing uses mremap right now) --- BizHawk.Emulation.Cores/Waterbox/MapHeap.cs | 10 +++++++--- BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs b/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs index 8e4dcae4ae..81a90396d5 100644 --- a/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs +++ b/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs @@ -135,10 +135,10 @@ namespace BizHawk.Emulation.Cores.Waterbox private void RefreshProtections(int startPage, int pageCount) { - int ps = 0; - for (int i = startPage; i < pageCount; i++) + int ps = startPage; + for (int i = startPage; i < startPage + pageCount; i++) { - if (i == pageCount - 1 || _pages[i] != _pages[i + 1]) + if (i == startPage + pageCount - 1 || _pages[i] != _pages[i + 1]) { var p = _pages[i]; ulong zstart = GetStartAddr(ps); @@ -305,6 +305,7 @@ namespace BizHawk.Emulation.Cores.Waterbox if (br.BaseStream.Read(_pagesAsBytes, 0, _pagesAsBytes.Length) != _pagesAsBytes.Length) throw new InvalidOperationException("Unexpected error reading!"); + Used = 0; Memory.Protect(Memory.Start, Memory.Size, MemoryBlock.Protection.RW); var dsts = Memory.GetXorStream(Memory.Start, Memory.Size, true); for (int i = 0, addr = 0; i < _pages.Length; i++, addr += WaterboxUtils.PageSize) @@ -313,8 +314,11 @@ namespace BizHawk.Emulation.Cores.Waterbox { dsts.Seek(addr, SeekOrigin.Begin); WaterboxUtils.CopySome(br.BaseStream, dsts, WaterboxUtils.PageSize); + Used += (uint)WaterboxUtils.PageSize; } } + if (Used != used) + throw new InvalidOperationException("Internal savestate error"); if (br.ReadUInt64() != MAGIC) throw new InvalidOperationException("Savestate internal error"); RefreshAllProtections(); diff --git a/BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs b/BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs index df8a8157fa..b3917b2f18 100644 --- a/BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs +++ b/BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs @@ -379,11 +379,11 @@ namespace BizHawk.Emulation.Cores.Waterbox /// /// the initial data to XOR against for both reading and writing /// - private byte[] _initial; + private readonly byte[] _initial; /// /// offset into the XOR data that this stream is representing /// - private int _offset; + private readonly int _offset; public override int Read(byte[] buffer, int offset, int count) {