[Lldb-commits] [lldb] [lldb] Remove broken comments originally written as table headers (NFC) (PR #116089)

via lldb-commits lldb-commits at lists.llvm.org
Wed Nov 13 10:34:04 PST 2024


github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 95b680e4c353d479fbfb96adb39696042c005e99 ae7f7d7e2167743f68118d1342cdb907ad478a95 --extensions cpp,h -- lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h lldb/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
index 6aadf652da..ea5d0bbd72 100644
--- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
@@ -36,1254 +36,1358 @@ using namespace lldb;
 using namespace lldb_private;
 
 static const RegisterInfo g_register_infos[] = {
-    {"r0",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r1",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r2",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r3",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r4",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r5",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r6",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r7",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"sp",
-     "r13",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"lr",
-     "r14",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"pc",
-     "r15",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"cpsr",
-     "psr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s0",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s1",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s2",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s3",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s4",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s5",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s6",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s7",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s8",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s9",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s10",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s11",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s12",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s13",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s14",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s15",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s16",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s17",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s18",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s19",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s20",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s21",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s22",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s23",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s24",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s25",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s26",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s27",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s28",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s29",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s30",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s31",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"fpscr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d0",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d1",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d2",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d3",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d4",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d5",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d6",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d7",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d8",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d9",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d10",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d11",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d12",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d13",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d14",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d15",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d16",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d17",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d18",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d19",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d20",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d21",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d22",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d23",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d24",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d25",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d26",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d27",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d28",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d29",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d30",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d31",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r8_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r9_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r10_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r11_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r12_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_usr",
-     "sp_usr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_usr",
-     "lr_usr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r8_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r9_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r10_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r11_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r12_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_fiq",
-     "sp_fiq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_fiq",
-     "lr_fiq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_irq",
-     "sp_irq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_irq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_irq",
-     "lr_irq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_irq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_abt",
-     "sp_abt",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_abt, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_abt",
-     "lr_abt",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_abt, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_und",
-     "sp_und",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_und, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_und",
-     "lr_und",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_und, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_svc",
-     "sp_svc",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_svc, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_svc",
-     "lr_svc",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_svc, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-     }};
+    {
+        "r0",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r1",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r2",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r3",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r4",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r5",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r6",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r7",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "sp",
+        "r13",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "lr",
+        "r14",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "pc",
+        "r15",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "cpsr",
+        "psr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s0",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s1",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s2",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s3",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s4",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s5",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s6",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s7",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s8",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s9",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s10",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s11",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s12",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s13",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s14",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s15",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s16",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s17",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s18",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s19",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s20",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s21",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s22",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s23",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s24",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s25",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s26",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s27",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s28",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s29",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s30",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s31",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "fpscr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d0",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d1",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d2",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d3",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d4",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d5",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d6",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d7",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d8",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d9",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d10",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d11",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d12",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d13",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d14",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d15",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d16",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d17",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d18",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d19",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d20",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d21",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d22",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d23",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d24",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d25",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d26",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d27",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d28",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d29",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d30",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d31",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r8_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r9_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r10_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r11_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r12_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_usr",
+        "sp_usr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_usr",
+        "lr_usr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r8_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r9_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r10_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r11_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r12_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_fiq",
+        "sp_fiq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_fiq",
+        "lr_fiq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_irq",
+        "sp_irq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_irq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_irq",
+        "lr_irq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_irq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_abt",
+        "sp_abt",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_abt, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_abt",
+        "lr_abt",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_abt, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_und",
+        "sp_und",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_und, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_und",
+        "lr_und",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_und, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_svc",
+        "sp_svc",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_svc, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_svc",
+        "lr_svc",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_svc, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    }};
 
 static const uint32_t k_num_register_infos = std::size(g_register_infos);
 
diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
index d67591ffa1..9e4aaef14c 100644
--- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
@@ -38,1255 +38,1359 @@ using namespace lldb_private;
 LLDB_PLUGIN_DEFINE(ABISysV_arm)
 
 static const RegisterInfo g_register_infos[] = {
-    {"r0",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r1",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r2",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r3",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r4",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r5",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r6",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r7",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"sp",
-     "r13",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"lr",
-     "r14",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"pc",
-     "r15",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"cpsr",
-     "psr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s0",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s1",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s2",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s3",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s4",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s5",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s6",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s7",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s8",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s9",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s10",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s11",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s12",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s13",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s14",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s15",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s16",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s17",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s18",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s19",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s20",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s21",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s22",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s23",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s24",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s25",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s26",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s27",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s28",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s29",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s30",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"s31",
-     nullptr,
-     4,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"fpscr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d0",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d1",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d2",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d3",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d4",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d5",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d6",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d7",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d8",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d9",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d10",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d11",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d12",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d13",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d14",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d15",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d16",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d17",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d18",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d19",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d20",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d21",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d22",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d23",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d24",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d25",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d26",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d27",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d28",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d29",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d30",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"d31",
-     nullptr,
-     8,
-     0,
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r8_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r9_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r10_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r11_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12_usr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r12_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_usr",
-     "sp_usr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_usr",
-     "lr_usr",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_usr, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r8_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r8_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r9_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r9_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r10_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r10_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r11_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r11_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r12_fiq",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r12_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_fiq",
-     "sp_fiq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_fiq",
-     "lr_fiq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_fiq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_irq",
-     "sp_irq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_irq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_irq",
-     "lr_irq",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_irq, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_abt",
-     "sp_abt",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_abt, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_abt",
-     "lr_abt",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_abt, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r13_und",
-     "sp_und",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_und, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_und",
-     "lr_und",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_und, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-
-    },
-    {"r13_svc",
-     "sp_svc",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r13_svc, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-    },
-    {"r14_svc",
-     "lr_svc",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, dwarf_r14_svc, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
-     }};
+    {
+        "r0",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r1",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r2",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r3",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r4",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r5",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r6",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r7",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "sp",
+        "r13",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "lr",
+        "r14",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "pc",
+        "r15",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "cpsr",
+        "psr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s0",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s1",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s2",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s3",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s4",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s5",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s6",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s7",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s8",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s9",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s10",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s11",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s12",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s13",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s14",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s15",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s16",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s17",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s18",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s19",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s20",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s21",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s22",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s23",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s24",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s25",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s26",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s27",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s28",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s29",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s30",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "s31",
+        nullptr,
+        4,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "fpscr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d0",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d1",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d2",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d3",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d4",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d5",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d6",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d7",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d8",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d9",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d10",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d11",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d12",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d13",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d14",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d15",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d16",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d17",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d18",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d19",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d20",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d21",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d22",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d23",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d24",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d25",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d26",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d27",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d28",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d29",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d30",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "d31",
+        nullptr,
+        8,
+        0,
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r8_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r9_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r10_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r11_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12_usr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r12_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_usr",
+        "sp_usr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_usr",
+        "lr_usr",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_usr, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r8_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r8_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r9_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r9_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r10_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r10_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r11_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r11_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r12_fiq",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r12_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_fiq",
+        "sp_fiq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_fiq",
+        "lr_fiq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_fiq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_irq",
+        "sp_irq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_irq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_irq",
+        "lr_irq",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_irq, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_abt",
+        "sp_abt",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_abt, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_abt",
+        "lr_abt",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_abt, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r13_und",
+        "sp_und",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_und, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_und",
+        "lr_und",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_und, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+
+    },
+    {
+        "r13_svc",
+        "sp_svc",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r13_svc, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    },
+    {
+        "r14_svc",
+        "lr_svc",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, dwarf_r14_svc, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
+    }};
 
 static const uint32_t k_num_register_infos = std::size(g_register_infos);
 
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
index 9c7312b975..7d09e04c9e 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
@@ -78,461 +78,499 @@ enum dwarf_regnums {
 };
 
 static const RegisterInfo g_register_infos[] = {
-    {"r0",
-     "zero",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r0",
+        "zero",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r1",
-     "AT",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r1",
+        "AT",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r2",
-     "v0",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r2",
+        "v0",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r3",
-     "v1",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r3",
+        "v1",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r4",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r4",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r5",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r5",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r6",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r6",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r7",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r7",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r8",
-     "arg5",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r8",
+        "arg5",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r9",
-     "arg6",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r9",
+        "arg6",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r10",
-     "arg7",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r10",
+        "arg7",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r11",
-     "arg8",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r11",
+        "arg8",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r12",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r12",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r13",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r13, dwarf_r13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r13",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r13, dwarf_r13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r14",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r14, dwarf_r14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r14",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r14, dwarf_r14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r15",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r15, dwarf_r15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r15",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r15, dwarf_r15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r16",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r16, dwarf_r16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r16",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r16, dwarf_r16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r17",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r17, dwarf_r17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r17",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r17, dwarf_r17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r18",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r18, dwarf_r18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r18",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r18, dwarf_r18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r19",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r19, dwarf_r19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r19",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r19, dwarf_r19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r20",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r20, dwarf_r20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r20",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r20, dwarf_r20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r21",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r21, dwarf_r21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r21",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r21, dwarf_r21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r22",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r22, dwarf_r22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r22",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r22, dwarf_r22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r23",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r23, dwarf_r23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r23",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r23, dwarf_r23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r24",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r24, dwarf_r24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r24",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r24, dwarf_r24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r25",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r25, dwarf_r25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r25",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r25, dwarf_r25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r26",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r26, dwarf_r26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r26",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r26, dwarf_r26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r27",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r27, dwarf_r27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r27",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r27, dwarf_r27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r28",
-     "gp",
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r28, dwarf_r28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r28",
+        "gp",
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r28, dwarf_r28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r29",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r29, dwarf_r29, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r29",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r29, dwarf_r29, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r30",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r30, dwarf_r30, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r30",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r30, dwarf_r30, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r31",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r31, dwarf_r31, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r31",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r31, dwarf_r31, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"sr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_sr, dwarf_sr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "sr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_sr, dwarf_sr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"lo",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_lo, dwarf_lo, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "lo",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_lo, dwarf_lo, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"hi",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_hi, dwarf_hi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "hi",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_hi, dwarf_hi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"bad",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_bad, dwarf_bad, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "bad",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_bad, dwarf_bad, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"cause",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_cause, dwarf_cause, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "cause",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_cause, dwarf_cause, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"pc",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "pc",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 };
 
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
index 4cc37dd7ac..e77f1b733a 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
@@ -78,462 +78,500 @@ enum dwarf_regnums {
 };
 
 static const RegisterInfo g_register_infos_mips64[] = {
-    {"r0",
-     "zero",
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r0",
+        "zero",
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r1",
-     "AT",
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r1",
+        "AT",
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
 
     },
-    {"r2",
-     "v0",
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r2",
+        "v0",
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r3",
-     "v1",
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r3",
+        "v1",
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r4",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r4",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r5",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r5",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r6",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r6",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r7",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r7",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r8",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r8, dwarf_r8, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r8",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r8, dwarf_r8, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r9",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r9, dwarf_r9, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r9",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r9, dwarf_r9, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r10",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r10, dwarf_r10, LLDB_REGNUM_GENERIC_ARG7, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r10",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r10, dwarf_r10, LLDB_REGNUM_GENERIC_ARG7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r11",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r11, dwarf_r11, LLDB_REGNUM_GENERIC_ARG8, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r11",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r11, dwarf_r11, LLDB_REGNUM_GENERIC_ARG8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r12",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r12",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r13",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r13, dwarf_r13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r13",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r13, dwarf_r13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r14",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r14, dwarf_r14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r14",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r14, dwarf_r14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r15",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r15, dwarf_r15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r15",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r15, dwarf_r15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r16",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r16, dwarf_r16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r16",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r16, dwarf_r16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r17",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r17, dwarf_r17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r17",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r17, dwarf_r17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r18",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r18, dwarf_r18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r18",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r18, dwarf_r18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r19",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r19, dwarf_r19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r19",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r19, dwarf_r19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r20",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r20, dwarf_r20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r20",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r20, dwarf_r20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r21",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r21, dwarf_r21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r21",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r21, dwarf_r21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r22",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r22, dwarf_r22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r22",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r22, dwarf_r22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r23",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r23, dwarf_r23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r23",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r23, dwarf_r23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r24",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r24, dwarf_r24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r24",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r24, dwarf_r24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r25",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r25, dwarf_r25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r25",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r25, dwarf_r25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r26",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r26, dwarf_r26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r26",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r26, dwarf_r26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r27",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r27, dwarf_r27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r27",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r27, dwarf_r27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r28",
-     "gp",
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r28, dwarf_r28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r28",
+        "gp",
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r28, dwarf_r28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r29",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r29, dwarf_r29, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r29",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r29, dwarf_r29, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r30",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r30, dwarf_r30, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r30",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r30, dwarf_r30, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r31",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_r31, dwarf_r31, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r31",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_r31, dwarf_r31, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"sr",
-     nullptr,
-     4,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_sr, dwarf_sr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "sr",
+        nullptr,
+        4,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_sr, dwarf_sr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"lo",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_lo, dwarf_lo, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "lo",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_lo, dwarf_lo, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"hi",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_hi, dwarf_hi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "hi",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_hi, dwarf_hi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"bad",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_bad, dwarf_bad, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "bad",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_bad, dwarf_bad, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"cause",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_cause, dwarf_cause, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "cause",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_cause, dwarf_cause, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"pc",
-     nullptr,
-     8,
-     0,
-     eEncodingUint,
-     eFormatHex,
-     {dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "pc",
+        nullptr,
+        8,
+        0,
+        eEncodingUint,
+        eFormatHex,
+        {dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 };
 
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
index 094b46bf86..f1f7933d71 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
@@ -184,634 +184,696 @@ enum {
    sizeof(RegisterContextDarwin_arm::EXC))
 
 static RegisterInfo g_register_infos[] = {
-    {"r0",
-     nullptr,
-     4,
-     GPR_OFFSET(0),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r0},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r0",
+        nullptr,
+        4,
+        GPR_OFFSET(0),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r0},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r1",
-     nullptr,
-     4,
-     GPR_OFFSET(1),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r1},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r1",
+        nullptr,
+        4,
+        GPR_OFFSET(1),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r1},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r2",
-     nullptr,
-     4,
-     GPR_OFFSET(2),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r2},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r2",
+        nullptr,
+        4,
+        GPR_OFFSET(2),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r2},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r3",
-     nullptr,
-     4,
-     GPR_OFFSET(3),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r3},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r3",
+        nullptr,
+        4,
+        GPR_OFFSET(3),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r3},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r4",
-     nullptr,
-     4,
-     GPR_OFFSET(4),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r4},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r4",
+        nullptr,
+        4,
+        GPR_OFFSET(4),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r4},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r5",
-     nullptr,
-     4,
-     GPR_OFFSET(5),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r5},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r5",
+        nullptr,
+        4,
+        GPR_OFFSET(5),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r5},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r6",
-     nullptr,
-     4,
-     GPR_OFFSET(6),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r6},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r6",
+        nullptr,
+        4,
+        GPR_OFFSET(6),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r6},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r7",
-     nullptr,
-     4,
-     GPR_OFFSET(7),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      gpr_r7},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r7",
+        nullptr,
+        4,
+        GPR_OFFSET(7),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         gpr_r7},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r8",
-     nullptr,
-     4,
-     GPR_OFFSET(8),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r8},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r8",
+        nullptr,
+        4,
+        GPR_OFFSET(8),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r8},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r9",
-     nullptr,
-     4,
-     GPR_OFFSET(9),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r9},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r9",
+        nullptr,
+        4,
+        GPR_OFFSET(9),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r9},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r10",
-     nullptr,
-     4,
-     GPR_OFFSET(10),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_r10},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r10",
+        nullptr,
+        4,
+        GPR_OFFSET(10),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r10},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r11",
-     nullptr,
-     4,
-     GPR_OFFSET(11),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_r11},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r11",
+        nullptr,
+        4,
+        GPR_OFFSET(11),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r11},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"r12",
-     nullptr,
-     4,
-     GPR_OFFSET(12),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_r12},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "r12",
+        nullptr,
+        4,
+        GPR_OFFSET(12),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_r12},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"sp",
-     "r13",
-     4,
-     GPR_OFFSET(13),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      gpr_sp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "sp",
+        "r13",
+        4,
+        GPR_OFFSET(13),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         gpr_sp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"lr",
-     "r14",
-     4,
-     GPR_OFFSET(14),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
-      gpr_lr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "lr",
+        "r14",
+        4,
+        GPR_OFFSET(14),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM,
+         gpr_lr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"pc",
-     "r15",
-     4,
-     GPR_OFFSET(15),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      gpr_pc},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "pc",
+        "r15",
+        4,
+        GPR_OFFSET(15),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         gpr_pc},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"cpsr",
-     "psr",
-     4,
-     GPR_OFFSET(16),
-     eEncodingUint,
-     eFormatHex,
-     {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM,
-      gpr_cpsr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "cpsr",
+        "psr",
+        4,
+        GPR_OFFSET(16),
+        eEncodingUint,
+        eFormatHex,
+        {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, gpr_cpsr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 
-    {"s0",
-     nullptr,
-     4,
-     FPU_OFFSET(0),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s0},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s0",
+        nullptr,
+        4,
+        FPU_OFFSET(0),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s0},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s1",
-     nullptr,
-     4,
-     FPU_OFFSET(1),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s1},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s1",
+        nullptr,
+        4,
+        FPU_OFFSET(1),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s1},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s2",
-     nullptr,
-     4,
-     FPU_OFFSET(2),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s2},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s2",
+        nullptr,
+        4,
+        FPU_OFFSET(2),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s2},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s3",
-     nullptr,
-     4,
-     FPU_OFFSET(3),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s3},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s3",
+        nullptr,
+        4,
+        FPU_OFFSET(3),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s3},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s4",
-     nullptr,
-     4,
-     FPU_OFFSET(4),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s4},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s4",
+        nullptr,
+        4,
+        FPU_OFFSET(4),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s4},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s5",
-     nullptr,
-     4,
-     FPU_OFFSET(5),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s5},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s5",
+        nullptr,
+        4,
+        FPU_OFFSET(5),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s5},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s6",
-     nullptr,
-     4,
-     FPU_OFFSET(6),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s6},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s6",
+        nullptr,
+        4,
+        FPU_OFFSET(6),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s6},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s7",
-     nullptr,
-     4,
-     FPU_OFFSET(7),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s7},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s7",
+        nullptr,
+        4,
+        FPU_OFFSET(7),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s7},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s8",
-     nullptr,
-     4,
-     FPU_OFFSET(8),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s8},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s8",
+        nullptr,
+        4,
+        FPU_OFFSET(8),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s8},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s9",
-     nullptr,
-     4,
-     FPU_OFFSET(9),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s9},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s9",
+        nullptr,
+        4,
+        FPU_OFFSET(9),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s9},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s10",
-     nullptr,
-     4,
-     FPU_OFFSET(10),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s10},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s10",
+        nullptr,
+        4,
+        FPU_OFFSET(10),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s10},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s11",
-     nullptr,
-     4,
-     FPU_OFFSET(11),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s11},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s11",
+        nullptr,
+        4,
+        FPU_OFFSET(11),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s11},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s12",
-     nullptr,
-     4,
-     FPU_OFFSET(12),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s12},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s12",
+        nullptr,
+        4,
+        FPU_OFFSET(12),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s12},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s13",
-     nullptr,
-     4,
-     FPU_OFFSET(13),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s13},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s13",
+        nullptr,
+        4,
+        FPU_OFFSET(13),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s13},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s14",
-     nullptr,
-     4,
-     FPU_OFFSET(14),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s14},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s14",
+        nullptr,
+        4,
+        FPU_OFFSET(14),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s14},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s15",
-     nullptr,
-     4,
-     FPU_OFFSET(15),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s15},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s15",
+        nullptr,
+        4,
+        FPU_OFFSET(15),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s15},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s16",
-     nullptr,
-     4,
-     FPU_OFFSET(16),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s16},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s16",
+        nullptr,
+        4,
+        FPU_OFFSET(16),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s16},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s17",
-     nullptr,
-     4,
-     FPU_OFFSET(17),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s17},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s17",
+        nullptr,
+        4,
+        FPU_OFFSET(17),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s17},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s18",
-     nullptr,
-     4,
-     FPU_OFFSET(18),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s18},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s18",
+        nullptr,
+        4,
+        FPU_OFFSET(18),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s18},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s19",
-     nullptr,
-     4,
-     FPU_OFFSET(19),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s19},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s19",
+        nullptr,
+        4,
+        FPU_OFFSET(19),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s19},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s20",
-     nullptr,
-     4,
-     FPU_OFFSET(20),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s20},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s20",
+        nullptr,
+        4,
+        FPU_OFFSET(20),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s20},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s21",
-     nullptr,
-     4,
-     FPU_OFFSET(21),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s21},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s21",
+        nullptr,
+        4,
+        FPU_OFFSET(21),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s21},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s22",
-     nullptr,
-     4,
-     FPU_OFFSET(22),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s22},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s22",
+        nullptr,
+        4,
+        FPU_OFFSET(22),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s22},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s23",
-     nullptr,
-     4,
-     FPU_OFFSET(23),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s23},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s23",
+        nullptr,
+        4,
+        FPU_OFFSET(23),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s23},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s24",
-     nullptr,
-     4,
-     FPU_OFFSET(24),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s24},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s24",
+        nullptr,
+        4,
+        FPU_OFFSET(24),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s24},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s25",
-     nullptr,
-     4,
-     FPU_OFFSET(25),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s25},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s25",
+        nullptr,
+        4,
+        FPU_OFFSET(25),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s25},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s26",
-     nullptr,
-     4,
-     FPU_OFFSET(26),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s26},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s26",
+        nullptr,
+        4,
+        FPU_OFFSET(26),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s26},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s27",
-     nullptr,
-     4,
-     FPU_OFFSET(27),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s27},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s27",
+        nullptr,
+        4,
+        FPU_OFFSET(27),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s27},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s28",
-     nullptr,
-     4,
-     FPU_OFFSET(28),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s28},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s28",
+        nullptr,
+        4,
+        FPU_OFFSET(28),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s28},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s29",
-     nullptr,
-     4,
-     FPU_OFFSET(29),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s29},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s29",
+        nullptr,
+        4,
+        FPU_OFFSET(29),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s29},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s30",
-     nullptr,
-     4,
-     FPU_OFFSET(30),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s30},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s30",
+        nullptr,
+        4,
+        FPU_OFFSET(30),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s30},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"s31",
-     nullptr,
-     4,
-     FPU_OFFSET(31),
-     eEncodingIEEE754,
-     eFormatFloat,
-     {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      fpu_s31},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "s31",
+        nullptr,
+        4,
+        FPU_OFFSET(31),
+        eEncodingIEEE754,
+        eFormatFloat,
+        {LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_s31},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"fpscr",
-     nullptr,
-     4,
-     FPU_OFFSET(32),
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fpscr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "fpscr",
+        nullptr,
+        4,
+        FPU_OFFSET(32),
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fpscr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 
-    {"exception",
-     nullptr,
-     4,
-     EXC_OFFSET(0),
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_exception},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "exception",
+        nullptr,
+        4,
+        EXC_OFFSET(0),
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_exception},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"fsr",
-     nullptr,
-     4,
-     EXC_OFFSET(1),
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_fsr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "fsr",
+        nullptr,
+        4,
+        EXC_OFFSET(1),
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_fsr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {"far",
-     nullptr,
-     4,
-     EXC_OFFSET(2),
-     eEncodingUint,
-     eFormatHex,
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_far},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        "far",
+        nullptr,
+        4,
+        EXC_OFFSET(2),
+        eEncodingUint,
+        eFormatHex,
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_far},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 
     {DEFINE_DBG(bvr, 0)},
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
index 174a5a567d..ee340a4f13 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
@@ -165,188 +165,214 @@ enum {
    sizeof(RegisterContextDarwin_i386::EXC))
 
 static RegisterInfo g_register_infos[] = {
-    {DEFINE_GPR(eax, nullptr),
-     {ehframe_eax, dwarf_eax, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_eax},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(eax, nullptr),
+        {ehframe_eax, dwarf_eax, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_eax},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ebx, nullptr),
-     {ehframe_ebx, dwarf_ebx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_ebx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ebx, nullptr),
+        {ehframe_ebx, dwarf_ebx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_ebx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ecx, nullptr),
-     {ehframe_ecx, dwarf_ecx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_ecx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ecx, nullptr),
+        {ehframe_ecx, dwarf_ecx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_ecx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(edx, nullptr),
-     {ehframe_edx, dwarf_edx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_edx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(edx, nullptr),
+        {ehframe_edx, dwarf_edx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_edx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(edi, nullptr),
-     {ehframe_edi, dwarf_edi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_edi},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(edi, nullptr),
+        {ehframe_edi, dwarf_edi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_edi},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(esi, nullptr),
-     {ehframe_esi, dwarf_esi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      gpr_esi},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(esi, nullptr),
+        {ehframe_esi, dwarf_esi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         gpr_esi},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ebp, "fp"),
-     {ehframe_ebp, dwarf_ebp, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
-      gpr_ebp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ebp, "fp"),
+        {ehframe_ebp, dwarf_ebp, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
+         gpr_ebp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(esp, "sp"),
-     {ehframe_esp, dwarf_esp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
-      gpr_esp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(esp, "sp"),
+        {ehframe_esp, dwarf_esp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
+         gpr_esp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ss, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_ss},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ss, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_ss},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(eflags, "flags"),
-     {ehframe_eflags, dwarf_eflags, LLDB_REGNUM_GENERIC_FLAGS,
-      LLDB_INVALID_REGNUM, gpr_eflags},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(eflags, "flags"),
+        {ehframe_eflags, dwarf_eflags, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, gpr_eflags},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(eip, "pc"),
-     {ehframe_eip, dwarf_eip, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
-      gpr_eip},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(eip, "pc"),
+        {ehframe_eip, dwarf_eip, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
+         gpr_eip},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(cs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_cs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(cs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_cs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ds, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_ds},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ds, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_ds},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(es, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_es},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(es, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_es},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(fs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_fs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(fs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_fs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(gs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_gs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(gs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_gs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 
-    {DEFINE_FPU_UINT(fcw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fcw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fcw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fcw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(fsw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fsw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fsw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fsw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ftw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ftw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ftw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ftw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(fop),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fop},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fop),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fop},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ip),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ip},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ip),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ip},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(cs),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_cs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(cs),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_cs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(dp),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_dp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(dp),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_dp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ds),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ds},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ds),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ds},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(mxcsr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_mxcsr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(mxcsr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_mxcsr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(mxcsrmask),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_mxcsrmask},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(mxcsrmask),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_mxcsrmask},
+        nullptr,
+        nullptr,
+        nullptr,
     },
     {DEFINE_FPU_VECT(stmm, 0)},
     {DEFINE_FPU_VECT(stmm, 1)},
