[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/39] cpu-exec: Move halt handling out of cpu_exec()
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 34/39] cpu-exec: Move halt handling out of cpu_exec() |
Date: |
Thu, 12 May 2016 14:13:35 -1000 |
From: Sergey Fedorov <address@hidden>
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 <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
cpu-exec.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index d55faa5..529cac2 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -352,6 +352,28 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu,
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)
{
CPUClass *cc = CPU_GET_CLASS(cpu);
@@ -383,20 +405,8 @@ int cpu_exec(CPUState *cpu)
/* replay_interrupt may need current_cpu */
current_cpu = cpu;
- if (cpu->halted) {
-#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;
- }
-
- cpu->halted = 0;
+ if (cpu_handle_halt(cpu)) {
+ return EXCP_HALTED;
}
atomic_mb_set(&tcg_current_cpu, cpu);
--
2.5.5
- [Qemu-devel] [PULL 26/39] tcg: code_bitmap and code_write_count are not used by user-mode emulation, (continued)
- [Qemu-devel] [PULL 26/39] tcg: code_bitmap and code_write_count are not used by user-mode emulation, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 25/39] tcg: Allow goto_tb to any target PC in user mode, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 27/39] tcg: reorganize tb_find_physical loop, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 28/39] cpu-exec: elide more icount code if CONFIG_USER_ONLY, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 29/39] tcg: Clean up from 'next_tb', Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 31/39] cpu-exec: Move TB chaining into tb_find_fast(), Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 30/39] tcg: Rework tb_invalidated_flag, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 33/39] cpu-exec: Remove relic orphaned comment, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 32/39] tcg: Remove needless CPUState::current_tb, Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 35/39] cpu-exec: Move exception handling out of cpu_exec(), Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 34/39] cpu-exec: Move halt handling out of cpu_exec(),
Richard Henderson <=
- [Qemu-devel] [PULL 38/39] cpu-exec: Remove unused 'x86_cpu' and 'env' from cpu_exec(), Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 36/39] cpu-exec: Move interrupt handling out of cpu_exec(), Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 37/39] cpu-exec: Move TB execution stuff out of cpu_exec(), Richard Henderson, 2016/05/12
- [Qemu-devel] [PULL 39/39] cpu-exec: Clean up 'interrupt_request' reloading in cpu_handle_interrupt(), Richard Henderson, 2016/05/12
- Re: [Qemu-devel] [PULL 00/39] tcg-next patch queue, Peter Maydell, 2016/05/13