From patchwork Fri Jun 4 19:14:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 54695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE834B7D24 for ; Sat, 5 Jun 2010 06:01:07 +1000 (EST) Received: from localhost ([127.0.0.1]:41959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKd4i-0002mt-7E for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 16:01:04 -0400 Received: from [140.186.70.92] (port=59137 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKcOJ-00066R-0k for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKcOH-0002cm-Hw for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:14 -0400 Received: from are.twiddle.net ([75.149.56.221]:54812) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKcOG-0002cV-7x for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:13 -0400 Received: from anchor.twiddle.home (anchor.twiddle.home [172.31.0.4]) by are.twiddle.net (Postfix) with ESMTPS id 6F9421069; Fri, 4 Jun 2010 12:17:11 -0700 (PDT) Received: from anchor.twiddle.home (anchor.twiddle.home [127.0.0.1]) by anchor.twiddle.home (8.14.4/8.14.4) with ESMTP id o54JHA5C007301; Fri, 4 Jun 2010 12:17:10 -0700 Received: (from rth@localhost) by anchor.twiddle.home (8.14.4/8.14.4/Submit) id o54JHAmF007300; Fri, 4 Jun 2010 12:17:10 -0700 From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 4 Jun 2010 12:14:36 -0700 Message-Id: <1275678883-7082-29-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1275678883-7082-1-git-send-email-rth@twiddle.net> References: <1275678883-7082-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: agraf@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 28/35] tcg-s390: Tidy tcg_prepare_qemu_ldst. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make use of the reg+reg+disp addressing mode to eliminate redundant additions. Make use of the load-and-operate insns. Avoid an extra register copy when using the 64-bit shift insns. Fix the width of the TLB comparison. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.c | 64 ++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 37 deletions(-) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index 88b5592..b73515d 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -146,7 +146,10 @@ typedef enum S390Opcode { RS_SRA = 0x8a, RS_SRL = 0x88, + RXY_AG = 0xe308, + RXY_AY = 0xe35a, RXY_CG = 0xe320, + RXY_CY = 0xe359, RXY_LB = 0xe376, RXY_LG = 0xe304, RXY_LGB = 0xe377, @@ -170,6 +173,8 @@ typedef enum S390Opcode { RXY_STRVH = 0xe33f, RXY_STY = 0xe350, + RX_A = 0x5a, + RX_C = 0x59, RX_L = 0x58, RX_LH = 0x48, RX_ST = 0x50, @@ -1220,24 +1225,16 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, { const TCGReg arg0 = TCG_REG_R2; const TCGReg arg1 = TCG_REG_R3; - const TCGReg arg2 = TCG_REG_R4; - int s_bits; + int s_bits = opc & 3; uint16_t *label1_ptr; + tcg_target_long ofs; - if (is_store) { - s_bits = opc; + if (TARGET_LONG_BITS == 32) { + tgen_ext32u(s, arg0, addr_reg); } else { - s_bits = opc & 3; + tcg_out_mov(s, arg0, addr_reg); } -#if TARGET_LONG_BITS == 32 - tgen_ext32u(s, arg1, addr_reg); - tgen_ext32u(s, arg0, addr_reg); -#else - tcg_out_mov(s, arg1, addr_reg); - tcg_out_mov(s, arg0, addr_reg); -#endif - tcg_out_sh64(s, RSY_SRLG, arg1, addr_reg, TCG_REG_NONE, TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS); @@ -1245,23 +1242,23 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, tgen64_andi_tmp(s, arg1, (CPU_TLB_SIZE - 1) << CPU_TLB_ENTRY_BITS); if (is_store) { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, - offsetof(CPUState, tlb_table[mem_index][0].addr_write)); + ofs = offsetof(CPUState, tlb_table[mem_index][0].addr_write); } else { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, - offsetof(CPUState, tlb_table[mem_index][0].addr_read)); + ofs = offsetof(CPUState, tlb_table[mem_index][0].addr_read); } - tcg_out_insn(s, RRE, AGR, arg1, TCG_TMP0); + assert(ofs < 0x80000); - tcg_out_insn(s, RRE, AGR, arg1, TCG_AREG0); - - tcg_out_insn(s, RXY, CG, arg0, arg1, 0, 0); + if (TARGET_LONG_BITS == 32) { + tcg_out_mem(s, RX_C, RXY_CY, arg0, arg1, TCG_AREG0, ofs); + } else { + tcg_out_mem(s, 0, RXY_CG, arg0, arg1, TCG_AREG0, ofs); + } -#if TARGET_LONG_BITS == 32 - tgen_ext32u(s, arg0, addr_reg); -#else - tcg_out_mov(s, arg0, addr_reg); -#endif + if (TARGET_LONG_BITS == 32) { + tgen_ext32u(s, arg0, addr_reg); + } else { + tcg_out_mov(s, arg0, addr_reg); + } label1_ptr = (uint16_t*)s->code_ptr; @@ -1271,7 +1268,7 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, /* call load/store helper */ if (is_store) { tcg_out_mov(s, arg1, data_reg); - tcg_out_movi(s, TCG_TYPE_I32, arg2, mem_index); + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_R4, mem_index); tgen_calli(s, (tcg_target_ulong)qemu_st_helpers[s_bits]); } else { tcg_out_movi(s, TCG_TYPE_I32, arg1, mem_index); @@ -1304,17 +1301,10 @@ static void tcg_prepare_qemu_ldst(TCGContext* s, TCGReg data_reg, *(label1_ptr + 1) = ((unsigned long)s->code_ptr - (unsigned long)label1_ptr) >> 1; - if (is_store) { - tcg_out_insn(s, RXY, LG, arg1, arg1, 0, - offsetof(CPUTLBEntry, addend) - - offsetof(CPUTLBEntry, addr_write)); - } else { - tcg_out_insn(s, RXY, LG, arg1, arg1, 0, - offsetof(CPUTLBEntry, addend) - - offsetof(CPUTLBEntry, addr_read)); - } + ofs = offsetof(CPUState, tlb_table[mem_index][0].addend); + assert(ofs < 0x80000); - tcg_out_insn(s, RRE, AGR, arg0, arg1); + tcg_out_mem(s, 0, RXY_AG, arg0, arg1, TCG_AREG0, ofs); } static void tcg_finish_qemu_ldst(TCGContext* s, uint16_t *label2_ptr)