diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2025-05-22 14:24:46 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2025-05-22 14:24:46 +0200 |
| commit | 1898d35c538a23046f5c6c4968e4ab4f24ce5eec (patch) | |
| tree | 9778e42f4f783ea0e913ec9a8008123aff012456 /src | |
| parent | 77f7c1278b8235aec0ea28ad61bf4d91b1fa0dc8 (diff) | |
| download | box64-1898d35c538a23046f5c6c4968e4ab4f24ce5eec.tar.gz box64-1898d35c538a23046f5c6c4968e4ab4f24ce5eec.zip | |
[WRAPPER][TRACE] Fixed some DLSYM_ERROR traces
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/wrappedlibdl.c | 16 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibgl.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c index f91e379e..5ad45de5 100644 --- a/src/wrapped/wrappedlibdl.c +++ b/src/wrapped/wrappedlibdl.c @@ -373,12 +373,12 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) ret_addr = *(uintptr_t*)R_RSP; elfheader_t *elf = FindElfAddress(my_context, ret_addr); // use return address to guess "self" if(GetNextSymbolStartEnd(my_context->maplib, rsymbol, &start, &end, elf, 0, -1, NULL, 0, NULL)) { - printf_dlsym(LOG_NEVER, "%p\n", (void*)start); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", (void*)start); pthread_mutex_unlock(&mutex); return (void*)start; } SET_ERROR("Symbol \"%s\" not found in %p)\n", rsymbol, handle); - printf_dlsym(LOG_NEVER, "%p\n", NULL); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", NULL); pthread_mutex_unlock(&mutex); return NULL; } @@ -387,13 +387,13 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) // size_t is unsigned if(nlib>=dl->lib_sz) { SET_ERROR("Bad handle %p)\n", handle); - printf_dlsym(LOG_NEVER, "%p\n", NULL); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", NULL); pthread_mutex_unlock(&mutex); return NULL; } if(!dl->dllibs[nlib].count || !dl->dllibs[nlib].full) { SET_ERROR("Bad handle %p (already closed))\n", handle); - printf_dlsym(LOG_NEVER, "%p\n", (void*)NULL); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", (void*)NULL); pthread_mutex_unlock(&mutex); return NULL; } @@ -401,7 +401,7 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) if(my_dlsym_lib(dl->dllibs[nlib].lib, rsymbol, &start, &end, -1, NULL)==0) { // not found printf_dlsym(LOG_NEVER, "%p\nCall to dlsym(%s, \"%s\") Symbol not found\n", NULL, GetNameLib(dl->dllibs[nlib].lib), rsymbol); - printf_log(LOG_DEBUG, " Symbol not found\n"); + printf_log_prefix(0, LOG_DEBUG, " Symbol not found\n"); SET_ERROR("Symbol \"%s\" not found in %p(%s)", rsymbol, handle, GetNameLib(dl->dllibs[nlib].lib)); pthread_mutex_unlock(&mutex); return NULL; @@ -418,16 +418,16 @@ void* my_dlsym(x64emu_t* emu, void *handle, void *symbol) if(!found && GetSymTabStartEnd(my_context->maplib, rsymbol, &start, &end)) found = 1; if(found) { - printf_dlsym(LOG_NEVER, "%p\n", (void*)start); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", (void*)start); pthread_mutex_unlock(&mutex); return (void*)start; } SET_ERROR("Symbol \"%s\" not found in %p)\n", rsymbol, handle); - printf_dlsym(LOG_NEVER, "%p\n", NULL); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", NULL); pthread_mutex_unlock(&mutex); return NULL; } - printf_dlsym(LOG_NEVER, "%p\n", (void*)start); + printf_dlsym_prefix(0, LOG_NEVER, "%p\n", (void*)start); pthread_mutex_unlock(&mutex); return (void*)start; } diff --git a/src/wrapped/wrappedlibgl.c b/src/wrapped/wrappedlibgl.c index 8f854e58..d6bad238 100644 --- a/src/wrapped/wrappedlibgl.c +++ b/src/wrapped/wrappedlibgl.c @@ -545,13 +545,13 @@ void* getGLProcAddress(x64emu_t* emu, glprocaddress_t procaddr, const char* rnam } else symbol = procaddr(rname); if(!symbol) { - printf_dlsym(LOG_DEBUG, "%p\n", NULL); + printf_dlsym_prefix(0, LOG_DEBUG, "%p\n", NULL); return NULL; // easy } // check if alread bridged uintptr_t ret = CheckBridged(emu->context->system, symbol); if(ret) { - printf_dlsym(LOG_DEBUG, "%p\n", (void*)ret); + printf_dlsym_prefix(0, LOG_DEBUG, "%p\n", (void*)ret); return (void*)ret; // already bridged } // get wrapper @@ -571,8 +571,8 @@ void* getGLProcAddress(x64emu_t* emu, glprocaddress_t procaddr, const char* rnam k = kh_get(symbolmap, wrappers->glwrappers, tmp); } if(k==kh_end(wrappers->glwrappers)) { - printf_dlsym(LOG_DEBUG, "%p\n", NULL); - printf_dlsym(LOG_INFO, "Warning, no wrapper for %s\n", rname); + printf_dlsym_prefix(0, LOG_DEBUG, "%p\n", NULL); + printf_dlsym_prefix(2, LOG_INFO, "Warning, no wrapper for %s\n", rname); return NULL; } symbol1_t* s = &kh_value(wrappers->glwrappers, k); @@ -583,6 +583,6 @@ void* getGLProcAddress(x64emu_t* emu, glprocaddress_t procaddr, const char* rnam s->resolved = 1; } ret = s->addr; - printf_dlsym(LOG_DEBUG, "%p\n", (void*)ret); + printf_dlsym_prefix(0, LOG_DEBUG, "%p\n", (void*)ret); return (void*)ret; } |