diff options
Diffstat (limited to 'src/libtools')
| -rw-r--r-- | src/libtools/signals.c | 3 | ||||
| -rw-r--r-- | src/libtools/threads.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libtools/signals.c b/src/libtools/signals.c index a15e7d66..94946b9e 100644 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -362,9 +362,10 @@ uint64_t RunFunctionHandler(int* exit, int dynarec, x64_ucontext_t* sigcontext, emu->flags.quitonlongjmp = oldquitonlongjmp; #ifdef DYNAREC - if(box64_dynarec_test) + if(box64_dynarec_test) { emu->test.test = 0; emu->test.clean = 0; + } #endif if(emu->flags.longjmp) { diff --git a/src/libtools/threads.c b/src/libtools/threads.c index 1baf91e9..2829917d 100644 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -139,9 +139,9 @@ static void emuthread_destroy(void* p) emuthread_t *et = (emuthread_t*)p; if(!et) return; - void* ptr; // check tlsdata - /*if (my_context && (ptr = pthread_getspecific(my_context->tlskey)) != NULL) + /*void* ptr; + if (my_context && (ptr = pthread_getspecific(my_context->tlskey)) != NULL) free_tlsdatasize(ptr);*/ // free x64emu if(et) { @@ -477,6 +477,7 @@ EXPORT int my_pthread_setattr_default_np(x64emu_t* emu, pthread_attr_t* attr) PTHREAD_ATTR_ALIGN(attr); int ret = pthread_setattr_default_np(PTHREAD_ATTR(attr)); PTHREAD_ATTR_UNALIGN(attr); + return ret; } #endif //!ANDROID #endif @@ -658,7 +659,6 @@ static void* findkey_dtorFct(void* fct) #undef SUPER // custom implementation of pthread_once... -static __thread uintptr_t my_once_callback_fct = 0; int EXPORT my_pthread_once(x64emu_t* emu, int* once, void* cb) { if(*once) // quick test first |