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_64.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.h b/src/core/arm/dynarmic/arm_dynarmic_64.h
index 58bc7fbec..86018f196 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <atomic>
 #include <memory>
 #include <unordered_map>
 
@@ -74,7 +75,10 @@ private:
     std::size_t core_index;
     DynarmicExclusiveMonitor& exclusive_monitor;
 
-    std::shared_ptr<Dynarmic::A64::Jit> jit;
+    std::shared_ptr<Dynarmic::A64::Jit> null_jit;
+
+    // A raw pointer here is fine; we never delete Jit instances.
+    std::atomic<Dynarmic::A64::Jit*> jit;
 
     // SVC callback
     u32 svc_swi{};
-- 
cgit v1.2.3