From: edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 6 Jun 2008 11:17:17 +0000 (+0000)
Subject: Correct P flag assertion in rfe.
X-Git-Tag: release_0_10_0~2003
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf443337130809afc7887dd59e0a29fe605155eb;p=thirdparty%2Fqemu.git

Correct P flag assertion in rfe.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4683 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index ebff31a1de2..21ee5ee1c54 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;
 }