{"id":2222475,"url":"http://patchwork.ozlabs.org/api/patches/2222475/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/51360220ee90a76ca326a4205f1f62b34a4a8624.1775959096.git.chao.liu.zevorn@gmail.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<51360220ee90a76ca326a4205f1f62b34a4a8624.1775959096.git.chao.liu.zevorn@gmail.com>","list_archive_url":null,"date":"2026-04-12T02:20:19","name":"[v6,2/7] target/riscv: add sdext debug CSRs state","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aedb8f6e288248278e8da1b07c29cc01e55f5723","submitter":{"id":92265,"url":"http://patchwork.ozlabs.org/api/people/92265/?format=json","name":"Chao Liu","email":"chao.liu.zevorn@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/51360220ee90a76ca326a4205f1f62b34a4a8624.1775959096.git.chao.liu.zevorn@gmail.com/mbox/","series":[{"id":499584,"url":"http://patchwork.ozlabs.org/api/series/499584/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499584","date":"2026-04-12T02:20:20","name":"riscv: add initial sdext support","version":6,"mbox":"http://patchwork.ozlabs.org/series/499584/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222475/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222475/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=ja5wGNqP;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4ftZ7v3FyTz1xtJ\n\tfor ; Sun, 12 Apr 2026 12:22:51 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBkRs-0004CX-Ac; Sat, 11 Apr 2026 22:21:20 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBkRr-0004CH-AN\n for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:19 -0400","from mail-qv1-xf43.google.com ([2607:f8b0:4864:20::f43])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wBkRo-0008Fy-Nv\n for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:18 -0400","by mail-qv1-xf43.google.com with SMTP id\n 6a1803df08f44-8a154cc6a48so37514736d6.0\n for ; Sat, 11 Apr 2026 19:21:16 -0700 (PDT)","from ZEVORN-PC.bbrouter ([162.244.208.119])\n by smtp.gmail.com with ESMTPSA id\n 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 11 Apr 2026 19:21:15 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775960476; x=1776565276; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=4l2xGOlFrRIMDi280dAJubGh82OnbmlN4aOQKeFT9Bk=;\n b=ja5wGNqPVP5Zh9GZxvDSrJ8+yoEZZ6/r2wOnf5CZ+WKp2FRy2heigmmlw6SFthijnV\n pEHFYZ7Hu0xDwzkGdFzSDeYAmHNL6nP6ZwwclKEHVgN+OthKW122fvjh8OA2A7H7tWZU\n ajwELJ6SUAF9lK5kd25LOj6B0Oiqo5jrhYFh4AD4H5gNPYdDyymRA3qxyNPXJ3WRpzvg\n +g1HmVmACn+Mt5wqDSQ8Kqmo+MeboitRchU0JNZm3HgEfujA89UkH7pKZYqCtOQBL3CH\n vcwsD25uSIJTRUp/D692iqeiHoFuyk4YAWQa07wJUaCeXC/GRtdayY9hHN/IQimC1Lvq\n KGuw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775960476; x=1776565276;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=4l2xGOlFrRIMDi280dAJubGh82OnbmlN4aOQKeFT9Bk=;\n b=P3uu7rDi95wuIuyj6+lfW6j3SaA0HUBhGJkmw16XYGMp6Q1JOeXVcl3hXRukzLVMas\n o0F8zqwOer8xSivJYOmgUm1To/SklOeraA3k9PaSUTE/03znISKbgEAepBcPN00jpDI8\n PI0i2Kae6wCuL+u33Yki12mDzjC3k6BplObxr8hsE/MSPgzN6mViBVyI2LT3uDtkG7mZ\n WjgBdZJ8jusT/+ryBX1kUgRLBvE2W1b40RnH/4dCSLiSOyrorXn03EXj0oVD0aVGmoLA\n 6q/uBVQ6OP1E21fRwlyqp6xPtHBz08W6KQEGw62qsH41brSSUbI5BOyKBU+EiM5zUcdA\n sPrg==","X-Gm-Message-State":"AOJu0YwM3DG+5LFBVPC+pKF9GRodn2B6M6s6K1HL197wGNo3YehNtqDM\n Z49Nbuvh7WK9x1a8N2cKZt3vWMf4cf2AqvndNGabwPLsJA6ZK0n7HdfU","X-Gm-Gg":"AeBDiev2C1udPt0vlsEouQItruRXbRn1+OlHhADjqT+PSUfnCNyq/CEMddKvOl3N3p4\n AGa7GdFKrxGIJ8FTaUIw/bXI1NNhRLFVJGs8po3jtSD856yi5e6QMzAqivX43FNIeGVO5SorUb5\n 5fbs3vRQbHxalmqRkNAS8P53iftHbt5siY6ny+xbD++4dJCQd0UU0ShutTgXJm1hwdTpgXarrUg\n bBRDbnj7ZYwq4fAythwJ5V9Dv+Eb+AKHATvBJ70oeRr6ef4NIe49jZicVH8goVBvuNWPFcDZRZV\n ITRsiz+09W4SgTAaofhMONIETE4/1W+8zt8iL7l7ALtimBggKM369YS9hZ0u7qp/t+oqHFqteVy\n etNkyZM9x8p7RQtUJ5vyY42mNQ5V+pbD1KQKOK88k7Gdii+E6OMq8bHWavutmuSREZ46F0fXUBz\n q7KGZkMW4MSuHVMZ/Ip/UC/Qj3yUpjHhLyewiG7vwAb4Fk0MWcdXMqVpGSbPXPLEE9KGrl","X-Received":"by 2002:a05:6214:4c84:b0:8ac:a6c5:c7d1 with SMTP id\n 6a1803df08f44-8aca6c5c984mr4860756d6.8.1775960475626;\n Sat, 11 Apr 2026 19:21:15 -0700 (PDT)","From":"Chao Liu ","To":"Pierrick Bouvier ,\n Palmer Dabbelt ,\n Alistair Francis ,\n Weiwei Li ,\n Daniel Henrique Barboza ,\n Liu Zhiwei ,\n Chao Liu ","Cc":"qemu-devel@nongnu.org, tangtao1634@phytium.com.cn,\n devel@lists.libvirt.org,\n 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":"\n <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":"8bit","Received-SPF":"pass client-ip=2607:f8b0:4864:20::f43;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"RISC-V Debug Specification:\nhttps://github.com/riscv/riscv-debug-spec/releases/tag/1.0\n\nAdd architectural state for Sdext Debug Mode: debug_mode, dcsr, dpc\nand dscratch0/1. Wire up CSR access for dcsr/dpc/dscratch and gate\nthem to Debug Mode (or host debugger access).\n\nThe Sdext is not fully implemented, so it is disabled by default.\n\nSigned-off-by: Chao Liu \nReviewed-by: Daniel Henrique Barboza \nTested-by: Tao Tang \n---\n target/riscv/cpu.c | 8 ++\n target/riscv/cpu.h | 4 +\n target/riscv/cpu_bits.h | 33 ++++++++\n target/riscv/cpu_cfg_fields.h.inc | 1 +\n target/riscv/csr.c | 126 ++++++++++++++++++++++++++++++\n target/riscv/machine.c | 20 +++++\n 6 files changed, 192 insertions(+)","diff":"diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c\nindex 6208201538..de9ba8dfb0 100644\n--- a/target/riscv/cpu.c\n+++ b/target/riscv/cpu.c\n@@ -210,6 +210,7 @@ const RISCVIsaExtData isa_edata_arr[] = {\n ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt),\n ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx),\n ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin),\n+ ISA_EXT_DATA_ENTRY(sdext, PRIV_VERSION_1_12_0, ext_sdext),\n ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig),\n ISA_EXT_DATA_ENTRY(shcounterenw, PRIV_VERSION_1_12_0, has_priv_1_12),\n ISA_EXT_DATA_ENTRY(sha, PRIV_VERSION_1_12_0, ext_sha),\n@@ -783,6 +784,12 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)\n env->vill = true;\n \n #ifndef CONFIG_USER_ONLY\n+ env->debug_mode = false;\n+ env->dcsr = DCSR_DEBUGVER(4);\n+ env->dpc = 0;\n+ env->dscratch[0] = 0;\n+ env->dscratch[1] = 0;\n+\n if (cpu->cfg.ext_sdtrig) {\n riscv_trigger_reset_hold(env);\n }\n@@ -1248,6 +1255,7 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = {\n MULTI_EXT_CFG_BOOL(\"smcdeleg\", ext_smcdeleg, false),\n MULTI_EXT_CFG_BOOL(\"sscsrind\", ext_sscsrind, false),\n MULTI_EXT_CFG_BOOL(\"ssccfg\", ext_ssccfg, false),\n+ MULTI_EXT_CFG_BOOL(\"sdext\", ext_sdext, false),\n MULTI_EXT_CFG_BOOL(\"sdtrig\", ext_sdtrig, true),\n MULTI_EXT_CFG_BOOL(\"smctr\", ext_smctr, false),\n MULTI_EXT_CFG_BOOL(\"ssctr\", ext_ssctr, false),\ndiff --git a/target/riscv/cpu.h b/target/riscv/cpu.h\nindex 4c0676ed53..2a265faae5 100644\n--- a/target/riscv/cpu.h\n+++ b/target/riscv/cpu.h\n@@ -476,6 +476,10 @@ struct CPUArchState {\n \n /* True if in debugger mode. */\n bool debugger;\n+ bool debug_mode;\n+ target_ulong dcsr;\n+ target_ulong dpc;\n+ target_ulong dscratch[2];\n \n uint64_t mstateen[SMSTATEEN_MAX_COUNT];\n uint64_t hstateen[SMSTATEEN_MAX_COUNT];\ndiff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h\nindex b62dd82fe7..bb59f7ff56 100644\n--- a/target/riscv/cpu_bits.h\n+++ b/target/riscv/cpu_bits.h\n@@ -467,6 +467,39 @@\n #define CSR_DCSR 0x7b0\n #define CSR_DPC 0x7b1\n #define CSR_DSCRATCH 0x7b2\n+#define CSR_DSCRATCH1 0x7b3\n+\n+/* DCSR fields */\n+#define DCSR_XDEBUGVER_SHIFT 28\n+#define DCSR_XDEBUGVER_MASK (0xfu << DCSR_XDEBUGVER_SHIFT)\n+#define DCSR_DEBUGVER(val) ((target_ulong)(val) << DCSR_XDEBUGVER_SHIFT)\n+#define DCSR_EXTCAUSE_SHIFT 24\n+#define DCSR_EXTCAUSE_MASK (0x7u << DCSR_EXTCAUSE_SHIFT)\n+#define DCSR_CETRIG BIT(19)\n+#define DCSR_PELP BIT(18)\n+#define DCSR_EBREAKVS BIT(17)\n+#define DCSR_EBREAKVU BIT(16)\n+#define DCSR_EBREAKM BIT(15)\n+#define DCSR_EBREAKS BIT(13)\n+#define DCSR_EBREAKU BIT(12)\n+#define DCSR_STEPIE BIT(11)\n+#define DCSR_STOPCOUNT BIT(10)\n+#define DCSR_STOPTIME BIT(9)\n+#define DCSR_CAUSE_SHIFT 6\n+#define DCSR_CAUSE_MASK (0x7u << DCSR_CAUSE_SHIFT)\n+#define DCSR_V BIT(5)\n+#define DCSR_MPRVEN BIT(4)\n+#define DCSR_NMIP BIT(3)\n+#define DCSR_STEP BIT(2)\n+#define DCSR_PRV_MASK 0x3u\n+\n+#define DCSR_CAUSE_EBREAK 1\n+#define DCSR_CAUSE_TRIGGER 2\n+#define DCSR_CAUSE_HALTREQ 3\n+#define DCSR_CAUSE_STEP 4\n+#define DCSR_CAUSE_RESET 5\n+#define DCSR_CAUSE_GROUP 6\n+#define DCSR_CAUSE_OTHER 7\n \n /* Performance Counters */\n #define CSR_MHPMCOUNTER3 0xb03\ndiff --git a/target/riscv/cpu_cfg_fields.h.inc b/target/riscv/cpu_cfg_fields.h.inc\nindex 44235bfaa1..3d2de307a2 100644\n--- a/target/riscv/cpu_cfg_fields.h.inc\n+++ b/target/riscv/cpu_cfg_fields.h.inc\n@@ -46,6 +46,7 @@ BOOL_FIELD(ext_zilsd)\n BOOL_FIELD(ext_zimop)\n BOOL_FIELD(ext_zcmop)\n BOOL_FIELD(ext_ztso)\n+BOOL_FIELD(ext_sdext)\n BOOL_FIELD(ext_sdtrig)\n BOOL_FIELD(ext_smstateen)\n BOOL_FIELD(ext_sstc)\ndiff --git a/target/riscv/csr.c b/target/riscv/csr.c\nindex 93b4864933..e8dc2d9e8a 100644\n--- a/target/riscv/csr.c\n+++ b/target/riscv/csr.c\n@@ -3147,6 +3147,126 @@ static RISCVException write_mtval(CPURISCVState *env, int csrno,\n return RISCV_EXCP_NONE;\n }\n \n+#if !defined(CONFIG_USER_ONLY)\n+static RISCVException sdext(CPURISCVState *env, int csrno)\n+{\n+ if (!riscv_cpu_cfg(env)->ext_sdext) {\n+ return RISCV_EXCP_ILLEGAL_INST;\n+ }\n+\n+ if (!env->debug_mode && !env->debugger) {\n+ return RISCV_EXCP_ILLEGAL_INST;\n+ }\n+\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static target_ulong dcsr_visible_mask(CPURISCVState *env)\n+{\n+ target_ulong mask = (target_ulong)-1;\n+ RISCVCPU *cpu = env_archcpu(env);\n+\n+ if (!riscv_has_ext(env, RVH)) {\n+ mask &= ~(DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V);\n+ }\n+ if (!riscv_has_ext(env, RVS)) {\n+ mask &= ~DCSR_EBREAKS;\n+ }\n+ if (!riscv_has_ext(env, RVU)) {\n+ mask &= ~DCSR_EBREAKU;\n+ }\n+ if (!cpu->cfg.ext_zicfilp) {\n+ mask &= ~DCSR_PELP;\n+ }\n+ if (!cpu->cfg.ext_smdbltrp) {\n+ mask &= ~DCSR_CETRIG;\n+ }\n+\n+ return mask;\n+}\n+\n+static RISCVException read_dcsr(CPURISCVState *env, int csrno,\n+ target_ulong *val)\n+{\n+ *val = env->dcsr & dcsr_visible_mask(env);\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static target_ulong dcsr_writable_mask(CPURISCVState *env)\n+{\n+ target_ulong mask = DCSR_EBREAKM | DCSR_EBREAKS | DCSR_EBREAKU |\n+ DCSR_STEPIE | DCSR_STOPCOUNT | DCSR_STOPTIME |\n+ DCSR_STEP | DCSR_PRV_MASK;\n+ RISCVCPU *cpu = env_archcpu(env);\n+\n+ mask |= DCSR_MPRVEN;\n+\n+ if (riscv_has_ext(env, RVH)) {\n+ mask |= DCSR_EBREAKVS | DCSR_EBREAKVU | DCSR_V;\n+ }\n+ if (riscv_has_ext(env, RVS)) {\n+ mask |= DCSR_EBREAKS;\n+ }\n+ if (riscv_has_ext(env, RVU)) {\n+ mask |= DCSR_EBREAKU;\n+ }\n+ if (cpu->cfg.ext_zicfilp) {\n+ mask |= DCSR_PELP;\n+ }\n+ if (cpu->cfg.ext_smdbltrp) {\n+ mask |= DCSR_CETRIG;\n+ }\n+\n+ return mask;\n+}\n+\n+static RISCVException write_dcsr(CPURISCVState *env, int csrno,\n+ target_ulong val, uintptr_t ra)\n+{\n+ target_ulong mask = dcsr_writable_mask(env);\n+ target_ulong new_val = env->dcsr;\n+\n+ new_val &= ~mask;\n+ new_val |= val & mask;\n+ new_val &= ~DCSR_XDEBUGVER_MASK;\n+ new_val |= DCSR_DEBUGVER(4);\n+ env->dcsr = new_val;\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static RISCVException read_dpc(CPURISCVState *env, int csrno,\n+ target_ulong *val)\n+{\n+ *val = env->dpc & get_xepc_mask(env);\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static RISCVException write_dpc(CPURISCVState *env, int csrno,\n+ target_ulong val, uintptr_t ra)\n+{\n+ env->dpc = val & get_xepc_mask(env);\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static RISCVException read_dscratch(CPURISCVState *env, int csrno,\n+ target_ulong *val)\n+{\n+ int index = (csrno == CSR_DSCRATCH1) ? 1 : 0;\n+\n+ *val = env->dscratch[index];\n+ return RISCV_EXCP_NONE;\n+}\n+\n+static RISCVException write_dscratch(CPURISCVState *env, int csrno,\n+ target_ulong val, uintptr_t ra)\n+{\n+ int index = (csrno == CSR_DSCRATCH1) ? 1 : 0;\n+\n+ env->dscratch[index] = val;\n+ return RISCV_EXCP_NONE;\n+}\n+#endif /* !CONFIG_USER_ONLY */\n+\n /* Execution environment configuration setup */\n static RISCVException read_menvcfg(CPURISCVState *env, int csrno,\n target_ulong *val)\n@@ -6316,6 +6436,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {\n [CSR_TDATA3] = { \"tdata3\", debug, read_tdata, write_tdata },\n [CSR_TINFO] = { \"tinfo\", debug, read_tinfo, write_ignore },\n [CSR_MCONTEXT] = { \"mcontext\", debug, read_mcontext, write_mcontext },\n+#if !defined(CONFIG_USER_ONLY)\n+ [CSR_DCSR] = { \"dcsr\", sdext, read_dcsr, write_dcsr },\n+ [CSR_DPC] = { \"dpc\", sdext, read_dpc, write_dpc },\n+ [CSR_DSCRATCH] = { \"dscratch0\", sdext, read_dscratch, write_dscratch },\n+ [CSR_DSCRATCH1] = { \"dscratch1\", sdext, read_dscratch, write_dscratch },\n+#endif\n \n [CSR_MCTRCTL] = { \"mctrctl\", ctr_mmode, NULL, NULL, rmw_xctrctl },\n [CSR_SCTRCTL] = { \"sctrctl\", ctr_smode, NULL, NULL, rmw_xctrctl },\ndiff --git a/target/riscv/machine.c b/target/riscv/machine.c\nindex 62c51c8033..52264cf047 100644\n--- a/target/riscv/machine.c\n+++ b/target/riscv/machine.c\n@@ -248,6 +248,25 @@ static const VMStateDescription vmstate_sdtrig = {\n VMSTATE_UINTTL_ARRAY(env.tdata1, RISCVCPU, RV_MAX_TRIGGERS),\n VMSTATE_UINTTL_ARRAY(env.tdata2, RISCVCPU, RV_MAX_TRIGGERS),\n VMSTATE_UINTTL_ARRAY(env.tdata3, RISCVCPU, RV_MAX_TRIGGERS),\n+ VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3),\n+ VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3),\n+ VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3),\n+ VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3),\n+ VMSTATE_END_OF_LIST()\n+ }\n+};\n+\n+static const VMStateDescription vmstate_sdext = {\n+ .name = \"cpu/sdext\",\n+ .version_id = 1,\n+ .minimum_version_id = 1,\n+ .needed = sdtrig_needed,\n+ .post_load = sdtrig_post_load,\n+ .fields = (const VMStateField[]) {\n+ VMSTATE_BOOL_V(env.debug_mode, RISCVCPU, 3),\n+ VMSTATE_UINTTL_V(env.dcsr, RISCVCPU, 3),\n+ VMSTATE_UINTTL_V(env.dpc, RISCVCPU, 3),\n+ VMSTATE_UINTTL_ARRAY_V(env.dscratch, RISCVCPU, 2, 3),\n VMSTATE_END_OF_LIST()\n }\n };\n@@ -499,6 +518,7 @@ const VMStateDescription vmstate_riscv_cpu = {\n &vmstate_ctr,\n &vmstate_sstc,\n &vmstate_sdtrig,\n+ &vmstate_sdext,\n NULL\n }\n };\n","prefixes":["v6","2/7"]}