[Qemu-devel] [PATCH] target-sh4: move intr_at_halt out of cpu_halted()

* [Qemu-devel] [PATCH] target-sh4: move intr_at_halt out of cpu_halted()
@ 2011-02-24 11:54 Aurelien Jarno
  2011-02-24 12:05 ` [Qemu-devel] " Paolo Bonzini
  0 siblings, 1 reply; 3+ messages in thread
From: Aurelien Jarno @ 2011-02-24 11:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Aurelien Jarno

All targets except SH4 have the same cpu_halted() routine, and it has
only one caller. It is therefore a good candidate for inlining.

The difference is the handling of the intr_at_halt, which is necessary
to ignore SR.BL when sleeping. Move intr_at_halt handling out of it, by
setting this variable while executing the sleep instruction, and
clearing it when the CPU has been woken-up by an interrupt, whatever the
state of SR.BL.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 target-sh4/exec.h      |    1 -
 target-sh4/helper.c    |    2 +-
 target-sh4/op_helper.c |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index 2999c02..61bc121 100644
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -37,7 +37,6 @@ static inline int cpu_halted(CPUState *env) {
         return 0;
     if (cpu_has_work(env)) {
         env->halted = 0;
-        env->intr_at_halt = 1;
         return 0;
     }
     return EXCP_HALTED;
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index b9fcba6..1f0d15b 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -93,8 +93,8 @@ void do_interrupt(CPUState * env)
         if (do_irq && !env->intr_at_halt) {
             return; /* masked */
         }
-        env->intr_at_halt = 0;
     }
+    env->intr_at_halt = 0;
 
     if (do_irq) {
         irq_vector = sh_intc_get_pending_vector(env->intc_handle,
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index 30f9842..2cd7fed 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -119,6 +119,7 @@ void helper_debug(void)
 void helper_sleep(uint32_t next_pc)
 {
     env->halted = 1;
+    env->intr_at_halt = 1;
     env->exception_index = EXCP_HLT;
     env->pc = next_pc;
     cpu_loop_exit();
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread