mirror of https://github.com/xemu-project/xemu.git
target-ppc: Use cpu_exec_enter qom hook
Cc: qemu-ppc@nongnu.org Signed-off-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 1410626734-3804-6-git-send-email-rth@twiddle.net Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
00f3fd63e1
commit
774f0abeae
|
@ -352,9 +352,6 @@ int cpu_exec(CPUArchState *env)
|
||||||
cpu->exit_request = 1;
|
cpu->exit_request = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(TARGET_PPC)
|
|
||||||
env->reserve_addr = -1;
|
|
||||||
#endif
|
|
||||||
cc->cpu_exec_enter(cpu);
|
cc->cpu_exec_enter(cpu);
|
||||||
cpu->exception_index = -1;
|
cpu->exception_index = -1;
|
||||||
|
|
||||||
|
|
|
@ -9456,6 +9456,14 @@ static bool ppc_cpu_has_work(CPUState *cs)
|
||||||
return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
|
return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ppc_cpu_exec_enter(CPUState *cs)
|
||||||
|
{
|
||||||
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||||
|
CPUPPCState *env = &cpu->env;
|
||||||
|
|
||||||
|
env->reserve_addr = -1;
|
||||||
|
}
|
||||||
|
|
||||||
/* CPUClass::reset() */
|
/* CPUClass::reset() */
|
||||||
static void ppc_cpu_reset(CPUState *s)
|
static void ppc_cpu_reset(CPUState *s)
|
||||||
{
|
{
|
||||||
|
@ -9638,6 +9646,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
|
||||||
cc->write_elf64_qemunote = ppc64_cpu_write_elf64_qemunote;
|
cc->write_elf64_qemunote = ppc64_cpu_write_elf64_qemunote;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
cc->cpu_exec_enter = ppc_cpu_exec_enter;
|
||||||
|
|
||||||
cc->gdb_num_core_regs = 71;
|
cc->gdb_num_core_regs = 71;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue