diff options
| author | Lars Persson <lars.persson@axis.com> | 2012-06-14 16:23:55 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2012-06-15 13:21:32 +0200 |
| commit | 8219314be689f54ff9814e55d619f87b9d66452a (patch) | |
| tree | 138134c99e9f48d09f653a0986823a475d2eb4b8 | |
| parent | da9fa17ee9bece7e7ef54681832427c1d6baf554 (diff) | |
cris: Fix NMI-flag handling on crisv10.
- The M-flag is encoded in different bits on cris v10 and cris v32.
Signed-off-by: Lars Persson <larper@axis.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rw-r--r-- | cpu-exec.c | 17 | ||||
| -rw-r--r-- | target-cris/cpu.h | 3 | ||||
| -rw-r--r-- | target-cris/helper.c | 4 | ||||
| -rw-r--r-- | target-cris/op_helper.c | 4 |
4 files changed, 18 insertions, 10 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 83cac932ed..624c409f7b 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -467,11 +467,18 @@ int cpu_exec(CPUArchState *env) do_interrupt(env); next_tb = 0; } - if (interrupt_request & CPU_INTERRUPT_NMI - && (env->pregs[PR_CCS] & M_FLAG)) { - env->exception_index = EXCP_NMI; - do_interrupt(env); - next_tb = 0; + if (interrupt_request & CPU_INTERRUPT_NMI) { + unsigned int m_flag_archval; + if (env->pregs[PR_VR] < 32) { + m_flag_archval = M_FLAG_V10; + } else { + m_flag_archval = M_FLAG_V32; + } + if ((env->pregs[PR_CCS] & m_flag_archval)) { + env->exception_index = EXCP_NMI; + do_interrupt(env); + next_tb = 0; + } } #elif defined(TARGET_M68K) if (interrupt_request & CPU_INTERRUPT_HARD diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 73004af010..4f4df6d9b5 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -69,13 +69,14 @@ /* CPU flags. */ #define Q_FLAG 0x80000000 -#define M_FLAG 0x40000000 +#define M_FLAG_V32 0x40000000 #define PFIX_FLAG 0x800 /* CRISv10 Only. */ #define F_FLAG_V10 0x400 #define P_FLAG_V10 0x200 #define S_FLAG 0x200 #define R_FLAG 0x100 #define P_FLAG 0x80 +#define M_FLAG_V10 0x80 #define U_FLAG 0x40 #define I_FLAG 0x20 #define X_FLAG 0x10 diff --git a/target-cris/helper.c b/target-cris/helper.c index dcc19ef63b..bfbc29ec6a 100644 --- a/target-cris/helper.c +++ b/target-cris/helper.c @@ -127,7 +127,7 @@ static void do_interruptv10(CPUCRISState *env) case EXCP_NMI: /* NMI is hardwired to vector zero. */ ex_vec = 0; - env->pregs[PR_CCS] &= ~M_FLAG; + env->pregs[PR_CCS] &= ~M_FLAG_V10; env->pregs[PRV10_BRP] = env->pc; break; @@ -185,7 +185,7 @@ void do_interrupt(CPUCRISState *env) case EXCP_NMI: /* NMI is hardwired to vector zero. */ ex_vec = 0; - env->pregs[PR_CCS] &= ~M_FLAG; + env->pregs[PR_CCS] &= ~M_FLAG_V32; env->pregs[PR_NRP] = env->pc; break; diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index b92c106e10..ac7c98c8ed 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -247,8 +247,8 @@ void helper_rfn(void) if (!rflag) env->pregs[PR_CCS] |= P_FLAG; - /* Always set the M flag. */ - env->pregs[PR_CCS] |= M_FLAG; + /* Always set the M flag. */ + env->pregs[PR_CCS] |= M_FLAG_V32; } uint32_t helper_lz(uint32_t t0) |