archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 17:01:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alternative TLS allocation

Browse source 
Should fix "out of TLS memory"
This commit is contained in:
Nekotekina 2017-03-28 01:33:28 +03:00
parent 4c789faea4
commit 77e88741bc
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
View file

@ -24,20 +24,28 @@ static std::unique_ptr<atomic_t<bool>[]> s_tls_map; // I'd like to make it std::
u32 ppu_alloc_tls() u32 ppu_alloc_tls()
{ {
u32 addr = 0;
for (u32 i = 0; i < s_tls_max; i++) for (u32 i = 0; i < s_tls_max; i++)
{ {
if (!s_tls_map[i] && s_tls_map[i].exchange(true) == false) if (!s_tls_map[i] && s_tls_map[i].exchange(true) == false)
{ {
const u32 addr = s_tls_area + i * s_tls_size; // Calculate TLS address // Default (small) TLS allocation
std::memset(vm::base(addr), 0, 0x30); // Clear system area (TODO) addr = s_tls_area + i * s_tls_size;
std::memcpy(vm::base(addr + 0x30), vm::base(s_tls_addr), s_tls_file); // Copy TLS image break;
std::memset(vm::base(addr + 0x30 + s_tls_file), 0, s_tls_zero); // Clear the rest
return addr;
} }
} }
sysPrxForUser.error("ppu_alloc_tls(): out of TLS memory (max=%zu)", s_tls_max); if (!addr)
return 0; {
// Alternative (big) TLS allocation
addr = vm::alloc(s_tls_size, vm::main);
}
std::memset(vm::base(addr), 0, 0x30); // Clear system area (TODO)
std::memcpy(vm::base(addr + 0x30), vm::base(s_tls_addr), s_tls_file); // Copy TLS image
std::memset(vm::base(addr + 0x30 + s_tls_file), 0, s_tls_zero); // Clear the rest
return addr;
} }
void ppu_free_tls(u32 addr) void ppu_free_tls(u32 addr)
@ -47,7 +55,8 @@ void ppu_free_tls(u32 addr)
if (addr < s_tls_area || i >= s_tls_max || (addr - s_tls_area) % s_tls_size) if (addr < s_tls_area || i >= s_tls_max || (addr - s_tls_area) % s_tls_size)
{ {
sysPrxForUser.error("ppu_free_tls(0x%x): invalid address", addr); // Alternative TLS allocation detected
vm::dealloc_verbose_nothrow(addr, vm::main);
return; return;
} }
@ -70,8 +79,8 @@ void sys_initialize_tls(ppu_thread& ppu, u64 main_thread_id, u32 tls_seg_addr, u
s_tls_file = tls_seg_size; s_tls_file = tls_seg_size;
s_tls_zero = tls_mem_size - tls_seg_size; s_tls_zero = tls_mem_size - tls_seg_size;
s_tls_size = tls_mem_size + 0x30; // 0x30 is system area size s_tls_size = tls_mem_size + 0x30; // 0x30 is system area size
s_tls_area = vm::alloc(0x20000, vm::main) + 0x30; s_tls_area = vm::alloc(0x40000, vm::main) + 0x30;
s_tls_max = (0xffd0 / s_tls_size) + (0x10000 / s_tls_size); s_tls_max = (0x40000 - 0x30) / s_tls_size;
s_tls_map = std::make_unique<atomic_t<bool>[]>(s_tls_max); s_tls_map = std::make_unique<atomic_t<bool>[]>(s_tls_max);
// Allocate TLS for main thread // Allocate TLS for main thread