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/op_helper.c | |
| parent | 8a231487bc45ad5e5a70c747d9f35027922fb640 (diff) | |
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/op_helper.c')
| -rw-r--r-- | target-sh4/op_helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 30f9842295..b8f4ca28ed 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(); |