diff options
Diffstat (limited to 'src')
83 files changed, 42 insertions, 134 deletions
diff --git a/src/build_info.h b/src/build_info.h index 45182a02..18456a4b 100755 --- a/src/build_info.h +++ b/src/build_info.h @@ -1,6 +1,6 @@ #ifndef __BUILD_INFO_H__ #define __BUILD_INFO_H__ -void PrintBox64Version(); +void PrintBox64Version(void); #endif //__BUILD_INFO_H__ \ No newline at end of file diff --git a/src/dynarec/arm64/dynarec_arm64_00.c b/src/dynarec/arm64/dynarec_arm64_00.c index db688eb3..9a7bf04b 100755 --- a/src/dynarec/arm64/dynarec_arm64_00.c +++ b/src/dynarec/arm64/dynarec_arm64_00.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> diff --git a/src/dynarec/arm64/dynarec_arm64_0f.c b/src/dynarec/arm64/dynarec_arm64_0f.c index b19c6590..2ea4161c 100755 --- a/src/dynarec/arm64/dynarec_arm64_0f.c +++ b/src/dynarec/arm64/dynarec_arm64_0f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_64.c b/src/dynarec/arm64/dynarec_arm64_64.c index 3b2dc9ed..7452585c 100644 --- a/src/dynarec/arm64/dynarec_arm64_64.c +++ b/src/dynarec/arm64/dynarec_arm64_64.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -23,8 +22,6 @@ #include "dynarec_arm64_helper.h" #include "dynarec_arm64_functions.h" -#define GETG gd = ((nextop&0x38)>>3)+(rex.r<<3) - uintptr_t dynarec64_64(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, rex_t rex, int rep, int seg, int* ok, int* need_epilog) { (void)ip; (void)rep; (void)need_epilog; diff --git a/src/dynarec/arm64/dynarec_arm64_66.c b/src/dynarec/arm64/dynarec_arm64_66.c index 9b8e440c..5c558248 100755 --- a/src/dynarec/arm64/dynarec_arm64_66.c +++ b/src/dynarec/arm64/dynarec_arm64_66.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_660f.c b/src/dynarec/arm64/dynarec_arm64_660f.c index 243bd288..509263fb 100755 --- a/src/dynarec/arm64/dynarec_arm64_660f.c +++ b/src/dynarec/arm64/dynarec_arm64_660f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_6664.c b/src/dynarec/arm64/dynarec_arm64_6664.c index a92c1c7f..920bb3e7 100644 --- a/src/dynarec/arm64/dynarec_arm64_6664.c +++ b/src/dynarec/arm64/dynarec_arm64_6664.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -22,8 +21,6 @@ #include "dynarec_arm64_helper.h" #include "dynarec_arm64_functions.h" -#define GETG gd = ((nextop&0x38)>>3)+(rex.r<<3) - uintptr_t dynarec64_6664(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, rex_t rex, int seg, int* ok, int* need_epilog) { (void)ip; (void)need_epilog; diff --git a/src/dynarec/arm64/dynarec_arm64_66f0.c b/src/dynarec/arm64/dynarec_arm64_66f0.c index 3002042a..be92a709 100644 --- a/src/dynarec/arm64/dynarec_arm64_66f0.c +++ b/src/dynarec/arm64/dynarec_arm64_66f0.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_67.c b/src/dynarec/arm64/dynarec_arm64_67.c index be397617..cfe50d20 100755 --- a/src/dynarec/arm64/dynarec_arm64_67.c +++ b/src/dynarec/arm64/dynarec_arm64_67.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -22,14 +21,6 @@ #include "dynarec_arm64_helper.h" #include "dynarec_arm64_functions.h" -#define GETGX(a, w) \ - gd = ((nextop&0x38)>>3)+(rex.r<<3); \ - a = sse_get_reg(dyn, ninst, x1, gd, w) - -#define GETGM(a) \ - gd = ((nextop&0x38)>>3); \ - a = mmx_get_reg(dyn, ninst, x1, x2, x3, gd) - #define GETGm gd = ((nextop&0x38)>>3) uintptr_t dynarec64_67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, rex_t rex, int rep, int* ok, int* need_epilog) diff --git a/src/dynarec/arm64/dynarec_arm64_d8.c b/src/dynarec/arm64/dynarec_arm64_d8.c index 8cd4b738..a363945e 100644 --- a/src/dynarec/arm64/dynarec_arm64_d8.c +++ b/src/dynarec/arm64/dynarec_arm64_d8.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_d9.c b/src/dynarec/arm64/dynarec_arm64_d9.c index 051f82ed..fcb44d15 100644 --- a/src/dynarec/arm64/dynarec_arm64_d9.c +++ b/src/dynarec/arm64/dynarec_arm64_d9.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_db.c b/src/dynarec/arm64/dynarec_arm64_db.c index 51a759fd..89743516 100644 --- a/src/dynarec/arm64/dynarec_arm64_db.c +++ b/src/dynarec/arm64/dynarec_arm64_db.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_dc.c b/src/dynarec/arm64/dynarec_arm64_dc.c index 4883534e..bd6c98d1 100644 --- a/src/dynarec/arm64/dynarec_arm64_dc.c +++ b/src/dynarec/arm64/dynarec_arm64_dc.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_dd.c b/src/dynarec/arm64/dynarec_arm64_dd.c index 38fa7d46..b2697912 100644 --- a/src/dynarec/arm64/dynarec_arm64_dd.c +++ b/src/dynarec/arm64/dynarec_arm64_dd.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_de.c b/src/dynarec/arm64/dynarec_arm64_de.c index 175cb38e..99d22c02 100644 --- a/src/dynarec/arm64/dynarec_arm64_de.c +++ b/src/dynarec/arm64/dynarec_arm64_de.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_df.c b/src/dynarec/arm64/dynarec_arm64_df.c index 5c3ee841..522fe8f3 100644 --- a/src/dynarec/arm64/dynarec_arm64_df.c +++ b/src/dynarec/arm64/dynarec_arm64_df.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_emit_logic.c b/src/dynarec/arm64/dynarec_arm64_emit_logic.c index 668713a6..e8af51f5 100755 --- a/src/dynarec/arm64/dynarec_arm64_emit_logic.c +++ b/src/dynarec/arm64/dynarec_arm64_emit_logic.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "arm64_printer.h" #include "dynarec_arm64_private.h" diff --git a/src/dynarec/arm64/dynarec_arm64_emit_math.c b/src/dynarec/arm64/dynarec_arm64_emit_math.c index 96b1127f..f391f3a5 100755 --- a/src/dynarec/arm64/dynarec_arm64_emit_math.c +++ b/src/dynarec/arm64/dynarec_arm64_emit_math.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "arm64_printer.h" #include "dynarec_arm64_private.h" diff --git a/src/dynarec/arm64/dynarec_arm64_emit_shift.c b/src/dynarec/arm64/dynarec_arm64_emit_shift.c index 3c06f045..007002f0 100755 --- a/src/dynarec/arm64/dynarec_arm64_emit_shift.c +++ b/src/dynarec/arm64/dynarec_arm64_emit_shift.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "arm64_printer.h" #include "dynarec_arm64_private.h" diff --git a/src/dynarec/arm64/dynarec_arm64_emit_tests.c b/src/dynarec/arm64/dynarec_arm64_emit_tests.c index 4d032e02..447ce8c7 100755 --- a/src/dynarec/arm64/dynarec_arm64_emit_tests.c +++ b/src/dynarec/arm64/dynarec_arm64_emit_tests.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "arm64_printer.h" #include "dynarec_arm64_private.h" diff --git a/src/dynarec/arm64/dynarec_arm64_f0.c b/src/dynarec/arm64/dynarec_arm64_f0.c index faced29f..0d1c7391 100644 --- a/src/dynarec/arm64/dynarec_arm64_f0.c +++ b/src/dynarec/arm64/dynarec_arm64_f0.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_f20f.c b/src/dynarec/arm64/dynarec_arm64_f20f.c index 17f95f4c..c2d8a46e 100755 --- a/src/dynarec/arm64/dynarec_arm64_f20f.c +++ b/src/dynarec/arm64/dynarec_arm64_f20f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_f30f.c b/src/dynarec/arm64/dynarec_arm64_f30f.c index 5b3aa85e..d57d3c8b 100755 --- a/src/dynarec/arm64/dynarec_arm64_f30f.c +++ b/src/dynarec/arm64/dynarec_arm64_f30f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/arm64/dynarec_arm64_functions.c b/src/dynarec/arm64/dynarec_arm64_functions.c index dfd60eae..42dfd09e 100755 --- a/src/dynarec/arm64/dynarec_arm64_functions.c +++ b/src/dynarec/arm64/dynarec_arm64_functions.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <string.h> #include <math.h> @@ -13,7 +12,6 @@ #include "box64context.h" #include "dynarec.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/dynarec/arm64/dynarec_arm64_helper.c b/src/dynarec/arm64/dynarec_arm64_helper.c index 00a49905..e1b93026 100755 --- a/src/dynarec/arm64/dynarec_arm64_helper.c +++ b/src/dynarec/arm64/dynarec_arm64_helper.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <assert.h> #include <string.h> @@ -19,7 +18,6 @@ #include "x64trace.h" #include "dynarec_native.h" #include "../dynablock_private.h" -#include "../tools/bridge_private.h" #include "custommem.h" #include "arm64_printer.h" diff --git a/src/dynarec/arm64/dynarec_arm64_helper.h b/src/dynarec/arm64/dynarec_arm64_helper.h index ad395d13..ec3dbf33 100755 --- a/src/dynarec/arm64/dynarec_arm64_helper.h +++ b/src/dynarec/arm64/dynarec_arm64_helper.h @@ -853,7 +853,7 @@ #define MODREG ((nextop&0xC0)==0xC0) -void arm64_epilog(); +void arm64_epilog(void); void* arm64_next(x64emu_t* emu, uintptr_t addr); #ifndef STEPNAME diff --git a/src/dynarec/dynablock.c b/src/dynarec/dynablock.c index d9b668b3..a3e46c2b 100755 --- a/src/dynarec/dynablock.c +++ b/src/dynarec/dynablock.c @@ -1,6 +1,5 @@ #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <setjmp.h> #include <sys/mman.h> @@ -9,7 +8,6 @@ #include "box64context.h" #include "dynarec.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/dynarec/dynarec.c b/src/dynarec/dynarec.c index f0b8250d..42cc582b 100755 --- a/src/dynarec/dynarec.c +++ b/src/dynarec/dynarec.c @@ -1,6 +1,5 @@ #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <setjmp.h> @@ -8,7 +7,6 @@ #include "box64context.h" #include "dynarec.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/dynarec/dynarec_native.c b/src/dynarec/dynarec_native.c index 29162041..a79aa081 100755 --- a/src/dynarec/dynarec_native.c +++ b/src/dynarec/dynarec_native.c @@ -1,6 +1,5 @@ #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <string.h> #include <assert.h> @@ -10,7 +9,6 @@ #include "custommem.h" #include "dynarec.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/dynarec/dynarec_native_functions.c b/src/dynarec/dynarec_native_functions.c index b899a7b0..d71d8594 100644 --- a/src/dynarec/dynarec_native_functions.c +++ b/src/dynarec/dynarec_native_functions.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <string.h> #include <math.h> diff --git a/src/dynarec/dynarec_native_pass.c b/src/dynarec/dynarec_native_pass.c index b141a230..18c0f543 100755 --- a/src/dynarec/dynarec_native_pass.c +++ b/src/dynarec/dynarec_native_pass.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <string.h> diff --git a/src/dynarec/rv64/dynarec_rv64_00.c b/src/dynarec/rv64/dynarec_rv64_00.c index e2442ac6..c7704e56 100644 --- a/src/dynarec/rv64/dynarec_rv64_00.c +++ b/src/dynarec/rv64/dynarec_rv64_00.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_00_0.c b/src/dynarec/rv64/dynarec_rv64_00_0.c index bdb1561f..c9356618 100644 --- a/src/dynarec/rv64/dynarec_rv64_00_0.c +++ b/src/dynarec/rv64/dynarec_rv64_00_0.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_00_1.c b/src/dynarec/rv64/dynarec_rv64_00_1.c index 0e20d81a..03e15cd2 100644 --- a/src/dynarec/rv64/dynarec_rv64_00_1.c +++ b/src/dynarec/rv64/dynarec_rv64_00_1.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_00_2.c b/src/dynarec/rv64/dynarec_rv64_00_2.c index b2954435..9f9c7c8e 100644 --- a/src/dynarec/rv64/dynarec_rv64_00_2.c +++ b/src/dynarec/rv64/dynarec_rv64_00_2.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_00_3.c b/src/dynarec/rv64/dynarec_rv64_00_3.c index 2f625478..f0428791 100644 --- a/src/dynarec/rv64/dynarec_rv64_00_3.c +++ b/src/dynarec/rv64/dynarec_rv64_00_3.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <signal.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_0f.c b/src/dynarec/rv64/dynarec_rv64_0f.c index 62066767..3074dd5b 100644 --- a/src/dynarec/rv64/dynarec_rv64_0f.c +++ b/src/dynarec/rv64/dynarec_rv64_0f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_64.c b/src/dynarec/rv64/dynarec_rv64_64.c index fb73b049..0fbbd8c5 100644 --- a/src/dynarec/rv64/dynarec_rv64_64.c +++ b/src/dynarec/rv64/dynarec_rv64_64.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -23,8 +22,6 @@ #include "dynarec_rv64_helper.h" #include "dynarec_rv64_functions.h" -#define GETG gd = ((nextop&0x38)>>3)+(rex.r<<3) - uintptr_t dynarec64_64(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, rex_t rex, int rep, int seg, int* ok, int* need_epilog) { (void)ip; (void)rep; (void)need_epilog; diff --git a/src/dynarec/rv64/dynarec_rv64_66.c b/src/dynarec/rv64/dynarec_rv64_66.c index ddf79b51..2a7280a2 100644 --- a/src/dynarec/rv64/dynarec_rv64_66.c +++ b/src/dynarec/rv64/dynarec_rv64_66.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_660f.c b/src/dynarec/rv64/dynarec_rv64_660f.c index 21c95103..3f51289e 100644 --- a/src/dynarec/rv64/dynarec_rv64_660f.c +++ b/src/dynarec/rv64/dynarec_rv64_660f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_6664.c b/src/dynarec/rv64/dynarec_rv64_6664.c index 973b6bd1..fbf8b15d 100644 --- a/src/dynarec/rv64/dynarec_rv64_6664.c +++ b/src/dynarec/rv64/dynarec_rv64_6664.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -22,8 +21,6 @@ #include "dynarec_rv64_helper.h" #include "dynarec_rv64_functions.h" -#define GETG gd = ((nextop&0x38)>>3)+(rex.r<<3) - uintptr_t dynarec64_6664(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, rex_t rex, int seg, int* ok, int* need_epilog) { (void)ip; (void)need_epilog; diff --git a/src/dynarec/rv64/dynarec_rv64_66f0.c b/src/dynarec/rv64/dynarec_rv64_66f0.c index 4862b89b..ee2e0b66 100644 --- a/src/dynarec/rv64/dynarec_rv64_66f0.c +++ b/src/dynarec/rv64/dynarec_rv64_66f0.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_67.c b/src/dynarec/rv64/dynarec_rv64_67.c index fcbac89a..89ee4fe3 100644 --- a/src/dynarec/rv64/dynarec_rv64_67.c +++ b/src/dynarec/rv64/dynarec_rv64_67.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <assert.h> diff --git a/src/dynarec/rv64/dynarec_rv64_d8.c b/src/dynarec/rv64/dynarec_rv64_d8.c index 246221ce..7f14468b 100644 --- a/src/dynarec/rv64/dynarec_rv64_d8.c +++ b/src/dynarec/rv64/dynarec_rv64_d8.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_d9.c b/src/dynarec/rv64/dynarec_rv64_d9.c index f924eaff..4940d6b4 100644 --- a/src/dynarec/rv64/dynarec_rv64_d9.c +++ b/src/dynarec/rv64/dynarec_rv64_d9.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_db.c b/src/dynarec/rv64/dynarec_rv64_db.c index cc3eac61..7a5dddb0 100644 --- a/src/dynarec/rv64/dynarec_rv64_db.c +++ b/src/dynarec/rv64/dynarec_rv64_db.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_dc.c b/src/dynarec/rv64/dynarec_rv64_dc.c index 750789da..d802e2fb 100644 --- a/src/dynarec/rv64/dynarec_rv64_dc.c +++ b/src/dynarec/rv64/dynarec_rv64_dc.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_dd.c b/src/dynarec/rv64/dynarec_rv64_dd.c index c6151196..044f9aab 100644 --- a/src/dynarec/rv64/dynarec_rv64_dd.c +++ b/src/dynarec/rv64/dynarec_rv64_dd.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_de.c b/src/dynarec/rv64/dynarec_rv64_de.c index 1511c6ef..a2341b40 100644 --- a/src/dynarec/rv64/dynarec_rv64_de.c +++ b/src/dynarec/rv64/dynarec_rv64_de.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_df.c b/src/dynarec/rv64/dynarec_rv64_df.c index 4c4a6e9c..9dcc9500 100644 --- a/src/dynarec/rv64/dynarec_rv64_df.c +++ b/src/dynarec/rv64/dynarec_rv64_df.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_emit_logic.c b/src/dynarec/rv64/dynarec_rv64_emit_logic.c index 93ce00a6..1352868b 100644 --- a/src/dynarec/rv64/dynarec_rv64_emit_logic.c +++ b/src/dynarec/rv64/dynarec_rv64_emit_logic.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "rv64_printer.h" #include "dynarec_rv64_private.h" diff --git a/src/dynarec/rv64/dynarec_rv64_emit_math.c b/src/dynarec/rv64/dynarec_rv64_emit_math.c index c076f2d3..5d6f7e0e 100644 --- a/src/dynarec/rv64/dynarec_rv64_emit_math.c +++ b/src/dynarec/rv64/dynarec_rv64_emit_math.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "rv64_printer.h" #include "dynarec_rv64_private.h" diff --git a/src/dynarec/rv64/dynarec_rv64_emit_shift.c b/src/dynarec/rv64/dynarec_rv64_emit_shift.c index 00047afa..7030c674 100644 --- a/src/dynarec/rv64/dynarec_rv64_emit_shift.c +++ b/src/dynarec/rv64/dynarec_rv64_emit_shift.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "rv64_printer.h" #include "dynarec_rv64_private.h" diff --git a/src/dynarec/rv64/dynarec_rv64_emit_tests.c b/src/dynarec/rv64/dynarec_rv64_emit_tests.c index 76cc66d5..00c1fb7d 100644 --- a/src/dynarec/rv64/dynarec_rv64_emit_tests.c +++ b/src/dynarec/rv64/dynarec_rv64_emit_tests.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" @@ -16,7 +15,6 @@ #include "emu/x64run_private.h" #include "x64trace.h" #include "dynarec_native.h" -#include "../tools/bridge_private.h" #include "rv64_printer.h" #include "dynarec_rv64_private.h" diff --git a/src/dynarec/rv64/dynarec_rv64_f0.c b/src/dynarec/rv64/dynarec_rv64_f0.c index 513bb3d8..65a144da 100644 --- a/src/dynarec/rv64/dynarec_rv64_f0.c +++ b/src/dynarec/rv64/dynarec_rv64_f0.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_f20f.c b/src/dynarec/rv64/dynarec_rv64_f20f.c index d532c6f5..ac3da811 100644 --- a/src/dynarec/rv64/dynarec_rv64_f20f.c +++ b/src/dynarec/rv64/dynarec_rv64_f20f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_f30f.c b/src/dynarec/rv64/dynarec_rv64_f30f.c index 383c6482..0c0676e0 100644 --- a/src/dynarec/rv64/dynarec_rv64_f30f.c +++ b/src/dynarec/rv64/dynarec_rv64_f30f.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include "debug.h" diff --git a/src/dynarec/rv64/dynarec_rv64_functions.c b/src/dynarec/rv64/dynarec_rv64_functions.c index 7abec870..b31b79eb 100644 --- a/src/dynarec/rv64/dynarec_rv64_functions.c +++ b/src/dynarec/rv64/dynarec_rv64_functions.c @@ -1,7 +1,6 @@ #define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include <errno.h> #include <string.h> #include <math.h> @@ -13,7 +12,6 @@ #include "box64context.h" #include "dynarec.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/dynarec/rv64/dynarec_rv64_helper.c b/src/dynarec/rv64/dynarec_rv64_helper.c index 762d505b..52cb5ce6 100644 --- a/src/dynarec/rv64/dynarec_rv64_helper.c +++ b/src/dynarec/rv64/dynarec_rv64_helper.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> -#include <pthread.h> #include <errno.h> #include <assert.h> #include <string.h> @@ -20,7 +19,6 @@ #include "x64trace.h" #include "dynarec_native.h" #include "../dynablock_private.h" -#include "../tools/bridge_private.h" #include "custommem.h" #include "rv64_printer.h" diff --git a/src/dynarec/rv64/dynarec_rv64_helper.h b/src/dynarec/rv64/dynarec_rv64_helper.h index 0bca2b18..6ce62914 100644 --- a/src/dynarec/rv64/dynarec_rv64_helper.h +++ b/src/dynarec/rv64/dynarec_rv64_helper.h @@ -809,8 +809,8 @@ #define MODREG ((nextop&0xC0)==0xC0) -void rv64_epilog(); -void rv64_epilog_fast(); +void rv64_epilog(void); +void rv64_epilog_fast(void); void* rv64_next(x64emu_t* emu, uintptr_t addr); #ifndef STEPNAME diff --git a/src/include/box64context.h b/src/include/box64context.h index 954d93cb..5b2c5a63 100755 --- a/src/include/box64context.h +++ b/src/include/box64context.h @@ -217,7 +217,7 @@ typedef struct box64context_s { #define mutex_trylock(A) pthread_mutex_trylock(A) #define mutex_unlock(A) pthread_mutex_unlock(A) #else -int GetTID(); +int GetTID(void); #define mutex_lock(A) {uint32_t tid = (uint32_t)GetTID(); while(native_lock_storeifnull_d(A, tid)) sched_yield();} #define mutex_trylock(A) native_lock_storeifnull_d(A, (uint32_t)GetTID()) #define mutex_unlock(A) native_lock_storeifref_d(A, 0, (uint32_t)GetTID()) @@ -243,10 +243,10 @@ int AddTLSPartition(box64context_t* context, int tlssize); // defined in fact in threads.c void thread_set_emu(x64emu_t* emu); -x64emu_t* thread_get_emu(); +x64emu_t* thread_get_emu(void); // unlock mutex that are locked by current thread (for signal handling). Return a mask of unlock mutex -int unlockMutex(); +int unlockMutex(void); // relock the muxtex that were unlocked void relockMutex(int locks); diff --git a/src/include/bridge.h b/src/include/bridge.h index 9859ae85..77f4e41a 100755 --- a/src/include/bridge.h +++ b/src/include/bridge.h @@ -7,7 +7,7 @@ typedef struct bridge_s bridge_t; typedef struct box64context_s box64context_t; typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc); -bridge_t *NewBridge(); +bridge_t *NewBridge(void); void FreeBridge(bridge_t** bridge); uintptr_t AddBridge(bridge_t* bridge, wrapper_t w, void* fnc, int N, const char* name); @@ -22,13 +22,13 @@ uintptr_t AddVSyscall(bridge_t* bridge, int num); int hasAlternate(void* addr); void* getAlternate(void* addr); void addAlternate(void* addr, void* alt); -void cleanAlternate(); +void cleanAlternate(void); #ifdef HAVE_TRACE const char* getBridgeName(void* addr); #endif -void init_bridge_helper(); -void fini_bridge_helper(); +void init_bridge_helper(void); +void fini_bridge_helper(void); #endif //__BRIDGE_H_ \ No newline at end of file diff --git a/src/include/custommem.h b/src/include/custommem.h index e7623db2..13e73c4f 100644 --- a/src/include/custommem.h +++ b/src/include/custommem.h @@ -32,7 +32,7 @@ int setJumpTableIfRef64(void* addr, void* jmp, void* ref); // return 1 if write void setJumpTableDefault64(void* addr); void setJumpTableDefaultRef64(void* addr, void* jmp); int isJumpTableDefault64(void* addr); -uintptr_t getJumpTable64(); +uintptr_t getJumpTable64(void); uintptr_t getJumpTableAddress64(uintptr_t addr); uintptr_t getJumpAddress64(uintptr_t addr); @@ -64,7 +64,7 @@ void freeProtection(uintptr_t addr, size_t size); void refreshProtection(uintptr_t addr); uint32_t getProtection(uintptr_t addr); int getMmapped(uintptr_t addr); -void loadProtectionFromMap(); +void loadProtectionFromMap(void); #ifdef DYNAREC void protectDB(uintptr_t addr, size_t size); void unprotectDB(uintptr_t addr, size_t size, int mark); // if mark==0, the blocks are not marked as potentially dirty @@ -79,7 +79,7 @@ void* find47bitBlock(size_t size); void* find47bitBlockNearHint(void* hint, size_t size); // unlock mutex that are locked by current thread (for signal handling). Return a mask of unlock mutex -int unlockCustommemMutex(); +int unlockCustommemMutex(void); // relock the muxtex that were unlocked void relockCustommemMutex(int locks); diff --git a/src/include/debug.h b/src/include/debug.h index 352e9b12..8397d6c5 100755 --- a/src/include/debug.h +++ b/src/include/debug.h @@ -103,7 +103,7 @@ void printf_ftrace(const char* fmt, ...); #define EXPORTDYN #endif -void init_malloc_hook(); +void init_malloc_hook(void); extern size_t(*box_malloc_usable_size)(void*); #ifdef ANDROID extern void*(*__libc_malloc)(size_t); diff --git a/src/include/dictionnary.h b/src/include/dictionnary.h index e2ec1466..efa5e1cc 100755 --- a/src/include/dictionnary.h +++ b/src/include/dictionnary.h @@ -4,7 +4,7 @@ typedef void dic_t; -dic_t *NewDictionnary(); +dic_t *NewDictionnary(void); void FreeDictionnary(dic_t **dic); const char* AddDictionnary(dic_t* dic, const char* s); diff --git a/src/include/dynablock.h b/src/include/dynablock.h index ed7b3c8a..757ca4ae 100755 --- a/src/include/dynablock.h +++ b/src/include/dynablock.h @@ -19,6 +19,6 @@ dynablock_t* DBGetBlock(x64emu_t* emu, uintptr_t addr, int create, int is32bits) dynablock_t* DBAlternateBlock(x64emu_t* emu, uintptr_t addr, uintptr_t filladdr, int is32bits); // for use in signal handler -void cancelFillBlock(); +void cancelFillBlock(void); #endif //__DYNABLOCK_H_ \ No newline at end of file diff --git a/src/include/dynarec_rv64.h b/src/include/dynarec_rv64.h index 9abb704b..dd3b734e 100644 --- a/src/include/dynarec_rv64.h +++ b/src/include/dynarec_rv64.h @@ -4,7 +4,7 @@ typedef struct dynablock_s dynablock_t; typedef struct x64emu_s x64emu_t; -void CancelBlock64(); +void CancelBlock64(void); void* FillBlock64(dynablock_t* block, uintptr_t addr); #endif //__DYNAREC_RV64_H_ \ No newline at end of file diff --git a/src/include/fileutils.h b/src/include/fileutils.h index c666f0be..2e983c74 100755 --- a/src/include/fileutils.h +++ b/src/include/fileutils.h @@ -19,13 +19,13 @@ int FileIsX64ELF(const char* filename); int FileIsShell(const char* filename); // return temp folder (will return /tmp if nothing is correct) -const char* GetTmpDir(); +const char* GetTmpDir(void); // will lower case the string and return a copy. Nothing fancy here, just A..Z transformed to a..z, rest is untouched char* LowerCase(const char* s); #if defined(RPI) || defined(RK3399) || defined(RK3326) -void sanitize_mojosetup_gtk_background(); +void sanitize_mojosetup_gtk_background(void); #endif #endif //__FILEUTILS_H_ \ No newline at end of file diff --git a/src/include/globalsymbols.h b/src/include/globalsymbols.h index fc2753ef..d0eb3012 100755 --- a/src/include/globalsymbols.h +++ b/src/include/globalsymbols.h @@ -2,18 +2,18 @@ #define _GLOBAL_SYMBOLS_H_ //GTK stuff -void my_checkGlobalGdkDisplay(); -void my_setGlobalGThreadsInit(); +void my_checkGlobalGdkDisplay(void); +void my_setGlobalGThreadsInit(void); -//void** my_GetGTKDisplay(); -void** my_GetGthreadsGotInitialized(); // defined in wrappedgthread2 +//void** my_GetGTKDisplay(void); +void** my_GetGthreadsGotInitialized(void); // defined in wrappedgthread2 // NCurse / TInfo -void my_checkGlobalTInfo(); -void my_updateGlobalTInfo(); +void my_checkGlobalTInfo(void); +void my_updateGlobalTInfo(void); // getopt -void my_checkGlobalOpt(); -void my_updateGlobalOpt(); +void my_checkGlobalOpt(void); +void my_updateGlobalOpt(void); #endif //_GLOBAL_SYMBOLS_H_ \ No newline at end of file diff --git a/src/include/gtkclass.h b/src/include/gtkclass.h index ad262fda..6835a68b 100755 --- a/src/include/gtkclass.h +++ b/src/include/gtkclass.h @@ -840,7 +840,7 @@ my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, size_t parent); my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, size_t parent); void InitGTKClass(bridge_t *bridge); -void FiniGTKClass(); +void FiniGTKClass(void); #define GTKCLASSES() \ GTKCLASS(GObject) \ diff --git a/src/include/librarian.h b/src/include/librarian.h index 6219f00c..c05ce963 100755 --- a/src/include/librarian.h +++ b/src/include/librarian.h @@ -16,7 +16,7 @@ typedef char* cstr_t; lib_t *NewLibrarian(box64context_t* context, int ownlibs); void FreeLibrarian(lib_t **maplib, x64emu_t* emu); -dlprivate_t *NewDLPrivate(); +dlprivate_t *NewDLPrivate(void); void FreeDLPrivate(dlprivate_t **lib); box64context_t* GetLibrarianContext(lib_t* maplib); diff --git a/src/include/rcfile.h b/src/include/rcfile.h index c194e9ae..ebad7048 100644 --- a/src/include/rcfile.h +++ b/src/include/rcfile.h @@ -2,7 +2,7 @@ #define __RCFILE_H__ void LoadRCFile(const char* filename); -void DeleteParams(); +void DeleteParams(void); void ApplyParams(const char* name); #endif //__RCFILE_H__ \ No newline at end of file diff --git a/src/include/sdl1rwops.h b/src/include/sdl1rwops.h index 46b73519..76fd890f 100755 --- a/src/include/sdl1rwops.h +++ b/src/include/sdl1rwops.h @@ -4,7 +4,7 @@ typedef struct SDL1_RWops_s SDL1_RWops_t; // the actual SDL1 SDL_RWops typedef struct x64emu_s x64emu_t; -typedef SDL1_RWops_t* (*sdl1_allocrw)(); +typedef SDL1_RWops_t* (*sdl1_allocrw)(void); typedef void (*sdl1_freerw)(SDL1_RWops_t*); // each function will be added to dictionary, and each native functions will be wrapped so they run in emulated world diff --git a/src/include/sdl2rwops.h b/src/include/sdl2rwops.h index f03f17c2..1b13c091 100755 --- a/src/include/sdl2rwops.h +++ b/src/include/sdl2rwops.h @@ -4,7 +4,7 @@ typedef struct SDL2_RWops_s SDL2_RWops_t; // the actual SDL2 SDL_RWops typedef struct x64emu_s x64emu_t; -typedef SDL2_RWops_t* (*sdl2_allocrw)(); +typedef SDL2_RWops_t* (*sdl2_allocrw)(void); typedef void (*sdl2_freerw)(SDL2_RWops_t*); typedef struct SDL2RWSave_s { diff --git a/src/include/signals.h b/src/include/signals.h index 22e96d15..f3697f48 100755 --- a/src/include/signals.h +++ b/src/include/signals.h @@ -34,7 +34,7 @@ int my___sigaction(x64emu_t* emu, int signum, const x64_sigaction_t *act, x64_si int my_syscall_rt_sigaction(x64emu_t* emu, int signum, const x64_sigaction_restorer_t *act, x64_sigaction_restorer_t *oldact, int sigsetsize); void init_signal_helper(box64context_t* context); -void fini_signal_helper(); +void fini_signal_helper(void); void emit_signal(x64emu_t* emu, int sig, void* addr, int code); diff --git a/src/include/symbols.h b/src/include/symbols.h index a7ac4321..32e54b20 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -9,7 +9,7 @@ typedef struct versymbols_s versymbols_t; KHASH_MAP_DECLARE_STR(mapsymbols, versymbols_t) -kh_mapsymbols_t* NewMapSymbols(); +kh_mapsymbols_t* NewMapSymbols(void); void FreeMapSymbols(kh_mapsymbols_t** map); // replace if already there @@ -25,7 +25,7 @@ const char* GetSymbolName(kh_mapsymbols_t* mapsymbols, void* p, uintptr_t* offs, // default version handling KHASH_MAP_DECLARE_STR(defaultversion, const char*) -kh_defaultversion_t* NewDefaultVersion(); +kh_defaultversion_t* NewDefaultVersion(void); void FreeDefaultVersion(kh_defaultversion_t** def); void AddDefaultVersion(kh_defaultversion_t* def, const char* symname, const char* vername); diff --git a/src/include/threads.h b/src/include/threads.h index 847d4ee6..ec133d16 100755 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -12,9 +12,9 @@ typedef struct emu_jmpbuf_s { void CleanStackSize(box64context_t* context); -emu_jmpbuf_t* GetJmpBuf(); +emu_jmpbuf_t* GetJmpBuf(void); -void init_pthread_helper(); +void init_pthread_helper(void); void fini_pthread_helper(box64context_t* context); // prepare an "emuthread structure" in pet and return address of function pointer for a "thread creation routine" diff --git a/src/include/wine_tools.h b/src/include/wine_tools.h index 52993cea..5c60fec2 100755 --- a/src/include/wine_tools.h +++ b/src/include/wine_tools.h @@ -4,10 +4,10 @@ void wine_prereserve(const char* reserve); extern int wine_preloaded; -void* get_wine_prereserve(); +void* get_wine_prereserve(void); #ifdef DYNAREC -void dynarec_wine_prereserve(); +void dynarec_wine_prereserve(void); #endif #endif //__WINE_TOOLS_H__ diff --git a/src/include/x64emu.h b/src/include/x64emu.h index 355c7fa1..51a27a18 100755 --- a/src/include/x64emu.h +++ b/src/include/x64emu.h @@ -14,7 +14,7 @@ void CopyEmu(x64emu_t *newemu, const x64emu_t* emu); void SetTraceEmu(uintptr_t trace_start, uintptr_t trace_end); box64context_t* GetEmuContext(x64emu_t* emu); -uint32_t* GetParityTab(); +uint32_t* GetParityTab(void); uint32_t GetEAX(x64emu_t *emu); uint64_t GetRAX(x64emu_t *emu); diff --git a/src/include/x64run.h b/src/include/x64run.h index 0e156341..11f07cfa 100755 --- a/src/include/x64run.h +++ b/src/include/x64run.h @@ -11,6 +11,6 @@ int DynaRun(x64emu_t *emu); uint32_t LibSyscall(x64emu_t *emu); void PltResolver(x64emu_t* emu); extern uintptr_t pltResolver; -int GetTID(); +int GetTID(void); #endif //__X64RUN_H_ \ No newline at end of file diff --git a/src/include/x64trace.h b/src/include/x64trace.h index 9ecbb9d5..e7c3efd7 100755 --- a/src/include/x64trace.h +++ b/src/include/x64trace.h @@ -15,6 +15,4 @@ void DeleteX64TraceDecoder(zydis_dec_t **dec); const char* DecodeX64Trace(zydis_dec_t *dec, uintptr_t p); -#define ZYDIS_RUNTIME_ADDRESS_NONE (uint64_t)(-1) - #endif //__X64TRACE_H_ \ No newline at end of file diff --git a/src/libtools/threads.c b/src/libtools/threads.c index 83627da5..c2c6dfb1 100755 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -14,7 +14,6 @@ #include "box64context.h" #include "threads.h" #include "emu/x64emu_private.h" -#include "tools/bridge_private.h" #include "x64run.h" #include "x64emu.h" #include "box64stack.h" diff --git a/src/mallochook.c b/src/mallochook.c index 9317f301..d51a1416 100644 --- a/src/mallochook.c +++ b/src/mallochook.c @@ -43,7 +43,6 @@ */ #include "bridge.h" -#include "tools/bridge_private.h" #include "wrapper.h" #define SUPER() \ |