From patchwork Fri Aug 4 05:44:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9880589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B0E560360 for ; Fri, 4 Aug 2017 05:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B6F0289A6 for ; Fri, 4 Aug 2017 05:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E995289B0; Fri, 4 Aug 2017 05:54:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B92B0289A6 for ; Fri, 4 Aug 2017 05:54:24 +0000 (UTC) Received: from localhost ([::1]:36692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVYh-0002Y8-Kw for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Aug 2017 01:54:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVPp-0004Av-GF for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVPo-0003sq-HR for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:53 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:33067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVPo-0003rE-CI for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:52 -0400 Received: by mail-pg0-x242.google.com with SMTP id u185so854016pgb.0 for ; Thu, 03 Aug 2017 22:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=0CbqG/jCmy9nKLrHCKRdJkneOc8A7e+qahK61diRF3I=; b=aTXA2AuVuKHnyWgBZErorcOBW2XL19Kk96+n1FjxeZD+16yMR28WaEaoIg3BA+BBZJ 99+ojCfYcUyItJTPUYUXDvAb47OjJz97RABPUoweaaSbx1IAjYW5hHZsgEl6LzU4gPtM bQETtCFDkmZQ+Por1fID/39ojONCAOymQjbycx1AuXKJDE1ewGNzZyBpxbDC7LW2LCta iRP/kxEGPsoGgD4MIS/jQrUCYDSWLHXAnZaglxoniBnS62YdgK4R4Jt1CfSt6/Qd/OJ4 cDGNELt1TwWxV9zEtMYWo0lFVolQl2ZxkUah6qZFMmh7QiKqNyY+bvL12Nc3D11NkRLX bCGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=0CbqG/jCmy9nKLrHCKRdJkneOc8A7e+qahK61diRF3I=; b=eLUoDIRnKcoacqJZp3FcG2jBZu3QmY+c85hrrsRzb1a5D351nZS/alFevTORMhIyR4 Ywu+++yPlx0wTAsOE0hxTzxnSIBdCAb6ECM7e33QESVqmxda5s5An+BAQpiLL9W5US7p fDH8rFcpmUXbEnduTzl6Ki8hNT7kpqtWXybwv/Rpd3A9Wf+qEvVRjLBpSpLIW+2cZQUA M9myiD/PvDBYwmLRFCy5tXbUBYpj2eFVnmgrpqkhNO34Fgo56V49HdQKyPiI/WNVcnbh wFtAeeRQewMxPIne6/DA/YSgV/ZQQ8o7lPMXuHs//lirRXmN+/n6rGh5XghDMUwyw3yI PFvg== X-Gm-Message-State: AIVw110v4xIvmGJBp7EyM18ekJeymn0cLyCWnVNweGbFHXfgimADernJ HFgldIzaKq85Gqd4Fdc= X-Received: by 10.84.195.131 with SMTP id j3mr1361597pld.147.1501825491280; Thu, 03 Aug 2017 22:44:51 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id o14sm1061063pfi.158.2017.08.03.22.44.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:44:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:44:26 -0700 Message-Id: <20170804054426.10590-24-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170804054426.10590-1-rth@twiddle.net> References: <20170804054426.10590-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH for-2.11 23/23] tcg/ppc: Use constant pool for movi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.h | 1 + tcg/ppc/tcg-target.inc.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index c1226ea5b6..e10d7e4411 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -130,5 +130,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t); #ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS #endif +#define TCG_TARGET_NEED_POOL_LABELS #endif diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 4b32809217..7598157e5f 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -22,6 +22,9 @@ * THE SOFTWARE. */ +#include "elf.h" +#include "tcg-pool.inc.c" + #if defined _CALL_DARWIN || defined __APPLE__ #define TCG_TARGET_CALL_DARWIN #endif @@ -58,8 +61,6 @@ static tcg_insn_unit *tb_ret_addr; -#include "elf.h" - bool have_isa_2_06; bool have_isa_3_00; @@ -224,9 +225,12 @@ static inline void tcg_out_bc_noaddr(TCGContext *s, int insn) static void patch_reloc(tcg_insn_unit *code_ptr, int type, intptr_t value, intptr_t addend) { - tcg_insn_unit *target = (tcg_insn_unit *)value; + tcg_insn_unit *target; + tcg_insn_unit old; + + value += addend; + target = (tcg_insn_unit *)value; - tcg_debug_assert(addend == 0); switch (type) { case R_PPC_REL14: reloc_pc14(code_ptr, target); @@ -234,6 +238,12 @@ static void patch_reloc(tcg_insn_unit *code_ptr, int type, case R_PPC_REL24: reloc_pc24(code_ptr, target); break; + case R_PPC_ADDR16: + assert(value == (int16_t)value); + old = *code_ptr; + old = deposit32(old, 0, 16, value); + *code_ptr = old; + break; default: tcg_abort(); } @@ -647,6 +657,14 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, return; } + /* Use the constant pool, if possible. */ + if (!in_prologue && USE_REG_TB) { + new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr, + -(intptr_t)s->code_gen_ptr); + tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0)); + return; + } + high = arg >> 31 >> 1; tcg_out_movi(s, TCG_TYPE_I32, ret, high); if (high) { @@ -1829,6 +1847,14 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) #endif } +static void tcg_out_nop_fill(tcg_insn_unit *p, int count) +{ + int i; + for (i = 0; i < count; ++i) { + p[i] = NOP; + } +} + /* Parameters for function call generation, used in tcg.c. */ #define TCG_TARGET_STACK_ALIGN 16 #define TCG_TARGET_EXTEND_ARGS 1