From patchwork Sat Apr 6 22:32:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786488 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1101:b0:343:f27d:c44e with SMTP id z1csp764630wrw; Sat, 6 Apr 2024 15:33:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUSpF+1u0qFGMombejjgbTKLqhXEtz4kJF/TTloWUdIHbzIS+il2VoyXTSbLMteUnMgqZNLQhMvlIV/FoEpY59 X-Google-Smtp-Source: AGHT+IEJagamKVVaT6ybzLdh0aKTX6Y4M11yjr4gpUJaz/Tbn9LKUKYebbeLmXZM6mKaktDW7rcT X-Received: by 2002:a05:6214:20a6:b0:699:3304:30e4 with SMTP id 6-20020a05621420a600b00699330430e4mr6282104qvd.31.1712442835907; Sat, 06 Apr 2024 15:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712442835; cv=none; d=google.com; s=arc-20160816; b=azkONl2Fgwv2j4qqXNOcgK0FcdoT7ue3FVeUKkP5D9Jqm4/nGt9vWi6NqsAwkxrobz xhxb8wQsw3Vebb3/CkoAmZfJ6X89uN0bi6VCccVQJcRnChCgQiQ2xC7a2cwdSk05CalC x2xE4gA66qX02VjPPbzqA3rmp4f7bzV1/D9o54ntHlIFh4l1wpecEaQAZkTFJkw5EnM3 jn7/HsfuHtWfcXxslzrnUYwJxuuMDKVsvSsYEpkbYLRQpxMhp29NKLR0ptNbY6EMEkkk Vxdu19BnHHLjLce918+9AlpeiYopO5zSM/c8FuXlDlRG9Pc1C18ZlT3nTs/CQ3zjY8RL uYNg== 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=5EK613jOMt0q5YKINPHaRaY+PjrWQT7TxkM34vbcqwA=; fh=/EzrXVxGMvSr5VAgu4NIsk0fqauOAeCxfxr2Kf+iwls=; b=0LjcPw6AcUERHCKiB+Spa0T3I6r56+wY/Ng0dnBd/bLPcG2Pg3rTziRpIhvRrFXOCp aDRCzUgXpz0QOKoUhIsDkGNr1ro6FHdzfxchLCAQ89MejDHV2vc//VHuz/4Vv9aFZqKh QcVSLwGbqiHAAh1bQ6QJKKp/rVXbFmUwDv/DwGXJa9a+KF3FB5hfEv6m4ObkeVUyCUWY aoB9CH5xQEAeTcGbqpNrwW1Hkm03TikiNHlI2tL9jpBQGdSdyIGEcDzCvkaHgwrYe4x/ EEEW45EeqK2Ht4zdPcqdRqT0LLdguecfUc5qTBDd8iEyTWjzuu5N1D1BcPm5FJBgPpSw tMIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a6iP+T6r; 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 ef10-20020a0562140a6a00b00696955631adsi4773705qvb.167.2024.04.06.15.33.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 06 Apr 2024 15:33: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=pass header.i=@linaro.org header.s=google header.b=a6iP+T6r; 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 1rtEay-0003Oy-TB; Sat, 06 Apr 2024 18:33:08 -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 1rtEaw-0003OL-HQ for qemu-devel@nongnu.org; Sat, 06 Apr 2024 18:33:06 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtEav-0006jw-3P for qemu-devel@nongnu.org; Sat, 06 Apr 2024 18:33:06 -0400 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so2769479a12.1 for ; Sat, 06 Apr 2024 15:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712442783; x=1713047583; 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=5EK613jOMt0q5YKINPHaRaY+PjrWQT7TxkM34vbcqwA=; b=a6iP+T6rk6iAIhM7d8wsEfyJ9b8hoWyphLncgP0F3l5RAtfzFhS7lSX5B4Egvd5xia izFMpUn7jTYbDA1f8nPSx9CnZS8F+ExY7ghF6pkjZCczIcsPZZCHRCZ+fmTimKWb4bYk iDaTMphD7594Fvs/wJwpN8g5i8psT1dOaodlGdzfj9IIwpP7cYSE56N0saFkrSaIVMU5 K6AAMdluwVvj2Lo5GFtbUAggv722x92Y06xNwQIyjspKYoQZf0Jr8dYMPxuPGTAfcYXG uBsz8VMGS1WP95GvLRljKtKtVS5OPm4XtN5+UQ3O93sej16DE9FYXT3VviWzrGbX27tL LOuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712442783; x=1713047583; 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=5EK613jOMt0q5YKINPHaRaY+PjrWQT7TxkM34vbcqwA=; b=hi8HQrwodOzJ0UtFAVyJ2hT4DtizfbBVZAzd4ckq38LJNyEkRPXlNx95X+e0uy827H dmk7idJb8TG1Ju9ejpenNoaIPdoU3ret6GWsC/ksWkcY8OPgpR0403dRB3LV1035+H8H qe2xrmaR7wjYI3V63d0hKJH7Yc+3BbkxoD/ZHyNJL6Ek+u1i9tKDvta8mMkywNlKrpGx v48n6h+QwnH/zYt00U6ZWVwa7TGQpnvN0gw7P9PqWCBQtx8+5htaMKN14SeiVoClX9gX f4Pce6KG9OuX+HM2pmlM4Sz48EGaPjp9BPwGMYDRwM/H3dUVH8XH7q7BJG2JjYrCgfoN M1mA== X-Gm-Message-State: AOJu0YxBWGSHfIDlRviekjwd5q3oXoxjyPa+KNFPdnnJTuxdIyeOcbPD 042X9+lxYHJsuNOk3U5AkjBpsS+Wm5QiX34AAF4Ydv3c+Rmq0Cvxms0mimcUIRnq6GBP+/xMzGI C X-Received: by 2002:a05:6a21:8182:b0:1a7:5706:9b96 with SMTP id pd2-20020a056a21818200b001a757069b96mr966857pzb.38.1712442783698; Sat, 06 Apr 2024 15:33:03 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id f23-20020a17090ace1700b002a20c0dcebbsm3643279pju.31.2024.04.06.15.33.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 15:33:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Jorgen.Hansen@wdc.com, Jonathan.Cameron@huawei.com, linux-cxl@vger.kernel.org Subject: [PATCH 7/9] target/riscv: Use insn_start from DisasContextBase Date: Sat, 6 Apr 2024 12:32:46 -1000 Message-Id: <20240406223248.502699-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240406223248.502699-1-richard.henderson@linaro.org> References: <20240406223248.502699-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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)