diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-02-24 12:31:41 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-03 23:33:22 +0100 |
| commit | efac4154711863128558b5b65486ac79b760367e (patch) | |
| tree | 7eba947ea407303db2a322f7015e166e66affa27 /target-sh4 | |
| parent | 8a231487bc45ad5e5a70c747d9f35027922fb640 (diff) | |
| download | qemu-efac4154711863128558b5b65486ac79b760367e.zip qemu-efac4154711863128558b5b65486ac79b760367e.tar.gz qemu-efac4154711863128558b5b65486ac79b760367e.tar.bz2 | |
target-sh4: move intr_at_halt out of cpu_halted()
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. Also rename this variable in_sleep.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target-sh4')
| -rw-r--r-- | target-sh4/cpu.h | 2 | ||||
| -rw-r--r-- | target-sh4/exec.h | 1 | ||||
| -rw-r--r-- | target-sh4/helper.c | 4 | ||||
| -rw-r--r-- | target-sh4/op_helper.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 789d188..74ff97a 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -184,7 +184,7 @@ typedef struct CPUSH4State { uint32_t cvr; /* Cache Version Register */ void *intc_handle; - int intr_at_halt; /* SR_BL ignored during sleep */ + int in_sleep; /* SR_BL ignored during sleep */ memory_content *movcal_backup; memory_content **movcal_backup_tail; } CPUSH4State; 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 d2038bd..8f36d31 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -90,11 +90,11 @@ void do_interrupt(CPUState * env) if (do_exp && env->exception_index != 0x1e0) { env->exception_index = 0x000; /* masked exception -> reset */ } - if (do_irq && !env->intr_at_halt) { + if (do_irq && !env->in_sleep) { return; /* masked */ } - env->intr_at_halt = 0; } + env->in_sleep = 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..b8f4ca2 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->in_sleep = 1; env->exception_index = EXCP_HLT; env->pc = next_pc; cpu_loop_exit(); |