OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/i386: Convert to tcg_ops restore_state_to_opc 

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-24 20:18:03 +10:00
parent e9cc3aca11
commit 434382e640
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/i386/tcg/tcg-cpu.c
View File

@ -56,6 +56,24 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs,
} }
} }
static void x86_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb,
const uint64_t *data)
{
X86CPU *cpu = X86_CPU(cs);
CPUX86State *env = &cpu->env;
int cc_op = data[1];
if (TARGET_TB_PCREL) {
env->eip = (env->eip & TARGET_PAGE_MASK) | data[0];
} else {
env->eip = data[0] - tb->cs_base;
}
if (cc_op != CC_OP_DYNAMIC) {
env->cc_op = cc_op;
}
}
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
static bool x86_debug_check_breakpoint(CPUState *cs) static bool x86_debug_check_breakpoint(CPUState *cs)
{ {
@ -72,6 +90,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs)
static const struct TCGCPUOps x86_tcg_ops = { static const struct TCGCPUOps x86_tcg_ops = {
.initialize = tcg_x86_init, .initialize = tcg_x86_init,
.synchronize_from_tb = x86_cpu_synchronize_from_tb, .synchronize_from_tb = x86_cpu_synchronize_from_tb,
.restore_state_to_opc = x86_restore_state_to_opc,
.cpu_exec_enter = x86_cpu_exec_enter, .cpu_exec_enter = x86_cpu_exec_enter,
.cpu_exec_exit = x86_cpu_exec_exit, .cpu_exec_exit = x86_cpu_exec_exit,
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY

15
target/i386/tcg/translate.c
View File

@ -7023,18 +7023,3 @@ void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_insns,
translator_loop(cpu, tb, max_insns, pc, host_pc, &i386_tr_ops, &dc.base); translator_loop(cpu, tb, max_insns, pc, host_pc, &i386_tr_ops, &dc.base);
} }
void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb,
target_ulong *data)
{
int cc_op = data[1];
if (TARGET_TB_PCREL) {
env->eip = (env->eip & TARGET_PAGE_MASK) | data[0];
} else {
env->eip = data[0] - tb->cs_base;
}
if (cc_op != CC_OP_DYNAMIC) {
env->cc_op = cc_op;
}
}