From nobody Mon Feb 9 02:15:17 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=1770123406; cv=none; d=zohomail.com; s=zohoarc; b=j8WpcE27V1zSTmDPf8ffyvLyLS28J8QMIPVHFPNxDdPxD0lIa7DSJjUK6CldX4dQDN04oqM8r3upq9KtWuMbFlxzkQ8pTGeRsqpkPQY8Om2QlMbpwCtgxw2ZL1CbyZs2wUJ/rO9MsCJCCqBaArJzZWdXgbqS/0eTeb9irqh5mzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770123406; 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=M90wMGk4h3GY5YVxBmIlu1BXQtHAUIoQs/agFdkxAIk=; b=RKum/JWsbvPnT+7HsqIxo0juTb1wRHSf11NAE4+9Gq7yuCPTBeknB/uZW/KigHYrT6Rh/36f6ltTjZyYo4CsGiefWZLu0xBZf7+A+p+htN3E0OJdhVC7jd1fPndMO0fv6tN9sWKwbAVj6PgcF9RmiZE2ZoL88kUfB4jpCipIobs= 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 1770123406630355.1284662698066; Tue, 3 Feb 2026 04:56:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnFxJ-0004Xx-Cm; Tue, 03 Feb 2026 07:56:33 -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 1vnFxD-0004Wv-IP for qemu-devel@nongnu.org; Tue, 03 Feb 2026 07:56:27 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnFxB-0003wB-NH for qemu-devel@nongnu.org; Tue, 03 Feb 2026 07:56:27 -0500 Received: by mail-pf1-x444.google.com with SMTP id d2e1a72fcca58-8217f2ad01eso4494657b3a.2 for ; Tue, 03 Feb 2026 04:56:25 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.22.5]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c642aaf1308sm18214796a12.30.2026.02.03.04.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 04:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770123384; x=1770728184; 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=M90wMGk4h3GY5YVxBmIlu1BXQtHAUIoQs/agFdkxAIk=; b=b503CFttSQ7zTd79skZ7zRTak1AKrNgjelD6dwBBT4GwS3tX/fvhgkoxlWDU+AN5oJ +K4iO0YtmiMZc5EZfgdXGLPPqTs+2MsDXjjTAbX26mz/6rqICa4hy/yzxe7tGtQw2oXQ bcIqBme3WQjYJugFJ82A0G0TV0G5i3iGgm4RW37ap4vs8/voL+618l5391OXZn6oSOCK vLY7r4EsyUwI34E/MQqSk5SpvbAerkuh/NIvnW2KyoOCI6Yr++KUQvEC0ijeAj3FSTWK XU9fQmGdyCOmSrTbPbDXKI/wD0pqM4XFOoW88aRymkHgvcIsHEA9OrkR+XIzwsKG4NZz NQ8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770123384; x=1770728184; 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=M90wMGk4h3GY5YVxBmIlu1BXQtHAUIoQs/agFdkxAIk=; b=kgAMf0X4Rnw7puGOaafuynolNkFVBdE7WBJc/MJy591AyIIXkKvqi/WijuW0BzmOXS uQ+McUeZTAfLu/y7/f7C2iy9g+WhBg9qp8EMiUOw/Fvq+brlGR6jf+/xw/w+DNQEl3UQ jEkMevNo6drXZIasFYzaJZGzneKXs9Fw1cQfHkfUDfkWIjlJCcKgtHzPG9z8aK9wkYvz rGYVv16cmwNlKGbq6ZVeVBBPgGy7W+UL5tfK/yLjpYYMMFEKYTHR15ZMGyl07vrcd0tK ef7rL8JiqBI/PSNa8IrvsWUYkNQ1Yrz1uinuu5FtG1L8epnYppOqXzJOuY8suKyho6X5 8Yhg== X-Gm-Message-State: AOJu0YwL/R22+1RZELys3Te8cM7dZO57Wi5csg+ICHPAFp06mnLh1Gp0 2KZ1lwIGuuHbdeE801ahcpWUE0VntcfpmRM40VOoDXq6zjWkh4N0TtZG X-Gm-Gg: AZuq6aLxO66gN/L7i6ZLCQzD5tDFWsT6WrelrrxYXEqOCTPy3tQvHKBHTJEsea6GIF6 U/Dpjqc2XXLpETa9XnKqn4XF4xc/WwQLnasHo/zoTfomU2Z6d9sfHIxr8xdbR7z0E48CmbaaDSa Y+G3KNZB1mbnxtv/avNSrFpID0jKaXvAceqzoskihJ+PGDFj9ue8bu/tPjVMllDkqS89PGBgPjk RuzNy9YEKwQkcSZUTOTsudHMXWEAZw/AJAymQFiRv1CGuyrdtKYcbgz9GMSosBVqHna0GWwdznA E0vlitLTr+rBMmAFg0YI5/T8MI9MM8GPHSZ64bFjGOAv+nypNeB3K9kGGXMD4jAI6Hvy8gJpz9V eGGtpQdtJAW3OxEfD4gL/7l3EZFThn6cwEIszCPEq3P2TYLD3JbEDDEST/Bx3/GAmFDOEDTxmQJ fT1cK6YY37SrSslNuJB2c6F4W22nQsoHEY5GoWgZcmDBsg26xwfoW06a28 X-Received: by 2002:a05:6a21:a98:b0:366:14ac:e1ec with SMTP id adf61e73a8af0-392e016e1f2mr14909595637.62.1770123384313; Tue, 03 Feb 2026 04:56:24 -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, hust-os-kernel-patches@googlegroups.com, devel@lists.libvirt.org, Chao Liu , Daniel Henrique Barboza Subject: [RFC PATCH v5 3/7] target/riscv: add sdext Debug Mode helpers Date: Tue, 3 Feb 2026 20:56:02 +0800 Message-ID: <7fd9deef21573daeeff53cea15d0e66417d4a8f3.1770104280.git.chao.liu.zevorn@gmail.com> X-Mailer: git-send-email 2.53.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 client-ip=2607:f8b0:4864:20::444; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pf1-x444.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=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: 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: 1770123408408158500 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 Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu.h | 3 ++ target/riscv/cpu_helper.c | 84 ++++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 5 +++ target/riscv/tcg/tcg-cpu.c | 14 +++++++ 4 files changed, 106 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..0e266ff3a9 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -136,6 +136,90 @@ 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; + } + + 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; + } + + 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; + } + + 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; + } + + 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; + } + + env->debug_mode =3D false; + riscv_cpu_set_mode(env, new_priv, new_virt); + + if (env_archcpu(env)->cfg.ext_zicfilp) { + env->elp =3D cpu_get_fcfien(env) && (env->dcsr & DCSR_PELP); + env->dcsr &=3D ~DCSR_PELP; + } + + if (new_priv !=3D PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MPRV, 0); + } + + 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 d9fbb5bf58..f80e3413f8 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.53.0