diff --git a/src/target/riscv/Makefile.am b/src/target/riscv/Makefile.am
index 4b6a74f0b8..1a814d2075 100644
--- a/src/target/riscv/Makefile.am
+++ b/src/target/riscv/Makefile.am
@@ -5,6 +5,7 @@ noinst_LTLIBRARIES += %D%/libriscv.la
        %D%/asm.h \
        %D%/batch.h \
        %D%/debug_defines.h \
+       %D%/debug_register_printers.h \
        %D%/encoding.h \
        %D%/gdb_regs.h \
        %D%/opcodes.h \
@@ -15,4 +16,6 @@ noinst_LTLIBRARIES += %D%/libriscv.la
        %D%/riscv-011.c \
        %D%/riscv-013.c \
        %D%/riscv.c \
-       %D%/riscv_semihosting.c
+       %D%/riscv_semihosting.c \
+       %D%/debug_defines.c \
+       %D%/debug_register_printers.c
diff --git a/src/target/riscv/debug_defines.c b/src/target/riscv/debug_defines.c
new file mode 100644
index 0000000000..45a2c4ddf5
--- /dev/null
+++ b/src/target/riscv/debug_defines.c
@@ -0,0 +1,4145 @@
+/*
+ * This file is auto-generated by running 'make debug_defines' in
+ * https://github.com/riscv/riscv-debug-spec/ (d749752-dirty)
+ */
+
+#include "debug_defines.h"
+#include <stddef.h>
+#include <assert.h>
+riscv_debug_reg_field_list_t dtm_idcode_get_version(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "Version",
+			.lsb = 0x1c,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_idcode_get_partnumber(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "PartNumber",
+			.lsb = 0xc,
+			.msb = 0x1b,
+			.values = NULL
+		},
+		.get_next = dtm_idcode_get_version
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_idcode_get_manufid(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ManufId",
+			.lsb = 1,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dtm_idcode_get_partnumber
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_idcode_get_1(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "1",
+			.lsb = 0,
+			.msb = 0,
+			.values = NULL
+		},
+		.get_next = dtm_idcode_get_manufid
+	};
+	return result;
+}
+
+static const char *dtm_dtmcs_version_values[16] = {
+	[0] = "0.11",
+	[1] = "1.0",
+	[15] = "custom"
+};
+riscv_debug_reg_field_list_t dtm_dtmcs_get_abits(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "abits",
+			.lsb = 4,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dtmcs_get_dmihardreset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmihardreset",
+			.lsb = 0x11,
+			.msb = 0x11,
+			.values = NULL
+		},
+		.get_next = dtm_dtmcs_get_abits
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dtmcs_get_dmireset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmireset",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = NULL
+		},
+		.get_next = dtm_dtmcs_get_dmihardreset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dtmcs_get_idle(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "idle",
+			.lsb = 0xc,
+			.msb = 0xe,
+			.values = NULL
+		},
+		.get_next = dtm_dtmcs_get_dmireset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dtmcs_get_dmistat(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmistat",
+			.lsb = 0xa,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dtm_dtmcs_get_idle
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dtmcs_get_version(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "version",
+			.lsb = 0,
+			.msb = 3,
+			.values = dtm_dtmcs_version_values
+		},
+		.get_next = dtm_dtmcs_get_dmistat
+	};
+	return result;
+}
+
+static const char *dtm_dmi_op_values[4] = {};
+riscv_debug_reg_field_list_t dtm_dmi_get_address(riscv_debug_reg_ctx_t context)
+{
+	assert(context.abits.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "address",
+			.lsb = 0x22,
+			.msb = (context.abits.value + 0x21),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dmi_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 2,
+			.msb = 0x21,
+			.values = NULL
+		},
+		.get_next = dtm_dmi_get_address
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dtm_dmi_get_op(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "op",
+			.lsb = 0,
+			.msb = 1,
+			.values = dtm_dmi_op_values
+		},
+		.get_next = dtm_dmi_get_data
+	};
+	return result;
+}
+
+
+static const char *csr_dcsr_debugver_values[16] = {
+	[0] = "none",
+	[4] = "1.0",
+	[15] = "custom"
+};
+static const char *csr_dcsr_ebreakvs_values[2] = {
+	[0] = "exception",
+	[1] = "debug mode"
+};
+static const char *csr_dcsr_ebreakvu_values[2] = {
+	[0] = "exception",
+	[1] = "debug mode"
+};
+static const char *csr_dcsr_ebreakm_values[2] = {
+	[0] = "exception",
+	[1] = "debug mode"
+};
+static const char *csr_dcsr_ebreaks_values[2] = {
+	[0] = "exception",
+	[1] = "debug mode"
+};
+static const char *csr_dcsr_ebreaku_values[2] = {
+	[0] = "exception",
+	[1] = "debug mode"
+};
+static const char *csr_dcsr_stepie_values[2] = {
+	[0] = "interrupts disabled",
+	[1] = "interrupts enabled"
+};
+static const char *csr_dcsr_stopcount_values[2] = {
+	[0] = "normal",
+	[1] = "freeze"
+};
+static const char *csr_dcsr_stoptime_values[2] = {
+	[0] = "normal",
+	[1] = "freeze"
+};
+static const char *csr_dcsr_cause_values[8] = {
+	[1] = "ebreak",
+	[2] = "trigger",
+	[3] = "haltreq",
+	[4] = "step",
+	[5] = "resethaltreq",
+	[6] = "group"
+};
+static const char *csr_dcsr_mprven_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+riscv_debug_reg_field_list_t csr_dcsr_get_stoptime(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "stoptime",
+			.lsb = 9,
+			.msb = 9,
+			.values = csr_dcsr_stoptime_values
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_cause(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cause",
+			.lsb = 6,
+			.msb = 8,
+			.values = csr_dcsr_cause_values
+		},
+		.get_next = csr_dcsr_get_stoptime
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_v(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "v",
+			.lsb = 5,
+			.msb = 5,
+			.values = NULL
+		},
+		.get_next = csr_dcsr_get_cause
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_mprven(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mprven",
+			.lsb = 4,
+			.msb = 4,
+			.values = csr_dcsr_mprven_values
+		},
+		.get_next = csr_dcsr_get_v
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_nmip(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "nmip",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = csr_dcsr_get_mprven
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_debugver(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "debugver",
+			.lsb = 0x1c,
+			.msb = 0x1f,
+			.values = csr_dcsr_debugver_values
+		},
+		.get_next = csr_dcsr_get_nmip
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_step(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "step",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = csr_dcsr_get_debugver
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_ebreakvs(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ebreakvs",
+			.lsb = 0x11,
+			.msb = 0x11,
+			.values = csr_dcsr_ebreakvs_values
+		},
+		.get_next = csr_dcsr_get_step
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_ebreakvu(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ebreakvu",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = csr_dcsr_ebreakvu_values
+		},
+		.get_next = csr_dcsr_get_ebreakvs
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_ebreakm(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ebreakm",
+			.lsb = 0xf,
+			.msb = 0xf,
+			.values = csr_dcsr_ebreakm_values
+		},
+		.get_next = csr_dcsr_get_ebreakvu
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_ebreaks(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ebreaks",
+			.lsb = 0xd,
+			.msb = 0xd,
+			.values = csr_dcsr_ebreaks_values
+		},
+		.get_next = csr_dcsr_get_ebreakm
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_ebreaku(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ebreaku",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = csr_dcsr_ebreaku_values
+		},
+		.get_next = csr_dcsr_get_ebreaks
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_stepie(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "stepie",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = csr_dcsr_stepie_values
+		},
+		.get_next = csr_dcsr_get_ebreaku
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_stopcount(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "stopcount",
+			.lsb = 0xa,
+			.msb = 0xa,
+			.values = csr_dcsr_stopcount_values
+		},
+		.get_next = csr_dcsr_get_stepie
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dcsr_get_prv(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "prv",
+			.lsb = 0,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = csr_dcsr_get_stopcount
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_dpc_get_dpc(riscv_debug_reg_ctx_t context)
+{
+	assert(context.DXLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dpc",
+			.lsb = 0,
+			.msb = (context.DXLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tselect_get_index(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "index",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *csr_tdata1_type_values[16] = {
+	[0] = "none",
+	[1] = "legacy",
+	[2] = "mcontrol",
+	[3] = "icount",
+	[4] = "itrigger",
+	[5] = "etrigger",
+	[6] = "mcontrol6",
+	[7] = "tmexttrigger",
+	[15] = "disabled"
+};
+static const char *csr_tdata1_dmode_values[2] = {
+	[0] = "both",
+	[1] = "dmode"
+};
+riscv_debug_reg_field_list_t csr_tdata1_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = csr_tdata1_dmode_values
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tdata1_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = csr_tdata1_type_values
+		},
+		.get_next = csr_tdata1_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tdata1_get_data(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -6),
+			.values = NULL
+		},
+		.get_next = csr_tdata1_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tdata2_get_data(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tdata3_get_data(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tinfo_get_info(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "info",
+			.lsb = 0,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *csr_tcontrol_mte_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+riscv_debug_reg_field_list_t csr_tcontrol_get_mpte(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mpte",
+			.lsb = 7,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tcontrol_get_mte(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mte",
+			.lsb = 3,
+			.msb = 3,
+			.values = csr_tcontrol_mte_values
+		},
+		.get_next = csr_tcontrol_get_mpte
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_hcontext_get_hcontext(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hcontext",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_scontext_get_data(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *csr_mcontrol_select_values[2] = {
+	[0] = "address",
+	[1] = "data"
+};
+static const char *csr_mcontrol_timing_values[2] = {
+	[0] = "before",
+	[1] = "after"
+};
+static const char *csr_mcontrol_sizelo_values[4] = {};
+static const char *csr_mcontrol_action_values[16] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+static const char *csr_mcontrol_chain_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+static const char *csr_mcontrol_match_values[16] = {
+	[0] = "equal",
+	[1] = "napot",
+	[2] = "ge",
+	[3] = "lt",
+	[4] = "mask low",
+	[5] = "mask high",
+	[8] = "not equal",
+	[9] = "not napot",
+	[12] = "not mask low",
+	[13] = "not mask high"
+};
+riscv_debug_reg_field_list_t csr_mcontrol_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_maskmax(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "maskmax",
+			.lsb = (context.XLEN.value + -0xb),
+			.msb = (context.XLEN.value + -6),
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_match(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "match",
+			.lsb = 7,
+			.msb = 0xa,
+			.values = csr_mcontrol_match_values
+		},
+		.get_next = csr_mcontrol_get_maskmax
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_m(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "m",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_match
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_s(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "s",
+			.lsb = 4,
+			.msb = 4,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_m
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_u(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "u",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_s
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_sizehi(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sizehi",
+			.lsb = 0x15,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_u
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_hit(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = 0x14,
+			.msb = 0x14,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_sizehi
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_execute(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "execute",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_select(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "select",
+			.lsb = 0x13,
+			.msb = 0x13,
+			.values = csr_mcontrol_select_values
+		},
+		.get_next = csr_mcontrol_get_execute
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_timing(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "timing",
+			.lsb = 0x12,
+			.msb = 0x12,
+			.values = csr_mcontrol_timing_values
+		},
+		.get_next = csr_mcontrol_get_select
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_sizelo(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sizelo",
+			.lsb = 0x10,
+			.msb = 0x11,
+			.values = csr_mcontrol_sizelo_values
+		},
+		.get_next = csr_mcontrol_get_timing
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0xc,
+			.msb = 0xf,
+			.values = csr_mcontrol_action_values
+		},
+		.get_next = csr_mcontrol_get_sizelo
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_chain(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "chain",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = csr_mcontrol_chain_values
+		},
+		.get_next = csr_mcontrol_get_action
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_store(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "store",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_chain
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol_get_load(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "load",
+			.lsb = 0,
+			.msb = 0,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol_get_store
+	};
+	return result;
+}
+
+static const char *csr_mcontrol6_select_values[2] = {
+	[0] = "address",
+	[1] = "data"
+};
+static const char *csr_mcontrol6_timing_values[2] = {
+	[0] = "before",
+	[1] = "after"
+};
+static const char *csr_mcontrol6_size_values[16] = {
+	[0] = "any",
+	[1] = "8bit",
+	[2] = "16bit",
+	[3] = "32bit",
+	[4] = "48bit",
+	[5] = "64bit",
+	[6] = "80bit",
+	[7] = "96bit",
+	[8] = "112bit",
+	[9] = "128bit"
+};
+static const char *csr_mcontrol6_action_values[16] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+static const char *csr_mcontrol6_chain_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+static const char *csr_mcontrol6_match_values[16] = {
+	[0] = "equal",
+	[1] = "napot",
+	[2] = "ge",
+	[3] = "lt",
+	[4] = "mask low",
+	[5] = "mask high",
+	[8] = "not equal",
+	[9] = "not napot",
+	[12] = "not mask low",
+	[13] = "not mask high"
+};
+riscv_debug_reg_field_list_t csr_mcontrol6_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_match(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "match",
+			.lsb = 7,
+			.msb = 0xa,
+			.values = csr_mcontrol6_match_values
+		},
+		.get_next = csr_mcontrol6_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_m(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "m",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_match
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_s(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "s",
+			.lsb = 4,
+			.msb = 4,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_m
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_u(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "u",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_s
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_vs(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vs",
+			.lsb = 0x18,
+			.msb = 0x18,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_u
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_vu(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vu",
+			.lsb = 0x17,
+			.msb = 0x17,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_vs
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_hit(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = 0x16,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_vu
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_select(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "select",
+			.lsb = 0x15,
+			.msb = 0x15,
+			.values = csr_mcontrol6_select_values
+		},
+		.get_next = csr_mcontrol6_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_timing(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "timing",
+			.lsb = 0x14,
+			.msb = 0x14,
+			.values = csr_mcontrol6_timing_values
+		},
+		.get_next = csr_mcontrol6_get_select
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_execute(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "execute",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_timing
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_size(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "size",
+			.lsb = 0x10,
+			.msb = 0x13,
+			.values = csr_mcontrol6_size_values
+		},
+		.get_next = csr_mcontrol6_get_execute
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0xc,
+			.msb = 0xf,
+			.values = csr_mcontrol6_action_values
+		},
+		.get_next = csr_mcontrol6_get_size
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_chain(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "chain",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = csr_mcontrol6_chain_values
+		},
+		.get_next = csr_mcontrol6_get_action
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_store(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "store",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_chain
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_mcontrol6_get_load(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "load",
+			.lsb = 0,
+			.msb = 0,
+			.values = NULL
+		},
+		.get_next = csr_mcontrol6_get_store
+	};
+	return result;
+}
+
+static const char *csr_icount_action_values[64] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+riscv_debug_reg_field_list_t csr_icount_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_icount_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_m(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "m",
+			.lsb = 9,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_pending(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "pending",
+			.lsb = 8,
+			.msb = 8,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_m
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_s(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "s",
+			.lsb = 7,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_pending
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_u(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "u",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_s
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_vs(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vs",
+			.lsb = 0x1a,
+			.msb = 0x1a,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_u
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_vu(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vu",
+			.lsb = 0x19,
+			.msb = 0x19,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_vs
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_hit(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = 0x18,
+			.msb = 0x18,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_vu
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_count(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "count",
+			.lsb = 0xa,
+			.msb = 0x17,
+			.values = NULL
+		},
+		.get_next = csr_icount_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_icount_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0,
+			.msb = 5,
+			.values = csr_icount_action_values
+		},
+		.get_next = csr_icount_get_count
+	};
+	return result;
+}
+
+static const char *csr_itrigger_action_values[64] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+riscv_debug_reg_field_list_t csr_itrigger_get_hit(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = (context.XLEN.value + -6),
+			.msb = (context.XLEN.value + -6),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_m(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "m",
+			.lsb = 9,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_s(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "s",
+			.lsb = 7,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_m
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_u(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "u",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_s
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_vs(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vs",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_u
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_vu(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vu",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_vs
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_nmi(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "nmi",
+			.lsb = 0xa,
+			.msb = 0xa,
+			.values = NULL
+		},
+		.get_next = csr_itrigger_get_vu
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_itrigger_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0,
+			.msb = 5,
+			.values = csr_itrigger_action_values
+		},
+		.get_next = csr_itrigger_get_nmi
+	};
+	return result;
+}
+
+static const char *csr_etrigger_action_values[64] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+riscv_debug_reg_field_list_t csr_etrigger_get_hit(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = (context.XLEN.value + -6),
+			.msb = (context.XLEN.value + -6),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_m(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "m",
+			.lsb = 9,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_s(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "s",
+			.lsb = 7,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_m
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_u(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "u",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_s
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_vs(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vs",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_u
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_vu(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "vu",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = csr_etrigger_get_vs
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_etrigger_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0,
+			.msb = 5,
+			.values = csr_etrigger_action_values
+		},
+		.get_next = csr_etrigger_get_vu
+	};
+	return result;
+}
+
+static const char *csr_tmexttrigger_action_values[64] = {
+	[0] = "breakpoint",
+	[1] = "debug mode",
+	[2] = "trace on",
+	[3] = "trace off",
+	[4] = "trace notify",
+	[8] = "external0",
+	[9] = "external1"
+};
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_hit(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hit",
+			.lsb = (context.XLEN.value + -6),
+			.msb = (context.XLEN.value + -6),
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_dmode(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmode",
+			.lsb = (context.XLEN.value + -5),
+			.msb = (context.XLEN.value + -5),
+			.values = NULL
+		},
+		.get_next = csr_tmexttrigger_get_hit
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_type(riscv_debug_reg_ctx_t context)
+{
+	assert(context.XLEN.is_set);
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "type",
+			.lsb = (context.XLEN.value + -4),
+			.msb = (context.XLEN.value + -1),
+			.values = NULL
+		},
+		.get_next = csr_tmexttrigger_get_dmode
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_select(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "select",
+			.lsb = 6,
+			.msb = 0x15,
+			.values = NULL
+		},
+		.get_next = csr_tmexttrigger_get_type
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_intctl(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "intctl",
+			.lsb = 0x16,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = csr_tmexttrigger_get_select
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_tmexttrigger_get_action(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "action",
+			.lsb = 0,
+			.msb = 5,
+			.values = csr_tmexttrigger_action_values
+		},
+		.get_next = csr_tmexttrigger_get_intctl
+	};
+	return result;
+}
+
+static const char *csr_textra32_mhselect_values[8] = {
+	[0] = "ignore",
+	[4] = "mcontext"
+};
+static const char *csr_textra32_sselect_values[4] = {
+	[0] = "ignore",
+	[1] = "scontext",
+	[2] = "asid"
+};
+riscv_debug_reg_field_list_t csr_textra32_get_mhvalue(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mhvalue",
+			.lsb = 0x1a,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra32_get_mhselect(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mhselect",
+			.lsb = 0x17,
+			.msb = 0x19,
+			.values = csr_textra32_mhselect_values
+		},
+		.get_next = csr_textra32_get_mhvalue
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra32_get_svalue(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "svalue",
+			.lsb = 2,
+			.msb = 0x11,
+			.values = NULL
+		},
+		.get_next = csr_textra32_get_mhselect
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra32_get_sbytemask(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbytemask",
+			.lsb = 0x12,
+			.msb = 0x13,
+			.values = NULL
+		},
+		.get_next = csr_textra32_get_svalue
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra32_get_sselect(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sselect",
+			.lsb = 0,
+			.msb = 1,
+			.values = csr_textra32_sselect_values
+		},
+		.get_next = csr_textra32_get_sbytemask
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra64_get_mhvalue(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mhvalue",
+			.lsb = 0x33,
+			.msb = 0x3f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra64_get_mhselect(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "mhselect",
+			.lsb = 0x30,
+			.msb = 0x32,
+			.values = NULL
+		},
+		.get_next = csr_textra64_get_mhvalue
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra64_get_sbytemask(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbytemask",
+			.lsb = 0x24,
+			.msb = 0x28,
+			.values = NULL
+		},
+		.get_next = csr_textra64_get_mhselect
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra64_get_svalue(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "svalue",
+			.lsb = 2,
+			.msb = 0x23,
+			.values = NULL
+		},
+		.get_next = csr_textra64_get_sbytemask
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t csr_textra64_get_sselect(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sselect",
+			.lsb = 0,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = csr_textra64_get_svalue
+	};
+	return result;
+}
+
+static const char *dm_dmstatus_ndmresetpending_values[2] = {
+	[0] = "false",
+	[1] = "true"
+};
+static const char *dm_dmstatus_stickyunavail_values[2] = {
+	[0] = "current",
+	[1] = "sticky"
+};
+static const char *dm_dmstatus_authenticated_values[2] = {
+	[0] = "false",
+	[1] = "true"
+};
+static const char *dm_dmstatus_authbusy_values[2] = {
+	[0] = "ready",
+	[1] = "busy"
+};
+static const char *dm_dmstatus_confstrptrvalid_values[2] = {
+	[0] = "invalid",
+	[1] = "valid"
+};
+static const char *dm_dmstatus_version_values[16] = {
+	[0] = "none",
+	[1] = "0.11",
+	[2] = "0.13",
+	[3] = "1.0",
+	[15] = "custom"
+};
+riscv_debug_reg_field_list_t dm_dmstatus_get_allhalted(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allhalted",
+			.lsb = 9,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anyhalted(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anyhalted",
+			.lsb = 8,
+			.msb = 8,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allhalted
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_authenticated(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "authenticated",
+			.lsb = 7,
+			.msb = 7,
+			.values = dm_dmstatus_authenticated_values
+		},
+		.get_next = dm_dmstatus_get_anyhalted
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_authbusy(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "authbusy",
+			.lsb = 6,
+			.msb = 6,
+			.values = dm_dmstatus_authbusy_values
+		},
+		.get_next = dm_dmstatus_get_authenticated
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_hasresethaltreq(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hasresethaltreq",
+			.lsb = 5,
+			.msb = 5,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_authbusy
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_confstrptrvalid(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "confstrptrvalid",
+			.lsb = 4,
+			.msb = 4,
+			.values = dm_dmstatus_confstrptrvalid_values
+		},
+		.get_next = dm_dmstatus_get_hasresethaltreq
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_ndmresetpending(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ndmresetpending",
+			.lsb = 0x18,
+			.msb = 0x18,
+			.values = dm_dmstatus_ndmresetpending_values
+		},
+		.get_next = dm_dmstatus_get_confstrptrvalid
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_stickyunavail(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "stickyunavail",
+			.lsb = 0x17,
+			.msb = 0x17,
+			.values = dm_dmstatus_stickyunavail_values
+		},
+		.get_next = dm_dmstatus_get_ndmresetpending
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_impebreak(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "impebreak",
+			.lsb = 0x16,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_stickyunavail
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_allhavereset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allhavereset",
+			.lsb = 0x13,
+			.msb = 0x13,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_impebreak
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anyhavereset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anyhavereset",
+			.lsb = 0x12,
+			.msb = 0x12,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allhavereset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_allresumeack(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allresumeack",
+			.lsb = 0x11,
+			.msb = 0x11,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_anyhavereset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anyresumeack(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anyresumeack",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allresumeack
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_allnonexistent(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allnonexistent",
+			.lsb = 0xf,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_anyresumeack
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anynonexistent(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anynonexistent",
+			.lsb = 0xe,
+			.msb = 0xe,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allnonexistent
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_allunavail(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allunavail",
+			.lsb = 0xd,
+			.msb = 0xd,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_anynonexistent
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anyunavail(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anyunavail",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allunavail
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_allrunning(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "allrunning",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_anyunavail
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_anyrunning(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "anyrunning",
+			.lsb = 0xa,
+			.msb = 0xa,
+			.values = NULL
+		},
+		.get_next = dm_dmstatus_get_allrunning
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmstatus_get_version(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "version",
+			.lsb = 0,
+			.msb = 3,
+			.values = dm_dmstatus_version_values
+		},
+		.get_next = dm_dmstatus_get_anyrunning
+	};
+	return result;
+}
+
+static const char *dm_dmcontrol_ackhavereset_values[2] = {
+	[0] = "nop",
+	[1] = "ack"
+};
+static const char *dm_dmcontrol_ackunavail_values[2] = {
+	[0] = "nop",
+	[1] = "ack"
+};
+static const char *dm_dmcontrol_hasel_values[2] = {
+	[0] = "single",
+	[1] = "multiple"
+};
+static const char *dm_dmcontrol_dmactive_values[2] = {
+	[0] = "inactive",
+	[1] = "active"
+};
+riscv_debug_reg_field_list_t dm_dmcontrol_get_hartselhi(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hartselhi",
+			.lsb = 6,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_setkeepalive(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "setkeepalive",
+			.lsb = 5,
+			.msb = 5,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_hartselhi
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_clrkeepalive(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "clrkeepalive",
+			.lsb = 4,
+			.msb = 4,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_setkeepalive
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_haltreq(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "haltreq",
+			.lsb = 0x1f,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_clrkeepalive
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_resumereq(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "resumereq",
+			.lsb = 0x1e,
+			.msb = 0x1e,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_haltreq
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_setresethaltreq(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "setresethaltreq",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_resumereq
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_hartreset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hartreset",
+			.lsb = 0x1d,
+			.msb = 0x1d,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_setresethaltreq
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_ackhavereset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ackhavereset",
+			.lsb = 0x1c,
+			.msb = 0x1c,
+			.values = dm_dmcontrol_ackhavereset_values
+		},
+		.get_next = dm_dmcontrol_get_hartreset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_ackunavail(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ackunavail",
+			.lsb = 0x1b,
+			.msb = 0x1b,
+			.values = dm_dmcontrol_ackunavail_values
+		},
+		.get_next = dm_dmcontrol_get_ackhavereset
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_hasel(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hasel",
+			.lsb = 0x1a,
+			.msb = 0x1a,
+			.values = dm_dmcontrol_hasel_values
+		},
+		.get_next = dm_dmcontrol_get_ackunavail
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_clrresethaltreq(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "clrresethaltreq",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_hasel
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_hartsello(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hartsello",
+			.lsb = 0x10,
+			.msb = 0x19,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_clrresethaltreq
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_ndmreset(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "ndmreset",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = dm_dmcontrol_get_hartsello
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcontrol_get_dmactive(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmactive",
+			.lsb = 0,
+			.msb = 0,
+			.values = dm_dmcontrol_dmactive_values
+		},
+		.get_next = dm_dmcontrol_get_ndmreset
+	};
+	return result;
+}
+
+static const char *dm_hartinfo_dataaccess_values[2] = {
+	[0] = "csr",
+	[1] = "memory"
+};
+riscv_debug_reg_field_list_t dm_hartinfo_get_nscratch(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "nscratch",
+			.lsb = 0x14,
+			.msb = 0x17,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_hartinfo_get_dataaccess(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dataaccess",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = dm_hartinfo_dataaccess_values
+		},
+		.get_next = dm_hartinfo_get_nscratch
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_hartinfo_get_datasize(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "datasize",
+			.lsb = 0xc,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = dm_hartinfo_get_dataaccess
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_hartinfo_get_dataaddr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dataaddr",
+			.lsb = 0,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dm_hartinfo_get_datasize
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_hawindowsel_get_hawindowsel(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hawindowsel",
+			.lsb = 0,
+			.msb = 0xe,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_hawindow_get_maskdata(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "maskdata",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *dm_abstractcs_busy_values[2] = {
+	[0] = "ready",
+	[1] = "busy"
+};
+static const char *dm_abstractcs_cmderr_values[8] = {
+	[0] = "none",
+	[1] = "busy",
+	[2] = "not supported",
+	[3] = "exception",
+	[4] = "halt/resume",
+	[5] = "bus",
+	[6] = "reserved",
+	[7] = "other"
+};
+riscv_debug_reg_field_list_t dm_abstractcs_get_cmderr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cmderr",
+			.lsb = 8,
+			.msb = 0xa,
+			.values = dm_abstractcs_cmderr_values
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractcs_get_progbufsize(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "progbufsize",
+			.lsb = 0x18,
+			.msb = 0x1c,
+			.values = NULL
+		},
+		.get_next = dm_abstractcs_get_cmderr
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractcs_get_busy(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "busy",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = dm_abstractcs_busy_values
+		},
+		.get_next = dm_abstractcs_get_progbufsize
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractcs_get_relaxedpriv(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "relaxedpriv",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dm_abstractcs_get_busy
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractcs_get_datacount(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "datacount",
+			.lsb = 0,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = dm_abstractcs_get_relaxedpriv
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_command_get_cmdtype(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cmdtype",
+			.lsb = 0x18,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_command_get_control(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "control",
+			.lsb = 0,
+			.msb = 0x17,
+			.values = NULL
+		},
+		.get_next = dm_command_get_cmdtype
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractauto_get_autoexecprogbuf(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "autoexecprogbuf",
+			.lsb = 0x10,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_abstractauto_get_autoexecdata(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "autoexecdata",
+			.lsb = 0,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dm_abstractauto_get_autoexecprogbuf
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_confstrptr0_get_addr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "addr",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_confstrptr1_get_addr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "addr",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_confstrptr2_get_addr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "addr",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_confstrptr3_get_addr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "addr",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_nextdm_get_addr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "addr",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_data0_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_progbuf0_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_authdata_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *dm_dmcs2_grouptype_values[2] = {
+	[0] = "halt",
+	[1] = "resume"
+};
+static const char *dm_dmcs2_hgselect_values[2] = {
+	[0] = "harts",
+	[1] = "triggers"
+};
+riscv_debug_reg_field_list_t dm_dmcs2_get_dmexttrigger(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "dmexttrigger",
+			.lsb = 7,
+			.msb = 0xa,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcs2_get_group(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "group",
+			.lsb = 2,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = dm_dmcs2_get_dmexttrigger
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcs2_get_grouptype(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "grouptype",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = dm_dmcs2_grouptype_values
+		},
+		.get_next = dm_dmcs2_get_group
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcs2_get_hgwrite(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hgwrite",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = dm_dmcs2_get_grouptype
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_dmcs2_get_hgselect(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "hgselect",
+			.lsb = 0,
+			.msb = 0,
+			.values = dm_dmcs2_hgselect_values
+		},
+		.get_next = dm_dmcs2_get_hgwrite
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_haltsum0_get_haltsum0(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "haltsum0",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_haltsum1_get_haltsum1(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "haltsum1",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_haltsum2_get_haltsum2(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "haltsum2",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_haltsum3_get_haltsum3(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "haltsum3",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *dm_sbcs_sbversion_values[8] = {
+	[0] = "legacy",
+	[1] = "1.0"
+};
+static const char *dm_sbcs_sbaccess_values[8] = {
+	[0] = "8bit",
+	[1] = "16bit",
+	[2] = "32bit",
+	[3] = "64bit",
+	[4] = "128bit"
+};
+static const char *dm_sbcs_sberror_values[8] = {
+	[0] = "none",
+	[1] = "timeout",
+	[2] = "address",
+	[3] = "alignment",
+	[4] = "size",
+	[7] = "other"
+};
+riscv_debug_reg_field_list_t dm_sbcs_get_sbasize(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbasize",
+			.lsb = 5,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess128(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess128",
+			.lsb = 4,
+			.msb = 4,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbasize
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess64(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess64",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbaccess128
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbversion(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbversion",
+			.lsb = 0x1d,
+			.msb = 0x1f,
+			.values = dm_sbcs_sbversion_values
+		},
+		.get_next = dm_sbcs_get_sbaccess64
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbbusyerror(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbbusyerror",
+			.lsb = 0x16,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbversion
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbbusy(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbbusy",
+			.lsb = 0x15,
+			.msb = 0x15,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbbusyerror
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbreadonaddr(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbreadonaddr",
+			.lsb = 0x14,
+			.msb = 0x14,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbbusy
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess32(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess32",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbreadonaddr
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess",
+			.lsb = 0x11,
+			.msb = 0x13,
+			.values = dm_sbcs_sbaccess_values
+		},
+		.get_next = dm_sbcs_get_sbaccess32
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbautoincrement(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbautoincrement",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbaccess
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbreadondata(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbreadondata",
+			.lsb = 0xf,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbautoincrement
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sberror(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sberror",
+			.lsb = 0xc,
+			.msb = 0xe,
+			.values = dm_sbcs_sberror_values
+		},
+		.get_next = dm_sbcs_get_sbreadondata
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess16(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess16",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sberror
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbcs_get_sbaccess8(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "sbaccess8",
+			.lsb = 0,
+			.msb = 0,
+			.values = NULL
+		},
+		.get_next = dm_sbcs_get_sbaccess16
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbaddress0_get_address(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "address",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbaddress1_get_address(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "address",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbaddress2_get_address(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "address",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbaddress3_get_address(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "address",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbdata0_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbdata1_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbdata2_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dm_sbdata3_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t shortname_get_field(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "field",
+			.lsb = 0,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *ac_access_register_aarsize_values[8] = {
+	[2] = "32bit",
+	[3] = "64bit",
+	[4] = "128bit"
+};
+static const char *ac_access_register_aarpostincrement_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+static const char *ac_access_register_postexec_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+static const char *ac_access_register_transfer_values[2] = {
+	[0] = "disabled",
+	[1] = "enabled"
+};
+static const char *ac_access_register_write_values[2] = {
+	[0] = "arg0",
+	[1] = "register"
+};
+riscv_debug_reg_field_list_t ac_access_register_get_cmdtype(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cmdtype",
+			.lsb = 0x18,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_aarsize(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "aarsize",
+			.lsb = 0x14,
+			.msb = 0x16,
+			.values = ac_access_register_aarsize_values
+		},
+		.get_next = ac_access_register_get_cmdtype
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_aarpostincrement(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "aarpostincrement",
+			.lsb = 0x13,
+			.msb = 0x13,
+			.values = ac_access_register_aarpostincrement_values
+		},
+		.get_next = ac_access_register_get_aarsize
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_postexec(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "postexec",
+			.lsb = 0x12,
+			.msb = 0x12,
+			.values = ac_access_register_postexec_values
+		},
+		.get_next = ac_access_register_get_aarpostincrement
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_transfer(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "transfer",
+			.lsb = 0x11,
+			.msb = 0x11,
+			.values = ac_access_register_transfer_values
+		},
+		.get_next = ac_access_register_get_postexec
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_write(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "write",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = ac_access_register_write_values
+		},
+		.get_next = ac_access_register_get_transfer
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_register_get_regno(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "regno",
+			.lsb = 0,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = ac_access_register_get_write
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_quick_access_get_cmdtype(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cmdtype",
+			.lsb = 0x18,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+static const char *ac_access_memory_aamvirtual_values[2] = {
+	[0] = "physical",
+	[1] = "virtual"
+};
+static const char *ac_access_memory_aamsize_values[8] = {
+	[0] = "8bit",
+	[1] = "16bit",
+	[2] = "32bit",
+	[3] = "64bit",
+	[4] = "128bit"
+};
+static const char *ac_access_memory_write_values[2] = {
+	[0] = "arg0",
+	[1] = "memory"
+};
+riscv_debug_reg_field_list_t ac_access_memory_get_cmdtype(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "cmdtype",
+			.lsb = 0x18,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_memory_get_aamvirtual(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "aamvirtual",
+			.lsb = 0x17,
+			.msb = 0x17,
+			.values = ac_access_memory_aamvirtual_values
+		},
+		.get_next = ac_access_memory_get_cmdtype
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_memory_get_aamsize(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "aamsize",
+			.lsb = 0x14,
+			.msb = 0x16,
+			.values = ac_access_memory_aamsize_values
+		},
+		.get_next = ac_access_memory_get_aamvirtual
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_memory_get_aampostincrement(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "aampostincrement",
+			.lsb = 0x13,
+			.msb = 0x13,
+			.values = NULL
+		},
+		.get_next = ac_access_memory_get_aamsize
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_memory_get_write(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "write",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = ac_access_memory_write_values
+		},
+		.get_next = ac_access_memory_get_aampostincrement
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t ac_access_memory_get_target_specific(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "target-specific",
+			.lsb = 0xe,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = ac_access_memory_get_write
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t virt_priv_get_v(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "v",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t virt_priv_get_prv(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "prv",
+			.lsb = 0,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = virt_priv_get_v
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full3(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full3",
+			.lsb = 9,
+			.msb = 9,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error2(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error2",
+			.lsb = 8,
+			.msb = 8,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full3
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid2(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid2",
+			.lsb = 7,
+			.msb = 7,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error2
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full2(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full2",
+			.lsb = 6,
+			.msb = 6,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid2
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error1(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error1",
+			.lsb = 5,
+			.msb = 5,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full2
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid1(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid1",
+			.lsb = 4,
+			.msb = 4,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error1
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full1(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full1",
+			.lsb = 3,
+			.msb = 3,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid1
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_serialcount(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "serialcount",
+			.lsb = 0x1c,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full1
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_serial(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "serial",
+			.lsb = 0x18,
+			.msb = 0x1a,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_serialcount
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error7(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error7",
+			.lsb = 0x17,
+			.msb = 0x17,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_serial
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid7(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid7",
+			.lsb = 0x16,
+			.msb = 0x16,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error7
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full7(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full7",
+			.lsb = 0x15,
+			.msb = 0x15,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid7
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error6(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error6",
+			.lsb = 0x14,
+			.msb = 0x14,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full7
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error0(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error0",
+			.lsb = 2,
+			.msb = 2,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error6
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid6(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid6",
+			.lsb = 0x13,
+			.msb = 0x13,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error0
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full6(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full6",
+			.lsb = 0x12,
+			.msb = 0x12,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid6
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error5(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error5",
+			.lsb = 0x11,
+			.msb = 0x11,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full6
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid5(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid5",
+			.lsb = 0x10,
+			.msb = 0x10,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error5
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full5(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full5",
+			.lsb = 0xf,
+			.msb = 0xf,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid5
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error4(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error4",
+			.lsb = 0xe,
+			.msb = 0xe,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full5
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid4(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid4",
+			.lsb = 0xd,
+			.msb = 0xd,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error4
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full4(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full4",
+			.lsb = 0xc,
+			.msb = 0xc,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid4
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_error3(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "error3",
+			.lsb = 0xb,
+			.msb = 0xb,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_full4
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid3(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid3",
+			.lsb = 0xa,
+			.msb = 0xa,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_error3
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_valid0(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "valid0",
+			.lsb = 1,
+			.msb = 1,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid3
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sercs_get_full0(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "full0",
+			.lsb = 0,
+			.msb = 0,
+			.values = NULL
+		},
+		.get_next = dmi_sercs_get_valid0
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_sertx_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_field_list_t dmi_serrx_get_data(riscv_debug_reg_ctx_t context)
+{
+	riscv_debug_reg_field_list_t result = {
+		.field = {
+			.name = "data",
+			.lsb = 0,
+			.msb = 0x1f,
+			.values = NULL
+		},
+		.get_next = NULL
+	};
+	return result;
+}
+
+riscv_debug_reg_info_t get_riscv_debug_reg_info(enum riscv_debug_reg_ordinal reg_ordinal)
+{
+	static const riscv_debug_reg_info_t debug_reg_info[] = {
+		[DTM_IDCODE_ORDINAL] = {
+			.name = "idcode",
+			.get_fields_head = dtm_idcode_get_1
+		},
+		[DTM_DTMCS_ORDINAL] = {
+			.name = "dtmcs",
+			.get_fields_head = dtm_dtmcs_get_version
+		},
+		[DTM_DMI_ORDINAL] = {
+			.name = "dmi",
+			.get_fields_head = dtm_dmi_get_op
+		},
+		[DTM_BYPASS_ORDINAL] = {
+			.name = "bypass",
+			.get_fields_head = NULL
+		},
+		[CSR_DCSR_ORDINAL] = {
+			.name = "dcsr",
+			.get_fields_head = csr_dcsr_get_prv
+		},
+		[CSR_DPC_ORDINAL] = {
+			.name = "dpc",
+			.get_fields_head = csr_dpc_get_dpc
+		},
+		[CSR_TSELECT_ORDINAL] = {
+			.name = "tselect",
+			.get_fields_head = csr_tselect_get_index
+		},
+		[CSR_TDATA1_ORDINAL] = {
+			.name = "tdata1",
+			.get_fields_head = csr_tdata1_get_data
+		},
+		[CSR_TDATA2_ORDINAL] = {
+			.name = "tdata2",
+			.get_fields_head = csr_tdata2_get_data
+		},
+		[CSR_TDATA3_ORDINAL] = {
+			.name = "tdata3",
+			.get_fields_head = csr_tdata3_get_data
+		},
+		[CSR_TINFO_ORDINAL] = {
+			.name = "tinfo",
+			.get_fields_head = csr_tinfo_get_info
+		},
+		[CSR_TCONTROL_ORDINAL] = {
+			.name = "tcontrol",
+			.get_fields_head = csr_tcontrol_get_mte
+		},
+		[CSR_HCONTEXT_ORDINAL] = {
+			.name = "hcontext",
+			.get_fields_head = csr_hcontext_get_hcontext
+		},
+		[CSR_SCONTEXT_ORDINAL] = {
+			.name = "scontext",
+			.get_fields_head = csr_scontext_get_data
+		},
+		[CSR_MCONTROL_ORDINAL] = {
+			.name = "mcontrol",
+			.get_fields_head = csr_mcontrol_get_load
+		},
+		[CSR_MCONTROL6_ORDINAL] = {
+			.name = "mcontrol6",
+			.get_fields_head = csr_mcontrol6_get_load
+		},
+		[CSR_ICOUNT_ORDINAL] = {
+			.name = "icount",
+			.get_fields_head = csr_icount_get_action
+		},
+		[CSR_ITRIGGER_ORDINAL] = {
+			.name = "itrigger",
+			.get_fields_head = csr_itrigger_get_action
+		},
+		[CSR_ETRIGGER_ORDINAL] = {
+			.name = "etrigger",
+			.get_fields_head = csr_etrigger_get_action
+		},
+		[CSR_TMEXTTRIGGER_ORDINAL] = {
+			.name = "tmexttrigger",
+			.get_fields_head = csr_tmexttrigger_get_action
+		},
+		[CSR_TEXTRA32_ORDINAL] = {
+			.name = "textra32",
+			.get_fields_head = csr_textra32_get_sselect
+		},
+		[CSR_TEXTRA64_ORDINAL] = {
+			.name = "textra64",
+			.get_fields_head = csr_textra64_get_sselect
+		},
+		[DM_DMSTATUS_ORDINAL] = {
+			.name = "dmstatus",
+			.get_fields_head = dm_dmstatus_get_version
+		},
+		[DM_DMCONTROL_ORDINAL] = {
+			.name = "dmcontrol",
+			.get_fields_head = dm_dmcontrol_get_dmactive
+		},
+		[DM_HARTINFO_ORDINAL] = {
+			.name = "hartinfo",
+			.get_fields_head = dm_hartinfo_get_dataaddr
+		},
+		[DM_HAWINDOWSEL_ORDINAL] = {
+			.name = "hawindowsel",
+			.get_fields_head = dm_hawindowsel_get_hawindowsel
+		},
+		[DM_HAWINDOW_ORDINAL] = {
+			.name = "hawindow",
+			.get_fields_head = dm_hawindow_get_maskdata
+		},
+		[DM_ABSTRACTCS_ORDINAL] = {
+			.name = "abstractcs",
+			.get_fields_head = dm_abstractcs_get_datacount
+		},
+		[DM_COMMAND_ORDINAL] = {
+			.name = "command",
+			.get_fields_head = dm_command_get_control
+		},
+		[DM_ABSTRACTAUTO_ORDINAL] = {
+			.name = "abstractauto",
+			.get_fields_head = dm_abstractauto_get_autoexecdata
+		},
+		[DM_CONFSTRPTR0_ORDINAL] = {
+			.name = "confstrptr0",
+			.get_fields_head = dm_confstrptr0_get_addr
+		},
+		[DM_CONFSTRPTR1_ORDINAL] = {
+			.name = "confstrptr1",
+			.get_fields_head = dm_confstrptr1_get_addr
+		},
+		[DM_CONFSTRPTR2_ORDINAL] = {
+			.name = "confstrptr2",
+			.get_fields_head = dm_confstrptr2_get_addr
+		},
+		[DM_CONFSTRPTR3_ORDINAL] = {
+			.name = "confstrptr3",
+			.get_fields_head = dm_confstrptr3_get_addr
+		},
+		[DM_NEXTDM_ORDINAL] = {
+			.name = "nextdm",
+			.get_fields_head = dm_nextdm_get_addr
+		},
+		[DM_DATA0_ORDINAL] = {
+			.name = "data0",
+			.get_fields_head = dm_data0_get_data
+		},
+		[DM_PROGBUF0_ORDINAL] = {
+			.name = "progbuf0",
+			.get_fields_head = dm_progbuf0_get_data
+		},
+		[DM_AUTHDATA_ORDINAL] = {
+			.name = "authdata",
+			.get_fields_head = dm_authdata_get_data
+		},
+		[DM_DMCS2_ORDINAL] = {
+			.name = "dmcs2",
+			.get_fields_head = dm_dmcs2_get_hgselect
+		},
+		[DM_HALTSUM0_ORDINAL] = {
+			.name = "haltsum0",
+			.get_fields_head = dm_haltsum0_get_haltsum0
+		},
+		[DM_HALTSUM1_ORDINAL] = {
+			.name = "haltsum1",
+			.get_fields_head = dm_haltsum1_get_haltsum1
+		},
+		[DM_HALTSUM2_ORDINAL] = {
+			.name = "haltsum2",
+			.get_fields_head = dm_haltsum2_get_haltsum2
+		},
+		[DM_HALTSUM3_ORDINAL] = {
+			.name = "haltsum3",
+			.get_fields_head = dm_haltsum3_get_haltsum3
+		},
+		[DM_SBCS_ORDINAL] = {
+			.name = "sbcs",
+			.get_fields_head = dm_sbcs_get_sbaccess8
+		},
+		[DM_SBADDRESS0_ORDINAL] = {
+			.name = "sbaddress0",
+			.get_fields_head = dm_sbaddress0_get_address
+		},
+		[DM_SBADDRESS1_ORDINAL] = {
+			.name = "sbaddress1",
+			.get_fields_head = dm_sbaddress1_get_address
+		},
+		[DM_SBADDRESS2_ORDINAL] = {
+			.name = "sbaddress2",
+			.get_fields_head = dm_sbaddress2_get_address
+		},
+		[DM_SBADDRESS3_ORDINAL] = {
+			.name = "sbaddress3",
+			.get_fields_head = dm_sbaddress3_get_address
+		},
+		[DM_SBDATA0_ORDINAL] = {
+			.name = "sbdata0",
+			.get_fields_head = dm_sbdata0_get_data
+		},
+		[DM_SBDATA1_ORDINAL] = {
+			.name = "sbdata1",
+			.get_fields_head = dm_sbdata1_get_data
+		},
+		[DM_SBDATA2_ORDINAL] = {
+			.name = "sbdata2",
+			.get_fields_head = dm_sbdata2_get_data
+		},
+		[DM_SBDATA3_ORDINAL] = {
+			.name = "sbdata3",
+			.get_fields_head = dm_sbdata3_get_data
+		},
+		[SHORTNAME_ORDINAL] = {
+			.name = "shortname",
+			.get_fields_head = shortname_get_field
+		},
+		[AC_ACCESS_REGISTER_ORDINAL] = {
+			.name = "access register",
+			.get_fields_head = ac_access_register_get_regno
+		},
+		[AC_QUICK_ACCESS_ORDINAL] = {
+			.name = "quick access",
+			.get_fields_head = ac_quick_access_get_cmdtype
+		},
+		[AC_ACCESS_MEMORY_ORDINAL] = {
+			.name = "access memory",
+			.get_fields_head = ac_access_memory_get_target_specific
+		},
+		[VIRT_PRIV_ORDINAL] = {
+			.name = "priv",
+			.get_fields_head = virt_priv_get_prv
+		},
+		[DMI_SERCS_ORDINAL] = {
+			.name = "sercs",
+			.get_fields_head = dmi_sercs_get_full0
+		},
+		[DMI_SERTX_ORDINAL] = {
+			.name = "sertx",
+			.get_fields_head = dmi_sertx_get_data
+		},
+		[DMI_SERRX_ORDINAL] = {
+			.name = "serrx",
+			.get_fields_head = dmi_serrx_get_data
+		},
+	};
+	return debug_reg_info[reg_ordinal];
+}
diff --git a/src/target/riscv/debug_defines.h b/src/target/riscv/debug_defines.h
index 8113d47664..cc70b030f4 100644
--- a/src/target/riscv/debug_defines.h
+++ b/src/target/riscv/debug_defines.h
@@ -1,8 +1,10 @@
 /*
- * This file is auto-generated by running 'make debug_defines.h' in
- * https://github.com/riscv/riscv-debug-spec/ (d749752)
+ * This file is auto-generated by running 'make debug_defines' in
+ * https://github.com/riscv/riscv-debug-spec/ (d749752-dirty)
  */
 
+#ifndef DEBUG_DEFINES_H
+#define DEBUG_DEFINES_H
 #define DTM_IDCODE                          0x01
 /*
  * Identifies the release version of this part.
@@ -100,8 +102,8 @@
  * to access the DM over the DMI.
  */
 #define DTM_DMI_ADDRESS_OFFSET              0x22
-#define DTM_DMI_ADDRESS_LENGTH(abits)       abits
-#define DTM_DMI_ADDRESS(abits)              ((0x400000000ULL * (1ULL<<abits)) + -0x400000000ULL)
+#define DTM_DMI_ADDRESS_LENGTH(abits)       (abits)
+#define DTM_DMI_ADDRESS(abits)              ((0x400000000ULL * (1ULL << (abits))) + -0x400000000ULL)
 /*
  * The data to send to the DM over the DMI during Update-DR, and
  * the data returned from the DM as a result of the previous operation.
@@ -407,18 +409,18 @@
 #define CSR_DCSR_PRV                        3
 #define CSR_DPC                             0x7b1
 #define CSR_DPC_DPC_OFFSET                  0
-#define CSR_DPC_DPC_LENGTH(DXLEN)           DXLEN
-#define CSR_DPC_DPC(DXLEN)                  ((1ULL<<DXLEN) + -1)
+#define CSR_DPC_DPC_LENGTH(DXLEN)           (DXLEN)
+#define CSR_DPC_DPC(DXLEN)                  ((1ULL << (DXLEN)) + -1)
 #define CSR_DSCRATCH0                       0x7b2
 #define CSR_DSCRATCH1                       0x7b3
 #define CSR_TSELECT                         0x7a0
 #define CSR_TSELECT_INDEX_OFFSET            0
-#define CSR_TSELECT_INDEX_LENGTH(XLEN)      XLEN
-#define CSR_TSELECT_INDEX(XLEN)             ((1ULL<<XLEN) + -1)
+#define CSR_TSELECT_INDEX_LENGTH(XLEN)      (XLEN)
+#define CSR_TSELECT_INDEX(XLEN)             ((1ULL << (XLEN)) + -1)
 #define CSR_TDATA1                          0x7a1
-#define CSR_TDATA1_TYPE_OFFSET(XLEN)        (XLEN + -4)
+#define CSR_TDATA1_TYPE_OFFSET(XLEN)        ((XLEN) + -4)
 #define CSR_TDATA1_TYPE_LENGTH              4
-#define CSR_TDATA1_TYPE(XLEN)               (0xf * (1ULL<<(XLEN + -4)))
+#define CSR_TDATA1_TYPE(XLEN)               (0xf * (1ULL << ((XLEN) + -4)))
 /*
  * none: There is no trigger at this \RcsrTselect.
  */
@@ -478,9 +480,9 @@
 /*
  * If \FcsrTdataOneType is 0, then this bit is hard-wired to 0.
  */
-#define CSR_TDATA1_DMODE_OFFSET(XLEN)       (XLEN + -5)
+#define CSR_TDATA1_DMODE_OFFSET(XLEN)       ((XLEN) + -5)
 #define CSR_TDATA1_DMODE_LENGTH             1
-#define CSR_TDATA1_DMODE(XLEN)              (1ULL<<(XLEN + -5))
+#define CSR_TDATA1_DMODE(XLEN)              (1ULL << ((XLEN) + -5))
 /*
  * both: Both Debug and M-mode can write the {\tt tdata} registers at the
  * selected \RcsrTselect.
@@ -505,16 +507,16 @@
  * Trigger-specific data.
  */
 #define CSR_TDATA1_DATA_OFFSET              0
-#define CSR_TDATA1_DATA_LENGTH(XLEN)        (XLEN + -5)
-#define CSR_TDATA1_DATA(XLEN)               ((1ULL<<(XLEN + -5)) + -1)
+#define CSR_TDATA1_DATA_LENGTH(XLEN)        ((XLEN) + -5)
+#define CSR_TDATA1_DATA(XLEN)               ((1ULL << ((XLEN) + -5)) + -1)
 #define CSR_TDATA2                          0x7a2
 #define CSR_TDATA2_DATA_OFFSET              0
-#define CSR_TDATA2_DATA_LENGTH(XLEN)        XLEN
-#define CSR_TDATA2_DATA(XLEN)               ((1ULL<<XLEN) + -1)
+#define CSR_TDATA2_DATA_LENGTH(XLEN)        (XLEN)
+#define CSR_TDATA2_DATA(XLEN)               ((1ULL << (XLEN)) + -1)
 #define CSR_TDATA3                          0x7a3
 #define CSR_TDATA3_DATA_OFFSET              0
-#define CSR_TDATA3_DATA_LENGTH(XLEN)        XLEN
-#define CSR_TDATA3_DATA(XLEN)               ((1ULL<<XLEN) + -1)
+#define CSR_TDATA3_DATA_LENGTH(XLEN)        (XLEN)
+#define CSR_TDATA3_DATA(XLEN)               ((1ULL << (XLEN)) + -1)
 #define CSR_TINFO                           0x7a4
 /*
  * One bit for each possible \FcsrTdataOneType enumerated in \RcsrTdataOne. Bit N
@@ -573,8 +575,8 @@
  * and 14 on RV64.
  */
 #define CSR_HCONTEXT_HCONTEXT_OFFSET        0
-#define CSR_HCONTEXT_HCONTEXT_LENGTH(XLEN)  XLEN
-#define CSR_HCONTEXT_HCONTEXT(XLEN)         ((1ULL<<XLEN) + -1)
+#define CSR_HCONTEXT_HCONTEXT_LENGTH(XLEN)  (XLEN)
+#define CSR_HCONTEXT_HCONTEXT(XLEN)         ((1ULL << (XLEN)) + -1)
 #define CSR_SCONTEXT                        0x5a8
 /*
  * Supervisor mode software can write a context number to this
@@ -586,17 +588,17 @@
  * 34 on RV64.
  */
 #define CSR_SCONTEXT_DATA_OFFSET            0
-#define CSR_SCONTEXT_DATA_LENGTH(XLEN)      XLEN
-#define CSR_SCONTEXT_DATA(XLEN)             ((1ULL<<XLEN) + -1)
+#define CSR_SCONTEXT_DATA_LENGTH(XLEN)      (XLEN)
+#define CSR_SCONTEXT_DATA(XLEN)             ((1ULL << (XLEN)) + -1)
 #define CSR_MCONTEXT                        0x7a8
 #define CSR_MSCONTEXT                       0x7aa
 #define CSR_MCONTROL                        0x7a1
-#define CSR_MCONTROL_TYPE_OFFSET(XLEN)      (XLEN + -4)
+#define CSR_MCONTROL_TYPE_OFFSET(XLEN)      ((XLEN) + -4)
 #define CSR_MCONTROL_TYPE_LENGTH            4
-#define CSR_MCONTROL_TYPE(XLEN)             (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_MCONTROL_DMODE_OFFSET(XLEN)     (XLEN + -5)
+#define CSR_MCONTROL_TYPE(XLEN)             (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_MCONTROL_DMODE_OFFSET(XLEN)     ((XLEN) + -5)
 #define CSR_MCONTROL_DMODE_LENGTH           1
-#define CSR_MCONTROL_DMODE(XLEN)            (1ULL<<(XLEN + -5))
+#define CSR_MCONTROL_DMODE(XLEN)            (1ULL << ((XLEN) + -5))
 /*
  * Specifies the largest naturally aligned powers-of-two (NAPOT) range
  * supported by the hardware when \FcsrMcontrolMatch is 1. The value is the
@@ -605,9 +607,9 @@
  * A value of 63 corresponds to the maximum NAPOT range, which is
  * $2^{63}$ bytes in size.
  */
-#define CSR_MCONTROL_MASKMAX_OFFSET(XLEN)   (XLEN + -0xb)
+#define CSR_MCONTROL_MASKMAX_OFFSET(XLEN)   ((XLEN) + -0xb)
 #define CSR_MCONTROL_MASKMAX_LENGTH         6
-#define CSR_MCONTROL_MASKMAX(XLEN)          (0x3f * (1ULL<<(XLEN + -0xb)))
+#define CSR_MCONTROL_MASKMAX(XLEN)          (0x3f * (1ULL << ((XLEN) + -0xb)))
 /*
  * This field only exists when XLEN is at least 64.
  * It contains the 2 high bits of the access size. The low bits
@@ -946,12 +948,12 @@
 #define CSR_MCONTROL_LOAD_LENGTH            1
 #define CSR_MCONTROL_LOAD                   1
 #define CSR_MCONTROL6                       0x7a1
-#define CSR_MCONTROL6_TYPE_OFFSET(XLEN)     (XLEN + -4)
+#define CSR_MCONTROL6_TYPE_OFFSET(XLEN)     ((XLEN) + -4)
 #define CSR_MCONTROL6_TYPE_LENGTH           4
-#define CSR_MCONTROL6_TYPE(XLEN)            (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_MCONTROL6_DMODE_OFFSET(XLEN)    (XLEN + -5)
+#define CSR_MCONTROL6_TYPE(XLEN)            (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_MCONTROL6_DMODE_OFFSET(XLEN)    ((XLEN) + -5)
 #define CSR_MCONTROL6_DMODE_LENGTH          1
-#define CSR_MCONTROL6_DMODE(XLEN)           (1ULL<<(XLEN + -5))
+#define CSR_MCONTROL6_DMODE(XLEN)           (1ULL << ((XLEN) + -5))
 /*
  * When set, enable this trigger in VS-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1295,12 +1297,12 @@
 #define CSR_MCONTROL6_LOAD_LENGTH           1
 #define CSR_MCONTROL6_LOAD                  1
 #define CSR_ICOUNT                          0x7a1
-#define CSR_ICOUNT_TYPE_OFFSET(XLEN)        (XLEN + -4)
+#define CSR_ICOUNT_TYPE_OFFSET(XLEN)        ((XLEN) + -4)
 #define CSR_ICOUNT_TYPE_LENGTH              4
-#define CSR_ICOUNT_TYPE(XLEN)               (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_ICOUNT_DMODE_OFFSET(XLEN)       (XLEN + -5)
+#define CSR_ICOUNT_TYPE(XLEN)               (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_ICOUNT_DMODE_OFFSET(XLEN)       ((XLEN) + -5)
 #define CSR_ICOUNT_DMODE_LENGTH             1
-#define CSR_ICOUNT_DMODE(XLEN)              (1ULL<<(XLEN + -5))
+#define CSR_ICOUNT_DMODE(XLEN)              (1ULL << ((XLEN) + -5))
 /*
  * When set, enable this trigger in VS-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1400,12 +1402,12 @@
  */
 #define CSR_ICOUNT_ACTION_EXTERNAL1         9
 #define CSR_ITRIGGER                        0x7a1
-#define CSR_ITRIGGER_TYPE_OFFSET(XLEN)      (XLEN + -4)
+#define CSR_ITRIGGER_TYPE_OFFSET(XLEN)      ((XLEN) + -4)
 #define CSR_ITRIGGER_TYPE_LENGTH            4
-#define CSR_ITRIGGER_TYPE(XLEN)             (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_ITRIGGER_DMODE_OFFSET(XLEN)     (XLEN + -5)
+#define CSR_ITRIGGER_TYPE(XLEN)             (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_ITRIGGER_DMODE_OFFSET(XLEN)     ((XLEN) + -5)
 #define CSR_ITRIGGER_DMODE_LENGTH           1
-#define CSR_ITRIGGER_DMODE(XLEN)            (1ULL<<(XLEN + -5))
+#define CSR_ITRIGGER_DMODE(XLEN)            (1ULL << ((XLEN) + -5))
 /*
  * If this bit is implemented, the hardware sets it when this
  * trigger matches. The trigger's user can set or clear it at any
@@ -1413,9 +1415,9 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_ITRIGGER_HIT_OFFSET(XLEN)       (XLEN + -6)
+#define CSR_ITRIGGER_HIT_OFFSET(XLEN)       ((XLEN) + -6)
 #define CSR_ITRIGGER_HIT_LENGTH             1
-#define CSR_ITRIGGER_HIT(XLEN)              (1ULL<<(XLEN + -6))
+#define CSR_ITRIGGER_HIT(XLEN)              (1ULL << ((XLEN) + -6))
 /*
  * When set, enable this trigger for interrupts that are taken from VS
  * mode.
@@ -1502,12 +1504,12 @@
  */
 #define CSR_ITRIGGER_ACTION_EXTERNAL1       9
 #define CSR_ETRIGGER                        0x7a1
-#define CSR_ETRIGGER_TYPE_OFFSET(XLEN)      (XLEN + -4)
+#define CSR_ETRIGGER_TYPE_OFFSET(XLEN)      ((XLEN) + -4)
 #define CSR_ETRIGGER_TYPE_LENGTH            4
-#define CSR_ETRIGGER_TYPE(XLEN)             (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_ETRIGGER_DMODE_OFFSET(XLEN)     (XLEN + -5)
+#define CSR_ETRIGGER_TYPE(XLEN)             (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_ETRIGGER_DMODE_OFFSET(XLEN)     ((XLEN) + -5)
 #define CSR_ETRIGGER_DMODE_LENGTH           1
-#define CSR_ETRIGGER_DMODE(XLEN)            (1ULL<<(XLEN + -5))
+#define CSR_ETRIGGER_DMODE(XLEN)            (1ULL << ((XLEN) + -5))
 /*
  * If this bit is implemented, the hardware sets it when this
  * trigger matches. The trigger's user can set or clear it at any
@@ -1515,9 +1517,9 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_ETRIGGER_HIT_OFFSET(XLEN)       (XLEN + -6)
+#define CSR_ETRIGGER_HIT_OFFSET(XLEN)       ((XLEN) + -6)
 #define CSR_ETRIGGER_HIT_LENGTH             1
-#define CSR_ETRIGGER_HIT(XLEN)              (1ULL<<(XLEN + -6))
+#define CSR_ETRIGGER_HIT(XLEN)              (1ULL << ((XLEN) + -6))
 /*
  * When set, enable this trigger for exceptions that are taken from VS
  * mode.
@@ -1597,12 +1599,12 @@
  */
 #define CSR_ETRIGGER_ACTION_EXTERNAL1       9
 #define CSR_TMEXTTRIGGER                    0x7a1
-#define CSR_TMEXTTRIGGER_TYPE_OFFSET(XLEN)  (XLEN + -4)
+#define CSR_TMEXTTRIGGER_TYPE_OFFSET(XLEN)  ((XLEN) + -4)
 #define CSR_TMEXTTRIGGER_TYPE_LENGTH        4
-#define CSR_TMEXTTRIGGER_TYPE(XLEN)         (0xf * (1ULL<<(XLEN + -4)))
-#define CSR_TMEXTTRIGGER_DMODE_OFFSET(XLEN) (XLEN + -5)
+#define CSR_TMEXTTRIGGER_TYPE(XLEN)         (0xf * (1ULL << ((XLEN) + -4)))
+#define CSR_TMEXTTRIGGER_DMODE_OFFSET(XLEN) ((XLEN) + -5)
 #define CSR_TMEXTTRIGGER_DMODE_LENGTH       1
-#define CSR_TMEXTTRIGGER_DMODE(XLEN)        (1ULL<<(XLEN + -5))
+#define CSR_TMEXTTRIGGER_DMODE(XLEN)        (1ULL << ((XLEN) + -5))
 /*
  * If this bit is implemented, the hardware sets it when this
  * trigger matches. The trigger's user can set or clear it at any
@@ -1610,9 +1612,9 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_TMEXTTRIGGER_HIT_OFFSET(XLEN)   (XLEN + -6)
+#define CSR_TMEXTTRIGGER_HIT_OFFSET(XLEN)   ((XLEN) + -6)
 #define CSR_TMEXTTRIGGER_HIT_LENGTH         1
-#define CSR_TMEXTTRIGGER_HIT(XLEN)          (1ULL<<(XLEN + -6))
+#define CSR_TMEXTTRIGGER_HIT(XLEN)          (1ULL << ((XLEN) + -6))
 /*
  * This optional bit, when set, causes this trigger to fire whenever an attached
  * interrupt controller signals a trigger.
@@ -3059,3 +3061,93 @@
 #define DMI_SERRX_DATA_OFFSET               0
 #define DMI_SERRX_DATA_LENGTH               0x20
 #define DMI_SERRX_DATA                      0xffffffffU
+enum riscv_debug_reg_ordinal {
+	DTM_IDCODE_ORDINAL,
+	DTM_DTMCS_ORDINAL,
+	DTM_DMI_ORDINAL,
+	DTM_BYPASS_ORDINAL,
+	CSR_DCSR_ORDINAL,
+	CSR_DPC_ORDINAL,
+	CSR_TSELECT_ORDINAL,
+	CSR_TDATA1_ORDINAL,
+	CSR_TDATA2_ORDINAL,
+	CSR_TDATA3_ORDINAL,
+	CSR_TINFO_ORDINAL,
+	CSR_TCONTROL_ORDINAL,
+	CSR_HCONTEXT_ORDINAL,
+	CSR_SCONTEXT_ORDINAL,
+	CSR_MCONTROL_ORDINAL,
+	CSR_MCONTROL6_ORDINAL,
+	CSR_ICOUNT_ORDINAL,
+	CSR_ITRIGGER_ORDINAL,
+	CSR_ETRIGGER_ORDINAL,
+	CSR_TMEXTTRIGGER_ORDINAL,
+	CSR_TEXTRA32_ORDINAL,
+	CSR_TEXTRA64_ORDINAL,
+	DM_DMSTATUS_ORDINAL,
+	DM_DMCONTROL_ORDINAL,
+	DM_HARTINFO_ORDINAL,
+	DM_HAWINDOWSEL_ORDINAL,
+	DM_HAWINDOW_ORDINAL,
+	DM_ABSTRACTCS_ORDINAL,
+	DM_COMMAND_ORDINAL,
+	DM_ABSTRACTAUTO_ORDINAL,
+	DM_CONFSTRPTR0_ORDINAL,
+	DM_CONFSTRPTR1_ORDINAL,
+	DM_CONFSTRPTR2_ORDINAL,
+	DM_CONFSTRPTR3_ORDINAL,
+	DM_NEXTDM_ORDINAL,
+	DM_DATA0_ORDINAL,
+	DM_PROGBUF0_ORDINAL,
+	DM_AUTHDATA_ORDINAL,
+	DM_DMCS2_ORDINAL,
+	DM_HALTSUM0_ORDINAL,
+	DM_HALTSUM1_ORDINAL,
+	DM_HALTSUM2_ORDINAL,
+	DM_HALTSUM3_ORDINAL,
+	DM_SBCS_ORDINAL,
+	DM_SBADDRESS0_ORDINAL,
+	DM_SBADDRESS1_ORDINAL,
+	DM_SBADDRESS2_ORDINAL,
+	DM_SBADDRESS3_ORDINAL,
+	DM_SBDATA0_ORDINAL,
+	DM_SBDATA1_ORDINAL,
+	DM_SBDATA2_ORDINAL,
+	DM_SBDATA3_ORDINAL,
+	SHORTNAME_ORDINAL,
+	AC_ACCESS_REGISTER_ORDINAL,
+	AC_QUICK_ACCESS_ORDINAL,
+	AC_ACCESS_MEMORY_ORDINAL,
+	VIRT_PRIV_ORDINAL,
+	DMI_SERCS_ORDINAL,
+	DMI_SERTX_ORDINAL,
+	DMI_SERRX_ORDINAL
+};
+typedef struct {
+	struct {
+		unsigned int value; int is_set;
+	} DXLEN;
+	struct {
+		unsigned int value; int is_set;
+	} XLEN;
+	struct {
+		unsigned int value; int is_set;
+	} abits;
+} riscv_debug_reg_ctx_t;
+
+typedef struct {
+	const char *name;
+	unsigned int lsb; // inclusive
+	unsigned int msb; // inclusive
+	const char **values; // If non-NULL, array of human-readable string for each possible value
+} riscv_debug_reg_field_info_t;
+typedef struct riscv_debug_reg_field_list_t {
+	riscv_debug_reg_field_info_t field;
+	struct riscv_debug_reg_field_list_t (*get_next)(riscv_debug_reg_ctx_t context);
+} riscv_debug_reg_field_list_t;
+typedef struct {
+	const char *name;
+	struct riscv_debug_reg_field_list_t (* const get_fields_head)(riscv_debug_reg_ctx_t context);
+} riscv_debug_reg_info_t;
+riscv_debug_reg_info_t get_riscv_debug_reg_info(enum riscv_debug_reg_ordinal reg_ordinal);
+#endif
diff --git a/src/target/riscv/debug_register_printers.c b/src/target/riscv/debug_register_printers.c
new file mode 100644
index 0000000000..7ba56b6c66
--- /dev/null
+++ b/src/target/riscv/debug_register_printers.c
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdio.h>
+#include <inttypes.h>
+#include <assert.h>
+#include <stdarg.h>
+
+#include "debug_register_printers.h"
+
+static unsigned int get_len_or_sprintf(char *buf, unsigned int curr, const char *format, ...)
+{
+	assert(format);
+	va_list args;
+	int length;
+
+	va_start(args, format);
+	if (buf)
+		length = vsprintf(buf + curr, format, args);
+	else
+		length = vsnprintf(NULL, 0, format, args);
+	va_end(args);
+	assert(length >= 0);
+	return (unsigned int)length;
+}
+
+static unsigned int print_value(char *buf, unsigned int offset, uint64_t value)
+{
+	const char * const format = value > 9 ? "0x%" PRIx64 : "%" PRIx64;
+
+	return get_len_or_sprintf(buf, offset, format, value);
+}
+
+static unsigned int riscv_debug_reg_field_value_to_s(char *buf, unsigned int offset,
+		const char * const *field_value_names, uint64_t field_value)
+{
+	const char * const field_value_name = field_value_names ?
+		field_value_names[field_value] :
+		NULL;
+
+	if (!field_value_name)
+		return print_value(buf, offset, field_value);
+	return get_len_or_sprintf(buf, offset, "%s", field_value_name);
+}
+
+static unsigned int riscv_debug_reg_field_to_s(char *buf, unsigned int offset,
+		riscv_debug_reg_field_info_t field, riscv_debug_reg_ctx_t context,
+		uint64_t field_value)
+{
+	const unsigned int name_len = get_len_or_sprintf(buf, offset, "%s=", field.name);
+
+	return name_len + riscv_debug_reg_field_value_to_s(buf, offset + name_len,
+			field.values, field_value);
+}
+
+static uint64_t riscv_debug_reg_field_value(riscv_debug_reg_field_info_t field, uint64_t value)
+{
+	assert(field.msb < 64);
+	assert(field.msb >= field.lsb);
+	const uint64_t trailing_ones_mask = (uint64_t)(-1) >> (63 - field.msb);
+	return (value & trailing_ones_mask) >> field.lsb;
+}
+
+static unsigned int riscv_debug_reg_fields_to_s(char *buf, unsigned int offset,
+		riscv_debug_reg_field_list_t list, riscv_debug_reg_ctx_t context, uint64_t value)
+{
+	unsigned int curr = offset;
+	curr += get_len_or_sprintf(buf, curr, " { ");
+	for (; list.get_next; list = list.get_next(context)) {
+		curr += riscv_debug_reg_field_to_s(buf, curr, list.field, context,
+				riscv_debug_reg_field_value(list.field, value));
+		curr += get_len_or_sprintf(buf, curr, ", ");
+	}
+	curr += get_len_or_sprintf(buf, curr, "}");
+	return curr - offset;
+}
+
+unsigned int riscv_debug_reg_to_s(char *buf, enum riscv_debug_reg_ordinal reg_ordinal,
+		riscv_debug_reg_ctx_t context, uint64_t value)
+{
+	unsigned int length = 0;
+
+	riscv_debug_reg_info_t reg = get_riscv_debug_reg_info(reg_ordinal);
+
+	length += get_len_or_sprintf(buf, length, "%s=", reg.name);
+	length += print_value(buf, length, value);
+
+	if (reg.get_fields_head)
+		length += riscv_debug_reg_fields_to_s(buf, length, reg.get_fields_head(context),
+				context, value);
+
+	if (buf)
+		buf[length] = '\0';
+	return length;
+}
diff --git a/src/target/riscv/debug_register_printers.h b/src/target/riscv/debug_register_printers.h
new file mode 100644
index 0000000000..a81fe46b20
--- /dev/null
+++ b/src/target/riscv/debug_register_printers.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include "debug_defines.h"
+
+/**
+ * This function is used to fill a buffer with a decoded string representation
+ * of register's value.
+ * @param buf      If non-NULL, the buffer to write the string into.
+ *                 Otherwise, the function does not perform any writes,
+ *                 it just calculates the number of characters used.
+ * @param reg_ordinal
+ *                 The ordinal of the regiter.
+ * @param context  The structure, containing the information about the target,
+ *                 necessary to decode the register.
+ * @param value    The value to be decoded.
+ *
+ * Returns the number of characters used by the string representation
+ * (excluding '\0').
+ *
+ * Example:
+ * const struct riscv_debug_reg_ctx_t context = {
+ *     .abits = { .value = <abits value>, .is_set = true }
+ * };
+ * char buf[riscv_debug_reg_to_s(NULL, DTM_DMI_ORDINAL, context, <dmi value>) + 1]
+ * riscv_debug_reg_to_s(buf, DTM_DMI_ORDINAL, context, <dmi value>);
+ */
+unsigned int riscv_debug_reg_to_s(char *buf, enum riscv_debug_reg_ordinal reg_ordinal,
+		riscv_debug_reg_ctx_t context, uint64_t value);
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 817d65f6cf..73291a42fd 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -28,6 +28,7 @@
 #include "program.h"
 #include "asm.h"
 #include "batch.h"
+#include "debug_register_printers.h"
 
 static int riscv013_on_step_or_resume(struct target *target, bool step);
 static int riscv013_step_or_resume_current_hart(struct target *target,
@@ -285,6 +286,29 @@ static dm013_info_t *get_dm(struct target *target)
 	return dm;
 }
 
+static riscv_debug_reg_ctx_t get_riscv_debug_reg_ctx(struct target *target)
+{
+	RISCV_INFO(r);
+	RISCV013_INFO(info);
+	const riscv_debug_reg_ctx_t context = {
+		.XLEN = { .value = r->xlen, .is_set = true },
+		.DXLEN = { .value = r->xlen, .is_set = true },
+		.abits = { .value = info->abits, .is_set = true },
+	};
+	return context;
+}
+
+static void log_debug_register(struct target *target, enum riscv_debug_reg_ordinal reg,
+		riscv_reg_t value)
+{
+	if (debug_level < LOG_LVL_DEBUG)
+		return;
+	const riscv_debug_reg_ctx_t context = get_riscv_debug_reg_ctx(target);
+	char buf[riscv_debug_reg_to_s(NULL, reg, context, value) + 1];
+	riscv_debug_reg_to_s(buf, reg, context, value);
+	LOG_TARGET_DEBUG(target, "%s", buf);
+}
+
 static uint32_t set_dmcontrol_hartsel(uint32_t initial, int hart_index)
 {
 	assert(hart_index != HART_INDEX_UNKNOWN);
@@ -306,91 +330,42 @@ static uint32_t set_dmcontrol_hartsel(uint32_t initial, int hart_index)
 	return initial;
 }
 
-static void decode_dm(char *text, unsigned int address, unsigned int data)
+static unsigned int decode_dm(char *text, unsigned int address, unsigned int data)
 {
 	static const struct {
 		unsigned int address;
-		uint64_t mask;
-		const char *name;
+		enum riscv_debug_reg_ordinal ordinal;
 	} description[] = {
-		{ DM_DMCONTROL, DM_DMCONTROL_HALTREQ, "haltreq" },
-		{ DM_DMCONTROL, DM_DMCONTROL_RESUMEREQ, "resumereq" },
-		{ DM_DMCONTROL, DM_DMCONTROL_HARTRESET, "hartreset" },
-		{ DM_DMCONTROL, DM_DMCONTROL_HASEL, "hasel" },
-		{ DM_DMCONTROL, DM_DMCONTROL_HARTSELHI, "hartselhi" },
-		{ DM_DMCONTROL, DM_DMCONTROL_HARTSELLO, "hartsello" },
-		{ DM_DMCONTROL, DM_DMCONTROL_NDMRESET, "ndmreset" },
-		{ DM_DMCONTROL, DM_DMCONTROL_DMACTIVE, "dmactive" },
-		{ DM_DMCONTROL, DM_DMCONTROL_ACKHAVERESET, "ackhavereset" },
-
-		{ DM_DMSTATUS, DM_DMSTATUS_IMPEBREAK, "impebreak" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLHAVERESET, "allhavereset" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYHAVERESET, "anyhavereset" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLRESUMEACK, "allresumeack" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYRESUMEACK, "anyresumeack" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLNONEXISTENT, "allnonexistent" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYNONEXISTENT, "anynonexistent" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLUNAVAIL, "allunavail" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYUNAVAIL, "anyunavail" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLRUNNING, "allrunning" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYRUNNING, "anyrunning" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ALLHALTED, "allhalted" },
-		{ DM_DMSTATUS, DM_DMSTATUS_ANYHALTED, "anyhalted" },
-		{ DM_DMSTATUS, DM_DMSTATUS_AUTHENTICATED, "authenticated" },
-		{ DM_DMSTATUS, DM_DMSTATUS_AUTHBUSY, "authbusy" },
-		{ DM_DMSTATUS, DM_DMSTATUS_HASRESETHALTREQ, "hasresethaltreq" },
-		{ DM_DMSTATUS, DM_DMSTATUS_CONFSTRPTRVALID, "confstrptrvalid" },
-		{ DM_DMSTATUS, DM_DMSTATUS_VERSION, "version" },
-
-		{ DM_ABSTRACTCS, DM_ABSTRACTCS_PROGBUFSIZE, "progbufsize" },
-		{ DM_ABSTRACTCS, DM_ABSTRACTCS_BUSY, "busy" },
-		{ DM_ABSTRACTCS, DM_ABSTRACTCS_CMDERR, "cmderr" },
-		{ DM_ABSTRACTCS, DM_ABSTRACTCS_DATACOUNT, "datacount" },
-
-		{ DM_COMMAND, DM_COMMAND_CMDTYPE, "cmdtype" },
-
-		{ DM_SBCS, DM_SBCS_SBVERSION, "sbversion" },
-		{ DM_SBCS, DM_SBCS_SBBUSYERROR, "sbbusyerror" },
-		{ DM_SBCS, DM_SBCS_SBBUSY, "sbbusy" },
-		{ DM_SBCS, DM_SBCS_SBREADONADDR, "sbreadonaddr" },
-		{ DM_SBCS, DM_SBCS_SBACCESS, "sbaccess" },
-		{ DM_SBCS, DM_SBCS_SBAUTOINCREMENT, "sbautoincrement" },
-		{ DM_SBCS, DM_SBCS_SBREADONDATA, "sbreadondata" },
-		{ DM_SBCS, DM_SBCS_SBERROR, "sberror" },
-		{ DM_SBCS, DM_SBCS_SBASIZE, "sbasize" },
-		{ DM_SBCS, DM_SBCS_SBACCESS128, "sbaccess128" },
-		{ DM_SBCS, DM_SBCS_SBACCESS64, "sbaccess64" },
-		{ DM_SBCS, DM_SBCS_SBACCESS32, "sbaccess32" },
-		{ DM_SBCS, DM_SBCS_SBACCESS16, "sbaccess16" },
-		{ DM_SBCS, DM_SBCS_SBACCESS8, "sbaccess8" },
+#define DECL_DMI_DESC(ADDR) {ADDR, ADDR##_ORDINAL}
+		DECL_DMI_DESC(DM_DMCONTROL),
+		DECL_DMI_DESC(DM_DMSTATUS),
+		DECL_DMI_DESC(DM_ABSTRACTCS),
+		DECL_DMI_DESC(DM_COMMAND),
+		DECL_DMI_DESC(DM_SBCS)
+#undef DECL_DMI_DESC
 	};
 
-	text[0] = 0;
 	for (unsigned i = 0; i < ARRAY_SIZE(description); i++) {
 		if (description[i].address == address) {
-			uint64_t mask = description[i].mask;
-			unsigned value = get_field(data, mask);
-			if (value) {
-				if (i > 0)
-					*(text++) = ' ';
-				if (mask & (mask >> 1)) {
-					/* If the field is more than 1 bit wide. */
-					sprintf(text, "%s=%d", description[i].name, value);
-				} else {
-					strcpy(text, description[i].name);
-				}
-				text += strlen(text);
-			}
+			const riscv_debug_reg_ctx_t context = {
+				.XLEN = { .value = 0, .is_set = false },
+				.DXLEN = { .value = 0, .is_set = false },
+				.abits = { .value = 0, .is_set = false },
+			};
+			return riscv_debug_reg_to_s(text, description[i].ordinal,
+					context, data);
 		}
 	}
+	return 0;
 }
 
-static void decode_dmi(struct target *target, char *text, unsigned int address, unsigned int data)
+static unsigned int decode_dmi(struct target *target, char *text, unsigned int address,
+		unsigned int data)
 {
 	dm013_info_t *dm = get_dm(target);
 	if (!dm)
-		return;
-	decode_dm(text, address - dm->base, data);
+		return 0;
+	return decode_dm(text, address - dm->base, data);
 }
 
 static void dump_field(struct target *target, int idle, const struct scan_field *field)
@@ -417,13 +392,13 @@ static void dump_field(struct target *target, int idle, const struct scan_field
 			field->num_bits, op_string[out_op], out_data, out_address,
 			status_string[in_op], in_data, in_address, idle);
 
-	char out_text[500];
-	char in_text[500];
-	decode_dmi(target, out_text, out_address, out_data);
-	decode_dmi(target, in_text, in_address, in_data);
+	char out_text[decode_dmi(target, NULL, out_address, out_data) + 1];
+	unsigned int out_len  = decode_dmi(target, out_text, out_address, out_data);
+	char in_text[decode_dmi(target, NULL, in_address, in_data) + 1];
+	unsigned int in_len = decode_dmi(target, in_text, in_address, in_data);
 	if (in_text[0] || out_text[0]) {
-		log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, "scan", "%s -> %s",
-				out_text, in_text);
+		log_printf_lf(LOG_LVL_DEBUG, __FILE__, __LINE__, "scan", "%.*s -> %.*s",
+				out_len, out_text, in_len, in_text);
 	}
 }
 
@@ -880,14 +855,7 @@ static int execute_abstract_command(struct target *target, uint32_t command)
 	if (debug_level >= LOG_LVL_DEBUG) {
 		switch (get_field(command, DM_COMMAND_CMDTYPE)) {
 			case 0:
-				LOG_TARGET_DEBUG(target, "command=0x%x; access register, size=%d, postexec=%d, "
-						"transfer=%d, write=%d, regno=0x%x",
-						command,
-						8 << get_field(command, AC_ACCESS_REGISTER_AARSIZE),
-						get_field(command, AC_ACCESS_REGISTER_POSTEXEC),
-						get_field(command, AC_ACCESS_REGISTER_TRANSFER),
-						get_field(command, AC_ACCESS_REGISTER_WRITE),
-						get_field(command, AC_ACCESS_REGISTER_REGNO));
+				log_debug_register(target, AC_ACCESS_REGISTER_ORDINAL, command);
 				break;
 			default:
 				LOG_TARGET_DEBUG(target, "command=0x%x", command);