From 74ca4905c20fdb6697613abec9d3fd68345eed4f Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Mon, 25 Apr 2022 00:49:21 +0200
Subject: [PATCH] early-access version 2699

---
 README.md                                 | 2 +-
 src/core/arm/arm_interface.h              | 3 ---
 src/core/arm/dynarmic/arm_dynarmic_32.cpp | 4 ----
 src/core/arm/dynarmic/arm_dynarmic_32.h   | 1 -
 src/core/arm/dynarmic/arm_dynarmic_64.cpp | 4 ----
 src/core/arm/dynarmic/arm_dynarmic_64.h   | 1 -
 src/core/core.cpp                         | 4 ----
 src/core/core.h                           | 3 ---
 8 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/README.md b/README.md
index d7a2c1492..44135628d 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2698.
+This is the source code for early-access 2699.
 
 ## Legal Notice
 
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index bcec4b3b8..8ce973a77 100755
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -174,9 +174,6 @@ public:
     /// Clears the exclusive monitor's state.
     virtual void ClearExclusiveState() = 0;
 
-    /// Prepare core for thread reschedule (if needed to correctly handle state)
-    virtual void PrepareReschedule() = 0;
-
     /// Signal an interrupt and ask the core to halt as soon as possible.
     virtual void SignalInterrupt() = 0;
 
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index e95ace5f0..8b5bfeead 100755
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -334,10 +334,6 @@ void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) {
     jit.load()->LoadContext(context);
 }
 
-void ARM_Dynarmic_32::PrepareReschedule() {
-    jit.load()->HaltExecution(break_loop);
-}
-
 void ARM_Dynarmic_32::SignalInterrupt() {
     jit.load()->HaltExecution(break_loop);
 }
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h
index a25c9d277..abfe76644 100755
--- a/src/core/arm/dynarmic/arm_dynarmic_32.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.h
@@ -57,7 +57,6 @@ public:
     void LoadContext(const ThreadContext32& ctx) override;
     void LoadContext(const ThreadContext64& ctx) override {}
 
-    void PrepareReschedule() override;
     void SignalInterrupt() override;
     void ClearExclusiveState() override;
 
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index fb0094dfe..ae5a4b76a 100755
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -402,10 +402,6 @@ void ARM_Dynarmic_64::LoadContext(const ThreadContext64& ctx) {
     SetTPIDR_EL0(ctx.tpidr);
 }
 
-void ARM_Dynarmic_64::PrepareReschedule() {
-    jit.load()->HaltExecution(break_loop);
-}
-
 void ARM_Dynarmic_64::SignalInterrupt() {
     jit.load()->HaltExecution(break_loop);
 }
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.h b/src/core/arm/dynarmic/arm_dynarmic_64.h
index 9680c7b99..01a7e4dad 100755
--- a/src/core/arm/dynarmic/arm_dynarmic_64.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.h
@@ -51,7 +51,6 @@ public:
     void LoadContext(const ThreadContext32& ctx) override {}
     void LoadContext(const ThreadContext64& ctx) override;
 
-    void PrepareReschedule() override;
     void SignalInterrupt() override;
     void ClearExclusiveState() override;
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
index b5e2bcae2..8a887904d 100755
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -505,10 +505,6 @@ bool System::IsPoweredOn() const {
     return impl->is_powered_on.load(std::memory_order::relaxed);
 }
 
-void System::PrepareReschedule() {
-    // Deprecated, does nothing, kept for backward compatibility.
-}
-
 void System::PrepareReschedule(const u32 core_index) {
     impl->kernel.PrepareReschedule(core_index);
 }
diff --git a/src/core/core.h b/src/core/core.h
index 52ff90359..4a0c7dc84 100755
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -193,9 +193,6 @@ public:
     /// Gets a reference to the telemetry session for this emulation session.
     [[nodiscard]] const Core::TelemetrySession& TelemetrySession() const;
 
-    /// Prepare the core emulation for a reschedule
-    void PrepareReschedule();
-
     /// Prepare the core emulation for a reschedule
     void PrepareReschedule(u32 core_index);