From patchwork Mon May 27 08:21:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 799220 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a47:0:b0:354:fb4b:99cd with SMTP id t7csp1761448wrw; Mon, 27 May 2024 01:26:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXSsHuy6rLfUFREeWwLrd/hLdSHUISr/fFTnMJC74bUkw409jmXPHwjMBkvnCgfaQdM6zE31EWGXFHyTVdRAk6t X-Google-Smtp-Source: AGHT+IFKv27Mbs2aOLKif0bafgg04i5QAUX1E+60gHhIcWLOrLxIXBR0MpKCVhJdR4MwbSi3Fdsd X-Received: by 2002:a05:6122:c9c:b0:4d3:b326:5ae8 with SMTP id 71dfb90a1353d-4e4f02e64dcmr7973227e0c.14.1716798395921; Mon, 27 May 2024 01:26:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716798395; cv=none; d=google.com; s=arc-20160816; b=gEfBjHWOH+OIBreVjq6F/9ef0dMEwrDUxgSrXn1d1EaJbf7Nnf3sgV6pGGHk3DhSqk SP4PslWiAvaVqOfYMr1EPsvEGTPZe4ZxEbqtLeSAvwxn5dN7PXRbazcxR00dKWD5Om20 JLDtCDbdNMHitoOKy4+lQvMrC4XNzztEzPU1ups9PzP/yLmJfkSxDtHLvSM0NwHybPsi FPMXlRQc3bgTO4x9mLHzy1SmOoTQrVTs41EmxbYg9RicwZ4FLVBSxXOd0nZVKTwDxGLV EgIsLyzGCB21VDo7LIWJsPak2pM0oHxWqWDAv5JMhmSzN4nqIlivh+2Kfl7GwYvlaGMz phNQ== 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; bh=IN2w1Vc66VkLhGJ1vpi1aKOGJrgJhPqXRCLepGG4XVM=; fh=bMaafE1clBtiBaCrlbrbcY1DSEPhhFUklUk4XoVHiPU=; b=Y9Gu673q8NWThxi9zyvvJxbVnb0UWSV0TEYU+GCTUrgUXY258BXaBWgvg2L8BYf56T 2sW+dnNiA5yUl/7Nbe07L6zBZyDzSVJJq5W00LvuVhObeW2Qs7/+8rPDhdkv018widLX c6pmr9ZqzOmQzynAFZ6HvJ1g/vWZvfMHUCFAhE6MDOlNqnaC+BraYlRPpMulU6tAnMJx JjdBjmLYJxaoDQJt2Ft0ugbtWjoUiVPstWzW4bSyiQMrOZ0TcnOQ3PeO3XoR5CNnkSqI Txw7a24KcPUPDu9BAkuYa0LfIP94Uqg041PyUOFs2/opGQOsCqxv2TBuO9MTCg+ml7+S PzTA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-794abd3d6easi732096285a.467.2024.05.27.01.26.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 May 2024 01:26:35 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBVf5-0005Az-Ea; Mon, 27 May 2024 04:24:58 -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 1sBVdl-0001gB-Ju; Mon, 27 May 2024 04:23:33 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBVdk-0000zv-37; Mon, 27 May 2024 04:23:33 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 57E316A575; Mon, 27 May 2024 11:22:14 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 86261D8512; Mon, 27 May 2024 11:21:40 +0300 (MSK) Received: (nullmailer pid 66424 invoked by uid 1000); Mon, 27 May 2024 08:21:38 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev Subject: [Stable-9.0.1 24/44] target/sh4: Update DisasContextBase.insn_start Date: Mon, 27 May 2024 11:21:15 +0300 Message-Id: <20240527082138.66217-24-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Richard Henderson Match the extra inserts of INDEX_op_insn_start, fixing the db->num_insns != 1 assert in translator_loop. Fixes: dcd092a0636 ("accel/tcg: Improve can_do_io management") Signed-off-by: Richard Henderson (cherry picked from commit ca51921158e3cc07520a0ef5eb33739e5852ac6e) Signed-off-by: Michael Tokarev diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 3e013b7c7c..f91d61b960 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2181,6 +2181,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4State *env) */ for (i = 1; i < max_insns; ++i) { tcg_gen_insn_start(pc + i * 2, ctx->envflags); + ctx->base.insn_start = tcg_last_op(); } } #endif