mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid overwriting TLS[0x100] and TLS[0x102] as per 8.0.0

Browse Source
This commit is contained in:
fincs 2019-04-20 19:19:34 +02:00
parent 2f70ee6a92
commit 1c832bebd6
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

@ -11,7 +11,9 @@
#include "services/fatal.h" #include "services/fatal.h"
#include "../internal.h" #include "../internal.h"
#define NUM_TLS_SLOTS ((0x100 - sizeof(ThreadVars)) / sizeof(void*)) #define USER_TLS_BEGIN 0x108
#define USER_TLS_END (0x200 - sizeof(ThreadVars))
#define NUM_TLS_SLOTS ((USER_TLS_END - USER_TLS_BEGIN) / sizeof(void*))
extern const u8 __tdata_lma[]; extern const u8 __tdata_lma[];
extern const u8 __tdata_lma_end[]; extern const u8 __tdata_lma_end[];
@ -45,7 +47,7 @@ static void _EntryWrap(ThreadEntryArgs* args) {
// Initialize thread info // Initialize thread info
mutexLock(&g_threadMutex); mutexLock(&g_threadMutex);
args->t->tls_array = (void**)((u8*)armGetTls() + 0x100); args->t->tls_array = (void**)((u8*)armGetTls() + USER_TLS_BEGIN);
args->t->prev_next = &g_threadList; args->t->prev_next = &g_threadList;
args->t->next = g_threadList; args->t->next = g_threadList;
if (g_threadList) if (g_threadList)
@ -219,12 +221,12 @@ s32 threadTlsAlloc(void (* destructor)(void*)) {
} }
void* threadTlsGet(s32 slot_id) { void* threadTlsGet(s32 slot_id) {
void** tls_array = (void**)((u8*)armGetTls() + 0x100); void** tls_array = (void**)((u8*)armGetTls() + USER_TLS_BEGIN);
return tls_array[slot_id]; return tls_array[slot_id];
} }
void threadTlsSet(s32 slot_id, void* value) { void threadTlsSet(s32 slot_id, void* value) {
void** tls_array = (void**)((u8*)armGetTls() + 0x100); void** tls_array = (void**)((u8*)armGetTls() + USER_TLS_BEGIN);
tls_array[slot_id] = value; tls_array[slot_id] = value;
} }