From patchwork Thu Jan 7 20:14:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 358256 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp782590jai; Thu, 7 Jan 2021 12:24:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4l1DxRniP1ETOcr9UJ5UivjziDWqWgYX9XIVDzGuHQ3PSPfYyebwCMKmkmmX+gCuy6dOm X-Received: by 2002:a25:1e42:: with SMTP id e63mr865701ybe.270.1610051084392; Thu, 07 Jan 2021 12:24:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610051084; cv=none; d=google.com; s=arc-20160816; b=j7BNHLtqc+gV1PtYpah3HJlwpX0GgDfghxd8EQsdixTwsao39vDkUEsa7wk/trtWZz Utyp30ODj+skjgnXpUUhKw15CBc5nYcYL2orw2eZIA1avjJnnyRKl6XHJV5LEUirlXEZ mvPRTGoZoy2y1oFPlREqFAcFmbEwtCIAGJf+NsvJU1lNmhWm9lVX35gUnXhSHpwjFlJk tSVjfwjfHdLSD3huazjVubQCM03LfEVkCM08Q5rglL880xkZRajuKcxHlIJ8/cPthM7c /2UyMrnfO5Kpy7l+0reefRxybMxgVG313bzuVs+Tkx8YtoDf8U25q9kopSP8mjDNd1bg FIdw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=cwIe7ehFV7zcthsYPXS8JZ/YxLeGaqAzHfZida8viS0=; b=QnOeyKCn53vgL+ySejmg4BS8FN+kZI3Bb9rkelLQUTaGGuOG0R0vpBlX1DWzokk4z1 as+MZjrvcpoBZYu4yRo+HmE5kek7pJj0A05vBdrLoNAM5h29PX5y3KIFmlVZ45lJOZ3c Nh8QYjkvrvMvR7tZVlixRiiAT5B7OMvnZ7GMBGVjase8QxIxRlqYJJWoj24rGtjH6tXh Om5ZeHSgxpD6xEzBbzW39DkN2vXuPxBanNg1xT56QO9vEVFlgj3f1oGIA1gPlgC9k0uH 2bgO7pZBWXkYysXAYaGebq9FuMAXjmhMtmSnMvxacOufAYDKCemKsgE+NDDxvG1/vIvW Ohqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BB4dVPFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id y17si6783177ybq.34.2021.01.07.12.24.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jan 2021 12:24:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BB4dVPFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:43970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxbpr-0003GT-RQ for patch@linaro.org; Thu, 07 Jan 2021 15:24:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbge-0000ye-PB for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:15:12 -0500 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:39748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbgc-0001T8-Es for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:15:12 -0500 Received: by mail-pj1-x102c.google.com with SMTP id u4so2765720pjn.4 for ; Thu, 07 Jan 2021 12:15:09 -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 :mime-version:content-transfer-encoding; bh=cwIe7ehFV7zcthsYPXS8JZ/YxLeGaqAzHfZida8viS0=; b=BB4dVPFlsC8jiyq2dUGboLfeL+get6+FqSXYbV8Vp981IzDYotCf04i3gMKDuCCKg0 OSZoQyY0Gk5Drfbo4sAW40I/rDwOY1xSu5R3tYX+rawbfPsBcloIHkrHAe+eMl+5qTWf cAz4PIed9GXExURqY+Gw2CMg0FX6EARJkxR74rtdPJsYoFhTC+0Yls+pLW2MMzAHibdb NUT0JuaDeaEhQ8KnvwoT6Jve6HE1FXPAeJMb0szxbvmjo0U4L2TlaRwvejMSyEdcALpu VfiZkYovLVgZGp6hzIcCS3e91QLTHINEu1JILprfTeinTSgCv5G3WavXMZaTXaFc9R/0 Zv/w== 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:mime-version:content-transfer-encoding; bh=cwIe7ehFV7zcthsYPXS8JZ/YxLeGaqAzHfZida8viS0=; b=XwI8MWAZfOWR6fvM4Wv/l0zSZsHsXtz4ZUdTqpx0Om+k2AOKJASeF+bqUtqlzwLk9I RGTGGG3KyaSZAAduWFQSpw76v2FbzYdjeHaqNPBfw1HxI0L+UbNveC55kxKBlUvFDytc zgnzMVUyQ3RGLPOg4WbYNvsIuX8jN0UZ0Kt3zOz/ZJ/zsp1npiIWCwOQugJlmYlUWziX Dquf7izhu5xpXBE6w3O7OxcdGMHWP8vUHxmJLViCCAQcwsdxYpwJ4zZRnH3hDsZtBJlm LBGmnGVnuEHm49lhu93l8jfmtTNCiwKho1IcKEsL6uDaQA3qMPmFozyJvH9mc4tsgpsM ufMg== X-Gm-Message-State: AOAM5313g6sdy3EgWwDVUJOpGeeFZZMTyA6WQahMx2OMaIR3wN7Pt0iy wDUGhaVZnI/UwoIdRn/VjJTu2J1twDHOLw== X-Received: by 2002:a17:902:6b02:b029:da:c6c0:d650 with SMTP id o2-20020a1709026b02b02900dac6c0d650mr490444plk.74.1610050508781; Thu, 07 Jan 2021 12:15:08 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id v6sm6516265pfi.31.2021.01.07.12.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:15:08 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 09/47] tcg: Move tcg prologue pointer out of TCGContext Date: Thu, 7 Jan 2021 10:14:10 -1000 Message-Id: <20210107201448.1152301-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107201448.1152301-1-richard.henderson@linaro.org> References: <20210107201448.1152301-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Joelle van Dyne , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This value is constant across all thread-local copies of TCGContext, so we might as well move it out of thread-local storage. Use the correct function pointer type, and name the variable tcg_qemu_tb_exec, which means that we are able to remove the macro that does the casting. Replace HAVE_TCG_QEMU_TB_EXEC with CONFIG_TCG_INTERPRETER, as this is somewhat clearer in intent. Reviewed-by: Joelle van Dyne Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 9 ++++----- tcg/tcg.c | 9 ++++++++- tcg/tci.c | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 8ff9dad4ef..9cc412f90c 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -621,7 +621,6 @@ struct TCGContext { here, because there's too much arithmetic throughout that relies on addition and subtraction working on bytes. Rely on the GCC extension that allows arithmetic on void*. */ - void *code_gen_prologue; void *code_gen_epilogue; void *code_gen_buffer; size_t code_gen_buffer_size; @@ -1222,11 +1221,11 @@ static inline unsigned get_mmuidx(TCGMemOpIdx oi) #define TB_EXIT_IDXMAX 1 #define TB_EXIT_REQUESTED 3 -#ifdef HAVE_TCG_QEMU_TB_EXEC -uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr); +#ifdef CONFIG_TCG_INTERPRETER +uintptr_t tcg_qemu_tb_exec(CPUArchState *env, void *tb_ptr); #else -# define tcg_qemu_tb_exec(env, tb_ptr) \ - ((uintptr_t (*)(void *, void *))tcg_ctx->code_gen_prologue)(env, tb_ptr) +typedef uintptr_t tcg_prologue_fn(CPUArchState *env, void *tb_ptr); +extern tcg_prologue_fn *tcg_qemu_tb_exec; #endif void tcg_register_jit(void *buf, size_t buf_size); diff --git a/tcg/tcg.c b/tcg/tcg.c index 759a41d848..b686cc9ba8 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -162,6 +162,10 @@ static TCGContext **tcg_ctxs; static unsigned int n_tcg_ctxs; TCGv_env cpu_env = 0; +#ifndef CONFIG_TCG_INTERPRETER +tcg_prologue_fn *tcg_qemu_tb_exec; +#endif + struct tcg_region_tree { QemuMutex lock; GTree *tree; @@ -1055,7 +1059,10 @@ void tcg_prologue_init(TCGContext *s) s->code_ptr = buf0; s->code_buf = buf0; s->data_gen_ptr = NULL; - s->code_gen_prologue = buf0; + +#ifndef CONFIG_TCG_INTERPRETER + tcg_qemu_tb_exec = (tcg_prologue_fn *)buf0; +#endif /* Compute a high-water mark, at which we voluntarily flush the buffer and start over. The size here is arbitrary, significantly larger diff --git a/tcg/tci.c b/tcg/tci.c index 5d97b7c71c..cf0440445d 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -481,9 +481,9 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) * One possible operation in the pseudo code is a call to binary code. * Therefore, disable CFI checks in the interpreter function */ -QEMU_DISABLE_CFI -uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) +uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, void *v_tb_ptr) { + uint8_t *tb_ptr = v_tb_ptr; tcg_target_ulong regs[TCG_TARGET_NB_REGS]; long tcg_temps[CPU_TEMP_BUF_NLONGS]; uintptr_t sp_value = (uintptr_t)(tcg_temps + CPU_TEMP_BUF_NLONGS);