From 788c364031394948712c1f0f3f21d5a20a89e3dc Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Sat, 30 Apr 2022 09:55:12 -0700
Subject: [PATCH] Use updated macros, which take arguments as expected.

This is more to test the debug changes than to improve OpenOCD in any
way.

Change-Id: If2c3424af89f93952049a519108762a0644405ec
Signed-off-by: Tim Newsome <tim@sifive.com>
---
 src/target/riscv/debug_defines.h | 1020 +++++++++++++++---------------
 src/target/riscv/riscv.c         |    4 +-
 2 files changed, 501 insertions(+), 523 deletions(-)

diff --git a/src/target/riscv/debug_defines.h b/src/target/riscv/debug_defines.h
index 5c9eef4ea..3deac218e 100644
--- a/src/target/riscv/debug_defines.h
+++ b/src/target/riscv/debug_defines.h
@@ -1,6 +1,6 @@
 /*
  * This file is auto-generated by running 'make debug_defines.h' in
- * https://github.com/riscv/riscv-debug-spec/ (3dfe4f7)
+ * https://github.com/riscv/riscv-debug-spec/ (17187e4)
  * License: Creative Commons Attribution 4.0 International Public License (CC BY 4.0)
  */
 
@@ -8,15 +8,15 @@
 /*
  * Identifies the release version of this part.
  */
-#define DTM_IDCODE_VERSION_OFFSET           28
+#define DTM_IDCODE_VERSION_OFFSET           0x1c
 #define DTM_IDCODE_VERSION_LENGTH           4
-#define DTM_IDCODE_VERSION                  (0xfU << DTM_IDCODE_VERSION_OFFSET)
+#define DTM_IDCODE_VERSION                  0xf0000000U
 /*
  * Identifies the designer's part number of this part.
  */
-#define DTM_IDCODE_PARTNUMBER_OFFSET        12
-#define DTM_IDCODE_PARTNUMBER_LENGTH        16
-#define DTM_IDCODE_PARTNUMBER               (0xffffU << DTM_IDCODE_PARTNUMBER_OFFSET)
+#define DTM_IDCODE_PARTNUMBER_OFFSET        0xc
+#define DTM_IDCODE_PARTNUMBER_LENGTH        0x10
+#define DTM_IDCODE_PARTNUMBER               0xffff000
 /*
  * Identifies the designer/manufacturer of this part. Bits 6:0 must be
  * bits 6:0 of the designer/manufacturer's Identification Code as
@@ -25,11 +25,11 @@
  * Identification Code.
  */
 #define DTM_IDCODE_MANUFID_OFFSET           1
-#define DTM_IDCODE_MANUFID_LENGTH           11
-#define DTM_IDCODE_MANUFID                  (0x7ffU << DTM_IDCODE_MANUFID_OFFSET)
+#define DTM_IDCODE_MANUFID_LENGTH           0xb
+#define DTM_IDCODE_MANUFID                  0xffe
 #define DTM_IDCODE_1_OFFSET                 0
 #define DTM_IDCODE_1_LENGTH                 1
-#define DTM_IDCODE_1                        (0x1U << DTM_IDCODE_1_OFFSET)
+#define DTM_IDCODE_1                        1
 #define DTM_DTMCS                           0x10
 /*
  * Writing 1 to this bit does a hard reset of the DTM,
@@ -40,16 +40,16 @@
  * complete (e.g. a reset condition caused an inflight DMI transaction to
  * be cancelled).
  */
-#define DTM_DTMCS_DMIHARDRESET_OFFSET       17
+#define DTM_DTMCS_DMIHARDRESET_OFFSET       0x11
 #define DTM_DTMCS_DMIHARDRESET_LENGTH       1
-#define DTM_DTMCS_DMIHARDRESET              (0x1U << DTM_DTMCS_DMIHARDRESET_OFFSET)
+#define DTM_DTMCS_DMIHARDRESET              0x20000
 /*
  * Writing 1 to this bit clears the sticky error state, but does
  * not affect outstanding DMI transactions.
  */
-#define DTM_DTMCS_DMIRESET_OFFSET           16
+#define DTM_DTMCS_DMIRESET_OFFSET           0x10
 #define DTM_DTMCS_DMIRESET_LENGTH           1
-#define DTM_DTMCS_DMIRESET                  (0x1U << DTM_DTMCS_DMIRESET_OFFSET)
+#define DTM_DTMCS_DMIRESET                  0x10000
 /*
  * This is a hint to the debugger of the minimum number of
  * cycles a debugger should spend in
@@ -65,28 +65,21 @@
  *
  * And so on.
  */
-#define DTM_DTMCS_IDLE_OFFSET               12
+#define DTM_DTMCS_IDLE_OFFSET               0xc
 #define DTM_DTMCS_IDLE_LENGTH               3
-#define DTM_DTMCS_IDLE                      (0x7U << DTM_DTMCS_IDLE_OFFSET)
+#define DTM_DTMCS_IDLE                      0x7000
 /*
- * 0: No error.
- *
- * 1: Reserved. Interpret the same as 2.
- *
- * 2: An operation failed (resulted in \FdtmDmiOp of 2).
- *
- * 3: An operation was attempted while a DMI access was still in
- * progress (resulted in \FdtmDmiOp of 3).
+ * Read-only alias of \FdtmDmiOp.
  */
-#define DTM_DTMCS_DMISTAT_OFFSET            10
+#define DTM_DTMCS_DMISTAT_OFFSET            0xa
 #define DTM_DTMCS_DMISTAT_LENGTH            2
-#define DTM_DTMCS_DMISTAT                   (0x3U << DTM_DTMCS_DMISTAT_OFFSET)
+#define DTM_DTMCS_DMISTAT                   0xc00
 /*
  * The size of \FdmSbaddressZeroAddress in \RdtmDmi.
  */
 #define DTM_DTMCS_ABITS_OFFSET              4
 #define DTM_DTMCS_ABITS_LENGTH              6
-#define DTM_DTMCS_ABITS                     (0x3fU << DTM_DTMCS_ABITS_OFFSET)
+#define DTM_DTMCS_ABITS                     0x3f0
 /*
  * 0: Version described in spec version 0.11.
  *
@@ -96,22 +89,22 @@
  */
 #define DTM_DTMCS_VERSION_OFFSET            0
 #define DTM_DTMCS_VERSION_LENGTH            4
-#define DTM_DTMCS_VERSION                   (0xfU << DTM_DTMCS_VERSION_OFFSET)
+#define DTM_DTMCS_VERSION                   0xf
 #define DTM_DMI                             0x11
 /*
  * Address used for DMI access. In Update-DR this value is used
  * to access the DM over the DMI.
  */
-#define DTM_DMI_ADDRESS_OFFSET              34
-#define DTM_DMI_ADDRESS_LENGTH              abits
-#define DTM_DMI_ADDRESS                     (((1L << abits) - 1) << DTM_DMI_ADDRESS_OFFSET)
+#define DTM_DMI_ADDRESS_OFFSET              0x22
+#define DTM_DMI_ADDRESS_LENGTH(abits)       abits
+#define DTM_DMI_ADDRESS(abits)              ((0x400000000ULL * (1ULL<<abits)) + -17179869184)
 /*
  * 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.
  */
 #define DTM_DMI_DATA_OFFSET                 2
-#define DTM_DMI_DATA_LENGTH                 32
-#define DTM_DMI_DATA                        (0xffffffffULL << DTM_DMI_DATA_OFFSET)
+#define DTM_DMI_DATA_LENGTH                 0x20
+#define DTM_DMI_DATA                        0x3fffffffcULL
 /*
  * When the debugger writes this field, it has the following meaning:
  *
@@ -153,7 +146,7 @@
  */
 #define DTM_DMI_OP_OFFSET                   0
 #define DTM_DMI_OP_LENGTH                   2
-#define DTM_DMI_OP                          (0x3ULL << DTM_DMI_OP_OFFSET)
+#define DTM_DMI_OP                          3
 #define CSR_DCSR                            0x7b0
 /*
  * 0: There is no debug support.
@@ -163,9 +156,9 @@
  * 15: There is debug support, but it does not conform to any
  * available version of this spec.
  */
-#define CSR_DCSR_DEBUGVER_OFFSET            28
+#define CSR_DCSR_DEBUGVER_OFFSET            0x1c
 #define CSR_DCSR_DEBUGVER_LENGTH            4
-#define CSR_DCSR_DEBUGVER                   (0xfU << CSR_DCSR_DEBUGVER_OFFSET)
+#define CSR_DCSR_DEBUGVER                   0xf0000000U
 /*
  * 0: {\tt ebreak} instructions in VS-mode behave as described in the
  * Privileged Spec.
@@ -174,9 +167,9 @@
  *
  * This bit is hardwired to 0 if the hart does not support virtualization mode.
  */
-#define CSR_DCSR_EBREAKVS_OFFSET            17
+#define CSR_DCSR_EBREAKVS_OFFSET            0x11
 #define CSR_DCSR_EBREAKVS_LENGTH            1
-#define CSR_DCSR_EBREAKVS                   (0x1U << CSR_DCSR_EBREAKVS_OFFSET)
+#define CSR_DCSR_EBREAKVS                   0x20000
 /*
  * 0: {\tt ebreak} instructions in VU-mode behave as described in the
  * Privileged Spec.
@@ -185,18 +178,18 @@
  *
  * This bit is hardwired to 0 if the hart does not support virtualization mode.
  */
-#define CSR_DCSR_EBREAKVU_OFFSET            16
+#define CSR_DCSR_EBREAKVU_OFFSET            0x10
 #define CSR_DCSR_EBREAKVU_LENGTH            1
-#define CSR_DCSR_EBREAKVU                   (0x1U << CSR_DCSR_EBREAKVU_OFFSET)
+#define CSR_DCSR_EBREAKVU                   0x10000
 /*
  * 0: {\tt ebreak} instructions in M-mode behave as described in the
  * Privileged Spec.
  *
  * 1: {\tt ebreak} instructions in M-mode enter Debug Mode.
  */
-#define CSR_DCSR_EBREAKM_OFFSET             15
+#define CSR_DCSR_EBREAKM_OFFSET             0xf
 #define CSR_DCSR_EBREAKM_LENGTH             1
-#define CSR_DCSR_EBREAKM                    (0x1U << CSR_DCSR_EBREAKM_OFFSET)
+#define CSR_DCSR_EBREAKM                    0x8000
 /*
  * 0: {\tt ebreak} instructions in S-mode behave as described in the
  * Privileged Spec.
@@ -205,9 +198,9 @@
  *
  * This bit is hardwired to 0 if the hart does not support S-mode.
  */
-#define CSR_DCSR_EBREAKS_OFFSET             13
+#define CSR_DCSR_EBREAKS_OFFSET             0xd
 #define CSR_DCSR_EBREAKS_LENGTH             1
-#define CSR_DCSR_EBREAKS                    (0x1U << CSR_DCSR_EBREAKS_OFFSET)
+#define CSR_DCSR_EBREAKS                    0x2000
 /*
  * 0: {\tt ebreak} instructions in U-mode behave as described in the
  * Privileged Spec.
@@ -216,9 +209,9 @@
  *
  * This bit is hardwired to 0 if the hart does not support U-mode.
  */
-#define CSR_DCSR_EBREAKU_OFFSET             12
+#define CSR_DCSR_EBREAKU_OFFSET             0xc
 #define CSR_DCSR_EBREAKU_LENGTH             1
-#define CSR_DCSR_EBREAKU                    (0x1U << CSR_DCSR_EBREAKU_OFFSET)
+#define CSR_DCSR_EBREAKU                    0x1000
 /*
  * 0: Interrupts (including NMI) are disabled during single stepping.
  *
@@ -230,9 +223,9 @@
  * The debugger must not change the value of this bit while the hart
  * is running.
  */
-#define CSR_DCSR_STEPIE_OFFSET              11
+#define CSR_DCSR_STEPIE_OFFSET              0xb
 #define CSR_DCSR_STEPIE_LENGTH              1
-#define CSR_DCSR_STEPIE                     (0x1U << CSR_DCSR_STEPIE_OFFSET)
+#define CSR_DCSR_STEPIE                     0x800
 /*
  * 0: Increment counters as usual.
  *
@@ -244,19 +237,21 @@
  *
  * An implementation may hardwire this bit to 0 or 1.
  */
-#define CSR_DCSR_STOPCOUNT_OFFSET           10
+#define CSR_DCSR_STOPCOUNT_OFFSET           0xa
 #define CSR_DCSR_STOPCOUNT_LENGTH           1
-#define CSR_DCSR_STOPCOUNT                  (0x1U << CSR_DCSR_STOPCOUNT_OFFSET)
+#define CSR_DCSR_STOPCOUNT                  0x400
 /*
- * 0: Increment timers as usual.
+ * 0: Increment \Rtime as usual.
  *
- * 1: Don't increment any hart-local timers while in Debug Mode.
+ * 1: Don't increment \Rtime while in Debug Mode.  If all harts
+ * have \FcsrDcsrStoptime=1 and are in Debug Mode then \Rmtime
+ * is also allowed to stop incrementing.
  *
  * An implementation may hardwire this bit to 0 or 1.
  */
-#define CSR_DCSR_STOPTIME_OFFSET            9
+#define CSR_DCSR_STOPTIME_OFFSET            0x9
 #define CSR_DCSR_STOPTIME_LENGTH            1
-#define CSR_DCSR_STOPTIME                   (0x1U << CSR_DCSR_STOPTIME_OFFSET)
+#define CSR_DCSR_STOPTIME                   0x200
 /*
  * Explains why Debug Mode was entered.
  *
@@ -266,7 +261,7 @@
  *
  * 1: An {\tt ebreak} instruction was executed. (priority 3)
  *
- * 2: A Trigger Module trigger fired with action=0. (priority 4)
+ * 2: A Trigger Module trigger fired with action=1. (priority 4)
  *
  * 3: The debugger requested entry to Debug Mode using \FdmDmcontrolHaltreq.
  * (priority 1)
@@ -283,18 +278,18 @@
  */
 #define CSR_DCSR_CAUSE_OFFSET               6
 #define CSR_DCSR_CAUSE_LENGTH               3
-#define CSR_DCSR_CAUSE                      (0x7U << CSR_DCSR_CAUSE_OFFSET)
+#define CSR_DCSR_CAUSE                      0x1c0
 /*
  * Extends the prv field with the virtualization mode the hart was operating
  * in when Debug Mode was entered. The encoding is described in Table
- * \ref{tab:privlevel}.
+ * \ref{tab:privmode}.
  * A debugger can change this value to change the hart's virtualization mode
  * when exiting Debug Mode.
  * This bit is hardwired to 0 on harts that do not support virtualization mode.
  */
 #define CSR_DCSR_V_OFFSET                   5
 #define CSR_DCSR_V_LENGTH                   1
-#define CSR_DCSR_V                          (0x1U << CSR_DCSR_V_OFFSET)
+#define CSR_DCSR_V                          0x20
 /*
  * 0: \FcsrMstatusMprv in \Rmstatus is ignored in Debug Mode.
  *
@@ -304,7 +299,7 @@
  */
 #define CSR_DCSR_MPRVEN_OFFSET              4
 #define CSR_DCSR_MPRVEN_LENGTH              1
-#define CSR_DCSR_MPRVEN                     (0x1U << CSR_DCSR_MPRVEN_OFFSET)
+#define CSR_DCSR_MPRVEN                     0x10
 /*
  * When set, there is a Non-Maskable-Interrupt (NMI) pending for the hart.
  *
@@ -314,7 +309,7 @@
  */
 #define CSR_DCSR_NMIP_OFFSET                3
 #define CSR_DCSR_NMIP_LENGTH                1
-#define CSR_DCSR_NMIP                       (0x1U << CSR_DCSR_NMIP_OFFSET)
+#define CSR_DCSR_NMIP                       0x8
 /*
  * When set and not in Debug Mode, the hart will only execute a single
  * instruction and then enter Debug Mode. See Section~\ref{stepBit}
@@ -325,30 +320,30 @@
  */
 #define CSR_DCSR_STEP_OFFSET                2
 #define CSR_DCSR_STEP_LENGTH                1
-#define CSR_DCSR_STEP                       (0x1U << CSR_DCSR_STEP_OFFSET)
+#define CSR_DCSR_STEP                       4
 /*
- * Contains the privilege level the hart was operating in when Debug
+ * Contains the privilege mode the hart was operating in when Debug
  * Mode was entered. The encoding is described in Table
- * \ref{tab:privlevel}.  A debugger can change this value to change
- * the hart's privilege level when exiting Debug Mode.
+ * \ref{tab:privmode}.  A debugger can change this value to change
+ * the hart's privilege mode when exiting Debug Mode.
  *
- * Not all privilege levels are supported on all harts. If the
+ * Not all privilege modes are supported on all harts. If the
  * encoding written is not supported or the debugger is not allowed to
- * change to it, the hart may change to any supported privilege level.
+ * change to it, the hart may change to any supported privilege mode.
  */
 #define CSR_DCSR_PRV_OFFSET                 0
 #define CSR_DCSR_PRV_LENGTH                 2
