catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #668 from squidbus/fix-patch-stack 

Initialize patch stack before thread TLS.
This commit is contained in:
georgemoralis 2024-08-30 14:58:34 +03:00 committed by GitHub
parent 0f87d1e3d4 6e552aac6a
commit f1fe6b9f96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/libraries/kernel/thread_management.cpp
View File

@ -994,8 +994,8 @@ static void* run_thread(void* arg) {
auto* thread = static_cast<ScePthread>(arg); auto* thread = static_cast<ScePthread>(arg);
Common::SetCurrentThreadName(thread->name.c_str()); Common::SetCurrentThreadName(thread->name.c_str());
auto* linker = Common::Singleton<Core::Linker>::Instance(); auto* linker = Common::Singleton<Core::Linker>::Instance();
linker->InitTlsForThread(false);
Core::InitializeThreadPatchStack(); Core::InitializeThreadPatchStack();
linker->InitTlsForThread(false);
void* ret = nullptr; void* ret = nullptr;
g_pthread_self = thread; g_pthread_self = thread;
pthread_cleanup_push(cleanup_thread, thread); pthread_cleanup_push(cleanup_thread, thread);

2
src/core/linker.cpp
View File

@ -86,8 +86,8 @@ void Linker::Execute() {
// Init primary thread. // Init primary thread.
Common::SetCurrentThreadName("GAME_MainThread"); Common::SetCurrentThreadName("GAME_MainThread");
Libraries::Kernel::pthreadInitSelfMainThread(); Libraries::Kernel::pthreadInitSelfMainThread();
InitTlsForThread(true);
InitializeThreadPatchStack(); InitializeThreadPatchStack();
InitTlsForThread(true);
// Start shared library modules // Start shared library modules
for (auto& m : m_modules) { for (auto& m : m_modules) {