From f00320b90c9a1381aea68b20a1892c5e7d8c21cf Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 2 May 2020 20:54:38 -0400 Subject: [PATCH] support skip option on bsnes --- .../Consoles/Nintendo/SNES/LibsnesApi.cs | 6 ++++-- .../Consoles/Nintendo/SNES/LibsnesCore.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs index 1670b555c4..45a72b5d1d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs @@ -59,7 +59,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES _readonlyFiles.Add(name); } - public LibsnesApi(string dllPath) + public LibsnesApi(string dllPath, CoreComm comm) { _exe = new PeRunner(new PeRunnerOptions { @@ -69,7 +69,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES InvisibleHeapSizeKB = 8 * 1024, MmapHeapSizeKB = 32 * 1024, // TODO: see if we can safely make libco stacks smaller PlainHeapSizeKB = 2 * 1024, // TODO: wasn't there more in here? - SealedHeapSizeKB = 128 * 1024 + SealedHeapSizeKB = 128 * 1024, + SkipCoreConsistencyCheck = comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck), + SkipMemoryConsistencyCheck = comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck), }); using (_exe.EnterExit()) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 7c47b0783e..51b8fbdfca 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -61,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES _syncSettings = (SnesSyncSettings)syncSettings ?? new SnesSyncSettings(); // TODO: pass profile here - Api = new LibsnesApi(CoreComm.CoreFileProvider.DllPath()) + Api = new LibsnesApi(CoreComm.CoreFileProvider.DllPath(), CoreComm) { ReadHook = ReadHook, ExecHook = ExecHook,