diff options
author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-01 21:49:57 +0000 |
---|---|---|
committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-01 21:49:57 +0000 |
commit | a97fed52e57385fc749e6f6ef95be7ebdb81ba9b (patch) | |
tree | fb26f5a0ca1db4d31479e4ee47bc27be9a2b63bd /target-ppc/op.c | |
parent | 51996525c77e61a050562900a499798ded8981d0 (diff) |
Fix reproductible crash: call cpu_loop_exit from micro-op, not from helper.c
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3311 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-ppc/op.c')
-rw-r--r-- | target-ppc/op.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/target-ppc/op.c b/target-ppc/op.c index 822c267695..72fd483463 100644 --- a/target-ppc/op.c +++ b/target-ppc/op.c @@ -351,7 +351,10 @@ void OPPROTO op_load_msr (void) void OPPROTO op_store_msr (void) { - do_store_msr(env, T0); + if (do_store_msr(env, T0)) { + env->halted = 1; + do_raise_exception(EXCP_HLT); + } RETURN(); } @@ -365,7 +368,10 @@ void OPPROTO op_update_riee (void) #if defined (TARGET_PPC64) void OPPROTO op_store_msr_32 (void) { - ppc_store_msr_32(env, T0); + if (ppc_store_msr_32(env, T0)) { + env->halted = 1; + do_raise_exception(EXCP_HLT); + } RETURN(); } #endif |