From patchwork Thu Sep 7 22:40:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111982 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp727037qge; Thu, 7 Sep 2017 15:49:42 -0700 (PDT) X-Received: by 10.55.40.41 with SMTP id o41mr1215585qkh.271.1504824582947; Thu, 07 Sep 2017 15:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504824582; cv=none; d=google.com; s=arc-20160816; b=MYCGV1VfQX7/JgAIJPz5zTniuF0EGT5HvPW0SuwU1ZQIT1zmc8bKBeF8Bz31QEQSof irCfbwtnQlWg87yfRW8Ee0TRlnzJUnx4LyiXRuBQhsIarPkZtPjP6hcBl62EHDF264oI AG/F9/B/EUKLN/aF05iZjC4ohlBfb79liDlqZuqnTNhxdZg/L1o+4g6aG4gMhH+xx8J9 cIkKBZK416Lb4c5IeH1pyM5L5pkiWRO5bo0eHw3ISoPBzcUJLhq3KIdcwFLCoYRw+QC8 1rh3XjPsrxnmhG+YcEEVpk6RAd+5tU27Zeazbp2Lgw6EGPwUxra0XTCT9fn+pNaos9/m hnqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=daMSdqMbQuDE4qwwdspqIaJ34DPgPJe16DeZ0MUqsHw=; b=eHMhTcn1ydOv8UXMbXqwc4k+Y95WS5trUu+4Kg7thjyEZFYTUgpZTvOWASK+hPkqvP FRSmaOkbsJyMlCaKyLhxE6XI6nb78pNGiqFU1TF3LNshRBTfLypOeeNphMuUo8B0DsXq FMFfSAjsZP09NiTidUhN2BBm7qZzul32zm/qjYvmTLSJnzWKCS4ref15/etKmk/gEMtt J4qkM4AzejxjlQIWLCeozNkoPqdtiS0ZhFS0cPh1zFzK8qKrWhNKcNgLbbPa8birUzET xsnomv2/LubRyMNaljFn8RiJBk4IyK1q/E16ut6m/I+WlAWUe9sRkASVKuoBDZvcLtBA YGfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SBJD/udz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a125si485339qkg.57.2017.09.07.15.49.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 15:49:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SBJD/udz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dq5cC-0001Tq-Qv for patch@linaro.org; Thu, 07 Sep 2017 18:49:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dq5Tu-0002xY-5U for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dq5Tp-000843-Id for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:06 -0400 Received: from mail-pg0-x236.google.com ([2607:f8b0:400e:c05::236]:33212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dq5Tp-00083V-Cf for qemu-devel@nongnu.org; Thu, 07 Sep 2017 18:41:01 -0400 Received: by mail-pg0-x236.google.com with SMTP id t3so1832918pgt.0 for ; Thu, 07 Sep 2017 15:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=daMSdqMbQuDE4qwwdspqIaJ34DPgPJe16DeZ0MUqsHw=; b=SBJD/udzGS6O7LRdXlb75Ry24Fp5dFFrzLGlJhDE302XvbNazE67qBdjv73nfctlDC KutfV2ZLzbfUCB89WucE4maAZICZz+3jUbARahZvQXbED1dzJju/0sYcBgwZqD6sAdQd 7AacvqSp5Wk3w50nobkElvY0QQ5oldM5gBnCE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=daMSdqMbQuDE4qwwdspqIaJ34DPgPJe16DeZ0MUqsHw=; b=Nm4FxHCUkb+wMpBcCbShEMQ2HCb9gBnPqmFDf3x1IIWYYmGgfUF+hOjXrvmXIXdigO qA2txqKt/m+yAhB2VlGN/qwoACR8xLdvEXkJqQ/twXCMTmMv8ePeDVw5qpAhaFOrB+Je ksTxaZ783kOy4V+NuhZbKDvTMMr2mjV2iueUkkHRbtK7XuHaDLxjm74PLn7Uf2+89dh9 /BfYPvZy89U3Sn6p/z99MgqDbBr3JP73cK8sagRVtlJvncNBTppCyTZtRxE++87DSb0Z iJIZlNDs7FwwPE7EUiF/pNr/2wF9Yuqz+WgCmsl5ais+6tas3BVi1oQWzsRom16EqtI2 TvLQ== X-Gm-Message-State: AHPjjUgWigKtISjOlKdTWd2afMTDqGbxL4NSiST/izYeQwgk6/FRsuoH o23xG+A+0otGlvPQWAkFbg== X-Google-Smtp-Source: ADKCNb50pmjHwiFsMkL6m8hX/bfOjZELvV9WlmZAOpVIV01TAlsn6Frm7qtamlSfNO5mJfjtd4Q6mQ== X-Received: by 10.99.105.196 with SMTP id e187mr937282pgc.360.1504824060061; Thu, 07 Sep 2017 15:41:00 -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 h19sm770678pfh.142.2017.09.07.15.40.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 15:40:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 15:40:32 -0700 Message-Id: <20170907224051.21518-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170907224051.21518-1-richard.henderson@linaro.org> References: <20170907224051.21518-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::236 Subject: [Qemu-devel] [PULL 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: , Cc: peter.maydell@linaro.org, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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(-) -- 2.13.5 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