diff options
Diffstat (limited to 'src/dynarec')
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_pass0.h | 2 | ||||
| -rw-r--r-- | src/dynarec/dynarec_native.c | 12 | ||||
| -rw-r--r-- | src/dynarec/dynarec_native_functions.c | 6 | ||||
| -rw-r--r-- | src/dynarec/la64/dynarec_la64_pass0.h | 2 | ||||
| -rw-r--r-- | src/dynarec/rv64/dynarec_rv64_pass0.h | 2 | ||||
| -rw-r--r-- | src/dynarec/rv64/dynarec_rv64_pass3.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/dynarec/arm64/dynarec_arm64_pass0.h b/src/dynarec/arm64/dynarec_arm64_pass0.h index 64dfd500..ec792acb 100644 --- a/src/dynarec/arm64/dynarec_arm64_pass0.h +++ b/src/dynarec/arm64/dynarec_arm64_pass0.h @@ -50,7 +50,7 @@ PKip(0), PKip(1), PKip(2), PKip(3), PKip(4), PKip(5), PKip(6), PKip(7), PKip(8), PKip(9), \ PKip(10), PKip(11), PKip(12), PKip(13), PKip(14)); \ } \ - printFunctionAddr(ip, " => "); \ + PrintFunctionAddr(ip, " => "); \ dynarec_log_prefix(0, LOG_NONE, "\n"); \ } diff --git a/src/dynarec/dynarec_native.c b/src/dynarec/dynarec_native.c index 197a163e..5478fc43 100644 --- a/src/dynarec/dynarec_native.c +++ b/src/dynarec/dynarec_native.c @@ -46,11 +46,11 @@ void printf_x64_instruction(dynarec_native_t* dyn, zydis_dec_t* dec, instruction // print Call function name if possible if(ip[0]==0xE8 || ip[0]==0xE9) { // Call / Jmp uintptr_t nextaddr = (uintptr_t)ip + 5 + *((int32_t*)(ip+1)); - printFunctionAddr(nextaddr, "=> "); + PrintFunctionAddr(nextaddr, "=> "); } else if(ip[0]==0xFF) { if(ip[1]==0x25) { uintptr_t nextaddr = (uintptr_t)ip + 6 + *((int32_t*)(ip+2)); - printFunctionAddr(nextaddr, "=> "); + PrintFunctionAddr(nextaddr, "=> "); } } // end of line and colors @@ -235,7 +235,7 @@ int next_instruction(dynarec_native_t *dyn, uintptr_t addr) case 0xF3: nextop = PK(1); switch(nextop) { - case 0x90: + case 0x90: return 2; default: break; } @@ -279,7 +279,7 @@ void addInst(instsize_t* insts, size_t* size, int x64_size, int native_size) toadd = 1 + native_size/15; while(toadd) { if(x64_size>15) - insts[*size].x64 = 15; + insts[*size].x64 = 15; else insts[*size].x64 = x64_size; x64_size -= insts[*size].x64; @@ -764,7 +764,7 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr, int alternate, int is32bit CancelBlock64(0); return NULL; } - + // pass 2, instruction size helper.callrets = static_callrets; native_pass2(&helper, addr, alternate, is32bits, inst_max); @@ -824,7 +824,7 @@ void* FillBlock64(dynablock_t* block, uintptr_t addr, int alternate, int is32bit // pass 3, emit (log emit native opcode) if(BOX64DRENV(dynarec_dump)) { dynarec_log(LOG_NONE, "%s%04d|Emitting %zu bytes for %u %s bytes (native=%zu, table64=%zu, instsize=%zu, arch=%zu, callrets=%zu)", (BOX64DRENV(dynarec_dump)>1)?"\e[01;36m":"", GetTID(), helper.native_size, helper.isize, is32bits?"x86":"x64", native_size, helper.table64size*sizeof(uint64_t), insts_rsize, arch_size, callret_size); - printFunctionAddr(helper.start, " => "); + PrintFunctionAddr(helper.start, " => "); dynarec_log(LOG_NONE, "%s\n", (BOX64DRENV(dynarec_dump)>1)?"\e[m":""); } if (BOX64ENV(dynarec_gdbjit) && (!BOX64ENV(dynarec_gdbjit_end) || (addr >= BOX64ENV(dynarec_gdbjit_start) && addr < BOX64ENV(dynarec_gdbjit_end)))) { diff --git a/src/dynarec/dynarec_native_functions.c b/src/dynarec/dynarec_native_functions.c index e3813ff4..015058ad 100644 --- a/src/dynarec/dynarec_native_functions.c +++ b/src/dynarec/dynarec_native_functions.c @@ -20,7 +20,7 @@ #include "emu/x64run_private.h" #include "emu/x87emu_private.h" #include "x64trace.h" -#include "signals.h" +#include "mysignal.h" #include "emit_signals.h" #include "dynarec_native.h" #include "custommem.h" @@ -629,7 +629,7 @@ int is_avx_zero_unset(dynarec_native_t* dyn, int ninst, int reg) { if((dyn->ymm_zero>>reg)&1) { dyn->ymm_zero &= ~(1<<reg); - return 1; + return 1; } return 0; } @@ -651,7 +651,7 @@ void propagate_nodf(dynarec_native_t* dyn, int ninst) if(dyn->insts[ninst].x64.gen_flags || dyn->insts[ninst].x64.use_flags) return; // flags are use, so maybe it's needed dyn->insts[ninst].df_notneeded = 1; - --ninst; + --ninst; } } diff --git a/src/dynarec/la64/dynarec_la64_pass0.h b/src/dynarec/la64/dynarec_la64_pass0.h index 12ebe225..3193aca1 100644 --- a/src/dynarec/la64/dynarec_la64_pass0.h +++ b/src/dynarec/la64/dynarec_la64_pass0.h @@ -65,6 +65,6 @@ PKip(0), PKip(1), PKip(2), PKip(3), PKip(4), PKip(5), PKip(6), PKip(7), PKip(8), PKip(9), \ PKip(10), PKip(11), PKip(12), PKip(13), PKip(14)); \ } \ - printFunctionAddr(ip, " => "); \ + PrintFunctionAddr(ip, " => "); \ dynarec_log_prefix(0, LOG_NONE, "\n"); \ } diff --git a/src/dynarec/rv64/dynarec_rv64_pass0.h b/src/dynarec/rv64/dynarec_rv64_pass0.h index 8dc5d8a0..2f77b610 100644 --- a/src/dynarec/rv64/dynarec_rv64_pass0.h +++ b/src/dynarec/rv64/dynarec_rv64_pass0.h @@ -85,7 +85,7 @@ PKip(0), PKip(1), PKip(2), PKip(3), PKip(4), PKip(5), PKip(6), PKip(7), PKip(8), PKip(9), \ PKip(10), PKip(11), PKip(12), PKip(13), PKip(14)); \ } \ - printFunctionAddr(ip, " => "); \ + PrintFunctionAddr(ip, " => "); \ dynarec_log_prefix(0, LOG_NONE, "\n"); \ } diff --git a/src/dynarec/rv64/dynarec_rv64_pass3.h b/src/dynarec/rv64/dynarec_rv64_pass3.h index 1fec3dcb..5176c5c4 100644 --- a/src/dynarec/rv64/dynarec_rv64_pass3.h +++ b/src/dynarec/rv64/dynarec_rv64_pass3.h @@ -54,7 +54,7 @@ PKip(0), PKip(1), PKip(2), PKip(3), PKip(4), PKip(5), PKip(6), PKip(7), PKip(8), PKip(9), \ PKip(10), PKip(11), PKip(12), PKip(13), PKip(14)); \ } \ - printFunctionAddr(ip, " => "); \ + PrintFunctionAddr(ip, " => "); \ dynarec_log_prefix(0, LOG_NONE, "\n"); \ } \ return 0 |