From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KMUi9-0003gh-KJ
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 17:20:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KMUi9-0003gV-Bb
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 17:20:25 -0400
Received: from [199.232.76.173] (port=44069 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KMUi9-0003gS-4J
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 17:20:25 -0400
Received: from savannah.gnu.org ([199.232.41.3]:33576 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 1KMUi8-00069m-Vs
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 17:20:25 -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 1KMUi7-000874-E4
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 21:20:23 +0000
Received: from edgar_igl by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <edgar_igl@savannah.gnu.org>) id 1KMUi6-000870-Re
	for qemu-devel@nongnu.org; Fri, 25 Jul 2008 21:20:23 +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: <E1KMUi6-000870-Re@cvs.savannah.gnu.org>
Date: Fri, 25 Jul 2008 21:20:22 +0000
Subject: [Qemu-devel] [4944] CRIS: Correct condition for when to apply fast
 move flags evaluation .
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: 4944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4944
Author:   edgar_igl
Date:     2008-07-25 21:20:21 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
CRIS: Correct condition for when to apply fast move flags evaluation. Correct single-stepping over branches.

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

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c	2008-07-25 21:07:21 UTC (rev 4943)
+++ trunk/target-cris/translate.c	2008-07-25 21:20:21 UTC (rev 4944)
@@ -979,7 +979,7 @@
 	 * code is true.
 	 */
 	arith_opt = arith_cc(dc) && !dc->flags_uptodate;
-	move_opt = (dc->cc_op == CC_OP_MOVE) && !dc->flags_uptodate;
+	move_opt = (dc->cc_op == CC_OP_MOVE) && dc->flags_uptodate;
 	switch (cond) {
 		case CC_EQ:
 			if (arith_opt || move_opt) {
@@ -3192,7 +3192,8 @@
 	cris_evaluate_flags (dc);
 
 	if (unlikely(env->singlestep_enabled)) {
-		tcg_gen_movi_tl(env_pc, npc);
+		if (dc->is_jmp == DISAS_NEXT)
+			tcg_gen_movi_tl(env_pc, npc);
 		t_gen_raise_exception(EXCP_DEBUG);
 	} else {
 		switch(dc->is_jmp) {