From patchwork Thu Apr 4 22:56:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 233978 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 0F3952C008D for ; Fri, 5 Apr 2013 10:07:12 +1100 (EST) Received: from localhost ([::1]:50641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNtFO-0002id-6b for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 19:07:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNt6A-0006QV-Fv for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNt64-0001QJ-8T for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:57:38 -0400 Received: from mail-ob0-x234.google.com ([2607:f8b0:4003:c01::234]:37411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNt64-0001QC-3q for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:57:32 -0400 Received: by mail-ob0-f180.google.com with SMTP id wo10so3065245obc.25 for ; Thu, 04 Apr 2013 15:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=3PsPcp44h5BinRHdaPibfjzCwQBJ5ZYBJCzXOniSFtc=; b=SKGE4cRI2KDfkt7XQyEGak6zGmBpRqCpLzu2j1ByAtNEKFIvxDWg3iH0cfsrTtPA3H Hd3KCvRrmxHXWuQIm4lcgYqGdUwwgaR5C18n4trs7je7wTNpK3Y2g6/kS9ZYjp/ZqEUr 7TfViS7+nJM1jS6FT5GJROpTGhuGo8883DBAtQtmVQWmkeK8MB8TkI7Ih9AS3aRgW5yz b1GKAOZaF6jxCzzqGmoznSgsU2CE9Y4CQtU44Wp2kuTEmkINnAeL4lFtEsEWYK774ZTU mT+P8baK9PP60gYHNkMWSoqNeIpKLN3g59D5gJrK15l4I/QlTn/NKs/GiNjlw8Uz3665 DK/Q== X-Received: by 10.60.29.129 with SMTP id k1mr6292561oeh.8.1365116251572; Thu, 04 Apr 2013 15:57:31 -0700 (PDT) Received: from pebble.com ([12.236.175.36]) by mx.google.com with ESMTPS id j10sm9227424obg.4.2013.04.04.15.57.29 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 15:57:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 17:56:19 -0500 Message-Id: <1365116186-19382-27-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365116186-19382-1-git-send-email-rth@twiddle.net> References: <1365116186-19382-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c01::234 Cc: av1474@comtv.ru, Aurelien Jarno Subject: [Qemu-devel] [PATCH v4 26/33] tcg-ppc64: Use TCGType throughout compares 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 The optimization/bug being fixed is that tcg_out_cmp was not applying the right type to loading a constant, in the case it can't be implemented directly. Rather than recomputing the TCGType enum from the arch64 bool, pass around the original TCGType throughout. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/ppc64/tcg-target.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 27d5ea5..806f3e2 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -1053,8 +1053,8 @@ static void tcg_out_st (TCGContext *s, TCGType type, TCGReg arg, TCGReg arg1, tcg_out_ldsta (s, arg, arg1, arg2, STD, STDX); } -static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, - int const_arg2, int cr, int arch64) +static void tcg_out_cmp(TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, + int const_arg2, int cr, TCGType type) { int imm; uint32_t op; @@ -1116,19 +1116,17 @@ static void tcg_out_cmp (TCGContext *s, int cond, TCGArg arg1, TCGArg arg2, default: tcg_abort (); } - op |= BF (cr) | (arch64 << 21); + op |= BF(cr) | ((type == TCG_TYPE_I64) << 21); - if (imm) - tcg_out32 (s, op | RA (arg1) | (arg2 & 0xffff)); - else { + if (imm) { + tcg_out32(s, op | RA(arg1) | (arg2 & 0xffff)); + } else { if (const_arg2) { - tcg_out_movi (s, TCG_TYPE_I64, 0, arg2); - tcg_out32 (s, op | RA (arg1) | RB (0)); + tcg_out_movi(s, type, 0, arg2); + arg2 = 0; } - else - tcg_out32 (s, op | RA (arg1) | RB (arg2)); + tcg_out32(s, op | RA(arg1) | RB(arg2)); } - } static void tcg_out_setcond (TCGContext *s, TCGType type, TCGCond cond, @@ -1228,7 +1226,7 @@ static void tcg_out_setcond (TCGContext *s, TCGType type, TCGCond cond, sh = 31; crop = CRNOR | BT (7, CR_EQ) | BA (7, CR_GT) | BB (7, CR_GT); crtest: - tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7, type == TCG_TYPE_I64); + tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7, type); if (crop) tcg_out32 (s, crop); tcg_out32 (s, MFCR | RT (0)); tcg_out_rlw(s, RLWINM, arg0, 0, sh, 31, 31); @@ -1254,12 +1252,12 @@ static void tcg_out_bc (TCGContext *s, int bc, int label_index) } } -static void tcg_out_brcond (TCGContext *s, TCGCond cond, - TCGArg arg1, TCGArg arg2, int const_arg2, - int label_index, int arch64) +static void tcg_out_brcond(TCGContext *s, TCGCond cond, + TCGArg arg1, TCGArg arg2, int const_arg2, + int label_index, TCGType type) { - tcg_out_cmp (s, cond, arg1, arg2, const_arg2, 7, arch64); - tcg_out_bc (s, tcg_to_bc[cond], label_index); + tcg_out_cmp(s, cond, arg1, arg2, const_arg2, 7, type); + tcg_out_bc(s, tcg_to_bc[cond], label_index); } void ppc_tb_set_jmp_target (unsigned long jmp_addr, unsigned long addr) @@ -1543,11 +1541,13 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args, break; case INDEX_op_brcond_i32: - tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 0); + tcg_out_brcond(s, args[2], args[0], args[1], const_args[1], + args[3], TCG_TYPE_I32); break; case INDEX_op_brcond_i64: - tcg_out_brcond (s, args[2], args[0], args[1], const_args[1], args[3], 1); + tcg_out_brcond(s, args[2], args[0], args[1], const_args[1], + args[3], TCG_TYPE_I64); break; case INDEX_op_neg_i32: