From nobody Sun Apr 12 06:07:42 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=1775960555; cv=none; d=zohomail.com; s=zohoarc; b=gaBpEtQsVgdY8bp/ezTSvdKLIZvSZPwjdMDZlQAVTb0+JK1mKmbL5lcLoVUl2x4GdlyEWjgZl2cnXJ+hJ7gw6C1MIN/ZMSsOQNcwJ/Q8C+rVZ6RWSVr9Km6xYjjQHpARs6IuUkXGDNlBcqjV2y5cDTdZn520cmHuHL33emLB/ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960555; 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=r4TyZefY9NFwD1+f8ide9sGoKm39GlSzIyT0VGj0ISI=; b=LP7yanmwL1eeXpJzTNnRiXLWPQ2nC3E3lR4BeKgMQhhK+Ef38ULMOeq/JCqHWX4sZS3vICVJz9TtLi2XrQ/+sy0cIm1w/EKg1TbBLGV6HgFuXjPrwZxSB7RakVQai/VsPOSLc2Qs/AIiliRWOUZByVVoOPZfTvcZt4bvABvYNGU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960555224827.0489697757861; Sat, 11 Apr 2026 19:22:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkRn-0004B8-UW; Sat, 11 Apr 2026 22:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkRl-0004Ae-KU for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:13 -0400 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkRj-0008FP-M6 for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:13 -0400 Received: by mail-qv1-xf43.google.com with SMTP id 6a1803df08f44-8a1e1817db6so28502546d6.2 for ; Sat, 11 Apr 2026 19:21:11 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960471; x=1776565271; 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=r4TyZefY9NFwD1+f8ide9sGoKm39GlSzIyT0VGj0ISI=; b=tGR+cNuiqwInExOc6KWoKPguozWozJB3pO6TsIkkq6ztHyoQUpH+13E9pQmxrFzCd1 usPBr2Ou5fvvwFL+wENqbiq0SrPCPcUdqvC2za+N7SMFpaIQlETbClh/oRXfe42JpIun n0nuCmUJllypww8NcdM9RB7s88uoV/TFoxLiHLXGCV+1ZyNW1gEVJikmxo6mQvWsiL3C EAx8ofw6CjUDDjF/uoYBUKZmwcACNZMQZDg7wGPjI6wHmW5NbV2kFFiMEtTsdGryu+le 4ekB/WGP9g7WTpCQSvkbC3xm14tXwQItwAI59sSbDQD/8mEvauDm7o7CFSKbVSVmYdUg dOJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960471; x=1776565271; 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=r4TyZefY9NFwD1+f8ide9sGoKm39GlSzIyT0VGj0ISI=; b=HreLh32IWRt7MS6EekHZWWaMp+7qAK6BkDzqE8rxT+Oq0v+9+xE9Dv59KPkJqfWg9H iLSEPcana7ds7cCGqkQHTTHZ1x/aRCeibyAtN42C0lJyXaCwFNjOvxrOEs+KbQ2AbfRx XlzSjTT7fFI7E8M/DiiyRV3MKEIxsPJW8I/Ip+ld+hMbjxcFiWlKeuf1C0PI8R0Hqimq Kl0B4q+pGsEd7NEMBHugOHX+FDUSfRYcpz6bonPlzr7sP3yUefkOv+zUpCSszJSzZ98n 8WW2T/hs9eZf8fga9EXPJ5myzov5fUzKLbDodeR5nC8nFsXYfGwN3SpibMn7bAv8ljCj B80g== X-Gm-Message-State: AOJu0YzAnANg6cwz7arB7od6KSkUaHo48iZ205RcbI+R55zwV9LqDVPL lmeYkfLKgjPe/6UcaUgr54CtGpZbQmnMnMpWY72YNmhyxGjY4l7X0ITciSjWFDOHKQKdJioy X-Gm-Gg: AeBDieucV965Skbc5SwSRWGEdD8u7iaTIZxHOQTvDhuTFGNxJ5ZL3CINdvCfmpqC9+O 8lLUjFCOOREcR/pJA7RTCUmqaEO6MIym9Ps9szGG11L3shR+kFIJIOiOTQhhplhEXzIv0an3eoI 2BXqx0BlwsnuijeZb46QMiPsdzgd/HpVc+6NwaiTjwkZ2iyjp8+5CqEydxWDvJPeE+9mvqf+Uyc LffFLApjCRzHJTm8oa+ZNSWkzWn/+TJPDw11a2pwVywLJM9v5+djxk5uzKa75+8UdiW1uTJsGje dj/beM6N3TkdIL51/d72LnHuYM0dx0gMG0QkYf7yqgB6rH/dKQjgk7YdfqZslUvk4S98BMF7/XI mjc1JW0sv2pHZ4GruczjcdfATZtsHvBSIsPkIAuswiSNxnN8glsu17HWCsJagqaf4dF9vKlRRYl H5AMnuI3+Z/3D0Jy0CqSbvh3xb5SdGpWDlRbcTZ+FxWJLP5RFEdm0FOAE0ccAuaavm5fJNW6dvn w7K3lc= X-Received: by 2002:ad4:4ea7:0:b0:89c:9fa2:5de9 with SMTP id 6a1803df08f44-8ac862a63dbmr150577846d6.36.1775960470682; Sat, 11 Apr 2026 19:21:10 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 1/7] target/riscv: deprecate 'debug' CPU property Date: Sun, 12 Apr 2026 10:20:18 +0800 Message-ID: <99f0437cbb0169ffa318af4864ee48af22abeb17.1775959096.git.chao.liu.zevorn@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f43; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf43.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1775960555535158500 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 Reviewed-by: Chao Liu Tested-by: Tao Tang --- 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 a6d6a71326..cba050334b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -452,6 +452,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 38286b6b40..6208201538 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -210,7 +210,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), @@ -783,7 +783,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 @@ -947,7 +947,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 @@ -1126,6 +1126,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; } @@ -1240,6 +1248,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), @@ -2654,8 +2663,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 734fa079f2..44235bfaa1 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_xlrbr) =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 cfd076b368..93b4864933 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -776,7 +776,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 f3f7808895..0613450691 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.53.0 From nobody Sun Apr 12 06:07:42 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=1775960570; cv=none; d=zohomail.com; s=zohoarc; b=i/Q64Q4XQWub1FG35BvdZyGmBNB6Xab9BHmIus8u3uJbUyc+uPBHBuyguACNOEWxs8tUL3WEFZJ3460a1WsaDS50RqcoA0QuFuYyw5hWiqh95rEtHuqyCNRXBfOyBWwEo4YRJlPyO2U4tdujlGZL/GrvoPgKI4MueuFruNafHRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960570; 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=4l2xGOlFrRIMDi280dAJubGh82OnbmlN4aOQKeFT9Bk=; b=JtM2QWmO02UKxvStAy/fnppBwEU+ovJJHOMkbuv9UudGmPOr19ohD9ehZ1Hotap1+R+3A6iTlg4tRBOhRuBbgLvUQroOuToVlGiW4/zhiGTTP+qFLvVaG5AEzUOfTzkUVgXt9wDDTrZyurMkdWRVupaIGqetcIrVHeUqRkzD8A0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960570399231.36699333130844; Sat, 11 Apr 2026 19:22:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkRs-0004CX-Ac; Sat, 11 Apr 2026 22:21:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkRr-0004CH-AN for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:19 -0400 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkRo-0008Fy-Nv for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:18 -0400 Received: by mail-qv1-xf43.google.com with SMTP id 6a1803df08f44-8a154cc6a48so37514736d6.0 for ; Sat, 11 Apr 2026 19:21:16 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960476; x=1776565276; 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=4l2xGOlFrRIMDi280dAJubGh82OnbmlN4aOQKeFT9Bk=; b=ja5wGNqPVP5Zh9GZxvDSrJ8+yoEZZ6/r2wOnf5CZ+WKp2FRy2heigmmlw6SFthijnV pEHFYZ7Hu0xDwzkGdFzSDeYAmHNL6nP6ZwwclKEHVgN+OthKW122fvjh8OA2A7H7tWZU ajwELJ6SUAF9lK5kd25LOj6B0Oiqo5jrhYFh4AD4H5gNPYdDyymRA3qxyNPXJ3WRpzvg +g1HmVmACn+Mt5wqDSQ8Kqmo+MeboitRchU0JNZm3HgEfujA89UkH7pKZYqCtOQBL3CH vcwsD25uSIJTRUp/D692iqeiHoFuyk4YAWQa07wJUaCeXC/GRtdayY9hHN/IQimC1Lvq KGuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960476; x=1776565276; 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=4l2xGOlFrRIMDi280dAJubGh82OnbmlN4aOQKeFT9Bk=; b=P3uu7rDi95wuIuyj6+lfW6j3SaA0HUBhGJkmw16XYGMp6Q1JOeXVcl3hXRukzLVMas o0F8zqwOer8xSivJYOmgUm1To/SklOeraA3k9PaSUTE/03znISKbgEAepBcPN00jpDI8 PI0i2Kae6wCuL+u33Yki12mDzjC3k6BplObxr8hsE/MSPgzN6mViBVyI2LT3uDtkG7mZ WjgBdZJ8jusT/+ryBX1kUgRLBvE2W1b40RnH/4dCSLiSOyrorXn03EXj0oVD0aVGmoLA 6q/uBVQ6OP1E21fRwlyqp6xPtHBz08W6KQEGw62qsH41brSSUbI5BOyKBU+EiM5zUcdA sPrg== X-Gm-Message-State: AOJu0YwM3DG+5LFBVPC+pKF9GRodn2B6M6s6K1HL197wGNo3YehNtqDM Z49Nbuvh7WK9x1a8N2cKZt3vWMf4cf2AqvndNGabwPLsJA6ZK0n7HdfU X-Gm-Gg: AeBDiev2C1udPt0vlsEouQItruRXbRn1+OlHhADjqT+PSUfnCNyq/CEMddKvOl3N3p4 AGa7GdFKrxGIJ8FTaUIw/bXI1NNhRLFVJGs8po3jtSD856yi5e6QMzAqivX43FNIeGVO5SorUb5 5fbs3vRQbHxalmqRkNAS8P53iftHbt5siY6ny+xbD++4dJCQd0UU0ShutTgXJm1hwdTpgXarrUg bBRDbnj7ZYwq4fAythwJ5V9Dv+Eb+AKHATvBJ70oeRr6ef4NIe49jZicVH8goVBvuNWPFcDZRZV ITRsiz+09W4SgTAaofhMONIETE4/1W+8zt8iL7l7ALtimBggKM369YS9hZ0u7qp/t+oqHFqteVy etNkyZM9x8p7RQtUJ5vyY42mNQ5V+pbD1KQKOK88k7Gdii+E6OMq8bHWavutmuSREZ46F0fXUBz q7KGZkMW4MSuHVMZ/Ip/UC/Qj3yUpjHhLyewiG7vwAb4Fk0MWcdXMqVpGSbPXPLEE9KGrl X-Received: by 2002:a05:6214:4c84:b0:8ac:a6c5:c7d1 with SMTP id 6a1803df08f44-8aca6c5c984mr4860756d6.8.1775960475626; Sat, 11 Apr 2026 19:21:15 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 2/7] target/riscv: add sdext debug CSRs state Date: Sun, 12 Apr 2026 10:20:19 +0800 Message-ID: <51360220ee90a76ca326a4205f1f62b34a4a8624.1775959096.git.chao.liu.zevorn@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f43; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf43.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: 1775960572762154100 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). The Sdext is not fully implemented, so it is disabled by default. Signed-off-by: Chao Liu Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- target/riscv/cpu.c | 8 ++ 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, 192 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 6208201538..de9ba8dfb0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -210,6 +210,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), @@ -783,6 +784,12 @@ static void riscv_cpu_reset_hold(Object *obj, ResetTyp= e type) env->vill =3D true; =20 #ifndef CONFIG_USER_ONLY + 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; + if (cpu->cfg.ext_sdtrig) { riscv_trigger_reset_hold(env); } @@ -1248,6 +1255,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("sdext", ext_sdext, 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), 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 44235bfaa1..3d2de307a2 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 93b4864933..e8dc2d9e8a 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3147,6 +3147,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) @@ -6316,6 +6436,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.53.0 From nobody Sun Apr 12 06:07:42 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=1775960521; cv=none; d=zohomail.com; s=zohoarc; b=dcBvbLqM3v3VDeRw/skrmtmemsxq3K9dAGj3FyHYqxg6Q1h/7yNG0x0oBPSiollOfLy5t3RK+v7NAiZ4cBkNmBnvJiNbAczR/6OCI87gfvnI9EoSNMPRmCn8u0UKAiKuj0jN6mhCa7jZGL8YKGfsfmM0WjPTyTZLykoWQ55Tyuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960521; 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=7vVCl9oFeB3SQLBVtH9GYT4ioHX7OL/vziaYxhp85Ro=; b=h0N4hEcX03+LF4IX9RMA4b+akZzsjNpwAEKajEGfT7Xf+5tHnXYyy43UZYJDX4fHHOM7Zqzw4FjOp9EGDylEEpIj6phKw31PDh9g9uxi1+jMMEK27BMdt41x4FbYfI6ruJ34Z/4qcsieqZpPEtza/xHct+OQrVXNsNSc7KaOVVE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960521503176.63602789851393; Sat, 11 Apr 2026 19:22:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkS0-0004Dk-Fc; Sat, 11 Apr 2026 22:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkRw-0004DL-VE for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:26 -0400 Received: from mail-qv1-xf41.google.com ([2607:f8b0:4864:20::f41]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkRt-0008GT-L3 for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:24 -0400 Received: by mail-qv1-xf41.google.com with SMTP id 6a1803df08f44-8a08fa355a1so49657916d6.0 for ; Sat, 11 Apr 2026 19:21:21 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960481; x=1776565281; 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=7vVCl9oFeB3SQLBVtH9GYT4ioHX7OL/vziaYxhp85Ro=; b=dRfa+4jyZqQLHv/o1zI2rEiPh3WseNaM8vouc/eAN3tbPOKfOYTDmm6npw9ENNTIgd /RYsQ5pNz3ohs+DKqX1uf7fVnCkSDQORHdnB9H8HEuzsEIpgQS6IaggK24TvCt3ScGsn Bb8g3m8Dh6gnxpj70wAhsXm8sP/aIOLfyS8J5NjfAh7PuPPT+9//Mbq+cez52Hnv+xDf iRX8LP1krrrx84pJWpQn6lAc/CMgVv4ydiYvMxIuoYRJHeCucYlWOSvAlDBxS/YVqDXf t63dCWy3WpgYhfv5tyIHox1x3zUebtahRgB1ccv+C85UG0Uw/mBJ04ArfEdRPGZZ0xLe VW3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960481; x=1776565281; 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=7vVCl9oFeB3SQLBVtH9GYT4ioHX7OL/vziaYxhp85Ro=; b=ZBfV13zfNhjxWSoot1KbWynQYArktwjxG5cZGPPBDjxnDo5Yh+rbZVf8gMCrQTELos D2ZDbE3RzawHpHoN7xRQUSJtQ2yHpoooQrLMr2p4veeBWy3Fjr03nHK+1/Y8WtdOL+mg 0g75YUMzTwqMKZAMsxKx301Q/ZKPNbTOvJ0v8iZZys+4gZnUQhL0Y9lPuQLbwknI+P40 IRPNt7cd8D2ZW1KpiNIyD4xrWy3dVNJE0xZ+KCZu41q7ixK1WFjnBKvH05WZ8BdbDgu3 wvlPZmmVb3miDuLNsxuKTCuDSqzFcrko5o5D7pCqa5xQd4DLun+YqMAdAsjXTEnpxlwf 0KfQ== X-Gm-Message-State: AOJu0YwoYdSAFeEVmBFYJPz31hJ8RjalmdEVaqhjg94fQfxYUTKA4bHa 2QIiQCj6dfGTDLFkKwfprQpr6diQ3R83KOJqe+vMUc+jc+04GxqmZC0j X-Gm-Gg: AeBDieu8LKjtJ4+ZYWtRz0NFv7/Ie1yTeqqkzGpORMweRkQV+TtFpoK87qIIdRmmoO3 Lm7ngMd2L9KxiBPbubmJYCgPQdBUAwNcevKN5dUzF9UoIL0tpgI/haFTnG0x5PKJsmES1x3yFbP vkvpSOGsehuKVoGWOruemaoE3f2gCtNZ6STcvGIrNj77eXj3SskRg7P31V2gmS/kI6Xcxbzce4B g4nGRvM5FaVZud8Zw5ncYlWA/ZcVX7rxVJEF0QTlzmyj1iIas/m8Ej0+FzuG55nzOnpy55V9LfH q4pV92l7IN0nZFEcIFsVo0FqgtxmXHMsgoe8TuTQ8haPTyMDuzLDDCBBMCJ1tPBQxvN14JscUBC 150t965q44/iJr61Vqb+XC82KxY1Crxtm1ksK9HHR82IUykU5B3DxrYIRzE8vSjUKyYFE5bArNz D8t6XygpmbjEclyvvB+kA5xbd1UC7Tx1oPDQuY9p0tIyEgA/Fn4CYz0A1/fVRPQfUmYceI X-Received: by 2002:a05:6214:19e2:b0:89c:6ba4:e306 with SMTP id 6a1803df08f44-8ac862c8eaamr150741326d6.43.1775960480548; Sat, 11 Apr 2026 19:21:20 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 3/7] target/riscv: add sdext Debug Mode helpers Date: Sun, 12 Apr 2026 10:20:20 +0800 Message-ID: <99be0e0e0d43c77389dd076d079b195844817076.1775959096.git.chao.liu.zevorn@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f41; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf41.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: 1775960526109154100 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Add helpers to enter/leave Debug Mode and to update dpc/dcsr. Model resume without a Debug Module by leaving Debug Mode at cpu_exec_enter and continuing from dpc. Signed-off-by: Chao Liu Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- target/riscv/cpu.h | 3 ++ target/riscv/cpu_helper.c | 84 ++++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 5 +++ target/riscv/tcg/tcg-cpu.c | 14 +++++++ 4 files changed, 106 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 2a265faae5..62732957a4 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -624,6 +624,9 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, char *riscv_isa_string(RISCVCPU *cpu); int riscv_cpu_max_xlen(RISCVCPUClass *mcc); bool riscv_cpu_option_set(const char *optname); +void riscv_cpu_enter_debug_mode(CPURISCVState *env, target_ulong pc, + uint32_t cause); +void riscv_cpu_leave_debug_mode(CPURISCVState *env); =20 #ifndef CONFIG_USER_ONLY void riscv_cpu_do_interrupt(CPUState *cpu); diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 659150c646..0ff11a45de 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -136,6 +136,90 @@ bool riscv_env_smode_dbltrp_enabled(CPURISCVState *env= , bool virt) #endif } =20 +#ifndef CONFIG_USER_ONLY +static bool riscv_sdext_enabled(CPURISCVState *env) +{ + return riscv_cpu_cfg(env)->ext_sdext; +} +#endif + +void riscv_cpu_enter_debug_mode(CPURISCVState *env, target_ulong pc, + uint32_t cause) +{ +#ifndef CONFIG_USER_ONLY + if (!riscv_sdext_enabled(env)) { + return; + } + + env->debug_mode =3D true; + env->dpc =3D pc & get_xepc_mask(env); + env->dcsr &=3D ~(DCSR_CAUSE_MASK | DCSR_PRV_MASK | DCSR_V); + env->dcsr |=3D ((target_ulong)(cause & 0x7)) << DCSR_CAUSE_SHIFT; + env->dcsr |=3D env->priv & DCSR_PRV_MASK; + if (env->virt_enabled && riscv_has_ext(env, RVH)) { + env->dcsr |=3D DCSR_V; + } + + if (env_archcpu(env)->cfg.ext_zicfilp) { + if (env->elp) { + env->dcsr |=3D DCSR_PELP; + } else { + env->dcsr &=3D ~DCSR_PELP; + } + env->elp =3D false; + } +#endif +} + +void riscv_cpu_leave_debug_mode(CPURISCVState *env) +{ +#ifndef CONFIG_USER_ONLY + if (!riscv_sdext_enabled(env)) { + return; + } + + target_ulong new_priv =3D env->dcsr & DCSR_PRV_MASK; + bool new_virt =3D riscv_has_ext(env, RVH) && (env->dcsr & DCSR_V); + + if (new_priv > PRV_M) { + new_priv =3D PRV_M; + } + if (new_priv =3D=3D PRV_M) { + new_virt =3D false; + } + + if (new_priv =3D=3D PRV_S && !riscv_has_ext(env, RVS)) { + new_priv =3D PRV_M; + new_virt =3D false; + } else if (new_priv =3D=3D PRV_U && !riscv_has_ext(env, RVU)) { + new_priv =3D riscv_has_ext(env, RVS) ? PRV_S : PRV_M; + new_virt =3D false; + } + + env->debug_mode =3D false; + riscv_cpu_set_mode(env, new_priv, new_virt); + + if (env_archcpu(env)->cfg.ext_zicfilp) { + env->elp =3D cpu_get_fcfien(env) && (env->dcsr & DCSR_PELP); + env->dcsr &=3D ~DCSR_PELP; + } + + if (new_priv !=3D PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MPRV, 0); + } + + if (env_archcpu(env)->cfg.ext_smdbltrp && new_priv !=3D PRV_M) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_MDT, 0); + } + if (env_archcpu(env)->cfg.ext_ssdbltrp && (new_priv =3D=3D PRV_U || ne= w_virt)) { + env->mstatus =3D set_field(env->mstatus, MSTATUS_SDT, 0); + if (new_virt && new_priv =3D=3D PRV_U) { + env->vsstatus =3D set_field(env->vsstatus, MSTATUS_SDT, 0); + } + } +#endif +} + RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 5664466749..5877a60c50 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -927,6 +927,11 @@ void riscv_cpu_debug_excp_handler(CPUState *cs) RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; =20 + /* Triggers must not match or fire while in Debug Mode. */ + if (env->debug_mode) { + return; + } + if (cs->watchpoint_hit) { if (cs->watchpoint_hit->flags & BP_CPU) { do_trigger_action(env, DBG_ACTION_BP); diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 0613450691..4b17fbb611 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -266,6 +266,19 @@ static vaddr riscv_pointer_wrap(CPUState *cs, int mmu_= idx, } return extract64(result, 0, 64 - pm_len); } + +static void riscv_cpu_exec_enter(CPUState *cs) +{ + RISCVCPU *cpu =3D RISCV_CPU(cs); + CPURISCVState *env =3D &cpu->env; + + if (!cpu->cfg.ext_sdext || !env->debug_mode) { + return; + } + target_ulong pc =3D env->dpc; + riscv_cpu_leave_debug_mode(env); + env->pc =3D pc; +} #endif =20 const TCGCPUOps riscv_tcg_ops =3D { @@ -282,6 +295,7 @@ const TCGCPUOps riscv_tcg_ops =3D { #ifndef CONFIG_USER_ONLY .tlb_fill =3D riscv_cpu_tlb_fill, .pointer_wrap =3D riscv_pointer_wrap, + .cpu_exec_enter =3D riscv_cpu_exec_enter, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .cpu_exec_halt =3D riscv_cpu_has_work, .cpu_exec_reset =3D cpu_reset, --=20 2.53.0 From nobody Sun Apr 12 06:07:42 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=1775960528; cv=none; d=zohomail.com; s=zohoarc; b=MrfYpztHGxojgVbRL+bt/hL3hDwfXziiCI3Qk/uro8sI3jshpu6+PiBZ5Y2JeOHGxn9MF/v7VFIyRCHbv8kWgcg2sgA4YYGCXVBcnE43KGM55+KACAZ4efZv5ZOfjWeImXSGqYSgemNAuu7MpFMknj/Vu/8Carz9dK7tO9XGlhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960528; 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=CKkxfjFo9HpAG1vOAa+x6hJo3pEzWJI2rZ+qLPR4jgw=; b=XJdxVfDHulwW0GU1kss+Di9AtnozHwyp4b2k/1yoTWEV1vuRpz8ZnmIovlGGi5xrAkvKo4dLP8Hzu/OfVtqVDtWPQ4AmYeAGOSSvJEkMLQc45typ0dQH3qqcTgV4gIHo3Y90TFSqQSDLouo1cg0KnWWKNw1rny47D1RbKrIDt9c= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960528117267.20968868777004; Sat, 11 Apr 2026 19:22:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkS3-0004EQ-Ds; Sat, 11 Apr 2026 22:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkS0-0004Do-4k for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:28 -0400 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkRy-0008Nb-C1 for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:27 -0400 Received: by mail-qv1-xf43.google.com with SMTP id 6a1803df08f44-8a00566c11bso42519136d6.2 for ; Sat, 11 Apr 2026 19:21:26 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960485; x=1776565285; 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=CKkxfjFo9HpAG1vOAa+x6hJo3pEzWJI2rZ+qLPR4jgw=; b=Z9QXLuY06EAYf24uvR+y3zAJO1ndYbmgWFR/4Cu7CfyQBTzidowpwXQFJCNjo77gLw uPYgH83tMcd54e09oIyQBOYjnuyvsOBZDJNcRIdtsS2l22xTP6wmU3W6LO4yOGxAeZI0 pyGpODtgU/syoMtDXQ4SeQymHs+wxJWHdUjX6kJF8Xhya5h6aAq3tRgocnjv/VYzLMB9 ec3mahrzjac6VgEknmdYsihWMirJot93nCK0Kd6K+V6aXsEv1HZcEAUEjJ3OqCTIGQqv wM4l91kUZ+MWtSFLaikrVwZJRw2ZNpG74Ce8ebuRjWELegu7MiHFHzflJnwx6OtXN7Ed JZcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960485; x=1776565285; 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=CKkxfjFo9HpAG1vOAa+x6hJo3pEzWJI2rZ+qLPR4jgw=; b=F+HloFWeCALnsMaZXAi3nnC7rv7Q8MgRxV/oOTTfel0ye58ond8orRl7nyAhUbaiMC RfYfAi5R1bqaDLQDFtG5fUTkEBwv6fDBgYjMO7XrSWRoVmH/ICn7wJe7LHPrJ82tZRvH mVR01PgmG1syuTkRpV81ULzdvXv2uQyRsAA9PYI0qPTiCGCqX9ZaUsfkD1857YQd8GL0 a/NmKJGEd3Xsr6ZNiPJVJxj1dskPijXrelHz3wgsxwxWRCDsyosREcPopkAW3inVH7Za SkOmcZ3gob3hnkwCCwFpITJUcr3LE8Z082iNjXy4eytdgpNfmikgaMtb1MO6lDLUbQqR e81A== X-Gm-Message-State: AOJu0Yxyt+E9ObO3EFnBWpgrLgbsjxf7+9Zk3u0h5I2vvgbIvavjoYG+ qJSz9WdEz0osB39LWO+TDrLdfdzkJAlEUot9mgq9P5gnH3MmHSVwaNTJSqk+hh7iUVaQn9ac X-Gm-Gg: AeBDiesJQg+gFPLl3UFxnTaJ6rVP8ODxZT2AenqzRF5Y6Z7nvBpyJsOonrk30V9+SOR fmHP7moIDiwt0q8lKmHezuZ2fkt+HjFTiEG7ESQmwogcW14NPYlFF9gTzM13x+V6Cq+RAok9BRa NUixVa+N3Gi+jbcY7tckuDr3BNVQnHZ1XSAUDCQHdyhsDUQPFwc6cTyqbJosm40m9hlA205cloQ kFroAnYzaoXW+215RCZHFyHcTCaz+uSSmAOC8vD+4i7/nU7lLNzRmYFyxXoQwMiKcWFw4Kw1b48 L90sft1gDs8nylOVbTh5nlSnEeHQ781W23oO5yPQ/7vpDEO56LLih23PZ7tsCOd7+YSvfgEiP2s +TmrVy+zoOjVAc48VHkWg1hQrpu58l3gqBbFwLx8RBJFFLNj08LnQNA+RVwyQe5dgdgARaHsf0u IcDHaAYCo+6m5JhqUp30n/1kFikIHrgvkETB05srUvppHKL8AdAgQoBc++CUcI/HRZGjg4 X-Received: by 2002:ad4:5949:0:b0:89c:c75a:e83b with SMTP id 6a1803df08f44-8ac86319c15mr138327616d6.54.1775960485459; Sat, 11 Apr 2026 19:21:25 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 4/7] target/riscv: add dret instruction Date: Sun, 12 Apr 2026 10:20:21 +0800 Message-ID: <279d8e6c4bb55ae831f929c105a20c3372de636b.1775959096.git.chao.liu.zevorn@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f43; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf43.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1775960529966154100 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 Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- 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 54d2331966..c8e76eb116 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -133,6 +133,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 6e35c4b1e6..4db842d5d9 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 dde40a5549..ce68ee5959 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -440,6 +440,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.53.0 From nobody Sun Apr 12 06:07:42 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=1775960546; cv=none; d=zohomail.com; s=zohoarc; b=Knk2Nj+n+/RfejRjDF8+GHMYzTNnhLCwAdbDKC56SIr7glWyQFlP4d+zONM52ACXW0A00v+Kf0Uc5wQf9M57WPYb3HZOprJNorpPdE7FCkBXewND4onez4tvklGT75cgFZx5WSslidKYh2jTF3AWw4+LCD/b4bOio1x6L8wwuzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960546; 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=FdBL5bIRSTgxNZUleWGlM4V/8XxdsxNqxbGWbaqEPcw=; b=YJkHPU0f+JD58xmYcnTFqlfRmVy0Li4JqglgMhGbAYlibh5LQDI1cy5C2TEdtQtQZKUfSc9GqmDSyJgToQ7ubnNWUwydC4n4p6GdmM4M107d8//raL1BjjtKMICsFaEtPoo7Td77AbsGkUMbW5jCP/5/bOEJ+mpmTBy7pONXl64= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177596054657768.13459427832242; Sat, 11 Apr 2026 19:22:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkS7-0004FP-PN; Sat, 11 Apr 2026 22:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkS6-0004F7-NC for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:34 -0400 Received: from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkS3-00006i-8q for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:34 -0400 Received: by mail-qv1-xf43.google.com with SMTP id 6a1803df08f44-8a05c388b27so52959136d6.3 for ; Sat, 11 Apr 2026 19:21:30 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960490; x=1776565290; 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=FdBL5bIRSTgxNZUleWGlM4V/8XxdsxNqxbGWbaqEPcw=; b=AcVIGl+C5T39M+GJ7hHVAfQ9yLufeOgOfTEjSXIfkYieoEKITpu/LETPBDK5Bu1BWp O625shArxw1wQGH0EyiAJ+l9SPG/z4CEOkgyMwGzUL515DMbvtpo7b0+/oP0+5dmp44s lvYTTj9XmmJnILFj2fFxT07oSTOCS9v5DQdSIPDwccnJ4lsNj9QV6wzPdgEhCtRfk/MN f5Ig3On3klk8hGqvwNUBdUlwaN5ngMPo7T9Cq4JXJbUYtc3Odus6j5mXKz2SfjFUKI3r 7vOI93WyOsGLru/rp5SrhtQv+Fn1oaL4ZzuP1230SoxgpXP8RWoOuFKV/fo3AG4nXkKd 0wBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960490; x=1776565290; 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=FdBL5bIRSTgxNZUleWGlM4V/8XxdsxNqxbGWbaqEPcw=; b=P4OHCE1dw2BteuFzr1DjDP8HeTCZnaU9m/6LIFtIsomt7CyXfDupqiHx3ksbvHNpCF kiwLzvmQBq+Mqbz5owKGkrG6s1YM/Rb14xo5qDx4hQvZsuCNTIJtMP60o7tYJTP+tjKJ R0W8lFhhuNUKQshKbxX4+uCstFbAdzdsGvN5y3EguIylIMzL0Ci7goLHIHABoe4X4BlR 9gQN45UDUbilbpqD+VFxCOpbOSRzWzoMUp9jYWyQeEJMFKqQimzCK3e34CjxbPCruht0 n/449OQsd8hdtSTzkE9nLmcEF4h76tgshaocVzNhAT9W2nIPiC5XmxdbKRQh9HTt63p6 vc3w== X-Gm-Message-State: AOJu0Yyr3pbjABHr94L2JpCgtQ7XjT4qBq50sTH9f66LnMokUoxbxmMC q+XLRmr3gEy/3isKSWjGPerxiMsv9NnJ1rBIz6fWq1XCrZOGyb2lsXpU X-Gm-Gg: AeBDiev0podVrd/i8SSeGiiCjZWeiNWzxSgZY0OElpbSizwgho5QzIk0XN/+5D5c3La qICR2mkU9It0mH6pfFrsOgcrlOvfWHBYI0bcM2gB9lhdc8OwO9b6JLbkXJU1h5dRfjmnGXLXfjb aPs7IizaxGddei9+nWrLkGRLUlEgbLqr+kfTXldlBlaqgRNMti6g8abq/lItY7VI9NcTxNcFUrZ TCvPddIlpP9mcBVgDI/DncaRvi4IpYZD3oTVSbIJS1UbV+3tyZBI0XRcy/RJC1/BPxCZ0AmOqyg xZS+S2yh61tZNK9pUyjvrMn/2791x3MsuHBXhfBBbEke0Aw7g2ZNVjCd2KdNg5SPoBJDdS5Nh4q yHoZwqADx31RaTTQYXhohz267sW6EMLNmbGIpjdcG5qzkkVPPDmMTiDW6atCTjGegB2xn9wHSvc EE9p+TocjFlnn+Z5dZC8naVTRc54yBVEtXILXxgHnYWhFAhsS9GrN3GBJUduohqQKi81XnQXJ7l /AF2Jc= X-Received: by 2002:a05:6214:cc8:b0:8a1:fb3:5a37 with SMTP id 6a1803df08f44-8ac86160012mr143676646d6.9.1775960490342; Sat, 11 Apr 2026 19:21:30 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 5/7] target/riscv: add sdext enter Debug Mode on ebreak Date: Sun, 12 Apr 2026 10:20:22 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f43; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf43.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: 1775960548122158500 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 Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- target/riscv/helper.h | 1 + .../riscv/insn_trans/trans_privileged.c.inc | 6 ++++ target/riscv/op_helper.c | 34 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index c8e76eb116..9538e816f0 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -143,6 +143,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..84f0c77513 100644 --- a/target/riscv/insn_trans/trans_privileged.c.inc +++ b/target/riscv/insn_trans/trans_privileged.c.inc @@ -68,9 +68,15 @@ 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 { +#ifndef CONFIG_USER_ONLY + gen_update_pc(ctx, 0); + gen_helper_sdext_ebreak(tcg_env, tcg_constant_tl(ebreak_addr)); + ctx->base.is_jmp =3D DISAS_NORETURN; +#else tcg_gen_st_tl(tcg_constant_tl(ebreak_addr), tcg_env, offsetof(CPURISCVState, badaddr)); generate_exception(ctx, RISCV_EXCP_BREAKPOINT); +#endif } return true; } diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index ce68ee5959..58d47b88c1 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -456,6 +456,40 @@ target_ulong helper_dret(CPURISCVState *env) #endif } =20 +void helper_sdext_ebreak(CPURISCVState *env, target_ulong pc) +{ + 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()); +} + target_ulong helper_mnret(CPURISCVState *env) { target_ulong retpc =3D env->mnepc; --=20 2.53.0 From nobody Sun Apr 12 06:07:42 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=1775960547; cv=none; d=zohomail.com; s=zohoarc; b=bg444edsQJWN6/nNSmo5pbJWcAUFUDDM/yypdoxWNSBGjutbcQpGEZ6LO6F+HtnRpqwYcDfiE7EA9ErhoPAnBVvwuwMZPnMrnpD0skV65j3xCQQl+exqhMTrywzXtTnR1AZu8j0m8GBEiouuirWpTBo9Wba0qcGBWgJSzC3q5N0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960547; 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=X6AvJKjpsy8kWzemg/IhyQYebO4GZU+JLooE65CkwM8=; b=f+gzUdcu+MzCNDyN8EW9DnYM09xm6CHJPQKnWs3Do5OsjFCzHhOt8f+YmzMurY3BrBJTSKQikM7oKEm3bIFoJtvsjqsGZDJqvyFDV4iBrguuUOeH+2AfnkeWXHYchxsDMMmRLGfyJ/Qqojuu9f1vyM1cpxw3+RYq+zmPQieHEg4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960547273879.9403060588861; Sat, 11 Apr 2026 19:22:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkSC-0004IR-6f; Sat, 11 Apr 2026 22:21:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkSA-0004Fy-Eu for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:38 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkS8-0000Qg-Ab for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:38 -0400 Received: by mail-qt1-x842.google.com with SMTP id d75a77b69052e-50d876329bbso36328551cf.2 for ; Sat, 11 Apr 2026 19:21:35 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960495; x=1776565295; 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=X6AvJKjpsy8kWzemg/IhyQYebO4GZU+JLooE65CkwM8=; b=ra14ZT42Avw/kw9BEusIxunRjZPfj3CvwLMvpF2bweEUYxukLs43AmLbYNXq8jWG9L bWJqxnaLhVjsklK+y5bXklZZ3VYCcQCHgVZQStt725br0nn98f92sZyiIT/Mu+W90wNx PK8jjsobZVDgqZcg6RfiegTp9UxYrqQxvBIDlDY5i0KdFg3jq8IlsRS11ShzRGJWi2G7 8FdzsNOKPUz5GH8hdIq4pXlYRhPJe5t1vKMqQvDnSPXfeVkXQWeqjHgZetU7XX2lR28y uzlrNs6+D5QERFnOWsIHgDtVPo6V3WCuu+9xqht80zWifi9kTrx5lLyVho1txooPvW6j pFjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960495; x=1776565295; 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=X6AvJKjpsy8kWzemg/IhyQYebO4GZU+JLooE65CkwM8=; b=Bijhhqd620h7Z2wsZT2RzFkKfA1v8V9eJLvIBID1bkiasNgefqGxtNiQf2krWILFII lmjY/z7ngd++fx/edv1hAiPFA7AaJlGNMJ4aIRXnhD7AWfhUybbhFPDdxZg1rIibz8dk Bsjsme3urDiSM+ATKynm3SkEzSxuBypmmoMzCX2osD7y/poAMkD5X+Eg9UrxWqf+4Ak4 vskMYde5ujY9gik2gzKrwv7ylcsL4ag4r170Ghq3rpkhwmUXjGv3E7WCtkBO989Hv0bp J+5DlPJ49vfPtyv0CswWsvbSR0ZuxgXxJHVjIZXjry6hZjQ87HxHDnnu/uzWUN3RegOQ TK6Q== X-Gm-Message-State: AOJu0YwrHQjF10alTRP3sa6O5/lJuM0DDHoNsRC0it13nZUtNvJy7gsX /bofpyqK2TP8NGybniTOdDU1rhy0uf8k5lkjRuSslRsItdcavaPmdXwU X-Gm-Gg: AeBDietHOPN4UfFMSm3DqX4a3gyOvS85MiOEDBzZXmnOQZrGj/nexDlHF6lR5LbuhdR MXoldCxN3GI5xsxxCm2sHD7a+rvwFVojz96NR7v1sBWpHlRDlnnhg3aPKA2pHopLBpy1bZ2xv3o de9kRQbSY2Q0Rrx5RYR66b9+JwClyhiMqzgJ9QHztssVu3R5HR4I0en5mrb7Sv+n4DfWjLEiLMF l8PRMqSaAdtaG9XaRAYl2mRC21ClHiuSt0/1wie55GyZvS/kFMeC+sO8HHFgkmLeVffqj1NPrI3 2/m4T7O5q/l76CvTpC21b/E/bHcsHQ/SJWdV84G/41+jA3No3OgfoNHYC3FMdcrA20J4oGpWGG6 UrAEr8bzbhP7BV5sfi9nghgEYxgMuhRr1Xd6CaRD7hWX/Y3fYFqJUCmJ1RSwu/sXpFA3/qVZruj 0FZhwHFrrRra6UTFrEIko80pig6vYNxZGxjtuFUq8Xckfx1v4vmh6nrJFw6kFy8VbCPlrC2sxpc Odzfa4= X-Received: by 2002:a05:622a:1920:b0:50d:6ee0:3822 with SMTP id d75a77b69052e-50dd5a976b6mr132703411cf.4.1775960495198; Sat, 11 Apr 2026 19:21:35 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 6/7] target/riscv: add sdext single-step support Date: Sun, 12 Apr 2026 10:20:23 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::842; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qt1-x842.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: 1775960549350154100 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 Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- 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 0ff11a45de..cefab2b131 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -635,6 +635,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 9538e816f0..68e9796289 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -143,6 +143,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 58d47b88c1..0165e98d16 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -456,6 +456,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) { CPUState *cs =3D env_cpu(env); @@ -588,6 +604,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 4b17fbb611..cb464c13cd 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 81087e0a5d..d850aaee89 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 @@ -1357,6 +1366,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; @@ -1407,7 +1417,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.53.0 From nobody Sun Apr 12 06:07:42 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=1775960560; cv=none; d=zohomail.com; s=zohoarc; b=g804n6rTLc2VnP6qBVLtPjPa2Rx3o6ePr+EHnPR2EreUZQCKuaf3AkItVaj3pujNuGZ0Z42IpUa5S/vhpKs7c7jRcuHsSLbtFG0WeZmTlji8D8xYvo7eqRqrvhU0o7QevaM/xeLRNKUAXwUF8sq8QOolwrSitZ++56wn+JSqmkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960560; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=hl8wgT4CltLG6VTaxdvia71dry9BsZAG/SS1SHKc5qy6N4p7WXdJDnGaR+/lDJmCVKfETL4mbjSP7W4GX6BREPtHvWuQ0X7wFeSgSVVrSxPpxCU34CLxSMr0+eaPNnQ7BDqXKnl8AqvP5IjTQJQXFPka63N3a5KFsAoNngX/ogs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775960560399119.21379096183773; Sat, 11 Apr 2026 19:22:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkSG-0004Jp-2a; Sat, 11 Apr 2026 22:21:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBkSF-0004JU-8H for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:43 -0400 Received: from mail-qv1-xf42.google.com ([2607:f8b0:4864:20::f42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkSD-0000ca-F9 for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:43 -0400 Received: by mail-qv1-xf42.google.com with SMTP id 6a1803df08f44-8a3b0242631so39291466d6.3 for ; Sat, 11 Apr 2026 19:21:41 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960500; x=1776565300; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=CjSdkGAuncLKJ+k1frGeTMPQool1+ZXS8zYT8H+3OeLocYGo12jELlCWE+YNbhu/dU zEkMtTORNfJNemfyqDq+MqW9DGI28U6CQ/63NRKoFl8YJU0n3HrUbXqfKmKYzEWkCGUR 8UUDKQifSxuNoLaQRtHxDRf8v1qeKFod6dglUKHBVR6bJ8lQ8IfaQ8WsVQfex+/yJMH7 x+HiS3EFPjixDB9xMz0Ss+qJU8frvqgI1+ojfoM+a3Bm6IhEjYglXdMfnAQ6iQ693uRD g7Zdox2DvrQMEsm1lzmccZUQvdxpx0Nugj9PpbWELkk0ZmODLeilSkyE0fKvdgeixejx P/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960500; x=1776565300; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=eoz9//NXU29s6DrTRqyXUz82n1HLVOKB8tlNaChqrovleq725DTa9ZScmZCgWCP5EY mn2dnD95JOTusdC4A/a97t68EADHzBdIJpFXaOga9CudbSzr6DVO0PMRVWqv+1afQBFV FYUgZGTKCI3RQGiQFJOW0BPPh6odLxRYW+MRfq6lSXx0rYzbywiJKU4COhDEeNNrEsO3 1ZIk3w6IOncWqD0lPSW15EImn/C23FTdP5CsCuRjlA5uXTY1T/ntIEr5umLkM1bVtcb6 KwdJGyo2dHIU49vQOpWNXUPmNvJJAiYP/YFKg8+vxU1bhTHtw5T/1BMa+lO7AqdWPMoB 9VMQ== X-Gm-Message-State: AOJu0YyZJT3MB6jye6wsuvXuyAc/OT/Tk2PFvz/q2+2BnI5Y1bOGjBUE jDwacfh1je++nvhTdJN2qeRSdX2tYXOA1Coko/2N/TgchQSehHvrtSTw X-Gm-Gg: AeBDiesRQZidFsxrGfWJJ4iYp2Cgl6eFmd+1plMBWsiVHOR/6U+qx0OPOBrhP5Iafbu wY35YBJ2NG2PsksOB93APSeqn9ldxpsVJWIkct2NRWS2OF6QsZxYIyzJ4frsiYoU/2rr4FkQYoz dfWULtmnc6AZe5cHEXtggxPHEIkqdzfEl2n9nTUASVr2uis6dRNhL8sxXgCvsoy0eGXrig+6ZmO mQTyK4pS312bOVvnwiv3tXOyLibXmBUo/mBJbY0bShLk3TQZAJrfjE6OQIa4uHnXMPc9R/eC1X5 aDpv2SB3Khj0/VN56W1SAe/LPrUZmji9JV3ULksf1vxZrpALErI+u93YlR9OSLuK0502b+p6Pl0 XgKIwviP4UJl66oMO+ICxvZOMAxUjMM5lS6oX3OZyXsXSRPzURYvx6MIXLJ2p4cLNgc1XkKoI99 DaxUbVsnNyZIsocv7gD+9JK5Q63ZXVbHPcs40NzETMXRB3Dq3Cg03lI1L5I1GSK71blrfM X-Received: by 2002:a05:622a:4009:b0:50d:ce35:6e67 with SMTP id d75a77b69052e-50dd5ba3bd7mr124645941cf.42.1775960500394; Sat, 11 Apr 2026 19:21:40 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 7/7] target/riscv: add sdtrig trigger action=debug mode Date: Sun, 12 Apr 2026 10:20:24 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f42; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf42.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: 1775960562653158500 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 Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- 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..6c69c2f796 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_GUEST_ERROR, + "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_GUEST_ERROR, + "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_GUEST_ERROR, + "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.53.0