From nobody Mon Feb 9 06:26:44 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768897570; cv=none; d=zohomail.com; s=zohoarc; b=K2gZrAZPUW4S2dSCpIxxyguDeU8nKT28zNrVNxRHMy/enFIJI7Tvek1liaRlDeDkxUOP9C49bCVxNmYrLDncQQOhht1DfePA5ZzRHmWqFrlMkJHmTbkkOIH2l6PDq7QkbqkzEW2d1GbAYREzUgApFhNI8H7LZ2n5du1wyqhjQcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897570; 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=VPtyq2vpmISHFztA/nNK3WjvO8XBtF9mE2msAt6rqDc=; b=m0zjBimU89gJbjoi9Qy0WkY+Zsm7BEVDpWmTDsxpy1HvUr4thvKLZLVNa4z68CEnAjEC+k2a4ryLcZuAfOr0PSnKEQjlfcpPdjDjc3YzBOBzh9aSjEAPLKwcJcgMYqvn4FVNypYcRvsg8OcLtcfF6fYYo5tiLgFu9HuEP0Fro/E= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768897570172402.0091452655919; Tue, 20 Jan 2026 00:26:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72O-0005Ow-6Q; Tue, 20 Jan 2026 03:24:32 -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 1vi72M-0005Lf-9C for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:30 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72K-00033m-D8 for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:30 -0500 Received: by mail-pj1-x1044.google.com with SMTP id 98e67ed59e1d1-34c2f52585fso2744557a91.1 for ; Tue, 20 Jan 2026 00:24:28 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.21.37]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35274573a7esm4273592a91.11.2026.01.20.00.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897467; x=1769502267; 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=VPtyq2vpmISHFztA/nNK3WjvO8XBtF9mE2msAt6rqDc=; b=FfGjkLTzWlMhBiLw0oQe9tWZ3i5HsZKWEwi1R1NqpC77BvhEwxwpLY1jutx/5F+wGa ZUJFOWoY9wxxAdX50JlMkJNyfZSblBTdNDbPiEzvSrM19vx9St/LAFJtTSK3q5cZz624 phzVszC0BrCNf+gOyAPZcWYX4Uk7knE6g4oByFf3QRnvkG9Ul9L8cChrc+qoAuFRlJo6 R78pURF5Pf0qq6EJKu+93gUOXnSZjvg/9pCbYIsRk514/NPbbqBieyqC0pFjxHFtLiT1 xhyUq2Wo8O/WBaW2DN8RoEU3Hvlh99jeqsFMZ9VKLb/iI5ZPOO1YDHoDBtCeJfjEQ8sH I5yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897467; x=1769502267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VPtyq2vpmISHFztA/nNK3WjvO8XBtF9mE2msAt6rqDc=; b=Hl/9HkXYqbGUbpu/FxRLvkFDPt90peiEIUHekPNSGuCARK5vHA6CWz9xnZoz4+GMVE fsyxSmk6mNkC1ouwbb65VPxOnp34hF09TPRQGYFrVBUktVsIraDIKW+scHY/lyuUFOGV Cgm5XrXLjUeDI2Yr5TSUwgUhGVxjrbMWt2qoD5yicIWqH5YO2MGecrlahQzYyLhUlLdw RCN1jGpRhoh20pEE80Q22kOLHnuLXJK6VOYOx/rjyMgpA+GKC+a8qCZh/DRJMVruIEzM r/PJvp8CuxpCDC002fNRmxWUFDRzn42IwXccS8q2phTMQs3LDcp9WrvESy5UYJIdGp/K Qgag== X-Gm-Message-State: AOJu0YxnBsa5RQwlkX3FkBLqSioGpZE5krar9EcPiGiQl/03wK5VAYi5 0bbYN6tM34VvQ//k0f51eK+vOoUfpVJq12YzFffft9d/xzi2FMmcQlOe X-Gm-Gg: AZuq6aKB0A1ZZvZxgA6tJoZXCN2eJPi41WBYO3skFiXuaIMlLtQMAJhSLkgaSojnPaS 1LmyFmX1UxltqIrwy01iCjJg8sRLM7JMlv8hdJp/abKuequJSrAu4Xm1pQmMr7qIcXh+OzI0XDq 0AB91NkM+nxJZsvQ7Bi/OXG8+IdTHjUckblTPWG6gmHzGmQR1tszoDEknvNfZssq4Ksgdh60ls+ oELv8qIWXs8Y14wtglmxFHeP+VmGafGEyMEhn+SV7rR8qWyR/Bf/ZyzglbZ8dlRIoBLoYs+dy3o qHTDb/ivqDRbyIv66DgzKgxpBwIjUNGvlsFRzB7KCq0xNaYWrFKnmM+pSdQmob+/zmOmro2nzI2 X/uhuN+LaBwnPWERGg20HxCif22TmHcBDjkcXfhZx1/XZEj9ga5wCaL6nRgqHNw2s5D3hXnZ5QN zT7Tx2kSdd+FAh7UtFWSJVmtLc0aio7lMSlxKUeurZRbqICgLANXgW/FtEJ2Jq0W2XloHC X-Received: by 2002:a17:90b:4d8d:b0:34a:e9b:26b1 with SMTP id 98e67ed59e1d1-35272fb86b4mr12881434a91.26.1768897466789; Tue, 20 Jan 2026 00:24:26 -0800 (PST) From: Chao Liu To: Alistair Francis , Daniel Henrique Barboza , Palmer Dabbelt , Weiwei Li , Liu Zhiwei Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, wangjingwei@iscas.ac.cn, Chao Liu Subject: [RFC PATCH v2 3/7] target/riscv: add sdext Debug Mode helpers Date: Tue, 20 Jan 2026 16:23:59 +0800 Message-ID: X-Mailer: git-send-email 2.52.0 In-Reply-To: References: 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 (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::1044; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pj1-x1044.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1768897570881154100 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Add helpers to enter/leave Debug Mode and to update dpc/dcsr. Model resume without a Debug Module by leaving Debug Mode at cpu_exec_enter and continuing from dpc. Signed-off-by: Chao Liu --- target/riscv/cpu.h | 3 ++ target/riscv/cpu_helper.c | 87 ++++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 5 +++ target/riscv/tcg/tcg-cpu.c | 14 ++++++ 4 files changed, 109 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 2a265faae5..62732957a4 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -624,6 +624,9 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, char *riscv_isa_string(RISCVCPU *cpu); int riscv_cpu_max_xlen(RISCVCPUClass *mcc); bool riscv_cpu_option_set(const char *optname); +void riscv_cpu_enter_debug_mode(CPURISCVState *env, target_ulong pc, + uint32_t cause); +void riscv_cpu_leave_debug_mode(CPURISCVState *env); =20 #ifndef CONFIG_USER_ONLY void riscv_cpu_do_interrupt(CPUState *cpu); diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index dd6c861a90..05a991fccc 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -136,6 +136,93 @@ bool riscv_env_smode_dbltrp_enabled(CPURISCVState *env= , bool virt) #endif } =20 +#ifndef CONFIG_USER_ONLY +static bool riscv_sdext_enabled(CPURISCVState *env) +{ + return riscv_cpu_cfg(env)->ext_sdext; +} +#endif + +void riscv_cpu_enter_debug_mode(CPURISCVState *env, target_ulong pc, + uint32_t cause) +{ +#ifndef CONFIG_USER_ONLY + if (!riscv_sdext_enabled(env)) { + return; + } +#endif + env->debug_mode =3D true; + env->dpc =3D pc & get_xepc_mask(env); + env->dcsr &=3D ~(DCSR_CAUSE_MASK | DCSR_PRV_MASK | DCSR_V); + env->dcsr |=3D ((target_ulong)(cause & 0x7)) << DCSR_CAUSE_SHIFT; + env->dcsr |=3D env->priv & DCSR_PRV_MASK; + if (env->virt_enabled && riscv_has_ext(env, RVH)) { + env->dcsr |=3D DCSR_V; + } +#ifndef CONFIG_USER_ONLY + if (env_archcpu(env)->cfg.ext_zicfilp) { + if (env->elp) { + env->dcsr |=3D DCSR_PELP; + } else { + env->dcsr &=3D ~DCSR_PELP; + } + env->elp =3D false; + } +#endif +} + +void riscv_cpu_leave_debug_mode(CPURISCVState *env) +{ +#ifndef CONFIG_USER_ONLY + if (!riscv_sdext_enabled(env)) { + return; + } +#endif + target_ulong new_priv =3D env->dcsr & DCSR_PRV_MASK; + bool new_virt =3D riscv_has_ext(env, RVH) && (env->dcsr & DCSR_V); + + if (new_priv > PRV_M) { + new_priv =3D PRV_M; + } + if (new_priv =3D=3D PRV_M) { + new_virt =3D false; + } +#ifndef CONFIG_USER_ONLY + if (new_priv =3D=3D PRV_S && !riscv_has_ext(env, RVS)) { + new_priv =3D PRV_M; + new_virt =3D false; + } else if (new_priv =3D=3D PRV_U && !riscv_has_ext(env, RVU)) { + new_priv =3D riscv_has_ext(env, RVS) ? PRV_S : PRV_M; + new_virt =3D false; + } +#endif + + env->debug_mode =3D false; + riscv_cpu_set_mode(env, new_priv, new_virt); + +#ifndef CONFIG_USER_ONLY + if (env_archcpu(env)->cfg.ext_zicfilp) { + env->elp =3D cpu_get_fcfien(env) && (env->dcsr & DCSR_PELP); + env->dcsr &=3D ~DCSR_PELP; + } +#endif + + if (new_priv !=3D PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MPRV, 0); + } +#ifndef CONFIG_USER_ONLY + if (env_archcpu(env)->cfg.ext_smdbltrp && new_priv !=3D PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MDT, 0); + } + if (env_archcpu(env)->cfg.ext_ssdbltrp && (new_priv =3D=3D PRV_U || ne= w_virt)) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_SDT, 0); + if (new_virt && new_priv =3D=3D PRV_U) { + env->vsstatus =3D set_field(env->vsstatus, MSTATUS_SDT, 0); + } + } +#endif +} + RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 5664466749..5877a60c50 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -927,6 +927,11 @@ void riscv_cpu_debug_excp_handler(CPUState *cs) RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; =20 + /* Triggers must not match or fire while in Debug Mode. */ + if (env->debug_mode) { + return; + } + if (cs->watchpoint_hit) { if (cs->watchpoint_hit->flags & BP_CPU) { do_trigger_action(env, DBG_ACTION_BP); diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 1343f21d08..c6beac3d50 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -266,6 +266,19 @@ static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_= idx, } return extract64(result, 0, 64 - pm_len); } + +static void riscv_cpu_exec_enter(CPUState *cs) +{ + RISCVCPU *cpu =3D RISCV_CPU(cs); + CPURISCVState *env =3D &cpu->env; + + if (!cpu->cfg.ext_sdext || !env->debug_mode) { + return; + } + target_ulong pc =3D env->dpc; + riscv_cpu_leave_debug_mode(env); + env->pc =3D pc; +} #endif =20 const TCGCPUOps riscv_tcg_ops =3D { @@ -282,6 +295,7 @@ const TCGCPUOps riscv_tcg_ops =3D { #ifndef CONFIG_USER_ONLY .tlb_fill =3D riscv_cpu_tlb_fill, .pointer_wrap =3D riscv_pointer_wrap, + .cpu_exec_enter =3D riscv_cpu_exec_enter, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .cpu_exec_halt =3D riscv_cpu_has_work, .cpu_exec_reset =3D cpu_reset, --=20 2.52.0