From patchwork Fri Dec 14 03:19:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153731 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1605613ljp; Thu, 13 Dec 2018 19:38:15 -0800 (PST) X-Google-Smtp-Source: AFSGD/XOqYxvY1szvab0Mh+SyCVK9Y4P1g7xRjMbbktqv2f0RjE/wjZhsyU7aUIXTPPdIVBeD0PI X-Received: by 2002:a0c:d174:: with SMTP id c49mr1229507qvh.231.1544758695395; Thu, 13 Dec 2018 19:38:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544758695; cv=none; d=google.com; s=arc-20160816; b=XowEzIYoAH09DV00f3sLveng9D15RWKCgZaAEM7dzJ8PZ6u5lOrmO+wCNysgmqDcHN lHvMDi7PKJxB2idctqOGv8XnWSiGT88/bdJE1qrrxaGCl3k1cjYDdb7EBjZ2bzGlswL4 zSUA3qqQYVwLliGgHnn+w7IGrh1pVVzTRwgOw0wJcT4ZIpqWm2QiaBS+MRB11Et1Zlf+ /vb4EsVv1MW7y9n1pKMbjRSY+mfjxdgH7YF5q2jDXFwOqLgpU5KtnaHIuZ+iRenrc1hS VXkGl4yTYClpYV3wUvBQu8uznFgnvhc1E1PI/YgDqJjqwymRPWRLSPagwB1PJ9iHYIsQ SxtA== 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; bh=RGLha6wnqV2UoHvC7GVzmeu/KOuO36ywWoKZjz4PETE=; b=yoAyneVY3y5tj7vz6SNeNhsyB4ZoUl5V6kXDgdUECIAiUpmLNDGqrfQW2KY9/B8ty4 6VknCBhmUmX9+Ya8Izgn/R/QLLqW/DfCMMLNSoA2xqMwYBfnZjN4zt7Cj+v1/gPU5DgD g3ppn/ycGW9tcULAMe+wVTFGj1EM4qRrdV638X+N5w15vDFQDgufMi7As3jbosXDD9eh Hzc1pe9PCpDjwgCbwGhhpS2RrmJXyISVvDZZM8AimJZf3Rxcyf20IQ8MCMLQaqfXj/9o E44kL6nkOqvX9DMwohpJWnbxT0Mwk7r05Xfl7PLMP1WU+PV6Ygetjiuk/rq5u8zmRVYL BIdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cFdevTll; 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 v7si2210296qvl.15.2018.12.13.19.38.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 19:38:15 -0800 (PST) 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=cFdevTll; 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]:59154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXeIo-0005ho-R4 for patch@linaro.org; Thu, 13 Dec 2018 22:38:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXe1B-0006FO-1c for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:20:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXe16-0007Uc-RY for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:59 -0500 Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]:45952) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXe14-0007Eg-8A for qemu-devel@nongnu.org; Thu, 13 Dec 2018 22:19:55 -0500 Received: by mail-oi1-x229.google.com with SMTP id y1so3443290oie.12 for ; Thu, 13 Dec 2018 19:19:50 -0800 (PST) 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=RGLha6wnqV2UoHvC7GVzmeu/KOuO36ywWoKZjz4PETE=; b=cFdevTllHngDS/Xhgg2LGwZRZHQyok/opBNmBu5982egykC/ZKEadI3EfsYoxmf0Pq gAF239KLcPc/NOuixo850e2H4M89j3IIl+EuzniVy2VasfDjagRmEXNY4xwR5vf4MkFI ERT3lYbStkpL/IjiE8ujXMbt+CqdH8YxehDWE= 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=RGLha6wnqV2UoHvC7GVzmeu/KOuO36ywWoKZjz4PETE=; b=ZR1g/FGmCU47NQfDy5Dp5/Ay+8nojUaqwCmSpPTvxYCYr5UdDgFTGRFLUaSrFwW27+ 2NToNHrRvt0+WdmHHlpQoMyTiABiguEZ0UlCdlventD3fXAGcqt+PSmKzdsBZAwwwdCy id7qVQ7TxclwbzJIrKyyhNQ3zmhSlnZnHEnXS/bcxYQUCUv4g0BUVkcj0YSxjzHJ5eBj SEaqvPqjCrqT0er6zIRbQUVijEi7WYRi4SR0FSIFOTgbgP2WXZB4RC5SFz0wZDshr05r eg71ba87l5vLwaS/rGWMZJDiO2drUJR6FOUDT/eH3qchIh43xyl7w3227pxQL+TftauP l1oA== X-Gm-Message-State: AA+aEWZ3Kt2P8eA9esjioqePrQo9VDm1uYia9BLKt9Fk92MTNu7zHlyd vPyJlsfH9levlQ686vTA4iozrTvdA9tSug== X-Received: by 2002:a54:4895:: with SMTP id r21mr847663oic.210.1544757589977; Thu, 13 Dec 2018 19:19:49 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id g138sm2367537oib.26.2018.12.13.19.19.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 19:19:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 21:19:12 -0600 Message-Id: <20181214031923.29527-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214031923.29527-1-richard.henderson@linaro.org> References: <20181214031923.29527-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::229 Subject: [Qemu-devel] [PULL 21/32] tcg/i386: Precompute all guest_base parameters 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These values are constant between all qemu_ld/st invocations; there is no need to figure this out each time. If we cannot use a segment or an offset directly for guest_base, load the value into a register in the prologue. Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.inc.c | 101 +++++++++++++++----------------------- 1 file changed, 40 insertions(+), 61 deletions(-) -- 2.17.2 diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index f7b548545a..3fb2f4b971 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -1857,22 +1857,31 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) tcg_out_push(s, retaddr); tcg_out_jmp(s, qemu_st_helpers[opc & (MO_BSWAP | MO_SIZE)]); } -#elif defined(__x86_64__) && defined(__linux__) -# include -# include - +#elif TCG_TARGET_REG_BITS == 32 +# define x86_guest_base_seg 0 +# define x86_guest_base_index -1 +# define x86_guest_base_offset guest_base +#else +static int x86_guest_base_seg; +static int x86_guest_base_index = -1; +static int32_t x86_guest_base_offset; +# if defined(__x86_64__) && defined(__linux__) +# include +# include int arch_prctl(int code, unsigned long addr); - -static int guest_base_flags; -static inline void setup_guest_base_seg(void) +static inline int setup_guest_base_seg(void) { if (arch_prctl(ARCH_SET_GS, guest_base) == 0) { - guest_base_flags = P_GS; + return P_GS; } + return 0; } -#else -# define guest_base_flags 0 -static inline void setup_guest_base_seg(void) { } +# else +static inline int setup_guest_base_seg(void) +{ + return 0; +} +# endif #endif /* SOFTMMU */ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, @@ -2011,27 +2020,9 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) add_qemu_ldst_label(s, true, is64, oi, datalo, datahi, addrlo, addrhi, s->code_ptr, label_ptr); #else - { - int32_t offset = guest_base; - int index = -1; - int seg = 0; - - /* - * Recall we store 32-bit values zero-extended. No need for - * further manual extension or an addr32 (0x67) prefix. - */ - if (guest_base == 0 || guest_base_flags) { - seg = guest_base_flags; - offset = 0; - } else if (TCG_TARGET_REG_BITS == 64 && offset != guest_base) { - tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_L1, guest_base); - index = TCG_REG_L1; - offset = 0; - } - - tcg_out_qemu_ld_direct(s, datalo, datahi, - addrlo, index, offset, seg, is64, opc); - } + tcg_out_qemu_ld_direct(s, datalo, datahi, addrlo, x86_guest_base_index, + x86_guest_base_offset, x86_guest_base_seg, + is64, opc); #endif } @@ -2147,28 +2138,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64) add_qemu_ldst_label(s, false, is64, oi, datalo, datahi, addrlo, addrhi, s->code_ptr, label_ptr); #else - { - int32_t offset = guest_base; - int index = -1; - int seg = 0; - - /* - * Recall we store 32-bit values zero-extended. No need for - * further manual extension or an addr32 (0x67) prefix. - */ - if (guest_base == 0 || guest_base_flags) { - seg = guest_base_flags; - offset = 0; - } else if (TCG_TARGET_REG_BITS == 64 && offset != guest_base) { - /* ??? Note that we require L0 free for bswap. */ - tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_L1, guest_base); - index = TCG_REG_L1; - offset = 0; - } - - tcg_out_qemu_st_direct(s, datalo, datahi, - addrlo, index, offset, seg, opc); - } + tcg_out_qemu_st_direct(s, datalo, datahi, addrlo, x86_guest_base_index, + x86_guest_base_offset, x86_guest_base_seg, opc); #endif } @@ -3415,6 +3386,21 @@ static void tcg_target_qemu_prologue(TCGContext *s) (ARRAY_SIZE(tcg_target_callee_save_regs) + 2) * 4 + stack_addend); #else +# if !defined(CONFIG_SOFTMMU) && TCG_TARGET_REG_BITS == 64 + if (guest_base) { + int seg = setup_guest_base_seg(); + if (seg != 0) { + x86_guest_base_seg = seg; + } else if (guest_base == (int32_t)guest_base) { + x86_guest_base_offset = guest_base; + } else { + /* Choose R12 because, as a base, it requires a SIB byte. */ + x86_guest_base_index = TCG_REG_R12; + tcg_out_mov(s, TCG_TYPE_PTR, x86_guest_base_index, guest_base); + tcg_regset_set_reg(s->reserved_regs, x86_guest_base_index); + } + } +# endif tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, tcg_target_call_iarg_regs[0]); tcg_out_addi(s, TCG_REG_ESP, -stack_addend); /* jmp *tb. */ @@ -3440,13 +3426,6 @@ static void tcg_target_qemu_prologue(TCGContext *s) tcg_out_pop(s, tcg_target_callee_save_regs[i]); } tcg_out_opc(s, OPC_RET, 0, 0, 0); - -#if !defined(CONFIG_SOFTMMU) - /* Try to set up a segment register to point to guest_base. */ - if (guest_base) { - setup_guest_base_seg(); - } -#endif } static void tcg_out_nop_fill(tcg_insn_unit *p, int count)