From patchwork Tue Mar 5 00:32:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 224868 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 113972C033F for ; Tue, 5 Mar 2013 11:37:13 +1100 (EST) Received: from localhost ([::1]:40879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCfsV-0002Ox-7Z for incoming@patchwork.ozlabs.org; Mon, 04 Mar 2013 19:37:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCfp6-0005fq-Qi for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:33:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCfp2-00047v-Fg for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:33:40 -0500 Received: from mail-ie0-x234.google.com ([2607:f8b0:4001:c03::234]:57242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCfp2-00047q-BE for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:33:36 -0500 Received: by mail-ie0-f180.google.com with SMTP id bn7so7125373ieb.11 for ; Mon, 04 Mar 2013 16:33:35 -0800 (PST) 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=uY3Iw0/x70ciO8CfyWzE/fznwD0ECBYYQgmPjIbSBas=; b=kGj5O1q9/4CM/KJQhGpT8lTKUiZqZNvN2wsv2ogdGWVjRw7nD3aOItN/waX7RGr1/E +JU8WI7xCtAHEh9XMSRiwxVdEVluyLTRUuIoUUVg8Byc2Vfph3i42lWmJw8CxYai15ep nzOT32N9rrWp2r1qg6Q0DJ5PDlPD0wYF7v0J8NgAJ+Wkn0taa9eV108H2Bv0TDpWN9tN q6euZfyiVQnn0nfBf4O/LrTXDKDGKAyim/A1+UYjyY+9vTXZEPLaylznXKT4yNWjB1IU f8EcN0LE/NMko/AmRxElIw6h0uKiB7oKOsfWnq9NWhovdIGYrMHY5bFDSGWMRZx9bmq5 6TEA== X-Received: by 10.50.33.203 with SMTP id t11mr4240403igi.97.1362443615850; Mon, 04 Mar 2013 16:33:35 -0800 (PST) Received: from pebble.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id ih1sm12171205igc.3.2013.03.04.16.33.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 16:33:35 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2013 16:32:54 -0800 Message-Id: <1362443590-28191-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362443590-28191-1-git-send-email-rth@twiddle.net> References: <1362443590-28191-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:4001:c03::234 Cc: av1474@comtv.ru Subject: [Qemu-devel] [PATCH v2 11/27] tcg-ppc64: Tidy or and xor patterns. 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 Handle constants in common code; we'll want to reuse that later. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/ppc64/tcg-target.c | 55 ++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index d12fd61..9718ef6 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -527,6 +527,29 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg ret, } } +static void tcg_out_zori32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c, + int op_lo, int op_hi) +{ + if (c >> 16) { + tcg_out32(s, op_hi | SAI(src, dst, c >> 16)); + src = dst; + } + if (c & 0xffff) { + tcg_out32(s, op_lo | SAI(src, dst, c)); + src = dst; + } +} + +static void tcg_out_ori32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c) +{ + tcg_out_zori32(s, dst, src, c, ORI, ORIS); +} + +static void tcg_out_xori32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c) +{ + tcg_out_zori32(s, dst, src, c, XORI, XORIS); +} + static void tcg_out_b (TCGContext *s, int mask, tcg_target_long target) { tcg_target_long disp; @@ -1343,37 +1366,21 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args, break; case INDEX_op_or_i64: case INDEX_op_or_i32: + a0 = args[0], a1 = args[1], a2 = args[2]; if (const_args[2]) { - if (args[2] & 0xffff) { - tcg_out32(s, ORI | SAI(args[1], args[0], args[2])); - if (args[2] >> 16) { - tcg_out32(s, ORIS | SAI(args[0], args[0], args[2] >> 16)); - } - } - else { - tcg_out32(s, ORIS | SAI(args[1], args[0], args[2] >> 16)); - } + tcg_out_ori32(s, a0, a1, a2); + } else { + tcg_out32(s, OR | SAB(a1, a0, a2)); } - else - tcg_out32 (s, OR | SAB (args[1], args[0], args[2])); break; case INDEX_op_xor_i64: case INDEX_op_xor_i32: + a0 = args[0], a1 = args[1], a2 = args[2]; if (const_args[2]) { - if ((args[2] & 0xffff) == args[2]) { - tcg_out32(s, XORI | SAI(args[1], args[0], args[2])); - } else if ((args[2] & 0xffff0000) == args[2]) { - tcg_out32(s, XORIS | SAI(args[1], args[0], args[2] >> 16)); - } else { - tcg_out_movi (s, (opc == INDEX_op_and_i32 - ? TCG_TYPE_I32 - : TCG_TYPE_I64), - 0, args[2]); - tcg_out32 (s, XOR | SAB (args[1], args[0], 0)); - } + tcg_out_xori32(s, a0, a1, a2); + } else { + tcg_out32(s, XOR | SAB(a1, a0, a2)); } - else - tcg_out32 (s, XOR | SAB (args[1], args[0], args[2])); break; case INDEX_op_mul_i32: