From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L6yLd-0000dX-FU
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 21:17:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L6yLc-0000bY-RN
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 21:17:16 -0500
Received: from [199.232.76.173] (port=56726 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L6yLc-0000bB-EI
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 21:17:16 -0500
Received: from savannah.gnu.org ([199.232.41.3]:46795 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 <INVALID.NOREPLY@gnu.org>)
	id 1L6yLc-0006Lp-73
	for qemu-devel@nongnu.org; Sun, 30 Nov 2008 21:17:16 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L6yLa-0008Ii-GS
	for qemu-devel@nongnu.org; Mon, 01 Dec 2008 02:17:15 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L6yLZ-0008Ie-QS
	for qemu-devel@nongnu.org; Mon, 01 Dec 2008 02:17:14 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1L6yLZ-0008Ie-QS@cvs.savannah.gnu.org>
Date: Mon, 01 Dec 2008 02:17:13 +0000
Subject: [Qemu-devel] [5845] Don't rely on ARM tcg_out_goto() generating
	just a single insn.
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: 5845
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5845
Author:   balrog
Date:     2008-12-01 02:17:12 +0000 (Mon, 01 Dec 2008)

Log Message:
-----------
Don't rely on ARM tcg_out_goto() generating just a single insn.

Otherwise when tb_exit generates a jump beyond the pc-relative range,
tcg_out_goto() spans two/three instructions and we load the tb return
value from a wrong address.  This is #ifdefed out currently because
we take care for the jumps to be local.
Problem spotted by Steffen Liebergeld.

Modified Paths:
--------------
    trunk/tcg/arm/tcg-target.c

Modified: trunk/tcg/arm/tcg-target.c
===================================================================
--- trunk/tcg/arm/tcg-target.c	2008-12-01 02:10:17 UTC (rev 5844)
+++ trunk/tcg/arm/tcg-target.c	2008-12-01 02:17:12 UTC (rev 5845)
@@ -1232,19 +1232,24 @@
         if (args[0] >> 8)
             tcg_out32(s, args[0]);
 #else
-        if (args[0] >> 8)
-            tcg_out_ld32_12(s, COND_AL, 0, 15, 0);
-        else
-            tcg_out_dat_imm(s, COND_AL, ARITH_MOV, 0, 0, args[0]);
-        tcg_out_goto(s, COND_AL, (tcg_target_ulong) tb_ret_addr);
-        if (args[0] >> 8)
-            tcg_out32(s, args[0]);
+        {
+            uint8_t *ld_ptr = s->code_ptr;
+            if (args[0] >> 8)
+                tcg_out_ld32_12(s, COND_AL, 0, 15, 0);
+            else
+                tcg_out_dat_imm(s, COND_AL, ARITH_MOV, 0, 0, args[0]);
+            tcg_out_goto(s, COND_AL, (tcg_target_ulong) tb_ret_addr);
+            if (args[0] >> 8) {
+                *ld_ptr = (uint8_t) (s->code_ptr - ld_ptr) - 8;
+                tcg_out32(s, args[0]);
+            }
+        }
 #endif
         break;
     case INDEX_op_goto_tb:
         if (s->tb_jmp_offset) {
             /* Direct jump method */
-#if 1
+#if defined(USE_DIRECT_JUMP)
             s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf;
             tcg_out_b(s, COND_AL, 8);
 #else