From nobody Sun Feb 8 17:48:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1677506040; cv=none; d=zohomail.com; s=zohoarc; b=VTwtO1MpcUZkGDIlJ3cC+6917Wa7aa6+TwMmv5uX/8iTD+CNT/81DgSC0Pp3UKlglhGOiaW5CkAOrlkHxYu4O3cSheQDc2g9eANPkjVJGfY0ndoT+g+NuAM972Dxz+kerHnWj5PdvWJaAH+d55CtLkCU3N98VsY6rzu6hcJiUbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677506040; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=3qbyjfP/0w2PHnJ782uRu3T7Scx5l9drgWkI1rJHUQI=; b=bWpGFKA5qvbHkUHpjTzN41i3RDFq9f3R3nVRD9cO0AuGT2ZDSH7NjjN4hhYLJZq1+JpCVQVFl2o3oCSH4zLWTYZP9jv0I45O8TgHyWd8N/H6qpcc1jY80TnwcpQX9igsJGx0VAzXins1CQh2fNvACGOhRv20/8Fx+AC4LKFGBAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677506040451422.5591842268989; Mon, 27 Feb 2023 05:54:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWdvu-00073M-C0; Mon, 27 Feb 2023 08:52:50 -0500 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 1pWdvh-0006el-DC for qemu-devel@nongnu.org; Mon, 27 Feb 2023 08:52:40 -0500 Received: from rev.ng ([5.9.113.41]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWdvf-0005Ze-TD for qemu-devel@nongnu.org; Mon, 27 Feb 2023 08:52:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3qbyjfP/0w2PHnJ782uRu3T7Scx5l9drgWkI1rJHUQI=; b=RnCfgXDc7sEWQZeIP6y+mv0sy1 BCY8kWh1TcCMbonyvakT8BbO9knpnzdsQDUadNfSzYfsf4f5z+UTK2sCFmG0F3nxa1veiHEthcBQf q0ZonFtiZWCdk3tFt8fH+I9Z4QkPlkidwfirJAc3CkVS2QO8uzY/982VEHa2uzFMKtYQ=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, richard.henderson@linaro.org, pbonzini@redhat.com, eduardo@habkost.net, peter.maydell@linaro.org, mrolnik@gmail.com, tsimpson@quicinc.com, gaosong@loongson.cn, yangxiaojuan@loongson.cn, edgar.iglesias@gmail.com, philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, ysato@users.sourceforge.jp, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, kbastian@mail.uni-paderborn.de Subject: [PATCH v3 17/27] target/riscv: Replace `tb_pc()` with `tb->pc` Date: Mon, 27 Feb 2023 14:51:52 +0100 Message-Id: <20230227135202.9710-18-anjo@rev.ng> In-Reply-To: <20230227135202.9710-1-anjo@rev.ng> References: <20230227135202.9710-1-anjo@rev.ng> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=5.9.113.41; envelope-from=anjo@rev.ng; helo=rev.ng 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, SPF_HELO_PASS=-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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1677506041071100002 Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Palmer Dabbelt Reviewed-by: Palmer Dabbelt --- target/riscv/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 93b52b826c..9eb748a283 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -34,6 +34,7 @@ #include "fpu/softfloat-helpers.h" #include "sysemu/kvm.h" #include "kvm_riscv.h" +#include "tcg/tcg.h" =20 /* RISC-V CPU definitions */ =20 @@ -533,10 +534,12 @@ static void riscv_cpu_synchronize_from_tb(CPUState *c= s, CPURISCVState *env =3D &cpu->env; RISCVMXL xl =3D FIELD_EX32(tb->flags, TB_FLAGS, XL); =20 + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + if (xl =3D=3D MXL_RV32) { - env->pc =3D (int32_t)tb_pc(tb); + env->pc =3D (int32_t) tb->pc; } else { - env->pc =3D tb_pc(tb); + env->pc =3D tb->pc; } } =20 --=20 2.39.1