ThreadManager: Store off the syscallHandler

FEX-Emu · Dec 10, 2024 · 121af75 · 121af75
1 parent 6007e46
commit 121af75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp
@@ -744,7 +744,7 @@ void SyscallHandler::DefaultProgramBreak(uint64_t Base, uint64_t Size) {
 }
 
 SyscallHandler::SyscallHandler(FEXCore::Context::Context* _CTX, FEX::HLE::SignalDelegator* _SignalDelegation, FEX::HLE::ThunkHandler* ThunkHandler)
-  : TM {_CTX, _SignalDelegation}
+  : TM {_CTX, this, _SignalDelegation}
   , SeccompEmulator {this, _SignalDelegation}
   , FM {_CTX}
   , CTX {_CTX}

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.h
@@ -98,8 +98,9 @@ struct ThreadStateObject : public FEXCore::Allocator::FEXAllocOperators {
 class ThreadManager final {
 public:
 
-  ThreadManager(FEXCore::Context::Context* CTX, FEX::HLE::SignalDelegator* SignalDelegation)
+  ThreadManager(FEXCore::Context::Context* CTX, FEX::HLE::SyscallHandler* SyscallHandler, FEX::HLE::SignalDelegator* SignalDelegation)
     : CTX {CTX}
+    , SyscallHandler {SyscallHandler}
     , SignalDelegation {SignalDelegation} {}
 
   ~ThreadManager();
@@ -174,6 +175,7 @@ class ThreadManager final {
 
 private:
   FEXCore::Context::Context* CTX;
+  FEX::HLE::SyscallHandler* SyscallHandler;
   FEX::HLE::SignalDelegator* SignalDelegation;
 
   FEXCore::ForkableUniqueMutex ThreadCreationMutex;