[Qemu-devel] [4683] Correct P flag assertion in rfe.

[Edgar E. Iglesias]

Revision: 4683
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4683
Author:   edgar_igl
Date:     2008-06-06 11:17:17 +0000 (Fri, 06 Jun 2008)

Log Message:
-----------
Correct P flag assertion in rfe.

Modified Paths:
--------------
    trunk/target-cris/op_helper.c

Modified: trunk/target-cris/op_helper.c
===================================================================
--- trunk/target-cris/op_helper.c       2008-06-06 11:07:50 UTC (rev 4682)
+++ trunk/target-cris/op_helper.c       2008-06-06 11:17:17 UTC (rev 4683)
@@ -202,6 +202,8 @@
 
 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 @@
        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;
 }