Fix CPU type zapped by system_reset

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2743 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 0812e95a370e6563ff1f42f875c3c5c421e69902..645b41422880ffa1b46b60a35ab6e8e3abb72634 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -3301,7 +3301,6 @@ extern int ram_size;
 
 void cpu_reset(CPUSPARCState *env)
 {
-    memset(env, 0, sizeof(*env));
     tlb_flush(env, 1);
     env->cwp = 0;
     env->wim = 1;
@@ -3313,14 +3312,15 @@ void cpu_reset(CPUSPARCState *env)
     env->cansave = NWINDOWS - 1;
 #endif
 #else
+    env->psret = 0;
     env->psrs = 1;
     env->psrps = 1;
-    env->gregs[1] = ram_size;
 #ifdef TARGET_SPARC64
     env->pstate = PS_PRIV;
     env->pc = 0x1fff0000000ULL;
 #else
     env->pc = 0xffd00000;
+    env->mmuregs[0] &= ~(MMU_E | MMU_NF);
 #endif
     env->npc = env->pc + 4;
 #endif