Commit df52b0009bcd7cb10e52f37cb669c3b46a4b36b0
1 parent
8f40c388
sun4m halt support (Blue Swirl)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2161 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
4 additions
and
5 deletions
cpu-exec.c
| @@ -548,8 +548,10 @@ int cpu_exec(CPUState *env1) | @@ -548,8 +548,10 @@ int cpu_exec(CPUState *env1) | ||
| 548 | //do_interrupt(0, 0, 0, 0, 0); | 548 | //do_interrupt(0, 0, 0, 0, 0); |
| 549 | env->interrupt_request &= ~CPU_INTERRUPT_TIMER; | 549 | env->interrupt_request &= ~CPU_INTERRUPT_TIMER; |
| 550 | } else if (interrupt_request & CPU_INTERRUPT_HALT) { | 550 | } else if (interrupt_request & CPU_INTERRUPT_HALT) { |
| 551 | - env1->halted = 1; | ||
| 552 | - return EXCP_HALTED; | 551 | + env->interrupt_request &= ~CPU_INTERRUPT_HALT; |
| 552 | + env->halted = 1; | ||
| 553 | + env->exception_index = EXCP_HLT; | ||
| 554 | + cpu_loop_exit(); | ||
| 553 | } | 555 | } |
| 554 | #elif defined(TARGET_ARM) | 556 | #elif defined(TARGET_ARM) |
| 555 | if (interrupt_request & CPU_INTERRUPT_FIQ | 557 | if (interrupt_request & CPU_INTERRUPT_FIQ |
hw/slavio_misc.c
| @@ -123,10 +123,7 @@ static void slavio_misc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32 | @@ -123,10 +123,7 @@ static void slavio_misc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32 | ||
| 123 | break; | 123 | break; |
| 124 | case 0xa000000: | 124 | case 0xa000000: |
| 125 | MISC_DPRINTF("Write power management %2.2x\n", val & 0xff); | 125 | MISC_DPRINTF("Write power management %2.2x\n", val & 0xff); |
| 126 | -#if 0 | ||
| 127 | - // XXX almost works | ||
| 128 | cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HALT); | 126 | cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HALT); |
| 129 | -#endif | ||
| 130 | break; | 127 | break; |
| 131 | } | 128 | } |
| 132 | } | 129 | } |