mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 18:42:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

threads: fix stack size calculation

Browse Source
This commit is contained in:
Michael Scire 2019-10-18 18:29:53 -07:00
parent 3109b2c480
commit 96781796d7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nx/source/kernel/thread.c
View File

@ -72,8 +72,7 @@ Result threadCreate(
if (stack_mem == NULL) { if (stack_mem == NULL) {
// Allocate new memory, stack then reent then tls. // Allocate new memory, stack then reent then tls.
stack_sz = (stack_sz+0xFFF) & ~0xFFF; stack_mem = memalign(0x1000, ((stack_sz + reent_sz + tls_sz)+0xFFF) & ~0xFFF);
stack_mem = memalign(0x1000, stack_sz + reent_sz + tls_sz);
reent = (void*)((uintptr_t)stack_mem + stack_sz); reent = (void*)((uintptr_t)stack_mem + stack_sz);
tls = (void*)((uintptr_t)reent + reent_sz); tls = (void*)((uintptr_t)reent + reent_sz);
@ -86,6 +85,7 @@ Result threadCreate(
tls = (void*)((uintptr_t)stack_mem + stack_sz - tls_sz); tls = (void*)((uintptr_t)stack_mem + stack_sz - tls_sz);
reent = (void*)((uintptr_t)tls - reent_sz); reent = (void*)((uintptr_t)tls - reent_sz);
stack_sz -= tls_sz + reent_sz;
// Ensure we don't go out of bounds. // Ensure we don't go out of bounds.
if ((uintptr_t)reent <= (uintptr_t)stack_mem) { if ((uintptr_t)reent <= (uintptr_t)stack_mem) {
@ -99,8 +99,10 @@ Result threadCreate(
return MAKERESULT(Module_Libnx, LibnxError_OutOfMemory); return MAKERESULT(Module_Libnx, LibnxError_OutOfMemory);
} }
void* stack_mirror = virtmemReserveStack(stack_sz); // Stack size may be unaligned in the
Result rc = svcMapMemory(stack_mirror, stack_mem, stack_sz); const size_t aligned_stack_sz = (stack_sz+0xFFF) & ~0xFFF;
void* stack_mirror = virtmemReserveStack(aligned_stack_sz);
Result rc = svcMapMemory(stack_mirror, stack_mem, aligned_stack_sz);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
{ {