motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

accel/tcg: Pass TCGTBCPUState to tb_gen_code

Browse source 
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-04-29 18:59:26 -07:00
parent cec7176a23
commit 18a77386f1
3 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
accel/tcg/cpu-exec.c
View file

@ -574,7 +574,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
tb = tb_lookup(cpu, s); tb = tb_lookup(cpu, s);
if (tb == NULL) { if (tb == NULL) {
mmap_lock(); mmap_lock();
tb = tb_gen_code(cpu, s.pc, s.cs_base, s.flags, s.cflags); tb = tb_gen_code(cpu, s);
mmap_unlock(); mmap_unlock();
} }
@ -951,7 +951,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)
uint32_t h; uint32_t h;
mmap_lock(); mmap_lock();
tb = tb_gen_code(cpu, s.pc, s.cs_base, s.flags, s.cflags); tb = tb_gen_code(cpu, s);
mmap_unlock(); mmap_unlock();
/* /*

5
accel/tcg/internal-common.h
View file

@ -12,6 +12,7 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/translation-block.h" #include "exec/translation-block.h"
#include "exec/mmap-lock.h" #include "exec/mmap-lock.h"
#include "accel/tcg/tb-cpu-state.h"
extern int64_t max_delay; extern int64_t max_delay;
extern int64_t max_advance; extern int64_t max_advance;
@ -46,9 +47,7 @@ static inline bool cpu_plugin_mem_cbs_enabled(const CPUState *cpu)
#endif #endif
} }
TranslationBlock *tb_gen_code(CPUState *cpu, vaddr pc, TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUState s);
uint64_t cs_base, uint32_t flags,
int cflags);
void page_init(void); void page_init(void);
void tb_htable_init(void); void tb_htable_init(void);
void tb_reset_jump(TranslationBlock *tb, int n); void tb_reset_jump(TranslationBlock *tb, int n);

28
accel/tcg/translate-all.c
View file

@ -290,9 +290,7 @@ static int setjmp_gen_code(CPUArchState *env, TranslationBlock *tb,
} }
/* Called with mmap_lock held for user mode emulation. */ /* Called with mmap_lock held for user mode emulation. */
TranslationBlock *tb_gen_code(CPUState *cpu, TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUState s)
vaddr pc, uint64_t cs_base,
uint32_t flags, int cflags)
{ {
CPUArchState *env = cpu_env(cpu); CPUArchState *env = cpu_env(cpu);
TranslationBlock *tb, *existing_tb; TranslationBlock *tb, *existing_tb;
@ -305,14 +303,14 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
assert_memory_lock(); assert_memory_lock();
qemu_thread_jit_write(); qemu_thread_jit_write();
phys_pc = get_page_addr_code_hostp(env, pc, &host_pc); phys_pc = get_page_addr_code_hostp(env, s.pc, &host_pc);
if (phys_pc == -1) { if (phys_pc == -1) {
/* Generate a one-shot TB with 1 insn in it */ /* Generate a one-shot TB with 1 insn in it */
cflags = (cflags & ~CF_COUNT_MASK) | 1; s.cflags = (s.cflags & ~CF_COUNT_MASK) | 1;
} }
max_insns = cflags & CF_COUNT_MASK; max_insns = s.cflags & CF_COUNT_MASK;
if (max_insns == 0) { if (max_insns == 0) {
max_insns = TCG_MAX_INSNS; max_insns = TCG_MAX_INSNS;
} }
@ -332,12 +330,12 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
gen_code_buf = tcg_ctx->code_gen_ptr; gen_code_buf = tcg_ctx->code_gen_ptr;
tb->tc.ptr = tcg_splitwx_to_rx(gen_code_buf); tb->tc.ptr = tcg_splitwx_to_rx(gen_code_buf);
if (!(cflags & CF_PCREL)) { if (!(s.cflags & CF_PCREL)) {
tb->pc = pc; tb->pc = s.pc;
} }
tb->cs_base = cs_base; tb->cs_base = s.cs_base;
tb->flags = flags; tb->flags = s.flags;
tb->cflags = cflags; tb->cflags = s.cflags;
tb_set_page_addr0(tb, phys_pc); tb_set_page_addr0(tb, phys_pc);
tb_set_page_addr1(tb, -1); tb_set_page_addr1(tb, -1);
if (phys_pc != -1) { if (phys_pc != -1) {
@ -355,9 +353,9 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
tcg_ctx->guest_mo = cpu->cc->tcg_ops->guest_default_memory_order; tcg_ctx->guest_mo = cpu->cc->tcg_ops->guest_default_memory_order;
restart_translate: restart_translate:
trace_translate_block(tb, pc, tb->tc.ptr); trace_translate_block(tb, s.pc, tb->tc.ptr);
gen_code_size = setjmp_gen_code(env, tb, pc, host_pc, &max_insns, &ti); gen_code_size = setjmp_gen_code(env, tb, s.pc, host_pc, &max_insns, &ti);
if (unlikely(gen_code_size < 0)) { if (unlikely(gen_code_size < 0)) {
switch (gen_code_size) { switch (gen_code_size) {
case -1: case -1:
@ -434,10 +432,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
* For CF_PCREL, attribute all executions of the generated code * For CF_PCREL, attribute all executions of the generated code
* to its first mapping. * to its first mapping.
*/ */
perf_report_code(pc, tb, tcg_splitwx_to_rx(gen_code_buf)); perf_report_code(s.pc, tb, tcg_splitwx_to_rx(gen_code_buf));
if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) &&
qemu_log_in_addr_range(pc)) { qemu_log_in_addr_range(s.pc)) {
FILE *logfile = qemu_log_trylock(); FILE *logfile = qemu_log_trylock();
if (logfile) { if (logfile) {
int code_size, data_size; int code_size, data_size;