-#define CSR_DCSR_PRV                        (0x3U << CSR_DCSR_PRV_OFFSET)
+#define CSR_DCSR_PRV                        3
 #define CSR_DPC                             0x7b1
 #define CSR_DPC_DPC_OFFSET                  0
-#define CSR_DPC_DPC_LENGTH                  DXLEN
-#define CSR_DPC_DPC                         (((1L << DXLEN) - 1) << CSR_DPC_DPC_OFFSET)
+#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
-#define CSR_TSELECT_INDEX                   (((1L << XLEN) - 1) << CSR_TSELECT_INDEX_OFFSET)
+#define CSR_TSELECT_INDEX_LENGTH(XLEN)      XLEN
+#define CSR_TSELECT_INDEX(XLEN)             ((1ULL<<XLEN) + -1)
 #define CSR_TDATA1                          0x7a1
 /*
  * 0: There is no trigger at this \RcsrTselect.
@@ -378,14 +373,16 @@
  *
  * 12--14: These trigger types are available for non-standard use.
  *
- * 15: This trigger exists (so enumeration shouldn't terminate), but
- * is not currently available.
+ * 15: This trigger is disabled. In this state, \RcsrTdataTwo and
+ * \RcsrTdataThree can be written with any value that is supported for
+ * any of the types this trigger implements. The remaining bits in this
+ * register are ignored.
  *
  * Other values are reserved for future use.
  */
-#define CSR_TDATA1_TYPE_OFFSET              (XLEN-4)
+#define CSR_TDATA1_TYPE_OFFSET(XLEN)        (XLEN + -4)
 #define CSR_TDATA1_TYPE_LENGTH              4
-#define CSR_TDATA1_TYPE                     (0xfULL << CSR_TDATA1_TYPE_OFFSET)
+#define CSR_TDATA1_TYPE(XLEN)               (0xf * (1ULL<<(XLEN + -4)))
 /*
  * If \FcsrTdataOneType is 0, then this bit is hard-wired to 0.
  *
@@ -398,28 +395,29 @@
  * This bit is only writable from Debug Mode.
  * In ordinary use, external debuggers will always set this bit when
  * configuring a trigger.
- * When clearing this bit, debuggers should also clear the action field
- * (whose location depends on \FcsrTdataOneType).
+ * When clearing this bit, debuggers should also set the action field
+ * (whose location depends on \FcsrTdataOneType) to something other
+ * than 1.
  */
-#define CSR_TDATA1_DMODE_OFFSET             (XLEN-5)
+#define CSR_TDATA1_DMODE_OFFSET(XLEN)       (XLEN + -5)
 #define CSR_TDATA1_DMODE_LENGTH             1
-#define CSR_TDATA1_DMODE                    (0x1ULL << CSR_TDATA1_DMODE_OFFSET)
+#define CSR_TDATA1_DMODE(XLEN)              (1ULL<<(XLEN + -5))
 /*
  * If \FcsrTdataOneType is 0, then this field is hard-wired to 0.
  *
  * Trigger-specific data.
  */
 #define CSR_TDATA1_DATA_OFFSET              0
-#define CSR_TDATA1_DATA_LENGTH              (XLEN - 5)
-#define CSR_TDATA1_DATA                     (((1L << XLEN - 5) - 1) << CSR_TDATA1_DATA_OFFSET)
+#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
-#define CSR_TDATA2_DATA                     (((1L << XLEN) - 1) << CSR_TDATA2_DATA_OFFSET)
+#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
-#define CSR_TDATA3_DATA                     (((1L << XLEN) - 1) << CSR_TDATA3_DATA_OFFSET)
+#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
@@ -430,32 +428,9 @@
  * contains 1.
  */
 #define CSR_TINFO_INFO_OFFSET               0
-#define CSR_TINFO_INFO_LENGTH               16
-#define CSR_TINFO_INFO                      (0xffffULL << CSR_TINFO_INFO_OFFSET)
+#define CSR_TINFO_INFO_LENGTH               0x10
+#define CSR_TINFO_INFO                      0xffff
 #define CSR_TCONTROL                        0x7a5
-/*
- * \RcsrHcontext enable.
- *
- * 0: \RcsrHcontext is set to 0 and writes are ignored.
- *
- * 1: \RcsrHcontext may be written and read.
- */
-#define CSR_TCONTROL_HCXE_OFFSET            9
-#define CSR_TCONTROL_HCXE_LENGTH            1
-#define CSR_TCONTROL_HCXE                   (0x1ULL << CSR_TCONTROL_HCXE_OFFSET)
-/*
- * \RcsrScontext enable.
- *
- * 0: \RcsrScontext is set to 0 and writes are ignored.
- *
- * 1: \RcsrScontext may be written and read.
- *
- * Enabling \RcsrScontext can be a security risk in a
- * virtualized system with a hypervisor that does not swap \RcsrScontext.
- */
-#define CSR_TCONTROL_SCXE_OFFSET            8
-#define CSR_TCONTROL_SCXE_LENGTH            1
-#define CSR_TCONTROL_SCXE                   (0x1ULL << CSR_TCONTROL_SCXE_OFFSET)
 /*
  * M-mode previous trigger enable field.
  *
@@ -468,7 +443,7 @@
  */
 #define CSR_TCONTROL_MPTE_OFFSET            7
 #define CSR_TCONTROL_MPTE_LENGTH            1
-#define CSR_TCONTROL_MPTE                   (0x1ULL << CSR_TCONTROL_MPTE_OFFSET)
+#define CSR_TCONTROL_MPTE                   0x80
 /*
  * M-mode trigger enable field.
  *
@@ -481,7 +456,7 @@
  */
 #define CSR_TCONTROL_MTE_OFFSET             3
 #define CSR_TCONTROL_MTE_LENGTH             1
-#define CSR_TCONTROL_MTE                    (0x1ULL << CSR_TCONTROL_MTE_OFFSET)
+#define CSR_TCONTROL_MTE                    0x8
 #define CSR_HCONTEXT                        0x6a8
 /*
  * Hypervisor mode software can write a context number to this register,
@@ -496,8 +471,8 @@
  * and 14 on RV64.
  */
 #define CSR_HCONTEXT_HCONTEXT_OFFSET        0
-#define CSR_HCONTEXT_HCONTEXT_LENGTH        XLEN
-#define CSR_HCONTEXT_HCONTEXT               (((1L << XLEN) - 1) << CSR_HCONTEXT_HCONTEXT_OFFSET)
+#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
@@ -509,17 +484,17 @@
  * 34 on RV64.
  */
 #define CSR_SCONTEXT_DATA_OFFSET            0
-#define CSR_SCONTEXT_DATA_LENGTH            XLEN
-#define CSR_SCONTEXT_DATA                   (((1L << XLEN) - 1) << CSR_SCONTEXT_DATA_OFFSET)
+#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-4)
+#define CSR_MCONTROL_TYPE_OFFSET(XLEN)      (XLEN + -4)
 #define CSR_MCONTROL_TYPE_LENGTH            4
-#define CSR_MCONTROL_TYPE                   (0xfULL << CSR_MCONTROL_TYPE_OFFSET)
-#define CSR_MCONTROL_DMODE_OFFSET           (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                  (0x1ULL << CSR_MCONTROL_DMODE_OFFSET)
+#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
@@ -528,18 +503,18 @@
  * A value of 63 corresponds to the maximum NAPOT range, which is
  * $2^{63}$ bytes in size.
  */
-#define CSR_MCONTROL_MASKMAX_OFFSET         (XLEN-11)
+#define CSR_MCONTROL_MASKMAX_OFFSET(XLEN)   (XLEN + -11)
 #define CSR_MCONTROL_MASKMAX_LENGTH         6
-#define CSR_MCONTROL_MASKMAX                (0x3fULL << CSR_MCONTROL_MASKMAX_OFFSET)
+#define CSR_MCONTROL_MASKMAX(XLEN)          (0x3f * (1ULL<<(XLEN + -11)))
 /*
  * This field only exists when XLEN is at least 64.
  * It contains the 2 high bits of the access size. The low bits
  * come from \FcsrMcontrolSizelo. See \FcsrMcontrolSizelo for how this
  * is used.
  */
-#define CSR_MCONTROL_SIZEHI_OFFSET          21
+#define CSR_MCONTROL_SIZEHI_OFFSET          0x15
 #define CSR_MCONTROL_SIZEHI_LENGTH          2
-#define CSR_MCONTROL_SIZEHI                 (0x3ULL << CSR_MCONTROL_SIZEHI_OFFSET)
+#define CSR_MCONTROL_SIZEHI                 0x600000
 /*
  * If this bit is implemented then it must become set when this
  * trigger fires and may become set when this trigger matches.
@@ -548,9 +523,9 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_MCONTROL_HIT_OFFSET             20
+#define CSR_MCONTROL_HIT_OFFSET             0x14
 #define CSR_MCONTROL_HIT_LENGTH             1
-#define CSR_MCONTROL_HIT                    (0x1ULL << CSR_MCONTROL_HIT_OFFSET)
+#define CSR_MCONTROL_HIT                    0x100000
 /*
  * This bit determines the contents of the XLEN-bit compare values.
  *
@@ -565,9 +540,9 @@
  * value loaded or stored, or the instruction executed.
  * Any bits beyond the size of the data access will contain 0.
  */
-#define CSR_MCONTROL_SELECT_OFFSET          19
+#define CSR_MCONTROL_SELECT_OFFSET          0x13
 #define CSR_MCONTROL_SELECT_LENGTH          1
-#define CSR_MCONTROL_SELECT                 (0x1ULL << CSR_MCONTROL_SELECT_OFFSET)
+#define CSR_MCONTROL_SELECT                 0x80000
 /*
  * 0: The action for this trigger will be taken just before the
  * instruction that triggered it is committed, but after all preceding
@@ -606,9 +581,9 @@
  * implementation-dependent whether that prevents a trigger with
  * \FcsrMcontrolTiming of 1 matching as well.
  */
-#define CSR_MCONTROL_TIMING_OFFSET          18
+#define CSR_MCONTROL_TIMING_OFFSET          0x12
 #define CSR_MCONTROL_TIMING_LENGTH          1
-#define CSR_MCONTROL_TIMING                 (0x1ULL << CSR_MCONTROL_TIMING_OFFSET)
+#define CSR_MCONTROL_TIMING                 0x40000
 /*
  * This field contains the 2 low bits of the access size. The high bits come
  * from \FcsrMcontrolSizehi. The combined value is interpreted as follows:
@@ -656,16 +631,16 @@
  * hart supports, as well as for every instruction length up to XLEN
  * that the hart supports.
  */
-#define CSR_MCONTROL_SIZELO_OFFSET          16
+#define CSR_MCONTROL_SIZELO_OFFSET          0x10
 #define CSR_MCONTROL_SIZELO_LENGTH          2
-#define CSR_MCONTROL_SIZELO                 (0x3ULL << CSR_MCONTROL_SIZELO_OFFSET)
+#define CSR_MCONTROL_SIZELO                 0x30000
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
-#define CSR_MCONTROL_ACTION_OFFSET          12
+#define CSR_MCONTROL_ACTION_OFFSET          0xc
 #define CSR_MCONTROL_ACTION_LENGTH          4
-#define CSR_MCONTROL_ACTION                 (0xfULL << CSR_MCONTROL_ACTION_OFFSET)
+#define CSR_MCONTROL_ACTION                 0xf000
 /*
  * 0: When this trigger matches, the configured action is taken.
  *
@@ -695,9 +670,9 @@
  * chain (eg. to meet timing requirements) may do so by zeroing
  * \FcsrMcontrolChain in writes to \RcsrMcontrol that would make the chain too long.
  */
-#define CSR_MCONTROL_CHAIN_OFFSET           11
+#define CSR_MCONTROL_CHAIN_OFFSET           0xb
 #define CSR_MCONTROL_CHAIN_LENGTH           1
-#define CSR_MCONTROL_CHAIN                  (0x1ULL << CSR_MCONTROL_CHAIN_OFFSET)
+#define CSR_MCONTROL_CHAIN                  0x800
 /*
  * 0: Matches when any compare value equals \RcsrTdataTwo.
  *
@@ -743,13 +718,13 @@
  */
 #define CSR_MCONTROL_MATCH_OFFSET           7
 #define CSR_MCONTROL_MATCH_LENGTH           4
-#define CSR_MCONTROL_MATCH                  (0xfULL << CSR_MCONTROL_MATCH_OFFSET)
+#define CSR_MCONTROL_MATCH                  0x780
 /*
  * When set, enable this trigger in M-mode.
  */
 #define CSR_MCONTROL_M_OFFSET               6
 #define CSR_MCONTROL_M_LENGTH               1
-#define CSR_MCONTROL_M                      (0x1ULL << CSR_MCONTROL_M_OFFSET)
+#define CSR_MCONTROL_M                      0x40
 /*
  * When set, enable this trigger in S/HS-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -757,7 +732,7 @@
  */
 #define CSR_MCONTROL_S_OFFSET               4
 #define CSR_MCONTROL_S_LENGTH               1
-#define CSR_MCONTROL_S                      (0x1ULL << CSR_MCONTROL_S_OFFSET)
+#define CSR_MCONTROL_S                      0x10
 /*
  * When set, enable this trigger in U-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -765,51 +740,51 @@
  */
 #define CSR_MCONTROL_U_OFFSET               3
 #define CSR_MCONTROL_U_LENGTH               1
-#define CSR_MCONTROL_U                      (0x1ULL << CSR_MCONTROL_U_OFFSET)
+#define CSR_MCONTROL_U                      0x8
 /*
  * When set, the trigger fires on the virtual address or opcode of an
  * instruction that is executed.
  */
 #define CSR_MCONTROL_EXECUTE_OFFSET         2
 #define CSR_MCONTROL_EXECUTE_LENGTH         1
-#define CSR_MCONTROL_EXECUTE                (0x1ULL << CSR_MCONTROL_EXECUTE_OFFSET)
+#define CSR_MCONTROL_EXECUTE                4
 /*
  * When set, the trigger fires on the virtual address or data of any
  * store.
  */
 #define CSR_MCONTROL_STORE_OFFSET           1
 #define CSR_MCONTROL_STORE_LENGTH           1
-#define CSR_MCONTROL_STORE                  (0x1ULL << CSR_MCONTROL_STORE_OFFSET)
+#define CSR_MCONTROL_STORE                  2
 /*
  * When set, the trigger fires on the virtual address or data of any
  * load.
  */
 #define CSR_MCONTROL_LOAD_OFFSET            0
 #define CSR_MCONTROL_LOAD_LENGTH            1
-#define CSR_MCONTROL_LOAD                   (0x1ULL << CSR_MCONTROL_LOAD_OFFSET)
+#define CSR_MCONTROL_LOAD                   1
 #define CSR_MCONTROL6                       0x7a1
-#define CSR_MCONTROL6_TYPE_OFFSET           (XLEN-4)
+#define CSR_MCONTROL6_TYPE_OFFSET(XLEN)     (XLEN + -4)
 #define CSR_MCONTROL6_TYPE_LENGTH           4
-#define CSR_MCONTROL6_TYPE                  (0xfULL << CSR_MCONTROL6_TYPE_OFFSET)
-#define CSR_MCONTROL6_DMODE_OFFSET          (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                 (0x1ULL << CSR_MCONTROL6_DMODE_OFFSET)
+#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
  * virtualization mode.
  */
-#define CSR_MCONTROL6_VS_OFFSET             24
+#define CSR_MCONTROL6_VS_OFFSET             0x18
 #define CSR_MCONTROL6_VS_LENGTH             1
-#define CSR_MCONTROL6_VS                    (0x1ULL << CSR_MCONTROL6_VS_OFFSET)
+#define CSR_MCONTROL6_VS                    0x1000000
 /*
  * When set, enable this trigger in VU-mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_MCONTROL6_VU_OFFSET             23
+#define CSR_MCONTROL6_VU_OFFSET             0x17
 #define CSR_MCONTROL6_VU_LENGTH             1
-#define CSR_MCONTROL6_VU                    (0x1ULL << CSR_MCONTROL6_VU_OFFSET)
+#define CSR_MCONTROL6_VU                    0x800000
 /*
  * If this bit is implemented then it must become set when this
  * trigger fires and may become set when this trigger matches.
@@ -818,9 +793,9 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_MCONTROL6_HIT_OFFSET            22
+#define CSR_MCONTROL6_HIT_OFFSET            0x16
 #define CSR_MCONTROL6_HIT_LENGTH            1
-#define CSR_MCONTROL6_HIT                   (0x1ULL << CSR_MCONTROL6_HIT_OFFSET)
+#define CSR_MCONTROL6_HIT                   0x400000
 /*
  * This bit determines the contents of the XLEN-bit compare values.
  *
@@ -835,9 +810,9 @@
  * value loaded or stored, or the instruction executed.
  * Any bits beyond the size of the data access will contain 0.
  */
-#define CSR_MCONTROL6_SELECT_OFFSET         21
+#define CSR_MCONTROL6_SELECT_OFFSET         0x15
 #define CSR_MCONTROL6_SELECT_LENGTH         1
-#define CSR_MCONTROL6_SELECT                (0x1ULL << CSR_MCONTROL6_SELECT_OFFSET)
+#define CSR_MCONTROL6_SELECT                0x200000
 /*
  * 0: The action for this trigger will be taken just before the
  * instruction that triggered it is committed, but after all preceding
@@ -876,9 +851,9 @@
  * implementation-dependent whether that prevents a trigger with
  * \FcsrMcontrolSixTiming of 1 matching as well.
  */
-#define CSR_MCONTROL6_TIMING_OFFSET         20
+#define CSR_MCONTROL6_TIMING_OFFSET         0x14
 #define CSR_MCONTROL6_TIMING_LENGTH         1
-#define CSR_MCONTROL6_TIMING                (0x1ULL << CSR_MCONTROL6_TIMING_OFFSET)
+#define CSR_MCONTROL6_TIMING                0x100000
 /*
  * 0: The trigger will attempt to match against an access of any size.
  * The behavior is only well-defined if $|select|=0$, or if the access
@@ -923,16 +898,16 @@
  * hart supports, as well as for every instruction length up to XLEN
  * that the hart supports.
  */
-#define CSR_MCONTROL6_SIZE_OFFSET           16
+#define CSR_MCONTROL6_SIZE_OFFSET           0x10
 #define CSR_MCONTROL6_SIZE_LENGTH           4
-#define CSR_MCONTROL6_SIZE                  (0xfULL << CSR_MCONTROL6_SIZE_OFFSET)
+#define CSR_MCONTROL6_SIZE                  0xf0000
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
-#define CSR_MCONTROL6_ACTION_OFFSET         12
+#define CSR_MCONTROL6_ACTION_OFFSET         0xc
 #define CSR_MCONTROL6_ACTION_LENGTH         4
-#define CSR_MCONTROL6_ACTION                (0xfULL << CSR_MCONTROL6_ACTION_OFFSET)
+#define CSR_MCONTROL6_ACTION                0xf000
 /*
  * 0: When this trigger matches, the configured action is taken.
  *
@@ -962,9 +937,9 @@
  * chain (eg. to meet timing requirements) may do so by zeroing
  * \FcsrMcontrolSixChain in writes to \RcsrMcontrolSix that would make the chain too long.
  */
-#define CSR_MCONTROL6_CHAIN_OFFSET          11
+#define CSR_MCONTROL6_CHAIN_OFFSET          0xb
 #define CSR_MCONTROL6_CHAIN_LENGTH          1
-#define CSR_MCONTROL6_CHAIN                 (0x1ULL << CSR_MCONTROL6_CHAIN_OFFSET)
+#define CSR_MCONTROL6_CHAIN                 0x800
 /*
  * 0: Matches when any compare value equals \RcsrTdataTwo.
  *
@@ -972,8 +947,9 @@
  * $M$ bits of \RcsrTdataTwo.
  * $M$ is $|XLEN|-1$ minus the index of the least-significant bit
  * containing 0 in \RcsrTdataTwo.
- * \RcsrTdataTwo is WARL and bit $|maskmax6|-1$ will be set to 0 if no
- * less significant bits are written with 0.
+ * \RcsrTdataTwo is WARL and if bits $|maskmax6|-1$:0 are written with all
+ * ones then bit $|maskmax6|-1$ will be set to 0 while the values of bits $|maskmax6|-2$:0
+ * are \unspecified.
  * Legal values for \RcsrTdataTwo require $M + |maskmax6| \geq |XLEN|$ and $M\gt0$.
  * See above for how to determine maskmax6.
  *
@@ -1011,13 +987,13 @@
  */
 #define CSR_MCONTROL6_MATCH_OFFSET          7
 #define CSR_MCONTROL6_MATCH_LENGTH          4
-#define CSR_MCONTROL6_MATCH                 (0xfULL << CSR_MCONTROL6_MATCH_OFFSET)
+#define CSR_MCONTROL6_MATCH                 0x780
 /*
  * When set, enable this trigger in M-mode.
  */
 #define CSR_MCONTROL6_M_OFFSET              6
 #define CSR_MCONTROL6_M_LENGTH              1
-#define CSR_MCONTROL6_M                     (0x1ULL << CSR_MCONTROL6_M_OFFSET)
+#define CSR_MCONTROL6_M                     0x40
 /*
  * When set, enable this trigger in S/HS-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1025,7 +1001,7 @@
  */
 #define CSR_MCONTROL6_S_OFFSET              4
 #define CSR_MCONTROL6_S_LENGTH              1
-#define CSR_MCONTROL6_S                     (0x1ULL << CSR_MCONTROL6_S_OFFSET)
+#define CSR_MCONTROL6_S                     0x10
 /*
  * When set, enable this trigger in U-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1033,51 +1009,51 @@
  */
 #define CSR_MCONTROL6_U_OFFSET              3
 #define CSR_MCONTROL6_U_LENGTH              1
-#define CSR_MCONTROL6_U                     (0x1ULL << CSR_MCONTROL6_U_OFFSET)
+#define CSR_MCONTROL6_U                     0x8
 /*
  * When set, the trigger fires on the virtual address or opcode of an
  * instruction that is executed.
  */
 #define CSR_MCONTROL6_EXECUTE_OFFSET        2
 #define CSR_MCONTROL6_EXECUTE_LENGTH        1
-#define CSR_MCONTROL6_EXECUTE               (0x1ULL << CSR_MCONTROL6_EXECUTE_OFFSET)
+#define CSR_MCONTROL6_EXECUTE               4
 /*
  * When set, the trigger fires on the virtual address or data of any
  * store.
  */
 #define CSR_MCONTROL6_STORE_OFFSET          1
 #define CSR_MCONTROL6_STORE_LENGTH          1
-#define CSR_MCONTROL6_STORE                 (0x1ULL << CSR_MCONTROL6_STORE_OFFSET)
+#define CSR_MCONTROL6_STORE                 2
 /*
  * When set, the trigger fires on the virtual address or data of any
  * load.
  */
 #define CSR_MCONTROL6_LOAD_OFFSET           0
 #define CSR_MCONTROL6_LOAD_LENGTH           1
-#define CSR_MCONTROL6_LOAD                  (0x1ULL << CSR_MCONTROL6_LOAD_OFFSET)
+#define CSR_MCONTROL6_LOAD                  1
 #define CSR_ICOUNT                          0x7a1
-#define CSR_ICOUNT_TYPE_OFFSET              (XLEN-4)
+#define CSR_ICOUNT_TYPE_OFFSET(XLEN)        (XLEN + -4)
 #define CSR_ICOUNT_TYPE_LENGTH              4
-#define CSR_ICOUNT_TYPE                     (0xfULL << CSR_ICOUNT_TYPE_OFFSET)
-#define CSR_ICOUNT_DMODE_OFFSET             (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                    (0x1ULL << CSR_ICOUNT_DMODE_OFFSET)
+#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
  * virtualization mode.
  */
-#define CSR_ICOUNT_VS_OFFSET                26
+#define CSR_ICOUNT_VS_OFFSET                0x1a
 #define CSR_ICOUNT_VS_LENGTH                1
-#define CSR_ICOUNT_VS                       (0x1ULL << CSR_ICOUNT_VS_OFFSET)
+#define CSR_ICOUNT_VS                       0x4000000
 /*
  * When set, enable this trigger in VU-mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_ICOUNT_VU_OFFSET                25
+#define CSR_ICOUNT_VU_OFFSET                0x19
 #define CSR_ICOUNT_VU_LENGTH                1
-#define CSR_ICOUNT_VU                       (0x1ULL << CSR_ICOUNT_VU_OFFSET)
+#define CSR_ICOUNT_VU                       0x2000000
 /*
  * If this bit is implemented, the hardware sets it when this
  * trigger matches. The trigger's user can set or clear it at any
@@ -1085,32 +1061,30 @@
  * trigger(s) matched.  If the bit is not implemented, it is always 0
  * and writing it has no effect.
  */
-#define CSR_ICOUNT_HIT_OFFSET               24
+#define CSR_ICOUNT_HIT_OFFSET               0x18
 #define CSR_ICOUNT_HIT_LENGTH               1
-#define CSR_ICOUNT_HIT                      (0x1ULL << CSR_ICOUNT_HIT_OFFSET)
+#define CSR_ICOUNT_HIT                      0x1000000
 /*
- * When count is decremented to 0, the trigger fires. Instead of
- * changing \FcsrIcountCount from 1 to 0, it is also acceptable for hardware to
- * clear \FcsrIcountM, \FcsrIcountS, \FcsrIcountU, \FcsrIcountVs, and
- * \FcsrIcountVu. This allows \FcsrIcountCount to be hard-wired
- * to 1 if this register just exists for single step.
+ * The trigger will generally fire after \FcsrIcountCount instructions
+ * in enabled modes have been executed. See above for the precise behavior.
  */
-#define CSR_ICOUNT_COUNT_OFFSET             10
-#define CSR_ICOUNT_COUNT_LENGTH             14
-#define CSR_ICOUNT_COUNT                    (0x3fffULL << CSR_ICOUNT_COUNT_OFFSET)
+#define CSR_ICOUNT_COUNT_OFFSET             0xa
+#define CSR_ICOUNT_COUNT_LENGTH             0xe
+#define CSR_ICOUNT_COUNT                    0xfffc00
 /*
  * When set, enable this trigger in M-mode.
  */
-#define CSR_ICOUNT_M_OFFSET                 9
+#define CSR_ICOUNT_M_OFFSET                 0x9
 #define CSR_ICOUNT_M_LENGTH                 1
-#define CSR_ICOUNT_M                        (0x1ULL << CSR_ICOUNT_M_OFFSET)
+#define CSR_ICOUNT_M                        0x200
 /*
  * This bit becomes set when \FcsrIcountCount is decremented from 1
- * to 0. It is cleared when the trigger fires.
+ * to 0. It is cleared when the trigger fires, which will happen just
+ * before executing the next instruction in one of the enabled modes.
  */
-#define CSR_ICOUNT_PENDING_OFFSET           8
+#define CSR_ICOUNT_PENDING_OFFSET           0x8
 #define CSR_ICOUNT_PENDING_LENGTH           1
-#define CSR_ICOUNT_PENDING                  (0x1ULL << CSR_ICOUNT_PENDING_OFFSET)
+#define CSR_ICOUNT_PENDING                  0x100
 /*
  * When set, enable this trigger in S/HS-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1118,7 +1092,7 @@
  */
 #define CSR_ICOUNT_S_OFFSET                 7
 #define CSR_ICOUNT_S_LENGTH                 1
-#define CSR_ICOUNT_S                        (0x1ULL << CSR_ICOUNT_S_OFFSET)
+#define CSR_ICOUNT_S                        0x80
 /*
  * When set, enable this trigger in U-mode.
  * This bit is hard-wired to 0 if the hart does not support
@@ -1126,21 +1100,21 @@
  */
 #define CSR_ICOUNT_U_OFFSET                 6
 #define CSR_ICOUNT_U_LENGTH                 1
-#define CSR_ICOUNT_U                        (0x1ULL << CSR_ICOUNT_U_OFFSET)
+#define CSR_ICOUNT_U                        0x40
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
 #define CSR_ICOUNT_ACTION_OFFSET            0
 #define CSR_ICOUNT_ACTION_LENGTH            6
-#define CSR_ICOUNT_ACTION                   (0x3fULL << CSR_ICOUNT_ACTION_OFFSET)
+#define CSR_ICOUNT_ACTION                   0x3f
 #define CSR_ITRIGGER                        0x7a1
-#define CSR_ITRIGGER_TYPE_OFFSET            (XLEN-4)
+#define CSR_ITRIGGER_TYPE_OFFSET(XLEN)      (XLEN + -4)
 #define CSR_ITRIGGER_TYPE_LENGTH            4
-#define CSR_ITRIGGER_TYPE                   (0xfULL << CSR_ITRIGGER_TYPE_OFFSET)
-#define CSR_ITRIGGER_DMODE_OFFSET           (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                  (0x1ULL << CSR_ITRIGGER_DMODE_OFFSET)
+#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
@@ -1148,34 +1122,41 @@
  * 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-6)
+#define CSR_ITRIGGER_HIT_OFFSET(XLEN)       (XLEN + -6)
 #define CSR_ITRIGGER_HIT_LENGTH             1
-#define CSR_ITRIGGER_HIT                    (0x1ULL << CSR_ITRIGGER_HIT_OFFSET)
+#define CSR_ITRIGGER_HIT(XLEN)              (1ULL<<(XLEN + -6))
 /*
  * When set, enable this trigger for interrupts that are taken from VS
  * mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_ITRIGGER_VS_OFFSET              12
+#define CSR_ITRIGGER_VS_OFFSET              0xc
 #define CSR_ITRIGGER_VS_LENGTH              1
-#define CSR_ITRIGGER_VS                     (0x1ULL << CSR_ITRIGGER_VS_OFFSET)
+#define CSR_ITRIGGER_VS                     0x1000
 /*
  * When set, enable this trigger for interrupts that are taken from VU
  * mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_ITRIGGER_VU_OFFSET              11
+#define CSR_ITRIGGER_VU_OFFSET              0xb
 #define CSR_ITRIGGER_VU_LENGTH              1
-#define CSR_ITRIGGER_VU                     (0x1ULL << CSR_ITRIGGER_VU_OFFSET)
+#define CSR_ITRIGGER_VU                     0x800
+/*
+ * When set, non-maskable interrupts cause this
+ * trigger to fire if the trigger is enabled for the current mode.
+ */
+#define CSR_ITRIGGER_NMI_OFFSET             0xa
+#define CSR_ITRIGGER_NMI_LENGTH             1
+#define CSR_ITRIGGER_NMI                    0x400
 /*
  * When set, enable this trigger for interrupts that are taken from M
  * mode.
  */
-#define CSR_ITRIGGER_M_OFFSET               9
+#define CSR_ITRIGGER_M_OFFSET               0x9
 #define CSR_ITRIGGER_M_LENGTH               1
-#define CSR_ITRIGGER_M                      (0x1ULL << CSR_ITRIGGER_M_OFFSET)
+#define CSR_ITRIGGER_M                      0x200
 /*
  * When set, enable this trigger for interrupts that are taken from S/HS
  * mode.
@@ -1184,7 +1165,7 @@
  */
 #define CSR_ITRIGGER_S_OFFSET               7
 #define CSR_ITRIGGER_S_LENGTH               1
-#define CSR_ITRIGGER_S                      (0x1ULL << CSR_ITRIGGER_S_OFFSET)
+#define CSR_ITRIGGER_S                      0x80
 /*
  * When set, enable this trigger for interrupts that are taken from U
  * mode.
@@ -1193,21 +1174,21 @@
  */
 #define CSR_ITRIGGER_U_OFFSET               6
 #define CSR_ITRIGGER_U_LENGTH               1
-#define CSR_ITRIGGER_U                      (0x1ULL << CSR_ITRIGGER_U_OFFSET)
+#define CSR_ITRIGGER_U                      0x40
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
 #define CSR_ITRIGGER_ACTION_OFFSET          0
 #define CSR_ITRIGGER_ACTION_LENGTH          6
-#define CSR_ITRIGGER_ACTION                 (0x3fULL << CSR_ITRIGGER_ACTION_OFFSET)
+#define CSR_ITRIGGER_ACTION                 0x3f
 #define CSR_ETRIGGER                        0x7a1
-#define CSR_ETRIGGER_TYPE_OFFSET            (XLEN-4)
+#define CSR_ETRIGGER_TYPE_OFFSET(XLEN)      (XLEN + -4)
 #define CSR_ETRIGGER_TYPE_LENGTH            4
-#define CSR_ETRIGGER_TYPE                   (0xfULL << CSR_ETRIGGER_TYPE_OFFSET)
-#define CSR_ETRIGGER_DMODE_OFFSET           (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                  (0x1ULL << CSR_ETRIGGER_DMODE_OFFSET)
+#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
@@ -1215,42 +1196,34 @@
  * 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-6)
+#define CSR_ETRIGGER_HIT_OFFSET(XLEN)       (XLEN + -6)
 #define CSR_ETRIGGER_HIT_LENGTH             1
-#define CSR_ETRIGGER_HIT                    (0x1ULL << CSR_ETRIGGER_HIT_OFFSET)
+#define CSR_ETRIGGER_HIT(XLEN)              (1ULL<<(XLEN + -6))
 /*
  * When set, enable this trigger for exceptions that are taken from VS
  * mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_ETRIGGER_VS_OFFSET              12
+#define CSR_ETRIGGER_VS_OFFSET              0xc
 #define CSR_ETRIGGER_VS_LENGTH              1
-#define CSR_ETRIGGER_VS                     (0x1ULL << CSR_ETRIGGER_VS_OFFSET)
+#define CSR_ETRIGGER_VS                     0x1000
 /*
  * When set, enable this trigger for exceptions that are taken from VU
  * mode.
  * This bit is hard-wired to 0 if the hart does not support
  * virtualization mode.
  */
