From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnjS6-0001Y3-1S
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:04:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnjS5-0001Xb-G0
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:04:41 -0400
Received: from [199.232.76.173] (port=47935 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnjS5-0001XQ-3I
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:04:41 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35717 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 <aurelien@aurel32.net>)
	id 1LnjS4-0002G2-N0
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:04:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1LnjS4-00073o-96
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 01:04:40 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LnjS3-00073k-V3
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 01:04:40 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LnjS3-00073k-V3@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 01:04:40 +0000
Subject: [Qemu-devel] [6930] target-alpha: bug fix: avoid nop to override
	next instruction
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: 6930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6930
Author:   aurel32
Date:     2009-03-29 01:04:39 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
target-alpha: bug fix: avoid nop to override next instruction

While searching PC, always store the pc of a new instruction.
Instructions that didn't generate tcg code (such as nop) prevented the next
one to be referenced.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

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

Modified: trunk/target-alpha/translate.c
===================================================================
--- trunk/target-alpha/translate.c	2009-03-29 00:22:12 UTC (rev 6929)
+++ trunk/target-alpha/translate.c	2009-03-29 01:04:39 UTC (rev 6930)
@@ -2379,10 +2379,10 @@
                 lj++;
                 while (lj < j)
                     gen_opc_instr_start[lj++] = 0;
-                gen_opc_pc[lj] = ctx.pc;
-                gen_opc_instr_start[lj] = 1;
-                gen_opc_icount[lj] = num_insns;
             }
+            gen_opc_pc[lj] = ctx.pc;
+            gen_opc_instr_start[lj] = 1;
+            gen_opc_icount[lj] = num_insns;
         }
         if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO))
             gen_io_start();