diff options
| author | Yang Liu <liuyang22@iscas.ac.cn> | 2025-01-22 17:29:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-22 10:29:21 +0100 |
| commit | 89dcd2566bfa1ef93e740b568cbc3aa5c5409aa4 (patch) | |
| tree | af3e95e694fb620ccb2d955a74a0aab0ad14c29e /src/include | |
| parent | 314edea645acacf03930af17aa01783ca735306a (diff) | |
| download | box64-89dcd2566bfa1ef93e740b568cbc3aa5c5409aa4.tar.gz box64-89dcd2566bfa1ef93e740b568cbc3aa5c5409aa4.zip | |
Fixed various issues introduced in the env infra refactor (#2281)
* Open trace file again after apply env files * dynrec_df=1 by default * more fixes * more fixes * more
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/elfloader.h | 3 | ||||
| -rw-r--r-- | src/include/env.h | 185 |
2 files changed, 92 insertions, 96 deletions
diff --git a/src/include/elfloader.h b/src/include/elfloader.h index cec7195d..969cb95b 100644 --- a/src/include/elfloader.h +++ b/src/include/elfloader.h @@ -69,9 +69,6 @@ int32_t GetTLSBase(elfheader_t* h); uint32_t GetTLSSize(elfheader_t* h); void* GetTLSPointer(box64context_t* context, elfheader_t* h); void* GetDTatOffset(box64context_t* context, unsigned long int index, unsigned long int offset); -#ifdef DYNAREC -dynablock_t* GetDynablocksFromAddress(box64context_t *context, uintptr_t addr); -#endif void ResetSpecialCaseMainElf(elfheader_t* h); void CreateMemorymapFile(box64context_t* context, int fd); void* GetDynamicSection(elfheader_t* h); diff --git a/src/include/env.h b/src/include/env.h index 0b808dd5..598cb1db 100644 --- a/src/include/env.h +++ b/src/include/env.h @@ -23,99 +23,98 @@ extern char* ftrace_name; #define DEFAULT_LOG_LEVEL (ftrace_name ? LOG_INFO : (isatty(fileno(stdout)) ? LOG_INFO : LOG_NONE)) -#define ENVSUPER1() \ - STRING(BOX64_ADDLIBS, addlibs) \ - BOOLEAN(BOX64_ALLOWMISSINGLIBS, allow_missing_libs, 0) \ - STRING(BOX64_ARGS, args) \ - STRING(BOX64_BASH, bash) \ - BOOLEAN(BOX64_CEFDISABLEGPU, cefdisablegpu, 0) \ - BOOLEAN(BOX64_CEFDISABLEGPUCOMPOSITOR, cefdisablegpucompositor, 0) \ - INTEGER(BOX64_CPUTYPE, cputype, 0, 0, 1) \ - BOOLEAN(BOX64_CRASHHANDLER, dummy_crashhandler, 1) \ - BOOLEAN(BOX64_DLSYM_ERROR, dlsym_error, 0) \ - INTEGER(BOX64_DUMP, dump, 0, 0, 2) \ - BOOLEAN(BOX64_DYNAREC_ALIGNED_ATOMICS, dynarec_aligned_atomics, 0) \ - INTEGER(BOX64_DYNAREC_BIGBLOCK, dynarec_bigblock, 1, 0, 3) \ - BOOLEAN(BOX64_DYNAREC_BLEEDING_EDGE, dynarec_bleeding_edge, 1) \ - BOOLEAN(BOX64_DYNAREC_CALLRET, dynarec_callret, 0) \ - BOOLEAN(BOX64_DYNAREC_DF, dynarec_df, 0) \ - BOOLEAN(BOX64_DYNAREC_DIRTY, dynarec_dirty, 0) \ - BOOLEAN(BOX64_DYNAREC_DIV0, dynarec_div0, 0) \ - INTEGER(BOX64_DYNAREC_DUMP, dynarec_dump, 0, 0, 2) \ - BOOLEAN(BOX64_DYNAREC_FASTNAN, dynarec_fastnan, 1) \ - BOOLEAN(BOX64_DYNAREC_FASTROUND, dynarec_fastround, 1) \ - BOOLEAN(BOX64_DYNAREC_FORCED, dynarec_forced, 0) \ - INTEGER(BOX64_DYNAREC_FORWARD, dynarec_forward, 128, 0, 1024) \ - BOOLEAN(BOX64_DYNAREC_GDBJIT, dynarec_gdbjit, 0) \ - INTEGER(BOX64_DYNAREC_LOG, dynarec_log, 0, 0, 3) \ - BOOLEAN(BOX64_DYNAREC_MISSING, dynarec_missing, 0) \ - BOOLEAN(BOX64_DYNAREC_NATIVEFLAGS, dynarec_nativeflags, 1) \ - INTEGER(BOX64_DYNAREC_PAUSE, dynarec_pause, 0, 0, 3) \ - BOOLEAN(BOX64_DYNAREC_PERFMAP, dynarec_perf_map, 0) \ - INTEGER(BOX64_DYNAREC_SAFEFLAGS, dynarec_safeflags, 1, 0, 2) \ - BOOLEAN(BOX64_DYNAREC_STRONGMEM, dynarec_strongmem, 0) \ - BOOLEAN(BOX64_DYNAREC_TBB, dynarec_tbb, 1) \ - STRING(BOX64_DYNAREC_TEST, dynarec_test_str) \ - BOOLEAN(BOX64_DYNAREC_TRACE, dynarec_trace, 0) \ - BOOLEAN(BOX64_DYNAREC_WAIT, dynarec_wait, 1) \ - BOOLEAN(BOX64_DYNAREC_WEAKBARRIER, dynarec_weakbarrier, 1) \ - BOOLEAN(BOX64_DYNAREC_X87DOUBLE, dynarec_x87double, 0) \ - STRING(BOX64_EMULATED_LIBS, emulated_libs) \ - STRING(BOX64_ENV, env) \ - STRING(BOX64_ENV1, env1) \ - STRING(BOX64_ENV2, env2) \ - STRING(BOX64_ENV3, env3) \ - STRING(BOX64_ENV4, env4) \ - STRING(BOX64_ENV5, env5) \ - BOOLEAN(BOX64_EXIT, exit, 0) \ - BOOLEAN(BOX64_FIX_64BIT_INODES, fix_64bit_inodes, 0) \ - BOOLEAN(BOX64_IGNOREINT3, ignoreint3, 0) \ - STRING(BOX64_INSERT_ARGS, insert_args) \ - BOOLEAN(BOX64_INPROCESSGPU, inprocessgpu, 0) \ - BOOLEAN(BOX64_JITGDB, jitgdb, 0) \ - BOOLEAN(BOX64_JVM, jvm, 1) \ - STRING(BOX64_LD_LIBRARY_PATH, ld_library_path) \ - BOOLEAN(BOX64_LIBCEF, libcef, 1) \ - STRING(BOX64_LIBGL, libgl) \ - ADDRESS(BOX64_LOAD_ADDR, load_addr) \ - INTEGER(BOX64_LOG, log, DEFAULT_LOG_LEVEL, 0, 3) \ - BOOLEAN(BOX64_MALLOC_HACK, malloc_hack, 0) \ - INTEGER(BOX64_MAXCPU, new_maxcpu, 0, 0, 100) \ - BOOLEAN(BOX64_NOBANNER, nobanner, (isatty(fileno(stdout)) ? 0 : 1)) \ - STRING(BOX64_NODYNAREC, nodynarec) \ - BOOLEAN(BOX64_NOGTK, nogtk, 0) \ - BOOLEAN(BOX64_NOPULSE, nopulse, 0) \ - BOOLEAN(BOX64_NORCFILES, noenvfiles, 0) \ - BOOLEAN(BOX64_NOSANDBOX, nosandbox, 0) \ - BOOLEAN(BOX64_NOSIGSEGV, nosigsegv, 0) \ - BOOLEAN(BOX64_NOSIGILL, nosigill, 0) \ - BOOLEAN(BOX64_NOVULKAN, novulkan, 0) \ - STRING(BOX64_PATH, path) \ - BOOLEAN(BOX64_PREFER_EMULATED, prefer_emulated, 0) \ - BOOLEAN(BOX64_PREFER_WRAPPED, prefer_wrapped, 0) \ - STRING(BOX64_RCFILE, envfile) \ - BOOLEAN(BOX64_RDTSC_1GHZ, rdtsc_1ghz, 0) \ - BOOLEAN(BOX64_RESERVE_HIGH, reserve_high, 0) \ - BOOLEAN(BOX64_ROLLING_LOG, rolling_log, 0) \ - BOOLEAN(BOX64_SDL2_JGUID, sdl2_jguid, 0) \ - BOOLEAN(BOX64_SHAEXT, shaext, 1) \ - BOOLEAN(BOX64_SHOWBT, showbt, 0) \ - BOOLEAN(BOX64_SHOWSEGV, showsegv, 0) \ - BOOLEAN(BOX64_SSE_FLUSHTO0, sse_flushto0, 0) \ - BOOLEAN(BOX64_SSE42, sse42, 1) \ - BOOLEAN(BOX64_SYNC_ROUNDING, sync_rounding, 0) \ - BOOLEAN(BOX64_TRACE_COLOR, trace_regsdiff, 0) \ - BOOLEAN(BOX64_TRACE_EMM, trace_emm, 0) \ - STRING(BOX64_TRACE_FILE, trace_file) \ - STRING(BOX64_TRACE_INIT, trace_init) \ - INTEGER64(BOX64_TRACE_START, start_cnt, 0) \ - BOOLEAN(BOX64_TRACE_XMM, trace_xmm, 0) \ - STRING(BOX64_TRACE, trace) \ - BOOLEAN(BOX64_UNITYPLAYER, unityplayer, 1) \ - BOOLEAN(BOX64_WRAP_EGL, wrap_egl, 0) \ - BOOLEAN(BOX64_X11GLX, x11glx, 1) \ - BOOLEAN(BOX64_X11SYNC, x11sync, 0) \ - BOOLEAN(BOX64_X11THREADS, x11threads, 0) \ +#define ENVSUPER1() \ + STRING(BOX64_ADDLIBS, addlibs) \ + BOOLEAN(BOX64_ALLOWMISSINGLIBS, allow_missing_libs, 0) \ + STRING(BOX64_ARGS, args) \ + STRING(BOX64_BASH, bash) \ + BOOLEAN(BOX64_CEFDISABLEGPU, cefdisablegpu, 0) \ + BOOLEAN(BOX64_CEFDISABLEGPUCOMPOSITOR, cefdisablegpucompositor, 0) \ + INTEGER(BOX64_CPUTYPE, cputype, 0, 0, 1) \ + BOOLEAN(BOX64_CRASHHANDLER, dummy_crashhandler, 1) \ + BOOLEAN(BOX64_DLSYM_ERROR, dlsym_error, 0) \ + INTEGER(BOX64_DUMP, dump, 0, 0, 2) \ + BOOLEAN(BOX64_DYNAREC_ALIGNED_ATOMICS, dynarec_aligned_atomics, 0) \ + INTEGER(BOX64_DYNAREC_BIGBLOCK, dynarec_bigblock, 1, 0, 3) \ + BOOLEAN(BOX64_DYNAREC_BLEEDING_EDGE, dynarec_bleeding_edge, 1) \ + BOOLEAN(BOX64_DYNAREC_CALLRET, dynarec_callret, 0) \ + BOOLEAN(BOX64_DYNAREC_DF, dynarec_df, 1) \ + BOOLEAN(BOX64_DYNAREC_DIRTY, dynarec_dirty, 0) \ + BOOLEAN(BOX64_DYNAREC_DIV0, dynarec_div0, 0) \ + INTEGER(BOX64_DYNAREC_DUMP, dynarec_dump, 0, 0, 2) \ + BOOLEAN(BOX64_DYNAREC_FASTNAN, dynarec_fastnan, 1) \ + INTEGER(BOX64_DYNAREC_FASTROUND, dynarec_fastround, 1, 0, 2) \ + INTEGER(BOX64_DYNAREC_FORWARD, dynarec_forward, 128, 0, 1024) \ + INTEGER(BOX64_DYNAREC_GDBJIT, dynarec_gdbjit, 0, 0, 2) \ + INTEGER(BOX64_DYNAREC_LOG, dynarec_log, 0, 0, 3) \ + INTEGER(BOX64_DYNAREC_MISSING, dynarec_missing, 0, 0, 2) \ + BOOLEAN(BOX64_DYNAREC_NATIVEFLAGS, dynarec_nativeflags, 1) \ + INTEGER(BOX64_DYNAREC_PAUSE, dynarec_pause, 0, 0, 3) \ + BOOLEAN(BOX64_DYNAREC_PERFMAP, dynarec_perf_map, 0) \ + INTEGER(BOX64_DYNAREC_SAFEFLAGS, dynarec_safeflags, 1, 0, 2) \ + BOOLEAN(BOX64_DYNAREC_STRONGMEM, dynarec_strongmem, 0) \ + BOOLEAN(BOX64_DYNAREC_TBB, dynarec_tbb, 1) \ + STRING(BOX64_DYNAREC_TEST, dynarec_test_str) \ + BOOLEAN(BOX64_DYNAREC_TRACE, dynarec_trace, 0) \ + BOOLEAN(BOX64_DYNAREC_WAIT, dynarec_wait, 1) \ + BOOLEAN(BOX64_DYNAREC_WEAKBARRIER, dynarec_weakbarrier, 1) \ + BOOLEAN(BOX64_DYNAREC_X87DOUBLE, dynarec_x87double, 0) \ + STRING(BOX64_EMULATED_LIBS, emulated_libs) \ + STRING(BOX64_ENV, env) \ + STRING(BOX64_ENV1, env1) \ + STRING(BOX64_ENV2, env2) \ + STRING(BOX64_ENV3, env3) \ + STRING(BOX64_ENV4, env4) \ + STRING(BOX64_ENV5, env5) \ + BOOLEAN(BOX64_EXIT, exit, 0) \ + BOOLEAN(BOX64_FIX_64BIT_INODES, fix_64bit_inodes, 0) \ + BOOLEAN(BOX64_IGNOREINT3, ignoreint3, 0) \ + STRING(BOX64_INSERT_ARGS, insert_args) \ + BOOLEAN(BOX64_INPROCESSGPU, inprocessgpu, 0) \ + BOOLEAN(BOX64_JITGDB, jitgdb, 0) \ + BOOLEAN(BOX64_JVM, jvm, 1) \ + STRING(BOX64_LD_LIBRARY_PATH, ld_library_path) \ + BOOLEAN(BOX64_LIBCEF, libcef, 1) \ + STRING(BOX64_LIBGL, libgl) \ + ADDRESS(BOX64_LOAD_ADDR, load_addr) \ + INTEGER(BOX64_LOG, log, DEFAULT_LOG_LEVEL, 0, 3) \ + BOOLEAN(BOX64_MALLOC_HACK, malloc_hack, 0) \ + INTEGER(BOX64_MAXCPU, new_maxcpu, 0, 0, 100) \ + BOOLEAN(BOX64_NOBANNER, nobanner, (isatty(fileno(stdout)) ? 0 : 1)) \ + STRING(BOX64_NODYNAREC, nodynarec) \ + BOOLEAN(BOX64_NOGTK, nogtk, 0) \ + BOOLEAN(BOX64_NOPULSE, nopulse, 0) \ + BOOLEAN(BOX64_NORCFILES, noenvfiles, 0) \ + BOOLEAN(BOX64_NOSANDBOX, nosandbox, 0) \ + BOOLEAN(BOX64_NOSIGSEGV, nosigsegv, 0) \ + BOOLEAN(BOX64_NOSIGILL, nosigill, 0) \ + BOOLEAN(BOX64_NOVULKAN, novulkan, 0) \ + STRING(BOX64_PATH, path) \ + BOOLEAN(BOX64_PREFER_EMULATED, prefer_emulated, 0) \ + BOOLEAN(BOX64_PREFER_WRAPPED, prefer_wrapped, 0) \ + STRING(BOX64_RCFILE, envfile) \ + BOOLEAN(BOX64_RDTSC_1GHZ, rdtsc_1ghz, 0) \ + BOOLEAN(BOX64_RESERVE_HIGH, reserve_high, 0) \ + BOOLEAN(BOX64_ROLLING_LOG, rolling_log, 0) \ + BOOLEAN(BOX64_SDL2_JGUID, sdl2_jguid, 0) \ + BOOLEAN(BOX64_SHAEXT, shaext, 1) \ + BOOLEAN(BOX64_SHOWBT, showbt, 0) \ + BOOLEAN(BOX64_SHOWSEGV, showsegv, 0) \ + BOOLEAN(BOX64_SSE_FLUSHTO0, sse_flushto0, 0) \ + BOOLEAN(BOX64_SSE42, sse42, 1) \ + BOOLEAN(BOX64_SYNC_ROUNDING, sync_rounding, 0) \ + BOOLEAN(BOX64_TRACE_COLOR, trace_regsdiff, 0) \ + BOOLEAN(BOX64_TRACE_EMM, trace_emm, 0) \ + STRING(BOX64_TRACE_FILE, trace_file) \ + STRING(BOX64_TRACE_INIT, trace_init) \ + INTEGER64(BOX64_TRACE_START, start_cnt, 0) \ + BOOLEAN(BOX64_TRACE_XMM, trace_xmm, 0) \ + STRING(BOX64_TRACE, trace) \ + BOOLEAN(BOX64_UNITYPLAYER, unityplayer, 1) \ + BOOLEAN(BOX64_WRAP_EGL, wrap_egl, 0) \ + BOOLEAN(BOX64_X11GLX, x11glx, 1) \ + BOOLEAN(BOX64_X11SYNC, x11sync, 0) \ + BOOLEAN(BOX64_X11THREADS, x11threads, 0) \ BOOLEAN(BOX64_X87_NO80BITS, x87_no80bits, 0) #ifdef ARM64 |