-#define CSR_ETRIGGER_VU_OFFSET              11
+#define CSR_ETRIGGER_VU_OFFSET              0xb
 #define CSR_ETRIGGER_VU_LENGTH              1
-#define CSR_ETRIGGER_VU                     (0x1ULL << CSR_ETRIGGER_VU_OFFSET)
-/*
- * When set, non-maskable interrupts cause this
- * trigger to fire, regardless of the values of \FcsrEtriggerM,
- * \FcsrEtriggerS, \FcsrEtriggerU, \FcsrEtriggerVs, and \FcsrEtriggerVu.
- */
-#define CSR_ETRIGGER_NMI_OFFSET             10
-#define CSR_ETRIGGER_NMI_LENGTH             1
-#define CSR_ETRIGGER_NMI                    (0x1ULL << CSR_ETRIGGER_NMI_OFFSET)
+#define CSR_ETRIGGER_VU                     0x800
 /*
  * When set, enable this trigger for exceptions that are taken from M
  * mode.
  */
-#define CSR_ETRIGGER_M_OFFSET               9
+#define CSR_ETRIGGER_M_OFFSET               0x9
 #define CSR_ETRIGGER_M_LENGTH               1
-#define CSR_ETRIGGER_M                      (0x1ULL << CSR_ETRIGGER_M_OFFSET)
+#define CSR_ETRIGGER_M                      0x200
 /*
  * When set, enable this trigger for exceptions that are taken from S/HS
  * mode.
@@ -1259,7 +1232,7 @@
  */
 #define CSR_ETRIGGER_S_OFFSET               7
 #define CSR_ETRIGGER_S_LENGTH               1
-#define CSR_ETRIGGER_S                      (0x1ULL << CSR_ETRIGGER_S_OFFSET)
+#define CSR_ETRIGGER_S                      0x80
 /*
  * When set, enable this trigger for exceptions that are taken from U
  * mode.
@@ -1268,21 +1241,21 @@
  */
 #define CSR_ETRIGGER_U_OFFSET               6
 #define CSR_ETRIGGER_U_LENGTH               1
-#define CSR_ETRIGGER_U                      (0x1ULL << CSR_ETRIGGER_U_OFFSET)
+#define CSR_ETRIGGER_U                      0x40
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
 #define CSR_ETRIGGER_ACTION_OFFSET          0
 #define CSR_ETRIGGER_ACTION_LENGTH          6
-#define CSR_ETRIGGER_ACTION                 (0x3fULL << CSR_ETRIGGER_ACTION_OFFSET)
+#define CSR_ETRIGGER_ACTION                 0x3f
 #define CSR_TMEXTTRIGGER                    0x7a1
-#define CSR_TMEXTTRIGGER_TYPE_OFFSET        (XLEN-4)
+#define CSR_TMEXTTRIGGER_TYPE_OFFSET(XLEN)  (XLEN + -4)
 #define CSR_TMEXTTRIGGER_TYPE_LENGTH        4
-#define CSR_TMEXTTRIGGER_TYPE               (0xfULL << CSR_TMEXTTRIGGER_TYPE_OFFSET)
-#define CSR_TMEXTTRIGGER_DMODE_OFFSET       (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              (0x1ULL << CSR_TMEXTTRIGGER_DMODE_OFFSET)
+#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
@@ -1290,37 +1263,37 @@
  * 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-6)
+#define CSR_TMEXTTRIGGER_HIT_OFFSET(XLEN)   (XLEN + -6)
 #define CSR_TMEXTTRIGGER_HIT_LENGTH         1
-#define CSR_TMEXTTRIGGER_HIT                (0x1ULL << CSR_TMEXTTRIGGER_HIT_OFFSET)
+#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.
  */
-#define CSR_TMEXTTRIGGER_INTCTL_OFFSET      22
+#define CSR_TMEXTTRIGGER_INTCTL_OFFSET      0x16
 #define CSR_TMEXTTRIGGER_INTCTL_LENGTH      1
-#define CSR_TMEXTTRIGGER_INTCTL             (0x1ULL << CSR_TMEXTTRIGGER_INTCTL_OFFSET)
+#define CSR_TMEXTTRIGGER_INTCTL             0x400000
 /*
  * Selects any combination of up to 16 external debug trigger inputs
  * that cause this trigger to fire.
  */
 #define CSR_TMEXTTRIGGER_SELECT_OFFSET      6
-#define CSR_TMEXTTRIGGER_SELECT_LENGTH      16
-#define CSR_TMEXTTRIGGER_SELECT             (0xffffULL << CSR_TMEXTTRIGGER_SELECT_OFFSET)
+#define CSR_TMEXTTRIGGER_SELECT_LENGTH      0x10
+#define CSR_TMEXTTRIGGER_SELECT             0x3fffc0
 /*
  * The action to take when the trigger fires. The values are explained
  * in Table~\ref{tab:action}.
  */
 #define CSR_TMEXTTRIGGER_ACTION_OFFSET      0
 #define CSR_TMEXTTRIGGER_ACTION_LENGTH      6
-#define CSR_TMEXTTRIGGER_ACTION             (0x3fULL << CSR_TMEXTTRIGGER_ACTION_OFFSET)
+#define CSR_TMEXTTRIGGER_ACTION             0x3f
 #define CSR_TEXTRA32                        0x7a3
 /*
  * Data used together with \FcsrTextraThirtytwoMhselect.
  */
-#define CSR_TEXTRA32_MHVALUE_OFFSET         26
+#define CSR_TEXTRA32_MHVALUE_OFFSET         0x1a
 #define CSR_TEXTRA32_MHVALUE_LENGTH         6
-#define CSR_TEXTRA32_MHVALUE                (0x3fU << CSR_TEXTRA32_MHVALUE_OFFSET)
+#define CSR_TEXTRA32_MHVALUE                0xfc000000U
 /*
  * 0: Ignore \FcsrTextraThirtytwoMhvalue.
  *
@@ -1337,26 +1310,26 @@
  *
  * If the H extension is not supported, the only legal values are 0 and 4.
  */
-#define CSR_TEXTRA32_MHSELECT_OFFSET        23
+#define CSR_TEXTRA32_MHSELECT_OFFSET        0x17
 #define CSR_TEXTRA32_MHSELECT_LENGTH        3
-#define CSR_TEXTRA32_MHSELECT               (0x7U << CSR_TEXTRA32_MHSELECT_OFFSET)
+#define CSR_TEXTRA32_MHSELECT               0x3800000
 /*
  * When the least significant bit of this field is 1, it causes bits 7:0
  * in the comparison to be ignored, when \FcsrTextraThirtytwoSselect=1.
  * When the next most significant bit of this field is 1, it causes bits 15:8
  * to be ignored in the comparison, when \FcsrTextraThirtytwoSselect=1.
  */
-#define CSR_TEXTRA32_SBYTEMASK_OFFSET       18
+#define CSR_TEXTRA32_SBYTEMASK_OFFSET       0x12
 #define CSR_TEXTRA32_SBYTEMASK_LENGTH       2
-#define CSR_TEXTRA32_SBYTEMASK              (0x3U << CSR_TEXTRA32_SBYTEMASK_OFFSET)
+#define CSR_TEXTRA32_SBYTEMASK              0xc0000
 /*
  * Data used together with \FcsrTextraThirtytwoSselect.
  *
  * This field should be tied to 0 when S-mode is not supported.
  */
 #define CSR_TEXTRA32_SVALUE_OFFSET          2
-#define CSR_TEXTRA32_SVALUE_LENGTH          16
-#define CSR_TEXTRA32_SVALUE                 (0xffffU << CSR_TEXTRA32_SVALUE_OFFSET)
+#define CSR_TEXTRA32_SVALUE_LENGTH          0x10
+#define CSR_TEXTRA32_SVALUE                 0x3fffc
 /*
  * 0: Ignore \FcsrTextraThirtytwoSvalue.
  *
@@ -1377,14 +1350,14 @@
  */
 #define CSR_TEXTRA32_SSELECT_OFFSET         0
 #define CSR_TEXTRA32_SSELECT_LENGTH         2
-#define CSR_TEXTRA32_SSELECT                (0x3U << CSR_TEXTRA32_SSELECT_OFFSET)
+#define CSR_TEXTRA32_SSELECT                3
 #define CSR_TEXTRA64                        0x7a3
-#define CSR_TEXTRA64_MHVALUE_OFFSET         51
-#define CSR_TEXTRA64_MHVALUE_LENGTH         13
-#define CSR_TEXTRA64_MHVALUE                (0x1fffULL << CSR_TEXTRA64_MHVALUE_OFFSET)
-#define CSR_TEXTRA64_MHSELECT_OFFSET        48
+#define CSR_TEXTRA64_MHVALUE_OFFSET         0x33
+#define CSR_TEXTRA64_MHVALUE_LENGTH         0xd
+#define CSR_TEXTRA64_MHVALUE                0xfff8000000000000ULL
+#define CSR_TEXTRA64_MHSELECT_OFFSET        0x30
 #define CSR_TEXTRA64_MHSELECT_LENGTH        3
-#define CSR_TEXTRA64_MHSELECT               (0x7ULL << CSR_TEXTRA64_MHSELECT_OFFSET)
+#define CSR_TEXTRA64_MHSELECT               0x7000000000000ULL
 /*
  * When the least significant bit of this field is 1, it causes bits 7:0
  * in the comparison to be ignored, when \FcsrTextraSixtyfourSselect=1.
@@ -1393,15 +1366,15 @@
  * fourth bit controls the comparison of bits 31:24, and
  * fifth bit controls the comparison of bits 33:32.
  */
-#define CSR_TEXTRA64_SBYTEMASK_OFFSET       36
+#define CSR_TEXTRA64_SBYTEMASK_OFFSET       0x24
 #define CSR_TEXTRA64_SBYTEMASK_LENGTH       5
-#define CSR_TEXTRA64_SBYTEMASK              (0x1fULL << CSR_TEXTRA64_SBYTEMASK_OFFSET)
+#define CSR_TEXTRA64_SBYTEMASK              0x1f000000000ULL
 #define CSR_TEXTRA64_SVALUE_OFFSET          2
-#define CSR_TEXTRA64_SVALUE_LENGTH          34
-#define CSR_TEXTRA64_SVALUE                 (0x3ffffffffULL << CSR_TEXTRA64_SVALUE_OFFSET)
+#define CSR_TEXTRA64_SVALUE_LENGTH          0x22
+#define CSR_TEXTRA64_SVALUE                 0xffffffffcULL
 #define CSR_TEXTRA64_SSELECT_OFFSET         0
 #define CSR_TEXTRA64_SSELECT_LENGTH         2
-#define CSR_TEXTRA64_SSELECT                (0x3ULL << CSR_TEXTRA64_SSELECT_OFFSET)
+#define CSR_TEXTRA64_SSELECT                3
 #define DM_DMSTATUS                         0x11
 /*
  * 0: Unimplemented, or \FdmDmcontrolNdmreset is zero and no ndmreset is currently
@@ -1409,18 +1382,18 @@
  *
  * 1: \FdmDmcontrolNdmreset is currently nonzero, or there is an ndmreset in progress.
  */
-#define DM_DMSTATUS_NDMRESETPENDING_OFFSET  24
+#define DM_DMSTATUS_NDMRESETPENDING_OFFSET  0x18
 #define DM_DMSTATUS_NDMRESETPENDING_LENGTH  1
-#define DM_DMSTATUS_NDMRESETPENDING         (0x1U << DM_DMSTATUS_NDMRESETPENDING_OFFSET)
+#define DM_DMSTATUS_NDMRESETPENDING         0x1000000
 /*
  * 0: The per-hart {\tt unavail} bits reflect the current state of the hart.
  *
  * 1: The per-hart {\tt unavail} bits are sticky. Once they are set, they will
  * not clear until the debugger acknowledges them using \FdmDmcontrolAckunavail.
  */
-#define DM_DMSTATUS_STICKYUNAVAIL_OFFSET    23
+#define DM_DMSTATUS_STICKYUNAVAIL_OFFSET    0x17
 #define DM_DMSTATUS_STICKYUNAVAIL_LENGTH    1
-#define DM_DMSTATUS_STICKYUNAVAIL           (0x1U << DM_DMSTATUS_STICKYUNAVAIL_OFFSET)
+#define DM_DMSTATUS_STICKYUNAVAIL           0x800000
 /*
  * If 1, then there is an implicit {\tt ebreak} instruction at the
  * non-existent word immediately after the Program Buffer. This saves
@@ -1429,91 +1402,91 @@
  *
  * This must be 1 when \FdmAbstractcsProgbufsize is 1.
  */
-#define DM_DMSTATUS_IMPEBREAK_OFFSET        22
+#define DM_DMSTATUS_IMPEBREAK_OFFSET        0x16
 #define DM_DMSTATUS_IMPEBREAK_LENGTH        1
-#define DM_DMSTATUS_IMPEBREAK               (0x1U << DM_DMSTATUS_IMPEBREAK_OFFSET)
+#define DM_DMSTATUS_IMPEBREAK               0x400000
 /*
  * This field is 1 when all currently selected harts have been reset
  * and reset has not been acknowledged for any of them.
  */
-#define DM_DMSTATUS_ALLHAVERESET_OFFSET     19
+#define DM_DMSTATUS_ALLHAVERESET_OFFSET     0x13
 #define DM_DMSTATUS_ALLHAVERESET_LENGTH     1
-#define DM_DMSTATUS_ALLHAVERESET            (0x1U << DM_DMSTATUS_ALLHAVERESET_OFFSET)
+#define DM_DMSTATUS_ALLHAVERESET            0x80000
 /*
  * This field is 1 when at least one currently selected hart has been
  * reset and reset has not been acknowledged for that hart.
  */
-#define DM_DMSTATUS_ANYHAVERESET_OFFSET     18
+#define DM_DMSTATUS_ANYHAVERESET_OFFSET     0x12
 #define DM_DMSTATUS_ANYHAVERESET_LENGTH     1
-#define DM_DMSTATUS_ANYHAVERESET            (0x1U << DM_DMSTATUS_ANYHAVERESET_OFFSET)
+#define DM_DMSTATUS_ANYHAVERESET            0x40000
 /*
- * This field is 1 when all currently selected harts have acknowledged
- * their last resume request.
+ * This field is 1 when all currently selected harts have their
+ * resume ack bit\index{resume ack bit} set.
  */
-#define DM_DMSTATUS_ALLRESUMEACK_OFFSET     17
+#define DM_DMSTATUS_ALLRESUMEACK_OFFSET     0x11
 #define DM_DMSTATUS_ALLRESUMEACK_LENGTH     1
-#define DM_DMSTATUS_ALLRESUMEACK            (0x1U << DM_DMSTATUS_ALLRESUMEACK_OFFSET)
+#define DM_DMSTATUS_ALLRESUMEACK            0x20000
 /*
- * This field is 1 when any currently selected hart has acknowledged
- * its last resume request.
+ * This field is 1 when any currently selected hart has its
+ * resume ack bit\index{resume ack bit} set.
  */
-#define DM_DMSTATUS_ANYRESUMEACK_OFFSET     16
+#define DM_DMSTATUS_ANYRESUMEACK_OFFSET     0x10
 #define DM_DMSTATUS_ANYRESUMEACK_LENGTH     1
-#define DM_DMSTATUS_ANYRESUMEACK            (0x1U << DM_DMSTATUS_ANYRESUMEACK_OFFSET)
+#define DM_DMSTATUS_ANYRESUMEACK            0x10000
 /*
  * This field is 1 when all currently selected harts do not exist in
  * this hardware platform.
  */
-#define DM_DMSTATUS_ALLNONEXISTENT_OFFSET   15
+#define DM_DMSTATUS_ALLNONEXISTENT_OFFSET   0xf
 #define DM_DMSTATUS_ALLNONEXISTENT_LENGTH   1
-#define DM_DMSTATUS_ALLNONEXISTENT          (0x1U << DM_DMSTATUS_ALLNONEXISTENT_OFFSET)
+#define DM_DMSTATUS_ALLNONEXISTENT          0x8000
 /*
  * This field is 1 when any currently selected hart does not exist in
  * this hardware platform.
  */
-#define DM_DMSTATUS_ANYNONEXISTENT_OFFSET   14
+#define DM_DMSTATUS_ANYNONEXISTENT_OFFSET   0xe
 #define DM_DMSTATUS_ANYNONEXISTENT_LENGTH   1
-#define DM_DMSTATUS_ANYNONEXISTENT          (0x1U << DM_DMSTATUS_ANYNONEXISTENT_OFFSET)
+#define DM_DMSTATUS_ANYNONEXISTENT          0x4000
 /*
  * This field is 1 when all currently selected harts are
  * unavailable, or (if \FdmDmstatusStickyunavail is 1) were
  * unavailable without that being acknowledged.
  */
