mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 02:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Introduce host call wrapper. (#2913)

Browse Source
This commit is contained in:
squidbus 2025-05-11 20:27:54 -07:00 committed by GitHub
parent 02d3ed4973
commit 678f18ddb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/libraries/kernel/threads.h
View File

@ -35,7 +35,7 @@ public:
this->func = std::move(func); this->func = std::move(func);
PthreadAttrT attr{}; PthreadAttrT attr{};
posix_pthread_attr_init(&attr); posix_pthread_attr_init(&attr);
posix_pthread_create(&thread, &attr, RunWrapper, this); posix_pthread_create(&thread, &attr, HOST_CALL(RunWrapper), this);
posix_pthread_attr_destroy(&attr); posix_pthread_attr_destroy(&attr);
} }

3
src/core/libraries/libs.h
View File

@ -5,6 +5,7 @@
#include "core/loader/elf.h" #include "core/loader/elf.h"
#include "core/loader/symbols_resolver.h" #include "core/loader/symbols_resolver.h"
#include "core/tls.h"
#define LIB_FUNCTION(nid, lib, libversion, mod, moduleVersionMajor, moduleVersionMinor, function) \ #define LIB_FUNCTION(nid, lib, libversion, mod, moduleVersionMajor, moduleVersionMinor, function) \
{ \ { \
@ -16,7 +17,7 @@
sr.module_version_major = moduleVersionMajor; \ sr.module_version_major = moduleVersionMajor; \
sr.module_version_minor = moduleVersionMinor; \ sr.module_version_minor = moduleVersionMinor; \
sr.type = Core::Loader::SymbolType::Function; \ sr.type = Core::Loader::SymbolType::Function; \
auto func = reinterpret_cast<u64>(function); \ auto func = reinterpret_cast<u64>(HOST_CALL(function)); \
sym->AddSymbol(sr, func); \ sym->AddSymbol(sr, func); \
} }

12
src/core/tls.h
View File

@ -58,4 +58,16 @@ ReturnType ExecuteGuest(PS4_SYSV_ABI ReturnType (*func)(FuncArgs...), CallArgs&&
return func(std::forward<CallArgs>(args)...); return func(std::forward<CallArgs>(args)...);
} }
template <class F, F f>
struct HostCallWrapperImpl;
template <class ReturnType, class... Args, PS4_SYSV_ABI ReturnType (*func)(Args...)>
struct HostCallWrapperImpl<PS4_SYSV_ABI ReturnType (*)(Args...), func> {
static ReturnType PS4_SYSV_ABI wrap(Args... args) {
return func(args...);
}
};
#define HOST_CALL(func) (Core::HostCallWrapperImpl<decltype(&(func)), func>::wrap)
} // namespace Core } // namespace Core