From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K4Zwf-0000pf-QO
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 07:17:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K4Zwf-0000ov-1b
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 07:17:21 -0400
Received: from [199.232.76.173] (port=48201 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K4Zwe-0000ok-Sa
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 07:17:20 -0400
Received: from savannah.gnu.org ([199.232.41.3]:50335 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <edgar.iglesias@gmail.com>)
	id 1K4Zwe-0001bW-Ln
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 07:17:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <edgar.iglesias@gmail.com>) id 1K4Zwd-0007Cq-D2
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 11:17:19 +0000
Received: from edgar_igl by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <edgar_igl@savannah.gnu.org>) id 1K4Zwc-0007Ca-JI
	for qemu-devel@nongnu.org; Fri, 06 Jun 2008 11:17:19 +0000
MIME-Version: 1.0
Errors-To: edgar_igl
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-Id: <E1K4Zwc-0007Ca-JI@cvs.savannah.gnu.org>
Date: Fri, 06 Jun 2008 11:17:18 +0000
Subject: [Qemu-devel] [4683] Correct P flag assertion in rfe.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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;
 }