From: bellard <bellard>
Date: Wed, 20 Sep 2006 20:30:57 +0000 (+0000)
Subject: sun4m halt support (Blue Swirl)
X-Git-Tag: release_0_9_1~1734
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a73b457e21a73d0770ff08e612580d9948b0236;p=qemu-xen-4.0-testing.git

sun4m halt support (Blue Swirl)
---

diff --git a/cpu-exec.c b/cpu-exec.c
index eeeeb8f5..6385639f 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 904f44e5..a48a7af5 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;
     }
 }