diff options
| -rw-r--r-- | cpu-exec.c | 6 | ||||
| -rw-r--r-- | hw/slavio_misc.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index eeeeb8f5db..6385639f46 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -548,8 +548,10 @@ int cpu_exec(CPUState *env1) //do_interrupt(0, 0, 0, 0, 0); env->interrupt_request &= ~CPU_INTERRUPT_TIMER; } else if (interrupt_request & CPU_INTERRUPT_HALT) { - env1->halted = 1; - return EXCP_HALTED; + env->interrupt_request &= ~CPU_INTERRUPT_HALT; + env->halted = 1; + env->exception_index = EXCP_HLT; + cpu_loop_exit(); } #elif defined(TARGET_ARM) if (interrupt_request & CPU_INTERRUPT_FIQ diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 904f44e515..a48a7af5c0 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -123,10 +123,7 @@ static void slavio_misc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32 break; case 0xa000000: MISC_DPRINTF("Write power management %2.2x\n", val & 0xff); -#if 0 - // XXX almost works cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HALT); -#endif break; } } |