diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-14 08:48:23 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-14 08:48:23 +0000 |
| commit | e63ecc6f68d5f9349683aef5d74e36137eafb72d (patch) | |
| tree | c4ef66e5b7139ab1ce8685d19ccc767c4c42e233 /target-ppc | |
| parent | 22f8a8b31c1e20df835eb4a779c573647753ee77 (diff) | |
| download | qemu-e63ecc6f68d5f9349683aef5d74e36137eafb72d.zip | |
Do not allow PowerPC CPU restart after entering checkstop mode.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3388 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/helper.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/target-ppc/helper.c b/target-ppc/helper.c index dd5a07a53f..b3f3ae6d72 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2156,10 +2156,18 @@ static always_inline void powerpc_excp (CPUState *env, goto store_next; case POWERPC_EXCP_MCHECK: /* Machine check exception */ if (msr_me == 0) { - /* Machine check exception is not enabled */ - /* XXX: we may just stop the processor here, to allow debugging */ - excp = POWERPC_EXCP_RESET; - goto excp_reset; + /* Machine check exception is not enabled. + * Enter checkstop state. + */ + if (loglevel != 0) { + fprintf(logfile, "Machine check while not allowed. " + "Entering checkstop state\n"); + } else { + fprintf(stderr, "Machine check while not allowed. " + "Entering checkstop state\n"); + } + env->halted = 1; + env->interrupt_request |= CPU_INTERRUPT_EXITTB; } msr_ri = 0; msr_me = 0; @@ -2413,7 +2421,6 @@ static always_inline void powerpc_excp (CPUState *env, #if defined(TARGET_PPC64H) msr_hv = 1; #endif - excp_reset: goto store_next; #if defined(TARGET_PPC64) case POWERPC_EXCP_DSEG: /* Data segment exception */ |