| Message ID | 1298548457-10157-1-git-send-email-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
On 02/24/2011 12:54 PM, Aurelien Jarno wrote: > 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> Makes sense, thanks! You may want to rename intr_at_halt to env->in_sleep or something like that. Paolo
On Thu, Feb 24, 2011 at 01:05:02PM +0100, Paolo Bonzini wrote: > On 02/24/2011 12:54 PM, Aurelien Jarno wrote: > >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> > > Makes sense, thanks! > > You may want to rename intr_at_halt to env->in_sleep or something like that. > Agreed, I will send a new patch.
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();
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(-)