From patchwork Fri Aug 4 05:44:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9880567 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 7DEC760360 for ; Fri, 4 Aug 2017 05:48:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74C7B289A2 for ; Fri, 4 Aug 2017 05:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69A86289A6; Fri, 4 Aug 2017 05:48:21 +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 ED6F6289A2 for ; Fri, 4 Aug 2017 05:48:20 +0000 (UTC) Received: from localhost ([::1]:36666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVTA-000611-3Q for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Aug 2017 01:48:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVPW-0003nl-Fr for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVPU-00035k-Ti for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:34 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:37010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVPU-00033n-MW for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:32 -0400 Received: by mail-pg0-x244.google.com with SMTP id 83so821866pgb.4 for ; Thu, 03 Aug 2017 22:44:32 -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=BuEv1csrc3JSE+NkEWeag8w9qi/jTQAr7Da/v5oxytI=; b=GWiq7y8NSeJQPVfAoPMZj7uNERDILcito5Vqq6MkQJBs5lznOGWG1Y3M6Gv/eEkkII PYuAOvTUxZXPNayvAza9QGgqQTCm1ZWU3pfLybKNol9++y28WEVr//U8eOdRS533PLf0 Ftf5pLkt2cdan8pwcwRmrYQ7sm6VKvXoOt+7D7NJl869FCpaQPgZGIuiJYZLAQPWpyoc ncyo7dJ4MpjDf8WpClLcGrlVklkU+qNeap5yKBGDoPxr86Ze1NWjhwRDu+v7bl6guC/V hORWExJMZAispC2VTKvlSToKhcYD4A8QrW/YBBXuUD2cGaie7znt4ITuE5xTZU6W3F8s dbAQ== 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=BuEv1csrc3JSE+NkEWeag8w9qi/jTQAr7Da/v5oxytI=; b=Vvnvmi7IW7sSdV4SjoXL05TDyleyImmqxxpafYUVi4Z/L46ShN1vi59RzlDuRDiCTR 0ddakLp2LDJxILT+aKO1v0V15ErSg0O6zKuCocsUUUB+Zby5r1np/Ppqme03G3Y9XpQW E4fpagt85SjpMwN5D/GF6gMKLwfs9DqPSU94bxU0RgxbJ9gxDqhz8pD/1bT9yamIIKps Kk4o2sVs54zwafyjslFkhd2hi8lTeBlKUIVFPLWE2CrurVLxorkXfGEsSPnLWALj81VY aEC0OWy2CmFhThDck71kXtu8jLxp2grE/sjQPbY6ytwXp/pjK4+ja2yOWX9dAvbFxt7p YlCQ== X-Gm-Message-State: AIVw113nxOXw79y9yzsZVN49g/MLGrzL9rvm4RSkETqW8sEtUidYcOaA Rx9MCEhwXDTUELWT+cA= X-Received: by 10.98.36.198 with SMTP id k67mr1284220pfk.154.1501825471434; Thu, 03 Aug 2017 22:44:31 -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.30 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:44:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:44:07 -0700 Message-Id: <20170804054426.10590-5-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::244 Subject: [Qemu-devel] [PATCH for-2.11 04/23] tcg/i386: Store out-of-range call targets in constant pool 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 Already it saves 2 bytes per call, but also the constant pool entry may well be shared across multiple calls. Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.h | 1 + tcg/i386/tcg-target.inc.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index 11ee7fadd1..b89dababf4 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -189,5 +189,6 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, #ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS #endif +#define TCG_TARGET_NEED_POOL_LABELS #endif diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index 1a1ad96906..5231056fd3 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +#include "tcg-pool.inc.c" + #ifdef CONFIG_DEBUG_TCG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { #if TCG_TARGET_REG_BITS == 64 @@ -1180,9 +1182,14 @@ static void tcg_out_branch(TCGContext *s, int call, tcg_insn_unit *dest) tcg_out_opc(s, call ? OPC_CALL_Jz : OPC_JMP_long, 0, 0, 0); tcg_out32(s, disp); } else { - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R10, (uintptr_t)dest); - tcg_out_modrm(s, OPC_GRP5, - call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev, TCG_REG_R10); + /* rip-relative addressing into the constant pool. + This is 6 + 8 = 14 bytes, as compared to using an + an immediate load 10 + 6 = 16 bytes, plus we may + be able to re-use the pool constant for more calls. */ + tcg_out_opc(s, OPC_GRP5, 0, 0, 0); + tcg_out8(s, (call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev) << 3 | 5); + new_pool_label(s, (uintptr_t)dest, R_386_PC32, s->code_ptr, -4); + tcg_out32(s, 0); } } @@ -2595,6 +2602,11 @@ static void tcg_target_qemu_prologue(TCGContext *s) #endif } +static void tcg_out_nop_fill(tcg_insn_unit *p, int count) +{ + memset(p, 0x90, count); +} + static void tcg_target_init(TCGContext *s) { #ifdef CONFIG_CPUID_H