From patchwork Mon Apr 8 17:49:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786957 Delivered-To: patch@linaro.org Received: by 2002:adf:fb4d:0:b0:346:15ad:a2a with SMTP id c13csp2628wrs; Mon, 8 Apr 2024 10:58:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRB+8RFGdTqpcvcqF9OlrnUsUFfy3UXqI2QSHMH26mhgfalBAZqnDUk91CxsHnYO/al+6XJ3ImoHYbU5ajP/bi X-Google-Smtp-Source: AGHT+IHgodl/B48LTbv6K9ffq4YT8TcFQPtQIgGH1zUNfu8av9cRdN1urNFVrJ/JeHqkLKHf4lmF X-Received: by 2002:a05:6830:100a:b0:6ea:1c0e:6e14 with SMTP id a10-20020a056830100a00b006ea1c0e6e14mr2085181otp.6.1712599092104; Mon, 08 Apr 2024 10:58:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712599092; cv=none; d=google.com; s=arc-20160816; b=zFKIK54vFFbHdH4dP4qv+sULP0VME2+Jemh470gFcvBRdCBVD51L/LaVcaR2OkQviE aYnRK4a6+MoA7mVd/ttKz/2i/7jYc7DrI8OH/Kh6zncwOU33cjOL9ytdpIkmT96eqtWR F3y+wDBrvmD9HAxKtZb184KMPUml0PFmV5bVK10bUghea6HHy9sPki+joDH+360VYnFI +CJg/2Ia4Jrmnle0iTQBfFISay9ToWlI75vDXGobCMOmCOEWblm+FVAWL2pAraTTegw9 EUoXsAlngHqSCAEEtdeL/XxcexNXL5weppO72XXMBW5MkR/Poy9/5i6PzFXfpRNkfyQU ICIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=ZPbK/NhQe1+jKC23+AkIKSjI/CWiYdFRaJAq7oh1b28=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=dJ4Dt/TwG+HkGIQunJoUk6n8KwPKEqOX2MZk39iIA8YMCkUHYyCf3WNGGz3VS28r6s SquQfpJ+14TbMgbXscjjfWBzVjt3DBu18QEa1mTZ+CsBMt88Iqed+8LYkLOJnIudmBOL YvbqfshsNVdfs9TKQjbflvlK+fPmnzrhAQlz4hoxjuyBCJYTm0sZWSPmPQAWmO0zEkQo BqNFQoyVIIiSwOb/g2emePE6KH0pNgonMHORqWE3rwlIwY8r5LyWvSnVgH7N05Pgf+wr 7gWQo1oWXvr0kRDCJybfRu1N9qQZ8lLJIxFp+9CQGR69E4fKv2qGpk30Y0OrMZHSjbuQ bFOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XHhQNqU+; 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 bs7-20020a05620a470700b0078d54355829si4632354qkb.525.2024.04.08.10.58.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2024 10:58:12 -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=pass header.i=@linaro.org header.s=google header.b=XHhQNqU+; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtt8K-00026p-Js; Mon, 08 Apr 2024 13:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtt8J-00026C-58 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:50:15 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtt8H-0003jS-Ib for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:50:14 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5ce9555d42eso3494366a12.2 for ; Mon, 08 Apr 2024 10:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712598609; x=1713203409; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZPbK/NhQe1+jKC23+AkIKSjI/CWiYdFRaJAq7oh1b28=; b=XHhQNqU+r4ZzMspwRKdTg6bRyA11cdq5IIHYuJA/PO/CgSFejOQ/v1bYbqSY8hg9iG 24pXzG3RSe8LdGJK5So7DHidLY7y+SErAG7rJBa3SGeFTwGHm2kINxX5KZGls0i5VHoN vLby71Y1b7DnCf2co7ALE1iRH7jZbediGM4+Q1W60JZr0+7Al7xXqCu4gaVwpAZxpV9B lUq7OBZ3vXB2z6TP3ZZO7PVdgH7g/si/Jggm2S0enJDkhXL/O4XFXWQd4OBksfuAnzrJ xG6zAfCS3w051rItYdeBYgQUn9ofyV1fgOfjvLRkCXZV42sU2cMezLRymxRUfmWJtaz2 gb7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712598609; x=1713203409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZPbK/NhQe1+jKC23+AkIKSjI/CWiYdFRaJAq7oh1b28=; b=f303UYJ1SNlyo1LuLeUK5GwnnsPaH2pa/6KroYuBYffuaIwTVirmJEeBKpbN820tK5 d7llg0IGF02fArpSW6em+IKCn4ToQaj2jsAw2vYOvfqrIWpOx1lJSET7PbV3VyJT3Iv/ TVlfkc5ayAirIJRr90modqgCeDSrBTeWx0wZsI4glrXMl+tucnRGGo6kJHOE7kwP3YPh 9M0UkuU/qVimFhmzyE1FUW+JX0qa8GBsHPIVhwkmQd4I+my7NZVinFJ7CHhQvUzTpAlj topHQuT/3C1w78kPUgXRqE6q4xTGYID+UbxsR6ZKcURfIk6CJwYzMP5hvidevIFrvFae ca3g== X-Gm-Message-State: AOJu0Yx2xIIhFXHbI5mF8JwcaudiE0mQiPwt5hnM3Uvvv6WEZ5gi3gQi CZqOn4sGCDjF0gLdG96DQEYRxLAdFzi6TucBppeOkQqVNVsfteNd9SRhQS7bKdfazNvVv1wmjdX F X-Received: by 2002:a17:90a:e601:b0:2a5:222b:b776 with SMTP id j1-20020a17090ae60100b002a5222bb776mr3099303pjy.34.1712598608789; Mon, 08 Apr 2024 10:50:08 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id ga15-20020a17090b038f00b0029c3bac0aa8sm8658432pjb.4.2024.04.08.10.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 10:50:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 25/35] target/riscv: Use insn_start from DisasContextBase Date: Mon, 8 Apr 2024 07:49:19 -1000 Message-Id: <20240408174929.862917-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240408174929.862917-1-richard.henderson@linaro.org> References: <20240408174929.862917-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org To keep the multiple update check, replace insn_start with insn_start_updated. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/riscv/translate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 9d57089fcc..9ff09ebdb6 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -115,8 +115,7 @@ typedef struct DisasContext { bool itrigger; /* FRM is known to contain a valid value. */ bool frm_valid; - /* TCG of the current insn_start */ - TCGOp *insn_start; + bool insn_start_updated; } DisasContext; static inline bool has_ext(DisasContext *ctx, uint32_t ext) @@ -207,9 +206,9 @@ static void gen_check_nanbox_s(TCGv_i64 out, TCGv_i64 in) static void decode_save_opc(DisasContext *ctx) { - assert(ctx->insn_start != NULL); - tcg_set_insn_start_param(ctx->insn_start, 1, ctx->opcode); - ctx->insn_start = NULL; + assert(!ctx->insn_start_updated); + ctx->insn_start_updated = true; + tcg_set_insn_start_param(ctx->base.insn_start, 1, ctx->opcode); } static void gen_pc_plus_diff(TCGv target, DisasContext *ctx, @@ -1224,7 +1223,7 @@ static void riscv_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) } tcg_gen_insn_start(pc_next, 0); - ctx->insn_start = tcg_last_op(); + ctx->insn_start_updated = false; } static void riscv_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)