From fe33cc710327455a55bd4f44bc7aa69661cc7878 Mon Sep 17 00:00:00 2001
From: j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 3 Oct 2007 01:06:57 +0000
Subject: Fix PowerPC initialisation and first reset:  reset must occur after
 we defined the CPU features.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3317 c046a42c-6fe2-441c-8c8c-71466251a162
---
 target-ppc/helper.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'target-ppc')

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 438cad42a6..daee4c7a18 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2788,8 +2788,12 @@ void cpu_ppc_reset (void *opaque)
 #if defined(CONFIG_USER_ONLY)
     msr_fp = 1; /* Allow floating point exceptions */
     msr_pr = 1;
+#else
+#if defined(TARGET_PPC64)
+    env->nip = 0x00000100;
 #else
     env->nip = 0xFFFFFFFC;
+#endif
     ppc_tlb_invalidate_all(env);
 #endif
     do_compute_hflags(env);
@@ -2810,7 +2814,6 @@ CPUPPCState *cpu_ppc_init (void)
     if (!env)
         return NULL;
     cpu_exec_init(env);
-    cpu_ppc_reset(env);
 
     return env;
 }
-- 
cgit v1.2.1