diff options
Diffstat (limited to 'src/libtools')
| -rwxr-xr-x | src/libtools/auxval.c | 4 | ||||
| -rwxr-xr-x | src/libtools/signals.c | 4 | ||||
| -rwxr-xr-x | src/libtools/threads.c | 50 |
3 files changed, 43 insertions, 15 deletions
diff --git a/src/libtools/auxval.c b/src/libtools/auxval.c index a038f2dd..82c6fd35 100755 --- a/src/libtools/auxval.c +++ b/src/libtools/auxval.c @@ -23,6 +23,8 @@ static uintptr_t* auxval_start = NULL; int init_auxval(int argc, const char **argv, const char **env) { + (void)argc; (void)argv; + // auxval vector is after envs... while(*env) env++; @@ -56,4 +58,4 @@ unsigned long real_getauxval(unsigned long type) // p+=2; // } // return 0; -//} \ No newline at end of file +//} diff --git a/src/libtools/signals.c b/src/libtools/signals.c index 5c66522e..badb81c4 100755 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -449,6 +449,8 @@ void my_sigactionhandler_oldcode(int32_t sig, siginfo_t* info, void * ucntx, int if(db) { frame = (uintptr_t*)p->uc_mcontext.regs[10+_SP]; } +#else + (void)ucntx; (void)cur_db; #endif // stack tracking x64_stack_t *new_ss = my_context->onstack[sig]?(x64_stack_t*)pthread_getspecific(sigstack_key):NULL; @@ -554,7 +556,7 @@ void my_sigactionhandler_oldcode(int32_t sig, siginfo_t* info, void * ucntx, int sigcontext->uc_mcontext.gregs[X64_TRAPNO] = (info->si_code == SEGV_ACCERR)?13:14; } else if(info->si_code==SEGV_ACCERR && !(prot&PROT_WRITE)) { sigcontext->uc_mcontext.gregs[X64_ERR] = 0x0002; // write flag issue - if(abs((intptr_t)info->si_addr-(intptr_t)sigcontext->uc_mcontext.gregs[X64_RSP])<16) + if(labs((intptr_t)info->si_addr-(intptr_t)sigcontext->uc_mcontext.gregs[X64_RSP])<16) sigcontext->uc_mcontext.gregs[X64_TRAPNO] = 12; // stack overflow probably else sigcontext->uc_mcontext.gregs[X64_TRAPNO] = 14; // PAGE_FAULT diff --git a/src/libtools/threads.c b/src/libtools/threads.c index 0cd08a1b..b2ab3b5d 100755 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -245,6 +245,7 @@ pthread_attr_t* getAlignedAttr(pthread_attr_t* m) { return m; } void freeAlignedAttr(void* attr) { + (void)attr; } #else typedef struct aligned_attr_s { @@ -313,6 +314,7 @@ EXPORT int my_pthread_attr_setstack(x64emu_t* emu, void* attr, void* stackaddr, EXPORT int my_pthread_attr_setstacksize(x64emu_t* emu, void* attr, size_t stacksize) { + (void)emu; //aarch64 have an PTHREAD_STACK_MIN of 131072 instead of 16384 on x86_64! if(stacksize<PTHREAD_STACK_MIN) stacksize = PTHREAD_STACK_MIN; @@ -322,70 +324,86 @@ EXPORT int my_pthread_attr_setstacksize(x64emu_t* emu, void* attr, size_t stacks #ifndef NOALIGN EXPORT int my_pthread_attr_getdetachstate(x64emu_t* emu, pthread_attr_t* attr, int *state) { + (void)emu; return pthread_attr_getdetachstate(getAlignedAttr(attr), state); } EXPORT int my_pthread_attr_getguardsize(x64emu_t* emu, pthread_attr_t* attr, size_t* size) { + (void)emu; return pthread_attr_getguardsize(getAlignedAttr(attr), size); } EXPORT int my_pthread_attr_getinheritsched(x64emu_t* emu, pthread_attr_t* attr, int* sched) { + (void)emu; return pthread_attr_getinheritsched(getAlignedAttr(attr), sched); } EXPORT int my_pthread_attr_getschedparam(x64emu_t* emu, pthread_attr_t* attr, void* param) { + (void)emu; return pthread_attr_getschedparam(getAlignedAttr(attr), param); } EXPORT int my_pthread_attr_getschedpolicy(x64emu_t* emu, pthread_attr_t* attr, int* policy) { + (void)emu; return pthread_attr_getschedpolicy(getAlignedAttr(attr), policy); } EXPORT int my_pthread_attr_getscope(x64emu_t* emu, pthread_attr_t* attr, int* scope) { + (void)emu; return pthread_attr_getscope(getAlignedAttr(attr), scope); } EXPORT int my_pthread_attr_getstackaddr(x64emu_t* emu, pthread_attr_t* attr, void* addr) { + (void)emu; size_t size; return pthread_attr_getstack(getAlignedAttr(attr), addr, &size); //return pthread_attr_getstackaddr(getAlignedAttr(attr), addr); } EXPORT int my_pthread_attr_getstacksize(x64emu_t* emu, pthread_attr_t* attr, size_t* size) { + (void)emu; void* addr; return pthread_attr_getstack(getAlignedAttr(attr), &addr, size); //return pthread_attr_getstacksize(getAlignedAttr(attr), size); } EXPORT int my_pthread_attr_init(x64emu_t* emu, pthread_attr_t* attr) { + (void)emu; return pthread_attr_init(getAlignedAttrWithInit(attr, 0)); } EXPORT int my_pthread_attr_setaffinity_np(x64emu_t* emu, pthread_attr_t* attr, size_t cpusize, void* cpuset) { + (void)emu; return pthread_attr_setaffinity_np(getAlignedAttr(attr), cpusize, cpuset); } EXPORT int my_pthread_attr_setdetachstate(x64emu_t* emu, pthread_attr_t* attr, int state) { + (void)emu; return pthread_attr_setdetachstate(getAlignedAttr(attr), state); } EXPORT int my_pthread_attr_setguardsize(x64emu_t* emu, pthread_attr_t* attr, size_t size) { + (void)emu; return pthread_attr_setguardsize(getAlignedAttr(attr), size); } EXPORT int my_pthread_attr_setinheritsched(x64emu_t* emu, pthread_attr_t* attr, int sched) { + (void)emu; return pthread_attr_setinheritsched(getAlignedAttr(attr), sched); } EXPORT int my_pthread_attr_setschedparam(x64emu_t* emu, pthread_attr_t* attr, void* param) { + (void)emu; return pthread_attr_setschedparam(getAlignedAttr(attr), param); } EXPORT int my_pthread_attr_setschedpolicy(x64emu_t* emu, pthread_attr_t* attr, int policy) { + (void)emu; return pthread_attr_setschedpolicy(getAlignedAttr(attr), policy); } EXPORT int my_pthread_attr_setscope(x64emu_t* emu, pthread_attr_t* attr, int scope) { + (void)emu; return pthread_attr_setscope(getAlignedAttr(attr), scope); } EXPORT int my_pthread_attr_setstackaddr(x64emu_t* emu, pthread_attr_t* attr, void* addr) @@ -495,6 +513,7 @@ EXPORT void my___pthread_register_cancel(void* E, void* B) EXPORT void my___pthread_unregister_cancel(x64emu_t* emu, x64_unwind_buff_t* buff) { + (void)emu; __pthread_unwind_buf_t * pbuff = GetCancelThread(buff); __pthread_unregister_cancel(pbuff); @@ -504,6 +523,7 @@ EXPORT void my___pthread_unregister_cancel(x64emu_t* emu, x64_unwind_buff_t* buf EXPORT void my___pthread_unwind_next(x64emu_t* emu, x64_unwind_buff_t* buff) { + (void)emu; __pthread_unwind_buf_t pbuff = *GetCancelThread(buff); DelCancelThread(buff); // function is noreturn, putting stuff on the stack to have it auto-free (is that correct?) @@ -610,6 +630,7 @@ static void my_once_callback() int EXPORT my_pthread_once(x64emu_t* emu, void* once, void* cb) { + (void)emu; my_once_callback_fct = (uintptr_t)cb; return pthread_once(once, my_once_callback); } @@ -617,6 +638,7 @@ EXPORT int my___pthread_once(x64emu_t* emu, void* once, void* cb) __attribute__( EXPORT int my_pthread_key_create(x64emu_t* emu, void* key, void* dtor) { + (void)emu; return pthread_key_create(key, findkey_destructorFct(dtor)); } EXPORT int my___pthread_key_create(x64emu_t* emu, void* key, void* dtor) __attribute__((alias("my_pthread_key_create"))); @@ -626,43 +648,42 @@ pthread_mutex_t* getAlignedMutex(pthread_mutex_t* m); EXPORT int my_pthread_cond_timedwait(x64emu_t* emu, pthread_cond_t* cond, void* mutex, void* abstime) { + (void)emu; return pthread_cond_timedwait(cond, getAlignedMutex((pthread_mutex_t*)mutex), (const struct timespec*)abstime); } EXPORT int my_pthread_cond_wait(x64emu_t* emu, pthread_cond_t* cond, void* mutex) { + (void)emu; return pthread_cond_wait(cond, getAlignedMutex((pthread_mutex_t*)mutex)); } -//EXPORT int my_pthread_attr_setscope(x64emu_t* emu, void* at*tr, int scope) -//{ -// if(scope!=PTHREAD_SCOPE_SYSTEM) printf_log(LOG_INFO, "Warning, scope of call to pthread_attr_setscope(...) changed from %d to PTHREAD_SCOPE_SYSTEM\n", scope); -// return pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM); -// //The scope is either PTHREAD_SCOPE_SYSTEM or PTHREAD_SCOPE_PROCESS -// // but PTHREAD_SCOPE_PROCESS doesn't seem supported on ARM linux, and PTHREAD_SCOPE_SYSTEM is default -//} - EXPORT void my__pthread_cleanup_push_defer(x64emu_t* emu, void* buffer, void* routine, void* arg) { + (void)emu; _pthread_cleanup_push_defer(buffer, findcleanup_routineFct(routine), arg); } EXPORT void my__pthread_cleanup_push(x64emu_t* emu, void* buffer, void* routine, void* arg) { + (void)emu; _pthread_cleanup_push(buffer, findcleanup_routineFct(routine), arg); } EXPORT void my__pthread_cleanup_pop_restore(x64emu_t* emu, void* buffer, int exec) { + (void)emu; _pthread_cleanup_pop_restore(buffer, exec); } EXPORT void my__pthread_cleanup_pop(x64emu_t* emu, void* buffer, int exec) { + (void)emu; _pthread_cleanup_pop(buffer, exec); } //EXPORT int my_pthread_getaffinity_np(x64emu_t* emu, pthread_t thread, int cpusetsize, void* cpuset) //{ +// (void)emu; // int ret = pthread_getaffinity_np(thread, cpusetsize, cpuset); // if(ret<0) { // printf_log(LOG_INFO, "Warning, pthread_getaffinity_np(%p, %d, %p) errored, with errno=%d\n", (void*)thread, cpusetsize, cpuset, errno); @@ -673,6 +694,7 @@ EXPORT void my__pthread_cleanup_pop(x64emu_t* emu, void* buffer, int exec) //EXPORT int my_pthread_setaffinity_np(x64emu_t* emu, pthread_t thread, int cpusetsize, void* cpuset) //{ +// (void)emu; // int ret = pthread_setaffinity_np(thread, cpusetsize, cpuset); // if(ret<0) { // printf_log(LOG_INFO, "Warning, pthread_setaffinity_np(%p, %d, %p) errored, with errno=%d\n", (void*)thread, cpusetsize, cpuset, errno); @@ -683,7 +705,7 @@ EXPORT void my__pthread_cleanup_pop(x64emu_t* emu, void* buffer, int exec) //EXPORT int my_pthread_attr_setaffinity_np(x64emu_t* emu, void* attr, uint32_t cpusetsize, void* cpuset) //{ -// +// (void)emu; // int ret = pthread_attr_setaffinity_np(attr, cpusetsize, cpuset); // if(ret<0) { // printf_log(LOG_INFO, "Warning, pthread_attr_setaffinity_np(%p, %d, %p) errored, with errno=%d\n", attr, cpusetsize, cpuset, errno); @@ -694,14 +716,16 @@ EXPORT void my__pthread_cleanup_pop(x64emu_t* emu, void* buffer, int exec) EXPORT int my_pthread_kill(x64emu_t* emu, void* thread, int sig) { - // check for old "is everything ok?" - if(thread==NULL && sig==0) - return pthread_kill(pthread_self(), 0); - return pthread_kill((pthread_t)thread, sig); + (void)emu; + // check for old "is everything ok?" + if(thread==NULL && sig==0) + return pthread_kill(pthread_self(), 0); + return pthread_kill((pthread_t)thread, sig); } //EXPORT void my_pthread_exit(x64emu_t* emu, void* retval) //{ +// (void)emu; // pthread_exit(retval); //} |