From patchwork Mon Dec 14 14:02:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 343499 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3020786jai; Mon, 14 Dec 2020 06:04:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNNReX5SINxspFLHsU27aIiqywl2HtS2WsY084rMDaaMgyI6yaGWhNceFNHci9Ly36Qzse X-Received: by 2002:a5b:404:: with SMTP id m4mr7750221ybp.436.1607954653900; Mon, 14 Dec 2020 06:04:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607954653; cv=none; d=google.com; s=arc-20160816; b=LsApocE4XuHmamwI9Xp5RvZjKHtB2hrjkbcXPEE+W5nDarCqT12qXUfhk53hte75Bo Y7P7A6eybu9vF+KSaH4LhmpdpJ0/Hfu0KIoRcBo5D6pGpvvuCK11h53F3sRvHzvRKyjM /3iTsxPRT/W5iv+IqTm9STK2ICC/FHtOX4Ih6bDIJiCE8AHfvXCY2nuHweWUZwE30gVQ TY5YCenglIUISN1Z/JM4q7FyUURP/UgolJFFqKw50XhjewE7uUmM3pktIpyjzjbOi/bl nsy/usj1MdPTrT3ol2F4bJP63v16JbYWwW8V70UV+/iBnVqt9oGdbLUQvvpD93rTF05T xyVA== 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=e4GkJv76UBMIB3dzCCmxjxbYnphaAHyABGBMlwHa+9g=; b=clb91dV15UcV1jZ220yp1cNB/Lq3mwbKtaAyRoy9K2sDeauTXxbVhPhdoVov/UwGK1 bZ3kVivnA8ofZqqX+8yBPfSCvS6Bs8y2Hygi/5TyK1uwiHjEXrLmJMw4b25S5Cz4mpxL vdVut67/+sz2iB8509UrtINWmCLksxXvw2DanHOa7jr1oZQlahWDTOISv7yLjEX2uGNf wDBjEHGFBWFCYsm9RWvOlKUmR7uqZjYZkfZ08S0Q56U5gSYHLAD+gAldBIN3bfOPt/Bc tKUKMtbCSpUoHlAS2CT5Pq0kKU1oFT5cD0SIZogrwnSP6UndMn2WKU8YIW2tTcH5t8wE nWmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6qb9pB8; 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 v190si15616343ybc.340.2020.12.14.06.04.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Dec 2020 06:04:13 -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=e6qb9pB8; 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]:41846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kooST-0001bQ-8A for patch@linaro.org; Mon, 14 Dec 2020 09:04:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kooRm-0001Ys-O2 for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:03:30 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:43488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kooRk-0003up-Po for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:03:30 -0500 Received: by mail-ot1-x344.google.com with SMTP id q25so15756126otn.10 for ; Mon, 14 Dec 2020 06:03:28 -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=e4GkJv76UBMIB3dzCCmxjxbYnphaAHyABGBMlwHa+9g=; b=e6qb9pB8XU1J4St5tNl5X1Gk+/RxoTiVP3x8CX1fmEAvdXfOgUXxKjisvLENMopFag qJ1ZZybz+fuohhrOCYQAY5owdUp6b9QXvSSHYotKo7YcK8YU8zZUjROu0sLsSh6Hf54B h3SKTJF27hzSgf3YdGqP5yGBy+P7V1jwIBm6ATuP9ATc+tTpZYrTHKcaPLseG+zbH/zw OWOm+k4+A62gZcAI3Lwtrbirg7phgSIZ9dzetvXW70CcMDCzmOEqQHGm1/+wKdQlXi/A US/h9UlzKOvMc86vshcHtyU3PdjDxiOzVuah66sudjjO7puD7NoOIhd4gqKKojVK50vC imLg== 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=e4GkJv76UBMIB3dzCCmxjxbYnphaAHyABGBMlwHa+9g=; b=uMEq3yexGnJxIHaCtrCi93JyAo35shocb6QyH7vcZZLEWYB/TFq0ljgzuZ5Mu3IqiE Ot2T+JcLZqHiNw2VKw3ShsW3FPcN81HfZUBzEQMvNgdhlSfsmN4/kQpC7tuCxbJbc879 ZO9jIrmgZRDJP5GJzCZ+fjDGun/LjpHbunHobLyrsse8qEmMOKWfRgwZqWXOwL5fVBZD bApURtZ0meKq7R6jPoHoAnRFZodrqd3L9jMtFHyTfqpnBHDyzmVaUk4jyradvTYTZl/d VF90clmq7lbnG6iIJ8nFdDW8SAxTRysjcS2d4RiHxtycrNLGWnQp79HLR9TOOqF5gAhj YUxg== X-Gm-Message-State: AOAM5308QJeHLO4qmrx4l2VHCZgmcofNdmDMOkjVvZqxFv9uSrfW+nNw g65ouJSc9wmMLZPcaYZG1TSAvSQkcaFAlnkC X-Received: by 2002:a05:6830:1e7a:: with SMTP id m26mr10520089otr.78.1607954605458; Mon, 14 Dec 2020 06:03:25 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id t24sm3940146oou.4.2020.12.14.06.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 06:03:24 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 05/43] tcg: Move tcg prologue pointer out of TCGContext Date: Mon, 14 Dec 2020 08:02:36 -0600 Message-Id: <20201214140314.18544-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201214140314.18544-1-richard.henderson@linaro.org> References: <20201214140314.18544-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::344; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x344.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?= 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: Alex Bennée 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Joelle van Dyne 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 675334e844..67065c2ede 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);