Rename PowerPC MMUCSR0 and MMUCFG SPRs: those are not BookE specific.

[qemu] / linux-user / main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index a06a706..9c3d67d 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1127,6 +1127,9 @@ void cpu_loop(CPUPPCState *env)
             printf("syscall returned 0x%08x (%d)\n", ret, ret);
 #endif
             break;
+        case EXCP_INTERRUPT:
+            /* just indicate that signals should be handled asap */
+            break;
         default:
             cpu_abort(env, "Unknown exception 0x%d. Aborting\n", trapnr);
             break;
@@ -2097,7 +2100,7 @@ int main(int argc, char **argv)
                       "Unable to find PowerPC CPU definition\n");
         }
         cpu_ppc_register(env, def);
-
+        cpu_ppc_reset(env);
         for (i = 0; i < 32; i++) {
             if (i != 12 && i != 6 && i != 13)
                 env->msr[i] = (regs->msr >> i) & 1;
@@ -2145,7 +2148,11 @@ int main(int argc, char **argv)
 
         /* Choose and initialise CPU */
         if (cpu_model == NULL)
+#if defined(TARGET_MIPSN32) || defined(TARGET_MIPS64)
+            cpu_model = "20Kc";
+#else
             cpu_model = "24Kf";
+#endif
         mips_find_by_name(cpu_model, &def);
         if (def == NULL)
             cpu_abort(env, "Unable to find MIPS CPU definition\n");