VERY experimental Nintendo Switch 2 emulator
C++
dynarmic: Abort watchpoints ASAP
Merryf719a0a078e3
diff --git a/externals/dynarmic b/externals/dynarmicindex 9ebf6a8384..1f0a43753e 160000--- a/externals/dynarmic+++ b/externals/dynarmic@@ -1 +1 @@-Subproject commit 9ebf6a8384836322ce58beb7ca10f5d4c66e9211+Subproject commit 1f0a43753e51e4855ee6c0936d30807f373245ccdiff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cppindex cef79b245a..e72b250bec 100644--- a/src/core/arm/arm_interface.cpp+++ b/src/core/arm/arm_interface.cpp@@ -147,7 +147,6 @@ void ARM_Interface::Run() {// Notify the debugger and go to sleep if a watchpoint was hit.if (Has(hr, watchpoint)) {- RewindBreakpointInstruction();if (system.DebuggerEnabled()) {system.GetDebugger().NotifyThreadWatchpoint(current_thread, *HaltedWatchpoint());}diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.hindex 8a066ed914..c092db9ff3 100644--- a/src/core/arm/arm_interface.h+++ b/src/core/arm/arm_interface.h@@ -203,7 +203,7 @@ public:static constexpr Dynarmic::HaltReason break_loop = Dynarmic::HaltReason::UserDefined2;static constexpr Dynarmic::HaltReason svc_call = Dynarmic::HaltReason::UserDefined3;static constexpr Dynarmic::HaltReason breakpoint = Dynarmic::HaltReason::UserDefined4;- static constexpr Dynarmic::HaltReason watchpoint = Dynarmic::HaltReason::UserDefined5;+ static constexpr Dynarmic::HaltReason watchpoint = Dynarmic::HaltReason::MemoryAbort;static constexpr Dynarmic::HaltReason no_execute = Dynarmic::HaltReason::UserDefined6;protected:diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex 1be5fe1c17..d566e0eea7 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -155,7 +155,7 @@ public:const auto match{parent.MatchingWatchpoint(addr, size, type)};if (match) {parent.halted_watchpoint = match;- ReturnException(parent.jit.load()->Regs()[15], ARM_Interface::watchpoint);+ parent.jit.load()->HaltExecution(ARM_Interface::watchpoint);return false;}@@ -204,7 +204,6 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*// Code cache sizeconfig.code_cache_size = 512_MiB;- config.far_code_offset = 400_MiB;// Allow memory fault handling to workif (system.DebuggerEnabled()) {@@ -215,7 +214,6 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable*if (!page_table) {// Don't waste too much memory on null_jitconfig.code_cache_size = 8_MiB;- config.far_code_offset = 4_MiB;}// Safe optimizationsdiff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cppindex c437f24b8d..8a38ca888f 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -198,7 +198,7 @@ public:const auto match{parent.MatchingWatchpoint(addr, size, type)};if (match) {parent.halted_watchpoint = match;- ReturnException(parent.jit.load()->GetPC(), ARM_Interface::watchpoint);+ parent.jit.load()->HaltExecution(ARM_Interface::watchpoint);return false;}@@ -264,7 +264,6 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*// Code cache sizeconfig.code_cache_size = 512_MiB;- config.far_code_offset = 400_MiB;// Allow memory fault handling to workif (system.DebuggerEnabled()) {@@ -275,7 +274,6 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable*if (!page_table) {// Don't waste too much memory on null_jitconfig.code_cache_size = 8_MiB;- config.far_code_offset = 4_MiB;}// Safe optimizations