From b4b7b88f6983ef0994b26c9af055d6fb1fd01ba0 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sat, 24 Feb 2018 00:16:37 -0500 Subject: [PATCH] cpu-exec: Remove unused 'x86_cpu' and 'env' from cpu_exec() Backports commit ba048a4ae15ba0f70c6dcb12ee05db120408de78 from qemu --- qemu/cpu-exec.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c index f2a97fa9..8cabd4a1 100644 --- a/qemu/cpu-exec.c +++ b/qemu/cpu-exec.c @@ -354,9 +354,6 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu) { CPUArchState *env = cpu->env_ptr; CPUClass *cc = CPU_GET_CLASS(uc, cpu); -#ifdef TARGET_I386 - X86CPU *x86_cpu = X86_CPU(uc, cpu); -#endif int ret; if (cpu_handle_halt(cpu)) { @@ -410,17 +407,10 @@ int cpu_exec(struct uc_struct *uc, CPUState *cpu) cpu = uc->current_cpu; env = cpu->env_ptr; cc = CPU_GET_CLASS(uc, cpu); -#ifdef TARGET_I386 - x86_cpu = X86_CPU(uc, cpu); -#endif #else /* buggy compiler */ /* Assert that the compiler does not smash local variables. */ g_assert(cpu == current_cpu); g_assert(cc == CPU_GET_CLASS(cpu)); -#ifdef TARGET_I386 - g_assert(x86_cpu == X86_CPU(cpu)); - g_assert(env == &x86_cpu->env); -#endif #endif /* buggy compiler */ cpu->can_do_io = 1; }