From patchwork Fri Sep 6 06:50:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 273092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1DC932C0085 for ; Fri, 6 Sep 2013 16:59:25 +1000 (EST) Received: from localhost ([::1]:35424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHq0o-0005Rj-Sx for incoming@patchwork.ozlabs.org; Fri, 06 Sep 2013 02:59:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHptY-0001ea-9M for qemu-devel@nongnu.org; Fri, 06 Sep 2013 02:51:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHptS-0005H6-91 for qemu-devel@nongnu.org; Fri, 06 Sep 2013 02:51:52 -0400 Received: from mail-qa0-x22a.google.com ([2607:f8b0:400d:c00::22a]:34302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHptS-0005H1-3R for qemu-devel@nongnu.org; Fri, 06 Sep 2013 02:51:46 -0400 Received: by mail-qa0-f42.google.com with SMTP id cm18so284486qab.15 for ; Thu, 05 Sep 2013 23:51:45 -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:in-reply-to:references; bh=nf01GTM1r2SoR2ZokAHEBsZBcYbbRRtSs/oBRE1zOUA=; b=i2/xh/l6MnBp4hvpPeg2hNDP+xuu3+2xbdbmQ/Bg74EP8FhjF1cYm3MwSeOlU0gpqw VrGaHWz29ELX+g7f849KqCB8YiTiJUw3F4umPSMHJwi5kRYXy1dXZfTenMGlcG07jpp8 UNcqfTOwBWvhcN+ojeZTlZ8PCjK0Kq0OX3wVKkm6VVcHqN+lIEX7hW8dSDBIXuoAncU+ Kbyt/8jIqtKFJoS4pjP6TZbvxlAXAPqUpLS+HdWFcxR8bgi6k3Vv793ZlFPSAsjjoD+f ldXlvvHV+sIMn6pqWyMlsh5LTQN2GHJYpVW824I22WTKOjoOWTE6WnGvez5sLpWvwkLC dQtA== X-Received: by 10.224.166.129 with SMTP id m1mr2340066qay.46.1378450305611; Thu, 05 Sep 2013 23:51:45 -0700 (PDT) Received: from pebble.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id i10sm1688981qev.8.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Sep 2013 23:51:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 5 Sep 2013 23:50:39 -0700 Message-Id: <1378450242-27080-18-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1378450242-27080-1-git-send-email-rth@twiddle.net> References: <1378450242-27080-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:400d:c00::22a Cc: aurelien@aurel32.net, Richard Henderson Subject: [Qemu-devel] [PATCH 17/19] tcg-i64: Reduce code duplication in tcg_out_qemu_ld 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 only differences were in the bswap insns emitted. Signed-off-by: Richard Henderson --- tcg/ia64/tcg-target.c | 60 ++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/tcg/ia64/tcg-target.c b/tcg/ia64/tcg-target.c index 819bca3..6355f32 100644 --- a/tcg/ia64/tcg-target.c +++ b/tcg/ia64/tcg-target.c @@ -1647,13 +1647,13 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, OPC_LD1_M1, OPC_LD2_M1, OPC_LD4_M1, OPC_LD8_M1 }; int addr_reg, data_reg, mem_index; - TCGMemOp s_bits, bswap; + TCGMemOp s_bits; + uint64_t bswap1, bswap2; data_reg = *args++; addr_reg = *args++; mem_index = *args; s_bits = opc & MO_SIZE; - bswap = opc & MO_BSWAP; /* Read the TLB entry */ tcg_out_qemu_tlb(s, addr_reg, s_bits, @@ -1662,6 +1662,17 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, INSN_NOP_I, INSN_NOP_I); /* P6 is the fast path, and P7 the slow path */ + + bswap1 = bswap2 = INSN_NOP_I; + if (opc & MO_BSWAP) { + bswap1 = tcg_opc_bswap64_i(TCG_REG_P6, TCG_REG_R8, TCG_REG_R8); + if (s_bits < MO_64) { + int shift = 64 - (8 << s_bits); + bswap2 = tcg_opc_i11(TCG_REG_P6, OPC_EXTR_U_I11, + TCG_REG_R8, TCG_REG_R8, shift, 63 - shift); + } + } + tcg_out_bundle(s, mLX, tcg_opc_mov_a(TCG_REG_P7, TCG_REG_R56, TCG_AREG0), tcg_opc_l2 ((tcg_target_long) qemu_ld_helpers[s_bits]), @@ -1674,41 +1685,16 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, TCG_REG_R2, TCG_REG_R57), tcg_opc_i21(TCG_REG_P7, OPC_MOV_I21, TCG_REG_B6, TCG_REG_R3, 0)); - if (bswap && s_bits == MO_16) { - tcg_out_bundle(s, MmI, - tcg_opc_m1 (TCG_REG_P6, opc_ld_m1[s_bits], - TCG_REG_R8, TCG_REG_R2), - tcg_opc_m1 (TCG_REG_P7, OPC_LD8_M1, TCG_REG_R1, TCG_REG_R2), - tcg_opc_i12(TCG_REG_P6, OPC_DEP_Z_I12, - TCG_REG_R8, TCG_REG_R8, 15, 15)); - } else if (bswap && s_bits == MO_32) { - tcg_out_bundle(s, MmI, - tcg_opc_m1 (TCG_REG_P6, opc_ld_m1[s_bits], - TCG_REG_R8, TCG_REG_R2), - tcg_opc_m1 (TCG_REG_P7, OPC_LD8_M1, TCG_REG_R1, TCG_REG_R2), - tcg_opc_i12(TCG_REG_P6, OPC_DEP_Z_I12, - TCG_REG_R8, TCG_REG_R8, 31, 31)); - } else { - tcg_out_bundle(s, mmI, - tcg_opc_m1 (TCG_REG_P6, opc_ld_m1[s_bits], - TCG_REG_R8, TCG_REG_R2), - tcg_opc_m1 (TCG_REG_P7, OPC_LD8_M1, TCG_REG_R1, TCG_REG_R2), - INSN_NOP_I); - } - if (!bswap) { - tcg_out_bundle(s, miB, - tcg_opc_movi_a(TCG_REG_P7, TCG_REG_R58, mem_index), - INSN_NOP_I, - tcg_opc_b5 (TCG_REG_P7, OPC_BR_CALL_SPTK_MANY_B5, - TCG_REG_B0, TCG_REG_B6)); - } else { - tcg_out_bundle(s, miB, - tcg_opc_movi_a(TCG_REG_P7, TCG_REG_R58, mem_index), - tcg_opc_bswap64_i(TCG_REG_P6, TCG_REG_R8, TCG_REG_R8), - tcg_opc_b5 (TCG_REG_P7, OPC_BR_CALL_SPTK_MANY_B5, - TCG_REG_B0, TCG_REG_B6)); - } - + tcg_out_bundle(s, MmI, + tcg_opc_m1 (TCG_REG_P6, opc_ld_m1[s_bits], + TCG_REG_R8, TCG_REG_R2), + tcg_opc_m1 (TCG_REG_P7, OPC_LD8_M1, TCG_REG_R1, TCG_REG_R2), + bswap1); + tcg_out_bundle(s, miB, + tcg_opc_movi_a(TCG_REG_P7, TCG_REG_R58, mem_index), + bswap2, + tcg_opc_b5 (TCG_REG_P7, OPC_BR_CALL_SPTK_MANY_B5, + TCG_REG_B0, TCG_REG_B6)); tcg_out_bundle(s, miI, INSN_NOP_M, INSN_NOP_I,