From 59cbeb3e1ba461f3b138406081e2e12406f7445e Mon Sep 17 00:00:00 2001
From: merry <git@mary.rs>
Date: Sun, 10 Apr 2022 15:46:29 +0100
Subject: dynarmic: Fix race when switching page tables

---
 src/core/arm/dynarmic/arm_dynarmic_32.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/core/arm/dynarmic/arm_dynarmic_32.h')

diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h
index 3f68a4ff1..684937353 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <atomic>
 #include <memory>
 #include <unordered_map>
 
@@ -80,7 +81,11 @@ private:
     std::shared_ptr<DynarmicCP15> cp15;
     std::size_t core_index;
     DynarmicExclusiveMonitor& exclusive_monitor;
-    std::shared_ptr<Dynarmic::A32::Jit> jit;
+
+    std::shared_ptr<Dynarmic::A32::Jit> null_jit;
+
+    // A raw pointer here is fine; we never delete Jit instances.
+    std::atomic<Dynarmic::A32::Jit*> jit;
 
     // SVC callback
     u32 svc_swi{};
-- 
cgit v1.2.3