From nobody Sun Sep 28 16:34:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1758700227; cv=none; d=zohomail.com; s=zohoarc; b=a61CnO7pWVGl11Ip6ZdkoUrdhdoGzsl6KfTbj+/YN/5ryj0b+8NwAAckSz/KrWb8tn0A3wc/YvMRS/Ck73r0opSgzYH+VSvS2LTdarDw3g/gEUr0UM8VhTT7n9Ih7ObkgB/9WhHu9u4tTDMv8Y4xMgcrS1BB8k83sWCoOKgb8xI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758700227; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=J9PBLxL4kxcNju7dbINalVw2U5btg+Mjs9TmtxCLKY5BNq95JvXaHYIgCGzpGYpZqLhfnWKxql4pBH6PcEe0ECEz8ZaANP3YbiAd0ZF2/Q71z0E+b6cghfcwSEIaknYixTij36ZEz3fHPgzX4hXGLLUSJCOh1Y4FsDzzVH5/VnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758700227543449.17936780321565; Wed, 24 Sep 2025 00:50:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1KFI-0000tW-Sw; Wed, 24 Sep 2025 03:49:02 -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 1v1KFA-0000rd-QB for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:53 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v1KF6-0007dL-5X for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:52 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-77f605f22easo1160131b3a.2 for ; Wed, 24 Sep 2025 00:48:45 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b5541f0374csm8778502a12.49.2025.09.24.00.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 00:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1758700122; x=1759304922; 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=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=dnb1YioTTi76PUWMtgkpy806ZQ1Ct3eViwO2kUaZ/3cDD88PC7O/TO6swYc0LcEhEH m2XuwBZvCQbTJE2kYpilz6A4E4IeIVEmBwT40ArC8QpbiInCUifLHLl7JUxfjIC8wjiS DvpN2wSZTa4HrpuwiaDbKbxUa9/FRQQQ9azos/CwaOg/NZ5ohrnMwtFNZYysoisi1T/G 1dMdD58Rw+rV9XF4WREs5J/1OkDUJRHvrmvEc7jTvq0q4wQaTpKTKasjvtJDuXTt7410 QVXBTZuIR8PxbUuCiTTPMX6qhOrY/I3PIuUX/4tB4MuEYduQR/W8W3VdZ6gZHaSiLR9r fqMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758700122; x=1759304922; 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=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=HmLOd75hWcbK1WPQUgeS7w94UELmx7YB1LyHygpX/zxl5rB/pIVhqZRUo3BsvrWJln EwkuzXFeg8i600o8/BpCpv7nDFbU0+S4+F8FLfAdWXN3f0xAkbLlTJ4Vrnf4kCke1dIJ i4v6m9Ri5FfeOGyCrpG6nLz8Jz7WaKbsejc6mpae60pDrGAkxo3T5r4YAj3icNAbt+qB PHaBOI39PpSvuskzSSnmSmWbLtXSH00PTqBP/Eai2bgjNu3x7ao15swcofBqap9+gQE4 GWPsMRsvnTnOXpgozARP+IceGIbYLqQA276nDW2P91ipR1rPL2Xt4TnyVFfNfa7GZLge 8npA== X-Gm-Message-State: AOJu0YwfGPQ4q/rmvK4yTbSFaQFvmkqH4O0qP8PeIMwCVZMzPi5psoxQ xIz5xrh6NGAbCbY0DzW/d7PMVYqxZNaaPy7qFAG04vsL5nhf9tCbNYNocemlBAcEjCr6uFI5v5Y +6HNrCVX43OgjjOp/qRUKMgbEid69u2pCiA/bvxtB3ccDc053G4+IdewpEaPnBEOW58KyQFlpZ5 J5G5HXUZ4TQOabMj1nuSGYXWHDyS9DnD1c7CskTg== X-Gm-Gg: ASbGncsqDQRmkIbCHqSWW47t+tsFzf6KkAZMvwG5XQ0dlPeqDDFMJxqO41qakeY5VTz 2ajvyUO/pKFfN8HF7Uj9pPMWy+S3Fz0O29VplySonfoaYj2IyfMwFYmsv57+DEWwlYrz5l5JmmF GSSJcUTQwgnwDqmcsGYwUy4Q+M0KHwc5d+ITWWmjtaqRCM2djo4RUwYOlE9P4kLX2+YAUaZljSE 6lVH6ORYzgqH5YzebROgEX0IMzLTxCcKUXhXsdbDKDrnU8g+VrVyr67n8eUAkdZZFKNb8eFt204 diOUawveJjLbFAfzqxg4banEXPduM2c1wBRS4YDrOC49tDWpfg/taP0MhCW9QY/ktnU4ItDztXL lqbfUPhtmvRGzFbfIjbMSICFRuzBp1HKU2rw4g/sgEzpmZ/W4oWDPaeY= X-Google-Smtp-Source: AGHT+IFXI3WzGp2hjeRy8sgxLFhWiU3qxsCqDdU6XJvdOsip9rH89UUsmInCapi4Lhmh805ImBC34Q== X-Received: by 2002:a05:6a20:6a22:b0:2bd:2798:7ae7 with SMTP id adf61e73a8af0-2cfe9410fe3mr8110708637.31.1758700122014; Wed, 24 Sep 2025 00:48:42 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v1 1/3] target/riscv: Fix the mepc when sspopchk triggers the exception Date: Wed, 24 Sep 2025 15:48:16 +0800 Message-ID: <20250924074818.230010-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250924074818.230010-1-jim.shu@sifive.com> References: <20250924074818.230010-1-jim.shu@sifive.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::432; envelope-from=jim.shu@sifive.com; helo=mail-pf1-x432.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1758700230041116600 Content-Type: text/plain; charset="utf-8" When sspopchk is in the middle of TB and triggers the SW check exception, it should update PC from gen_update_pc(). If not, RISC-V mepc CSR will get wrong PC address which is still at the start of TB. Signed-off-by: Jim Shu --- target/riscv/insn_trans/trans_rvzicfiss.c.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/insn_trans/trans_rvzicfiss.c.inc b/target/riscv/i= nsn_trans/trans_rvzicfiss.c.inc index b0096adcd0..45686af4d6 100644 --- a/target/riscv/insn_trans/trans_rvzicfiss.c.inc +++ b/target/riscv/insn_trans/trans_rvzicfiss.c.inc @@ -40,6 +40,7 @@ static bool trans_sspopchk(DisasContext *ctx, arg_sspopch= k *a) tcg_gen_brcond_tl(TCG_COND_EQ, data, rs1, skip); tcg_gen_st_tl(tcg_constant_tl(RISCV_EXCP_SW_CHECK_BCFI_TVAL), tcg_env, offsetof(CPURISCVState, sw_check_code)); + gen_update_pc(ctx, 0); gen_helper_raise_exception(tcg_env, tcg_constant_i32(RISCV_EXCP_SW_CHECK)); gen_set_label(skip); --=20 2.43.0