From patchwork Mon Mar 1 21:33:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 46611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8A6ADB7DA1 for ; Tue, 2 Mar 2010 08:43:04 +1100 (EST) Received: from localhost ([127.0.0.1]:38880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmDKH-0005S6-W0 for incoming@patchwork.ozlabs.org; Mon, 01 Mar 2010 16:38:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmDFx-0003iA-UL for qemu-devel@nongnu.org; Mon, 01 Mar 2010 16:34:25 -0500 Received: from [199.232.76.173] (port=54282 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmDFx-0003hC-1M for qemu-devel@nongnu.org; Mon, 01 Mar 2010 16:34:25 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmDFv-0000wW-JC for qemu-devel@nongnu.org; Mon, 01 Mar 2010 16:34:24 -0500 Received: from hall.aurel32.net ([88.191.82.174]:41334) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NmDFu-0000vv-JP for qemu-devel@nongnu.org; Mon, 01 Mar 2010 16:34:23 -0500 Received: from [2a01:e35:2e80:2fb0:21e:8cff:feb0:693b] (helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NmDFt-0007en-2p; Mon, 01 Mar 2010 22:34:21 +0100 Received: from aurel32 by volta.aurel32.net with local (Exim 4.71) (envelope-from ) id 1NmDFo-0000iV-7B; Mon, 01 Mar 2010 22:34:16 +0100 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Mon, 1 Mar 2010 22:33:47 +0100 Message-Id: <1267479230-1964-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267479230-1964-1-git-send-email-aurelien@aurel32.net> References: <1267479230-1964-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Andrzej Zaborowski , Aurelien Jarno Subject: [Qemu-devel] [PATCH 1/4] tcg/arm: fix div2/divu2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When restoring register values, increase the stack register for skipped values. Signed-off-by: Aurelien Jarno --- tcg/arm/tcg-target.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index f8d626d..7bdfda9 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -851,23 +851,41 @@ static void tcg_out_div_helper(TCGContext *s, int cond, const TCGArg *args, tcg_out_dat_reg(s, cond, ARITH_MOV, div_reg, 0, 8, SHIFT_IMM_LSL(0)); /* ldr r0, [sp], #4 */ - if (rem_reg != 0 && div_reg != 0) + if (rem_reg != 0 && div_reg != 0) { tcg_out32(s, (cond << 28) | 0x04bd0004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } /* ldr r1, [sp], #4 */ - if (rem_reg != 1 && div_reg != 1) + if (rem_reg != 1 && div_reg != 1) { tcg_out32(s, (cond << 28) | 0x04bd1004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } /* ldr r2, [sp], #4 */ - if (rem_reg != 2 && div_reg != 2) + if (rem_reg != 2 && div_reg != 2) { tcg_out32(s, (cond << 28) | 0x04bd2004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } /* ldr r3, [sp], #4 */ - if (rem_reg != 3 && div_reg != 3) + if (rem_reg != 3 && div_reg != 3) { tcg_out32(s, (cond << 28) | 0x04bd3004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } /* ldr ip, [sp], #4 */ - if (rem_reg != 12 && div_reg != 12) + if (rem_reg != 12 && div_reg != 12) { tcg_out32(s, (cond << 28) | 0x04bdc004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } /* ldr lr, [sp], #4 */ - if (rem_reg != 14 && div_reg != 14) + if (rem_reg != 14 && div_reg != 14) { tcg_out32(s, (cond << 28) | 0x04bde004); + } else { + tcg_out_dat_imm(s, cond, ARITH_ADD, 13, 13, 4); + } } #ifdef CONFIG_SOFTMMU