-#define DM_DMSTATUS_ALLUNAVAIL_OFFSET       13
+#define DM_DMSTATUS_ALLUNAVAIL_OFFSET       0xd
 #define DM_DMSTATUS_ALLUNAVAIL_LENGTH       1
-#define DM_DMSTATUS_ALLUNAVAIL              (0x1U << DM_DMSTATUS_ALLUNAVAIL_OFFSET)
+#define DM_DMSTATUS_ALLUNAVAIL              0x2000
 /*
  * This field is 1 when any currently selected hart is unavailable,
  * or (if \FdmDmstatusStickyunavail is 1) was unavailable without
  * that being acknowledged.
  */
-#define DM_DMSTATUS_ANYUNAVAIL_OFFSET       12
+#define DM_DMSTATUS_ANYUNAVAIL_OFFSET       0xc
 #define DM_DMSTATUS_ANYUNAVAIL_LENGTH       1
-#define DM_DMSTATUS_ANYUNAVAIL              (0x1U << DM_DMSTATUS_ANYUNAVAIL_OFFSET)
+#define DM_DMSTATUS_ANYUNAVAIL              0x1000
 /*
  * This field is 1 when all currently selected harts are running.
  */
-#define DM_DMSTATUS_ALLRUNNING_OFFSET       11
+#define DM_DMSTATUS_ALLRUNNING_OFFSET       0xb
 #define DM_DMSTATUS_ALLRUNNING_LENGTH       1
-#define DM_DMSTATUS_ALLRUNNING              (0x1U << DM_DMSTATUS_ALLRUNNING_OFFSET)
+#define DM_DMSTATUS_ALLRUNNING              0x800
 /*
  * This field is 1 when any currently selected hart is running.
  */
-#define DM_DMSTATUS_ANYRUNNING_OFFSET       10
+#define DM_DMSTATUS_ANYRUNNING_OFFSET       0xa
 #define DM_DMSTATUS_ANYRUNNING_LENGTH       1
-#define DM_DMSTATUS_ANYRUNNING              (0x1U << DM_DMSTATUS_ANYRUNNING_OFFSET)
+#define DM_DMSTATUS_ANYRUNNING              0x400
 /*
  * This field is 1 when all currently selected harts are halted.
  */
-#define DM_DMSTATUS_ALLHALTED_OFFSET        9
+#define DM_DMSTATUS_ALLHALTED_OFFSET        0x9
 #define DM_DMSTATUS_ALLHALTED_LENGTH        1
-#define DM_DMSTATUS_ALLHALTED               (0x1U << DM_DMSTATUS_ALLHALTED_OFFSET)
+#define DM_DMSTATUS_ALLHALTED               0x200
 /*
  * This field is 1 when any currently selected hart is halted.
  */
-#define DM_DMSTATUS_ANYHALTED_OFFSET        8
+#define DM_DMSTATUS_ANYHALTED_OFFSET        0x8
 #define DM_DMSTATUS_ANYHALTED_LENGTH        1
-#define DM_DMSTATUS_ANYHALTED               (0x1U << DM_DMSTATUS_ANYHALTED_OFFSET)
+#define DM_DMSTATUS_ANYHALTED               0x100
 /*
  * 0: Authentication is required before using the DM.
  *
@@ -1524,7 +1497,7 @@
  */
 #define DM_DMSTATUS_AUTHENTICATED_OFFSET    7
 #define DM_DMSTATUS_AUTHENTICATED_LENGTH    1
-#define DM_DMSTATUS_AUTHENTICATED           (0x1U << DM_DMSTATUS_AUTHENTICATED_OFFSET)
+#define DM_DMSTATUS_AUTHENTICATED           0x80
 /*
  * 0: The authentication module is ready to process the next
  * read/write to \RdmAuthdata.
@@ -1537,7 +1510,7 @@
  */
 #define DM_DMSTATUS_AUTHBUSY_OFFSET         6
 #define DM_DMSTATUS_AUTHBUSY_LENGTH         1
-#define DM_DMSTATUS_AUTHBUSY                (0x1U << DM_DMSTATUS_AUTHBUSY_OFFSET)
+#define DM_DMSTATUS_AUTHBUSY                0x40
 /*
  * 1 if this Debug Module supports halt-on-reset functionality
  * controllable by the \FdmDmcontrolSetresethaltreq and \FdmDmcontrolClrresethaltreq bits.
@@ -1545,17 +1518,17 @@
  */
 #define DM_DMSTATUS_HASRESETHALTREQ_OFFSET  5
 #define DM_DMSTATUS_HASRESETHALTREQ_LENGTH  1
-#define DM_DMSTATUS_HASRESETHALTREQ         (0x1U << DM_DMSTATUS_HASRESETHALTREQ_OFFSET)
+#define DM_DMSTATUS_HASRESETHALTREQ         0x20
 /*
  * 0: \RdmConfstrptrZero--\RdmConfstrptrThree hold information which
- * is not relevant to the configuration string.
+ * is not relevant to the configuration structure.
  *
  * 1: \RdmConfstrptrZero--\RdmConfstrptrThree hold the address of the
- * configuration string.
+ * configuration structure.
  */
 #define DM_DMSTATUS_CONFSTRPTRVALID_OFFSET  4
 #define DM_DMSTATUS_CONFSTRPTRVALID_LENGTH  1
-#define DM_DMSTATUS_CONFSTRPTRVALID         (0x1U << DM_DMSTATUS_CONFSTRPTRVALID_OFFSET)
+#define DM_DMSTATUS_CONFSTRPTRVALID         0x10
 /*
  * 0: There is no Debug Module present.
  *
@@ -1573,7 +1546,7 @@
  */
 #define DM_DMSTATUS_VERSION_OFFSET          0
 #define DM_DMSTATUS_VERSION_LENGTH          4
-#define DM_DMSTATUS_VERSION                 (0xfU << DM_DMSTATUS_VERSION_OFFSET)
+#define DM_DMSTATUS_VERSION                 0xf
 #define DM_DMCONTROL                        0x10
 /*
  * Writing 0 clears the halt request bit for all currently selected
@@ -1585,9 +1558,9 @@
  *
  * Writes apply to the new value of \Fhartsel and \FdmDmcontrolHasel.
  */
-#define DM_DMCONTROL_HALTREQ_OFFSET         31
+#define DM_DMCONTROL_HALTREQ_OFFSET         0x1f
 #define DM_DMCONTROL_HALTREQ_LENGTH         1
-#define DM_DMCONTROL_HALTREQ                (0x1U << DM_DMCONTROL_HALTREQ_OFFSET)
+#define DM_DMCONTROL_HALTREQ                0x80000000U
 /*
  * Writing 1 causes the currently selected harts to resume once, if
  * they are halted when the write occurs. It also clears the resume
@@ -1597,9 +1570,9 @@
  *
  * Writes apply to the new value of \Fhartsel and \FdmDmcontrolHasel.
  */
-#define DM_DMCONTROL_RESUMEREQ_OFFSET       30
+#define DM_DMCONTROL_RESUMEREQ_OFFSET       0x1e
 #define DM_DMCONTROL_RESUMEREQ_LENGTH       1
-#define DM_DMCONTROL_RESUMEREQ              (0x1U << DM_DMCONTROL_RESUMEREQ_OFFSET)
+#define DM_DMCONTROL_RESUMEREQ              0x40000000
 /*
  * This optional field writes the reset bit for all the currently
  * selected harts.  To perform a reset the debugger writes 1, and then
@@ -1614,9 +1587,9 @@
  *
  * Writes apply to the new value of \Fhartsel and \FdmDmcontrolHasel.
  */
-#define DM_DMCONTROL_HARTRESET_OFFSET       29
+#define DM_DMCONTROL_HARTRESET_OFFSET       0x1d
 #define DM_DMCONTROL_HARTRESET_LENGTH       1
-#define DM_DMCONTROL_HARTRESET              (0x1U << DM_DMCONTROL_HARTRESET_OFFSET)
+#define DM_DMCONTROL_HARTRESET              0x20000000
 /*
  * 0: No effect.
  *
@@ -1624,19 +1597,19 @@
  *
  * Writes apply to the new value of \Fhartsel and \FdmDmcontrolHasel.
  */
-#define DM_DMCONTROL_ACKHAVERESET_OFFSET    28
+#define DM_DMCONTROL_ACKHAVERESET_OFFSET    0x1c
 #define DM_DMCONTROL_ACKHAVERESET_LENGTH    1
-#define DM_DMCONTROL_ACKHAVERESET           (0x1U << DM_DMCONTROL_ACKHAVERESET_OFFSET)
+#define DM_DMCONTROL_ACKHAVERESET           0x10000000
 /*
  * 0: No effect.
  *
- * 1: Clears {\tt unavail} for any selected harts.
+ * 1: Clears {\tt unavail} for any selected harts that are currently available.
  *
  * Writes apply to the new value of \Fhartsel and \FdmDmcontrolHasel.
  */
-#define DM_DMCONTROL_ACKUNAVAIL_OFFSET      27
+#define DM_DMCONTROL_ACKUNAVAIL_OFFSET      0x1b
 #define DM_DMCONTROL_ACKUNAVAIL_LENGTH      1
-#define DM_DMCONTROL_ACKUNAVAIL             (0x1U << DM_DMCONTROL_ACKUNAVAIL_OFFSET)
+#define DM_DMCONTROL_ACKUNAVAIL             0x8000000
 /*
  * Selects the definition of currently selected harts.
  *
@@ -1651,23 +1624,23 @@
  * mask register feature should set this bit and read back to see if the functionality
  * is supported.
  */
-#define DM_DMCONTROL_HASEL_OFFSET           26
+#define DM_DMCONTROL_HASEL_OFFSET           0x1a
 #define DM_DMCONTROL_HASEL_LENGTH           1
-#define DM_DMCONTROL_HASEL                  (0x1U << DM_DMCONTROL_HASEL_OFFSET)
+#define DM_DMCONTROL_HASEL                  0x4000000
 /*
  * The low 10 bits of \Fhartsel: the DM-specific index of the hart to
  * select. This hart is always part of the currently selected harts.
  */
-#define DM_DMCONTROL_HARTSELLO_OFFSET       16
-#define DM_DMCONTROL_HARTSELLO_LENGTH       10
-#define DM_DMCONTROL_HARTSELLO              (0x3ffU << DM_DMCONTROL_HARTSELLO_OFFSET)
+#define DM_DMCONTROL_HARTSELLO_OFFSET       0x10
+#define DM_DMCONTROL_HARTSELLO_LENGTH       0xa
+#define DM_DMCONTROL_HARTSELLO              0x3ff0000
 /*
  * The high 10 bits of \Fhartsel: the DM-specific index of the hart to
  * select. This hart is always part of the currently selected harts.
  */
 #define DM_DMCONTROL_HARTSELHI_OFFSET       6
-#define DM_DMCONTROL_HARTSELHI_LENGTH       10
-#define DM_DMCONTROL_HARTSELHI              (0x3ffU << DM_DMCONTROL_HARTSELHI_OFFSET)
+#define DM_DMCONTROL_HARTSELHI_LENGTH       0xa
+#define DM_DMCONTROL_HARTSELHI              0xffc0
 /*
  * This optional field sets \Fkeepalive for all currently selected
  * harts, unless \FdmDmcontrolClrkeepalive is simultaneously set to
@@ -1677,7 +1650,7 @@
  */
 #define DM_DMCONTROL_SETKEEPALIVE_OFFSET    5
 #define DM_DMCONTROL_SETKEEPALIVE_LENGTH    1
-#define DM_DMCONTROL_SETKEEPALIVE           (0x1U << DM_DMCONTROL_SETKEEPALIVE_OFFSET)
+#define DM_DMCONTROL_SETKEEPALIVE           0x20
 /*
  * This optional field clears \Fkeepalive for all currently selected
  * harts.
@@ -1686,7 +1659,7 @@
  */
 #define DM_DMCONTROL_CLRKEEPALIVE_OFFSET    4
 #define DM_DMCONTROL_CLRKEEPALIVE_LENGTH    1
-#define DM_DMCONTROL_CLRKEEPALIVE           (0x1U << DM_DMCONTROL_CLRKEEPALIVE_OFFSET)
+#define DM_DMCONTROL_CLRKEEPALIVE           0x10
 /*
  * This optional field writes the halt-on-reset request bit for all
  * currently selected harts, unless \FdmDmcontrolClrresethaltreq is
@@ -1701,7 +1674,7 @@
  */
 #define DM_DMCONTROL_SETRESETHALTREQ_OFFSET 3
 #define DM_DMCONTROL_SETRESETHALTREQ_LENGTH 1
-#define DM_DMCONTROL_SETRESETHALTREQ        (0x1U << DM_DMCONTROL_SETRESETHALTREQ_OFFSET)
+#define DM_DMCONTROL_SETRESETHALTREQ        0x8
 /*
  * This optional field clears the halt-on-reset request bit for all
  * currently selected harts.
@@ -1710,7 +1683,7 @@
  */
 #define DM_DMCONTROL_CLRRESETHALTREQ_OFFSET 2
 #define DM_DMCONTROL_CLRRESETHALTREQ_LENGTH 1
-#define DM_DMCONTROL_CLRRESETHALTREQ        (0x1U << DM_DMCONTROL_CLRRESETHALTREQ_OFFSET)
+#define DM_DMCONTROL_CLRRESETHALTREQ        4
 /*
  * This bit controls the reset signal from the DM to the rest of the
  * hardware platform. The signal should reset every part of the hardware platform, including
@@ -1722,7 +1695,7 @@
  */
 #define DM_DMCONTROL_NDMRESET_OFFSET        1
 #define DM_DMCONTROL_NDMRESET_LENGTH        1
-#define DM_DMCONTROL_NDMRESET               (0x1U << DM_DMCONTROL_NDMRESET_OFFSET)
+#define DM_DMCONTROL_NDMRESET               2
 /*
  * This bit serves as a reset signal for the Debug Module itself.
  * After changing the value of this bit, the debugger must poll
@@ -1753,7 +1726,7 @@
  */
 #define DM_DMCONTROL_DMACTIVE_OFFSET        0
 #define DM_DMCONTROL_DMACTIVE_LENGTH        1
-#define DM_DMCONTROL_DMACTIVE               (0x1U << DM_DMCONTROL_DMACTIVE_OFFSET)
+#define DM_DMCONTROL_DMACTIVE               1
 #define DM_HARTINFO                         0x12
 /*
  * Number of {\tt dscratch} registers available for the debugger
@@ -1761,9 +1734,9 @@
  * The debugger can make no assumptions about the contents of these
  * registers between commands.
  */
-#define DM_HARTINFO_NSCRATCH_OFFSET         20
+#define DM_HARTINFO_NSCRATCH_OFFSET         0x14
 #define DM_HARTINFO_NSCRATCH_LENGTH         4
-#define DM_HARTINFO_NSCRATCH                (0xfU << DM_HARTINFO_NSCRATCH_OFFSET)
+#define DM_HARTINFO_NSCRATCH                0xf00000
 /*
  * 0: The {\tt data} registers are shadowed in the hart by CSRs.
  * Each CSR is DXLEN bits in size, and corresponds
@@ -1772,9 +1745,9 @@
  * 1: The {\tt data} registers are shadowed in the hart's memory map.
  * Each register takes up 4 bytes in the memory map.
  */
-#define DM_HARTINFO_DATAACCESS_OFFSET       16
+#define DM_HARTINFO_DATAACCESS_OFFSET       0x10
 #define DM_HARTINFO_DATAACCESS_LENGTH       1
-#define DM_HARTINFO_DATAACCESS              (0x1U << DM_HARTINFO_DATAACCESS_OFFSET)
+#define DM_HARTINFO_DATAACCESS              0x10000
 /*
  * If \FdmHartinfoDataaccess is 0: Number of CSRs dedicated to
  * shadowing the {\tt data} registers.
@@ -1785,9 +1758,9 @@
  * Since there are at most 12 {\tt data} registers, the value in this
  * register must be 12 or smaller.
  */
-#define DM_HARTINFO_DATASIZE_OFFSET         12
+#define DM_HARTINFO_DATASIZE_OFFSET         0xc
 #define DM_HARTINFO_DATASIZE_LENGTH         4
-#define DM_HARTINFO_DATASIZE                (0xfU << DM_HARTINFO_DATASIZE_OFFSET)
+#define DM_HARTINFO_DATASIZE                0xf000
 /*
  * If \FdmHartinfoDataaccess is 0: The number of the first CSR dedicated to
  * shadowing the {\tt data} registers.
@@ -1798,8 +1771,8 @@
  * \Xzero as the address register.
  */
 #define DM_HARTINFO_DATAADDR_OFFSET         0