@@ -365,27 +391,30 @@ static RegisterInfo g_register_infos[] = {
     {DEFINE_FPU_VECT(xmm, 6)},
     {DEFINE_FPU_VECT(xmm, 7)},
 
-    {DEFINE_EXC(trapno),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_trapno},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_EXC(trapno),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_trapno},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_EXC(err),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_err},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_EXC(err),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_err},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_EXC(faultvaddr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_faultvaddr},
-     nullptr,
-     nullptr,
-     nullptr,
-     }};
+    {
+        DEFINE_EXC(faultvaddr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_faultvaddr},
+        nullptr,
+        nullptr,
+        nullptr,
+    }};
 
 static size_t k_num_register_infos = std::size(g_register_infos);
 
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
index 8e16d2e7fb..fafdd86a1c 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
@@ -184,223 +184,254 @@ enum ehframe_dwarf_regnums {
 
 // General purpose registers for 64 bit
 static RegisterInfo g_register_infos[] = {
-    {DEFINE_GPR(rax, nullptr),
-     {ehframe_dwarf_gpr_rax, ehframe_dwarf_gpr_rax, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rax},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rax, nullptr),
+        {ehframe_dwarf_gpr_rax, ehframe_dwarf_gpr_rax, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rax},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rbx, nullptr),
-     {ehframe_dwarf_gpr_rbx, ehframe_dwarf_gpr_rbx, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rbx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rbx, nullptr),
+        {ehframe_dwarf_gpr_rbx, ehframe_dwarf_gpr_rbx, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rbx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rcx, nullptr),
-     {ehframe_dwarf_gpr_rcx, ehframe_dwarf_gpr_rcx, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rcx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rcx, nullptr),
+        {ehframe_dwarf_gpr_rcx, ehframe_dwarf_gpr_rcx, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rcx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rdx, nullptr),
-     {ehframe_dwarf_gpr_rdx, ehframe_dwarf_gpr_rdx, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rdx},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rdx, nullptr),
+        {ehframe_dwarf_gpr_rdx, ehframe_dwarf_gpr_rdx, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rdx},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rdi, nullptr),
-     {ehframe_dwarf_gpr_rdi, ehframe_dwarf_gpr_rdi, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rdi},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rdi, nullptr),
+        {ehframe_dwarf_gpr_rdi, ehframe_dwarf_gpr_rdi, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rdi},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rsi, nullptr),
-     {ehframe_dwarf_gpr_rsi, ehframe_dwarf_gpr_rsi, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_rsi},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rsi, nullptr),
+        {ehframe_dwarf_gpr_rsi, ehframe_dwarf_gpr_rsi, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_rsi},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rbp, "fp"),
-     {ehframe_dwarf_gpr_rbp, ehframe_dwarf_gpr_rbp, LLDB_REGNUM_GENERIC_FP,
-      LLDB_INVALID_REGNUM, gpr_rbp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rbp, "fp"),
+        {ehframe_dwarf_gpr_rbp, ehframe_dwarf_gpr_rbp, LLDB_REGNUM_GENERIC_FP,
+         LLDB_INVALID_REGNUM, gpr_rbp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rsp, "sp"),
-     {ehframe_dwarf_gpr_rsp, ehframe_dwarf_gpr_rsp, LLDB_REGNUM_GENERIC_SP,
-      LLDB_INVALID_REGNUM, gpr_rsp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rsp, "sp"),
+        {ehframe_dwarf_gpr_rsp, ehframe_dwarf_gpr_rsp, LLDB_REGNUM_GENERIC_SP,
+         LLDB_INVALID_REGNUM, gpr_rsp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r8, nullptr),
-     {ehframe_dwarf_gpr_r8, ehframe_dwarf_gpr_r8, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r8},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r8, nullptr),
+        {ehframe_dwarf_gpr_r8, ehframe_dwarf_gpr_r8, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r8},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r9, nullptr),
-     {ehframe_dwarf_gpr_r9, ehframe_dwarf_gpr_r9, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r9},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r9, nullptr),
+        {ehframe_dwarf_gpr_r9, ehframe_dwarf_gpr_r9, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r9},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r10, nullptr),
-     {ehframe_dwarf_gpr_r10, ehframe_dwarf_gpr_r10, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r10},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r10, nullptr),
+        {ehframe_dwarf_gpr_r10, ehframe_dwarf_gpr_r10, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r10},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r11, nullptr),
-     {ehframe_dwarf_gpr_r11, ehframe_dwarf_gpr_r11, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r11},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r11, nullptr),
+        {ehframe_dwarf_gpr_r11, ehframe_dwarf_gpr_r11, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r11},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r12, nullptr),
-     {ehframe_dwarf_gpr_r12, ehframe_dwarf_gpr_r12, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r12},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r12, nullptr),
+        {ehframe_dwarf_gpr_r12, ehframe_dwarf_gpr_r12, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r12},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r13, nullptr),
-     {ehframe_dwarf_gpr_r13, ehframe_dwarf_gpr_r13, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r13},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r13, nullptr),
+        {ehframe_dwarf_gpr_r13, ehframe_dwarf_gpr_r13, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r13},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r14, nullptr),
-     {ehframe_dwarf_gpr_r14, ehframe_dwarf_gpr_r14, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r14},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r14, nullptr),
+        {ehframe_dwarf_gpr_r14, ehframe_dwarf_gpr_r14, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r14},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(r15, nullptr),
-     {ehframe_dwarf_gpr_r15, ehframe_dwarf_gpr_r15, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_r15},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(r15, nullptr),
+        {ehframe_dwarf_gpr_r15, ehframe_dwarf_gpr_r15, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_r15},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rip, "pc"),
-     {ehframe_dwarf_gpr_rip, ehframe_dwarf_gpr_rip, LLDB_REGNUM_GENERIC_PC,
-      LLDB_INVALID_REGNUM, gpr_rip},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rip, "pc"),
+        {ehframe_dwarf_gpr_rip, ehframe_dwarf_gpr_rip, LLDB_REGNUM_GENERIC_PC,
+         LLDB_INVALID_REGNUM, gpr_rip},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(rflags, "flags"),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_FLAGS,
-      LLDB_INVALID_REGNUM, gpr_rflags},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(rflags, "flags"),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, gpr_rflags},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(cs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_cs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(cs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_cs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(fs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_fs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(fs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_fs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(gs, nullptr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, gpr_gs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(gs, nullptr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, gpr_gs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 
-    {DEFINE_FPU_UINT(fcw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fcw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fcw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fcw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(fsw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fsw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fsw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fsw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ftw),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ftw},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ftw),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ftw},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(fop),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_fop},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(fop),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_fop},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ip),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ip},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ip),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ip},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(cs),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_cs},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(cs),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_cs},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(dp),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_dp},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(dp),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_dp},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(ds),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_ds},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(ds),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_ds},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(mxcsr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_mxcsr},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(mxcsr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_mxcsr},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_FPU_UINT(mxcsrmask),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, fpu_mxcsrmask},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_FPU_UINT(mxcsrmask),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, fpu_mxcsrmask},
+        nullptr,
+        nullptr,
+        nullptr,
     },
     {DEFINE_FPU_VECT(stmm, 0)},
     {DEFINE_FPU_VECT(stmm, 1)},
