From nobody Mon Feb 9 14:34:25 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=1768624574; cv=none; d=zohomail.com; s=zohoarc; b=Hy+myAtMvgZlMJyRlcYlarzeMw12aYTWCwCsnmg8QLVqD1HCh5JjSxilIDncki/MPdFEg16Bat+GMtQJrNn0DGHTEz5GoYoflkA59ta+JKL7IV0q8a9Yd47S0wqLVJz/VTcAea1sGkEfooUY7Emw9yvoZo+S2jcfGrSP77mPNIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768624574; 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=4ZlK4YcDnVr4YoAAgIp9FWKl3ozqkLm1udk+dBRmk0A=; b=gD9KsLXIxh2KXHhIxgD7wmtegBXQ5PFE3ktHp/PXXXtu8aNYgwJ/sD43EypJ8kUCimMSJWfqGXyIt1mRqN76J4oBvgAZtilH25fnxhTL+7+O3arM8+TVW3oQ13uqAnZ7t+xN3kNwrHUQhKahFExWM/jUqKkA43j5oETbxzDbD6c= 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 1768624574789982.75979266439; Fri, 16 Jan 2026 20:36:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgxuf-0000t9-VW; Fri, 16 Jan 2026 23:27:49 -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 1vgxuf-0000sd-1l for qemu-devel@nongnu.org; Fri, 16 Jan 2026 23:27:49 -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 1vgxud-0001ak-BR for qemu-devel@nongnu.org; Fri, 16 Jan 2026 23:27:48 -0500 Received: by mail-pf1-x444.google.com with SMTP id d2e1a72fcca58-81e93c5961cso2218316b3a.0 for ; Fri, 16 Jan 2026 20:27:47 -0800 (PST) Received: from ZEVORN-PC.localdomain ([114.88.97.170]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c5edf395851sm3273056a12.36.2026.01.16.20.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 20:27:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768624066; x=1769228866; 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=4ZlK4YcDnVr4YoAAgIp9FWKl3ozqkLm1udk+dBRmk0A=; b=MvdJ+Quyy5Donthm6PGTaB06kmA+ZLhp+LXoln9N5mCjbyx+WrkfTEv3s8Mf/w/By4 /quqQe4chd53W1NQJemga6023mCLwb22zNVse1ZZLxuOKm7RGhkHfpTzwlUPq5FOiEdd 1DpsatxHZ5wA8PvG/CUSOiUZn7Bc1A+xYXfKDCFjLK5vv14wGmBa/kLA3M0WZAP/Wh5j Kv8TekLCvbEfRhwHJOPVVyF8jBC6LIJHxOZWNodqmOr0H/2l3d6OkdjzaYdDrPT7A7cT 0i3LdA/4vAKsKFec8CbTZdPEXGH6qDXa6TrgVpcCcng5SFemmoIYZTRUuQJIwkwaubeG Dm0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768624066; x=1769228866; 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=4ZlK4YcDnVr4YoAAgIp9FWKl3ozqkLm1udk+dBRmk0A=; b=duUqzpzLGnHHZBHie4FwOEK68jA6dj5VlG3sjX24hMBPE5cH+SZBEvOAgHmt4KXzSl kj9nH870hV0+3v06b1xRx+mKyFjIGKpBuWwRWCSoYEQ8ubnrt3Lh2QftM70OW2nC53VB rI+OnPKJ++bojMhgP2Is0ohOkF4LE0JKA9vU5V/DAsuXoPgTzhb9LOe7GcQXaDfcJC4a ClEn7zUM5YhqLeBzkBOMs77YKcKuyU+UaO40f/n9lv2PlVwQQ3sx068fC4wlwK3T0d0Y F/i/SYFtrD6oAD/iMHCKwl7Tdd60ZJXAfMcJ8UYJC+k5TVYMaBpsobdU8d4BTcsoDvx2 ZDwQ== X-Gm-Message-State: AOJu0Yy4pJP1nmvjIOXnkrvuzb8u8LGZis+DNMcXOxlonKTIAnqpvWYj gPxCLl6YTrkO2GsrLeYYDqjDKyL7Rk1ehBDBi0Qzjb+XpqzHa8X3TZpU X-Gm-Gg: AY/fxX71UAldL9GhuQ9q4fTxpBVbRS/TM+WqkI7Gt/qwZjcDn1WmfSSUmar1nOSsCDg 5dry+bbU00fCHKLgypK4hxpeWY7C0vvBIhgzTDuaCv9JhiPoPRZqrkMCHD5PpoJBtkKUtpeEC7H mSJYmhUnUnLgPR3XKFrsYUn2DQxWWyzqNZQgpTA/gMafBe9JeQ7nYI1m3dkLWPAXjMIPfGkPu4Q 4gsqlQTRQPRl6rR0WO3McgSPi+eX07m0zg+RmnrtBibagwpE7UljvBl3lkBople6Bogb+FkyDw0 t+9Mbeochjx1UEM5jVxtHfh78D5TYPEGX0tcZVWYpIyaLO6et0/EQOLariPXYEHYnU82HW3vfFA HafAuMDOKoN9ks/RETmXIxrgwpCpiWS4vWogdGIyr22XLlFUBjSZ3gHucZyaNrqEuNeEGsZr3HN 4wYQewSCtQLOwH+H9ZINsVzWHsEdecBZukDI6zgvOK9s7X4aOSHapWfCUA8B/pDQ== X-Received: by 2002:a05:6a20:d80d:b0:2b1:c9dc:6da0 with SMTP id adf61e73a8af0-38dfe76e18amr5340653637.46.1768624065943; Fri, 16 Jan 2026 20:27:45 -0800 (PST) From: Chao Liu To: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, wangjingwei@iscas.ac.cn, Chao Liu Subject: [RFC PATCH v1 3/8] riscv: add sdext Debug Mode helpers Date: Sat, 17 Jan 2026 12:27:24 +0800 Message-ID: <8230a1b0633140c228d063602e93120f0963c3e6.1768622882.git.chao.liu.zevorn@gmail.com> 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::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=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: 1768624577040158500 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 18ebac830a..ca861aa5f8 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -630,6 +630,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 c4fb68b5de..83d2aa1b75 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 b5a26cf662..2b543ced07 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -261,6 +261,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 { @@ -277,6 +290,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