cpu-exec: Move halt handling out of cpu_exec()
Simplify cpu_exec() by extracting CPU halt state handling code out of cpu_exec() into a new static inline function cpu_handle_halt(). Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net> Message-Id: <1462962111-32237-2-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
c6f0d9f84c
commit
8b2d34e997
36
cpu-exec.c
36
cpu-exec.c
|
@ -352,6 +352,28 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu,
|
||||||
return tb;
|
return tb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool cpu_handle_halt(CPUState *cpu)
|
||||||
|
{
|
||||||
|
if (cpu->halted) {
|
||||||
|
#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
|
||||||
|
if ((cpu->interrupt_request & CPU_INTERRUPT_POLL)
|
||||||
|
&& replay_interrupt()) {
|
||||||
|
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||||
|
apic_poll_irq(x86_cpu->apic_state);
|
||||||
|
cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (!cpu_has_work(cpu)) {
|
||||||
|
current_cpu = NULL;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
cpu->halted = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static void cpu_handle_debug_exception(CPUState *cpu)
|
static void cpu_handle_debug_exception(CPUState *cpu)
|
||||||
{
|
{
|
||||||
CPUClass *cc = CPU_GET_CLASS(cpu);
|
CPUClass *cc = CPU_GET_CLASS(cpu);
|
||||||
|
@ -383,22 +405,10 @@ int cpu_exec(CPUState *cpu)
|
||||||
/* replay_interrupt may need current_cpu */
|
/* replay_interrupt may need current_cpu */
|
||||||
current_cpu = cpu;
|
current_cpu = cpu;
|
||||||
|
|
||||||
if (cpu->halted) {
|
if (cpu_handle_halt(cpu)) {
|
||||||
#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
|
|
||||||
if ((cpu->interrupt_request & CPU_INTERRUPT_POLL)
|
|
||||||
&& replay_interrupt()) {
|
|
||||||
apic_poll_irq(x86_cpu->apic_state);
|
|
||||||
cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if (!cpu_has_work(cpu)) {
|
|
||||||
current_cpu = NULL;
|
|
||||||
return EXCP_HALTED;
|
return EXCP_HALTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
cpu->halted = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
atomic_mb_set(&tcg_current_cpu, cpu);
|
atomic_mb_set(&tcg_current_cpu, cpu);
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue