From nobody Sun Feb 8 09:32:48 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=1768897538; cv=none; d=zohomail.com; s=zohoarc; b=E3Onfgmz7v2H6F8QnPE1dGREnn3AnYhXG4yTFnCQ10r3YqDDR4fKZekn+ToimXeEw314g5oQqEjlVlAD19Zk+eYMgHhhTun+trb/zgLyFlS4XS+vmlfq+N5kxT27yXUg4lxJP52mI57AKsWYnwLCNOjzu73v3cJSRgukVc8P5iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897538; 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=3IIJ+faclScSBNq5NpxC/1LmlPlQSbjBx402NxvLJP4=; b=EU1R6GZdfusdNM3GQdhsGZM6cdPgmiaKQE4KaFejgdUR42mCDkk8b1mT3j6E7Ce7c/VPvu7A01QnM9m3H17NM/ZQ3owZsM46SXTykfOi0Dp2tPH0skP5md9cDRbxszFMffkuquO1bjzFtCwqkXqUkRwBln9hziKnhN/+4Q8AXu0= 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 1768897538566306.2150763214364; Tue, 20 Jan 2026 00:25:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72I-0005Ef-PV; Tue, 20 Jan 2026 03:24:26 -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 1vi72H-0005Ce-1S for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:25 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72E-00032z-Ra for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:24 -0500 Received: by mail-pg1-x541.google.com with SMTP id 41be03b00d2f7-ba599137cf8so1878148a12.0 for ; Tue, 20 Jan 2026 00:24:22 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897461; x=1769502261; 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=3IIJ+faclScSBNq5NpxC/1LmlPlQSbjBx402NxvLJP4=; b=bpTlZwYHH9pkzBIq7dzhQIHMz9IOY5aVyPjjXjr9QRqOkgIOh75HQTpgmdR4zktq9L ovD+8hHChwaB8CexZMKvc2batP7qKH7yUdFe7hRMKaUhCTlWLWzkQyHNsRU2yjckT82H 4n3d1X3ciPnhQn3UIVwjdBjX58chwxMqpUZzzGcz6d8s66dteMqcJ0RJfXDcRmJfmHI9 oCOrFAEjtMtmSVl+WJtFx98tX84+bXM6BoKHABkUGi28qjjqFcUyqyFpND+IYUKJ3T2/ 5mxaI1pRuqH/A0cnmJT7uN55tgCFZQeMw18WMixbaQQAgpldwYfJmp94wcTF8q5gUiqD r8bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897461; x=1769502261; 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=3IIJ+faclScSBNq5NpxC/1LmlPlQSbjBx402NxvLJP4=; b=N3K4QBSeaIzELlGCP73eScD3GFoxAlmS7KSaRavKdCi6zCoRWmEZG1k5OktApO+AER s4HiAiNFsQOhKFa7QCe+o2M9lnk7W+2+OKlW1NKrZAAB0ip8MOcLA9Q3FCZ3u9hKT94b M2P/NzjRKnbGrmeNFKF6d4/YdBaJpaZp2AR/c/ViKZmdxTCon6yYmJ4Lgq7Ps9q7W8JF 52CqBCTqwdYpEc02LHpsPRqQbk6xW5KhB89xyaYvolMfHX6cd07jepRhtgUmVMlDE++C WIsn3HxtlajCHqZuaywMrSJujEba6vUQFgDs7VpxATuC3TND8B9kIqY9+/K3nVj8qdFR Nz+w== X-Gm-Message-State: AOJu0YwhRUT4HopywIeTOeXf0M9M7K7fuEWRLcatBYuf27GAw6TEZ626 fUC8bADEbvPw0mFQX+MuYfHI+HbC+tG4v0Wxrvu9SxCaiGuR2xIVJDze X-Gm-Gg: AZuq6aKRKLjMOCMROm+mbVyUs55ieqcbgK9hNIRf51TJ55FXNvFl7CX37iFU3HBhI8H s8lr68PMLqiQG1bOrIhdCXzoUdmB8RqAnkdjoKrJ5eaEEOM+jLfDi3KSpI6aIUFmddL1N9ClQhu rytx2sdBoczBdiAnzjYUTYq8rhu7zNckhuTrPCcAyhHfOcCgPqkLW2/C5FEivXtarsG1c9rlQsI XgvfV03L4sevPMGlDko+WTub3nZNdnKCcKZikk9t+DQjJwX9pn/x+fVRrLcnwX8O1iZl0nZ6uw4 KpVI52JvTWOfu5PeM7nrns26DmOBMCzgHIsUhSrWMxrEY+2AjhcV7r/wBLvclibMCa/6tfWKGAC bc93N0YTIoWBp7g2qr6yU3DBTMhhpzYzqCNE9xNuUmdNU6Cu0uQ9BhK5IW4XYNHRRl4z9vxt8X2 onTvPbkoy6hcTCqPJpDYbRA30sMyqrNl5ZN/KxTs6d2ft39ZS3UGwwaC12FA== X-Received: by 2002:a17:90b:4d0c:b0:34f:6312:f225 with SMTP id 98e67ed59e1d1-352678f31eamr14658510a91.14.1768897461261; Tue, 20 Jan 2026 00:24:21 -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, Daniel Henrique Barboza Subject: [RFC PATCH v2 1/7] target/riscv: deprecate 'debug' CPU property Date: Tue, 20 Jan 2026 16:23:57 +0800 Message-ID: <65b52195193a368dce4315e2194402a5aee55e01.1768892407.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::541; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pg1-x541.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: 1768897547806154100 Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza Starting on commit f31ba686a9 ("target/riscv/cpu.c: add 'sdtrig' in riscv,isa') the 'debug' flag has been used as an alias for 'sdtrig'. We're going to add more debug trigger extensions, e.g. 'sdext' [1]. And all of a sudden the existence of this flag is now weird. Do we keep it as a 'sdtrig' only or do we add 'sdext'? The solution proposed here is to deprecate it. The flag was introduced a long time ago as a way to encapsulate support for all debug related CSRs. Today we have specific debug trigger extensions and there's no more use for a generic 'debug' flag. Users should be encouraged to enable/disable extensions directly instead of using "made-up" flags that exists only in a QEMU context. The following changes are made: - 'ext_sdtrig' flag was added in cpu->cfg. 'debug' flag was removed from cpu->cfg; - All occurrences of cpu->cfg.debug were replaced to 'ext_sdtrig'; - Two explicit getters and setters for the 'debug' property were added. The property will simply get/set ext_sdtrig; - vmstate_debug was renamed to vmstate_sdtrig. We're aware that this will impact migration between QEMU 10.2 to newer versions, but we're still in a point where the migration break cost isn't big enough to justify adding migration compatibility scaffolding. Finally, deprecated.rst was updated to deprecate 'debug' and encourage users to use 'ext_sdtrig' instead. [1] https://lore.kernel.org/qemu-devel/cover.1768622881.git.chao.liu.zevorn= @gmail.com/ Signed-off-by: Daniel Henrique Barboza --- docs/about/deprecated.rst | 7 +++++ target/riscv/cpu.c | 51 ++++++++++++++++++++++++++++--- target/riscv/cpu_cfg_fields.h.inc | 2 +- target/riscv/csr.c | 2 +- target/riscv/machine.c | 24 +++++++-------- target/riscv/tcg/tcg-cpu.c | 2 +- 6 files changed, 69 insertions(+), 19 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 88efa3aa80..420bff8d0d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -478,6 +478,13 @@ It was implemented as a no-op instruction in TCG up to= QEMU 9.0, but only with ``-cpu max`` (which does not guarantee migration compatibility across versions). =20 +``debug=3Dtrue|false`` on RISC-V CPUs (since 11.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This option, since QEMU 10.1, has been a simple alias to the ``sdtrig`` +extension. Users are advised to enable/disable ``sdtrig`` directly instead +of using ``debug``. + Backwards compatibility ----------------------- =20 diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c2a9da0fe8..f1b977f0ee 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -211,7 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] =3D { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), - ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, debug), + ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha), ISA_EXT_DATA_ENTRY(shgatpa, PRIV_VERSION_1_12_0, has_priv_1_12), @@ -790,7 +790,7 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType= type) env->vill =3D true; =20 #ifndef CONFIG_USER_ONLY - if (cpu->cfg.debug) { + if (cpu->cfg.ext_sdtrig) { riscv_trigger_reset_hold(env); } =20 @@ -953,7 +953,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) riscv_cpu_register_gdb_regs_for_features(cs); =20 #ifndef CONFIG_USER_ONLY - if (cpu->cfg.debug) { + if (cpu->cfg.ext_sdtrig) { riscv_trigger_realize(&cpu->env); } #endif @@ -1132,6 +1132,14 @@ static void riscv_cpu_init(Object *obj) cpu->env.vext_ver =3D VEXT_VERSION_1_00_0; cpu->cfg.max_satp_mode =3D -1; =20 + /* + * 'debug' started being deprecated in 11.0, been just a proxy + * to set ext_sdtrig ever since. It has been enabled by default + * for a long time though, so we're stuck with setting set 'strig' + * by default too. At least for now ... + */ + cpu->cfg.ext_sdtrig =3D true; + if (mcc->def->profile) { mcc->def->profile->enabled =3D true; } @@ -1246,6 +1254,7 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = =3D { MULTI_EXT_CFG_BOOL("smcdeleg", ext_smcdeleg, false), MULTI_EXT_CFG_BOOL("sscsrind", ext_sscsrind, false), MULTI_EXT_CFG_BOOL("ssccfg", ext_ssccfg, false), + MULTI_EXT_CFG_BOOL("sdtrig", ext_sdtrig, true), MULTI_EXT_CFG_BOOL("smctr", ext_smctr, false), MULTI_EXT_CFG_BOOL("ssctr", ext_ssctr, false), MULTI_EXT_CFG_BOOL("zifencei", ext_zifencei, true), @@ -2682,8 +2691,42 @@ RISCVCPUImpliedExtsRule *riscv_multi_ext_implied_rul= es[] =3D { NULL }; =20 +/* + * DEPRECATED_11.0: just a proxy for ext_sdtrig. + */ +static void prop_debug_get(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + bool value =3D RISCV_CPU(obj)->cfg.ext_sdtrig; + + visit_type_bool(v, name, &value, errp); +} + +/* + * DEPRECATED_11.0: just a proxy for ext_sdtrig. + */ +static void prop_debug_set(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + RISCVCPU *cpu =3D RISCV_CPU(obj); + bool value; + + visit_type_bool(v, name, &value, errp); + cpu->cfg.ext_sdtrig =3D value; +} + +/* + * DEPRECATED_11.0: just a proxy for ext_sdtrig. + */ +static const PropertyInfo prop_debug =3D { + .type =3D "bool", + .description =3D "DEPRECATED: use 'sdtrig' instead.", + .get =3D prop_debug_get, + .set =3D prop_debug_set, +}; + static const Property riscv_cpu_properties[] =3D { - DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true), + {.name =3D "debug", .info =3D &prop_debug}, =20 {.name =3D "pmu-mask", .info =3D &prop_pmu_mask}, {.name =3D "pmu-num", .info =3D &prop_pmu_num}, /* Deprecated */ diff --git a/target/riscv/cpu_cfg_fields.h.inc b/target/riscv/cpu_cfg_field= s.h.inc index 353a932c36..a8c133d663 100644 --- a/target/riscv/cpu_cfg_fields.h.inc +++ b/target/riscv/cpu_cfg_fields.h.inc @@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc) BOOL_FIELD(ext_smcdeleg) @@ -159,7 +160,6 @@ BOOL_FIELD(ext_xmipslsp) =20 BOOL_FIELD(mmu) BOOL_FIELD(pmp) -BOOL_FIELD(debug) BOOL_FIELD(misa_w) =20 BOOL_FIELD(short_isa_string) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 05c7ec8352..870fad87ac 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -777,7 +777,7 @@ static RISCVException have_mseccfg(CPURISCVState *env, = int csrno) =20 static RISCVException debug(CPURISCVState *env, int csrno) { - if (riscv_cpu_cfg(env)->debug) { + if (riscv_cpu_cfg(env)->ext_sdtrig) { return RISCV_EXCP_NONE; } =20 diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 09c032a879..62c51c8033 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -218,14 +218,14 @@ static const VMStateDescription vmstate_kvmtimer =3D { }; #endif =20 -static bool debug_needed(void *opaque) +static bool sdtrig_needed(void *opaque) { RISCVCPU *cpu =3D opaque; =20 - return cpu->cfg.debug; + return cpu->cfg.ext_sdtrig; } =20 -static int debug_post_load(void *opaque, int version_id) +static int sdtrig_post_load(void *opaque, int version_id) { RISCVCPU *cpu =3D opaque; CPURISCVState *env =3D &cpu->env; @@ -237,12 +237,12 @@ static int debug_post_load(void *opaque, int version_= id) return 0; } =20 -static const VMStateDescription vmstate_debug =3D { - .name =3D "cpu/debug", - .version_id =3D 2, - .minimum_version_id =3D 2, - .needed =3D debug_needed, - .post_load =3D debug_post_load, +static const VMStateDescription vmstate_sdtrig =3D { + .name =3D "cpu/sdtrig", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D sdtrig_needed, + .post_load =3D sdtrig_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINTTL(env.trigger_cur, RISCVCPU), VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS), @@ -425,8 +425,8 @@ static const VMStateDescription vmstate_sstc =3D { =20 const VMStateDescription vmstate_riscv_cpu =3D { .name =3D "cpu", - .version_id =3D 11, - .minimum_version_id =3D 11, + .version_id =3D 12, + .minimum_version_id =3D 12, .post_load =3D riscv_cpu_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32), @@ -492,13 +492,13 @@ const VMStateDescription vmstate_riscv_cpu =3D { &vmstate_kvmtimer, #endif &vmstate_envcfg, - &vmstate_debug, &vmstate_smstateen, &vmstate_jvt, &vmstate_elp, &vmstate_ssp, &vmstate_ctr, &vmstate_sstc, + &vmstate_sdtrig, NULL } }; diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index c095bc9efd..1343f21d08 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -180,7 +180,7 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *c= s) ? EXT_STATUS_DIRTY : EXT_STATUS_DISABLED; } =20 - if (cpu->cfg.debug && !icount_enabled()) { + if (cpu->cfg.ext_sdtrig && !icount_enabled()) { flags =3D FIELD_DP32(flags, TB_FLAGS, ITRIGGER, env->itrigger_enab= led); } #endif --=20 2.52.0 From nobody Sun Feb 8 09:32:48 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=1768897525; cv=none; d=zohomail.com; s=zohoarc; b=OBmGd8KGJnaFlQD04PPY/Hv9v3qYhNm8lRdtIXUxeGpX+JxeefnNqWBKfN5ZZ5ZK30NP0euLHT6/+IvmP2t1waLu6EsNgAzqtESqOvUdJaoaBt10Ww/qKw2qGPM1NOVbifVozdZInYvxVmj6ps/uAvQeyuQrgdz+JtTb3VRrABM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897525; 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=V2VQiMNkQmKk0Gf4SL+MIOp2QrhXkeZ5QdOOake/81k=; b=SsT6UnsaMKW//YTjzId+cH+zEULzJE84uO0cwC9m7blpgdkhEVimjrNvGak7jupH+bobjX6i3UqqBuhYrip9hnV3W+qbuW0VPg+VSmC2MjM7vMZtadl7XC3V8qP5wgtItRMa9W+B+L1afRy3Lhx5X5CYPGf6Mcyv7TddrWNnYlw= 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 1768897525709907.0683776799551; Tue, 20 Jan 2026 00:25:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72L-0005Kk-T3; Tue, 20 Jan 2026 03:24:29 -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 1vi72J-0005Ga-Ra for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:27 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72H-00033M-OA for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:27 -0500 Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-2a75a4a140eso2812165ad.3 for ; Tue, 20 Jan 2026 00:24:25 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897464; x=1769502264; 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=V2VQiMNkQmKk0Gf4SL+MIOp2QrhXkeZ5QdOOake/81k=; b=aFMfRghU14ElVjcygft685th21WGxPeVtfvRICnvCWd0TdRZdP9PrgTnpjwvFRpTnJ MRBlMNxEyeLgvghvBQK9pFjMRqzyeeFp2PF2xgTv6Hu/6qVjfeIuTa7SO2Nrzius5Mg4 8eWeNbwf8U8Osvya4GdchXhaNZffadIj7fETpz9N7UUJanEMLiGc3mNQ6V2sFQXKuLAI xJq1PTAI6F9xqR2Sl/FJnbqy/v+2Hf8V+1t93NTRdD0QT1qQMMH5IDUTPuRkXTfsKIxC vjukkuXy5hcuQeRXpIxvcCu4kS7luo4e8OkLm3iLiKHOB+ZY2WNvqnZ6lxeOGAOP4U2V Q1Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897464; x=1769502264; 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=V2VQiMNkQmKk0Gf4SL+MIOp2QrhXkeZ5QdOOake/81k=; b=NVkZp24SPVyu/DDlnLh5NvW8ySljAEA/QpGh0VGWomZ3j/wnvYilg7MPM8PqXD6agp rUWBaR5e3jOBVPOt3u3Hfm2wQXtvz4Fvy/DkY9vid8hxRLPDlR4wcAAiRr+9kkGoklSH afzFYFnAS4q8LmUPfS7D8C+PkGXd//GVtx+PzoP00xLWtVd+ELBnYjB9P0Kr6QM13r+B Y7NzrGCrTyAI4+OCv1dYZnu7jCfo2mKa1FzZZEqASljKQItJEAJDJc6Mf9IfjwvNUD5s Z7QfMDz/YmRYh4KRyXYCuhW3mjdmwMGgANxzTRgvS/29ak64xkd7Zac37BhF4o6zae6O uxPw== X-Gm-Message-State: AOJu0YycgAqdU3T3TjDUMiF6TUKOL1WJyN+wAHr12vX7+JkabjeTWD6I THsJL1DJ/zSqg5a3reCc6vvXIHJCAHpuoFzRjxnfiiYWuDx5/Yz2d5kj X-Gm-Gg: AZuq6aL6GaryFsGeFhSbGstYXbtSwV7cMyXBqVlhJIqmToCVUWpSbizoUc+Itc4Z2SP ZFMV1i6aPjruxScvEXaSmChfwT9G4KgeHWkXZnWlRzaBxVbNvmFnmfyBX8vzFnRBkiMBk7RQRoH IvBOTazQh+ywdHtiHKS1EXcqbX/JfkbmC8VARSxjor4r7lzLFqSf2AWgNuXS/xMbjgjDUTVTggA 4IWd7p8bJqy9bxtPLo7IQnDoXTtVhApZvAET7rZszS2rpUGN0R7FepQ/J43reKgPXQAkM37vygV FjVxJYBS+z/Wwcnt49KBz2KzMNet/qIYYEKwNXkX07SqI0Y2Ao+/YXKjd9HPmviMwnfFFxlKxq9 rHV82IbkEKwDjuzgY1t8MW8dxhuAHA1UQRn7CbpwjiFdCoZawaX8EdC53nfgtP/+gDKAHZmv50x Y7KAIvmA6Yn9JaT3ETvYcOB6v7PuFR2qKbwvN2s0lOeMZ0QDWcsQYMbJxUhBWveixt9oLq X-Received: by 2002:a17:90b:2ccd:b0:340:4abf:391d with SMTP id 98e67ed59e1d1-352c3e9b01cmr1168854a91.16.1768897464070; Tue, 20 Jan 2026 00:24: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, wangjingwei@iscas.ac.cn, Chao Liu Subject: [RFC PATCH v2 2/7] target/riscv: add sdext debug CSRs state Date: Tue, 20 Jan 2026 16:23:58 +0800 Message-ID: <329a6d5fde74c5cce615053e7f4a0e1c48a27a1b.1768892407.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::641; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x641.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: 1768897528296154100 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Add architectural state for Sdext Debug Mode: debug_mode, dcsr, dpc and dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate them to Debug Mode (or host debugger access). Signed-off-by: Chao Liu --- target/riscv/cpu.c | 9 +++ target/riscv/cpu.h | 4 + target/riscv/cpu_bits.h | 33 ++++++++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++ target/riscv/machine.c | 20 +++++ 6 files changed, 193 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f1b977f0ee..bd6cff33cf 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -211,6 +211,7 @@ const RISCVIsaExtData isa_edata_arr[] =3D { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), + ISA_EXT_DATA_ENTRY(sdext, PRIV_VERSION_1_12_0, ext_sdext), ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12), ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha), @@ -788,6 +789,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetTyp= e type) set_ocp_fp8_same_canonical_nan(true, &env->fp_status); set_ocp_fp8e5m2_no_signal_nan(true, &env->fp_status); env->vill =3D true; + env->debug_mode =3D false; + env->dcsr =3D DCSR_DEBUGVER(4); + env->dpc =3D 0; + env->dscratch[0] =3D 0; + env->dscratch[1] =3D 0; =20 #ifndef CONFIG_USER_ONLY if (cpu->cfg.ext_sdtrig) { @@ -1140,6 +1146,9 @@ static void riscv_cpu_init(Object *obj) */ cpu->cfg.ext_sdtrig =3D true; =20 + /* sdext is not fully implemented, so it is disabled by default. */ + cpu->cfg.ext_sdext =3D false; + if (mcc->def->profile) { mcc->def->profile->enabled =3D true; } diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 4c0676ed53..2a265faae5 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -476,6 +476,10 @@ struct CPUArchState { =20 /* True if in debugger mode. */ bool debugger; + bool debug_mode; + target_ulong dcsr; + target_ulong dpc; + target_ulong dscratch[2]; =20 uint64_t mstateen[SMSTATEEN_MAX_COUNT]; uint64_t hstateen[SMSTATEEN_MAX_COUNT]; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index b62dd82fe7..bb59f7ff56 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -467,6 +467,39 @@ #define CSR_DCSR 0x7b0 #define CSR_DPC 0x7b1 #define CSR_DSCRATCH 0x7b2 +#define CSR_DSCRATCH1 0x7b3 + +/* DCSR fields */ +#define DCSR_XDEBUGVER_SHIFT 28 +#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT) +#define DCSR_DEBUGVER(val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHI= FT) +#define DCSR_EXTCAUSE_SHIFT 24 +#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT) +#define DCSR_CETRIG BIT(19) +#define DCSR_PELP BIT(18) +#define DCSR_EBREAKVS BIT(17) +#define DCSR_EBREAKVU BIT(16) +#define DCSR_EBREAKM BIT(15) +#define DCSR_EBREAKS BIT(13) +#define DCSR_EBREAKU BIT(12) +#define DCSR_STEPIE BIT(11) +#define DCSR_STOPCOUNT BIT(10) +#define DCSR_STOPTIME BIT(9) +#define DCSR_CAUSE_SHIFT 6 +#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT) +#define DCSR_V BIT(5) +#define DCSR_MPRVEN BIT(4) +#define DCSR_NMIP BIT(3) +#define DCSR_STEP BIT(2) +#define DCSR_PRV_MASK 0x3u + +#define DCSR_CAUSE_EBREAK 1 +#define DCSR_CAUSE_TRIGGER 2 +#define DCSR_CAUSE_HALTREQ 3 +#define DCSR_CAUSE_STEP 4 +#define DCSR_CAUSE_RESET 5 +#define DCSR_CAUSE_GROUP 6 +#define DCSR_CAUSE_OTHER 7 =20 /* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03 diff --git a/target/riscv/cpu_cfg_fields.h.inc b/target/riscv/cpu_cfg_field= s.h.inc index a8c133d663..99b5529161 100644 --- a/target/riscv/cpu_cfg_fields.h.inc +++ b/target/riscv/cpu_cfg_fields.h.inc @@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd) BOOL_FIELD(ext_zimop) BOOL_FIELD(ext_zcmop) BOOL_FIELD(ext_ztso) +BOOL_FIELD(ext_sdext) BOOL_FIELD(ext_sdtrig) BOOL_FIELD(ext_smstateen) BOOL_FIELD(ext_sstc) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 870fad87ac..3e38c943e0 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3136,6 +3136,126 @@ static RISCVException write_mtval(CPURISCVState *en= v, int csrno, return RISCV_EXCP_NONE; } =20 +#if !defined(CONFIG_USER_ONLY) +static RISCVException sdext(CPURISCVState *env, int csrno) +{ + if (!riscv_cpu_cfg(env)->ext_sdext) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (!env->debug_mode && !env->debugger) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_visible_mask(CPURISCVState *env) +{ + target_ulong mask =3D (target_ulong)-1; + RISCVCPU *cpu =3D env_archcpu(env); + + if (!riscv_has_ext(env, RVH)) { + mask &=3D ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V); + } + if (!riscv_has_ext(env, RVS)) { + mask &=3D ~DCSR_EBREAKS; + } + if (!riscv_has_ext(env, RVU)) { + mask &=3D ~DCSR_EBREAKU; + } + if (!cpu->cfg.ext_zicfilp) { + mask &=3D ~DCSR_PELP; + } + if (!cpu->cfg.ext_smdbltrp) { + mask &=3D ~DCSR_CETRIG; + } + + return mask; +} + +static RISCVException read_dcsr(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->dcsr & dcsr_visible_mask(env); + return RISCV_EXCP_NONE; +} + +static target_ulong dcsr_writable_mask(CPURISCVState *env) +{ + target_ulong mask =3D DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU | + DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME | + DCSR_STEP | DCSR_PRV_MASK; + RISCVCPU *cpu =3D env_archcpu(env); + + mask |=3D DCSR_MPRVEN; + + if (riscv_has_ext(env, RVH)) { + mask |=3D DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V; + } + if (riscv_has_ext(env, RVS)) { + mask |=3D DCSR_EBREAKS; + } + if (riscv_has_ext(env, RVU)) { + mask |=3D DCSR_EBREAKU; + } + if (cpu->cfg.ext_zicfilp) { + mask |=3D DCSR_PELP; + } + if (cpu->cfg.ext_smdbltrp) { + mask |=3D DCSR_CETRIG; + } + + return mask; +} + +static RISCVException write_dcsr(CPURISCVState *env, int csrno, + target_ulong val, uintptr_t ra) +{ + target_ulong mask =3D dcsr_writable_mask(env); + target_ulong new_val =3D env->dcsr; + + new_val &=3D ~mask; + new_val |=3D val & mask; + new_val &=3D ~DCSR_XDEBUGVER_MASK; + new_val |=3D DCSR_DEBUGVER(4); + env->dcsr =3D new_val; + return RISCV_EXCP_NONE; +} + +static RISCVException read_dpc(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->dpc & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException write_dpc(CPURISCVState *env, int csrno, + target_ulong val, uintptr_t ra) +{ + env->dpc =3D val & get_xepc_mask(env); + return RISCV_EXCP_NONE; +} + +static RISCVException read_dscratch(CPURISCVState *env, int csrno, + target_ulong *val) +{ + int index =3D (csrno =3D=3D CSR_DSCRATCH1) ? 1 : 0; + + *val =3D env->dscratch[index]; + return RISCV_EXCP_NONE; +} + +static RISCVException write_dscratch(CPURISCVState *env, int csrno, + target_ulong val, uintptr_t ra) +{ + int index =3D (csrno =3D=3D CSR_DSCRATCH1) ? 1 : 0; + + env->dscratch[index] =3D val; + return RISCV_EXCP_NONE; +} +#endif /* !CONFIG_USER_ONLY */ + /* Execution environment configuration setup */ static RISCVException read_menvcfg(CPURISCVState *env, int csrno, target_ulong *val) @@ -6297,6 +6417,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_TDATA3] =3D { "tdata3", debug, read_tdata, write_tdata = }, [CSR_TINFO] =3D { "tinfo", debug, read_tinfo, write_ignore = }, [CSR_MCONTEXT] =3D { "mcontext", debug, read_mcontext, write_mcontex= t }, +#if !defined(CONFIG_USER_ONLY) + [CSR_DCSR] =3D { "dcsr", sdext, read_dcsr, write_dcsr }, + [CSR_DPC] =3D { "dpc", sdext, read_dpc, write_dpc }, + [CSR_DSCRATCH] =3D { "dscratch0", sdext, read_dscratch, write_dscrat= ch }, + [CSR_DSCRATCH1] =3D { "dscratch1", sdext, read_dscratch, write_dscrat= ch }, +#endif =20 [CSR_MCTRCTL] =3D { "mctrctl", ctr_mmode, NULL, NULL, rmw_xctrc= tl }, [CSR_SCTRCTL] =3D { "sctrctl", ctr_smode, NULL, NULL, rmw_xctrc= tl }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 62c51c8033..52264cf047 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig =3D { VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata2, RISCVCPU, RV_MAX_TRIGGERS), VMSTATE_UINTTL_ARRAY(env.tdata3, RISCVCPU, RV_MAX_TRIGGERS), + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sdext =3D { + .name =3D "cpu/sdext", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D sdtrig_needed, + .post_load =3D sdtrig_post_load, + .fields =3D (const VMStateField[]) { + VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3), + VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3), + VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3), VMSTATE_END_OF_LIST() } }; @@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu =3D { &vmstate_ctr, &vmstate_sstc, &vmstate_sdtrig, + &vmstate_sdext, NULL } }; --=20 2.52.0 From nobody Sun Feb 8 09:32:48 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 From nobody Sun Feb 8 09:32:48 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=1768897509; cv=none; d=zohomail.com; s=zohoarc; b=IneuBlUDRg/4nxwW7fIeavAmW1emhEyEilUhoy3U0b1iagcUgFWiSrbTtA4BFDvxNjgqpkm2DwQ4IlYhkjzUWaRneF8o1GOU48hDyJ2qrlQ4z9ZMldcY7zsuzoHOaunR3CW8FPLYGMFeSCS0i7nL9ZnU3xpmBwSetmW1LE95tgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897509; 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=i1r38n5/smozxAk3MfAzmduskm1/QEC2/wzUy2JGan4=; b=cv3hB81H5dMTK2g4km+3RJaVLtMqpluHc7l7dulFGRenGtnAQ9f+Nad2/x3b5jRRmydchj5EPu+5PTFjo6g7QvSvj+WXt2/ZqhLPie0bt7m5GLKeREhF8FXI9XH+MuJTruUMlnEi0lzEgKfP0Gp88Repu+niJM0GX2fgSyy3JvA= 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 1768897509137211.03353553306363; Tue, 20 Jan 2026 00:25:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72Q-0005VT-SX; Tue, 20 Jan 2026 03:24:34 -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 1vi72O-0005QY-ME for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:32 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72M-00034V-Vh for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:32 -0500 Received: by mail-pg1-x541.google.com with SMTP id 41be03b00d2f7-c551edc745eso2158816a12.2 for ; Tue, 20 Jan 2026 00:24:30 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897469; x=1769502269; 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=i1r38n5/smozxAk3MfAzmduskm1/QEC2/wzUy2JGan4=; b=QGR3kgRYmQZh7nGWbs5zjaxM3qBSv1e+c6ZSoEtiwvp3lUMqPO7Mp/TbpyMrH0mYtj vdC6b6hQa6JevoJ7MAcP7Paa9JImS4e+p/7gfJHk2DktrA+2P9EX4T85sbLBXrYrH2qt 61oQVkoT6B8gq05YqIc0TU5stYVRU+L29gdKrWlb8Ycd+n0GVZHeAP0BxxeewbUHNeIu GoaGwSHd2PrPvMXZJ8+H6tTtwb5cbExqM5sR0QBxs2brlOpG2z4i47d9JtddA0LoqTHL 6DxjbWwVJ0VmIY3vJpfY4JrZjiJBJa5UK8RH+mTb5BPDbCqokp3CZrH8dGB4NFhVn4fK ekGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897469; x=1769502269; 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=i1r38n5/smozxAk3MfAzmduskm1/QEC2/wzUy2JGan4=; b=wFtRXtY0/Yeq/ERbWacliRa3V113SR5CD3b8tJTCeIY5fR/Ylv1HMgCM4iPt9Eu8wU 6iqgFXVwDVK3Y9NTRA39MXOOO7y1tlcBhvSODSIHUzzAfzwg0/7WQCmQGb4pvsdPAzLh drdhWvTFrsZNPuuuGUJvmlBcwz2lMXwP7L/t1i2TOnANMtTK1sHTJo12+bnfZxksmdXv SS1PHF2dmg9e400jo2LR3HxBpu8xlYB5mFjzX2x0X/8jyvmd6RcQlzaxFfftCJhDIxyT ajVwg20mhlHt0MhE+mUO9eAQ0lijcDaQAPdQMGJfRbtFEiPFKSlB8LTFyajQIPbY8HJo T5yA== X-Gm-Message-State: AOJu0YxZ5VYYe+JoLRvSaPkLUyEyR4pXwpxJqWFtWCo8hmJ7Di6QwXUu sSnKo6lgapvM+sShbaVkOGMuOJ78YTcokMktj4wTnQy5MdEv7QzxVp9w X-Gm-Gg: AZuq6aKtK/Nht+I1pTRmRLcXU9MP4m9jDh3Ef6OoK/Ih6SgRY8A92a05e+y1Cg1g//C 5wAWGh4obXu2Lf9DdjWop+nx7FKWp/J/MNZqK2hwlLjpoMHdyfre+S5+Pr0lKTlbnlKmKUJhe5e Ce89CK3fSwXl0reF7+3DJi6SZvuc7fKfNRwxO8MsfpOzIUwwNt5EoIo888VJfJeeQDK+jUW8my5 bZMDSUHywQGoMx6h+FbMT/oJL0Xu1vpRZY5gKiK0grGhL3Dv2hSknHhJAVHy9RDV6R+p2WppGaA F/lGm99Cd5fAt2Iipxv6fUFcwbN3HTXifpFFJmVmbv8PpaWsKDgwhKUOTr0xpaYVU80yRCcW+Zt TdWTJnFCWguZTiZIbH5eHA2PibdY4Tbe2VNDVRknKXrB8ASH5GwaArdjdg7Na9l6FFebwvzWeyv EOGt/IIzXKgenMUOEOXIncoKWsJAUuZrCxdSrTGUyRDllANfmAJ1qQI4ZDhA== X-Received: by 2002:a17:90a:d88b:b0:32e:a8b7:e9c with SMTP id 98e67ed59e1d1-352c40533cbmr1053201a91.29.1768897469525; Tue, 20 Jan 2026 00:24:29 -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 4/7] target/riscv: add dret instruction Date: Tue, 20 Jan 2026 16:24:00 +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::541; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pg1-x541.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: 1768897518209154100 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Add DRET decode/translate and a helper to leave Debug Mode and return to dpc. Executing DRET outside Debug Mode raises illegal instruction. Signed-off-by: Chao Liu --- target/riscv/helper.h | 1 + target/riscv/insn32.decode | 1 + target/riscv/insn_trans/trans_privileged.c.inc | 18 ++++++++++++++++++ target/riscv/op_helper.c | 16 ++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index 162303fb6c..af6f3f4fd5 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -131,6 +131,7 @@ DEF_HELPER_6(csrrw_i128, tl, env, int, tl, tl, tl, tl) #ifndef CONFIG_USER_ONLY DEF_HELPER_1(sret, tl, env) DEF_HELPER_1(mret, tl, env) +DEF_HELPER_1(dret, tl, env) DEF_HELPER_1(mnret, tl, env) DEF_HELPER_1(ctr_clear, void, env) DEF_HELPER_1(wfi, void, env) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index c58223ebd8..d04b192ad2 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -118,6 +118,7 @@ sctrclr 000100000100 00000 000 00000 1110011 uret 0000000 00010 00000 000 00000 1110011 sret 0001000 00010 00000 000 00000 1110011 mret 0011000 00010 00000 000 00000 1110011 +dret 0111101 10010 00000 000 00000 1110011 wfi 0001000 00101 00000 000 00000 1110011 sfence_vma 0001001 ..... ..... 000 00000 1110011 @sfence_vma =20 diff --git a/target/riscv/insn_trans/trans_privileged.c.inc b/target/riscv/= insn_trans/trans_privileged.c.inc index 8a62b4cfcd..f8641b1977 100644 --- a/target/riscv/insn_trans/trans_privileged.c.inc +++ b/target/riscv/insn_trans/trans_privileged.c.inc @@ -125,6 +125,24 @@ static bool trans_mret(DisasContext *ctx, arg_mret *a) #endif } =20 +static bool trans_dret(DisasContext *ctx, arg_dret *a) +{ +#ifndef CONFIG_USER_ONLY + if (!ctx->cfg_ptr->ext_sdext) { + return false; + } + decode_save_opc(ctx, 0); + translator_io_start(&ctx->base); + gen_update_pc(ctx, 0); + gen_helper_dret(cpu_pc, tcg_env); + exit_tb(ctx); /* no chaining */ + ctx->base.is_jmp =3D DISAS_NORETURN; + return true; +#else + return false; +#endif +} + static bool trans_mnret(DisasContext *ctx, arg_mnret *a) { #ifndef CONFIG_USER_ONLY diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 6ccc127c30..99736bbebb 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -454,6 +454,22 @@ target_ulong helper_mret(CPURISCVState *env) return retpc; } =20 +target_ulong helper_dret(CPURISCVState *env) +{ + uintptr_t ra =3D GETPC(); +#ifdef CONFIG_USER_ONLY + riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, ra); + return 0; +#else + if (!riscv_cpu_cfg(env)->ext_sdext || !env->debug_mode) { + riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, ra); + } + target_ulong retpc =3D env->dpc & get_xepc_mask(env); + riscv_cpu_leave_debug_mode(env); + return retpc; +#endif +} + target_ulong helper_mnret(CPURISCVState *env) { target_ulong retpc =3D env->mnepc; --=20 2.52.0 From nobody Sun Feb 8 09:32:48 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=1768897524; cv=none; d=zohomail.com; s=zohoarc; b=OaoKHhlW6ceUoMdluLsI44OW79uOHm1pjSS2xEGCj/AJYa1UOzhrQILotMu30En0jFXE+72XIgmAJgY7idbr8DHyYnkHNWYFazNHkerDcR1zeEIA2Py1LG1vjseVjr98ZGsgf6NIoEjtvbepsON1vFk//Bush+epFyXHNhrkI8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897524; 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=C+69Ad3lFG8QXRNC255LKiHQUR/HJ62o4vX0lEwMgoU=; b=R4glTP/IC9+aBTLKlQXt9cbWw2mt1faE8gE4Ing4wKaJU7swYtO/CXpXeLQ06duj6pv1UjwRjiuiwlOxaQLR2ajLxnb03FnLAFRDbJim+kPko4og30vHD7LnG5ZSxxlfXuD2OVW6Sx2ghVK57xXpHo/4pHwTQ9mfejMqEgzqDeA= 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 1768897524571730.6358739999184; Tue, 20 Jan 2026 00:25:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72T-0005bZ-1v; Tue, 20 Jan 2026 03:24:37 -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 1vi72R-0005X9-CO for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:35 -0500 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72P-00035D-Ik for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:35 -0500 Received: by mail-pj1-x1042.google.com with SMTP id 98e67ed59e1d1-34ab8e0df53so3830180a91.3 for ; Tue, 20 Jan 2026 00:24:33 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897472; x=1769502272; 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=C+69Ad3lFG8QXRNC255LKiHQUR/HJ62o4vX0lEwMgoU=; b=jIsK3as1zSXKJL9ugKvIS12ZWKscJcdNfw+sKJnGnjYeyfWPZfcRc0H+NSezi6ZoGc JpoAZfZ1nOyqhOz0e0f8LdTqfzrdx0ELdeocU1Jk9n8WQ3m38ofNuh/B6joxgUXHcYfE wYkdN/fblx1eVq2v7/5KvBSCcC3KcUNY3aBFa9rURzkMBNNz3alQdBsngj20LyYZkHHv N4ic018rB2HlV4DBUFd3vitzY4Ib/9mwhoCgPS14dPOd65UMKMYDz+1VEOpf/pVS+ic5 tM2BoFMxAWTk65IXyGMcPlSyF9z74KlzfTwRiLPLlGE8lT9o1eP8wNv5MrI5uCOqS6c4 mBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897472; x=1769502272; 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=C+69Ad3lFG8QXRNC255LKiHQUR/HJ62o4vX0lEwMgoU=; b=I10lUJG1SUcA2C594J/Ol+Co6l6Y+Bjve+L7GVTzAVxyGJgVdBZ93UoT5JFuktp+6b Wn9uXeR0gk3U/OKf/0o/GldHAOJB0i7ak1frdHjkpafxnHE95evqvL4HAgxidt6qGUQQ 1U+v5ssWac5HE09QoEYaBa2EVsoWd0IPdXgsoQ24Hl4MB09gr9xsWSffcqNVNBU4MJ2z KKdCSMUCyQ9CRnlPGkZbpdzvSvt+RGq9ztV+ICejVw0WOGw/BMRZ1jqnZ/NEyXRaIA3a YArm1aHLBGxK0AQCITWp7+5m+IKrPl26wiIYAE253N+f0hNkOJrirkIvM9lcQUNl/T1q WPeQ== X-Gm-Message-State: AOJu0YyMZ1sWLp6UfqaOyO59j1cOerTSmnZC1Pa8irMZetmJz84cCqvm RrdpiOH19BX77rW97eE/PLLX25fBowQKykUo4K2f1heFeOgvIjeBOrWgoAUZdkybnHHnMg== X-Gm-Gg: AZuq6aK5NU2MkbTQoHKm8jqTobQI20Fl0QB9u4zoll9geJAwwBB/7fJEKko+mdCFLXE RFiSebNL+T3CBbbwwcy3jyeUVOuaQsOJsdabd9O6aQ7xGsfBHAUNMpZhZRBlrzxQhxGrVKbLZ9V x/Bpk4W/heSqop3PqZ2qqRlQDAe+uFlFlbv9RGEIY2pNS/c++7yt9pubK9UXZqGLhk+LClC0X/o 0af/1ZrqKdqFsF9dJfKpeFAIx1KfRPrRz7JEMX3lGC8jaeCLSQ+eqXDEtTVBwyU7/ZEN58Jbm7v Kqponh1G6M7jXuwPu4yN2n7s2aYBCM1oFyiBUT6GJAieKvcIwh2fujdI6EdGWd/MmPG1Kb9cf6d Y8BJke9xCkcft2Xa/u/npC4ClbQB2LYd+yxfLjdaIUV/Vf6sfLphm6xZWyqLnYiz0bYHF1yAzm1 xl/2mLgWwISjpzpIIJSPmN/P4qysKKvIW5Rsqqtg4dyJgbkTZw01Li8lHhfnKXEBAf4tfR X-Received: by 2002:a17:90a:d44b:b0:34c:7d65:e4a with SMTP id 98e67ed59e1d1-35272fc12f7mr10916544a91.31.1768897472269; Tue, 20 Jan 2026 00:24:32 -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 5/7] target/riscv: add sdext enter Debug Mode on ebreak Date: Tue, 20 Jan 2026 16:24:01 +0800 Message-ID: <18e13c6d64d88f53b7cc63387bdc50f280435916.1768892407.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::1042; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pj1-x1042.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: 1768897526795154100 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Route EBREAK via helper_sdext_ebreak. If Sdext is enabled and the matching dcsr.ebreak* bit is set, enter Debug Mode with cause=3Debreak and stop with EXCP_DEBUG. Otherwise keep the normal breakpoint trap. Signed-off-by: Chao Liu --- target/riscv/helper.h | 1 + .../riscv/insn_trans/trans_privileged.c.inc | 6 ++-- target/riscv/op_helper.c | 36 +++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index af6f3f4fd5..bbfe7548d2 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -141,6 +141,7 @@ DEF_HELPER_1(tlb_flush_all, void, env) DEF_HELPER_4(ctr_add_entry, void, env, tl, tl, tl) /* Native Debug */ DEF_HELPER_1(itrigger_match, void, env) +DEF_HELPER_2(sdext_ebreak, void, env, tl) #endif =20 /* Hypervisor functions */ diff --git a/target/riscv/insn_trans/trans_privileged.c.inc b/target/riscv/= insn_trans/trans_privileged.c.inc index f8641b1977..377f551bb3 100644 --- a/target/riscv/insn_trans/trans_privileged.c.inc +++ b/target/riscv/insn_trans/trans_privileged.c.inc @@ -68,9 +68,9 @@ static bool trans_ebreak(DisasContext *ctx, arg_ebreak *a) if (pre =3D=3D 0x01f01013 && ebreak =3D=3D 0x00100073 && post =3D=3D 0= x40705013) { generate_exception(ctx, RISCV_EXCP_SEMIHOST); } else { - tcg_gen_st_tl(tcg_constant_tl(ebreak_addr), tcg_env, - offsetof(CPURISCVState, badaddr)); - generate_exception(ctx, RISCV_EXCP_BREAKPOINT); + gen_update_pc(ctx, 0); + gen_helper_sdext_ebreak(tcg_env, tcg_constant_tl(ebreak_addr)); + ctx->base.is_jmp =3D DISAS_NORETURN; } return true; } diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 99736bbebb..dfe5388ab7 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -470,6 +470,42 @@ target_ulong helper_dret(CPURISCVState *env) #endif } =20 +void helper_sdext_ebreak(CPURISCVState *env, target_ulong pc) +{ +#ifndef CONFIG_USER_ONLY + CPUState *cs =3D env_cpu(env); + bool enter_debug =3D false; + + if (riscv_cpu_cfg(env)->ext_sdext && !env->debug_mode) { + if (env->virt_enabled) { + if (env->priv =3D=3D PRV_S) { + enter_debug =3D env->dcsr & DCSR_EBREAKVS; + } else if (env->priv =3D=3D PRV_U) { + enter_debug =3D env->dcsr & DCSR_EBREAKVU; + } + } else { + if (env->priv =3D=3D PRV_M) { + enter_debug =3D env->dcsr & DCSR_EBREAKM; + } else if (env->priv =3D=3D PRV_S) { + enter_debug =3D env->dcsr & DCSR_EBREAKS; + } else if (env->priv =3D=3D PRV_U) { + enter_debug =3D env->dcsr & DCSR_EBREAKU; + } + } + } + + env->badaddr =3D pc; + + if (enter_debug) { + riscv_cpu_enter_debug_mode(env, pc, DCSR_CAUSE_EBREAK); + cs->exception_index =3D EXCP_DEBUG; + cpu_loop_exit_restore(cs, GETPC()); + } + + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, GETPC()); +#endif +} + target_ulong helper_mnret(CPURISCVState *env) { target_ulong retpc =3D env->mnepc; --=20 2.52.0 From nobody Sun Feb 8 09:32:48 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=1768897533; cv=none; d=zohomail.com; s=zohoarc; b=FFXAku20UB81O4gSLblqiC4/yrfOI/iCnOEAfQqdBW6aFEbIlCGmDOrVcGn1U4NPeX56lVxi3dIrSJZPYW102ri53YDyNOUau7gCYsXbPHJLOxr+1B28G9gWK9nFyuDw0k7P6Yjqa674icO0Rz6SXg9iyNOMImAhjkFwMOlLIvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897533; 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=2vWZi5duXXkyD/HWruu4ist4eS//a3QiftKxssXv66g=; b=dOIANZqOxg/VvdUZ/8HBxK4iUHml6y5QcioSqi+T2g3oMspXvIL8JtZbAzwR3LFCmlQ15YNBlXLSFSh7gknq5JTCLd6QodRObunLGoHUuvmd2UdsFoevtWFxNkJUlHhXhwkxl4pa1FtEooepWzaIiyKKECr8w/yyU6eXMcTAKnI= 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 1768897533446422.16445299029135; Tue, 20 Jan 2026 00:25:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72W-0005h1-9d; Tue, 20 Jan 2026 03:24:40 -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 1vi72U-0005dg-DF for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:38 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72S-00035a-Ar for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:38 -0500 Received: by mail-pg1-x541.google.com with SMTP id 41be03b00d2f7-c3e921afad1so2116836a12.1 for ; Tue, 20 Jan 2026 00:24:36 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897475; x=1769502275; 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=2vWZi5duXXkyD/HWruu4ist4eS//a3QiftKxssXv66g=; b=A75TnMhDDgnvr1qyzX9c5OaUq4shz5VeM02y8kQ319tDDxNrSE0woUaONkvDsIUUj7 mePZMnAUYoszT++vdLu0WeimAxj1Mlk22iLqohBQB8UHBb1x6g4akQEhj25Z8YiKz1DF I8OTCQraBW1EpA5G8ZXRMeATBB7AzfJCwfGtahfZqRoGy9C1WMoiiWjwxh7eoDNFMsAx 8xWYQDRTNdvsRryPEnqHgZ5tgcgKFGOrcCkzbiRa0W/j0sSd4l0vHHr+JPM4hmKQX+Xd Mc2mSQ1xaCN0vGmCE1i6J+ffCnuHzOr2oDpNUY3Qa6cCs4musMM7/JG61NCeLrQiT1pk qQ+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897475; x=1769502275; 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=2vWZi5duXXkyD/HWruu4ist4eS//a3QiftKxssXv66g=; b=KKUprCCbC5vbqhMtr1KVZaSU9Gnr51uq+YDcgf6FO1qt+QdWCr4vEjP/bUHH0iQKUE ZYNQEBWG1JPTLLAOpsCrVymYmmtdL+tYvVHNFeh/NohWuuU9f25E7edXbIiKb/ONaW9F 57U7druoywCDTubNx8/W694hH8AA9ry5bWxfmsxypC+o08jAlpwt0dIcB5OG+0KC0O4k YgDPw5+UwN4n6Pi19laIVyu8s2nr1+48mJXQiecthKAkSROKNQpS7Cw18vWnAsoGeU1F 96ateVUCVSHmUC8wLmVG1VKR6YmCSYMuQ3jpHPyxvemo6BsAbfKps5cC1p/AU6fIbJbd s5DA== X-Gm-Message-State: AOJu0YzqkAG7dOh7OKVM0S08xa9aKKzpw6rMysxd9N5x7DnTAuIZB573 TzXot9oov/WGcd4O9CvLDuzi4/qgM1D278HA76uwJOCmil2YAEezdUZEF5n6cG8qIHG8oQ== X-Gm-Gg: AZuq6aLrhIl+d9HVphDrq5vizPN/1/PVj0CJkLMUuFVDynFKlrUpo4kveYh4aJNfPs7 /rFLzqVIjy+DDpH4aeLjwKWvnJcKU00MzFkgAwOEY6+9Dd4idbwGnL2wN+zfR86VLHXy5jZAoah q/TRn0T6B4hg2FBWZRBug2yYV8iFH9L7FlJezJwtktHn0xRP4I7Kamz9YBXz6oMryGbgr+M5vB/ vuIGgrLyIzsJPgZwrYZXDSazsCKPKXQR2VqoCnXyH6egH3iLEbvtxuuQMnlSVFTQJ67N/PY8Fn2 v74gBdONt9fPMfXiIbXSOvTf6njYvQK1nsK69eF/Yle7GWPPurzVoj3o+pQ0f/NNktA2SGyCwHR uh2zlxdvR/oDJadoyvHy4au3LrtjoE8SlUDNA3ZDnH3SmiW9x9u7fZZ19kjCqNDg0Yy2kpNpufN jkB5CxA/DWO5KRXvyHFqfI115QfAWWfUgItPrCywNAhsH3NxxykujjL7qlbg== X-Received: by 2002:a17:90b:56c8:b0:341:2150:4856 with SMTP id 98e67ed59e1d1-352c404682cmr1203860a91.17.1768897475019; Tue, 20 Jan 2026 00:24:35 -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 6/7] target/riscv: add sdext single-step support Date: Tue, 20 Jan 2026 16:24:02 +0800 Message-ID: <07aaa807546ca59e185a3e5c0ad56cebf2165014.1768892407.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::541; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pg1-x541.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: 1768897535451158500 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Use a TB flag when dcsr.step is set (and we are not in Debug Mode). When the flag is on, build 1-insn TBs and do not chain to the next TB. Add a TB-exit helper that enters Debug Mode with cause=3Dstep and sets dpc to the next pc, then stops with EXCP_DEBUG. If dcsr.stepie is 0, do not take interrupts while stepping. Treat WFI as a nop so the hart does not sleep during a step. PS: This patch references Max Chou's handling of ext_tb_flags. https://lore.kernel.org/qemu-devel/20260108132631.9429-6-max.chou@sifive.co= m/ Signed-off-by: Chao Liu --- include/exec/translation-block.h | 4 ++-- target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 6 ++++++ target/riscv/helper.h | 1 + target/riscv/op_helper.c | 20 ++++++++++++++++++++ target/riscv/tcg/tcg-cpu.c | 5 +++++ target/riscv/translate.c | 15 +++++++++++++-- 7 files changed, 49 insertions(+), 4 deletions(-) diff --git a/include/exec/translation-block.h b/include/exec/translation-bl= ock.h index 40cc699031..ee15608c89 100644 --- a/include/exec/translation-block.h +++ b/include/exec/translation-block.h @@ -64,8 +64,8 @@ struct TranslationBlock { * x86: the original user, the Code Segment virtual base, * arm: an extension of tb->flags, * s390x: instruction data for EXECUTE, - * sparc: the next pc of the instruction queue (for delay slots). - * riscv: an extension of tb->flags, + * sparc: the next pc of the instruction queue (for delay slots), + * riscv: an extension of tb->flags. */ uint64_t cs_base; =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 62732957a4..0d6b70c9f0 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -712,6 +712,8 @@ FIELD(TB_FLAGS, PM_SIGNEXTEND, 31, 1) =20 FIELD(EXT_TB_FLAGS, MISA_EXT, 0, 32) FIELD(EXT_TB_FLAGS, ALTFMT, 32, 1) +/* sdext single-step needs a TB flag to build 1-insn TBs */ +FIELD(EXT_TB_FLAGS, SDEXT_STEP, 33, 1) =20 #ifdef TARGET_RISCV32 #define riscv_cpu_mxl(env) ((void)(env), MXL_RV32) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 05a991fccc..2ca6040d20 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -638,6 +638,12 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interr= upt_request) if (interrupt_request & mask) { RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; + + if (cpu->cfg.ext_sdext && !env->debug_mode && + (env->dcsr & DCSR_STEP) && !(env->dcsr & DCSR_STEPIE)) { + return false; + } + int interruptno =3D riscv_cpu_local_irq_pending(env); if (interruptno >=3D 0) { cs->exception_index =3D RISCV_EXCP_INT_FLAG | interruptno; diff --git a/target/riscv/helper.h b/target/riscv/helper.h index bbfe7548d2..cadb97f637 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -141,6 +141,7 @@ DEF_HELPER_1(tlb_flush_all, void, env) DEF_HELPER_4(ctr_add_entry, void, env, tl, tl, tl) /* Native Debug */ DEF_HELPER_1(itrigger_match, void, env) +DEF_HELPER_1(sdext_step, void, env) DEF_HELPER_2(sdext_ebreak, void, env, tl) #endif =20 diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index dfe5388ab7..6fe29ce905 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -470,6 +470,22 @@ target_ulong helper_dret(CPURISCVState *env) #endif } =20 +void helper_sdext_step(CPURISCVState *env) +{ +#ifndef CONFIG_USER_ONLY + CPUState *cs =3D env_cpu(env); + + if (!riscv_cpu_cfg(env)->ext_sdext || env->debug_mode || + !(env->dcsr & DCSR_STEP)) { + return; + } + + riscv_cpu_enter_debug_mode(env, env->pc, DCSR_CAUSE_STEP); + cs->exception_index =3D EXCP_DEBUG; + cpu_loop_exit_restore(cs, GETPC()); +#endif +} + void helper_sdext_ebreak(CPURISCVState *env, target_ulong pc) { #ifndef CONFIG_USER_ONLY @@ -604,6 +620,10 @@ void helper_wfi(CPURISCVState *env) (prv_u || (prv_s && get_field(env->hstatus, HSTATUS_VTW))))= { riscv_raise_exception(env, RISCV_EXCP_VIRT_INSTRUCTION_FAULT, GETP= C()); } else { + if (riscv_cpu_cfg(env)->ext_sdext && !env->debug_mode && + (env->dcsr & DCSR_STEP)) { + return; + } cs->halted =3D 1; cs->exception_index =3D EXCP_HLT; cpu_loop_exit(cs); diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index c6beac3d50..9166ec0404 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -193,6 +193,11 @@ static TCGTBCPUState riscv_get_tb_cpu_state(CPUState *= cs) flags =3D FIELD_DP32(flags, TB_FLAGS, PM_SIGNEXTEND, pm_signext); =20 ext_flags =3D FIELD_DP64(ext_flags, EXT_TB_FLAGS, MISA_EXT, env->misa_= ext); +#ifndef CONFIG_USER_ONLY + if (cpu->cfg.ext_sdext && !env->debug_mode && (env->dcsr & DCSR_STEP))= { + ext_flags =3D FIELD_DP64(ext_flags, EXT_TB_FLAGS, SDEXT_STEP, 1); + } +#endif =20 return (TCGTBCPUState){ .pc =3D env->xl =3D=3D MXL_RV32 ? env->pc & UINT32_MAX : env->pc, diff --git a/target/riscv/translate.c b/target/riscv/translate.c index bf403785b5..f2f12fe269 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -111,6 +111,8 @@ typedef struct DisasContext { bool ztso; /* Use icount trigger for native debug */ bool itrigger; + /* Enter Debug Mode after next instruction (sdext single-step). */ + bool sdext_step; /* FRM is known to contain a valid value. */ bool frm_valid; bool insn_start_updated; @@ -293,6 +295,9 @@ static void lookup_and_goto_ptr(DisasContext *ctx) if (ctx->itrigger) { gen_helper_itrigger_match(tcg_env); } + if (ctx->sdext_step) { + gen_helper_sdext_step(tcg_env); + } #endif tcg_gen_lookup_and_goto_ptr(); } @@ -303,6 +308,9 @@ static void exit_tb(DisasContext *ctx) if (ctx->itrigger) { gen_helper_itrigger_match(tcg_env); } + if (ctx->sdext_step) { + gen_helper_sdext_step(tcg_env); + } #endif tcg_gen_exit_tb(NULL, 0); } @@ -316,7 +324,8 @@ static void gen_goto_tb(DisasContext *ctx, unsigned tb_= slot_idx, * Under itrigger, instruction executes one by one like singlestep, * direct block chain benefits will be small. */ - if (translator_use_goto_tb(&ctx->base, dest) && !ctx->itrigger) { + if (translator_use_goto_tb(&ctx->base, dest) && + !ctx->itrigger && !ctx->sdext_step) { /* * For pcrel, the pc must always be up-to-date on entry to * the linked TB, so that it can use simple additions for all @@ -1351,6 +1360,7 @@ static void riscv_tr_init_disas_context(DisasContextB= ase *dcbase, CPUState *cs) ctx->bcfi_enabled =3D FIELD_EX32(tb_flags, TB_FLAGS, BCFI_ENABLED); ctx->fcfi_lp_expected =3D FIELD_EX32(tb_flags, TB_FLAGS, FCFI_LP_EXPEC= TED); ctx->fcfi_enabled =3D FIELD_EX32(tb_flags, TB_FLAGS, FCFI_ENABLED); + ctx->sdext_step =3D FIELD_EX64(ext_tb_flags, EXT_TB_FLAGS, SDEXT_STEP); ctx->zero =3D tcg_constant_tl(0); ctx->virt_inst_excp =3D false; ctx->decoders =3D cpu->decoders; @@ -1401,7 +1411,8 @@ static void riscv_tr_translate_insn(DisasContextBase = *dcbase, CPUState *cpu) =20 /* Only the first insn within a TB is allowed to cross a page boundary= . */ if (ctx->base.is_jmp =3D=3D DISAS_NEXT) { - if (ctx->itrigger || !translator_is_same_page(&ctx->base, ctx->bas= e.pc_next)) { + if (ctx->itrigger || ctx->sdext_step || + !translator_is_same_page(&ctx->base, ctx->base.pc_next)) { ctx->base.is_jmp =3D DISAS_TOO_MANY; } else { unsigned page_ofs =3D ctx->base.pc_next & ~TARGET_PAGE_MASK; --=20 2.52.0 From nobody Sun Feb 8 09:32:48 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=1768897559; cv=none; d=zohomail.com; s=zohoarc; b=jRu+bzsVWxKKTp5e04BDZeM68bF+XxndB294Bae4aKzgrpPoSjfcPWUixRpO3aTgT6KxYRNLQIWaHDrNbB3rYcNTlSY2UizgiD0vyU2mZDUWDnVqhMFutAsaw39x/Fu8xcFEDRx5vL5S3RMCOt8R4lNvn07MvhvR/hbFNZUjMxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768897559; 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=O7WkHiVNJCD9TWHbxn4o1h9ogKNZelcybfMD61+3Zog=; b=AGT0tyg7rNLElpx1x2PNQW784NZ8szrNRXFN2cA/9lyFBjbUdugGj9yniKgQuTDWkNi5ulS+0qAijdAyLuH2IoQMj7O9uLyiD7+s14eSFogwGCrZm8CIwMRpkMfWDo7y4g2RMvgaW+C44jolViKRaVWyJ/h9oGCL68jT+ezy0Q4= 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 1768897559357462.05801732036093; Tue, 20 Jan 2026 00:25:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vi72Y-0005oi-Vb; Tue, 20 Jan 2026 03:24:43 -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 1vi72W-0005jg-U6 for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:40 -0500 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vi72V-00035w-3F for qemu-devel@nongnu.org; Tue, 20 Jan 2026 03:24:40 -0500 Received: by mail-pj1-x1043.google.com with SMTP id 98e67ed59e1d1-34c3cb504efso3420634a91.2 for ; Tue, 20 Jan 2026 00:24:38 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 00:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768897478; x=1769502278; 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=O7WkHiVNJCD9TWHbxn4o1h9ogKNZelcybfMD61+3Zog=; b=Eo23jj3nmhIwhibaxhvpoFMC8vBnF05AmrlCfMVEBFsMf3wUzq/C+EuU2vvvIRfS73 FE1ZhLGZc6DTA9KOgvtHn0wdK5yQhGQY5L9tdUxKrbSkZjsQMQBonqK7oeS55H0+8Vrt xjJIybjSvunuPRDXpJ09ou7qS1zz+fi4C3Lw7romnEaYdCZurV2oe3rvkJUklinxt1h/ VejBOHnxjqZcxxQT0hEqZQzdsVH9/EEPjKA/ZkGb639mAqvKW9qc+TTDGnVnxhTbzNk1 GC2fJ2iwJgrY8FZVoDH4XdxOx2Hc2qzy7ahG238IEUpUYuJefq5ZMgewPd4yVJdblAeJ 7VHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768897478; x=1769502278; 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=O7WkHiVNJCD9TWHbxn4o1h9ogKNZelcybfMD61+3Zog=; b=EgoYXaZaZfCeJA9ZXUWgaHQ5q/AnmewZFJN5/UzyBWNp3kKpGvMQOVuPT5JXHdeAVo gLonstiv6tY284KsC1Agd06xHJMkflcSrfR40EASJvjUU3j7G2QbWCFSjB1cX2k51YhL h+1RS+MfsoqDBlJvIYwtkt9ksQeoQu/m5mByggxPhFvN6EEfzieJoo+/v2J+0C6hjHmp 8/AV5k2OI1b0R4SuzJs7n6XGZBm6lFX6qIYhTMlzipBWaGDOTCoyAEFuqpPrGAuD0L4X qSAxti3gT3n5ywdJu5yVk8fyAHWu1LWSbpcrQntf8/d8MJK0vrZ1Q8NwVnV1yyudrLaS vojw== X-Gm-Message-State: AOJu0YyqwtXfLfxulP70VV3khL2agcgayJBcKcLlBhiq6Q42finFx6+5 OsL89XWqop2l3VMT9WYuteoK/rv9FklhuUX4zeztLjyFNgn7QxtNESQH X-Gm-Gg: AZuq6aJdWX5BJfyR9a+IWju806c17Up5zfpg2yfxlO55VDJrTQ9KWz4Nwf1dAPTCJGn EeP6DhX+hgm9e4qj8daUEB5aphjx9PXy6zYsM2HMMKed4mLXUu09oLHe0HT8fXkP3PAFzPUVEx7 Ki3qN2cpTNC2mddVIrdxXJ8DrWsOVLFstirU773aGRy6YUXg0Laq8RPVCJRExmOOClEU0K6Kgbo 2HW1iO7PMkq24YBx0um2U6zKTTwxzz+z+woGoRAk94eiTwSO3TF4PioIv47EqaFqpw5lLb2g4zR t4DtYC039AbBt2I5n+gyZHZ9Ky1ad/YEhK+Q90LKjYh9ajD/SpzggGd3BhGN057oo9DuSHm19yy x+p3+XYsVsitgyePWmuYh64ws9OrmqBRUGi4GgHlo4HxKOBN53VHpQ0z+rgrc6hMLj5axpX0Ih3 Rtk9YKDM+TJtK/sqIrVrHVzem6dUm3qltQ15Q6MF6+5CaH8Bg1p1h20sQKSg== X-Received: by 2002:a17:90b:51ca:b0:34a:8c77:d386 with SMTP id 98e67ed59e1d1-3527317dae3mr12444629a91.9.1768897477740; Tue, 20 Jan 2026 00:24:37 -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 7/7] target/riscv: add sdtrig trigger action=debug mode Date: Tue, 20 Jan 2026 16:24:03 +0800 Message-ID: <585e99a7bfeb4857c7da2b06891d430da70d9ef6.1768892407.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::1043; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pj1-x1043.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: 1768897562018158500 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Allow mcontrol/mcontrol6 action=3D1 when Sdext is enabled. When such a trigger hits, enter Debug Mode with cause=3Dtrigger and stop with EXCP_DEBUG. Also report inst-count triggers in tinfo and read their action field. Signed-off-by: Chao Liu --- target/riscv/debug.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 5877a60c50..4e30d42905 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -110,6 +110,8 @@ static trigger_action_t get_trigger_action(CPURISCVStat= e *env, action =3D (tdata1 & TYPE6_ACTION) >> 12; break; case TRIGGER_TYPE_INST_CNT: + action =3D tdata1 & ITRIGGER_ACTION; + break; case TRIGGER_TYPE_INT: case TRIGGER_TYPE_EXCP: case TRIGGER_TYPE_EXT_SRC: @@ -280,6 +282,7 @@ static target_ulong textra_validate(CPURISCVState *env,= target_ulong tdata3) =20 static void do_trigger_action(CPURISCVState *env, target_ulong trigger_ind= ex) { + CPUState *cs =3D env_cpu(env); trigger_action_t action =3D get_trigger_action(env, trigger_index); =20 switch (action) { @@ -289,6 +292,21 @@ static void do_trigger_action(CPURISCVState *env, targ= et_ulong trigger_index) riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); break; case DBG_ACTION_DBG_MODE: + if (!env_archcpu(env)->cfg.ext_sdext) { + qemu_log_mask(LOG_UNIMP, + "trigger action=3Ddebug mode requires Sdext\n"); + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); + } + riscv_cpu_enter_debug_mode(env, env->pc, DCSR_CAUSE_TRIGGER); + /* + * If this came from the Trigger Module's CPU breakpoint/watchpoin= t, + * we're already returning via EXCP_DEBUG. Otherwise, stop now. + */ + if (cs->exception_index !=3D EXCP_DEBUG) { + cs->exception_index =3D EXCP_DEBUG; + cpu_loop_exit_restore(cs, GETPC()); + } + break; case DBG_ACTION_TRACE0: case DBG_ACTION_TRACE1: case DBG_ACTION_TRACE2: @@ -441,6 +459,7 @@ static target_ulong type2_mcontrol_validate(CPURISCVSta= te *env, { target_ulong val; uint32_t size; + uint32_t action; =20 /* validate the generic part first */ val =3D tdata1_validate(env, ctrl, TRIGGER_TYPE_AD_MATCH); @@ -448,11 +467,25 @@ static target_ulong type2_mcontrol_validate(CPURISCVS= tate *env, /* validate unimplemented (always zero) bits */ warn_always_zero_bit(ctrl, TYPE2_MATCH, "match"); warn_always_zero_bit(ctrl, TYPE2_CHAIN, "chain"); - warn_always_zero_bit(ctrl, TYPE2_ACTION, "action"); warn_always_zero_bit(ctrl, TYPE2_TIMING, "timing"); warn_always_zero_bit(ctrl, TYPE2_SELECT, "select"); warn_always_zero_bit(ctrl, TYPE2_HIT, "hit"); =20 + action =3D (ctrl & TYPE2_ACTION) >> 12; + if (action =3D=3D DBG_ACTION_BP) { + val |=3D ctrl & TYPE2_ACTION; + } else if (action =3D=3D DBG_ACTION_DBG_MODE) { + if (env_archcpu(env)->cfg.ext_sdext) { + val |=3D ctrl & TYPE2_ACTION; + } else { + qemu_log_mask(LOG_UNIMP, + "trigger action=3Ddebug mode requires Sdext\n"); + } + } else { + qemu_log_mask(LOG_UNIMP, "trigger action: %u is not supported\n", + action); + } + /* validate size encoding */ size =3D type2_breakpoint_size(env, ctrl); if (access_size[size] =3D=3D -1) { @@ -569,6 +602,7 @@ static target_ulong type6_mcontrol6_validate(CPURISCVSt= ate *env, { target_ulong val; uint32_t size; + uint32_t action; =20 /* validate the generic part first */ val =3D tdata1_validate(env, ctrl, TRIGGER_TYPE_AD_MATCH6); @@ -576,11 +610,25 @@ static target_ulong type6_mcontrol6_validate(CPURISCV= State *env, /* validate unimplemented (always zero) bits */ warn_always_zero_bit(ctrl, TYPE6_MATCH, "match"); warn_always_zero_bit(ctrl, TYPE6_CHAIN, "chain"); - warn_always_zero_bit(ctrl, TYPE6_ACTION, "action"); warn_always_zero_bit(ctrl, TYPE6_TIMING, "timing"); warn_always_zero_bit(ctrl, TYPE6_SELECT, "select"); warn_always_zero_bit(ctrl, TYPE6_HIT, "hit"); =20 + action =3D (ctrl & TYPE6_ACTION) >> 12; + if (action =3D=3D DBG_ACTION_BP) { + val |=3D ctrl & TYPE6_ACTION; + } else if (action =3D=3D DBG_ACTION_DBG_MODE) { + if (env_archcpu(env)->cfg.ext_sdext) { + val |=3D ctrl & TYPE6_ACTION; + } else { + qemu_log_mask(LOG_UNIMP, + "trigger action=3Ddebug mode requires Sdext\n"); + } + } else { + qemu_log_mask(LOG_UNIMP, "trigger action: %u is not supported\n", + action); + } + /* validate size encoding */ size =3D extract32(ctrl, 16, 4); if (access_size[size] =3D=3D -1) { @@ -919,6 +967,7 @@ target_ulong tinfo_csr_read(CPURISCVState *env) { /* assume all triggers support the same types of triggers */ return BIT(TRIGGER_TYPE_AD_MATCH) | + BIT(TRIGGER_TYPE_INST_CNT) | BIT(TRIGGER_TYPE_AD_MATCH6); } =20 --=20 2.52.0