From patchwork Tue Jan 5 17:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 356900 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp186172jai; Tue, 5 Jan 2021 09:43:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjG8Okjs5kua34NPlx2SuYUclQeMZnFoBxODNzwHJN4sU9BEpxy+Yx/o5tpIkW+8043l/e X-Received: by 2002:a5b:908:: with SMTP id a8mr820462ybq.11.1609868588178; Tue, 05 Jan 2021 09:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609868588; cv=none; d=google.com; s=arc-20160816; b=tqleqVsoUxiVeiMeQNFHXbMSSIt+GlqEdAKmZoHxjAmVhMk3Fh+qAzEikaT9BOKMDz GoKxsoSBmTGYpsx8dHbebgancp63q3HB0hw0E8hhKpN5x6FCFGfZoo9B/AIFy9Q6fDRv bTjzP7s8JIGZqfDwpedtE3Mv7/QCEal4Dgbx2h/VAS3uG1VJdQ3YUBOtXARDNI1yneQB RO0jfx9V/BqegoG3wsE570qkFG0sNa6mJippNZeSJo0vwWn0N/pevEXZ1cHhK7ZjYyHQ hyi5mtuUlr5v36Y750vehLif4gd9tObO+Yt7LvPiPvxo9NfCMM7ui5rtGr0HRPOPAzdK QsiA== 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=mbF8LIbJA/srkkxrRGCDeXCnJ4tQUbtm6VJdqasFFJw=; b=xN7U0GWPQe+vBTF5dhKk2zib9zA/tR/0hjNi/VgpOKzyNLve5rIyC0VIrcn6Tr3Ncs y6kC0vIIHS2e4/VLwk+SoB3+0t17aR++QM2Yj+JQvT1wVCSfrjDFG3pKttfW91h0XjTX 1Dm1nGMBSHtitY+wJ0Iw20Tn2RJeLDvcSM4wmh0qomoMqvMt68ctm3vJ73fAZLxZ6Pl7 6Ljb7rSMVinQTndFLyf1K5H8LeQFMzCMITDWzifZuw5AMqvlrTLPTd3PgYOZfuIdvv29 VitWMcjzfPTSlPPdhdkPYrEQM4aAhMMfQks+jR3PU27WU/GEBMtdTI9xiSClPcd9RFXd 4rPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WVxRkvkE; 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 j7si415115ybt.380.2021.01.05.09.43.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jan 2021 09:43:08 -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=WVxRkvkE; 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]:40930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwqMN-0007CS-JO for patch@linaro.org; Tue, 05 Jan 2021 12:43:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwq0C-0002HJ-4m for qemu-devel@nongnu.org; Tue, 05 Jan 2021 12:20:12 -0500 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:39027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwq08-0006RS-Mb for qemu-devel@nongnu.org; Tue, 05 Jan 2021 12:20:11 -0500 Received: by mail-pj1-x1033.google.com with SMTP id hk16so14008pjb.4 for ; Tue, 05 Jan 2021 09:20:07 -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=mbF8LIbJA/srkkxrRGCDeXCnJ4tQUbtm6VJdqasFFJw=; b=WVxRkvkEGvR0qY76Ju005kH4wDsMZ9OQ2Vx2WXLLv9cEnERuyRKwUff5sJYaDfAv53 eYxe8KUUgYuGYRhKkYumPAqLqHDGgldWkBc10xA0uFE1RaYvgjdS6dFwKoIAHBguJ6aX tPw1Dy0W2/c711y6l9aJ7Xc0+O41JhgI4YndsHx7RF1M+zCSHe1QkJFfrFPuIfb/N1QN NHrEL6l+cr8jA6tXpuYAZmIvIrMh3JOhJJsIqr3ZyMFkjFXR6b4MMXIuzrKyxd9CZkkF ibdE2gH7bpB4i/bIzCLws0RgfO/BXfWmX0y+LrrBjpiayi9igZWghXygjfnlatnM9fUM TSmg== 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=mbF8LIbJA/srkkxrRGCDeXCnJ4tQUbtm6VJdqasFFJw=; b=O7DOJAnJxyIzFLOMRTIALmjsgrYG+xQQFqVWhigjEw4ftXDJ406heoC2GW8syQVbiN 3nG3QDhT1zlBI7SQrQJEYA4HPjTsrwLjddDiVxdmMfdwmtiLNIzidzD1ShDwy+G3JnUe FndEt076XIRnSKR1UY0JFB2vV9iNGrYqYN4d+otuYEVZjlEQgE9QvaZnGJg5z4k24AZr 3gYsE6nnGdGppX98gVMQBwH8s6suhPYU6t4gu8VapIed8s/ftgpCiytOYMfd6aJlEQU5 UAEeYrs5wF5t1hBd1bgk2gEacRgf/pOozmUI32vV4V0qRau8Ea/wJjx3Q6h1v2jSjkWP pwvA== X-Gm-Message-State: AOAM532eF/Vs9KB8TbQkhaWeYMaHMTaSeE9ZphJPbXN6Y/owQEyvkEdp 9R5L0sUpjGbgyQTNeo4ZD4x6WOz66WCDsg== X-Received: by 2002:a17:90b:346:: with SMTP id fh6mr214455pjb.225.1609867206392; Tue, 05 Jan 2021 09:20:06 -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 u12sm2010pfh.98.2021.01.05.09.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 09:20:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 05/43] tcg: Move tcg prologue pointer out of TCGContext Date: Tue, 5 Jan 2021 07:19:12 -1000 Message-Id: <20210105171950.415486-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105171950.415486-1-richard.henderson@linaro.org> References: <20210105171950.415486-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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: =?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 | 3 ++- 3 files changed, 14 insertions(+), 7 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 82039fd163..d996eb7cf8 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -475,8 +475,9 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) #endif /* Interpret pseudo code in tb. */ -uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr) +uintptr_t 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);