From bd36eaf15d88c3875aba7032fe5124fbb150bd5d Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Thu, 27 Feb 2020 11:25:42 -0400
Subject: [PATCH] SVC: Correct races on physical core switching.

---
 src/core/cpu_manager.cpp    | 11 ++++++-----
 src/core/hle/kernel/svc.cpp |  9 ++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index 241971ff38..904aacd97e 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -79,12 +79,13 @@ void CpuManager::RunGuestThread() {
         sched.OnThreadStart();
     }
     while (true) {
-        auto& physical_core = kernel.CurrentPhysicalCore();
-        while (!physical_core.IsInterrupted()) {
-            physical_core.Run();
+        auto* physical_core = &kernel.CurrentPhysicalCore();
+        while (!physical_core->IsInterrupted()) {
+            physical_core->Run();
+            physical_core = &kernel.CurrentPhysicalCore();
         }
-        physical_core.ClearExclusive();
-        auto& scheduler = physical_core.Scheduler();
+        physical_core->ClearExclusive();
+        auto& scheduler = physical_core->Scheduler();
         scheduler.TryDoContextSwitch();
     }
 }
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 279fe5888d..1e6c60d78e 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -2454,11 +2454,6 @@ void Call(Core::System& system, u32 immediate) {
     MICROPROFILE_SCOPE(Kernel_SVC);
 
     auto& physical_core = system.CurrentPhysicalCore();
-    if (physical_core.IsInterrupted()) {
-        auto& sched = physical_core.Scheduler();
-        sched.TryDoContextSwitch();
-    }
-    physical_core.ClearExclusive();
 
     const FunctionDef* info = system.CurrentProcess()->Is64BitProcess() ? GetSVCInfo64(immediate)
                                                                         : GetSVCInfo32(immediate);
@@ -2471,6 +2466,10 @@ void Call(Core::System& system, u32 immediate) {
     } else {
         LOG_CRITICAL(Kernel_SVC, "Unknown SVC function 0x{:X}", immediate);
     }
+    auto& physical_core_2 = system.CurrentPhysicalCore();
+    if (physical_core.CoreIndex() != physical_core_2.CoreIndex()) {
+        physical_core.Stop();
+    }
 }
 
 } // namespace Kernel::Svc