kernel command line support (Daniel Jacobowitz)

[qemu] / cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 5c85c1e..7c056d4 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -265,11 +265,11 @@ int cpu_exec(CPUState *env1)
         }
     }
 #elif defined(TARGET_PPC)
-    if (env1->msr[MSR_POW]) {
+    if (env1->halted) {
         if (env1->msr[MSR_EE] && 
             (env1->interrupt_request & 
              (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER))) {
-            env1->msr[MSR_POW] = 0;
+            env1->halted = 0;
         } else {
             return EXCP_HALTED;
         }
@@ -904,7 +904,7 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address,
         /* we restore the process signal mask as the sigreturn should
            do it (XXX: use sigsetjmp) */
         sigprocmask(SIG_SETMASK, old_set, NULL);
-        raise_exception_err(EXCP0E_PAGE, env->error_code);
+        raise_exception_err(env->exception_index, env->error_code);
     } else {
         /* activate soft MMU for this block */
         env->hflags |= HF_SOFTMMU_MASK;