From patchwork Fri Nov 6 03:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 320729 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp977351ilc; Thu, 5 Nov 2020 19:33:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyobdSWT36v4zndWeVbYz/9ae6UAVLNnb5va0jJb88Dz4eD/d4wsbZQiDLLks77qKV1XJFU X-Received: by 2002:a25:686:: with SMTP id 128mr205427ybg.175.1604633598340; Thu, 05 Nov 2020 19:33:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604633598; cv=none; d=google.com; s=arc-20160816; b=mtyAidPm1Nfk9eKCdRB9nk5tNRYtJUI+/sKJSZBv/t+R8uccgoICaz5jhaq1ePXK3+ Uu78c5iyVAovuPkUL/+7Pegsz5z9IDvm9DR74FPeBEow5+AjNeWnMle8QO5DmJddwUqY r5gZaAbsfF2eZ6hriY5ZPA3A6ZuJR8jxappbR6eAfkLwKqdiENkcD8nCMhb/iavO8kMb vzMTQp3Ij0otU1qGh8mml6kIj+rUanQMDM47nlktoGWmARgBxhevqbG+8lgYpYguXWZA J4Ow5K3CA7kE2RxSe5YbXe+zSvT3rJ8r87kfGc4KyGUNJfYWPNPbOpXByqHDvM2bq4Yc BZCQ== 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=pAispzyuoe9bb7pX+t0JNwtc7CrjVyVvkGgTqmJ29zY=; b=KKF32JxuyyNT+gmuECsmXLU+NMOJpSGpx/KogwC/VF+SKAwnJQtXNL/b/NqZ169xPy ckt0YnvDyR+EiANXwPAN/GS8eDkgZiAXmFW7xZBfgiv2+3UF40VDp6oo/yjc5tE0kkOM xFocofNJtxsGapEJXWN0RDM/VMOkxtdfBKlYNd2slpNrWZ3lBgvJk2sC8Yfpc3OzZLqH sZkSxyP4smHlRFyvIAlbypD71DW7wylNoBe27INpIEYHrw2GLxwupw0AxNMRhJH+qLsz s2u4Ve3SEkxgI/6T0FspTwTO+WH45uIJeNZJb8v2yTggLmlKns64KCT4S0/6keMPxX7t GX5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bd1BKXve; 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=pass (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 x8si2823904ybt.35.2020.11.05.19.33.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Nov 2020 19:33:18 -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=pass header.i=@linaro.org header.s=google header.b=bd1BKXve; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kasV2-00083M-5P for patch@linaro.org; Thu, 05 Nov 2020 22:33:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kasRP-0004N8-5S for qemu-devel@nongnu.org; Thu, 05 Nov 2020 22:29:31 -0500 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:37586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kasRM-0006tw-2m for qemu-devel@nongnu.org; Thu, 05 Nov 2020 22:29:30 -0500 Received: by mail-pf1-x443.google.com with SMTP id 13so51933pfy.4 for ; Thu, 05 Nov 2020 19:29:27 -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=pAispzyuoe9bb7pX+t0JNwtc7CrjVyVvkGgTqmJ29zY=; b=bd1BKXveBuU//fHZTnIZDLyjtxcrIVGn5jr5DMLBZa95UkDPoPvw9ZG/0zqU8+ozKp Bmhu/keZnbhmWvKVtnNAum2iFCjIj99TpIVfCNubgZffGNABsaL7Pvp5pgaOUIXLnpU7 KS1dEpaJ1aeFhB7PThe+jWnKH0hWR/9Ay7DV7fHF18wEQ5XLGv4vpiSEunmv8/6yzwqg k64QnE65/5g7SgKd6Uyv0tG1X4L/Dj6n1T8llcCeu5qNmZnXyfzVL+jyxBCd05tPutGp QmUaKXxm5oxSjSaPOinyU/ra/iK6kedtmFECB/JO0bxGddCIamVZFQ9B1PyhUH5C+hOf 4Ebg== 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=pAispzyuoe9bb7pX+t0JNwtc7CrjVyVvkGgTqmJ29zY=; b=cjJMl90gCXhQFa8zXce8Dgtb5ESf9lZVmkMtqAXartM6BkCAO/La71dJI60Onc7UZz hnK/ckshWeEamog1DHIpIgl73a3QuTL5qLLrjkzm2vIjYZSBYoiN1PWalBHd5W2g7IPQ 3vxuPjcLZzjTPmEnX782N+ucwelwR+u0P0aqyVJHi3QzZp2wqugeTI58tO9Crh1JiJ75 CPMYJHJUrm1MT1gJfBGWz8cjdI0WkP2helXkIOTpyjC7FNQcrl8CllVhGnnAKnw9wnqb JlD75SWIo8RODjd+pRmP6X7o2aYjB6rsvRoV0iEvUxfaIummSDmtWOOLnIlM4V4rbsd0 HWcQ== X-Gm-Message-State: AOAM532wdFeAtOtcyaf7LO9CExyeBwT7K/JpTxV65ISBSViL3bOPYFRA 5BDNtP9scQ+yMcJLslmAg3G0qrZRrkOebQ== X-Received: by 2002:aa7:9e90:0:b029:18b:a94:3498 with SMTP id p16-20020aa79e900000b029018b0a943498mr5160617pfq.54.1604633365753; Thu, 05 Nov 2020 19:29:25 -0800 (PST) Received: from localhost.localdomain (76-14-210-194.or.wavecable.com. [76.14.210.194]) by smtp.gmail.com with ESMTPSA id i10sm40773pfd.60.2020.11.05.19.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 19:29:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 02/41] tcg: Move tcg prologue pointer out of TCGContext Date: Thu, 5 Nov 2020 19:28:42 -0800 Message-Id: <20201106032921.600200-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106032921.600200-1-richard.henderson@linaro.org> References: <20201106032921.600200-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: j@getutm.app 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. Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 9 ++++----- tcg/tci/tcg-target.h | 2 -- tcg/tcg.c | 9 ++++++++- tcg/tci.c | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) -- 2.25.1 Reviewed-by: Alex Bennée 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/tci/tcg-target.h b/tcg/tci/tcg-target.h index 6460449719..49f3291f8a 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -189,8 +189,6 @@ typedef enum { void tci_disas(uint8_t opc); -#define HAVE_TCG_QEMU_TB_EXEC - /* Flush the dcache at RW, and the icache at RX, as necessary. */ static inline void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len) { diff --git a/tcg/tcg.c b/tcg/tcg.c index d5a72c226f..a6f47b033c 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -161,6 +161,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; @@ -1054,7 +1058,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);