ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accel/tcg: rename tb_lookup__cpu_state and hoist state extraction 

Having a function return either and valid TB and some system state
seems excessive. It will make the subsequent re-factoring easier if we
lookup the current state where we are.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210224165811.11567-2-alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Alex Bennée 2021-02-24 16:58:07 +00:00 committed by Richard Henderson
parent 9e9acb7b34
commit 6f04cb1c8f
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
accel/tcg/cpu-exec.c
View File

@ -245,6 +245,7 @@ static void cpu_exec_exit(CPUState *cpu)
void cpu_exec_step_atomic(CPUState *cpu) void cpu_exec_step_atomic(CPUState *cpu)
{ {
CPUArchState *env = (CPUArchState *)cpu->env_ptr;
TranslationBlock *tb; TranslationBlock *tb;
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
@ -258,7 +259,9 @@ void cpu_exec_step_atomic(CPUState *cpu)
g_assert(!cpu->running); g_assert(!cpu->running);
cpu->running = true; cpu->running = true;
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, cf_mask); cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
tb = tb_lookup(cpu, pc, cs_base, flags, cf_mask);
if (tb == NULL) { if (tb == NULL) {
mmap_lock(); mmap_lock();
tb = tb_gen_code(cpu, pc, cs_base, flags, cflags); tb = tb_gen_code(cpu, pc, cs_base, flags, cflags);
@ -418,11 +421,14 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
TranslationBlock *last_tb, TranslationBlock *last_tb,
int tb_exit, uint32_t cf_mask) int tb_exit, uint32_t cf_mask)
{ {
CPUArchState *env = (CPUArchState *)cpu->env_ptr;
TranslationBlock *tb; TranslationBlock *tb;
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, cf_mask); cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
tb = tb_lookup(cpu, pc, cs_base, flags, cf_mask);
if (tb == NULL) { if (tb == NULL) {
mmap_lock(); mmap_lock();
tb = tb_gen_code(cpu, pc, cs_base, flags, cf_mask); tb = tb_gen_code(cpu, pc, cs_base, flags, cf_mask);

4
accel/tcg/tcg-runtime.c
View File

@ -152,7 +152,9 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env)
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, curr_cflags()); cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
tb = tb_lookup(cpu, pc, cs_base, flags, curr_cflags());
if (tb == NULL) { if (tb == NULL) {
return tcg_code_gen_epilogue; return tcg_code_gen_epilogue;
} }

18
include/exec/tb-lookup.h
View File

@ -17,30 +17,28 @@
#include "exec/tb-hash.h" #include "exec/tb-hash.h"
/* Might cause an exception, so have a longjmp destination ready */ /* Might cause an exception, so have a longjmp destination ready */
static inline TranslationBlock * static inline TranslationBlock *tb_lookup(CPUState *cpu, target_ulong pc,
tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base, target_ulong cs_base,
uint32_t *flags, uint32_t cf_mask) uint32_t flags, uint32_t cf_mask)
{ {
CPUArchState *env = (CPUArchState *)cpu->env_ptr;
TranslationBlock *tb; TranslationBlock *tb;
uint32_t hash; uint32_t hash;
cpu_get_tb_cpu_state(env, pc, cs_base, flags); hash = tb_jmp_cache_hash_func(pc);
hash = tb_jmp_cache_hash_func(*pc);
tb = qatomic_rcu_read(&cpu->tb_jmp_cache[hash]); tb = qatomic_rcu_read(&cpu->tb_jmp_cache[hash]);
cf_mask &= ~CF_CLUSTER_MASK; cf_mask &= ~CF_CLUSTER_MASK;
cf_mask |= cpu->cluster_index << CF_CLUSTER_SHIFT; cf_mask |= cpu->cluster_index << CF_CLUSTER_SHIFT;
if (likely(tb && if (likely(tb &&
tb->pc == *pc && tb->pc == pc &&
tb->cs_base == *cs_base && tb->cs_base == cs_base &&
tb->flags == *flags && tb->flags == flags &&
tb->trace_vcpu_dstate == *cpu->trace_dstate && tb->trace_vcpu_dstate == *cpu->trace_dstate &&
(tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask)) { (tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask)) {
return tb; return tb;
} }
tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags, cf_mask); tb = tb_htable_lookup(cpu, pc, cs_base, flags, cf_mask);
if (tb == NULL) { if (tb == NULL) {
return NULL; return NULL;
} }