From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L77P3-0000kI-4r for qemu-devel@nongnu.org; Mon, 01 Dec 2008 06:57:25 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L77P1-0000hp-JB for qemu-devel@nongnu.org; Mon, 01 Dec 2008 06:57:24 -0500 Received: from [199.232.76.173] (port=57723 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L77P1-0000hX-CF for qemu-devel@nongnu.org; Mon, 01 Dec 2008 06:57:23 -0500 Received: from savannah.gnu.org ([199.232.41.3]:60076 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 ) id 1L77P0-0006iv-Vr for qemu-devel@nongnu.org; Mon, 01 Dec 2008 06:57:23 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L77P0-0002np-AQ for qemu-devel@nongnu.org; Mon, 01 Dec 2008 11:57:22 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L77P0-0002nR-1F for qemu-devel@nongnu.org; Mon, 01 Dec 2008 11:57:22 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Mon, 01 Dec 2008 11:57:22 +0000 Subject: [Qemu-devel] [5847] arm: Don't potentially overwrite input registers in add2, sub2. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5847 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5847 Author: balrog Date: 2008-12-01 11:57:21 +0000 (Mon, 01 Dec 2008) Log Message: ----------- arm: Don't potentially overwrite input registers in add2, sub2. According to malc TCG will often genereate an add2/sub2/mul2 with low half of the output in the same register as high half of one of the inputs, so account for that. 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:19:41 UTC (rev 5846) +++ trunk/tcg/arm/tcg-target.c 2008-12-01 11:57:21 UTC (rev 5847) @@ -295,10 +295,19 @@ int cond, int opc0, int opc1, int rd0, int rd1, int rn0, int rn1, int rm0, int rm1, int shift) { - tcg_out32(s, (cond << 28) | (0 << 25) | (opc0 << 21) | (1 << 20) | - (rn0 << 16) | (rd0 << 12) | shift | rm0); - tcg_out32(s, (cond << 28) | (0 << 25) | (opc1 << 21) | - (rn1 << 16) | (rd1 << 12) | shift | rm1); + if (rd0 == rn1 || rd0 == rm1) { + tcg_out32(s, (cond << 28) | (0 << 25) | (opc0 << 21) | (1 << 20) | + (rn0 << 16) | (8 << 12) | shift | rm0); + tcg_out32(s, (cond << 28) | (0 << 25) | (opc1 << 21) | + (rn1 << 16) | (rd1 << 12) | shift | rm1); + tcg_out_dat_reg(s, cond, ARITH_MOV, + rd0, 0, TCG_REG_R8, SHIFT_IMM_LSL(0)); + } else { + tcg_out32(s, (cond << 28) | (0 << 25) | (opc0 << 21) | (1 << 20) | + (rn0 << 16) | (rd0 << 12) | shift | rm0); + tcg_out32(s, (cond << 28) | (0 << 25) | (opc1 << 21) | + (rn1 << 16) | (rd1 << 12) | shift | rm1); + } } static inline void tcg_out_dat_imm(TCGContext *s,