diff options
| -rw-r--r-- | hw/ppc.c | 8 | ||||
| -rw-r--r-- | target-ppc/helper.c | 17 |
2 files changed, 13 insertions, 12 deletions
@@ -103,6 +103,7 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level) case PPC6xx_INPUT_CKSTP_IN: /* Level sensitive - active low */ /* XXX: TODO: relay the signal to CKSTP_OUT pin */ + /* XXX: Note that the only way to restart the CPU is to reset it */ if (level) { #if defined(PPC_DEBUG_IRQ) if (loglevel & CPU_LOG_INT) { @@ -110,13 +111,6 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level) } #endif env->halted = 1; - } else { -#if defined(PPC_DEBUG_IRQ) - if (loglevel & CPU_LOG_INT) { - fprintf(logfile, "%s: restart the CPU\n", __func__); - } -#endif - env->halted = 0; } break; case PPC6xx_INPUT_HRESET: 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 */ |