From nobody Sat Feb 7 08:27:21 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=1769519903; cv=none; d=zohomail.com; s=zohoarc; b=VIaiJBPkOONtCrfvKm4rcjUgM5ApxDslnYFtwu0kUn2pEcKsxqnK/9sOEWcuZlON9XHmA1nmzAP0Av2f/pi5f0zT1E2HE8kWqojbSFF1HKOSpWTcaiLm110NLNuyU12LxzzZ1Njdgzdxgb3/QsABm/rqsOWG4DTorr8KJsTMFRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519903; 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=J2vLx32DWtnhtQ+ZpYxxqpmLXkzq+s4yZEN7bYup1Ic=; b=QiIC3gV0lWjh36FkK9sVn+sHnmHlZ0hXJDU14Q5dkm+Z89MwKUBgXPelafcgj0b0m9BNV/kZBTiOiMrsw4B0Q08wWNyvlRpM36BZHYAlRBPIrrVxVVNvkyJfU5UuZUpnIPxwn4fpDKBqjspsw2xnUTXijxkUXTjQR3uCPdAiKwM= 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 1769519903489835.948744151804; Tue, 27 Jan 2026 05:18:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwA-00079n-Cr; Tue, 27 Jan 2026 08:16:55 -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 1vkivw-00076y-BB for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:41 -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 1vkivu-0004Zr-7K for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:40 -0500 Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-2a743050256so37376895ad.3 for ; Tue, 27 Jan 2026 05:16:37 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519797; x=1770124597; 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=J2vLx32DWtnhtQ+ZpYxxqpmLXkzq+s4yZEN7bYup1Ic=; b=MEkgU/JMvh/1FUFoSKlr0umUPNxaFO35pFPK2t6Q26OuXSTXR0Qfajlm++DApsrH5M E1E1rOmI8IImBjyIVilfrCX7vxDgimmVF7n1wMvFZ9N5CYLZlOsgTguvx7uL4R781BBD +wKNC/1gaBNhf87SCvOSJuPIGLvh/j3N8srIXuAlrTg5gd5gSy9NhgxnAJs+vQTU/AUq axgxU2SmbqrEymFkQcmeG7/wrO9FPgk4CILXAK6P9QAjcVqNwjnAhFH0inT0ng5+r20D wiTw+NvdKKTpvghMM4w+PqqIzbceJGne++c2r/ubmUuIZmCnGrxOjfjM/+fWI4lirqqG XTUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519797; x=1770124597; 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=J2vLx32DWtnhtQ+ZpYxxqpmLXkzq+s4yZEN7bYup1Ic=; b=M2W3/a9/EffktWPoqQ1lzvyn7dedcM/+u2MwAQ58RutqO8hNw6IGjxc5fr+FjghoMy tSsbbcq+b43T3IdlKzfzst5SLFXsViI39rImhG8z7JMixXSh2l9gCI3+Q4Cfofa1gLIi wXMTju1tC7lQsHDfPxVS4ahaytLcOx0jQVl2eCEG5PU8kxxOY+r9BuMhPZDpaXfjsBTF LSXchJBhN73VW2xdLa8U4lnOnV76jV0oo/XNSlaue/ctMr7mpY4pB7h7UqG4kypvUJFB qU9z07QUaHh1N+3GegjrVf3uoHhP0IrfT6mIQUyYksIt4erCUoRQJ/fG+XV7Sz22lxDW feqQ== X-Gm-Message-State: AOJu0YwC301ewE1kdoaMDDiCBbl+0UcrGSk81z5uL5CrbQ5MaOqa4ANS sXvciY+oAAZp7hh/wTyhf89DRJ7EH1+XW8HvbW6u0zPaZlhJ9U/H94GZ X-Gm-Gg: AZuq6aIe0U+primxdlp1XTgxbmDfA5rSwocsobmSUw6P0g7MkvP5Il/2M2MXDIxCCSq NKNhtwC4tWINF9A0e2i2pQkZ4Jn+S1zjJfmZTRI92IHIqKBe/PqFbTDTTooMKQTz4MnfTumIxSl aE8y+7uTDowK7jaLagJbb6QLyeD6s+CoV6dwIZFUCjnWqFS53Dvs3mJY0/pTRb6/IXTAKz8lYUS sFRYgfqSwweMnsi0xBlMYPekIOAQsb4ODyfnHO6U9PmCO6Lc3Tfi+aSYT/jogsEtlD/3PL7oMj/ KGnSj0CRXTDXxwAoM168JkjUrj0GQSirl/ka5Z+wCe2I+Qarxqf1l9kK2rUzkh2m9T6c32jhLDh a1FbybLYxI8potk0F4xQaEFWcBrrqi9EcKWrkEPSZQIA5HqegHVkP5s4KB9pd76q5CKjG302JlL sw8akoDlEJ2aNklsX48mIzfy13KFc2xsOBhd88ikAZ8LnLL4M3ivugmIQW/fQ= X-Received: by 2002:a17:903:1a88:b0:2a0:f828:24a3 with SMTP id d9443c01a7336-2a870e18d4amr18317425ad.28.1769519796643; Tue, 27 Jan 2026 05:16:36 -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, hust-os-kernel-patches@googlegroups.com, Daniel Henrique Barboza Subject: [RFC PATCH v3 1/7] target/riscv: deprecate 'debug' CPU property Date: Tue, 27 Jan 2026 21:15:45 +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 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=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: 1769519903907158501 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 7abb3dab59..44a6e53044 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -507,6 +507,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 fa7079d86e..0ba98a62e4 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -209,7 +209,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), @@ -781,7 +781,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 @@ -944,7 +944,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 @@ -1123,6 +1123,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; } @@ -1237,6 +1245,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), @@ -2639,8 +2648,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 70ec650abf..492fdd1553 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) @@ -156,7 +157,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 7a9314670b..799e907991 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 Sat Feb 7 08:27:21 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=1769519857; cv=none; d=zohomail.com; s=zohoarc; b=Bw0zNjJhSh3/bRsqF6sSbOkpaxBO1dYsjv1fxCm5dTXNuy7YrobAhzk32OE/VmObjGa1CCStB1EOxMgGE9tB29aeO/Bd2lp2gCWI1UZuSFwur991rd8bCrejUspJZvlTDWO9ghK3b1v3DkfZg4JUvv4gS1luJG9jk44h6vQFgfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519857; 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=7g22QIGF5x2xiu24z0cGAiGtX+Ng12KZKSShvKcEqIU=; b=E69UlgkYsG/hY515nCu5TxuNS2Rl6jLTmo9QbZ3z8ukIeDq17APzWcs6p8sr42JBJ4l5k+Lvtw4vhyKnP9t8om4TTqhX5hxK9cpYQ7CGxr/D3HH3AdUomiDPwE/0jCIk2rx+BwrY2kLnN0TX93WoaWchejw55zwp4zGflT6D60U= 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 1769519857761993.3496765109961; Tue, 27 Jan 2026 05:17:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwF-0007Dy-Bi; Tue, 27 Jan 2026 08:16:59 -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 1vkiw0-00078j-4a for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:45 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkivx-0004aJ-Nc for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:43 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-2a743050256so37377135ad.3 for ; Tue, 27 Jan 2026 05:16:40 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519799; x=1770124599; 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=7g22QIGF5x2xiu24z0cGAiGtX+Ng12KZKSShvKcEqIU=; b=dVk4IGgtcAABpxqVcgUFYPOKRlxyScxPal+bL2/PJvuwNy3Ff4TQH2wwS7/O9dfP1m 6sDAGypEKnfmAhpvFPGTDDoqoDJ/YsrFW5tm//L1zEwQjhBw+79NJryQjGLXjgEkwL/i D1QYJgS8DtHIqS4bNvRe1C1NzaI8GIekDvMwrOp3y1BH9WTPB6Cda6wvZJUfUcqAtAB+ OCEZVrdjLVmK2UpgIscsyhX+dULAOB/rEB05ASWCdIHKU1LLRSGzsMLyRGDrkm5c8I0b SK5ddJ6mZUb70IJMSj2j8FUshmPNh4ARQpRCqe51wDjw/hkv66zQM8pkGiiMQTyUpJCM psdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519799; x=1770124599; 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=7g22QIGF5x2xiu24z0cGAiGtX+Ng12KZKSShvKcEqIU=; b=f9SsCLHRRPXfEe5K4BSOzXNHrrWkRlFdxF83/md+TgBUZk0Ntca+zd7yaynOagh1Bx 6+zuZTV3rBe9ntjtU1cCG9mRQu4dd8+/k/tuz7Cjeff3eTOWsL35CSBoIzu6BGUxfRml ViOvnbU5tEa0apiq0onhTpHOMfvCi0QNr2gSe37ny4Dmq88H/P1z+8fG/8DsbLiwCJNu LtHZUHVsdf5/gGSdQEAr0n6MoF3Q3jpkUFSqzpnSRqfp+EEj/+GN2jK6U+/K9G1mfs/N xP8vkr/t91cbYVdmY0Q5TY7lklEuR8fKcmIeuR1UwnraqrC2p1rgfuivAPemSbba326A QLew== X-Gm-Message-State: AOJu0YzUrt5uq2drKKo/zEYnSi0dhecLfAZ7qhOzyH8Z8gLJSDEwoeYY iKImR1dHg5wQcbt7gjmlA6ncxuhZKhy0RVUEOyv+lkY4D1LSyZtY0hLX X-Gm-Gg: AZuq6aL8lLoBp/48zZM9VdnE7vpkpqNA5EGJ8+UQ6wDoZEoQHT9e8ikZ5zYmf5c9gbW QkG+0e6k75Bs+xuk1E2Ik2yllsgVm1AM9I7t/QkpbypuvEUz+4u34w2CAU3cUzeXywO3DnxHwji ILooJlGGwBBDAkLsAq0sfOPtsNnA+2NzzTMOqsS7q6xnkAhvYDEzyVMPUxnKLvRTOIOYYW6zb/3 MMNbb4beEJlbHXw7MSZKCqZtcM3ztlbthsSyjUGvIsfli7dxRd8XPNhVuhXOzGUtAFvA21VOKBT 5Utsw9jDvFe69bOLtEc3ejAR5YkXr2p6U8y8RLSkhYJzgFGMc6iRZc0XgCWhjthiYEqYPLj9WzB PudYglOfQjqWxoPVydl7VBiLwcXngTU9sxA4l+IlMqPY2Aga6l2FStc/I8WxSWMZqvQFWMo7oAi BRA+uWYMgAyIIZ8wCa4wIxLP/2FTx4C/hp8ghzUCgBFauFRDTFcWzlKnkFR40= X-Received: by 2002:a17:903:1250:b0:297:e59c:63cc with SMTP id d9443c01a7336-2a870e1878amr17910365ad.35.1769519799444; Tue, 27 Jan 2026 05:16:39 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 2/7] target/riscv: add sdext debug CSRs state Date: Tue, 27 Jan 2026 21:15:46 +0800 Message-ID: <2d69ba8204da7d3e6f8700f0c41b72d01c9a6d26.1769517768.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 client-ip=2607:f8b0:4864:20::642; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x642.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: 1769519859745158500 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 --- target/riscv/cpu.c | 10 +++ 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, 194 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 0ba98a62e4..ba8fd1557a 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -209,6 +209,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), @@ -779,6 +780,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetTyp= e type) /* Default NaN value: sign bit clear, frac msb set */ set_float_default_nan_pattern(0b01000000, &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) { @@ -1131,6 +1137,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; } @@ -1245,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("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 5c6824f2d3..a474494dff 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 492fdd1553..4b157ac920 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 Sat Feb 7 08:27:21 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=1769519894; cv=none; d=zohomail.com; s=zohoarc; b=J08fMjPkKhqnieCZxaGQztLYtWkrMIUycaLNdTs4ryJK+W0JLHHwMlbO4mO++JagkLux957qqzNA4uwObXuWT2bCSOiNWkbdyMKsbo+1FahpALi/9vzquWD1HP0C0Vznw3hr+j8Avl/1ZXs2CJrW0xA0Rmu0qcg/m5te+YZalmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519894; 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=dAKoSN7mWcRNGhupTzLMUZwEFuXsEho0xzWOYUXHY/Q=; b=WWkNkYluNIUs1cXEE8QSi8iasbbj5Ay2M8THJtw6CiNH1Fsp1QWbAKyKFyp9v2//95JQ7fLr80g3Effa0hLExM8hmgpBTtn6yh50vxwORCIhm071UnDVOvAqp1RhxfntrAcblp6j4fvvvdwDO8UyrLjQnb9tY4er54ZAuWsd92I= 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 1769519894120109.3136444121917; Tue, 27 Jan 2026 05:18:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwG-0007GA-1g; Tue, 27 Jan 2026 08:17:00 -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 1vkiw5-00079J-Aw for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:50 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkivz-0004al-TQ for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:45 -0500 Received: by mail-pl1-x644.google.com with SMTP id d9443c01a7336-2a0fe77d141so32778845ad.1 for ; Tue, 27 Jan 2026 05:16:43 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519802; x=1770124602; 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=dAKoSN7mWcRNGhupTzLMUZwEFuXsEho0xzWOYUXHY/Q=; b=GtQuj7ue9C6mo/lWayyY/yFPr4rTYoz2bWbRN6vxJFDHfHn3Nbd64XRRBmeOk971vh v0Ot6209g09dtBiW29Vvr+7iTQ3NwXUVqAoVywNBFFUvLFQJ/Y2xW8a5UxYhTPn5AHsG BD0nt7/7WUn7F77cEDDKkSM+sJfypoIIROJnhz7/Kv2nUjdDDZ6vVTuY9ICl9Asda9hb hjBE8mrL2PHGQrpMn27Cj7p3KP9fGzmcfTCXcj+J7R+p8Ink7sCVMGPDcAZJ0HrGpuax Q2oYkKe67Lpr+KTfoHCdrtFMdl4fy4OhFEQmK8iAue+caf5YiWkw+L0o7mh/y0Im2KeA SC+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519802; x=1770124602; 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=dAKoSN7mWcRNGhupTzLMUZwEFuXsEho0xzWOYUXHY/Q=; b=kAoxe6Klq5YpGtYLpwXvGuS0CFVwR9lg+0MsjU+rnklL1WsQIo4GqXq9ed24tXyCsO 59fMFN0MkzE+yxTZ3EDzBNG3fTRe8WISH2dJbvNbjYTti7q0M3i+4nfdzXvv8DO3nNJa /0oFkdR68cxkRkobU3E7MalSxX+N7IaW/CBayHmhUTuMSq87LSTinlTwYGFkKL4SXbfV w6J+l5x/NXOjkijQxOXIdf0xhDPUhSxXLViw7tETSoxTQi2KYgc9Jb83qrGL94BY6cyS PoMz2/vrO8/phHYGx7r28utPUVt5l4OKD/S+vBt1vecJoAP5qvzbcxxscCJA6KzcmfVI Gyig== X-Gm-Message-State: AOJu0YxoKu3Z0A/SNm/wFjtTkYUGlYdF4EF6XbHAAuCGzAAn1t5M+shw A+5MlDbwpYbT0oPeyZ+ZVmDckp3HLoJJlHb1pzTXaOHgnZYbnSQAenQY X-Gm-Gg: AZuq6aLqITP/aMV5vOIRMs3DsuB6uKX6R2SiONyoLq62U2CFdRjQA+iQYiMj2jLh2BU DEElCBXKvty/WVLkRR6BoO6uWUQjNZp4dcVcBaK/HeUcH/FiCWh0YQAArbN3XJkX9U8CjOQq20J 9x6JAYZg59fHa1jxUZgZpea+4ijjhM66KWRzaW6tb1O8N6MSoYUd/W/tRUESrIm8a5rMLfQgQfc IuhjUy0Dz2xT6ujs3NaDDuSfU1Xman3h3f0hYVvVngukGB3YAEH4yKpm6ouXvnN/R4jlab38VuX lorvKDoGOzuhdWIJb83D/ralDE63aXw5onDwZaFSgw9bu4nKwDTBpt5+vQF+Cm/NBpD9+zWYZfS Yp0r6d5Cdj6tCD/vtmXgGD2Hj306lfoRmfUuQXcmjqM1w7fbkxKcqGuTRYLQERFvx0yXUlhT7tg VSXSMWtjKpmvh4SCwDEft0P2uwR6h65pPUQWd1b9BISor3WHlNcgDCC+WoF8+8nRx3rNphKw== X-Received: by 2002:a17:902:d552:b0:29f:2b9:6cca with SMTP id d9443c01a7336-2a870ddd6b3mr17142255ad.44.1769519802264; Tue, 27 Jan 2026 05:16:42 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 3/7] target/riscv: add sdext Debug Mode helpers Date: Tue, 27 Jan 2026 21:15:47 +0800 Message-ID: <7efc36a07cf762a62d151cd257f3e3d83442abad.1769517768.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 client-ip=2607:f8b0:4864:20::644; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x644.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: 1769519895895158500 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 a474494dff..4a2509e002 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 799e907991..1bdef55d9a 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 Sat Feb 7 08:27:21 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=1769519926; cv=none; d=zohomail.com; s=zohoarc; b=HEJS4BdbYU55qK8l2jws/88V+gVLGYDPVSsk1UFKVFWE4pMwcX3clajmyXA3dxS/uF30Zp4hZ96fS8qRPsj63UncnP/29QtQy5g2j9mSjqKDJpRKh/JmOb/jVNZKzELmQvDaQOXomozJi5nM6uMe+apapk8DUq1widy7dakWdlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519926; 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=Mm/3dAQBor5aHsIKTr1YNKoYJvIqXNWkdCE6WmE7HoA=; b=QUrl992n2iQ4l89L7VB0Clm7Ud/wgFsUlRywhgp+gBl2NNnjjVj+gg5QvXv3puGwemHnpPDg4jS8aOatE6AV9PXed/6pA7DMVXDXrxGqcPm3dtjKd9yrcI/ej19EvCg3oq2AEfeqlr3cwy9AemN9BuVdJuIhVa2YHD4cMeTQ2Jc= 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 1769519926530795.2451191763712; Tue, 27 Jan 2026 05:18:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwH-0007H3-9V; Tue, 27 Jan 2026 08:17:01 -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 1vkiw7-00079l-Mm for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:53 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkiw4-0004b9-28 for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:51 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-2a7a9b8ed69so59826655ad.2 for ; Tue, 27 Jan 2026 05:16:46 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519805; x=1770124605; 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=Mm/3dAQBor5aHsIKTr1YNKoYJvIqXNWkdCE6WmE7HoA=; b=nPvFYAbyq14aZicxHzNSYRMNgaGqNoidfDzhATtLgKm9AkhK7lO7stXiF3WIhbN1jg Q4fcTAGi6fwVosGbuWaDVYq9k5X+h6zN/z8+oYFKY57mVSAW51qWe3VU6yinLtqC44Ax /6UCGG1fPPoiXWEIjtEhcuMqmIfeVW3TEcKVN1PdBiiXJkVdFps09tUiK8rzFeZooVJZ 43McAMa1fhBhdHwLs4qzlDy051Gt+/sOlWhjd+jL4/3NmKFEjD8Lz3fWVhkIf+mLmsp0 dNMbC9IpIArvequsiG/9G9LurtVHmlr9xj9MDFLk9mZMgnvIOlFTGqlK1pv84j3j28FO 4cxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519805; x=1770124605; 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=Mm/3dAQBor5aHsIKTr1YNKoYJvIqXNWkdCE6WmE7HoA=; b=JFs7jU7IMMvKdm2bDWPtLoX/wSsjfFSQ+aYxIcpTIPNztB41gszbyukN3fN7MFmR4t wNi3Tr6nMgaxX6spvyUOjYNrHgYfW0HAApQWwwd3XbhcYXi8rO3RKN5Wex7BU3i18V9A uPlZ7qUKkbCIxv2aOr1xnYMrL6TpY9CQ/ejydktV5dJlX5v6a+qljyg8AWIm4KhL3/86 y1/WaTidlpo72bxxW+rW79euoqr1xsvBWztD5WbHR4pXa20IX65vhN4IPFbmysh1N23V PjwjMB+daYbUijJ71Df/A0H8T4sOT7XlGydbybmh4VWn17PKuy0jLN4Va7zzTNLyF/wx rlXA== X-Gm-Message-State: AOJu0YxandXgQs29HYHfxH9kVzGAJsE83WuSzUaRJEzwWXXWdy0sMNab dGnsat+CI8d8ku6+znpN2eMTFJJLjpwMTHOXdNCueiBmKFJEnqRwkT30 X-Gm-Gg: AZuq6aLaK5r3OgDaL/apH21u2B0p2BJ6HJ5iqZO4zSi6bKvaH3Ymy7PnKMyIstmSKLj oEJw+jZF0TH+6l+81rlhNFTT7jViASVGD6lg8sOxN8QHpqZ6GKbuvyaU8LplkNBNxbjoyyM8yEA SyaB3ixzZI5cjDNryy1TjlkG8PWiNqJzN5CnjuY2kVroiSkA4Ojv6a/xWF4DaMilywgWh3b5Q0v ThC8QMbLDkhE4mYhROdsvDVGUgpJV/F5uTwDsF122G+32AVOq0CDKe/o4PowH8jdm32gqDnZ+5T I2+COKH+U1RiAVbvi4KPlDtQL/tWg+sSQbgjFEEabTzbRbeftudPP4Cv1XqldoYiqGFIH2Khe9n SfNrZcPeCc0pf9G2spIYXxaffWm0YVoY8daxdWsoOezlc3+maDZyikI0oOSQFANtNZD6WHp/X9r wSNm7WRpbrP2enchywWbBH3uR9oO+XOXcKVXzMkqNReRyVEO2oyWwWFePEb8w= X-Received: by 2002:a17:902:f60e:b0:2a0:bb3b:4191 with SMTP id d9443c01a7336-2a870d7a91dmr15791755ad.12.1769519805099; Tue, 27 Jan 2026 05:16:45 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 4/7] target/riscv: add dret instruction Date: Tue, 27 Jan 2026 21:15:48 +0800 Message-ID: <83a9bb4ebe16311c007ab4968e7445d121256e02.1769517768.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 client-ip=2607:f8b0:4864:20::642; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x642.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: 1769519928027154100 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 b785456ee0..6140b6340d 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 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 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 Sat Feb 7 08:27:21 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=1769519928; cv=none; d=zohomail.com; s=zohoarc; b=EYvmrwg7chxq7fpTq1xdyV9qbii+e9g+6dDnrI1kbISwx1ZARh3T0ov2bk/Ob+azYBp7Mm/7twYT/v/1j31WZ9MgEvG6gSG6eTnMIuMRMeevxSwM16ZtwgIPWlMoT36WuIhxdNJ+QwkiXCBE6OLMRHRU5+uTxL9hKXma9hKmCxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519928; 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=P7s36Gnhgk2Vos6o6JQQC1qIECPmtRU7o2DM59bcTqc=; b=Oi+70z8k5SDIcWztg81fRsjqHk1iwmhtFqHKtH5cyOldGqt7coPJyDqKL7XBHOLC16fwbrZt7jEYiDc0zbV5U/JqKdec4YSHBfYsTC+YIbvlvabxsbM2xewh+vJ5/Pq+8a59nWa5y3KxLN7yFwr0GQxXfc+t90aGVGQCT/tIIdo= 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 1769519928355715.781020842333; Tue, 27 Jan 2026 05:18:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwI-0007J8-GA; Tue, 27 Jan 2026 08:17:02 -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 1vkiw9-0007AE-Ob for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:54 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkiw5-0004bR-Mq for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:52 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-2a2ea96930cso35441405ad.2 for ; Tue, 27 Jan 2026 05:16:48 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519808; x=1770124608; 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=P7s36Gnhgk2Vos6o6JQQC1qIECPmtRU7o2DM59bcTqc=; b=WRtwW2N3Yv+x2notsZhM9RZGYW3cDWdzwNNOIK4crKKWFJsxtd1Lx7QEIoN0ZWicrN tg68YBe1hkdfx/YuN+HgEHVr2kmEONFk0tYcNLW8ZDRE/wlkrRvznGpvgsjO53y3wxZS uIJDZMbv9V/Z989VsJ/Jexg1NpIYIxVT27xB3dYAo0m3PI4j2cYnTTY7tt4GMepY4CQO ShzDtUdXsGm/RnyRD63rumF/2fc8YSSWL5J2Cjyh65yd14sPTTKO+LOoOapeWG7703c2 lP1WuRNgG5TCKeOXp+ZOZKGofkhRBPvkKzlXmRjXOg+v2I8csQpgJbCPU3Oqvh6o9+uz tmZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519808; x=1770124608; 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=P7s36Gnhgk2Vos6o6JQQC1qIECPmtRU7o2DM59bcTqc=; b=gfku3QrmHVnd5a7+sxOkjQ3fMY8z+5VrYWEiUPQN13pa6bYO2AfXt3/3CapQdO0lUU x374VGdhlZjKpprMv+ZV+RvWXsbaf6dGYBmzTgxrOnAOeByCcIB9t5U6ZnZi+nwdzcWy p8kg1za0wvRGWEOFCr8rLm7Uuf+CYW8mWXKZmxNEH+eXAEV3HxA22SY8Lza9H5fPiqsl NgVrKpiK5oEONoS3nUo9eSy4YI6nPxKmGgVn+mXc2SxEtPSY2Iza4EZb0K29ADqR8i9j 19hyPE373U2SD4mCE8VeE4DTsLDkxy2pHSR/7ykY76nKvX8VPpPPp5osnv+eIXFT6M1n Jb2w== X-Gm-Message-State: AOJu0YyFRvcHH/M56VLg0XpJpf/kfvPTA8pb6tQVIakF+VaLgHVUZEJq aIzU9XqAacvqUcCh53aiOwkk4u0KEJ0iwTgZl7HNnjwG3RpHky30atQ+ X-Gm-Gg: AZuq6aKJO0ZDubQzKyWOd2grYEPJKLsIW3IzmSIwl9A8xZb3vhKiEqcLQCPR5TSe/GK bRhlkZZvVNMgQMzPPZs8wSU9UNbs6JkgRKJnhrqDd2AzM0WreVH7mCG2XrKTfm0A/B+pSfUyZQ2 kO/3FVwV++JkAtPlJ/CcuvPn7ullkX4lxlETFJLvOZ0Kq8JOT2DtutQhbdpEZENKF7LwgLfeGWd D8l7DA0OrimVVs4/z4CI1uFHMDkKg+NqClMuftWSjB8dBHqJ5QD8MO7GzvlwKV+HPNJobLjXsRF UfpAcf9GYW3oQrxnaR9vK3+a+7R3TTLFakgdJlKvzFOqJaKNKkepZCs1kAWUsQF9d5kwlDntFNE IJc6EIJcqL3RLswJJ6awZaTjt/f9nL9AN2gbrvxMFOuWflvLfjdBza2HK/3kNrCL9ug6XxXFqqg VmZGWsMjSsddf4ozetR2T7nImui8BZjIWmo/jGZf99ueTBxSNNisypj5vY5fc= X-Received: by 2002:a17:902:f60d:b0:2a3:e7fe:645e with SMTP id d9443c01a7336-2a870d58d36mr17593205ad.1.1769519807845; Tue, 27 Jan 2026 05:16:47 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 5/7] target/riscv: add sdext enter Debug Mode on ebreak Date: Tue, 27 Jan 2026 21:15:49 +0800 Message-ID: <11206be920f2d74fcf25db2c8cf145720f69ecb0.1769517768.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 client-ip=2607:f8b0:4864:20::643; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x643.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: 1769519930654154100 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 6140b6340d..acff73051b 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 Sat Feb 7 08:27:21 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=1769519926; cv=none; d=zohomail.com; s=zohoarc; b=DTXHRnP9RIY/Od71A/qKykY1TxQE0wEGYXsZ8pIXAQNnVAn2W2/FjUYuKSgKvAH8oBhbO3Dxn+y5DUsYdAbfvSu4XbcbFNQulIHzbRB5ndY99vI2q3dqvEG6bugesvDO8YszKpB3F/DwTvJS6Sd4eqOQyy9kHZsKx7mUSQ29jxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519926; 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=VLrX4WceHRAasUz6JVBvvYnwaCVndNcPYB7jYphsrzg=; b=KQSH2dgvWkmRnWcEI+t8neY1VwNR/yEs0LOJ44N6tJWlSu/efdZM/MCgmrkkP8eUvM5AmmdaJ7lnoFC2gPJghcZChGzbTrSALtXg/5/l3E6TwQD7DJ46Kpe9k86zdh7hlKW+JaOWFSof6m8wD80N0Irn9GFVLibP3KiIDGWz6yk= 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 1769519926423186.2604918803579; Tue, 27 Jan 2026 05:18:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwG-0007GQ-BW; Tue, 27 Jan 2026 08:17:00 -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 1vkiwB-0007Cw-Lq for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:57 -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 1vkiw8-0004c0-Bi for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:55 -0500 Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-2a0c09bb78cso40334525ad.0 for ; Tue, 27 Jan 2026 05:16:52 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519811; x=1770124611; 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=VLrX4WceHRAasUz6JVBvvYnwaCVndNcPYB7jYphsrzg=; b=k+iU+CyWnAZasRTk9bewJX1ngJHKG1Iew8xACU7WJtKpXS6jZZWCiNntN+1je1Qf6w FrIcb5p4InRu9il/TgrxFnIgd0eDnedncb+rEujlcNKL7EwDXrb5ZkDcs7zBXOnGZ5oc uNIHWGOKzISUy2jptBzRnpkcYlOBFrqJOzy+AaIYwJITGkd6IypDIccZZwRhxpfY47rj BjmSNKXE9fiYv5lI6VJT/xsPCMPR07PsSwmV3IX+gFR2D5Vvr1zjdGMSTG+coTaiL9dn VVE0NOfpCCojKhCiJlLhWC3kp2m6Gnzhl/pSFZYF8QIe5kOaZI5A4TT9c4k44KOxhqak M+tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519811; x=1770124611; 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=VLrX4WceHRAasUz6JVBvvYnwaCVndNcPYB7jYphsrzg=; b=eGeKdM44aZKB7Ynn0JBo3J3WPj1y3a5d+eW1x7Fuz3d8hGmxEaYcasOpz0k6PbdDTw gTd6cB9HAWA0Yyng/UwAWWwoMG6S3ngbn7iP6iq0yuSEAyrhinBb0S7d/en+xHpLssu/ Dzr38diCxfphTyih/+rN7E9EaBd8H4iykPvgZL0FsjmlQDtiHIwlWjbinwRt4c8R7pZS QemcaNavlUlXZKeT1dreZhT6riQczw8/sXSe6fneV+Z2DH35pk6nw5EkFgmEU/Lf1CnY +4BdRXFAwcufbwRkhfc6c+Rk/VKO62cd0VCCY+JoaQBm/oGmMElipu1bKKMhdq1bLUm+ sReA== X-Gm-Message-State: AOJu0YyUPGv07GrHKSwhPMoJVUZA19mduuTsfgfXy7IESl71CUQzS/ak k+PuMMspx7qFD5HCHCu6LZYi+NnY/bW6dBdjMTeozI5uFbNTXotlzcd3 X-Gm-Gg: AZuq6aJgRstMSI2jlprLArEHYMAS9KjLSoeu5L+A0TVIsnDDPL4/nwuso5fp9ROkxeo raMYwis6imh5DM04N4qUKJnri+vFUOT8V1hvecIlk8rU1jvcCV8DAPgcm2WTstcfOhN9KYtfqqi 1EsDDo/WCpONQwgDuGkskVj9kLuQk7vWftvhtayZaMtCRnyfTFUhQdIf1r6YD9Lkozcmk74Hmd3 Ogvug/i+mOgKjRg/yBWBPLD3FG4BV0Pr9KBeLCLzMNJWQEAqUFFh2gTXJ5mrtV8VQ8BH9xdH8m/ RmWjn8eoNGljAz29p3bc3g4J0xkCAfk9+wlFRlto/0SEE3AmSmKE4Skbc1ii0ZakWA7eMnbcRDv xcoRq9RgxLc9UehnVmIDoh3wxPI/mxH/mFqYSf7XpQ9MR9mfv+QtSGsOCJ++GSfyAk1vViDSmeI Fqq/LwTOlbWg0AZJK1qWtMjAiQ+ischYVsQpgehOzIimXeJcYoX67DGbo+UxQ= X-Received: by 2002:a17:903:3d05:b0:2a7:5e7a:5e80 with SMTP id d9443c01a7336-2a871366f2cmr14075935ad.26.1769519810726; Tue, 27 Jan 2026 05:16:50 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 6/7] target/riscv: add sdext single-step support Date: Tue, 27 Jan 2026 21:15:50 +0800 Message-ID: <07fc1ddebad14dad52bdaf4937ca93c6399e5840.1769517768.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 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=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: 1769519928046158501 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 4a2509e002..805fe23411 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 acff73051b..0b709c2b99 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 1bdef55d9a..935ebfdeb2 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 f687c75fe4..894fb27727 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -110,6 +110,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; @@ -284,6 +286,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(); } @@ -294,6 +299,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); } @@ -307,7 +315,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 @@ -1338,6 +1347,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; @@ -1388,7 +1398,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 Sat Feb 7 08:27:21 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=1769519930; cv=none; d=zohomail.com; s=zohoarc; b=X/vgXwIWxLTLi0ugDEN6jGYyzXYDTcHhlfXW1zesJgWCBwVgvlX1nALlNbrLIodoCwkZqaixikwhV5otphe5ZpqovDp1LxYNO91Y/9c9g6nhZWqz4jhqZn4+w51S1nae873ffjhCS2yWywZa02DH9ApLfGuQQQU68PMdMQBM63k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769519930; 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=A1y6UC7Iq2lpCVJJGC2uY+4u7D/x1jjSUHZxJPI/sw9VxV9IxXdDrwIR6ipunzPMyrrGlN6/jEIG+18kjX1Gu2P2hejh31WWelyWUblEWE6bpc6N5RPCIu4avnCI5zVFPlD+5rCcck6+obcweYOMPQiaty/v98shRJ0nMfRLu+s= 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 1769519930663664.1093615481016; Tue, 27 Jan 2026 05:18:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkiwI-0007Jr-RK; Tue, 27 Jan 2026 08:17:02 -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 1vkiwF-0007FG-GN for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:59 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vkiwB-0004cO-E2 for qemu-devel@nongnu.org; Tue, 27 Jan 2026 08:16:58 -0500 Received: by mail-pl1-x642.google.com with SMTP id d9443c01a7336-2a7a94c6d4fso26742795ad.0 for ; Tue, 27 Jan 2026 05:16:54 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([183.195.23.113]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802fb03b4sm117164345ad.82.2026.01.27.05.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 05:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769519814; x=1770124614; 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=QcJlRxDIXWrLF4Ly/tUfWFIIqXYF6wDiKziLg2INKIEEpEKt3Wdw6MHf3DT9Aa0KK1 ABaDpslwE9HzA6RfoCZF8HmEH6SYAFxl8vab/g9IrA8albVz/apLIm1xFAKDKgg0XZQC MiqbU+7rm8QXSCVI1raIx9HUnhxGqVALVBAgOyOk2P7jA7s31LOB5rjcX0Sl+PddfLUH Ul3XOTS3ESbLzxF/HRZYWYtMvHgAc7wRC4cy/nJeYarFi2BeVds1k25Gda1BeR3e+lt5 zfq+O9KC23NfSGhaChTfLH/Hf3DhdiG3YHXpeGxLGyfLhBJNq21nSpxcTkFjp4GiJKrm 3p4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769519814; x=1770124614; 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=D73E/JsVocDQuQIi+5O9cVhbD+EcLLRAmXMDboRmQ8CQ/pN4eqcM2nddsXJ7d3p5K0 jiHLJdBqsX/qeIIUhMLYjBu5mKfniIQhMMM6G/WaI3DDD2k1iAuoDCcQ+LIcgvPoVcun EE0KJLmCn9XSRVl2rl7q6tf2gSXocedtdwG3JCDMEGqCNVAlo0fi/0fsmpkGowRttAza HCiUwKpox/zqSv1KA5xINn7Y/LdQ0hkNhBC+ls15di0OZXroOa8rDF9BVg1BbAuzdECh WMK9CcOWy5WTcmBbCkJ1VNewWCJINEzeHWsTXTMfBVQQRLS3ldqQOlNh217HHGBocJdY 5xIw== X-Gm-Message-State: AOJu0YwY7MUSpAPYhK3iI8cnYWCEjyuKLxZ7VTHMx2PHSUq03EygBNIg tUEDRnoWZ6ciZeyvGu1hNymIEi6xjACq8IWSMonQBrYN9YgDcdp6Bfwq7dgBGAxL088WWw== X-Gm-Gg: AZuq6aLIUGHF8yfL5olXSL67EbzUU0hX+gl3AluZ6p06+T6L47fd4UvvjiHO34LY7X/ O0d62WM513GWxQQ1UzjBM60IyjxbLxpssHUWEaYOFoqvDAq7BlVbjpITD+Tf0mzdmW3ogYldzJx 3slt38kkH+u+BO31cL2JyZdDJEqZN6ChdNC3Q8gM+IHnLgIcmzgtl3XCoqsAfOua3mSlm3rvVrd DcbThewyysvgN249OHTKFujOH9W3v3gLnCL/jrGoGHNi0TaeuXrk1G7KMIWL8XGcyObEFMAxHCe h19D6MaBqgg5QUfce9LMa4KqwUQ++wyRyWiz+xGbboxdq2sTwAzjpYsszd4OuH+B3htocZ3l2j2 tLUn4FxYK+mkw9Zj32x6ajunb42DE0D1qVjxioAaTLy7OZgXgsh4vVlVxD1G5Glw1LKDHLHkOT8 fCSHSbQzeW/e1/vS7a+q/2ZSDOn3rk335yvl3ZmXh3BfEKne4ABR2EYB5C8bQ= X-Received: by 2002:a17:902:da2d:b0:2a1:3cd8:d2df with SMTP id d9443c01a7336-2a870e35032mr17078785ad.54.1769519813648; Tue, 27 Jan 2026 05:16:53 -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, hust-os-kernel-patches@googlegroups.com, Chao Liu Subject: [RFC PATCH v3 7/7] target/riscv: add sdtrig trigger action=debug mode Date: Tue, 27 Jan 2026 21:15:51 +0800 Message-ID: <0fa8cc505f0c9f863aecc71710f77c7af76d7586.1769517768.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 client-ip=2607:f8b0:4864:20::642; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-pl1-x642.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: 1769519931823158500 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