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

support skip option in waterbox

This commit is contained in:
zeromus 2020-05-02 20:54:27 -04:00
parent 6fc522072b
commit 4cd6e6fe8a
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs
View File

@ -56,6 +56,16 @@ namespace BizHawk.Emulation.Cores.Waterbox
/// start address in memory
/// </summary>
public ulong StartAddress { get; set; } = PeRunner.CanonicalStart;
/// <summary>
/// Skips the "core consistency check"
/// </summary>
public bool SkipCoreConsistencyCheck { get; set; } = false;
/// <summary>
/// Skips the "memory consistency check"
/// </summary>
public bool SkipMemoryConsistencyCheck { get; set; } = false;
}
public class PeRunner : Swappable, IImportResolver, IBinaryStateable
@ -1014,7 +1024,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
data = File.ReadAllBytes(path);
}
var module = new PeWrapper(moduleName, data, _nextStart);
var module = new PeWrapper(moduleName, data, _nextStart, opt.SkipCoreConsistencyCheck, opt.SkipMemoryConsistencyCheck);
ComputeNextStart(module.Size);
AddMemoryBlock(module.Memory, moduleName);
_savestateComponents.Add(module);

32
src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs
View File

@ -50,6 +50,9 @@ namespace BizHawk.Emulation.Cores.Waterbox
private readonly PeFile _pe;
private readonly byte[] _fileHash;
private bool _skipCoreConsistencyCheck;
private bool _skipMemoryConsistencyCheck;
public ulong Size { get; }
public ulong Start { get; }
@ -116,12 +119,14 @@ namespace BizHawk.Emulation.Cores.Waterbox
}
}
public PeWrapper(string moduleName, byte[] fileData, ulong destAddress)
public PeWrapper(string moduleName, byte[] fileData, ulong destAddress, bool skipCoreConsistencyCheck, bool skipMemoryConsistencyCheck)
{
ModuleName = moduleName;
_pe = new PeFile(fileData);
Size = _pe.ImageNtHeaders.OptionalHeader.SizeOfImage;
Start = destAddress;
this._skipCoreConsistencyCheck = skipCoreConsistencyCheck;
this._skipMemoryConsistencyCheck = skipMemoryConsistencyCheck;
if (Size < _pe.ImageSectionHeaders.Max(s => (ulong)s.VirtualSize + s.VirtualAddress))
{
@ -409,13 +414,24 @@ namespace BizHawk.Emulation.Cores.Waterbox
if (br.ReadUInt64() != MAGIC)
// file id is missing. probable cause: garbage savestate
throw new InvalidOperationException("Savestate corrupted!");
if (!br.ReadBytes(_fileHash.Length).SequenceEqual(_fileHash))
// the .dll file that is loaded now has a different hash than the .dll that created the savestate
throw new InvalidOperationException("Core consistency check failed. Is this a savestate from a different version?");
if (!br.ReadBytes(Memory.XorHash.Length).SequenceEqual(Memory.XorHash))
// the post-Seal memory state is different. probable cause: different rom or different version of rom,
// different syncsettings
throw new InvalidOperationException("Memory consistency check failed. Is this savestate from different SyncSettings?");
var fileHash = br.ReadBytes(_fileHash.Length);
if (!_skipCoreConsistencyCheck)
{
if (!fileHash.SequenceEqual(_fileHash))
// the .dll file that is loaded now has a different hash than the .dll that created the savestate
throw new InvalidOperationException("Core consistency check failed. Is this a savestate from a different version?");
}
var xorHash = br.ReadBytes(Memory.XorHash.Length);
if (!_skipMemoryConsistencyCheck)
{
if (!xorHash.SequenceEqual(Memory.XorHash))
// the post-Seal memory state is different. probable cause: different rom or different version of rom,
// different syncsettings
throw new InvalidOperationException("Memory consistency check failed. Is this savestate from different SyncSettings?");
}
if (br.ReadUInt64() != Start)
// dll loaded somewhere else. probable cause: internal logic error.
// unlikely to get this far if the previous checks pssed