From patchwork Thu Jan 7 20:14:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 358261 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp784051jai; Thu, 7 Jan 2021 12:27:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwXvG5l2yHszNn1x01rCPdgPpNa2fkhWVxZE2tRvqQX+eOUgLHlsACrZvP/g5bDjC4KYrE X-Received: by 2002:a25:2fc3:: with SMTP id v186mr854711ybv.113.1610051242043; Thu, 07 Jan 2021 12:27:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610051242; cv=none; d=google.com; s=arc-20160816; b=BCbhnxv7cKZ3/BcLAf5DRGky+/wWAIc0cjn6QDaVmWuZwf6xU+X0Chw1Nf7jbAPlCO aGKs1MLhMWHeVVjK1ro+G6aRzNl7iX4W0UP7RwmFuntBGNKuUubPFA/CmhzgVIQQcywL tCKctPYX0zLSisOwwKTCiYtG45X9kKTkJIg0NBoQCbfSjBJExsMjom4jvbgQmH8tXduv Vk4pw7f6GX+zIauNzvYMS6E00nlJ1P1mAXZL1VOCiTZcGp467YEWfprm/msCPl8bo8KM KUizPUM+2Y1s32eie/SQATr1fOU9Yx7YQQjUPZP7HplNHd2S4sNDhbreNHEo+e5v4R1m P3OQ== 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=E8w1jAPv5ZMwC9hUfY2h/aIQICFcgu6SGeTKeYT6t3w=; b=f1wVugfFSnt0wNK8o58AcQj3wW9OqgpmaUE99v7lWKYxNfFnvHNxSQpMknj65lJKC6 cztBMwAj9+mAXsmKM9cTeGNyqwSjb2udXnvNZll0CAwV1xf237knujsgd1506XROaGJK XObQl7b4VA9FuofwRq6gvjlLBHNsHMadKts4b3Od+Jpk3Ziohyf2lIL3tt6tUIX5e+vY kZ4ckBn6DjaZy5M7S3EGSmoOUpKxhX4n2m5CzOK5jgQgbfGY/N9tW0YK1rVgBkNACPmP mRnvw57ty6YPSAq32Vd4LFYZJVZ3k6EGAQwNSSWrzHI2vPf5JATyng/ChqxakN4aPjF6 QKvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XUwSh5CD; 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 k2si8088447ybt.145.2021.01.07.12.27.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jan 2021 12:27:22 -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=XUwSh5CD; 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]:52894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxbsP-00073A-E9 for patch@linaro.org; Thu, 07 Jan 2021 15:27:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbh3-0001GT-5Z for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:15:37 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:33791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbgs-0001b7-RS for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:15:36 -0500 Received: by mail-pg1-x534.google.com with SMTP id n25so5759130pgb.0 for ; Thu, 07 Jan 2021 12:15:25 -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=E8w1jAPv5ZMwC9hUfY2h/aIQICFcgu6SGeTKeYT6t3w=; b=XUwSh5CDfgJyOtXyayoEkPrl9/O2hNhd+PghLTD6EvUpCZKC+HKExv3TeH0GkZSDsQ KyD+PSnaHNtxeozLpQ02nIjGutRaWEMQNJjnsR8HhVw7uqrucRXLmDCICvNAvRn+k5/G bu125UgukkFMVo0QLMk+2viGB/WFv64UJA7OFr8i4zv1BfJgLfUma7lwWLkIW93dY+yl q4P+uWrY29wqriMWntqhcc4wvsCjKeSiw+/ojxuGDev+DaAzRDnqLca4gKf94JKa0wYf EYVuzjhcTn7gSalvEJdb8bFxovlbDy2Bxx/0Q9WrcEgMqYaTYUlzwXEK6k19zwHfXZ70 Fhgg== 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=E8w1jAPv5ZMwC9hUfY2h/aIQICFcgu6SGeTKeYT6t3w=; b=q1yERoUTGxeu23R/4IxX+fcn5xpTN3wn7tdVOB7lAWQiD4mPaBUw+6y1wuCZsCyx6C 5PyOVyQhDnbCr2yJAWCfK5a0TXiKyjCvU7miUVMrQND4HbCeCdYTDEHu1R1Ll2HfZMKB gcRF0QPgHEj2sFMrq6K1DSn72aDL51WlWoKZgYAw3MMy7aRfQFw3HLAR3Ff34SVcdETo FyoGZh7ZuUldOBZOsxPf5tI+sVEJponBbXzZjR5awN0s8qkyhjeM08vsRf4T34tMKwIC 559ZTcVuFreuTUlLBSpIS6+I00v67zHN1ypeS3JKKo0LFnJuhNgBkFDrNKRI1dfpENE0 cKzA== X-Gm-Message-State: AOAM5315SdpYOv2KWcfE12JMlwz6YHJ1xeZKKUAY7aV86FAI4G346Lpz n6BhHdEyF9jegMWMW0rx2FsHAVvi9fkfgw== X-Received: by 2002:a63:ca10:: with SMTP id n16mr3477869pgi.105.1610050524480; Thu, 07 Jan 2021 12:15:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:15:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 18/47] tcg: Make DisasContextBase.tb const Date: Thu, 7 Jan 2021 10:14:19 -1000 Message-Id: <20210107201448.1152301-19-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::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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, Joelle van Dyne , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There is nothing within the translators that ought to be changing the TranslationBlock data, so make it const. This does not actually use the read-only copy of the data structure that exists within the rx region. Reviewed-by: Joelle van Dyne Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/exec/gen-icount.h | 4 ++-- include/exec/translator.h | 2 +- include/tcg/tcg-op.h | 2 +- accel/tcg/translator.c | 4 ++-- target/arm/translate-a64.c | 2 +- tcg/tcg-op.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 822c43cfd3..aa4b44354a 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -32,7 +32,7 @@ static inline void gen_io_end(void) tcg_temp_free_i32(tmp); } -static inline void gen_tb_start(TranslationBlock *tb) +static inline void gen_tb_start(const TranslationBlock *tb) { TCGv_i32 count, imm; @@ -71,7 +71,7 @@ static inline void gen_tb_start(TranslationBlock *tb) tcg_temp_free_i32(count); } -static inline void gen_tb_end(TranslationBlock *tb, int num_insns) +static inline void gen_tb_end(const TranslationBlock *tb, int num_insns) { if (tb_cflags(tb) & CF_USE_ICOUNT) { /* Update the num_insn immediate parameter now that we know diff --git a/include/exec/translator.h b/include/exec/translator.h index 638e1529c5..24232ead41 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -67,7 +67,7 @@ typedef enum DisasJumpType { * Architecture-agnostic disassembly context. */ typedef struct DisasContextBase { - TranslationBlock *tb; + const TranslationBlock *tb; target_ulong pc_first; target_ulong pc_next; DisasJumpType is_jmp; diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 5b3bdacc39..901b19f32a 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -805,7 +805,7 @@ static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1, * be NULL and @idx should be 0. Otherwise, @tb should be valid and * @idx should be one of the TB_EXIT_ values. */ -void tcg_gen_exit_tb(TranslationBlock *tb, unsigned idx); +void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx); /** * tcg_gen_goto_tb() - output goto_tb TCG operation diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index fb1e19c585..a49a794065 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -133,8 +133,8 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, } /* The disas_log hook may use these values rather than recompute. */ - db->tb->size = db->pc_next - db->pc_first; - db->tb->icount = db->num_insns; + tb->size = db->pc_next - db->pc_first; + tb->icount = db->num_insns; #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 2e3fdfdf6b..ef63edfc68 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -410,7 +410,7 @@ static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest) static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest) { - TranslationBlock *tb; + const TranslationBlock *tb; tb = s->base.tb; if (use_goto_tb(s, n, dest)) { diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index af7ce91ffa..19fa8e4691 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2664,7 +2664,7 @@ void tcg_gen_extr32_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i64 arg) /* QEMU specific operations. */ -void tcg_gen_exit_tb(TranslationBlock *tb, unsigned idx) +void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx) { uintptr_t val = (uintptr_t)tb + idx;