General: Move ARM_Interface into Threads.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index f08745226..599972211 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -1533,7 +1533,9 @@ static void SleepThread(Core::System& system, s64 nanoseconds) {
     }
 
     if (is_redundant && !system.Kernel().IsMulticore()) {
+        system.Kernel().ExitSVCProfile();
         system.GetCpuManager().PreemptSingleCore();
+        system.Kernel().EnterSVCProfile();
     }
 }
 
@@ -2457,9 +2459,6 @@ void Call(Core::System& system, u32 immediate) {
     auto& kernel = system.Kernel();
     kernel.EnterSVCProfile();
 
-    auto* thread = system.CurrentScheduler().GetCurrentThread();
-    thread->SetContinuousOnSVC(true);
-
     const FunctionDef* info = system.CurrentProcess()->Is64BitProcess() ? GetSVCInfo64(immediate)
                                                                         : GetSVCInfo32(immediate);
     if (info) {
@@ -2473,12 +2472,6 @@ void Call(Core::System& system, u32 immediate) {
     }
 
     kernel.ExitSVCProfile();
-
-    if (!thread->IsContinuousOnSVC()) {
-        auto* host_context = thread->GetHostContext().get();
-        host_context->Rewind();
-    }
-
     system.EnterDynarmicProfile();
 }