From patchwork Sun Mar 14 21:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 400145 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp2930672jai; Sun, 14 Mar 2021 14:58:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmIvrpXjwPSnhhAX/Em86j704zw2wbYoT+ixVMCBPiqjqWjaVLjbf6OFiWEuWU5kAaIH7C X-Received: by 2002:a25:d214:: with SMTP id j20mr30965041ybg.147.1615759135279; Sun, 14 Mar 2021 14:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615759135; cv=none; d=google.com; s=arc-20160816; b=d9IpVXPgfsqk3RG2b/81SijSTdmUVvQJKtOHITM/YYZpXUG4sn2FodbKc8rgcfH1pf L/sDvbZ4e0XT8ZGU9PdeqiPTy+pbPN9cNprP7FQwIRUNKtFWiqRPdPtfhWVQjOPcNC4g pa20HArto6EALOmJIM6Y7emDS3vSpecKaNDofb77KcrsO1SJbv9+laF9UCA4BeomxDNe gcfN5qZGEM0MOo4+QKs6WWznIqj+OgtzVw7meIf6i1lSX09ysZL0oTflDIqrzF0FuBww qgep2mA5U93+TcpMaqq/nug5fBP0PaJT3dVrafMHCdlPsUVQRVAeVP0a7aiq/qMgH4Fc KPqg== 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=Ikw13dOWP7lAlgKFWW7kJaboNeemcm515c1euWh3qoM=; b=lkQWEpOwN6i7XENLZEC4wXVNI71/ZzxrubnaVcVOyD4ZMXLWQ4R3tZeik6J0mQT7Vh k0VDwwzKBAiLKOslFSOSmIUi8GmWy7662iN9adtsSIQmZxOfR7C9dBNqxtW93EIzJWUH zAvhael/jNtS7UdCEq+jxP0fdBfmoj5wbV6kBrowWbHGwEftAmcSFF6mSUPUC1rMn/c8 hn8fy1sAwxNjqn+XrJLzust4p6mfdWoi/10um1FB1DaE1vTjeboPmVk4JxEBxXW6vZc7 K4FhN+haICCKuYdayk8eUUEf1TDw4GxSMS8cN4jioLdDwW84KZxScQGe1TmllxIIP0E0 a4eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XbhgSV0+; 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 v10si14057175ybq.162.2021.03.14.14.58.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Mar 2021 14:58:55 -0700 (PDT) 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=XbhgSV0+; 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]:38140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLYlC-0001q8-PI for patch@linaro.org; Sun, 14 Mar 2021 17:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLYHK-0006QE-1W for qemu-devel@nongnu.org; Sun, 14 Mar 2021 17:28:02 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:42133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLYHH-0008K1-QR for qemu-devel@nongnu.org; Sun, 14 Mar 2021 17:28:01 -0400 Received: by mail-qk1-x72f.google.com with SMTP id z190so29892186qka.9 for ; Sun, 14 Mar 2021 14:27:59 -0700 (PDT) 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=Ikw13dOWP7lAlgKFWW7kJaboNeemcm515c1euWh3qoM=; b=XbhgSV0+XSAV3sXwI0vtpgVL+rOXB5MIKHC9EmSPetHvOchpFtEnUbij/s39OiPeqR xqzWkP148XpBe4jlXW+UyugLp9TLHda45zw7AWYUQ7jzl1kOP9ebuLXelTTiwtrmyGAp /UuJzkG+sH0mOjAltt/HGXckk+IrI9xY7I1pkZM0dKe2oNHJdlKFZrp6omVL3kmgK79J ytbBtPUeTVJDtqyyVPcZow6RFmt+IchKj5OnJijMecIa6MWkXrwfyjUGyWwGlrvIVRfo OFgiBIhWFn04e2j2BYKZ0Z2VtDPjg77ZGKhTuA1OUc9pyeQc2FN3g/sEcSihTH0rMG61 r1BQ== 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=Ikw13dOWP7lAlgKFWW7kJaboNeemcm515c1euWh3qoM=; b=KNl8I4eK6c9SbLaZyPKXECO92aY8Z4osbPtDErIJVsYGomFMsAtYvoHX6LhKbouA9u n+5a3Ol96kbPPaRBcRCrH/uA7wDZr+bGyCOiq2kAUNSJ4UWlY4G7tZPbQWkqKrq9N3WH rEYDzLb1wa4/50d0ZV8mAjdTNCyFEKQau6dD9BLpyr5gJNbD0wVuX60yf/yfQnMJ1FIs uafJkxvK84dSglpLDCZYuU3hnksxGOUEduM9df5Z/YSAlMSkqRqJouMQqPYx1kqmqJ4S R79RdT7E/bqOCOKAkDs7j4cj/BP5Im0Wxftyg3LZwD6Rv0sDxXOIdh8K6526gEWnwBJX ohkw== X-Gm-Message-State: AOAM533ZVKOYUMcd8PB2525/azGzmgkIwS4lBQ+RTmYA9fpJMmTNnur9 w5E6eIvw9KvlvyfW5MegYqZkyaBWQ6QU4qTK X-Received: by 2002:a37:a404:: with SMTP id n4mr22138457qke.439.1615757279036; Sun, 14 Mar 2021 14:27:59 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id t2sm9337749qtd.13.2021.03.14.14.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 14:27:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 29/29] tcg: Move tcg_init_ctx and tcg_ctx from accel/tcg/ Date: Sun, 14 Mar 2021 15:27:24 -0600 Message-Id: <20210314212724.1917075-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210314212724.1917075-1-richard.henderson@linaro.org> References: <20210314212724.1917075-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72f.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: r.bolshakov@yadro.com, j@getutm.app, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These variables belong to the jit side, not the user side. Since tcg_init_ctx is no longer used outside of tcg/, move the declaration to tcg/internal.h. Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 1 - tcg/internal.h | 1 + accel/tcg/translate-all.c | 3 --- tcg/tcg.c | 3 +++ 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index a19deb529f..eef8857cca 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -690,7 +690,6 @@ static inline bool temp_readonly(TCGTemp *ts) return ts->kind >= TEMP_FIXED; } -extern TCGContext tcg_init_ctx; extern __thread TCGContext *tcg_ctx; extern const void *tcg_code_gen_epilogue; extern uintptr_t tcg_splitwx_diff; diff --git a/tcg/internal.h b/tcg/internal.h index f9906523da..181f86507a 100644 --- a/tcg/internal.h +++ b/tcg/internal.h @@ -27,6 +27,7 @@ #define TCG_HIGHWATER 1024 +extern TCGContext tcg_init_ctx; extern TCGContext **tcg_ctxs; extern unsigned int tcg_cur_ctxs; extern unsigned int tcg_max_ctxs; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 40aeecf611..b32760c253 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -218,9 +218,6 @@ static int v_l2_levels; static void *l1_map[V_L1_MAX_SIZE]; -/* code generation context */ -TCGContext tcg_init_ctx; -__thread TCGContext *tcg_ctx; TBContext tb_ctx; static void page_table_config_init(void) diff --git a/tcg/tcg.c b/tcg/tcg.c index 65f9cf01d5..77335fb60f 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -149,6 +149,9 @@ static int tcg_target_const_match(tcg_target_long val, TCGType type, static int tcg_out_ldst_finalize(TCGContext *s); #endif +TCGContext tcg_init_ctx; +__thread TCGContext *tcg_ctx; + TCGContext **tcg_ctxs; unsigned int tcg_cur_ctxs; unsigned int tcg_max_ctxs;