ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mapheap: fix some bugs that weren't exercised (nothing uses mremap right now)

This commit is contained in:
nattthebear 2017-06-14 19:51:43 -04:00
parent 69ec6b2a73
commit d7809d0f52
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Emulation.Cores/Waterbox/MapHeap.cs
View File

@ -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();

4
BizHawk.Emulation.Cores/Waterbox/MemoryBlock.cs
View File

@ -379,11 +379,11 @@ namespace BizHawk.Emulation.Cores.Waterbox
/// <summary>
/// the initial data to XOR against for both reading and writing
/// </summary>
private byte[] _initial;
private readonly byte[] _initial;
/// <summary>
/// offset into the XOR data that this stream is representing
/// </summary>
private int _offset;
private readonly int _offset;
public override int Read(byte[] buffer, int offset, int count)
{