-#define DM_HARTINFO_DATAADDR_LENGTH         12
-#define DM_HARTINFO_DATAADDR                (0xfffU << DM_HARTINFO_DATAADDR_OFFSET)
+#define DM_HARTINFO_DATAADDR_LENGTH         0xc
+#define DM_HARTINFO_DATAADDR                0xfff
 #define DM_HAWINDOWSEL                      0x14
 /*
  * The high bits of this field may be tied to 0, depending on how large
@@ -1807,28 +1780,28 @@
  * of this field may actually be writable.
  */
 #define DM_HAWINDOWSEL_HAWINDOWSEL_OFFSET   0
-#define DM_HAWINDOWSEL_HAWINDOWSEL_LENGTH   15
-#define DM_HAWINDOWSEL_HAWINDOWSEL          (0x7fffU << DM_HAWINDOWSEL_HAWINDOWSEL_OFFSET)
+#define DM_HAWINDOWSEL_HAWINDOWSEL_LENGTH   0xf
+#define DM_HAWINDOWSEL_HAWINDOWSEL          0x7fff
 #define DM_HAWINDOW                         0x15
 #define DM_HAWINDOW_MASKDATA_OFFSET         0
-#define DM_HAWINDOW_MASKDATA_LENGTH         32
-#define DM_HAWINDOW_MASKDATA                (0xffffffffU << DM_HAWINDOW_MASKDATA_OFFSET)
+#define DM_HAWINDOW_MASKDATA_LENGTH         0x20
+#define DM_HAWINDOW_MASKDATA                0xffffffffU
 #define DM_ABSTRACTCS                       0x16
 /*
  * Size of the Program Buffer, in 32-bit words. Valid sizes are 0 - 16.
  */
-#define DM_ABSTRACTCS_PROGBUFSIZE_OFFSET    24
+#define DM_ABSTRACTCS_PROGBUFSIZE_OFFSET    0x18
 #define DM_ABSTRACTCS_PROGBUFSIZE_LENGTH    5
-#define DM_ABSTRACTCS_PROGBUFSIZE           (0x1fU << DM_ABSTRACTCS_PROGBUFSIZE_OFFSET)
+#define DM_ABSTRACTCS_PROGBUFSIZE           0x1f000000
 /*
  * 1: An abstract command is currently being executed.
  *
  * This bit is set as soon as \RdmCommand is written, and is
  * not cleared until that command has completed.
  */
-#define DM_ABSTRACTCS_BUSY_OFFSET           12
+#define DM_ABSTRACTCS_BUSY_OFFSET           0xc
 #define DM_ABSTRACTCS_BUSY_LENGTH           1
-#define DM_ABSTRACTCS_BUSY                  (0x1U << DM_ABSTRACTCS_BUSY_OFFSET)
+#define DM_ABSTRACTCS_BUSY                  0x1000
 /*
  * This optional bit controls whether program buffer and abstract
  * memory accesses are performed with the exact and full set of
@@ -1838,9 +1811,9 @@
  * details of the latter are implementation-specific.  When set to 0,
  * full permissions apply; when set to 1, relaxed permissions apply.
  */
-#define DM_ABSTRACTCS_RELAXEDPRIV_OFFSET    11
+#define DM_ABSTRACTCS_RELAXEDPRIV_OFFSET    0xb
 #define DM_ABSTRACTCS_RELAXEDPRIV_LENGTH    1
-#define DM_ABSTRACTCS_RELAXEDPRIV           (0x1U << DM_ABSTRACTCS_RELAXEDPRIV_OFFSET)
+#define DM_ABSTRACTCS_RELAXEDPRIV           0x800
 /*
  * Gets set if an abstract command fails. The bits in this field remain set until
  * they are cleared by writing 1 to them. No abstract command is
@@ -1873,72 +1846,74 @@
  *
  * 7 (other): The command failed for another reason.
  */
-#define DM_ABSTRACTCS_CMDERR_OFFSET         8
+#define DM_ABSTRACTCS_CMDERR_OFFSET         0x8
 #define DM_ABSTRACTCS_CMDERR_LENGTH         3
-#define DM_ABSTRACTCS_CMDERR                (0x7U << DM_ABSTRACTCS_CMDERR_OFFSET)
+#define DM_ABSTRACTCS_CMDERR                0x700
 /*
  * Number of {\tt data} registers that are implemented as part of the
  * abstract command interface. Valid sizes are 1 -- 12.
  */
 #define DM_ABSTRACTCS_DATACOUNT_OFFSET      0
 #define DM_ABSTRACTCS_DATACOUNT_LENGTH      4
-#define DM_ABSTRACTCS_DATACOUNT             (0xfU << DM_ABSTRACTCS_DATACOUNT_OFFSET)
+#define DM_ABSTRACTCS_DATACOUNT             0xf
 #define DM_COMMAND                          0x17
 /*
  * The type determines the overall functionality of this
  * abstract command.
  */
-#define DM_COMMAND_CMDTYPE_OFFSET           24
-#define DM_COMMAND_CMDTYPE_LENGTH           8
-#define DM_COMMAND_CMDTYPE                  (0xffU << DM_COMMAND_CMDTYPE_OFFSET)
+#define DM_COMMAND_CMDTYPE_OFFSET           0x18
+#define DM_COMMAND_CMDTYPE_LENGTH           0x8
+#define DM_COMMAND_CMDTYPE                  0xff000000U
 /*
  * This field is interpreted in a command-specific manner,
  * described for each abstract command.
  */
 #define DM_COMMAND_CONTROL_OFFSET           0
-#define DM_COMMAND_CONTROL_LENGTH           24
-#define DM_COMMAND_CONTROL                  (0xffffffU << DM_COMMAND_CONTROL_OFFSET)
+#define DM_COMMAND_CONTROL_LENGTH           0x18
+#define DM_COMMAND_CONTROL                  0xffffff
 #define DM_ABSTRACTAUTO                     0x18
 /*
  * When a bit in this field is 1, read or write accesses to the
- * corresponding {\tt progbuf} word cause the command in \RdmCommand to
- * be executed again.
+ * corresponding {\tt progbuf} word cause the DM to act as if the
+ * current value in \RdmCommand was written there again after the
+ * access to {\tt progbuf} completes.
  */
-#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF_OFFSET 16
-#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF_LENGTH 16
-#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF     (0xffffU << DM_ABSTRACTAUTO_AUTOEXECPROGBUF_OFFSET)
+#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF_OFFSET 0x10
+#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF_LENGTH 0x10
+#define DM_ABSTRACTAUTO_AUTOEXECPROGBUF     0xffff0000U
 /*
  * When a bit in this field is 1, read or write accesses to the
- * corresponding {\tt data} word cause the command in \RdmCommand to be
- * executed again.
+ * corresponding {\tt data} word cause the DM to act as if the current
+ * value in \RdmCommand was written there again after the
+ * access to {\tt data} completes.
  */
 #define DM_ABSTRACTAUTO_AUTOEXECDATA_OFFSET 0
-#define DM_ABSTRACTAUTO_AUTOEXECDATA_LENGTH 12
-#define DM_ABSTRACTAUTO_AUTOEXECDATA        (0xfffU << DM_ABSTRACTAUTO_AUTOEXECDATA_OFFSET)
+#define DM_ABSTRACTAUTO_AUTOEXECDATA_LENGTH 0xc
+#define DM_ABSTRACTAUTO_AUTOEXECDATA        0xfff
 #define DM_CONFSTRPTR0                      0x19
 #define DM_CONFSTRPTR0_ADDR_OFFSET          0
-#define DM_CONFSTRPTR0_ADDR_LENGTH          32
-#define DM_CONFSTRPTR0_ADDR                 (0xffffffffU << DM_CONFSTRPTR0_ADDR_OFFSET)
+#define DM_CONFSTRPTR0_ADDR_LENGTH          0x20
+#define DM_CONFSTRPTR0_ADDR                 0xffffffffU
 #define DM_CONFSTRPTR1                      0x1a
 #define DM_CONFSTRPTR1_ADDR_OFFSET          0
-#define DM_CONFSTRPTR1_ADDR_LENGTH          32
-#define DM_CONFSTRPTR1_ADDR                 (0xffffffffU << DM_CONFSTRPTR1_ADDR_OFFSET)
+#define DM_CONFSTRPTR1_ADDR_LENGTH          0x20
+#define DM_CONFSTRPTR1_ADDR                 0xffffffffU
 #define DM_CONFSTRPTR2                      0x1b
 #define DM_CONFSTRPTR2_ADDR_OFFSET          0
-#define DM_CONFSTRPTR2_ADDR_LENGTH          32
-#define DM_CONFSTRPTR2_ADDR                 (0xffffffffU << DM_CONFSTRPTR2_ADDR_OFFSET)
+#define DM_CONFSTRPTR2_ADDR_LENGTH          0x20
+#define DM_CONFSTRPTR2_ADDR                 0xffffffffU
 #define DM_CONFSTRPTR3                      0x1c
 #define DM_CONFSTRPTR3_ADDR_OFFSET          0
-#define DM_CONFSTRPTR3_ADDR_LENGTH          32
-#define DM_CONFSTRPTR3_ADDR                 (0xffffffffU << DM_CONFSTRPTR3_ADDR_OFFSET)
+#define DM_CONFSTRPTR3_ADDR_LENGTH          0x20
+#define DM_CONFSTRPTR3_ADDR                 0xffffffffU
 #define DM_NEXTDM                           0x1d
 #define DM_NEXTDM_ADDR_OFFSET               0
-#define DM_NEXTDM_ADDR_LENGTH               32
-#define DM_NEXTDM_ADDR                      (0xffffffffU << DM_NEXTDM_ADDR_OFFSET)
+#define DM_NEXTDM_ADDR_LENGTH               0x20
+#define DM_NEXTDM_ADDR                      0xffffffffU
 #define DM_DATA0                            0x04
 #define DM_DATA0_DATA_OFFSET                0
-#define DM_DATA0_DATA_LENGTH                32
-#define DM_DATA0_DATA                       (0xffffffffU << DM_DATA0_DATA_OFFSET)
+#define DM_DATA0_DATA_LENGTH                0x20
+#define DM_DATA0_DATA                       0xffffffffU
 #define DM_DATA1                            0x05
 #define DM_DATA2                            0x06
 #define DM_DATA3                            0x07
@@ -1952,8 +1927,8 @@
 #define DM_DATA11                           0x0f
 #define DM_PROGBUF0                         0x20
 #define DM_PROGBUF0_DATA_OFFSET             0
-#define DM_PROGBUF0_DATA_LENGTH             32
-#define DM_PROGBUF0_DATA                    (0xffffffffU << DM_PROGBUF0_DATA_OFFSET)
+#define DM_PROGBUF0_DATA_LENGTH             0x20
+#define DM_PROGBUF0_DATA                    0xffffffffU
 #define DM_PROGBUF1                         0x21
 #define DM_PROGBUF2                         0x22
 #define DM_PROGBUF3                         0x23
@@ -1971,17 +1946,17 @@
 #define DM_PROGBUF15                        0x2f
 #define DM_AUTHDATA                         0x30
 #define DM_AUTHDATA_DATA_OFFSET             0
-#define DM_AUTHDATA_DATA_LENGTH             32
-#define DM_AUTHDATA_DATA                    (0xffffffffU << DM_AUTHDATA_DATA_OFFSET)
+#define DM_AUTHDATA_DATA_LENGTH             0x20
+#define DM_AUTHDATA_DATA                    0xffffffffU
 #define DM_DMCS2                            0x32
 /*
  * 0: The remaining fields in this register configure halt groups.
  *
  * 1: The remaining fields in this register configure resume groups.
  */
-#define DM_DMCS2_GROUPTYPE_OFFSET           11
+#define DM_DMCS2_GROUPTYPE_OFFSET           0xb
 #define DM_DMCS2_GROUPTYPE_LENGTH           1
-#define DM_DMCS2_GROUPTYPE                  (0x1U << DM_DMCS2_GROUPTYPE_OFFSET)
+#define DM_DMCS2_GROUPTYPE                  0x800
 /*
  * This field contains the currently selected DM external trigger.
  *
@@ -1990,7 +1965,7 @@
  */
 #define DM_DMCS2_DMEXTTRIGGER_OFFSET        7
 #define DM_DMCS2_DMEXTTRIGGER_LENGTH        4
-#define DM_DMCS2_DMEXTTRIGGER               (0xfU << DM_DMCS2_DMEXTTRIGGER_OFFSET)
+#define DM_DMCS2_DMEXTTRIGGER               0x780
 /*
  * When \FdmDmcsTwoHgselect is 0, contains the group of the hart
  * specified by \Fhartsel.
@@ -1998,7 +1973,8 @@
  * When \FdmDmcsTwoHgselect is 1, contains the group of the DM external
  * trigger selected by \FdmDmcsTwoDmexttrigger.
  *
- * Writes only have an effect if \FdmDmcsTwoHgwrite is also written 1.
+ * The value written to this field is ignored unless \FdmDmcsTwoHgwrite
+ * is also written 1.
  *
  * Group numbers are contiguous starting at 0, with the highest number
  * being implementation-dependent, and possibly different between
@@ -2009,7 +1985,7 @@
  */
 #define DM_DMCS2_GROUP_OFFSET               2
 #define DM_DMCS2_GROUP_LENGTH               5
-#define DM_DMCS2_GROUP                      (0x1fU << DM_DMCS2_GROUP_OFFSET)
+#define DM_DMCS2_GROUP                      0x7c
 /*
  * When 1 is written and \FdmDmcsTwoHgselect is 0, for every selected
  * hart the DM will change its group to the value written to \FdmDmcsTwoGroup,
@@ -2027,7 +2003,7 @@
  */
 #define DM_DMCS2_HGWRITE_OFFSET             1
 #define DM_DMCS2_HGWRITE_LENGTH             1
-#define DM_DMCS2_HGWRITE                    (0x1U << DM_DMCS2_HGWRITE_OFFSET)
+#define DM_DMCS2_HGWRITE                    2
 /*
  * 0: Operate on harts.
  *
@@ -2037,23 +2013,23 @@
  */
 #define DM_DMCS2_HGSELECT_OFFSET            0
 #define DM_DMCS2_HGSELECT_LENGTH            1
-#define DM_DMCS2_HGSELECT                   (0x1U << DM_DMCS2_HGSELECT_OFFSET)
+#define DM_DMCS2_HGSELECT                   1
 #define DM_HALTSUM0                         0x40
 #define DM_HALTSUM0_HALTSUM0_OFFSET         0
-#define DM_HALTSUM0_HALTSUM0_LENGTH         32
-#define DM_HALTSUM0_HALTSUM0                (0xffffffffU << DM_HALTSUM0_HALTSUM0_OFFSET)
+#define DM_HALTSUM0_HALTSUM0_LENGTH         0x20
+#define DM_HALTSUM0_HALTSUM0                0xffffffffU
 #define DM_HALTSUM1                         0x13
 #define DM_HALTSUM1_HALTSUM1_OFFSET         0
-#define DM_HALTSUM1_HALTSUM1_LENGTH         32
-#define DM_HALTSUM1_HALTSUM1                (0xffffffffU << DM_HALTSUM1_HALTSUM1_OFFSET)
+#define DM_HALTSUM1_HALTSUM1_LENGTH         0x20
+#define DM_HALTSUM1_HALTSUM1                0xffffffffU
 #define DM_HALTSUM2                         0x34
 #define DM_HALTSUM2_HALTSUM2_OFFSET         0
-#define DM_HALTSUM2_HALTSUM2_LENGTH         32
-#define DM_HALTSUM2_HALTSUM2                (0xffffffffU << DM_HALTSUM2_HALTSUM2_OFFSET)
+#define DM_HALTSUM2_HALTSUM2_LENGTH         0x20
+#define DM_HALTSUM2_HALTSUM2                0xffffffffU
 #define DM_HALTSUM3                         0x35
 #define DM_HALTSUM3_HALTSUM3_OFFSET         0
-#define DM_HALTSUM3_HALTSUM3_LENGTH         32
-#define DM_HALTSUM3_HALTSUM3                (0xffffffffU << DM_HALTSUM3_HALTSUM3_OFFSET)
+#define DM_HALTSUM3_HALTSUM3_LENGTH         0x20
+#define DM_HALTSUM3_HALTSUM3                0xffffffffU
 #define DM_SBCS                             0x38
 /*
  * 0: The System Bus interface conforms to mainline drafts of this
@@ -2063,9 +2039,9 @@
  *
  * Other values are reserved for future versions.
  */
-#define DM_SBCS_SBVERSION_OFFSET            29
+#define DM_SBCS_SBVERSION_OFFSET            0x1d
 #define DM_SBCS_SBVERSION_LENGTH            3
-#define DM_SBCS_SBVERSION                   (0x7U << DM_SBCS_SBVERSION_OFFSET)
+#define DM_SBCS_SBVERSION                   0xe0000000U
 /*
  * Set when the debugger attempts to read data while a read is in
  * progress, or when the debugger initiates a new access while one is
@@ -2075,9 +2051,9 @@
  * While this field is set, no more system bus accesses can be
  * initiated by the Debug Module.
  */
