diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/debug.h | 43 | ||||
| -rw-r--r-- | src/include/env.h | 2 | ||||
| -rw-r--r-- | src/include/os.h | 3 |
3 files changed, 19 insertions, 29 deletions
diff --git a/src/include/debug.h b/src/include/debug.h index 92425ad1..abd94bf7 100644 --- a/src/include/debug.h +++ b/src/include/debug.h @@ -70,55 +70,42 @@ extern int box64_tcmalloc_minimal; // when using tcmalloc_minimal #define LOG_NEVER 3 #define LOG_VERBOSE 3 -#ifndef _WIN32 // TODO: better wow64 support? -void printf_ftrace(int prefix, const char* fmt, ...); -#define printf_log_prefix(prefix, L, ...) \ - do { \ - if ((L) <= BOX64ENV(log)) { printf_ftrace(prefix + (prefix && (L) == LOG_NONE), __VA_ARGS__); } \ +#define printf_log_prefix(prefix, L, ...) \ + do { \ + if ((L) <= BOX64ENV(log)) { PrintfFtrace(prefix + (prefix && (L) == LOG_NONE), __VA_ARGS__); } \ } while (0) #define printf_log(L, ...) printf_log_prefix(1, L, __VA_ARGS__) -#define printf_dump_prefix(prefix, L, ...) \ - do { \ - if (BOX64ENV(dump) || ((L) <= BOX64ENV(log))) { printf_ftrace(prefix, __VA_ARGS__); } \ +#define printf_dump_prefix(prefix, L, ...) \ + do { \ + if (BOX64ENV(dump) || ((L) <= BOX64ENV(log))) { PrintfFtrace(prefix, __VA_ARGS__); } \ } while (0) #define printf_dump(L, ...) printf_dump_prefix(1, L, __VA_ARGS__) -#define printf_dlsym_prefix(prefix, L, ...) \ - do { \ - if (BOX64ENV(dlsym_error) || BOX64ENV(dump) || ((L) <= BOX64ENV(log))) { printf_ftrace(prefix, __VA_ARGS__); } \ +#define printf_dlsym_prefix(prefix, L, ...) \ + do { \ + if (BOX64ENV(dlsym_error) || BOX64ENV(dump) || ((L) <= BOX64ENV(log))) { PrintfFtrace(prefix, __VA_ARGS__); } \ } while (0) #define printf_dlsym_dump(L, ...) printf_dlsym_dump_prefix(1, L, __VA_ARGS__) -#define printf_dlsym_dump_prefix(prefix, L, ...) \ - do { \ - if (BOX64ENV(dlsym_error) || ((L) <= BOX64ENV(log))) { printf_ftrace(prefix, __VA_ARGS__); } \ +#define printf_dlsym_dump_prefix(prefix, L, ...) \ + do { \ + if (BOX64ENV(dlsym_error) || ((L) <= BOX64ENV(log))) { PrintfFtrace(prefix, __VA_ARGS__); } \ } while (0) #define printf_dlsym(L, ...) printf_dlsym_prefix(1, L, __VA_ARGS__) -#define dynarec_log_prefix(prefix, L, ...) \ - do { \ - if ((L) <= BOX64ENV(dynarec_log)) { printf_ftrace(prefix, __VA_ARGS__); } \ +#define dynarec_log_prefix(prefix, L, ...) \ + do { \ + if ((L) <= BOX64ENV(dynarec_log)) { PrintfFtrace(prefix, __VA_ARGS__); } \ } while (0) #define dynarec_log(L, ...) dynarec_log_prefix(1, L, __VA_ARGS__) -#else -#define printf_log_prefix(prefix, L, ...) -#define printf_log(L, ...) -#define printf_dump_prefix(prefix, L, ...) -#define printf_dump(L, ...) -#define printf_dlsym_prefix(prefix, L, ...) -#define printf_dlsym(L, ...) -#define dynarec_log_prefix(prefix, L, ...) -#define dynarec_log(L, ...) -#endif - #define EXPORT __attribute__((visibility("default"))) #ifdef BUILD_DYNAMIC diff --git a/src/include/env.h b/src/include/env.h index f3456647..db4974bd 100644 --- a/src/include/env.h +++ b/src/include/env.h @@ -23,7 +23,7 @@ #ifdef _WIN32 #define DEFAULT_LOG_LEVEL (LOG_INFO) -#define BOX64_NOBANNER_DEFAULT (1) +#define BOX64_NOBANNER_DEFAULT (0) #else extern char* ftrace_name; #define DEFAULT_LOG_LEVEL (ftrace_name ? LOG_INFO : (isatty(fileno(stdout)) ? LOG_INFO : LOG_NONE)) diff --git a/src/include/os.h b/src/include/os.h index f141e99e..03c075e7 100644 --- a/src/include/os.h +++ b/src/include/os.h @@ -56,6 +56,7 @@ void PersonalityAddrLimit32Bit(void); int IsAddrElfOrFileMapped(uintptr_t addr); const char* GetNativeName(void* p); +const char* GetBridgeName(void* p); // ---------------------------------------------------------------- #ifndef _WIN32 @@ -96,4 +97,6 @@ extern int isnanf(float); #define isinff isinf #endif +void PrintfFtrace(int prefix, const char* fmt, ...); + #endif //__OS_H_ |