From patchwork Thu Sep 27 01:55:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE2EE2C007C for ; Thu, 27 Sep 2012 11:56:19 +1000 (EST) Received: from localhost ([::1]:33712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3Kr-0001F6-TV for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 21:56:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3KY-00018f-2W for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TH3KX-0005rs-0e for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:57 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:43496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3KW-0005kA-R0 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:56 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so256012dad.4 for ; Wed, 26 Sep 2012 18:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tBdDPDgoOaLUhyad9f5q3EGSdMDKwMVwP7MYjueYDzY=; b=l/my2oS9AmJ9W6rztBr0ZrGQLsWE4JV/LC7twV5Fq8D+Ncrbd3ERjKy5o1SV5HUPKk 8oL4Zx67RC+tomLvJwI4EorafAG2cAKpfDc7hccG/4jfZmd+os4L/9thdj5LtTbr21aT BFKnPN4tRtBgOb6FNWfpKwEcZ2D/X3YN7Z9bviZ9oharUcH9QOLcH0hiIRdQPqsR0U+F 7YxlWgqcEGsYxCILdO308ea8Gn7uX1eeUkkT4l89ogQ2pT431HZ7FA8/eCzO39qFRS/L B6BIcSPr4KEd5ob4Zslj5vXT5RNRdjGuEyOQkctWKnVCkxPZpN/BSVU+jMPZGMVKmItB swMQ== Received: by 10.68.194.165 with SMTP id hx5mr7522354pbc.40.1348710956416; Wed, 26 Sep 2012 18:55:56 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id o1sm2830071pax.21.2012.09.26.18.55.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 18:55:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2012 18:55:36 -0700 Message-Id: <1348710942-3040-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348710942-3040-1-git-send-email-rth@twiddle.net> References: <1348710942-3040-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 06/12] tcg-sparc: Fix add2/sub2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We must care not to clobber the high parts before we consume them. Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index c3e15b9..3154992 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -704,6 +704,22 @@ static void tcg_out_setcond2_i32(TCGContext *s, TCGCond cond, TCGArg ret, break; } } + +static void tcg_out_addsub2(TCGContext *s, TCGArg rl, TCGArg rh, + TCGArg al, TCGArg ah, TCGArg bl, int blconst, + TCGArg bh, int bhconst, int opl, int oph) +{ + TCGArg tmp = TCG_REG_T1; + + /* Note that the low parts are fully consumed before tmp is set. */ + if (rl != ah && (bhconst || rl != bh)) { + tmp = rl; + } + + tcg_out_arithc(s, tmp, al, bl, blconst, opl); + tcg_out_arithc(s, rh, ah, bh, bhconst, oph); + tcg_out_mov(s, TCG_TYPE_I32, rl, tmp); +} #endif /* Generate global QEMU prologue and epilogue code */ @@ -1244,16 +1260,14 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, args[4], const_args[4]); break; case INDEX_op_add2_i32: - tcg_out_arithc(s, args[0], args[2], args[4], const_args[4], - ARITH_ADDCC); - tcg_out_arithc(s, args[1], args[3], args[5], const_args[5], - ARITH_ADDX); + tcg_out_addsub2(s, args[0], args[1], args[2], args[3], + args[4], const_args[4], args[5], const_args[5], + ARITH_ADDCC, ARITH_ADDX); break; case INDEX_op_sub2_i32: - tcg_out_arithc(s, args[0], args[2], args[4], const_args[4], - ARITH_SUBCC); - tcg_out_arithc(s, args[1], args[3], args[5], const_args[5], - ARITH_SUBX); + tcg_out_addsub2(s, args[0], args[1], args[2], args[3], + args[4], const_args[4], args[5], const_args[5], + ARITH_SUBCC, ARITH_SUBX); break; case INDEX_op_mulu2_i32: tcg_out_arithc(s, args[0], args[2], args[3], const_args[3],