yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-04 21:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: do not generate basic-block callback when translation is broken in the middle due to full cache

Browse source
This commit is contained in:
Nguyen Anh Quynh 2015-08-25 14:50:55 +08:00
parent e426ba78ee
commit c3e95ec34e
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/uc_priv.h
View file

@ -163,6 +163,8 @@ struct uc_struct {
uint64_t addr_end; // address where emulation stops (@end param of uc_emu_start()) uint64_t addr_end; // address where emulation stops (@end param of uc_emu_start())
int thumb; // thumb mode for ARM int thumb; // thumb mode for ARM
// full TCG cache leads to middle-block break in the last translation?
bool block_full;
}; };
#include "qemu_macro.h" #include "qemu_macro.h"

8
qemu/target-i386/translate.c
View file

@ -8256,6 +8256,7 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
target_ulong cs_base; target_ulong cs_base;
int num_insns; int num_insns;
int max_insns; int max_insns;
bool block_full = false;
/* generate intermediate code */ /* generate intermediate code */
pc_start = tb->pc; pc_start = tb->pc;
@ -8349,7 +8350,9 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
max_insns = CF_COUNT_MASK; max_insns = CF_COUNT_MASK;
// Unicorn: trace this block on request // Unicorn: trace this block on request
if (env->uc->hook_block) { // Only hook this block if it is not broken from previous translation due to
// full translation cache
if (env->uc->hook_block && !env->uc->block_full) {
struct hook_struct *trace = hook_find((uch)env->uc, UC_HOOK_BLOCK, pc_start); struct hook_struct *trace = hook_find((uch)env->uc, UC_HOOK_BLOCK, pc_start);
if (trace) { if (trace) {
env->uc->block_addr = pc_start; env->uc->block_addr = pc_start;
@ -8407,6 +8410,7 @@ static inline void gen_intermediate_code_internal(uint8_t *gen_opc_cc_op,
num_insns >= max_insns) { num_insns >= max_insns) {
gen_jmp_im(dc, pc_ptr - dc->cs_base); gen_jmp_im(dc, pc_ptr - dc->cs_base);
gen_eob(dc); gen_eob(dc);
block_full = true;
break; break;
} }
} }
@ -8427,6 +8431,8 @@ done_generating:
tb->size = pc_ptr - pc_start; tb->size = pc_ptr - pc_start;
// tb->icount = num_insns; // tb->icount = num_insns;
} }
env->uc->block_full = block_full;
} }
void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb) void gen_intermediate_code(CPUX86State *env, TranslationBlock *tb)

1
uc.c
View file

@ -414,6 +414,7 @@ uc_err uc_emu_start(uch handle, uint64_t begin, uint64_t until, uint64_t timeout
uc->emu_counter = 0; uc->emu_counter = 0;
uc->stop_request = false; uc->stop_request = false;
uc->invalid_error = UC_ERR_OK; uc->invalid_error = UC_ERR_OK;
uc->block_full = false;
switch(uc->arch) { switch(uc->arch) {
default: default: