From 1e6a745f1957b8b21fbb51e62cbcf2948ccd25ac Mon Sep 17 00:00:00 2001 From: byuu <2107894+byuu@users.noreply.github.com> Date: Mon, 16 Dec 2019 01:59:39 +0900 Subject: [PATCH] v113.1 Emergency hotfix for an issue affecting manually created save states. Still need to determine root cause, but for now, reverting the code. --- bsnes/emulator/emulator.hpp | 2 +- bsnes/sfc/smp/timing.cpp | 3 ++- bsnes/target-bsnes/presentation/presentation.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bsnes/emulator/emulator.hpp b/bsnes/emulator/emulator.hpp index 5e1300bd..3aae67f6 100644 --- a/bsnes/emulator/emulator.hpp +++ b/bsnes/emulator/emulator.hpp @@ -29,7 +29,7 @@ using namespace nall; namespace Emulator { static const string Name = "bsnes"; - static const string Version = "113"; + static const string Version = "113.1"; static const string Author = "byuu"; static const string License = "GPLv3"; static const string Website = "https://byuu.org"; diff --git a/bsnes/sfc/smp/timing.cpp b/bsnes/sfc/smp/timing.cpp index 1140d76e..4f70d561 100644 --- a/bsnes/sfc/smp/timing.cpp +++ b/bsnes/sfc/smp/timing.cpp @@ -35,8 +35,9 @@ auto SMP::waitIdle(maybe addr, bool half) -> void { auto SMP::step(uint clocks) -> void { clock += clocks * (uint64_t)cpu.frequency; dsp.clock -= clocks; - synchronizeCPU(); synchronizeDSP(); + //forcefully sync SMP to CPU in case chips are not communicating + if(clock > 768 * 24 * (int64_t)24'000'000) synchronizeCPU(); } auto SMP::stepIdle(uint clocks) -> void { diff --git a/bsnes/target-bsnes/presentation/presentation.cpp b/bsnes/target-bsnes/presentation/presentation.cpp index 677b5466..89ae5dce 100644 --- a/bsnes/target-bsnes/presentation/presentation.cpp +++ b/bsnes/target-bsnes/presentation/presentation.cpp @@ -179,7 +179,7 @@ auto Presentation::create() -> void { helpMenu.setText(tr("Help")); documentation.setIcon(Icon::Application::Browser).setText({tr("Documentation"), " ..."}).onActivate([&] { - invoke("https://doc.byuu.org/bsnes"); + invoke("https://byuu.org/doc/bsnes"); }); aboutSameBoy.setIcon(Icon::Prompt::Question).setText({tr("About SameBoy"), " ..."}).onActivate([&] { AboutDialog()