-#define DM_SBCS_SBBUSYERROR_OFFSET          22
+#define DM_SBCS_SBBUSYERROR_OFFSET          0x16
 #define DM_SBCS_SBBUSYERROR_LENGTH          1
-#define DM_SBCS_SBBUSYERROR                 (0x1U << DM_SBCS_SBBUSYERROR_OFFSET)
+#define DM_SBCS_SBBUSYERROR                 0x400000
 /*
  * When 1, indicates the system bus master is busy. (Whether the
  * system bus itself is busy is related, but not the same thing.) This
@@ -2088,16 +2064,16 @@
  * behavior.  A debugger must not write to \RdmSbcs until it reads
  * \FdmSbcsSbbusy as 0.
  */
-#define DM_SBCS_SBBUSY_OFFSET               21
+#define DM_SBCS_SBBUSY_OFFSET               0x15
 #define DM_SBCS_SBBUSY_LENGTH               1
-#define DM_SBCS_SBBUSY                      (0x1U << DM_SBCS_SBBUSY_OFFSET)
+#define DM_SBCS_SBBUSY                      0x200000
 /*
  * When 1, every write to \RdmSbaddressZero automatically triggers a
  * system bus read at the new address.
  */
-#define DM_SBCS_SBREADONADDR_OFFSET         20
+#define DM_SBCS_SBREADONADDR_OFFSET         0x14
 #define DM_SBCS_SBREADONADDR_LENGTH         1
-#define DM_SBCS_SBREADONADDR                (0x1U << DM_SBCS_SBREADONADDR_OFFSET)
+#define DM_SBCS_SBREADONADDR                0x100000
 /*
  * Select the access size to use for system bus accesses.
  *
@@ -2114,23 +2090,23 @@
  * If \FdmSbcsSbaccess has an unsupported value when the DM starts a bus
  * access, the access is not performed and \FdmSbcsSberror is set to 4.
  */
-#define DM_SBCS_SBACCESS_OFFSET             17
+#define DM_SBCS_SBACCESS_OFFSET             0x11
 #define DM_SBCS_SBACCESS_LENGTH             3
-#define DM_SBCS_SBACCESS                    (0x7U << DM_SBCS_SBACCESS_OFFSET)
+#define DM_SBCS_SBACCESS                    0xe0000
 /*
  * When 1, {\tt sbaddress} is incremented by the access size (in
  * bytes) selected in \FdmSbcsSbaccess after every system bus access.
  */
-#define DM_SBCS_SBAUTOINCREMENT_OFFSET      16
+#define DM_SBCS_SBAUTOINCREMENT_OFFSET      0x10
 #define DM_SBCS_SBAUTOINCREMENT_LENGTH      1
-#define DM_SBCS_SBAUTOINCREMENT             (0x1U << DM_SBCS_SBAUTOINCREMENT_OFFSET)
+#define DM_SBCS_SBAUTOINCREMENT             0x10000
 /*
  * When 1, every read from \RdmSbdataZero automatically triggers a
  * system bus read at the (possibly auto-incremented) address.
  */
-#define DM_SBCS_SBREADONDATA_OFFSET         15
+#define DM_SBCS_SBREADONDATA_OFFSET         0xf
 #define DM_SBCS_SBREADONDATA_LENGTH         1
-#define DM_SBCS_SBREADONDATA                (0x1U << DM_SBCS_SBREADONDATA_OFFSET)
+#define DM_SBCS_SBREADONDATA                0x8000
 /*
  * When the Debug Module's system bus
  * master encounters an error, this field gets set. The bits in this
@@ -2152,108 +2128,108 @@
  *
  * 7: Other.
  */
-#define DM_SBCS_SBERROR_OFFSET              12
+#define DM_SBCS_SBERROR_OFFSET              0xc
 #define DM_SBCS_SBERROR_LENGTH              3
-#define DM_SBCS_SBERROR                     (0x7U << DM_SBCS_SBERROR_OFFSET)
+#define DM_SBCS_SBERROR                     0x7000
 /*
  * Width of system bus addresses in bits. (0 indicates there is no bus
  * access support.)
  */
 #define DM_SBCS_SBASIZE_OFFSET              5
 #define DM_SBCS_SBASIZE_LENGTH              7
-#define DM_SBCS_SBASIZE                     (0x7fU << DM_SBCS_SBASIZE_OFFSET)
+#define DM_SBCS_SBASIZE                     0xfe0
 /*
  * 1 when 128-bit system bus accesses are supported.
  */
 #define DM_SBCS_SBACCESS128_OFFSET          4
 #define DM_SBCS_SBACCESS128_LENGTH          1
-#define DM_SBCS_SBACCESS128                 (0x1U << DM_SBCS_SBACCESS128_OFFSET)
+#define DM_SBCS_SBACCESS128                 0x10
 /*
  * 1 when 64-bit system bus accesses are supported.
  */
 #define DM_SBCS_SBACCESS64_OFFSET           3
 #define DM_SBCS_SBACCESS64_LENGTH           1
-#define DM_SBCS_SBACCESS64                  (0x1U << DM_SBCS_SBACCESS64_OFFSET)
+#define DM_SBCS_SBACCESS64                  0x8
 /*
  * 1 when 32-bit system bus accesses are supported.
  */
 #define DM_SBCS_SBACCESS32_OFFSET           2
 #define DM_SBCS_SBACCESS32_LENGTH           1
-#define DM_SBCS_SBACCESS32                  (0x1U << DM_SBCS_SBACCESS32_OFFSET)
+#define DM_SBCS_SBACCESS32                  4
 /*
  * 1 when 16-bit system bus accesses are supported.
  */
 #define DM_SBCS_SBACCESS16_OFFSET           1
 #define DM_SBCS_SBACCESS16_LENGTH           1
-#define DM_SBCS_SBACCESS16                  (0x1U << DM_SBCS_SBACCESS16_OFFSET)
+#define DM_SBCS_SBACCESS16                  2
 /*
  * 1 when 8-bit system bus accesses are supported.
  */
 #define DM_SBCS_SBACCESS8_OFFSET            0
 #define DM_SBCS_SBACCESS8_LENGTH            1
-#define DM_SBCS_SBACCESS8                   (0x1U << DM_SBCS_SBACCESS8_OFFSET)
+#define DM_SBCS_SBACCESS8                   1
 #define DM_SBADDRESS0                       0x39
 /*
  * Accesses bits 31:0 of the physical address in {\tt sbaddress}.
  */
 #define DM_SBADDRESS0_ADDRESS_OFFSET        0
-#define DM_SBADDRESS0_ADDRESS_LENGTH        32
-#define DM_SBADDRESS0_ADDRESS               (0xffffffffU << DM_SBADDRESS0_ADDRESS_OFFSET)
+#define DM_SBADDRESS0_ADDRESS_LENGTH        0x20
+#define DM_SBADDRESS0_ADDRESS               0xffffffffU
 #define DM_SBADDRESS1                       0x3a
 /*
  * Accesses bits 63:32 of the physical address in {\tt sbaddress} (if
  * the system address bus is that wide).
  */
 #define DM_SBADDRESS1_ADDRESS_OFFSET        0
-#define DM_SBADDRESS1_ADDRESS_LENGTH        32
-#define DM_SBADDRESS1_ADDRESS               (0xffffffffU << DM_SBADDRESS1_ADDRESS_OFFSET)
+#define DM_SBADDRESS1_ADDRESS_LENGTH        0x20
+#define DM_SBADDRESS1_ADDRESS               0xffffffffU
 #define DM_SBADDRESS2                       0x3b
 /*
  * Accesses bits 95:64 of the physical address in {\tt sbaddress} (if
  * the system address bus is that wide).
  */
 #define DM_SBADDRESS2_ADDRESS_OFFSET        0
-#define DM_SBADDRESS2_ADDRESS_LENGTH        32
-#define DM_SBADDRESS2_ADDRESS               (0xffffffffU << DM_SBADDRESS2_ADDRESS_OFFSET)
+#define DM_SBADDRESS2_ADDRESS_LENGTH        0x20
+#define DM_SBADDRESS2_ADDRESS               0xffffffffU
 #define DM_SBADDRESS3                       0x37
 /*
  * Accesses bits 127:96 of the physical address in {\tt sbaddress} (if
  * the system address bus is that wide).
  */
 #define DM_SBADDRESS3_ADDRESS_OFFSET        0
-#define DM_SBADDRESS3_ADDRESS_LENGTH        32
-#define DM_SBADDRESS3_ADDRESS               (0xffffffffU << DM_SBADDRESS3_ADDRESS_OFFSET)
+#define DM_SBADDRESS3_ADDRESS_LENGTH        0x20
+#define DM_SBADDRESS3_ADDRESS               0xffffffffU
 #define DM_SBDATA0                          0x3c
 /*
  * Accesses bits 31:0 of {\tt sbdata}.
  */
 #define DM_SBDATA0_DATA_OFFSET              0
-#define DM_SBDATA0_DATA_LENGTH              32
-#define DM_SBDATA0_DATA                     (0xffffffffU << DM_SBDATA0_DATA_OFFSET)
+#define DM_SBDATA0_DATA_LENGTH              0x20
+#define DM_SBDATA0_DATA                     0xffffffffU
 #define DM_SBDATA1                          0x3d
 /*
  * Accesses bits 63:32 of {\tt sbdata} (if the system bus is that
  * wide).
  */
 #define DM_SBDATA1_DATA_OFFSET              0
-#define DM_SBDATA1_DATA_LENGTH              32
-#define DM_SBDATA1_DATA                     (0xffffffffU << DM_SBDATA1_DATA_OFFSET)
+#define DM_SBDATA1_DATA_LENGTH              0x20
+#define DM_SBDATA1_DATA                     0xffffffffU
 #define DM_SBDATA2                          0x3e
 /*
  * Accesses bits 95:64 of {\tt sbdata} (if the system bus is that
  * wide).
  */
 #define DM_SBDATA2_DATA_OFFSET              0
-#define DM_SBDATA2_DATA_LENGTH              32
-#define DM_SBDATA2_DATA                     (0xffffffffU << DM_SBDATA2_DATA_OFFSET)
+#define DM_SBDATA2_DATA_LENGTH              0x20
+#define DM_SBDATA2_DATA                     0xffffffffU
 #define DM_SBDATA3                          0x3f
 /*
  * Accesses bits 127:96 of {\tt sbdata} (if the system bus is that
  * wide).
  */
 #define DM_SBDATA3_DATA_OFFSET              0
-#define DM_SBDATA3_DATA_LENGTH              32
-#define DM_SBDATA3_DATA                     (0xffffffffU << DM_SBDATA3_DATA_OFFSET)
+#define DM_SBDATA3_DATA_LENGTH              0x20
+#define DM_SBDATA3_DATA                     0xffffffffU
 #define DM_CUSTOM                           0x1f
 #define DM_CUSTOM0                          0x70
 #define DM_CUSTOM1                          0x71
@@ -2276,14 +2252,14 @@
  * Description of what this field is used for.
  */
 #define SHORTNAME_FIELD_OFFSET              0
-#define SHORTNAME_FIELD_LENGTH              8
-#define SHORTNAME_FIELD                     (0xffU << SHORTNAME_FIELD_OFFSET)
+#define SHORTNAME_FIELD_LENGTH              0x8
+#define SHORTNAME_FIELD                     0xff
 /*
  * This is 0 to indicate Access Register Command.
  */
-#define AC_ACCESS_REGISTER_CMDTYPE_OFFSET   24
-#define AC_ACCESS_REGISTER_CMDTYPE_LENGTH   8
-#define AC_ACCESS_REGISTER_CMDTYPE          (0xffU << AC_ACCESS_REGISTER_CMDTYPE_OFFSET)
+#define AC_ACCESS_REGISTER_CMDTYPE_OFFSET   0x18
+#define AC_ACCESS_REGISTER_CMDTYPE_LENGTH   0x8
+#define AC_ACCESS_REGISTER_CMDTYPE          0xff000000U
 /*
  * 2: Access the lowest 32 bits of the register.
  *
@@ -2294,13 +2270,15 @@
  * If \FacAccessregisterAarsize specifies a size larger than the register's actual size,
  * then the access must fail. If a register is accessible, then reads of \FacAccessregisterAarsize
  * less than or equal to the register's actual size must be supported.
+ * Writing less than the full register may be supported, but what
+ * happens to the high bits in that case is \unspecified.
  *
  * This field controls the Argument Width as referenced in
  * Table~\ref{tab:datareg}.
  */
-#define AC_ACCESS_REGISTER_AARSIZE_OFFSET   20
+#define AC_ACCESS_REGISTER_AARSIZE_OFFSET   0x14
 #define AC_ACCESS_REGISTER_AARSIZE_LENGTH   3
-#define AC_ACCESS_REGISTER_AARSIZE          (0x7U << AC_ACCESS_REGISTER_AARSIZE_OFFSET)
+#define AC_ACCESS_REGISTER_AARSIZE          0x700000
 /*
  * 0: No effect. This variant must be supported.
  *
@@ -2310,9 +2288,9 @@
  * this variant is optional. It is undefined whether the increment
  * happens when \FacAccessregisterTransfer is 0.
  */
-#define AC_ACCESS_REGISTER_AARPOSTINCREMENT_OFFSET 19
+#define AC_ACCESS_REGISTER_AARPOSTINCREMENT_OFFSET 0x13
 #define AC_ACCESS_REGISTER_AARPOSTINCREMENT_LENGTH 1
-#define AC_ACCESS_REGISTER_AARPOSTINCREMENT (0x1U << AC_ACCESS_REGISTER_AARPOSTINCREMENT_OFFSET)
+#define AC_ACCESS_REGISTER_AARPOSTINCREMENT 0x80000
 /*
  * 0: No effect. This variant must be supported, and is the only
  * supported one if \FdmAbstractcsProgbufsize is 0.
@@ -2321,9 +2299,9 @@
  * performing the transfer, if any. Supporting this variant is
  * optional.
  */
-#define AC_ACCESS_REGISTER_POSTEXEC_OFFSET  18
+#define AC_ACCESS_REGISTER_POSTEXEC_OFFSET  0x12
 #define AC_ACCESS_REGISTER_POSTEXEC_LENGTH  1
-#define AC_ACCESS_REGISTER_POSTEXEC         (0x1U << AC_ACCESS_REGISTER_POSTEXEC_OFFSET)
+#define AC_ACCESS_REGISTER_POSTEXEC         0x40000
 /*
  * 0: Don't do the operation specified by \FacAccessregisterWrite.
  *
@@ -2332,9 +2310,9 @@
  * This bit can be used to just execute the Program Buffer without
  * having to worry about placing valid values into \FacAccessregisterAarsize or \FacAccessregisterRegno.
  */
-#define AC_ACCESS_REGISTER_TRANSFER_OFFSET  17
+#define AC_ACCESS_REGISTER_TRANSFER_OFFSET  0x11
 #define AC_ACCESS_REGISTER_TRANSFER_LENGTH  1
-#define AC_ACCESS_REGISTER_TRANSFER         (0x1U << AC_ACCESS_REGISTER_TRANSFER_OFFSET)
+#define AC_ACCESS_REGISTER_TRANSFER         0x20000
 /*
  * When \FacAccessregisterTransfer is set:
  * 0: Copy data from the specified register into {\tt arg0} portion
@@ -2343,9 +2321,9 @@
  * 1: Copy data from {\tt arg0} portion of {\tt data} into the
  * specified register.
  */
-#define AC_ACCESS_REGISTER_WRITE_OFFSET     16
+#define AC_ACCESS_REGISTER_WRITE_OFFSET     0x10
 #define AC_ACCESS_REGISTER_WRITE_LENGTH     1
-#define AC_ACCESS_REGISTER_WRITE            (0x1U << AC_ACCESS_REGISTER_WRITE_OFFSET)
+#define AC_ACCESS_REGISTER_WRITE            0x10000
 /*
  * Number of the register to access, as described in
  * Table~\ref{tab:regno}.
@@ -2353,20 +2331,20 @@
  * supported on a non-halted hart.
  */
 #define AC_ACCESS_REGISTER_REGNO_OFFSET     0
-#define AC_ACCESS_REGISTER_REGNO_LENGTH     16
-#define AC_ACCESS_REGISTER_REGNO            (0xffffU << AC_ACCESS_REGISTER_REGNO_OFFSET)
+#define AC_ACCESS_REGISTER_REGNO_LENGTH     0x10
+#define AC_ACCESS_REGISTER_REGNO            0xffff
 /*
  * This is 1 to indicate Quick Access command.
  */
-#define AC_QUICK_ACCESS_CMDTYPE_OFFSET      24
-#define AC_QUICK_ACCESS_CMDTYPE_LENGTH      8
-#define AC_QUICK_ACCESS_CMDTYPE             (0xffU << AC_QUICK_ACCESS_CMDTYPE_OFFSET)
+#define AC_QUICK_ACCESS_CMDTYPE_OFFSET      0x18
+#define AC_QUICK_ACCESS_CMDTYPE_LENGTH      0x8
+#define AC_QUICK_ACCESS_CMDTYPE             0xff000000U
 /*
  * This is 2 to indicate Access Memory Command.
  */
