From bf443337130809afc7887dd59e0a29fe605155eb Mon Sep 17 00:00:00 2001 From: edgar_igl Date: Fri, 6 Jun 2008 11:17:17 +0000 Subject: [PATCH] Correct P flag assertion in rfe. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4683 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-cris/op_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index ebff31a1de..21ee5ee1c5 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -202,6 +202,8 @@ static void cris_ccs_rshift(CPUState *env) void helper_rfe(void) { + int rflag = env->pregs[PR_CCS] & R_FLAG; + D(fprintf(logfile, "rfe: erp=%x pid=%x ccs=%x btarget=%x\n", env->pregs[PR_ERP], env->pregs[PR_PID], env->pregs[PR_CCS], @@ -210,7 +212,7 @@ void helper_rfe(void) cris_ccs_rshift(env); /* RFE sets the P_FLAG only if the R_FLAG is not set. */ - if (!(env->pregs[PR_CCS] & R_FLAG)) + if (!rflag) env->pregs[PR_CCS] |= P_FLAG; }