Merge pull request #4039 from Sonicadvance1/move_customir_entry

FEXCore: Move `CustomIRResult` to internal header
FEX-Emu · Sep 6, 2024 · 29f0e9b · 29f0e9b
2 parents b75efc4 + 48fd827
commit 29f0e9b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h
@@ -75,6 +75,23 @@ struct ExitFunctionLinkData {
   uint64_t GuestRIP;
 };
 
+struct CustomIRResult {
+  void* Creator;
+  void* Data;
+
+  explicit operator bool() const noexcept {
+    return !lock;
+  }
+
+  CustomIRResult(std::unique_lock<std::shared_mutex>&& lock, void* Creator, void* Data)
+    : Creator(Creator)
+    , Data(Data)
+    , lock(std::move(lock)) {}
+
+private:
+  std::unique_lock<std::shared_mutex> lock;
+};
+
 using BlockDelinkerFunc = void (*)(FEXCore::Core::CpuStateFrame* Frame, FEXCore::Context::ExitFunctionLinkData* Record);
 constexpr uint32_t TSC_SCALE_MAXIMUM = 1'000'000'000; ///< 1Ghz
 

diff --git a/FEXCore/include/FEXCore/Core/Context.h b/FEXCore/include/FEXCore/Core/Context.h
@@ -14,8 +14,6 @@
 
 #include <istream>
 #include <ostream>
-#include <mutex>
-#include <shared_mutex>
 #include <span>
 
 namespace FEXCore {
@@ -59,23 +57,6 @@ enum OperatingMode {
   MODE_64BIT,
 };
 
-struct CustomIRResult {
-  void* Creator;
-  void* Data;
-
-  explicit operator bool() const noexcept {
-    return !lock;
-  }
-
-  CustomIRResult(std::unique_lock<std::shared_mutex>&& lock, void* Creator, void* Data)
-    : Creator(Creator)
-    , Data(Data)
-    , lock(std::move(lock)) {}
-
-private:
-  std::unique_lock<std::shared_mutex> lock;
-};
-
 /**
  * @brief IR Serialization handler class.
  */