summaryrefslogtreecommitdiff
path: root/target-cris/helper.c
diff options
context:
space:
mode:
authorLars Persson <lars.persson@axis.com>2012-06-14 16:23:55 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2012-06-15 13:21:32 +0200
commit8219314be689f54ff9814e55d619f87b9d66452a (patch)
tree138134c99e9f48d09f653a0986823a475d2eb4b8 /target-cris/helper.c
parentda9fa17ee9bece7e7ef54681832427c1d6baf554 (diff)
downloadqemu-8219314be689f54ff9814e55d619f87b9d66452a.tar.gz
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>
Diffstat (limited to 'target-cris/helper.c')
-rw-r--r--target-cris/helper.c4
1 files changed, 2 insertions, 2 deletions
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;