diff options
| -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 789d1880b7..74ff97a908 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 2999c023c0..61bc1211dd 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 d2038bd842..8f36d313cd 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 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(); |