Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several bugfixes #2049

Merged
merged 4 commits into from
Nov 4, 2024
Merged

Several bugfixes #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67af3fe
Remove global variable from aarch64 tcg target
tbodt Nov 2, 2024
15031a7
Reenable writing to jit region while calling tb_add_jump
tbodt Nov 2, 2024
d6b2f43
Don't forget to call restore_jit_state in uc_context_restore
tbodt Nov 2, 2024
dd62e60
Restore pc before calling into tlb fill hook
tbodt Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions qemu/accel/tcg/cpu-exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,9 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
}
/* See if we can patch the calling TB. */
if (last_tb) {
tb_exec_unlock(cpu->uc);
tb_add_jump(last_tb, tb_exit, tb);
tb_exec_lock(cpu->uc);
}

return tb;
Expand Down
1 change: 1 addition & 0 deletions qemu/include/tcg/tcg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ struct TCGContext {
TCGv_i64 cpu_bndu[4];

/* qemu/tcg/i386/tcg-target.inc.c */
/* qemu/tcg/aarch64/tcg-target.inc.c */
void *tb_ret_addr;

/* target/riscv/translate.c */
Expand Down
2 changes: 2 additions & 0 deletions qemu/softmmu/unicorn_vtlb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ bool unicorn_fill_tlb(CPUState *cs, vaddr address, int size,
struct hook *hook;
HOOK_FOREACH_VAR_DECLARE;

cpu_restore_state(cs, retaddr, false);

HOOK_FOREACH(uc, hook, UC_HOOK_TLB_FILL) {
if (hook->to_delete) {
continue;
Expand Down
6 changes: 2 additions & 4 deletions qemu/tcg/aarch64/tcg-target.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,8 +1858,6 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
#endif /* CONFIG_SOFTMMU */
}

static tcg_insn_unit *tb_ret_addr;

static void tcg_out_op(TCGContext *s, TCGOpcode opc,
const TCGArg args[TCG_MAX_OP_ARGS],
const int const_args[TCG_MAX_OP_ARGS])
Expand All @@ -1885,7 +1883,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
tcg_out_goto_long(s, s->code_gen_epilogue);
} else {
tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_X0, a0);
tcg_out_goto_long(s, tb_ret_addr);
tcg_out_goto_long(s, s->tb_ret_addr);
}
break;

Expand Down Expand Up @@ -2859,7 +2857,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out_movi(s, TCG_TYPE_REG, TCG_REG_X0, 0);

/* TB epilogue */
tb_ret_addr = s->code_ptr;
s->tb_ret_addr = s->code_ptr;

/* Remove TCG locals stack space. */
tcg_out_insn(s, 3401, ADDI, TCG_TYPE_I64, TCG_REG_SP, TCG_REG_SP,
Expand Down
6 changes: 5 additions & 1 deletion uc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,7 @@ uc_err uc_context_restore(uc_engine *uc, uc_context *context)
uc->snapshot_level = context->snapshot_level;
ret = uc_restore_latest_snapshot(uc);
if (ret != UC_ERR_OK) {
restore_jit_state(uc);
return ret;
}
uc_snapshot(uc);
Expand All @@ -2441,9 +2442,12 @@ uc_err uc_context_restore(uc_engine *uc, uc_context *context)
if (uc->context_content & UC_CTL_CONTEXT_CPU) {
if (!uc->context_restore) {
memcpy(uc->cpu->env_ptr, context->data, context->context_size);
restore_jit_state(uc);
return UC_ERR_OK;
} else {
return uc->context_restore(uc, context);
ret = uc->context_restore(uc, context);
restore_jit_state(uc);
return ret;
}
}
return UC_ERR_OK;
Expand Down
Loading