@@ -427,27 +458,30 @@ static RegisterInfo g_register_infos[] = {
     {DEFINE_FPU_VECT(xmm, 14)},
     {DEFINE_FPU_VECT(xmm, 15)},
 
-    {DEFINE_EXC(trapno),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_trapno},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_EXC(trapno),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_trapno},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_EXC(err),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_err},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_EXC(err),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_err},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_EXC(faultvaddr),
-     {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, exc_faultvaddr},
-     nullptr,
-     nullptr,
-     nullptr,
-     }};
+    {
+        DEFINE_EXC(faultvaddr),
+        {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, exc_faultvaddr},
+        nullptr,
+        nullptr,
+        nullptr,
+    }};
 
 static size_t k_num_register_infos = std::size(g_register_infos);
 
diff --git a/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp b/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
index 3f4c6494de..9faa9f78c9 100644
--- a/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp
@@ -51,75 +51,85 @@ enum RegisterIndex {
 
 // Array of all register information supported by Windows x86
 RegisterInfo g_register_infos[] = {
-    {DEFINE_GPR(eax, nullptr),
-     {ehframe_eax_i386, dwarf_eax_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_eax_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(eax, nullptr),
+        {ehframe_eax_i386, dwarf_eax_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_eax_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ebx, nullptr),
-     {ehframe_ebx_i386, dwarf_ebx_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_ebx_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ebx, nullptr),
+        {ehframe_ebx_i386, dwarf_ebx_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_ebx_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ecx, nullptr),
-     {ehframe_ecx_i386, dwarf_ecx_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_ecx_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ecx, nullptr),
+        {ehframe_ecx_i386, dwarf_ecx_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_ecx_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(edx, nullptr),
-     {ehframe_edx_i386, dwarf_edx_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_edx_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(edx, nullptr),
+        {ehframe_edx_i386, dwarf_edx_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_edx_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(edi, nullptr),
-     {ehframe_edi_i386, dwarf_edi_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_edi_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(edi, nullptr),
+        {ehframe_edi_i386, dwarf_edi_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_edi_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(esi, nullptr),
-     {ehframe_esi_i386, dwarf_esi_i386, LLDB_INVALID_REGNUM,
-      LLDB_INVALID_REGNUM, lldb_esi_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(esi, nullptr),
+        {ehframe_esi_i386, dwarf_esi_i386, LLDB_INVALID_REGNUM,
+         LLDB_INVALID_REGNUM, lldb_esi_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(ebp, "fp"),
-     {ehframe_ebp_i386, dwarf_ebp_i386, LLDB_REGNUM_GENERIC_FP,
-      LLDB_INVALID_REGNUM, lldb_ebp_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(ebp, "fp"),
+        {ehframe_ebp_i386, dwarf_ebp_i386, LLDB_REGNUM_GENERIC_FP,
+         LLDB_INVALID_REGNUM, lldb_ebp_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(esp, "sp"),
-     {ehframe_esp_i386, dwarf_esp_i386, LLDB_REGNUM_GENERIC_SP,
-      LLDB_INVALID_REGNUM, lldb_esp_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(esp, "sp"),
+        {ehframe_esp_i386, dwarf_esp_i386, LLDB_REGNUM_GENERIC_SP,
+         LLDB_INVALID_REGNUM, lldb_esp_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR(eip, "pc"),
-     {ehframe_eip_i386, dwarf_eip_i386, LLDB_REGNUM_GENERIC_PC,
-      LLDB_INVALID_REGNUM, lldb_eip_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR(eip, "pc"),
+        {ehframe_eip_i386, dwarf_eip_i386, LLDB_REGNUM_GENERIC_PC,
+         LLDB_INVALID_REGNUM, lldb_eip_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
-    {DEFINE_GPR_BIN(eflags, "flags"),
-     {ehframe_eflags_i386, dwarf_eflags_i386, LLDB_REGNUM_GENERIC_FLAGS,
-      LLDB_INVALID_REGNUM, lldb_eflags_i386},
-     nullptr,
-     nullptr,
-     nullptr,
+    {
+        DEFINE_GPR_BIN(eflags, "flags"),
+        {ehframe_eflags_i386, dwarf_eflags_i386, LLDB_REGNUM_GENERIC_FLAGS,
+         LLDB_INVALID_REGNUM, lldb_eflags_i386},
+        nullptr,
+        nullptr,
+        nullptr,
     },
 };
 static size_t k_num_register_infos = std::size(g_register_infos);

``````````

</details>


https://github.com/llvm/llvm-project/pull/116089


More information about the lldb-commits mailing list