mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-31 14:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fallback to std malloc

Browse Source
This commit is contained in:
microsoftv 2024-08-11 13:59:54 -04:00
parent bfd9611f80
commit b8856be903
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/linker.cpp
View File

@ -336,9 +336,17 @@ void Linker::InitTlsForThread(bool is_primary) {
ASSERT_MSG(ret == 0, "Unable to allocate TLS+TCB for the primary thread"); ASSERT_MSG(ret == 0, "Unable to allocate TLS+TCB for the primary thread");
} else { } else {
if (heap_api) { if (heap_api) {
addr_out = heap_api->heap_malloc(total_tls_size); LOG_ERROR(Core_Linker, "TLS user malloc called, using std::malloc");
} else { // TODO: ref rtld_tls_block_malloc, tls malloc replacement
//addr_out = heap_api->heap_malloc(total_tls_size);
addr_out = std::malloc(total_tls_size); addr_out = std::malloc(total_tls_size);
if (!addr_out) {
auto pth_id = pthread_self();
auto handle = pthread_gethandle(pth_id);
ASSERT_MSG(addr_out,
"Cannot allocate TLS block defined for handle=%x, index=%d size=%d",
handle, pth_id, total_tls_size);
}
} }
} }