-#define AC_ACCESS_MEMORY_CMDTYPE_OFFSET     24
-#define AC_ACCESS_MEMORY_CMDTYPE_LENGTH     8
-#define AC_ACCESS_MEMORY_CMDTYPE            (0xffU << AC_ACCESS_MEMORY_CMDTYPE_OFFSET)
+#define AC_ACCESS_MEMORY_CMDTYPE_OFFSET     0x18
+#define AC_ACCESS_MEMORY_CMDTYPE_LENGTH     0x8
+#define AC_ACCESS_MEMORY_CMDTYPE            0xff000000U
 /*
  * An implementation does not have to implement both virtual and
  * physical accesses, but it must fail accesses that it doesn't
@@ -2381,9 +2359,9 @@
  * may optionally allow \FacAccessmemoryAamvirtual set to 1, which would produce the same result as
  * that same abstract command with \FacAccessmemoryAamvirtual cleared.
  */
-#define AC_ACCESS_MEMORY_AAMVIRTUAL_OFFSET  23
+#define AC_ACCESS_MEMORY_AAMVIRTUAL_OFFSET  0x17
 #define AC_ACCESS_MEMORY_AAMVIRTUAL_LENGTH  1
-#define AC_ACCESS_MEMORY_AAMVIRTUAL         (0x1U << AC_ACCESS_MEMORY_AAMVIRTUAL_OFFSET)
+#define AC_ACCESS_MEMORY_AAMVIRTUAL         0x800000
 /*
  * 0: Access the lowest 8 bits of the memory location.
  *
@@ -2395,9 +2373,9 @@
  *
  * 4: Access the lowest 128 bits of the memory location.
  */
-#define AC_ACCESS_MEMORY_AAMSIZE_OFFSET     20
+#define AC_ACCESS_MEMORY_AAMSIZE_OFFSET     0x14
 #define AC_ACCESS_MEMORY_AAMSIZE_LENGTH     3
-#define AC_ACCESS_MEMORY_AAMSIZE            (0x7U << AC_ACCESS_MEMORY_AAMSIZE_OFFSET)
+#define AC_ACCESS_MEMORY_AAMSIZE            0x700000
 /*
  * After a memory access has completed, if this bit is 1, increment
  * {\tt arg1} (which contains the address used) by the number of bytes
@@ -2406,9 +2384,9 @@
  * Supporting this variant is optional, but highly recommended for
  * performance reasons.
  */
-#define AC_ACCESS_MEMORY_AAMPOSTINCREMENT_OFFSET 19
+#define AC_ACCESS_MEMORY_AAMPOSTINCREMENT_OFFSET 0x13
 #define AC_ACCESS_MEMORY_AAMPOSTINCREMENT_LENGTH 1
-#define AC_ACCESS_MEMORY_AAMPOSTINCREMENT   (0x1U << AC_ACCESS_MEMORY_AAMPOSTINCREMENT_OFFSET)
+#define AC_ACCESS_MEMORY_AAMPOSTINCREMENT   0x80000
 /*
  * 0: Copy data from the memory location specified in {\tt arg1} into
  * the low bits of {\tt arg0}. Any remaining bits of {\tt arg0} now
@@ -2417,112 +2395,112 @@
  * 1: Copy data from the low bits of {\tt arg0} into the memory
  * location specified in {\tt arg1}.
  */
-#define AC_ACCESS_MEMORY_WRITE_OFFSET       16
+#define AC_ACCESS_MEMORY_WRITE_OFFSET       0x10
 #define AC_ACCESS_MEMORY_WRITE_LENGTH       1
-#define AC_ACCESS_MEMORY_WRITE              (0x1U << AC_ACCESS_MEMORY_WRITE_OFFSET)
+#define AC_ACCESS_MEMORY_WRITE              0x10000
 /*
  * These bits are reserved for target-specific uses.
  */
-#define AC_ACCESS_MEMORY_TARGET_SPECIFIC_OFFSET 14
+#define AC_ACCESS_MEMORY_TARGET_SPECIFIC_OFFSET 0xe
 #define AC_ACCESS_MEMORY_TARGET_SPECIFIC_LENGTH 2
-#define AC_ACCESS_MEMORY_TARGET_SPECIFIC    (0x3U << AC_ACCESS_MEMORY_TARGET_SPECIFIC_OFFSET)
+#define AC_ACCESS_MEMORY_TARGET_SPECIFIC    0xc000
 #define VIRT_PRIV                           virtual
 /*
  * Contains the virtualization mode the hart was operating in when Debug
- * Mode was entered. The encoding is described in Table \ref{tab:privlevel},
+ * Mode was entered. The encoding is described in Table \ref{tab:privmode},
  * and matches the virtualization mode encoding from the Privileged Spec.
  * A user can write this value to change the hart's virtualization mode
  * when exiting Debug Mode.
  */
 #define VIRT_PRIV_V_OFFSET                  2
 #define VIRT_PRIV_V_LENGTH                  1
-#define VIRT_PRIV_V                         (0x1U << VIRT_PRIV_V_OFFSET)
+#define VIRT_PRIV_V                         4
 /*
- * Contains the privilege level the hart was operating in when Debug
+ * Contains the privilege mode the hart was operating in when Debug
  * Mode was entered. The encoding is described in Table
- * \ref{tab:privlevel}, and matches the privilege level encoding from
+ * \ref{tab:privmode}, and matches the privilege mode encoding from
  * the Privileged Spec. A user can write this
- * value to change the hart's privilege level when exiting Debug Mode.
+ * value to change the hart's privilege mode when exiting Debug Mode.
  */
 #define VIRT_PRIV_PRV_OFFSET                0
 #define VIRT_PRIV_PRV_LENGTH                2
-#define VIRT_PRIV_PRV                       (0x3U << VIRT_PRIV_PRV_OFFSET)
+#define VIRT_PRIV_PRV                       3
 #define DMI_SERCS                           0x34
 /*
  * Number of supported serial ports.
  */
-#define DMI_SERCS_SERIALCOUNT_OFFSET        28
+#define DMI_SERCS_SERIALCOUNT_OFFSET        0x1c
 #define DMI_SERCS_SERIALCOUNT_LENGTH        4
-#define DMI_SERCS_SERIALCOUNT               (0xfU << DMI_SERCS_SERIALCOUNT_OFFSET)
+#define DMI_SERCS_SERIALCOUNT               0xf0000000U
 /*
  * Select which serial port is accessed by \RdmiSerrx and \RdmiSertx.
  */
-#define DMI_SERCS_SERIAL_OFFSET             24
+#define DMI_SERCS_SERIAL_OFFSET             0x18
 #define DMI_SERCS_SERIAL_LENGTH             3
-#define DMI_SERCS_SERIAL                    (0x7U << DMI_SERCS_SERIAL_OFFSET)
-#define DMI_SERCS_ERROR7_OFFSET             23
+#define DMI_SERCS_SERIAL                    0x7000000
+#define DMI_SERCS_ERROR7_OFFSET             0x17
 #define DMI_SERCS_ERROR7_LENGTH             1
-#define DMI_SERCS_ERROR7                    (0x1U << DMI_SERCS_ERROR7_OFFSET)
-#define DMI_SERCS_VALID7_OFFSET             22
+#define DMI_SERCS_ERROR7                    0x800000
+#define DMI_SERCS_VALID7_OFFSET             0x16
 #define DMI_SERCS_VALID7_LENGTH             1
-#define DMI_SERCS_VALID7                    (0x1U << DMI_SERCS_VALID7_OFFSET)
-#define DMI_SERCS_FULL7_OFFSET              21
+#define DMI_SERCS_VALID7                    0x400000
+#define DMI_SERCS_FULL7_OFFSET              0x15
 #define DMI_SERCS_FULL7_LENGTH              1
-#define DMI_SERCS_FULL7                     (0x1U << DMI_SERCS_FULL7_OFFSET)
-#define DMI_SERCS_ERROR6_OFFSET             20
+#define DMI_SERCS_FULL7                     0x200000
+#define DMI_SERCS_ERROR6_OFFSET             0x14
 #define DMI_SERCS_ERROR6_LENGTH             1
-#define DMI_SERCS_ERROR6                    (0x1U << DMI_SERCS_ERROR6_OFFSET)
-#define DMI_SERCS_VALID6_OFFSET             19
+#define DMI_SERCS_ERROR6                    0x100000
+#define DMI_SERCS_VALID6_OFFSET             0x13
 #define DMI_SERCS_VALID6_LENGTH             1
-#define DMI_SERCS_VALID6                    (0x1U << DMI_SERCS_VALID6_OFFSET)
-#define DMI_SERCS_FULL6_OFFSET              18
+#define DMI_SERCS_VALID6                    0x80000
+#define DMI_SERCS_FULL6_OFFSET              0x12
 #define DMI_SERCS_FULL6_LENGTH              1
-#define DMI_SERCS_FULL6                     (0x1U << DMI_SERCS_FULL6_OFFSET)
-#define DMI_SERCS_ERROR5_OFFSET             17
+#define DMI_SERCS_FULL6                     0x40000
+#define DMI_SERCS_ERROR5_OFFSET             0x11
 #define DMI_SERCS_ERROR5_LENGTH             1
-#define DMI_SERCS_ERROR5                    (0x1U << DMI_SERCS_ERROR5_OFFSET)
-#define DMI_SERCS_VALID5_OFFSET             16
+#define DMI_SERCS_ERROR5                    0x20000
+#define DMI_SERCS_VALID5_OFFSET             0x10
 #define DMI_SERCS_VALID5_LENGTH             1
-#define DMI_SERCS_VALID5                    (0x1U << DMI_SERCS_VALID5_OFFSET)
-#define DMI_SERCS_FULL5_OFFSET              15
+#define DMI_SERCS_VALID5                    0x10000
+#define DMI_SERCS_FULL5_OFFSET              0xf
 #define DMI_SERCS_FULL5_LENGTH              1
-#define DMI_SERCS_FULL5                     (0x1U << DMI_SERCS_FULL5_OFFSET)
-#define DMI_SERCS_ERROR4_OFFSET             14
+#define DMI_SERCS_FULL5                     0x8000
+#define DMI_SERCS_ERROR4_OFFSET             0xe
 #define DMI_SERCS_ERROR4_LENGTH             1
-#define DMI_SERCS_ERROR4                    (0x1U << DMI_SERCS_ERROR4_OFFSET)
-#define DMI_SERCS_VALID4_OFFSET             13
+#define DMI_SERCS_ERROR4                    0x4000
+#define DMI_SERCS_VALID4_OFFSET             0xd
 #define DMI_SERCS_VALID4_LENGTH             1
-#define DMI_SERCS_VALID4                    (0x1U << DMI_SERCS_VALID4_OFFSET)
-#define DMI_SERCS_FULL4_OFFSET              12
+#define DMI_SERCS_VALID4                    0x2000
+#define DMI_SERCS_FULL4_OFFSET              0xc
 #define DMI_SERCS_FULL4_LENGTH              1
-#define DMI_SERCS_FULL4                     (0x1U << DMI_SERCS_FULL4_OFFSET)
-#define DMI_SERCS_ERROR3_OFFSET             11
+#define DMI_SERCS_FULL4                     0x1000
+#define DMI_SERCS_ERROR3_OFFSET             0xb
 #define DMI_SERCS_ERROR3_LENGTH             1
-#define DMI_SERCS_ERROR3                    (0x1U << DMI_SERCS_ERROR3_OFFSET)
-#define DMI_SERCS_VALID3_OFFSET             10
+#define DMI_SERCS_ERROR3                    0x800
+#define DMI_SERCS_VALID3_OFFSET             0xa
 #define DMI_SERCS_VALID3_LENGTH             1
-#define DMI_SERCS_VALID3                    (0x1U << DMI_SERCS_VALID3_OFFSET)
-#define DMI_SERCS_FULL3_OFFSET              9
+#define DMI_SERCS_VALID3                    0x400
+#define DMI_SERCS_FULL3_OFFSET              0x9
 #define DMI_SERCS_FULL3_LENGTH              1
-#define DMI_SERCS_FULL3                     (0x1U << DMI_SERCS_FULL3_OFFSET)
-#define DMI_SERCS_ERROR2_OFFSET             8
+#define DMI_SERCS_FULL3                     0x200
+#define DMI_SERCS_ERROR2_OFFSET             0x8
 #define DMI_SERCS_ERROR2_LENGTH             1
-#define DMI_SERCS_ERROR2                    (0x1U << DMI_SERCS_ERROR2_OFFSET)
+#define DMI_SERCS_ERROR2                    0x100
 #define DMI_SERCS_VALID2_OFFSET             7
 #define DMI_SERCS_VALID2_LENGTH             1
-#define DMI_SERCS_VALID2                    (0x1U << DMI_SERCS_VALID2_OFFSET)
+#define DMI_SERCS_VALID2                    0x80
 #define DMI_SERCS_FULL2_OFFSET              6
 #define DMI_SERCS_FULL2_LENGTH              1
-#define DMI_SERCS_FULL2                     (0x1U << DMI_SERCS_FULL2_OFFSET)
+#define DMI_SERCS_FULL2                     0x40
 #define DMI_SERCS_ERROR1_OFFSET             5
 #define DMI_SERCS_ERROR1_LENGTH             1
-#define DMI_SERCS_ERROR1                    (0x1U << DMI_SERCS_ERROR1_OFFSET)
+#define DMI_SERCS_ERROR1                    0x20
 #define DMI_SERCS_VALID1_OFFSET             4
 #define DMI_SERCS_VALID1_LENGTH             1
-#define DMI_SERCS_VALID1                    (0x1U << DMI_SERCS_VALID1_OFFSET)
+#define DMI_SERCS_VALID1                    0x10
 #define DMI_SERCS_FULL1_OFFSET              3
 #define DMI_SERCS_FULL1_LENGTH              1
-#define DMI_SERCS_FULL1                     (0x1U << DMI_SERCS_FULL1_OFFSET)
+#define DMI_SERCS_FULL1                     0x8
 /*
  * 1 when the debugger-to-core queue for serial port 0 has
  * over or underflowed. This bit will remain set until it is reset by
@@ -2530,24 +2508,24 @@
  */
 #define DMI_SERCS_ERROR0_OFFSET             2
 #define DMI_SERCS_ERROR0_LENGTH             1
-#define DMI_SERCS_ERROR0                    (0x1U << DMI_SERCS_ERROR0_OFFSET)
+#define DMI_SERCS_ERROR0                    4
 /*
  * 1 when the core-to-debugger queue for serial port 0 is not empty.
  */
 #define DMI_SERCS_VALID0_OFFSET             1
 #define DMI_SERCS_VALID0_LENGTH             1
-#define DMI_SERCS_VALID0                    (0x1U << DMI_SERCS_VALID0_OFFSET)
+#define DMI_SERCS_VALID0                    2
 /*
  * 1 when the debugger-to-core queue for serial port 0 is full.
  */
 #define DMI_SERCS_FULL0_OFFSET              0
 #define DMI_SERCS_FULL0_LENGTH              1
-#define DMI_SERCS_FULL0                     (0x1U << DMI_SERCS_FULL0_OFFSET)
+#define DMI_SERCS_FULL0                     1
 #define DMI_SERTX                           0x35
 #define DMI_SERTX_DATA_OFFSET               0
-#define DMI_SERTX_DATA_LENGTH               32
-#define DMI_SERTX_DATA                      (0xffffffffU << DMI_SERTX_DATA_OFFSET)
+#define DMI_SERTX_DATA_LENGTH               0x20
+#define DMI_SERTX_DATA                      0xffffffffU
 #define DMI_SERRX                           0x36
 #define DMI_SERRX_DATA_OFFSET               0
-#define DMI_SERRX_DATA_LENGTH               32
-#define DMI_SERRX_DATA                      (0xffffffffU << DMI_SERRX_DATA_OFFSET)
+#define DMI_SERRX_DATA_LENGTH               0x20
+#define DMI_SERRX_DATA                      0xffffffffU
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 484db7485..da1ef6556 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -710,7 +710,7 @@ static int add_trigger(struct target *target, struct trigger *trigger)
 		int result = riscv_get_register(target, &tdata1, GDB_REGNO_TDATA1);
 		if (result != ERROR_OK)
 			return result;
-		int type = get_field(tdata1, MCONTROL_TYPE(riscv_xlen(target)));
+		int type = get_field(tdata1, CSR_MCONTROL_TYPE(riscv_xlen(target)));
 
 		result = ERROR_OK;
 		switch (type) {
@@ -3929,7 +3929,7 @@ int riscv_enumerate_triggers(struct target *target)
 		if (result != ERROR_OK)
 			return result;
 
-		int type = get_field(tdata1, MCONTROL_TYPE(riscv_xlen(target)));
+		int type = get_field(tdata1, CSR_MCONTROL_TYPE(riscv_xlen(target)));
 		if (type == 0)
 			break;
 		switch (type) {