yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-11 06:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu-exec: Move TB chaining into tb_find_fast()

Browse source 
Move tb_add_jump() call and surrounding code from cpu_exec() into
tb_find_fast(). That simplifies cpu_exec() a little by hiding the direct
chaining optimization details into tb_find_fast(). It also allows to
move tb_lock()/tb_unlock() pair into tb_find_fast(), putting it closer
to tb_find_slow() which also manipulates the lock.

Backports commit a0522c7a55cc8ac76d82884cf8e52f76daa664cc from qemu
This commit is contained in:
Sergey Fedorov 2018-02-23 23:37:10 -05:00 committed by Lioncash
parent ba9a237586
commit 73c75b4cf7
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
qemu/cpu-exec.c
View file

@ -30,7 +30,9 @@
static tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb); static tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb);
static TranslationBlock *tb_find_slow(CPUState *cpu, target_ulong pc, static TranslationBlock *tb_find_slow(CPUState *cpu, target_ulong pc,
target_ulong cs_base, uint64_t flags); target_ulong cs_base, uint64_t flags);
static TranslationBlock *tb_find_fast(CPUState *cpu); static TranslationBlock *tb_find_fast(CPUState *cpu,
TranslationBlock **last_tb,
int tb_exit);
static void cpu_handle_debug_exception(CPUState *cpu); static void cpu_handle_debug_exception(CPUState *cpu);
/* main execution loop */ /* main execution loop */
@ -182,24 +184,12 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu)
cpu->exception_index = EXCP_INTERRUPT; cpu->exception_index = EXCP_INTERRUPT;
cpu_loop_exit(cpu); cpu_loop_exit(cpu);
} }
tb = tb_find_fast(cpu); // UNICORN tb = tb_find_fast(cpu, &last_tb, tb_exit);
if (!tb) { // invalid TB due to invalid code? if (!tb) { // invalid TB due to invalid code?
uc->invalid_error = UC_ERR_FETCH_UNMAPPED; uc->invalid_error = UC_ERR_FETCH_UNMAPPED;
ret = EXCP_HLT; ret = EXCP_HLT;
break; break;
} }
if (cpu->tb_flushed) {
/* Ensure that no TB jump will be modified as the
* translation buffer has been flushed.
*/
last_tb = NULL;
cpu->tb_flushed = false;
}
/* See if we can patch the calling TB. */
if (last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
tb_add_jump(last_tb, tb_exit, tb);
}
if (likely(!cpu->exit_request)) { if (likely(!cpu->exit_request)) {
uintptr_t ret; uintptr_t ret;
cpu->current_tb = tb; cpu->current_tb = tb;
@ -382,7 +372,9 @@ found:
return tb; return tb;
} }
static TranslationBlock *tb_find_fast(CPUState *cpu) static inline TranslationBlock *tb_find_fast(CPUState *cpu,
TranslationBlock **last_tb,
int tb_exit)
{ {
CPUArchState *env = (CPUArchState *)cpu->env_ptr; CPUArchState *env = (CPUArchState *)cpu->env_ptr;
TranslationBlock *tb; TranslationBlock *tb;
@ -393,11 +385,26 @@ static TranslationBlock *tb_find_fast(CPUState *cpu)
always be the same before a given translated block always be the same before a given translated block
is executed. */ is executed. */
cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
// Unicorn: commented out
//tb_lock();
tb = cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]; tb = cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)];
if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base || if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
tb->flags != flags)) { tb->flags != flags)) {
tb = tb_find_slow(cpu, pc, cs_base, flags); // qq tb = tb_find_slow(cpu, pc, cs_base, flags); // qq
} }
if (cpu->tb_flushed) {
/* Ensure that no TB jump will be modified as the
* translation buffer has been flushed.
*/
*last_tb = NULL;
cpu->tb_flushed = false;
}
/* See if we can patch the calling TB. */
if (*last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
tb_add_jump(*last_tb, tb_exit, tb);
}
// Unicorn: commented out
//tb_unlock();
return tb; return tb;
} }