From d8251ec441a312bcc52554b56392a68da00bc7c4 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 16 Apr 2020 07:40:47 +0200 Subject: [PATCH] Fix link on non-dynarec build --- src/dynarec/arm_emitter.h | 4 ++++ src/include/debug.h | 4 +--- src/main.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/dynarec/arm_emitter.h b/src/dynarec/arm_emitter.h index 9e39d79b..64874a6e 100755 --- a/src/dynarec/arm_emitter.h +++ b/src/dynarec/arm_emitter.h @@ -875,6 +875,10 @@ Op is 20-27 #define VTBL1_8(Dd, Dn, Dm) EMIT(VTBL_gen(((Dd)>>4)&1, (Dn)&15, (Dd)&15, 0b00, ((Dn)>>4)&1, 0, ((Dm)>>4)&1, (Dm)&15)) // Vector Table lookup, take elements from Dn/Dn+1, and using lookup table Dm, put elements in Dd #define VTBL2_8(Dd, Dn, Dm) EMIT(VTBL_gen(((Dd)>>4)&1, (Dn)&15, (Dd)&15, 0b01, ((Dn)>>4)&1, 0, ((Dm)>>4)&1, (Dm)&15)) +// Vector Table lookup eXtension, take elements from Dn, and using lookup table Dm, put elements in Dd, outer element untouched +#define VTBLX1_8(Dd, Dn, Dm) EMIT(VTBL_gen(((Dd)>>4)&1, (Dn)&15, (Dd)&15, 0b00, ((Dn)>>4)&1, 1, ((Dm)>>4)&1, (Dm)&15)) +// Vector Table lookup eXtension, take elements from Dn/Dn+1, and using lookup table Dm, put elements in Dd, outer element untouched +#define VTBLX2_8(Dd, Dn, Dm) EMIT(VTBL_gen(((Dd)>>4)&1, (Dn)&15, (Dd)&15, 0b01, ((Dn)>>4)&1, 1, ((Dm)>>4)&1, (Dm)&15)) #define VRECPE_gen(D, size, Vd, F, Q, M, Vm) (0b1111<<28 | 0b0011<<24 | 1<<23 | (D)<<22 | 0b11<<20 | (size)<<18 | 0b11<<16 | (Vd)<<12 | 0b010<<9 | (F)<<8 | (Q)<<6 | (M)<<5 | (Vm)) // Vector Reciprocal Estimate of Dm to Dd diff --git a/src/include/debug.h b/src/include/debug.h index 08a688d3..b5ecc39f 100755 --- a/src/include/debug.h +++ b/src/include/debug.h @@ -2,9 +2,9 @@ #define __DEBUG_H_ extern int box86_log; // log level +extern int box86_dynarec_log; #ifdef DYNAREC extern int box86_dynarec_dump; -extern int box86_dynarec_log; extern int box86_dynarec; extern int box86_dynarec_linker; extern int box86_dynarec_trace; @@ -29,9 +29,7 @@ extern FILE* ftrace; #define printf_log(L, ...) do {if(L<=box86_log) {fprintf(ftrace, __VA_ARGS__); fflush(ftrace);}} while(0) -#ifdef DYNAREC #define dynarec_log(L, ...) do {if(L<=box86_dynarec_log) {fprintf(ftrace, __VA_ARGS__); fflush(ftrace);}} while(0) -#endif #define EXPORT __attribute__((visibility("default"))) diff --git a/src/main.c b/src/main.c index b33b5701..4f734f41 100755 --- a/src/main.c +++ b/src/main.c @@ -37,9 +37,9 @@ #include "auxval.h" int box86_log = LOG_INFO;//LOG_NONE; +int box86_dynarec_log = LOG_NONE; #ifdef DYNAREC int box86_dynarec_dump = 0; -int box86_dynarec_log = LOG_NONE; int box86_dynarec = 1; int box86_dynarec_linker = 1; int box86_dynarec_forced = 0;