From patchwork Thu Sep 27 01:55:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187253 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 DD72C2C007C for ; Thu, 27 Sep 2012 11:56:13 +1000 (EST) Received: from localhost ([::1]:33390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3Km-000149-0k for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 21:56:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3KU-0000zH-4O for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TH3KS-0005hg-Qb for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:54 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:33983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TH3KS-0005h9-KV for qemu-devel@nongnu.org; Wed, 26 Sep 2012 21:55:52 -0400 Received: by padfb10 with SMTP id fb10so913009pad.4 for ; Wed, 26 Sep 2012 18:55:51 -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=tMkHvNZfYpJMZLX8F7TNYdfB13k+OeJMEfafLWql9Bs=; b=k3Z+wEvmkqx/WL+hror1SABtgxwrQoUYkv6MgSC8S01H50+rwkhiqrvWWNWsf0q8QS 1mjeKhq+5jFwh+ztFKuXPJgzsEfP15gCjzm225G9s8X0JkqdLF3c/oh9ag5jplBmVxLi 7tb/htgePT8M3VtLRzeW1yH2Sa/wlF8+bEs8L8wLmLfwtZZKjvFOZU0WsVKJ3mXAaUqC P+zdQ5VpA/fOSedMOh5F6hr3zh4zJbopZfPK5Y4SRoDjmQ2Z/T0J7jblcToAtjM1Aj+c /xPRqrG8k8/k73wCMBl6adfTAo+IyPdMWeGBNrbuy1tU++cc6+FCapPul/jmMQpTTcHn soaw== Received: by 10.68.218.226 with SMTP id pj2mr7439279pbc.33.1348710951745; Wed, 26 Sep 2012 18:55:51 -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.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 18:55:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2012 18:55:31 -0700 Message-Id: <1348710942-3040-2-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.220.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 01/12] tcg-sparc: Fix brcond2 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 Much the same problem as recently fixed for hppa. Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index bb43e83..726fb9b 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -561,33 +561,24 @@ static void tcg_out_brcond2_i32(TCGContext *s, TCGCond cond, /* Note that we fill one of the delay slots with the second compare. */ switch (cond) { case TCG_COND_EQ: - cc = INSN_COND(tcg_cond_to_bcond[TCG_COND_NE], 0); - tcg_out_branch_i32(s, cc, label_next); + tcg_out_branch_i32(s, COND_NE, label_next); tcg_out_cmp(s, al, bl, blconst); - cc = INSN_COND(tcg_cond_to_bcond[TCG_COND_EQ], 0); - tcg_out_branch_i32(s, cc, label_dest); + tcg_out_branch_i32(s, COND_E, label_dest); break; case TCG_COND_NE: - cc = INSN_COND(tcg_cond_to_bcond[TCG_COND_NE], 0); - tcg_out_branch_i32(s, cc, label_dest); + tcg_out_branch_i32(s, COND_NE, label_dest); tcg_out_cmp(s, al, bl, blconst); - tcg_out_branch_i32(s, cc, label_dest); + tcg_out_branch_i32(s, COND_NE, label_dest); break; default: - /* ??? One could fairly easily special-case 64-bit unsigned - compares against 32-bit zero-extended constants. For instance, - we know that (unsigned)AH < 0 is false and need not emit it. - Similarly, (unsigned)AH > 0 being true implies AH != 0, so the - second branch will never be taken. */ - cc = INSN_COND(tcg_cond_to_bcond[cond], 0); + cc = tcg_cond_to_bcond[tcg_high_cond(cond)]; tcg_out_branch_i32(s, cc, label_dest); tcg_out_nop(s); - cc = INSN_COND(tcg_cond_to_bcond[TCG_COND_NE], 0); - tcg_out_branch_i32(s, cc, label_next); + tcg_out_branch_i32(s, COND_NE, label_next); tcg_out_cmp(s, al, bl, blconst); - cc = INSN_COND(tcg_cond_to_bcond[tcg_unsigned_cond(cond)], 0); + cc = tcg_cond_to_bcond[tcg_unsigned_cond(cond)]; tcg_out_branch_i32(s, cc, label_dest); break; }