summaryrefslogtreecommitdiff
path: root/target-cris/op_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/op_helper.c
parentda9fa17ee9bece7e7ef54681832427c1d6baf554 (diff)
downloadqemu-8219314be689f54ff9814e55d619f87b9d66452a.zip
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/op_helper.c')
-rw-r--r--target-cris/op_helper.c4
1 files changed, 2 insertions, 2 deletions
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)