Merge pull request #3286 from Sonicadvance1/remove_getcpustate

FEXCore: Removes Get/SetCPUState
FEX-Emu · Nov 29, 2023 · 7de66ac · 7de66ac
2 parents 85a1c1f + e555a8f
commit 7de66ac
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 35 deletions.
diff --git a/FEXCore/Source/Interface/Context/Context.cpp b/FEXCore/Source/Interface/Context/Context.cpp
@@ -56,14 +56,6 @@ namespace FEXCore::Context {
     return IsPaused();
   }
 
-  void FEXCore::Context::ContextImpl::GetCPUState(FEXCore::Core::CPUState *State) const {
-    memcpy(State, ParentThread->CurrentFrame, sizeof(FEXCore::Core::CPUState));
-  }
-
-  void FEXCore::Context::ContextImpl::SetCPUState(const FEXCore::Core::CPUState *State) {
-    memcpy(ParentThread->CurrentFrame, State, sizeof(FEXCore::Core::CPUState));
-  }
-
   void FEXCore::Context::ContextImpl::SetCustomCPUBackendFactory(CustomCPUFactoryType Factory) {
     CustomCPUFactory = std::move(Factory);
   }

diff --git a/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h
@@ -95,9 +95,6 @@ namespace FEXCore::Context {
 
       bool IsDone() const override;
 
-      void GetCPUState(FEXCore::Core::CPUState *State) const override;
-      void SetCPUState(const FEXCore::Core::CPUState *State) override;
-
       void SetCustomCPUBackendFactory(CustomCPUFactoryType Factory) override;
 
       HostFeatures GetHostFeatures() const override;

diff --git a/FEXCore/include/FEXCore/Core/Context.h b/FEXCore/include/FEXCore/Core/Context.h
@@ -222,22 +222,6 @@ namespace FEXCore::Context {
        */
       FEX_DEFAULT_VISIBILITY virtual bool IsDone() const = 0;
 
-      /**
-       * @brief Gets a copy the CPUState of the parent thread
-       *
-       * @param CTX The context that we created
-       * @param State The state object to populate
-       */
-      FEX_DEFAULT_VISIBILITY virtual void GetCPUState(FEXCore::Core::CPUState *State) const = 0;
-
-      /**
-       * @brief Copies the CPUState provided to the parent thread
-       *
-       * @param CTX The context that we created
-       * @param State The satate object to copy from
-       */
-      FEX_DEFAULT_VISIBILITY virtual void SetCPUState(const FEXCore::Core::CPUState *State) = 0;
-
       /**
        * @brief Allows the frontend to pass in a custom CPUBackend creation factory
        *

diff --git a/Source/Tools/FEXLoader/IRLoader.cpp b/Source/Tools/FEXLoader/IRLoader.cpp
@@ -179,7 +179,7 @@ int main(int argc, char **argv, char **const envp)
 
   if (Loader.LoadIR(CTX.get()))
   {
-    CTX->InitCore(Loader.DefaultRIP(), Loader.GetStackPointer());
+    auto ParentThread = CTX->InitCore(Loader.DefaultRIP(), Loader.GetStackPointer());
 
     auto ShutdownReason = FEXCore::Context::ExitReason::EXIT_SHUTDOWN;
 
@@ -211,10 +211,7 @@ int main(int argc, char **argv, char **const envp)
     LogMan::Msg::DFmt("Reason we left VM: {}", FEXCore::ToUnderlying(ShutdownReason));
 
     // Just re-use compare state. It also checks against the expected values in config.
-    FEXCore::Core::CPUState State;
-    CTX->GetCPUState(&State);
-
-    const bool Passed = Loader.CompareStates(&State, SupportsAVX);
+    const bool Passed = Loader.CompareStates(&ParentThread->CurrentFrame->State, SupportsAVX);
 
     LogMan::Msg::IFmt("Passed? {}\n", Passed ? "Yes" : "No");
 

diff --git a/Source/Tools/FEXLoader/TestHarnessRunner.cpp b/Source/Tools/FEXLoader/TestHarnessRunner.cpp
@@ -303,9 +303,9 @@ int main(int argc, char **argv, char **const envp) {
     CTX->SetSignalDelegator(SignalDelegation.get());
     CTX->SetSyscallHandler(SyscallHandler.get());
 
-    bool Result1 = CTX->InitCore(Loader.DefaultRIP(), Loader.GetStackPointer());
+    auto ParentThread = CTX->InitCore(Loader.DefaultRIP(), Loader.GetStackPointer());
 
-    if (!Result1) {
+    if (!ParentThread) {
       return 1;
     }
 
@@ -315,7 +315,7 @@ int main(int argc, char **argv, char **const envp) {
     }
 
     // Just re-use compare state. It also checks against the expected values in config.
-    CTX->GetCPUState(&State);
+    memcpy(&State, &ParentThread->CurrentFrame->State, sizeof(State));
 
     SyscallHandler.reset();
   }