diff options
| author | Yang Liu <liuyang22@iscas.ac.cn> | 2025-01-21 23:13:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-21 16:13:51 +0100 |
| commit | 044dec0bfa0f3f8f62f7703d6b0a8600c1354dc5 (patch) | |
| tree | dc41c611965cec299dcb62185c5fba4935b6251f /src/emu/x64syscall.c | |
| parent | ed8b6fe9db863a8d9e473a645e84700c7291bb06 (diff) | |
| download | box64-044dec0bfa0f3f8f62f7703d6b0a8600c1354dc5.tar.gz box64-044dec0bfa0f3f8f62f7703d6b0a8600c1354dc5.zip | |
[ENV] Initial refactor of env variables infrastructure (#2274)
* [ENV] Initial refactor of env variables infrastructure * Ported BOX64_DYNAREC_LOG * Ported more options * Ported BOX64_MALLOC_HACK * Ported BOX64_DYNAREC_TEST * Ported more options * Ported more options * Ported more options * Ported all options * Removed old rcfile parser * Fix * review * fix * fix * more fixes
Diffstat (limited to 'src/emu/x64syscall.c')
| -rw-r--r-- | src/emu/x64syscall.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/x64syscall.c b/src/emu/x64syscall.c index a912afcb..4c20bb9d 100644 --- a/src/emu/x64syscall.c +++ b/src/emu/x64syscall.c @@ -450,14 +450,14 @@ void EXPORT x64Syscall(x64emu_t *emu) char buff2[64] = "\0"; char* buff = NULL; char* buffret = NULL; - if(box64_log>=LOG_DEBUG || cycle_log) { + if(BOX64ENV(log) >= LOG_DEBUG || BOX64ENV(rolling_log)) { log = 1; - buff = cycle_log?my_context->log_call[my_context->current_line]:t_buff; - buffret = cycle_log?my_context->log_ret[my_context->current_line]:t_buffret; - if(cycle_log) - my_context->current_line = (my_context->current_line+1)%cycle_log; + buff = BOX64ENV(rolling_log)?my_context->log_call[my_context->current_line]:t_buff; + buffret = BOX64ENV(rolling_log)?my_context->log_ret[my_context->current_line]:t_buffret; + if(BOX64ENV(rolling_log)) + my_context->current_line = (my_context->current_line+1)%BOX64ENV(rolling_log); snprintf(buff, 255, "%04d|%p: Calling syscall 0x%02X (%d) %p %p %p %p %p %p", GetTID(), (void*)R_RIP, s, s, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_R10, (void*)R_R8, (void*)R_R9); - if(!cycle_log) + if(!BOX64ENV(rolling_log)) printf_log(LOG_NONE, "%s", buff); } // check wrapper first @@ -480,7 +480,7 @@ void EXPORT x64Syscall(x64emu_t *emu) if(S_RAX==-1 && errno>0) S_RAX = -errno; if(log) snprintf(buffret, 127, "0x%x%s", R_EAX, buff2); - if(log && !cycle_log) printf_log(LOG_NONE, "=> %s\n", buffret); + if(log && !BOX64ENV(rolling_log)) printf_log(LOG_NONE, "=> %s\n", buffret); return; } switch (s) { @@ -838,7 +838,7 @@ void EXPORT x64Syscall(x64emu_t *emu) #endif case 449: #ifdef __NR_futex_waitv - if(box64_futex_waitv) + if(BOX64ENV(futex_waitv)) S_RAX = syscall(__NR_futex_waitv, R_RDI, R_RSI, R_RDX, R_R10, R_R8); else #endif @@ -851,7 +851,7 @@ void EXPORT x64Syscall(x64emu_t *emu) return; } if(log) snprintf(buffret, 127, "0x%lx%s", R_RAX, buff2); - if(log && !cycle_log) printf_log(LOG_NONE, "=> %s\n", buffret); + if(log && !BOX64ENV(rolling_log)) printf_log(LOG_NONE, "=> %s\n", buffret); } #define stack(n) (R_RSP+8+n) @@ -1116,7 +1116,7 @@ long EXPORT my_syscall(x64emu_t *emu) #endif case 449: #ifdef __NR_futex_waitv - if(box64_futex_waitv) + if(BOX64ENV(futex_waitv)) return syscall(__NR_futex_waitv, R_RSI, R_RDX, R_RCX, R_R8, R_R9); else #endif |