[Lldb-commits] [lldb] 00e704b - [lldb] Remove "dwarf dynamic register size expressions" from RegisterInfo
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Wed Oct 6 04:49:14 PDT 2021
Author: Pavel Labath
Date: 2021-10-06T13:22:38+02:00
New Revision: 00e704bf080ffeeb9e334fb3ab71594f9aa50969
URL: https://github.com/llvm/llvm-project/commit/00e704bf080ffeeb9e334fb3ab71594f9aa50969
DIFF: https://github.com/llvm/llvm-project/commit/00e704bf080ffeeb9e334fb3ab71594f9aa50969.diff
LOG: [lldb] Remove "dwarf dynamic register size expressions" from RegisterInfo
These were added to support some mips registers on linux, but linux mips
support has now been removed due.
They are still referenced in the freebds mips implementation, but the
completeness of that implementation is also unknown. All other
architectures just set these fields to zero, which is a cause of
significant bloat in our register info definitions.
Arm also has registers with variable sizes, but they were implemented in
a more gdb-compatible fashion and don't use this feature.
Differential Revision: https://reviews.llvm.org/D110914
Added:
Modified:
lldb/include/lldb/Target/DynamicRegisterInfo.h
lldb/include/lldb/Target/RegisterContext.h
lldb/include/lldb/lldb-private-types.h
lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp
lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp
lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp
lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp
lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp
lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp
lldb/source/Target/DynamicRegisterInfo.cpp
lldb/source/Target/RegisterContext.cpp
lldb/unittests/Target/DynamicRegisterInfoTest.cpp
lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp
Removed:
################################################################################
diff --git a/lldb/include/lldb/Target/DynamicRegisterInfo.h b/lldb/include/lldb/Target/DynamicRegisterInfo.h
index ac8d6a7781c3f..5cbafe000e0b0 100644
--- a/lldb/include/lldb/Target/DynamicRegisterInfo.h
+++ b/lldb/include/lldb/Target/DynamicRegisterInfo.h
@@ -108,7 +108,6 @@ class DynamicRegisterInfo {
name_collection m_set_names;
reg_to_regs_map m_value_regs_map;
reg_to_regs_map m_invalidate_regs_map;
- dynamic_reg_size_map m_dynamic_reg_size_map;
size_t m_reg_data_byte_size = 0u; // The number of bytes required to store
// all registers
bool m_finalized = false;
diff --git a/lldb/include/lldb/Target/RegisterContext.h b/lldb/include/lldb/Target/RegisterContext.h
index c5068feedd5bb..392b462ecf072 100644
--- a/lldb/include/lldb/Target/RegisterContext.h
+++ b/lldb/include/lldb/Target/RegisterContext.h
@@ -31,10 +31,6 @@ class RegisterContext : public std::enable_shared_from_this<RegisterContext>,
virtual const RegisterInfo *GetRegisterInfoAtIndex(size_t reg) = 0;
- // Detect the register size dynamically.
- uint32_t UpdateDynamicRegisterSize(const lldb_private::ArchSpec &arch,
- RegisterInfo *reg_info);
-
virtual size_t GetRegisterSetCount() = 0;
virtual const RegisterSet *GetRegisterSet(size_t reg_set) = 0;
diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h
index 73d618d7069ce..5e71b68630a95 100644
--- a/lldb/include/lldb/lldb-private-types.h
+++ b/lldb/include/lldb/lldb-private-types.h
@@ -58,12 +58,6 @@ struct RegisterInfo {
/// this register changes. For example, the invalidate list for eax would be
/// rax ax, ah, and al.
uint32_t *invalidate_regs;
- /// A DWARF expression that when evaluated gives the byte size of this
- /// register.
- const uint8_t *dynamic_size_dwarf_expr_bytes;
- /// The length of the DWARF expression in bytes in the
- /// dynamic_size_dwarf_expr_bytes member.
- size_t dynamic_size_dwarf_len;
llvm::ArrayRef<uint8_t> data(const uint8_t *context_base) const {
return llvm::ArrayRef<uint8_t>(context_base + byte_offset, byte_size);
diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
index f0b953ad0e8de..93939800cd69c 100644
--- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
@@ -51,8 +51,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
nullptr,
4,
@@ -63,8 +62,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
nullptr,
4,
@@ -75,8 +73,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
nullptr,
4,
@@ -87,8 +84,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
4,
@@ -99,8 +95,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
4,
@@ -111,8 +106,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
4,
@@ -123,8 +117,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
4,
@@ -135,8 +128,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
nullptr,
4,
@@ -147,8 +139,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
nullptr,
4,
@@ -159,8 +150,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
nullptr,
4,
@@ -171,8 +161,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
nullptr,
4,
@@ -183,8 +172,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
4,
@@ -195,8 +183,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"r13",
4,
@@ -207,8 +194,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r14",
4,
@@ -219,8 +205,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"r15",
4,
@@ -231,8 +216,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cpsr",
"psr",
4,
@@ -243,8 +227,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s0",
nullptr,
4,
@@ -255,8 +238,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s1",
nullptr,
4,
@@ -267,8 +249,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s2",
nullptr,
4,
@@ -279,8 +260,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s3",
nullptr,
4,
@@ -291,8 +271,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s4",
nullptr,
4,
@@ -303,8 +282,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s5",
nullptr,
4,
@@ -315,8 +293,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s6",
nullptr,
4,
@@ -327,8 +304,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s7",
nullptr,
4,
@@ -339,8 +315,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s8",
nullptr,
4,
@@ -351,8 +326,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s9",
nullptr,
4,
@@ -363,8 +337,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s10",
nullptr,
4,
@@ -375,8 +348,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s11",
nullptr,
4,
@@ -387,8 +359,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s12",
nullptr,
4,
@@ -399,8 +370,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s13",
nullptr,
4,
@@ -411,8 +381,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s14",
nullptr,
4,
@@ -423,8 +392,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s15",
nullptr,
4,
@@ -435,8 +403,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s16",
nullptr,
4,
@@ -447,8 +414,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s17",
nullptr,
4,
@@ -459,8 +425,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s18",
nullptr,
4,
@@ -471,8 +436,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s19",
nullptr,
4,
@@ -483,8 +447,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s20",
nullptr,
4,
@@ -495,8 +458,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s21",
nullptr,
4,
@@ -507,8 +469,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s22",
nullptr,
4,
@@ -519,8 +480,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s23",
nullptr,
4,
@@ -531,8 +491,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s24",
nullptr,
4,
@@ -543,8 +502,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s25",
nullptr,
4,
@@ -555,8 +513,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s26",
nullptr,
4,
@@ -567,8 +524,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s27",
nullptr,
4,
@@ -579,8 +535,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s28",
nullptr,
4,
@@ -591,8 +546,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s29",
nullptr,
4,
@@ -603,8 +557,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s30",
nullptr,
4,
@@ -615,8 +568,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s31",
nullptr,
4,
@@ -627,8 +579,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpscr",
nullptr,
4,
@@ -639,8 +590,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d0",
nullptr,
8,
@@ -651,8 +601,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d1",
nullptr,
8,
@@ -663,8 +612,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d2",
nullptr,
8,
@@ -675,8 +623,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d3",
nullptr,
8,
@@ -687,8 +634,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d4",
nullptr,
8,
@@ -699,8 +645,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d5",
nullptr,
8,
@@ -711,8 +656,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d6",
nullptr,
8,
@@ -723,8 +667,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d7",
nullptr,
8,
@@ -735,8 +678,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d8",
nullptr,
8,
@@ -747,8 +689,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d9",
nullptr,
8,
@@ -759,8 +700,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d10",
nullptr,
8,
@@ -771,8 +711,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d11",
nullptr,
8,
@@ -783,8 +722,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d12",
nullptr,
8,
@@ -795,8 +733,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d13",
nullptr,
8,
@@ -807,8 +744,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d14",
nullptr,
8,
@@ -819,8 +755,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d15",
nullptr,
8,
@@ -831,8 +766,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d16",
nullptr,
8,
@@ -843,8 +777,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d17",
nullptr,
8,
@@ -855,8 +788,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d18",
nullptr,
8,
@@ -867,8 +799,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d19",
nullptr,
8,
@@ -879,8 +810,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d20",
nullptr,
8,
@@ -891,8 +821,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d21",
nullptr,
8,
@@ -903,8 +832,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d22",
nullptr,
8,
@@ -915,8 +843,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d23",
nullptr,
8,
@@ -927,8 +854,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d24",
nullptr,
8,
@@ -939,8 +865,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d25",
nullptr,
8,
@@ -951,8 +876,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d26",
nullptr,
8,
@@ -963,8 +887,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d27",
nullptr,
8,
@@ -975,8 +898,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d28",
nullptr,
8,
@@ -987,8 +909,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d29",
nullptr,
8,
@@ -999,8 +920,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d30",
nullptr,
8,
@@ -1011,8 +931,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d31",
nullptr,
8,
@@ -1023,8 +942,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8_usr",
nullptr,
4,
@@ -1035,8 +953,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9_usr",
nullptr,
4,
@@ -1047,8 +964,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10_usr",
nullptr,
4,
@@ -1059,8 +975,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11_usr",
nullptr,
4,
@@ -1071,8 +986,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12_usr",
nullptr,
4,
@@ -1083,8 +997,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_usr",
"sp_usr",
4,
@@ -1095,8 +1008,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_usr",
"lr_usr",
4,
@@ -1107,8 +1019,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8_fiq",
nullptr,
4,
@@ -1119,8 +1030,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9_fiq",
nullptr,
4,
@@ -1131,8 +1041,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10_fiq",
nullptr,
4,
@@ -1143,8 +1052,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11_fiq",
nullptr,
4,
@@ -1155,8 +1063,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12_fiq",
nullptr,
4,
@@ -1167,8 +1074,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_fiq",
"sp_fiq",
4,
@@ -1179,8 +1085,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_fiq",
"lr_fiq",
4,
@@ -1191,8 +1096,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_irq",
"sp_irq",
4,
@@ -1203,8 +1107,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_irq",
"lr_irq",
4,
@@ -1215,8 +1118,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_abt",
"sp_abt",
4,
@@ -1227,8 +1129,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_abt",
"lr_abt",
4,
@@ -1239,8 +1140,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_und",
"sp_und",
4,
@@ -1251,8 +1151,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_und",
"lr_und",
4,
@@ -1263,8 +1162,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_svc",
"sp_svc",
4,
@@ -1275,8 +1173,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_svc",
"lr_svc",
4,
@@ -1287,8 +1184,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0}};
+ }};
static const uint32_t k_num_register_infos =
llvm::array_lengthof(g_register_infos);
diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
index 90b51d93bf728..43f277eff9cad 100644
--- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
@@ -54,8 +54,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
nullptr,
4,
@@ -66,8 +65,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
nullptr,
4,
@@ -78,8 +76,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
nullptr,
4,
@@ -90,8 +87,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
4,
@@ -102,8 +98,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
4,
@@ -114,8 +109,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
4,
@@ -126,8 +120,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
4,
@@ -138,8 +131,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
nullptr,
4,
@@ -150,8 +142,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
nullptr,
4,
@@ -162,8 +153,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
nullptr,
4,
@@ -174,8 +164,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
nullptr,
4,
@@ -186,8 +175,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
4,
@@ -198,8 +186,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"r13",
4,
@@ -210,8 +197,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r14",
4,
@@ -222,8 +208,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"r15",
4,
@@ -234,8 +219,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cpsr",
"psr",
4,
@@ -246,8 +230,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s0",
nullptr,
4,
@@ -258,8 +241,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s1",
nullptr,
4,
@@ -270,8 +252,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s2",
nullptr,
4,
@@ -282,8 +263,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s3",
nullptr,
4,
@@ -294,8 +274,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s4",
nullptr,
4,
@@ -306,8 +285,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s5",
nullptr,
4,
@@ -318,8 +296,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s6",
nullptr,
4,
@@ -330,8 +307,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s7",
nullptr,
4,
@@ -342,8 +318,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s8",
nullptr,
4,
@@ -354,8 +329,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s9",
nullptr,
4,
@@ -366,8 +340,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s10",
nullptr,
4,
@@ -378,8 +351,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s11",
nullptr,
4,
@@ -390,8 +362,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s12",
nullptr,
4,
@@ -402,8 +373,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s13",
nullptr,
4,
@@ -414,8 +384,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s14",
nullptr,
4,
@@ -426,8 +395,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s15",
nullptr,
4,
@@ -438,8 +406,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s16",
nullptr,
4,
@@ -450,8 +417,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s17",
nullptr,
4,
@@ -462,8 +428,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s18",
nullptr,
4,
@@ -474,8 +439,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s19",
nullptr,
4,
@@ -486,8 +450,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s20",
nullptr,
4,
@@ -498,8 +461,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s21",
nullptr,
4,
@@ -510,8 +472,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s22",
nullptr,
4,
@@ -522,8 +483,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s23",
nullptr,
4,
@@ -534,8 +494,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s24",
nullptr,
4,
@@ -546,8 +505,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s25",
nullptr,
4,
@@ -558,8 +516,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s26",
nullptr,
4,
@@ -570,8 +527,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s27",
nullptr,
4,
@@ -582,8 +538,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s28",
nullptr,
4,
@@ -594,8 +549,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s29",
nullptr,
4,
@@ -606,8 +560,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s30",
nullptr,
4,
@@ -618,8 +571,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s31",
nullptr,
4,
@@ -630,8 +582,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpscr",
nullptr,
4,
@@ -642,8 +593,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d0",
nullptr,
8,
@@ -654,8 +604,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d1",
nullptr,
8,
@@ -666,8 +615,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d2",
nullptr,
8,
@@ -678,8 +626,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d3",
nullptr,
8,
@@ -690,8 +637,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d4",
nullptr,
8,
@@ -702,8 +648,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d5",
nullptr,
8,
@@ -714,8 +659,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d6",
nullptr,
8,
@@ -726,8 +670,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d7",
nullptr,
8,
@@ -738,8 +681,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d8",
nullptr,
8,
@@ -750,8 +692,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d9",
nullptr,
8,
@@ -762,8 +703,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d10",
nullptr,
8,
@@ -774,8 +714,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d11",
nullptr,
8,
@@ -786,8 +725,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d12",
nullptr,
8,
@@ -798,8 +736,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d13",
nullptr,
8,
@@ -810,8 +747,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d14",
nullptr,
8,
@@ -822,8 +758,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d15",
nullptr,
8,
@@ -834,8 +769,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d16",
nullptr,
8,
@@ -846,8 +780,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d17",
nullptr,
8,
@@ -858,8 +791,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d18",
nullptr,
8,
@@ -870,8 +802,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d19",
nullptr,
8,
@@ -882,8 +813,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d20",
nullptr,
8,
@@ -894,8 +824,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d21",
nullptr,
8,
@@ -906,8 +835,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d22",
nullptr,
8,
@@ -918,8 +846,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d23",
nullptr,
8,
@@ -930,8 +857,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d24",
nullptr,
8,
@@ -942,8 +868,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d25",
nullptr,
8,
@@ -954,8 +879,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d26",
nullptr,
8,
@@ -966,8 +890,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d27",
nullptr,
8,
@@ -978,8 +901,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d28",
nullptr,
8,
@@ -990,8 +912,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d29",
nullptr,
8,
@@ -1002,8 +923,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d30",
nullptr,
8,
@@ -1014,8 +934,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d31",
nullptr,
8,
@@ -1026,8 +945,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8_usr",
nullptr,
4,
@@ -1038,8 +956,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9_usr",
nullptr,
4,
@@ -1050,8 +967,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10_usr",
nullptr,
4,
@@ -1062,8 +978,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11_usr",
nullptr,
4,
@@ -1074,8 +989,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12_usr",
nullptr,
4,
@@ -1086,8 +1000,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_usr",
"sp_usr",
4,
@@ -1098,8 +1011,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_usr",
"lr_usr",
4,
@@ -1110,8 +1022,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8_fiq",
nullptr,
4,
@@ -1122,8 +1033,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9_fiq",
nullptr,
4,
@@ -1134,8 +1044,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10_fiq",
nullptr,
4,
@@ -1146,8 +1055,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11_fiq",
nullptr,
4,
@@ -1158,8 +1066,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12_fiq",
nullptr,
4,
@@ -1170,8 +1077,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_fiq",
"sp_fiq",
4,
@@ -1182,8 +1088,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_fiq",
"lr_fiq",
4,
@@ -1194,8 +1099,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_irq",
"sp_irq",
4,
@@ -1206,8 +1110,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_irq",
"lr_irq",
4,
@@ -1218,8 +1121,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_abt",
"sp_abt",
4,
@@ -1230,8 +1132,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_abt",
"lr_abt",
4,
@@ -1242,8 +1143,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_und",
"sp_und",
4,
@@ -1254,8 +1154,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_und",
"lr_und",
4,
@@ -1266,8 +1165,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13_svc",
"sp_svc",
4,
@@ -1278,8 +1176,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14_svc",
"lr_svc",
4,
@@ -1290,8 +1187,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0}};
+ }};
static const uint32_t k_num_register_infos =
llvm::array_lengthof(g_register_infos);
diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
index 62d0940cc6c4d..07ea8a6b4baa2 100644
--- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
+++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
@@ -45,8 +45,7 @@ static const RegisterInfo g_register_infos[] = {
{0, 0, LLDB_INVALID_REGNUM, 0, 0},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r01",
"",
4,
@@ -56,8 +55,7 @@ static const RegisterInfo g_register_infos[] = {
{1, 1, LLDB_INVALID_REGNUM, 1, 1},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r02",
"",
4,
@@ -67,8 +65,7 @@ static const RegisterInfo g_register_infos[] = {
{2, 2, LLDB_INVALID_REGNUM, 2, 2},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r03",
"",
4,
@@ -78,8 +75,7 @@ static const RegisterInfo g_register_infos[] = {
{3, 3, LLDB_INVALID_REGNUM, 3, 3},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r04",
"",
4,
@@ -89,8 +85,7 @@ static const RegisterInfo g_register_infos[] = {
{4, 4, LLDB_INVALID_REGNUM, 4, 4},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r05",
"",
4,
@@ -100,8 +95,7 @@ static const RegisterInfo g_register_infos[] = {
{5, 5, LLDB_INVALID_REGNUM, 5, 5},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r06",
"",
4,
@@ -111,8 +105,7 @@ static const RegisterInfo g_register_infos[] = {
{6, 6, LLDB_INVALID_REGNUM, 6, 6},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r07",
"",
4,
@@ -122,8 +115,7 @@ static const RegisterInfo g_register_infos[] = {
{7, 7, LLDB_INVALID_REGNUM, 7, 7},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r08",
"",
4,
@@ -133,8 +125,7 @@ static const RegisterInfo g_register_infos[] = {
{8, 8, LLDB_INVALID_REGNUM, 8, 8},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r09",
"",
4,
@@ -144,8 +135,7 @@ static const RegisterInfo g_register_infos[] = {
{9, 9, LLDB_INVALID_REGNUM, 9, 9},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
"",
4,
@@ -155,8 +145,7 @@ static const RegisterInfo g_register_infos[] = {
{10, 10, LLDB_INVALID_REGNUM, 10, 10},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
"",
4,
@@ -166,8 +155,7 @@ static const RegisterInfo g_register_infos[] = {
{11, 11, LLDB_INVALID_REGNUM, 11, 11},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
"",
4,
@@ -177,8 +165,7 @@ static const RegisterInfo g_register_infos[] = {
{12, 12, LLDB_INVALID_REGNUM, 12, 12},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13",
"",
4,
@@ -188,8 +175,7 @@ static const RegisterInfo g_register_infos[] = {
{13, 13, LLDB_INVALID_REGNUM, 13, 13},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14",
"",
4,
@@ -199,8 +185,7 @@ static const RegisterInfo g_register_infos[] = {
{14, 14, LLDB_INVALID_REGNUM, 14, 14},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r15",
"",
4,
@@ -210,8 +195,7 @@ static const RegisterInfo g_register_infos[] = {
{15, 15, LLDB_INVALID_REGNUM, 15, 15},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r16",
"",
4,
@@ -221,8 +205,7 @@ static const RegisterInfo g_register_infos[] = {
{16, 16, LLDB_INVALID_REGNUM, 16, 16},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r17",
"",
4,
@@ -232,8 +215,7 @@ static const RegisterInfo g_register_infos[] = {
{17, 17, LLDB_INVALID_REGNUM, 17, 17},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r18",
"",
4,
@@ -243,8 +225,7 @@ static const RegisterInfo g_register_infos[] = {
{18, 18, LLDB_INVALID_REGNUM, 18, 18},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r19",
"",
4,
@@ -254,8 +235,7 @@ static const RegisterInfo g_register_infos[] = {
{19, 19, LLDB_INVALID_REGNUM, 19, 19},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r20",
"",
4,
@@ -265,8 +245,7 @@ static const RegisterInfo g_register_infos[] = {
{20, 20, LLDB_INVALID_REGNUM, 20, 20},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r21",
"",
4,
@@ -276,8 +255,7 @@ static const RegisterInfo g_register_infos[] = {
{21, 21, LLDB_INVALID_REGNUM, 21, 21},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r22",
"",
4,
@@ -287,8 +265,7 @@ static const RegisterInfo g_register_infos[] = {
{22, 22, LLDB_INVALID_REGNUM, 22, 22},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r23",
"",
4,
@@ -298,8 +275,7 @@ static const RegisterInfo g_register_infos[] = {
{23, 23, LLDB_INVALID_REGNUM, 23, 23},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r24",
"",
4,
@@ -309,8 +285,7 @@ static const RegisterInfo g_register_infos[] = {
{24, 24, LLDB_INVALID_REGNUM, 24, 24},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r25",
"",
4,
@@ -320,8 +295,7 @@ static const RegisterInfo g_register_infos[] = {
{25, 25, LLDB_INVALID_REGNUM, 25, 25},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r26",
"",
4,
@@ -331,8 +305,7 @@ static const RegisterInfo g_register_infos[] = {
{26, 26, LLDB_INVALID_REGNUM, 26, 26},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r27",
"",
4,
@@ -342,8 +315,7 @@ static const RegisterInfo g_register_infos[] = {
{27, 27, LLDB_INVALID_REGNUM, 27, 27},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r28",
"",
4,
@@ -353,8 +325,7 @@ static const RegisterInfo g_register_infos[] = {
{28, 28, LLDB_INVALID_REGNUM, 28, 28},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"r29",
4,
@@ -364,8 +335,7 @@ static const RegisterInfo g_register_infos[] = {
{29, 29, LLDB_REGNUM_GENERIC_SP, 29, 29},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fp",
"r30",
4,
@@ -375,8 +345,7 @@ static const RegisterInfo g_register_infos[] = {
{30, 30, LLDB_REGNUM_GENERIC_FP, 30, 30},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r31",
4,
@@ -386,8 +355,7 @@ static const RegisterInfo g_register_infos[] = {
{31, 31, LLDB_REGNUM_GENERIC_RA, 31, 31},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sa0",
"",
4,
@@ -397,8 +365,7 @@ static const RegisterInfo g_register_infos[] = {
{32, 32, LLDB_INVALID_REGNUM, 32, 32},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lc0",
"",
4,
@@ -408,8 +375,7 @@ static const RegisterInfo g_register_infos[] = {
{33, 33, LLDB_INVALID_REGNUM, 33, 33},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sa1",
"",
4,
@@ -419,8 +385,7 @@ static const RegisterInfo g_register_infos[] = {
{34, 34, LLDB_INVALID_REGNUM, 34, 34},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lc1",
"",
4,
@@ -430,8 +395,7 @@ static const RegisterInfo g_register_infos[] = {
{35, 35, LLDB_INVALID_REGNUM, 35, 35},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// --> hexagon-v4/5/55/56-sim.xml
{"p3_0",
"",
@@ -442,8 +406,7 @@ static const RegisterInfo g_register_infos[] = {
{36, 36, LLDB_INVALID_REGNUM, 36, 36},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// PADDING {
{"p00",
"",
@@ -454,8 +417,7 @@ static const RegisterInfo g_register_infos[] = {
{37, 37, LLDB_INVALID_REGNUM, 37, 37},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// }
{"m0",
"",
@@ -466,8 +428,7 @@ static const RegisterInfo g_register_infos[] = {
{38, 38, LLDB_INVALID_REGNUM, 38, 38},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"m1",
"",
4,
@@ -477,8 +438,7 @@ static const RegisterInfo g_register_infos[] = {
{39, 39, LLDB_INVALID_REGNUM, 39, 39},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"usr",
"",
4,
@@ -488,8 +448,7 @@ static const RegisterInfo g_register_infos[] = {
{40, 40, LLDB_INVALID_REGNUM, 40, 40},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"",
4,
@@ -499,8 +458,7 @@ static const RegisterInfo g_register_infos[] = {
{41, 41, LLDB_REGNUM_GENERIC_PC, 41, 41},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"ugp",
"",
4,
@@ -510,8 +468,7 @@ static const RegisterInfo g_register_infos[] = {
{42, 42, LLDB_INVALID_REGNUM, 42, 42},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"gp",
"",
4,
@@ -521,8 +478,7 @@ static const RegisterInfo g_register_infos[] = {
{43, 43, LLDB_INVALID_REGNUM, 43, 43},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cs0",
"",
4,
@@ -532,8 +488,7 @@ static const RegisterInfo g_register_infos[] = {
{44, 44, LLDB_INVALID_REGNUM, 44, 44},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cs1",
"",
4,
@@ -543,8 +498,7 @@ static const RegisterInfo g_register_infos[] = {
{45, 45, LLDB_INVALID_REGNUM, 45, 45},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// PADDING {
{"p01",
"",
@@ -555,8 +509,7 @@ static const RegisterInfo g_register_infos[] = {
{46, 46, LLDB_INVALID_REGNUM, 46, 46},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p02",
"",
4,
@@ -566,8 +519,7 @@ static const RegisterInfo g_register_infos[] = {
{47, 47, LLDB_INVALID_REGNUM, 47, 47},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p03",
"",
4,
@@ -577,8 +529,7 @@ static const RegisterInfo g_register_infos[] = {
{48, 48, LLDB_INVALID_REGNUM, 48, 48},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p04",
"",
4,
@@ -588,8 +539,7 @@ static const RegisterInfo g_register_infos[] = {
{49, 49, LLDB_INVALID_REGNUM, 49, 49},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p05",
"",
4,
@@ -599,8 +549,7 @@ static const RegisterInfo g_register_infos[] = {
{50, 50, LLDB_INVALID_REGNUM, 50, 50},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p06",
"",
4,
@@ -610,8 +559,7 @@ static const RegisterInfo g_register_infos[] = {
{51, 51, LLDB_INVALID_REGNUM, 51, 51},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p07",
"",
4,
@@ -621,8 +569,7 @@ static const RegisterInfo g_register_infos[] = {
{52, 52, LLDB_INVALID_REGNUM, 52, 52},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p08",
"",
4,
@@ -632,8 +579,7 @@ static const RegisterInfo g_register_infos[] = {
{53, 53, LLDB_INVALID_REGNUM, 53, 53},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p09",
"",
4,
@@ -643,8 +589,7 @@ static const RegisterInfo g_register_infos[] = {
{54, 54, LLDB_INVALID_REGNUM, 54, 54},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p10",
"",
4,
@@ -654,8 +599,7 @@ static const RegisterInfo g_register_infos[] = {
{55, 55, LLDB_INVALID_REGNUM, 55, 55},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p11",
"",
4,
@@ -665,8 +609,7 @@ static const RegisterInfo g_register_infos[] = {
{56, 56, LLDB_INVALID_REGNUM, 56, 56},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p12",
"",
4,
@@ -676,8 +619,7 @@ static const RegisterInfo g_register_infos[] = {
{57, 57, LLDB_INVALID_REGNUM, 57, 57},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p13",
"",
4,
@@ -687,8 +629,7 @@ static const RegisterInfo g_register_infos[] = {
{58, 58, LLDB_INVALID_REGNUM, 58, 58},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p14",
"",
4,
@@ -698,8 +639,7 @@ static const RegisterInfo g_register_infos[] = {
{59, 59, LLDB_INVALID_REGNUM, 59, 59},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p15",
"",
4,
@@ -709,8 +649,7 @@ static const RegisterInfo g_register_infos[] = {
{60, 60, LLDB_INVALID_REGNUM, 60, 60},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p16",
"",
4,
@@ -720,8 +659,7 @@ static const RegisterInfo g_register_infos[] = {
{61, 61, LLDB_INVALID_REGNUM, 61, 61},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p17",
"",
4,
@@ -731,8 +669,7 @@ static const RegisterInfo g_register_infos[] = {
{62, 62, LLDB_INVALID_REGNUM, 62, 62},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p18",
"",
4,
@@ -742,8 +679,7 @@ static const RegisterInfo g_register_infos[] = {
{63, 63, LLDB_INVALID_REGNUM, 63, 63},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// }
{"sgp0",
"",
@@ -754,8 +690,7 @@ static const RegisterInfo g_register_infos[] = {
{64, 64, LLDB_INVALID_REGNUM, 64, 64},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// PADDING {
{"p19",
"",
@@ -766,8 +701,7 @@ static const RegisterInfo g_register_infos[] = {
{65, 65, LLDB_INVALID_REGNUM, 65, 65},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// }
{"stid",
"",
@@ -778,8 +712,7 @@ static const RegisterInfo g_register_infos[] = {
{66, 66, LLDB_INVALID_REGNUM, 66, 66},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"elr",
"",
4,
@@ -789,8 +722,7 @@ static const RegisterInfo g_register_infos[] = {
{67, 67, LLDB_INVALID_REGNUM, 67, 67},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"badva0",
"",
4,
@@ -800,8 +732,7 @@ static const RegisterInfo g_register_infos[] = {
{68, 68, LLDB_INVALID_REGNUM, 68, 68},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"badva1",
"",
4,
@@ -811,8 +742,7 @@ static const RegisterInfo g_register_infos[] = {
{69, 69, LLDB_INVALID_REGNUM, 69, 69},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"ssr",
"",
4,
@@ -822,8 +752,7 @@ static const RegisterInfo g_register_infos[] = {
{70, 70, LLDB_INVALID_REGNUM, 70, 70},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"ccr",
"",
4,
@@ -833,8 +762,7 @@ static const RegisterInfo g_register_infos[] = {
{71, 71, LLDB_INVALID_REGNUM, 71, 71},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"htid",
"",
4,
@@ -844,8 +772,7 @@ static const RegisterInfo g_register_infos[] = {
{72, 72, LLDB_INVALID_REGNUM, 72, 72},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// PADDING {
{"p20",
"",
@@ -856,8 +783,7 @@ static const RegisterInfo g_register_infos[] = {
{73, 73, LLDB_INVALID_REGNUM, 73, 73},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// }
{"imask",
"",
@@ -868,8 +794,7 @@ static const RegisterInfo g_register_infos[] = {
{74, 74, LLDB_INVALID_REGNUM, 74, 74},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// PADDING {
{"p21",
"",
@@ -880,8 +805,7 @@ static const RegisterInfo g_register_infos[] = {
{75, 75, LLDB_INVALID_REGNUM, 75, 75},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p22",
"",
4,
@@ -891,8 +815,7 @@ static const RegisterInfo g_register_infos[] = {
{76, 76, LLDB_INVALID_REGNUM, 76, 76},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p23",
"",
4,
@@ -902,8 +825,7 @@ static const RegisterInfo g_register_infos[] = {
{77, 77, LLDB_INVALID_REGNUM, 77, 77},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p24",
"",
4,
@@ -913,8 +835,7 @@ static const RegisterInfo g_register_infos[] = {
{78, 78, LLDB_INVALID_REGNUM, 78, 78},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"p25",
"",
4,
@@ -924,8 +845,7 @@ static const RegisterInfo g_register_infos[] = {
{79, 79, LLDB_INVALID_REGNUM, 79, 79},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// }
{"g0",
"",
@@ -936,8 +856,7 @@ static const RegisterInfo g_register_infos[] = {
{80, 80, LLDB_INVALID_REGNUM, 80, 80},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"g1",
"",
4,
@@ -947,8 +866,7 @@ static const RegisterInfo g_register_infos[] = {
{81, 81, LLDB_INVALID_REGNUM, 81, 81},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"g2",
"",
4,
@@ -958,8 +876,7 @@ static const RegisterInfo g_register_infos[] = {
{82, 82, LLDB_INVALID_REGNUM, 82, 82},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"g3",
"",
4,
@@ -969,8 +886,7 @@ static const RegisterInfo g_register_infos[] = {
{83, 83, LLDB_INVALID_REGNUM, 83, 83},
nullptr,
nullptr,
- nullptr,
- 0}};
+ }};
static const uint32_t k_num_register_infos =
sizeof(g_register_infos) / sizeof(RegisterInfo);
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
index 65bb528798624..ac0531a0ec195 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
@@ -92,8 +92,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
"AT",
4,
@@ -104,8 +103,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
"v0",
4,
@@ -116,8 +114,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
"v1",
4,
@@ -128,8 +125,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
4,
@@ -140,8 +136,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
4,
@@ -152,8 +147,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
4,
@@ -164,8 +158,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
4,
@@ -176,8 +169,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
"arg5",
4,
@@ -188,8 +180,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
"arg6",
4,
@@ -200,8 +191,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
"arg7",
4,
@@ -212,8 +202,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
"arg8",
4,
@@ -224,8 +213,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
4,
@@ -236,8 +224,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13",
nullptr,
4,
@@ -248,8 +235,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14",
nullptr,
4,
@@ -260,8 +246,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r15",
nullptr,
4,
@@ -272,8 +257,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r16",
nullptr,
4,
@@ -284,8 +268,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r17",
nullptr,
4,
@@ -296,8 +279,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r18",
nullptr,
4,
@@ -308,8 +290,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r19",
nullptr,
4,
@@ -320,8 +301,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r20",
nullptr,
4,
@@ -332,8 +312,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r21",
nullptr,
4,
@@ -344,8 +323,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r22",
nullptr,
4,
@@ -356,8 +334,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r23",
nullptr,
4,
@@ -368,8 +345,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r24",
nullptr,
4,
@@ -380,8 +356,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r25",
nullptr,
4,
@@ -392,8 +367,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r26",
nullptr,
4,
@@ -404,8 +378,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r27",
nullptr,
4,
@@ -416,8 +389,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r28",
"gp",
4,
@@ -428,8 +400,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r29",
nullptr,
4,
@@ -440,8 +411,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r30",
nullptr,
4,
@@ -452,8 +422,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r31",
nullptr,
4,
@@ -464,8 +433,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sr",
nullptr,
4,
@@ -476,8 +444,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lo",
nullptr,
4,
@@ -488,8 +455,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"hi",
nullptr,
4,
@@ -500,8 +466,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"bad",
nullptr,
4,
@@ -512,8 +477,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cause",
nullptr,
4,
@@ -524,8 +488,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
nullptr,
4,
@@ -536,8 +499,7 @@ static const RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
};
static const uint32_t k_num_register_infos =
diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
index 3c42d278d860f..9aa390cdb52e5 100644
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
@@ -92,8 +92,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
"AT",
8,
@@ -104,8 +103,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
"v0",
8,
@@ -116,8 +114,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
"v1",
8,
@@ -128,8 +125,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
8,
@@ -140,8 +136,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
8,
@@ -152,8 +147,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
8,
@@ -164,8 +158,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
8,
@@ -176,8 +169,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
nullptr,
8,
@@ -188,8 +180,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
nullptr,
8,
@@ -200,8 +191,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
nullptr,
8,
@@ -212,8 +202,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
nullptr,
8,
@@ -224,8 +213,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
8,
@@ -236,8 +224,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r13",
nullptr,
8,
@@ -248,8 +235,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r14",
nullptr,
8,
@@ -260,8 +246,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r15",
nullptr,
8,
@@ -272,8 +257,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r16",
nullptr,
8,
@@ -284,8 +268,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r17",
nullptr,
8,
@@ -296,8 +279,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r18",
nullptr,
8,
@@ -308,8 +290,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r19",
nullptr,
8,
@@ -320,8 +301,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r20",
nullptr,
8,
@@ -332,8 +312,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r21",
nullptr,
8,
@@ -344,8 +323,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r22",
nullptr,
8,
@@ -356,8 +334,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r23",
nullptr,
8,
@@ -368,8 +345,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r24",
nullptr,
8,
@@ -380,8 +356,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r25",
nullptr,
8,
@@ -392,8 +367,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r26",
nullptr,
8,
@@ -404,8 +378,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r27",
nullptr,
8,
@@ -416,8 +389,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r28",
"gp",
8,
@@ -428,8 +400,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r29",
nullptr,
8,
@@ -440,8 +411,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r30",
nullptr,
8,
@@ -452,8 +422,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r31",
nullptr,
8,
@@ -464,8 +433,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sr",
nullptr,
4,
@@ -476,8 +444,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lo",
nullptr,
8,
@@ -488,8 +455,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"hi",
nullptr,
8,
@@ -500,8 +466,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"bad",
nullptr,
8,
@@ -512,8 +477,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cause",
nullptr,
8,
@@ -524,8 +488,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
nullptr,
8,
@@ -536,8 +499,7 @@ static const RegisterInfo g_register_infos_mips64[] = {
LLDB_INVALID_REGNUM},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
};
static const uint32_t k_num_register_infos =
diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
index 90728b7cd56ee..d2f53f71e431a 100644
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
@@ -112,7 +112,7 @@ enum dwarf_regnums {
#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4) \
{ \
#reg, alt, 8, 0, eEncodingUint, eFormatHex, {kind1, kind2, kind3, kind4 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
static const RegisterInfo g_register_infos[] = {
@@ -200,9 +200,7 @@ static const RegisterInfo g_register_infos[] = {
eFormatHex,
{dwarf_cfa, dwarf_cfa, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
nullptr,
- nullptr,
- nullptr,
- 0}};
+ }};
static const uint32_t k_num_register_infos =
llvm::array_lengthof(g_register_infos);
diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
index 0494d78030532..f20266878b975 100644
--- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
+++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
@@ -115,7 +115,7 @@ enum dwarf_regnums {
#name, alt, size, 0, eEncodingUint, eFormatHex, \
{dwarf_##name##_s390x, dwarf_##name##_s390x, generic, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
static const RegisterInfo g_register_infos[] = {
diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
index 9b0c06bcccab0..ab5a5d07de906 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -35,7 +35,7 @@
"na", nullptr, 8, 0, lldb::eEncodingUint, lldb::eFormatHex, \
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, \
- nullptr, nullptr, nullptr, 0
+ nullptr, nullptr
#define DECLARE_REGISTER_INFOS_ARM64_STRUCT
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
index 7e38091738e31..e1d3b6ecd7d09 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
@@ -177,7 +177,7 @@ enum {
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM }, \
- nullptr, nullptr, nullptr, 0
+ nullptr, nullptr,
#define REG_CONTEXT_SIZE \
(sizeof(RegisterContextDarwin_arm::GPR) + \
sizeof(RegisterContextDarwin_arm::FPU) + \
@@ -200,8 +200,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r0},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
nullptr,
4,
@@ -211,8 +210,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r1},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
nullptr,
4,
@@ -222,8 +220,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r2},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
nullptr,
4,
@@ -233,8 +230,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r3},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
4,
@@ -244,8 +240,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r4},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
4,
@@ -255,8 +250,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r5},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
4,
@@ -266,8 +260,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r6},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
4,
@@ -278,8 +271,7 @@ static RegisterInfo g_register_infos[] = {
gpr_r7},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
nullptr,
4,
@@ -289,8 +281,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r8},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
nullptr,
4,
@@ -300,8 +291,7 @@ static RegisterInfo g_register_infos[] = {
{ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r9},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
nullptr,
4,
@@ -312,8 +302,7 @@ static RegisterInfo g_register_infos[] = {
gpr_r10},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
nullptr,
4,
@@ -324,8 +313,7 @@ static RegisterInfo g_register_infos[] = {
gpr_r11},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
4,
@@ -336,8 +324,7 @@ static RegisterInfo g_register_infos[] = {
gpr_r12},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"r13",
4,
@@ -348,8 +335,7 @@ static RegisterInfo g_register_infos[] = {
gpr_sp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r14",
4,
@@ -360,8 +346,7 @@ static RegisterInfo g_register_infos[] = {
gpr_lr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"r15",
4,
@@ -372,8 +357,7 @@ static RegisterInfo g_register_infos[] = {
gpr_pc},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cpsr",
"psr",
4,
@@ -384,8 +368,7 @@ static RegisterInfo g_register_infos[] = {
gpr_cpsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s0",
nullptr,
@@ -397,8 +380,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s0},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s1",
nullptr,
4,
@@ -409,8 +391,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s1},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s2",
nullptr,
4,
@@ -421,8 +402,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s2},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s3",
nullptr,
4,
@@ -433,8 +413,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s3},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s4",
nullptr,
4,
@@ -445,8 +424,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s4},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s5",
nullptr,
4,
@@ -457,8 +435,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s5},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s6",
nullptr,
4,
@@ -469,8 +446,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s6},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s7",
nullptr,
4,
@@ -481,8 +457,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s7},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s8",
nullptr,
4,
@@ -493,8 +468,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s8},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s9",
nullptr,
4,
@@ -505,8 +479,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s9},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s10",
nullptr,
4,
@@ -517,8 +490,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s10},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s11",
nullptr,
4,
@@ -529,8 +501,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s11},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s12",
nullptr,
4,
@@ -541,8 +512,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s12},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s13",
nullptr,
4,
@@ -553,8 +523,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s13},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s14",
nullptr,
4,
@@ -565,8 +534,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s14},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s15",
nullptr,
4,
@@ -577,8 +545,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s15},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s16",
nullptr,
4,
@@ -589,8 +556,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s16},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s17",
nullptr,
4,
@@ -601,8 +567,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s17},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s18",
nullptr,
4,
@@ -613,8 +578,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s18},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s19",
nullptr,
4,
@@ -625,8 +589,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s19},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s20",
nullptr,
4,
@@ -637,8 +600,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s20},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s21",
nullptr,
4,
@@ -649,8 +611,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s21},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s22",
nullptr,
4,
@@ -661,8 +622,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s22},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s23",
nullptr,
4,
@@ -673,8 +633,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s23},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s24",
nullptr,
4,
@@ -685,8 +644,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s24},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s25",
nullptr,
4,
@@ -697,8 +655,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s25},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s26",
nullptr,
4,
@@ -709,8 +666,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s26},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s27",
nullptr,
4,
@@ -721,8 +677,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s27},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s28",
nullptr,
4,
@@ -733,8 +688,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s28},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s29",
nullptr,
4,
@@ -745,8 +699,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s29},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s30",
nullptr,
4,
@@ -757,8 +710,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s30},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s31",
nullptr,
4,
@@ -769,8 +721,7 @@ static RegisterInfo g_register_infos[] = {
fpu_s31},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpscr",
nullptr,
4,
@@ -781,8 +732,7 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, fpu_fpscr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"exception",
nullptr,
@@ -794,8 +744,7 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, exc_exception},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fsr",
nullptr,
4,
@@ -806,8 +755,7 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, exc_fsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"far",
nullptr,
4,
@@ -818,8 +766,7 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, exc_far},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_DBG(bvr, 0)},
{DEFINE_DBG(bvr, 1)},
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp
index b98b2f35c23e6..50f710e268152 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp
@@ -59,7 +59,7 @@ using namespace lldb_private;
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM }, \
- NULL, NULL, NULL, 0
+ NULL, NULL
#define REG_CONTEXT_SIZE \
(sizeof(RegisterContextDarwin_arm64::GPR) + \
sizeof(RegisterContextDarwin_arm64::FPU) + \
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
index 95f8132a990ce..5f56e6f1636a2 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
@@ -154,7 +154,7 @@ enum {
{LLDB_INVALID_REGNUM, dwarf_##reg##i, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
fpu_##reg##i }, \
- nullptr, nullptr, nullptr, 0
+ nullptr, nullptr,
#define DEFINE_EXC(reg) \
#reg, NULL, sizeof(((RegisterContextDarwin_i386::EXC *) NULL)->reg), \
@@ -175,184 +175,158 @@ static RegisterInfo g_register_infos[] = {
gpr_eax},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(ebx, nullptr),
{ehframe_ebx, dwarf_ebx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
gpr_ebx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(ecx, nullptr),
{ehframe_ecx, dwarf_ecx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
gpr_ecx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(edx, nullptr),
{ehframe_edx, dwarf_edx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
gpr_edx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(edi, nullptr),
{ehframe_edi, dwarf_edi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
gpr_edi},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(esi, nullptr),
{ehframe_esi, dwarf_esi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
gpr_esi},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(ebp, "fp"),
{ehframe_ebp, dwarf_ebp, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM,
gpr_ebp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(esp, "sp"),
{ehframe_esp, dwarf_esp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM,
gpr_esp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(ss, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_ss},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(eflags, "flags"),
{ehframe_eflags, dwarf_eflags, LLDB_REGNUM_GENERIC_FLAGS,
LLDB_INVALID_REGNUM, gpr_eflags},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(eip, "pc"),
{ehframe_eip, dwarf_eip, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM,
gpr_eip},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(cs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_cs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(ds, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_ds},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(es, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_es},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(fs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_fs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(gs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_gs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fcw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fcw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fsw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fsw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ftw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ftw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fop),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fop},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ip),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ip},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(cs),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_cs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(dp),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_dp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ds),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ds},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(mxcsr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_mxcsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(mxcsrmask),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_mxcsrmask},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_VECT(stmm, 0)},
{DEFINE_FPU_VECT(stmm, 1)},
{DEFINE_FPU_VECT(stmm, 2)},
@@ -375,22 +349,19 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, exc_trapno},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_EXC(err),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, exc_err},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_EXC(faultvaddr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, exc_faultvaddr},
nullptr,
nullptr,
- nullptr,
- 0}};
+ }};
static size_t k_num_register_infos = llvm::array_lengthof(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 03e5ea424e391..567df8fc980ce 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
@@ -172,7 +172,7 @@ enum ehframe_dwarf_regnums {
{ehframe_dwarf_fpu_##reg##i, \
ehframe_dwarf_fpu_##reg##i, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, fpu_##reg##i }, \
- nullptr, nullptr, nullptr, 0
+ nullptr, nullptr,
#define DEFINE_EXC(reg) \
#reg, NULL, sizeof(((RegisterContextDarwin_x86_64::EXC *) NULL)->reg), \
EXC_OFFSET(reg), eEncodingUint, eFormatHex
@@ -194,219 +194,188 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, gpr_rax},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rbx, nullptr),
{ehframe_dwarf_gpr_rbx, ehframe_dwarf_gpr_rbx, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_rbx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rcx, nullptr),
{ehframe_dwarf_gpr_rcx, ehframe_dwarf_gpr_rcx, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_rcx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rdx, nullptr),
{ehframe_dwarf_gpr_rdx, ehframe_dwarf_gpr_rdx, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_rdx},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rdi, nullptr),
{ehframe_dwarf_gpr_rdi, ehframe_dwarf_gpr_rdi, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_rdi},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rsi, nullptr),
{ehframe_dwarf_gpr_rsi, ehframe_dwarf_gpr_rsi, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_rsi},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rbp, "fp"),
{ehframe_dwarf_gpr_rbp, ehframe_dwarf_gpr_rbp, LLDB_REGNUM_GENERIC_FP,
LLDB_INVALID_REGNUM, gpr_rbp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rsp, "sp"),
{ehframe_dwarf_gpr_rsp, ehframe_dwarf_gpr_rsp, LLDB_REGNUM_GENERIC_SP,
LLDB_INVALID_REGNUM, gpr_rsp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r8, nullptr),
{ehframe_dwarf_gpr_r8, ehframe_dwarf_gpr_r8, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r8},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r9, nullptr),
{ehframe_dwarf_gpr_r9, ehframe_dwarf_gpr_r9, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r9},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r10, nullptr),
{ehframe_dwarf_gpr_r10, ehframe_dwarf_gpr_r10, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r10},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r11, nullptr),
{ehframe_dwarf_gpr_r11, ehframe_dwarf_gpr_r11, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r11},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r12, nullptr),
{ehframe_dwarf_gpr_r12, ehframe_dwarf_gpr_r12, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r12},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r13, nullptr),
{ehframe_dwarf_gpr_r13, ehframe_dwarf_gpr_r13, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r13},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r14, nullptr),
{ehframe_dwarf_gpr_r14, ehframe_dwarf_gpr_r14, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r14},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(r15, nullptr),
{ehframe_dwarf_gpr_r15, ehframe_dwarf_gpr_r15, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_r15},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rip, "pc"),
{ehframe_dwarf_gpr_rip, ehframe_dwarf_gpr_rip, LLDB_REGNUM_GENERIC_PC,
LLDB_INVALID_REGNUM, gpr_rip},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(rflags, "flags"),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_FLAGS,
LLDB_INVALID_REGNUM, gpr_rflags},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(cs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_cs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(fs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_fs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_GPR(gs, nullptr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, gpr_gs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fcw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fcw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fsw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fsw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ftw),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ftw},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(fop),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_fop},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ip),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ip},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(cs),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_cs},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(dp),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_dp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(ds),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_ds},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(mxcsr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_mxcsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_UINT(mxcsrmask),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, fpu_mxcsrmask},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_FPU_VECT(stmm, 0)},
{DEFINE_FPU_VECT(stmm, 1)},
{DEFINE_FPU_VECT(stmm, 2)},
@@ -437,22 +406,19 @@ static RegisterInfo g_register_infos[] = {
LLDB_INVALID_REGNUM, exc_trapno},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_EXC(err),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, exc_err},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_EXC(faultvaddr),
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
LLDB_INVALID_REGNUM, exc_faultvaddr},
nullptr,
nullptr,
- nullptr,
- 0}};
+ }};
static size_t k_num_register_infos = llvm::array_lengthof(g_register_infos);
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
index 518dc273faf48..39bec20649a4c 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
@@ -89,19 +89,18 @@ struct UserArea {
RegisterContextLinux_i386::RegisterContextLinux_i386(
const ArchSpec &target_arch)
: RegisterInfoInterface(target_arch) {
- RegisterInfo orig_ax = {"orig_eax",
- nullptr,
- sizeof(((GPR *)nullptr)->orig_eax),
- (LLVM_EXTENSION offsetof(GPR, orig_eax)),
- eEncodingUint,
- eFormatHex,
- {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
- LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
- LLDB_INVALID_REGNUM},
- nullptr,
- nullptr,
- nullptr,
- 0};
+ RegisterInfo orig_ax = {
+ "orig_eax",
+ nullptr,
+ sizeof(((GPR *)nullptr)->orig_eax),
+ (LLVM_EXTENSION offsetof(GPR, orig_eax)),
+ eEncodingUint,
+ eFormatHex,
+ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+ nullptr,
+ nullptr,
+ };
d_register_infos.push_back(orig_ax);
}
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
index f9d4e23fcde2c..20b8d74f8c0db 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
@@ -156,19 +156,18 @@ RegisterContextLinux_x86_64::RegisterContextLinux_x86_64(
m_register_info_p(GetRegisterInfoPtr(target_arch)),
m_register_info_count(GetRegisterInfoCount(target_arch)),
m_user_register_count(GetUserRegisterInfoCount(target_arch)) {
- RegisterInfo orig_ax = {"orig_rax",
- nullptr,
- sizeof(((GPR *)nullptr)->orig_rax),
- (LLVM_EXTENSION offsetof(GPR, orig_rax)),
- eEncodingUint,
- eFormatHex,
- {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
- LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
- LLDB_INVALID_REGNUM},
- nullptr,
- nullptr,
- nullptr,
- 0};
+ RegisterInfo orig_ax = {
+ "orig_rax",
+ nullptr,
+ sizeof(((GPR *)nullptr)->orig_rax),
+ (LLVM_EXTENSION offsetof(GPR, orig_rax)),
+ eEncodingUint,
+ eFormatHex,
+ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
+ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM},
+ nullptr,
+ nullptr,
+ };
d_register_infos.push_back(orig_ax);
}
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp
index 11556e802e33b..066d50d9c149f 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp
@@ -41,7 +41,6 @@ typedef struct _GPR {
#reg, alt, sizeof(((GPR *)nullptr)->reg), GPR_OFFSET(reg), eEncodingUint, \
eFormatHex, \
{kind1, kind2, kind3, kind4, lldb_##reg##_i386 }, nullptr, nullptr, \
- nullptr, 0 \
}
// clang-format off
diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp
index 15cae5ab4c998..a35ccace5d5be 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp
@@ -49,7 +49,6 @@ typedef struct _GPR {
#reg, alt, sizeof(((GPR *)nullptr)->reg), GPR_OFFSET(reg), eEncodingUint, \
eFormatHex, \
{kind1, kind2, kind3, kind4, lldb_##reg##_x86_64 }, nullptr, nullptr, \
- nullptr, 0 \
}
typedef struct _FPReg {
@@ -80,7 +79,7 @@ typedef struct _FPReg {
eEncodingUint, eFormatVectorOfUInt64, \
{dwarf_##reg##_x86_64, dwarf_##reg##_x86_64, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##reg##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
// clang-format off
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp
index 63461f7ab2db5..fd4c373e2cb1d 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp
@@ -38,7 +38,7 @@ using namespace lldb_private;
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
dbg_##reg##i }, \
- NULL, NULL, NULL, 0
+ NULL, NULL,
#define REG_CONTEXT_SIZE \
(sizeof(RegisterInfoPOSIX_arm::GPR) + sizeof(RegisterInfoPOSIX_arm::FPU) + \
sizeof(RegisterInfoPOSIX_arm::EXC))
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
index b878534b39db8..6c130be7b7411 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
@@ -60,7 +60,7 @@
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
dbg_##reg##i }, \
- NULL, NULL, NULL, 0
+ NULL, NULL,
#define REG_CONTEXT_SIZE \
(sizeof(RegisterInfoPOSIX_arm64::GPR) + \
sizeof(RegisterInfoPOSIX_arm64::FPU) + \
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
index 4af0069eb6f39..9eba19c071e3b 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
@@ -347,8 +347,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r0},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r1",
nullptr,
4,
@@ -359,8 +358,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r1},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r2",
nullptr,
4,
@@ -371,8 +369,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r2},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r3",
nullptr,
4,
@@ -383,8 +380,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r3},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r4",
nullptr,
4,
@@ -394,8 +390,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r4},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r5",
nullptr,
4,
@@ -405,8 +400,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r5},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r6",
nullptr,
4,
@@ -416,8 +410,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r6},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r7",
nullptr,
4,
@@ -427,8 +420,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r7, dwarf_r7, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r7},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r8",
nullptr,
4,
@@ -438,8 +430,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r8},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r9",
nullptr,
4,
@@ -449,8 +440,7 @@ static RegisterInfo g_register_infos_arm[] = {
{ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r9},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r10",
nullptr,
4,
@@ -461,8 +451,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r10},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r11",
nullptr,
4,
@@ -473,8 +462,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r11},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"r12",
nullptr,
4,
@@ -485,8 +473,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_r12},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"r13",
4,
@@ -497,8 +484,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_sp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r14",
4,
@@ -509,8 +495,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_lr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"r15",
4,
@@ -521,8 +506,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_pc},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cpsr",
"psr",
4,
@@ -533,8 +517,7 @@ static RegisterInfo g_register_infos_arm[] = {
gpr_cpsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"s0",
nullptr,
@@ -546,8 +529,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s0},
nullptr,
g_s0_invalidates,
- nullptr,
- 0},
+ },
{"s1",
nullptr,
4,
@@ -558,8 +540,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s1},
nullptr,
g_s1_invalidates,
- nullptr,
- 0},
+ },
{"s2",
nullptr,
4,
@@ -570,8 +551,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s2},
nullptr,
g_s2_invalidates,
- nullptr,
- 0},
+ },
{"s3",
nullptr,
4,
@@ -582,8 +562,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s3},
nullptr,
g_s3_invalidates,
- nullptr,
- 0},
+ },
{"s4",
nullptr,
4,
@@ -594,8 +573,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s4},
nullptr,
g_s4_invalidates,
- nullptr,
- 0},
+ },
{"s5",
nullptr,
4,
@@ -606,8 +584,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s5},
nullptr,
g_s5_invalidates,
- nullptr,
- 0},
+ },
{"s6",
nullptr,
4,
@@ -618,8 +595,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s6},
nullptr,
g_s6_invalidates,
- nullptr,
- 0},
+ },
{"s7",
nullptr,
4,
@@ -630,8 +606,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s7},
nullptr,
g_s7_invalidates,
- nullptr,
- 0},
+ },
{"s8",
nullptr,
4,
@@ -642,8 +617,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s8},
nullptr,
g_s8_invalidates,
- nullptr,
- 0},
+ },
{"s9",
nullptr,
4,
@@ -654,8 +628,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s9},
nullptr,
g_s9_invalidates,
- nullptr,
- 0},
+ },
{"s10",
nullptr,
4,
@@ -666,8 +639,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s10},
nullptr,
g_s10_invalidates,
- nullptr,
- 0},
+ },
{"s11",
nullptr,
4,
@@ -678,8 +650,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s11},
nullptr,
g_s11_invalidates,
- nullptr,
- 0},
+ },
{"s12",
nullptr,
4,
@@ -690,8 +661,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s12},
nullptr,
g_s12_invalidates,
- nullptr,
- 0},
+ },
{"s13",
nullptr,
4,
@@ -702,8 +672,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s13},
nullptr,
g_s13_invalidates,
- nullptr,
- 0},
+ },
{"s14",
nullptr,
4,
@@ -714,8 +683,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s14},
nullptr,
g_s14_invalidates,
- nullptr,
- 0},
+ },
{"s15",
nullptr,
4,
@@ -726,8 +694,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s15},
nullptr,
g_s15_invalidates,
- nullptr,
- 0},
+ },
{"s16",
nullptr,
4,
@@ -738,8 +705,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s16},
nullptr,
g_s16_invalidates,
- nullptr,
- 0},
+ },
{"s17",
nullptr,
4,
@@ -750,8 +716,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s17},
nullptr,
g_s17_invalidates,
- nullptr,
- 0},
+ },
{"s18",
nullptr,
4,
@@ -762,8 +727,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s18},
nullptr,
g_s18_invalidates,
- nullptr,
- 0},
+ },
{"s19",
nullptr,
4,
@@ -774,8 +738,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s19},
nullptr,
g_s19_invalidates,
- nullptr,
- 0},
+ },
{"s20",
nullptr,
4,
@@ -786,8 +749,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s20},
nullptr,
g_s20_invalidates,
- nullptr,
- 0},
+ },
{"s21",
nullptr,
4,
@@ -798,8 +760,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s21},
nullptr,
g_s21_invalidates,
- nullptr,
- 0},
+ },
{"s22",
nullptr,
4,
@@ -810,8 +771,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s22},
nullptr,
g_s22_invalidates,
- nullptr,
- 0},
+ },
{"s23",
nullptr,
4,
@@ -822,8 +782,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s23},
nullptr,
g_s23_invalidates,
- nullptr,
- 0},
+ },
{"s24",
nullptr,
4,
@@ -834,8 +793,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s24},
nullptr,
g_s24_invalidates,
- nullptr,
- 0},
+ },
{"s25",
nullptr,
4,
@@ -846,8 +804,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s25},
nullptr,
g_s25_invalidates,
- nullptr,
- 0},
+ },
{"s26",
nullptr,
4,
@@ -858,8 +815,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s26},
nullptr,
g_s26_invalidates,
- nullptr,
- 0},
+ },
{"s27",
nullptr,
4,
@@ -870,8 +826,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s27},
nullptr,
g_s27_invalidates,
- nullptr,
- 0},
+ },
{"s28",
nullptr,
4,
@@ -882,8 +837,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s28},
nullptr,
g_s28_invalidates,
- nullptr,
- 0},
+ },
{"s29",
nullptr,
4,
@@ -894,8 +848,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s29},
nullptr,
g_s29_invalidates,
- nullptr,
- 0},
+ },
{"s30",
nullptr,
4,
@@ -906,8 +859,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s30},
nullptr,
g_s30_invalidates,
- nullptr,
- 0},
+ },
{"s31",
nullptr,
4,
@@ -918,8 +870,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_s31},
nullptr,
g_s31_invalidates,
- nullptr,
- 0},
+ },
{"fpscr",
nullptr,
4,
@@ -930,8 +881,7 @@ static RegisterInfo g_register_infos_arm[] = {
LLDB_INVALID_REGNUM, fpu_fpscr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"d0",
nullptr,
@@ -943,8 +893,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d0},
g_d0_contains,
g_d0_invalidates,
- nullptr,
- 0},
+ },
{"d1",
nullptr,
8,
@@ -955,8 +904,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d1},
g_d1_contains,
g_d1_invalidates,
- nullptr,
- 0},
+ },
{"d2",
nullptr,
8,
@@ -967,8 +915,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d2},
g_d2_contains,
g_d2_invalidates,
- nullptr,
- 0},
+ },
{"d3",
nullptr,
8,
@@ -979,8 +926,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d3},
g_d3_contains,
g_d3_invalidates,
- nullptr,
- 0},
+ },
{"d4",
nullptr,
8,
@@ -991,8 +937,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d4},
g_d4_contains,
g_d4_invalidates,
- nullptr,
- 0},
+ },
{"d5",
nullptr,
8,
@@ -1003,8 +948,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d5},
g_d5_contains,
g_d5_invalidates,
- nullptr,
- 0},
+ },
{"d6",
nullptr,
8,
@@ -1015,8 +959,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d6},
g_d6_contains,
g_d6_invalidates,
- nullptr,
- 0},
+ },
{"d7",
nullptr,
8,
@@ -1027,8 +970,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d7},
g_d7_contains,
g_d7_invalidates,
- nullptr,
- 0},
+ },
{"d8",
nullptr,
8,
@@ -1039,8 +981,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d8},
g_d8_contains,
g_d8_invalidates,
- nullptr,
- 0},
+ },
{"d9",
nullptr,
8,
@@ -1051,8 +992,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d9},
g_d9_contains,
g_d9_invalidates,
- nullptr,
- 0},
+ },
{"d10",
nullptr,
8,
@@ -1063,8 +1003,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d10},
g_d10_contains,
g_d10_invalidates,
- nullptr,
- 0},
+ },
{"d11",
nullptr,
8,
@@ -1075,8 +1014,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d11},
g_d11_contains,
g_d11_invalidates,
- nullptr,
- 0},
+ },
{"d12",
nullptr,
8,
@@ -1087,8 +1025,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d12},
g_d12_contains,
g_d12_invalidates,
- nullptr,
- 0},
+ },
{"d13",
nullptr,
8,
@@ -1099,8 +1036,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d13},
g_d13_contains,
g_d13_invalidates,
- nullptr,
- 0},
+ },
{"d14",
nullptr,
8,
@@ -1111,8 +1047,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d14},
g_d14_contains,
g_d14_invalidates,
- nullptr,
- 0},
+ },
{"d15",
nullptr,
8,
@@ -1123,8 +1058,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d15},
g_d15_contains,
g_d15_invalidates,
- nullptr,
- 0},
+ },
{"d16",
nullptr,
8,
@@ -1135,8 +1069,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d16},
nullptr,
g_d16_invalidates,
- nullptr,
- 0},
+ },
{"d17",
nullptr,
8,
@@ -1147,8 +1080,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d17},
nullptr,
g_d17_invalidates,
- nullptr,
- 0},
+ },
{"d18",
nullptr,
8,
@@ -1159,8 +1091,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d18},
nullptr,
g_d18_invalidates,
- nullptr,
- 0},
+ },
{"d19",
nullptr,
8,
@@ -1171,8 +1102,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d19},
nullptr,
g_d19_invalidates,
- nullptr,
- 0},
+ },
{"d20",
nullptr,
8,
@@ -1183,8 +1113,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d20},
nullptr,
g_d20_invalidates,
- nullptr,
- 0},
+ },
{"d21",
nullptr,
8,
@@ -1195,8 +1124,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d21},
nullptr,
g_d21_invalidates,
- nullptr,
- 0},
+ },
{"d22",
nullptr,
8,
@@ -1207,8 +1135,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d22},
nullptr,
g_d22_invalidates,
- nullptr,
- 0},
+ },
{"d23",
nullptr,
8,
@@ -1219,8 +1146,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d23},
nullptr,
g_d23_invalidates,
- nullptr,
- 0},
+ },
{"d24",
nullptr,
8,
@@ -1231,8 +1157,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d24},
nullptr,
g_d24_invalidates,
- nullptr,
- 0},
+ },
{"d25",
nullptr,
8,
@@ -1243,8 +1168,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d25},
nullptr,
g_d25_invalidates,
- nullptr,
- 0},
+ },
{"d26",
nullptr,
8,
@@ -1255,8 +1179,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d26},
nullptr,
g_d26_invalidates,
- nullptr,
- 0},
+ },
{"d27",
nullptr,
8,
@@ -1267,8 +1190,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d27},
nullptr,
g_d27_invalidates,
- nullptr,
- 0},
+ },
{"d28",
nullptr,
8,
@@ -1279,8 +1201,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d28},
nullptr,
g_d28_invalidates,
- nullptr,
- 0},
+ },
{"d29",
nullptr,
8,
@@ -1291,8 +1212,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d29},
nullptr,
g_d29_invalidates,
- nullptr,
- 0},
+ },
{"d30",
nullptr,
8,
@@ -1303,8 +1223,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d30},
nullptr,
g_d30_invalidates,
- nullptr,
- 0},
+ },
{"d31",
nullptr,
8,
@@ -1315,8 +1234,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_d31},
nullptr,
g_d31_invalidates,
- nullptr,
- 0},
+ },
{"q0",
nullptr,
@@ -1328,8 +1246,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q0},
g_q0_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q1",
nullptr,
16,
@@ -1340,8 +1257,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q1},
g_q1_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q2",
nullptr,
16,
@@ -1352,8 +1268,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q2},
g_q2_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q3",
nullptr,
16,
@@ -1364,8 +1279,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q3},
g_q3_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q4",
nullptr,
16,
@@ -1376,8 +1290,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q4},
g_q4_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q5",
nullptr,
16,
@@ -1388,8 +1301,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q5},
g_q5_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q6",
nullptr,
16,
@@ -1400,8 +1312,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q6},
g_q6_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q7",
nullptr,
16,
@@ -1412,8 +1323,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q7},
g_q7_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q8",
nullptr,
16,
@@ -1424,8 +1334,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q8},
g_q8_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q9",
nullptr,
16,
@@ -1436,8 +1345,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q9},
g_q9_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q10",
nullptr,
16,
@@ -1448,8 +1356,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q10},
g_q10_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q11",
nullptr,
16,
@@ -1460,8 +1367,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q11},
g_q11_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q12",
nullptr,
16,
@@ -1472,8 +1378,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q12},
g_q12_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q13",
nullptr,
16,
@@ -1484,8 +1389,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q13},
g_q13_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q14",
nullptr,
16,
@@ -1496,8 +1400,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q14},
g_q14_contains,
nullptr,
- nullptr,
- 0},
+ },
{"q15",
nullptr,
16,
@@ -1508,8 +1411,7 @@ static RegisterInfo g_register_infos_arm[] = {
fpu_q15},
g_q15_contains,
nullptr,
- nullptr,
- 0},
+ },
{"exception",
nullptr,
@@ -1521,8 +1423,7 @@ static RegisterInfo g_register_infos_arm[] = {
LLDB_INVALID_REGNUM, exc_exception},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fsr",
nullptr,
4,
@@ -1533,8 +1434,7 @@ static RegisterInfo g_register_infos_arm[] = {
LLDB_INVALID_REGNUM, exc_fsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"far",
nullptr,
4,
@@ -1545,8 +1445,7 @@ static RegisterInfo g_register_infos_arm[] = {
LLDB_INVALID_REGNUM, exc_far},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{DEFINE_DBG(bvr, 0)},
{DEFINE_DBG(bvr, 1)},
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
index 47cedc31bcd7b..ccfbd6afbefba 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
@@ -489,7 +489,6 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
{ \
#reg, nullptr, 8, GPR_OFFSET(gpr_##reg), lldb::eEncodingUint, \
lldb::eFormatHex, GPR64_KIND(reg, generic_kind), nullptr, nullptr, \
- nullptr, 0 \
}
// Defines a 64-bit general purpose register
@@ -497,7 +496,6 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
{ \
#reg, #alt, 8, GPR_OFFSET(gpr_##reg), lldb::eEncodingUint, \
lldb::eFormatHex, GPR64_KIND(reg, generic_kind), nullptr, nullptr, \
- nullptr, 0 \
}
// Defines a 32-bit general purpose pseudo register
@@ -506,15 +504,14 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
#wreg, nullptr, 4, \
GPR_OFFSET(gpr_##xreg) + GPR_W_PSEUDO_REG_ENDIAN_OFFSET, \
lldb::eEncodingUint, lldb::eFormatHex, LLDB_KIND(gpr_##wreg), \
- g_contained_##xreg, g_##wreg##_invalidates, nullptr, 0 \
+ g_contained_##xreg, g_##wreg##_invalidates, \
}
// Defines a vector register with 16-byte size
#define DEFINE_VREG(reg) \
{ \
#reg, nullptr, 16, FPU_OFFSET(fpu_##reg - fpu_v0), lldb::eEncodingVector, \
- lldb::eFormatVectorOfUInt8, VREG_KIND(reg), nullptr, nullptr, nullptr, \
- 0 \
+ lldb::eFormatVectorOfUInt8, VREG_KIND(reg), nullptr, nullptr, \
}
// Defines S and D pseudo registers mapping over corresponding vector register
@@ -522,7 +519,7 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
{ \
#reg, nullptr, size, FPU_OFFSET(fpu_##vreg - fpu_v0) + offset, \
lldb::eEncodingIEEE754, lldb::eFormatFloat, LLDB_KIND(fpu_##reg), \
- g_contained_##vreg, g_##reg##_invalidates, nullptr, 0 \
+ g_contained_##vreg, g_##reg##_invalidates, \
}
// Defines miscellaneous status and control registers like cpsr, fpsr etc
@@ -530,14 +527,13 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
{ \
#reg, nullptr, size, TYPE##_OFFSET_NAME(reg), lldb::eEncodingUint, \
lldb::eFormatHex, MISC_##TYPE##_KIND(lldb_kind), nullptr, nullptr, \
- nullptr, 0 \
}
// Defines pointer authentication mask registers
#define DEFINE_EXTENSION_REG(reg) \
{ \
#reg, nullptr, 8, 0, lldb::eEncodingUint, lldb::eFormatHex, \
- KIND_ALL_INVALID, nullptr, nullptr, nullptr, 0 \
+ KIND_ALL_INVALID, nullptr, nullptr, \
}
static lldb_private::RegisterInfo g_register_infos_arm64_le[] = {
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
index 9551db7e8ebff..b2837b8f1e981 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
@@ -309,7 +309,6 @@ static uint32_t g_contained_z31[] = {sve_z31, LLDB_INVALID_REGNUM};
{ \
#vreg, nullptr, 16, 0, lldb::eEncodingVector, lldb::eFormatVectorOfUInt8, \
VREG_KIND(vreg), g_contained_##zreg, g_sve_##vreg##_invalidates, \
- nullptr, 0 \
}
// Defines S and D pseudo registers mapping over corresponding vector register
@@ -317,21 +316,20 @@ static uint32_t g_contained_z31[] = {sve_z31, LLDB_INVALID_REGNUM};
{ \
#reg, nullptr, size, 0, lldb::eEncodingIEEE754, lldb::eFormatFloat, \
LLDB_KIND(fpu_##reg), g_contained_##zreg, g_sve_##reg##_invalidates, \
- nullptr, 0 \
}
// Defines a Z vector register with 16-byte default size
#define DEFINE_ZREG(reg) \
{ \
#reg, nullptr, 16, 0, lldb::eEncodingVector, lldb::eFormatVectorOfUInt8, \
- SVE_REG_KIND(reg), nullptr, nullptr, nullptr, 0 \
+ SVE_REG_KIND(reg), nullptr, nullptr, \
}
// Defines a P vector register with 2-byte default size
#define DEFINE_PREG(reg) \
{ \
#reg, nullptr, 2, 0, lldb::eEncodingVector, lldb::eFormatVectorOfUInt8, \
- SVE_REG_KIND(reg), nullptr, nullptr, nullptr, 0 \
+ SVE_REG_KIND(reg), nullptr, nullptr, \
}
static lldb_private::RegisterInfo g_register_infos_arm64_sve_le[] = {
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
index 15c7cac544a11..4b73008adb169 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
@@ -64,7 +64,7 @@
GPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, \
lldb_##reg##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4) \
@@ -72,7 +72,7 @@
#name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, \
lldb_##name##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
// RegisterKind: EHFrame, DWARF, Generic, Process Plugin, LLDB
@@ -84,7 +84,7 @@
stmm[i]), eEncodingVector, eFormatVectorOfUInt8, \
{ehframe_st##i##_i386, dwarf_st##i##_i386, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_st##i##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_FP_MM(reg, i, streg) \
@@ -94,7 +94,7 @@
{dwarf_mm##i##_i386, dwarf_mm##i##_i386, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_mm##i##_i386 }, \
RegisterContextPOSIX_x86::g_contained_##streg##_32, \
- RegisterContextPOSIX_x86::g_invalidate_##streg##_32, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##streg##_32, \
}
#define DEFINE_XMM(reg, i) \
@@ -104,7 +104,7 @@
reg[i]), eEncodingVector, eFormatVectorOfUInt8, \
{ehframe_##reg##i##_i386, dwarf_##reg##i##_i386, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_##reg##i##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
// I believe the YMM registers use dwarf_xmm_%_i386 register numbers and then
@@ -116,7 +116,7 @@
{LLDB_INVALID_REGNUM, dwarf_xmm##i##_i386, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_BNDR(reg, i) \
@@ -125,7 +125,7 @@
LLVM_EXTENSION BNDR_OFFSET(i), eEncodingVector, eFormatVectorOfUInt64, \
{dwarf_##reg##i##_i386, dwarf_##reg##i##_i386, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##reg##i##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_BNDC(name, i) \
@@ -135,7 +135,7 @@
eFormatVectorOfUInt8, \
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##name##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_DR(reg, i) \
@@ -145,7 +145,7 @@
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_i386 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_GPR_PSEUDO_16(reg16, reg32) \
@@ -156,7 +156,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg16##_i386 }, \
RegisterContextPOSIX_x86::g_contained_##reg32, \
- RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg32, \
}
#define DEFINE_GPR_PSEUDO_8H(reg8, reg32) \
@@ -167,7 +167,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg8##_i386 }, \
RegisterContextPOSIX_x86::g_contained_##reg32, \
- RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg32, \
}
#define DEFINE_GPR_PSEUDO_8L(reg8, reg32) \
@@ -178,7 +178,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg8##_i386 }, \
RegisterContextPOSIX_x86::g_contained_##reg32, \
- RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg32, \
}
static RegisterInfo g_register_infos_i386[] = {
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
index 32a8c98fce43c..60811d65ffc5d 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h
@@ -30,22 +30,16 @@
GPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, \
gpr_##reg##_mips64 }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL \
}
-const uint8_t dwarf_opcode_mips64[] = {
- llvm::dwarf::DW_OP_regx, dwarf_sr_mips64, llvm::dwarf::DW_OP_lit1,
- llvm::dwarf::DW_OP_lit26, llvm::dwarf::DW_OP_shl, llvm::dwarf::DW_OP_and,
- llvm::dwarf::DW_OP_lit26, llvm::dwarf::DW_OP_shr};
-
#define DEFINE_FPR(reg, alt, kind1, kind2, kind3) \
{ \
#reg, alt, sizeof(((FPR_freebsd_mips *) 0)->reg), \
FPR_OFFSET(reg), eEncodingIEEE754, eFormatFloat, \
{kind1, kind2, kind3, LLDB_INVALID_REGNUM, \
fpr_##reg##_mips64 }, \
- NULL, NULL, dwarf_opcode_mips64, \
- sizeof(dwarf_opcode_mips64) \
+ NULL, NULL, \
}
#define DEFINE_FPR_INFO(reg, alt, kind1, kind2, kind3) \
@@ -54,7 +48,7 @@ const uint8_t dwarf_opcode_mips64[] = {
FPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, LLDB_INVALID_REGNUM, \
fpr_##reg##_mips64 }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
index 09f9430e693fd..0fd0a526f9214 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
@@ -24,7 +24,7 @@
dwarf_##reg##_powerpc, lldb_kind, \
LLDB_INVALID_REGNUM, \
gpr_##reg##_powerpc }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_FPR(reg, lldb_kind) \
{ \
@@ -32,7 +32,7 @@
{dwarf_##reg##_powerpc, dwarf_##reg##_powerpc, \
lldb_kind, LLDB_INVALID_REGNUM, \
fpr_##reg##_powerpc }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_VMX(reg, lldb_kind) \
{ \
@@ -40,7 +40,7 @@
{dwarf_##reg##_powerpc, dwarf_##reg##_powerpc, \
lldb_kind, LLDB_INVALID_REGNUM, \
vmx_##reg##_powerpc }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
// General purpose registers. EH_Frame, DWARF,
@@ -125,8 +125,7 @@
LLDB_INVALID_REGNUM, fpr_fpscr_powerpc}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
DEFINE_VMX(v0, LLDB_INVALID_REGNUM), \
DEFINE_VMX(v1, LLDB_INVALID_REGNUM), \
DEFINE_VMX(v2, LLDB_INVALID_REGNUM), \
@@ -169,8 +168,7 @@
LLDB_INVALID_REGNUM, vmx_vrsave_powerpc}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
{"vscr", \
NULL, \
4, \
@@ -181,8 +179,7 @@
LLDB_INVALID_REGNUM, vmx_vscr_powerpc}, \
NULL, \
NULL, \
- NULL, \
- 0},
+ },
static RegisterInfo g_register_infos_powerpc64[] = {
#define GPR GPR64
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
index c321b54ac8d42..19f2e56277036 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
@@ -31,7 +31,7 @@
lldb_kind, \
LLDB_INVALID_REGNUM, \
gpr_##reg##_ppc64 }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_FPR_PPC64(reg, alt, lldb_kind) \
{ \
@@ -40,7 +40,7 @@
{ppc64_dwarf::dwarf_##reg##_ppc64, \
ppc64_dwarf::dwarf_##reg##_ppc64, lldb_kind, LLDB_INVALID_REGNUM, \
fpr_##reg##_ppc64 }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_VMX_PPC64(reg, lldb_kind) \
{ \
@@ -49,7 +49,7 @@
{ppc64_dwarf::dwarf_##reg##_ppc64, \
ppc64_dwarf::dwarf_##reg##_ppc64, lldb_kind, LLDB_INVALID_REGNUM, \
vmx_##reg##_ppc64 }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
// General purpose registers.
@@ -136,8 +136,7 @@
LLDB_INVALID_REGNUM, fpr_fpscr_ppc64}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
DEFINE_VMX_PPC64(vr0, LLDB_INVALID_REGNUM), \
DEFINE_VMX_PPC64(vr1, LLDB_INVALID_REGNUM), \
DEFINE_VMX_PPC64(vr2, LLDB_INVALID_REGNUM), \
@@ -180,8 +179,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, vmx_vscr_ppc64}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
{"vrsave", \
NULL, \
4, \
@@ -193,8 +191,7 @@
LLDB_INVALID_REGNUM, vmx_vrsave_ppc64}, \
NULL, \
NULL, \
- NULL, \
- 0}, /* */
+ }, /* */
typedef struct _GPR_PPC64 {
uint64_t r0;
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
index 557d476ae009e..f8f8651c856c7 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
@@ -31,7 +31,7 @@
lldb_kind, \
LLDB_INVALID_REGNUM, \
gpr_##reg##_ppc64le }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_FPR(reg, alt, lldb_kind) \
{ \
@@ -39,7 +39,7 @@
{ppc64le_dwarf::dwarf_##reg##_ppc64le, \
ppc64le_dwarf::dwarf_##reg##_ppc64le, lldb_kind, LLDB_INVALID_REGNUM, \
fpr_##reg##_ppc64le }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_VMX(reg, lldb_kind) \
{ \
@@ -48,7 +48,7 @@
{ppc64le_dwarf::dwarf_##reg##_ppc64le, \
ppc64le_dwarf::dwarf_##reg##_ppc64le, lldb_kind, LLDB_INVALID_REGNUM, \
vmx_##reg##_ppc64le }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_VSX(reg, lldb_kind) \
{ \
@@ -57,7 +57,7 @@
{ppc64le_dwarf::dwarf_##reg##_ppc64le, \
ppc64le_dwarf::dwarf_##reg##_ppc64le, lldb_kind, LLDB_INVALID_REGNUM, \
vsx_##reg##_ppc64le }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
// General purpose registers.
@@ -147,8 +147,7 @@
LLDB_INVALID_REGNUM, fpr_fpscr_ppc64le}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
DEFINE_VMX(vr0, LLDB_INVALID_REGNUM), \
DEFINE_VMX(vr1, LLDB_INVALID_REGNUM), \
DEFINE_VMX(vr2, LLDB_INVALID_REGNUM), \
@@ -191,8 +190,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, vmx_vscr_ppc64le}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
{"vrsave", \
NULL, \
4, \
@@ -204,8 +202,7 @@
LLDB_INVALID_REGNUM, vmx_vrsave_ppc64le}, \
NULL, \
NULL, \
- NULL, \
- 0}, \
+ }, \
DEFINE_VSX(vs0, LLDB_INVALID_REGNUM), \
DEFINE_VSX(vs1, LLDB_INVALID_REGNUM), \
DEFINE_VSX(vs2, LLDB_INVALID_REGNUM), \
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
index faeb92114b1eb..65878b04eed84 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
@@ -27,7 +27,7 @@
#name, alt, size, offset, eEncodingUint, eFormatHex, \
{dwarf_##name##_s390x, dwarf_##name##_s390x, generic, \
LLDB_INVALID_REGNUM, lldb_##name##_s390x }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_GPR_NODWARF(name, size, offset, alt, generic) \
@@ -35,7 +35,7 @@
#name, alt, size, offset, eEncodingUint, eFormatHex, \
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, generic, \
LLDB_INVALID_REGNUM, lldb_##name##_s390x }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_FPR(name, size, offset) \
@@ -43,7 +43,7 @@
#name, NULL, size, offset, eEncodingUint, eFormatHex, \
{dwarf_##name##_s390x, dwarf_##name##_s390x, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##name##_s390x }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
#define DEFINE_FPR_NODWARF(name, size, offset) \
@@ -51,7 +51,7 @@
#name, NULL, size, offset, eEncodingUint, eFormatHex, \
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##name##_s390x }, \
- NULL, NULL, NULL, 0 \
+ NULL, NULL, \
}
static RegisterInfo g_register_infos_s390x[] = {
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
index c956005c49b4c..1de67165fb2f1 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
@@ -67,7 +67,7 @@
GPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, \
lldb_##reg##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4) \
@@ -75,7 +75,7 @@
#name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, \
lldb_##name##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_FP_ST(reg, i) \
@@ -85,7 +85,7 @@
stmm[i]), eEncodingVector, eFormatVectorOfUInt8, \
{dwarf_st##i##_x86_64, dwarf_st##i##_x86_64, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_st##i##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_FP_MM(reg, i, streg) \
@@ -95,7 +95,7 @@
{dwarf_mm##i##_x86_64, dwarf_mm##i##_x86_64, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_mm##i##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##streg##_64, \
- RegisterContextPOSIX_x86::g_invalidate_##streg##_64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##streg##_64, \
}
#define DEFINE_XMM(reg, i) \
@@ -106,7 +106,7 @@
{dwarf_##reg##i##_x86_64, dwarf_##reg##i##_x86_64, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_YMM(reg, i) \
@@ -117,7 +117,7 @@
dwarf_##reg##i##h_x86_64, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_BNDR(reg, i) \
@@ -128,7 +128,7 @@
dwarf_##reg##i##_x86_64, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_BNDC(name, i) \
@@ -137,7 +137,7 @@
LLVM_EXTENSION BNDC_OFFSET(i), eEncodingVector, eFormatVectorOfUInt8, \
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, lldb_##name##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_DR(reg, i) \
@@ -147,7 +147,7 @@
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg##i##_x86_64 }, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEFINE_GPR_PSEUDO_32(reg32, reg64) \
@@ -158,7 +158,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg32##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##reg64, \
- RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg64, \
}
#define DEFINE_GPR_PSEUDO_16(reg16, reg64) \
@@ -169,7 +169,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg16##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##reg64, \
- RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg64, \
}
#define DEFINE_GPR_PSEUDO_8H(reg8, reg64) \
@@ -180,7 +180,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg8##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##reg64, \
- RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg64, \
}
#define DEFINE_GPR_PSEUDO_8L(reg8, reg64) \
@@ -191,7 +191,7 @@
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
lldb_##reg8##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##reg64, \
- RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg64, \
}
#define DEFINE_FPR_32(name, reg, kind1, kind2, kind3, kind4, reg64) \
@@ -199,7 +199,7 @@
#name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \
{kind1, kind2, kind3, kind4, lldb_##name##_x86_64 }, \
RegisterContextPOSIX_x86::g_contained_##reg64, \
- RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \
+ RegisterContextPOSIX_x86::g_invalidate_##reg64, \
}
// clang-format off
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
index cd8537812eff1..8a86734b3da9e 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -1827,13 +1827,6 @@ GDBRemoteCommunicationServerLLGS::Handle_qRegisterInfo(
response.PutChar(';');
}
- if (reg_info->dynamic_size_dwarf_expr_bytes) {
- const size_t dwarf_opcode_len = reg_info->dynamic_size_dwarf_len;
- response.PutCString("dynamic_size_dwarf_expr_bytes:");
- for (uint32_t i = 0; i < dwarf_opcode_len; ++i)
- response.PutHex8(reg_info->dynamic_size_dwarf_expr_bytes[i]);
- response.PutChar(';');
- }
return SendPacketNoLock(response.GetString());
}
@@ -2071,12 +2064,8 @@ GDBRemoteCommunicationServerLLGS::Handle_P(StringExtractorGDBRemote &packet) {
return SendErrorResponse(0x47);
}
- // The dwarf expression are evaluate on host site which may cause register
- // size to change Hence the reg_size may not be same as reg_info->bytes_size
- if ((reg_size != reg_info->byte_size) &&
- !(reg_info->dynamic_size_dwarf_expr_bytes)) {
+ if (reg_size != reg_info->byte_size)
return SendIllFormedResponse(packet, "P packet register size is incorrect");
- }
// Build the reginfos response.
StreamGDBRemote response;
@@ -2916,14 +2905,6 @@ GDBRemoteCommunicationServerLLGS::BuildTargetXml() {
response.Printf("\" ");
}
- if (reg_info->dynamic_size_dwarf_expr_bytes) {
- const size_t dwarf_opcode_len = reg_info->dynamic_size_dwarf_len;
- response.PutCString("dynamic_size_dwarf_expr_bytes=\"");
- for (uint32_t i = 0; i < dwarf_opcode_len; ++i)
- response.PutHex8(reg_info->dynamic_size_dwarf_expr_bytes[i]);
- response.Printf("\" ");
- }
-
response.Printf("/>");
}
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
index 92a5227a9a3a8..b80498069f164 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -69,14 +69,7 @@ size_t GDBRemoteRegisterContext::GetRegisterCount() {
const RegisterInfo *
GDBRemoteRegisterContext::GetRegisterInfoAtIndex(size_t reg) {
- RegisterInfo *reg_info = m_reg_info_sp->GetRegisterInfoAtIndex(reg);
-
- if (reg_info && reg_info->dynamic_size_dwarf_expr_bytes) {
- const ArchSpec &arch = m_thread.GetProcess()->GetTarget().GetArchitecture();
- uint8_t reg_size = UpdateDynamicRegisterSize(arch, reg_info);
- reg_info->byte_size = reg_size;
- }
- return reg_info;
+ return m_reg_info_sp->GetRegisterInfoAtIndex(reg);
}
size_t GDBRemoteRegisterContext::GetRegisterSetCount() {
@@ -832,115 +825,115 @@ void GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters(bool from_scratch) {
// clang-format off
static RegisterInfo g_register_infos[] = {
-// NAME ALT SZ OFF ENCODING FORMAT EH_FRAME DWARF GENERIC PROCESS PLUGIN LLDB VALUE REGS INVALIDATE REGS SIZE EXPR SIZE LEN
-// ====== ====== === === ============= ========== =================== =================== ====================== ============= ==== ========== =============== ========= ========
- { "r0", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1,0, 0 }, nullptr, nullptr, nullptr, 0 },
- { "r1", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2,1, 1 }, nullptr, nullptr, nullptr, 0 },
- { "r2", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3,2, 2 }, nullptr, nullptr, nullptr, 0 },
- { "r3", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4,3, 3 }, nullptr, nullptr, nullptr, 0 },
- { "r4", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, 4, 4 }, nullptr, nullptr, nullptr, 0 },
- { "r5", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, 5, 5 }, nullptr, nullptr, nullptr, 0 },
- { "r6", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, 6, 6 }, nullptr, nullptr, nullptr, 0 },
- { "r7", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, 7, 7 }, nullptr, nullptr, nullptr, 0 },
- { "r8", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, 8, 8 }, nullptr, nullptr, nullptr, 0 },
- { "r9", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, 9, 9 }, nullptr, nullptr, nullptr, 0 },
- { "r10", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, 10, 10 }, nullptr, nullptr, nullptr, 0 },
- { "r11", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, 11, 11 }, nullptr, nullptr, nullptr, 0 },
- { "r12", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, 12, 12 }, nullptr, nullptr, nullptr, 0 },
- { "sp", "r13", 4, 0, eEncodingUint, eFormatHex, { ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, 13, 13 }, nullptr, nullptr, nullptr, 0 },
- { "lr", "r14", 4, 0, eEncodingUint, eFormatHex, { ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, 14, 14 }, nullptr, nullptr, nullptr, 0 },
- { "pc", "r15", 4, 0, eEncodingUint, eFormatHex, { ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, 15, 15 }, nullptr, nullptr, nullptr, 0 },
- { "f0", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 16, 16 }, nullptr, nullptr, nullptr, 0 },
- { "f1", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 17, 17 }, nullptr, nullptr, nullptr, 0 },
- { "f2", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 18, 18 }, nullptr, nullptr, nullptr, 0 },
- { "f3", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 19, 19 }, nullptr, nullptr, nullptr, 0 },
- { "f4", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 20, 20 }, nullptr, nullptr, nullptr, 0 },
- { "f5", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 21, 21 }, nullptr, nullptr, nullptr, 0 },
- { "f6", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 22, 22 }, nullptr, nullptr, nullptr, 0 },
- { "f7", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 23, 23 }, nullptr, nullptr, nullptr, 0 },
- { "fps", nullptr, 4, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 24, 24 }, nullptr, nullptr, nullptr, 0 },
- { "cpsr","flags", 4, 0, eEncodingUint, eFormatHex, { ehframe_cpsr, dwarf_cpsr, LLDB_INVALID_REGNUM, 25, 25 }, nullptr, nullptr, nullptr, 0 },
- { "s0", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM, 26, 26 }, nullptr, nullptr, nullptr, 0 },
- { "s1", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM, 27, 27 }, nullptr, nullptr, nullptr, 0 },
- { "s2", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM, 28, 28 }, nullptr, nullptr, nullptr, 0 },
- { "s3", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM, 29, 29 }, nullptr, nullptr, nullptr, 0 },
- { "s4", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM, 30, 30 }, nullptr, nullptr, nullptr, 0 },
- { "s5", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM, 31, 31 }, nullptr, nullptr, nullptr, 0 },
- { "s6", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM, 32, 32 }, nullptr, nullptr, nullptr, 0 },
- { "s7", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM, 33, 33 }, nullptr, nullptr, nullptr, 0 },
- { "s8", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM, 34, 34 }, nullptr, nullptr, nullptr, 0 },
- { "s9", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM, 35, 35 }, nullptr, nullptr, nullptr, 0 },
- { "s10", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM, 36, 36 }, nullptr, nullptr, nullptr, 0 },
- { "s11", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM, 37, 37 }, nullptr, nullptr, nullptr, 0 },
- { "s12", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM, 38, 38 }, nullptr, nullptr, nullptr, 0 },
- { "s13", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM, 39, 39 }, nullptr, nullptr, nullptr, 0 },
- { "s14", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM, 40, 40 }, nullptr, nullptr, nullptr, 0 },
- { "s15", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM, 41, 41 }, nullptr, nullptr, nullptr, 0 },
- { "s16", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM, 42, 42 }, nullptr, nullptr, nullptr, 0 },
- { "s17", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM, 43, 43 }, nullptr, nullptr, nullptr, 0 },
- { "s18", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM, 44, 44 }, nullptr, nullptr, nullptr, 0 },
- { "s19", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM, 45, 45 }, nullptr, nullptr, nullptr, 0 },
- { "s20", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM, 46, 46 }, nullptr, nullptr, nullptr, 0 },
- { "s21", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM, 47, 47 }, nullptr, nullptr, nullptr, 0 },
- { "s22", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM, 48, 48 }, nullptr, nullptr, nullptr, 0 },
- { "s23", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM, 49, 49 }, nullptr, nullptr, nullptr, 0 },
- { "s24", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM, 50, 50 }, nullptr, nullptr, nullptr, 0 },
- { "s25", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM, 51, 51 }, nullptr, nullptr, nullptr, 0 },
- { "s26", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM, 52, 52 }, nullptr, nullptr, nullptr, 0 },
- { "s27", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM, 53, 53 }, nullptr, nullptr, nullptr, 0 },
- { "s28", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM, 54, 54 }, nullptr, nullptr, nullptr, 0 },
- { "s29", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM, 55, 55 }, nullptr, nullptr, nullptr, 0 },
- { "s30", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM, 56, 56 }, nullptr, nullptr, nullptr, 0 },
- { "s31", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM, 57, 57 }, nullptr, nullptr, nullptr, 0 },
- { "fpscr",nullptr, 4, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 58, 58 }, nullptr, nullptr, nullptr, 0 },
- { "d16", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM, 59, 59 }, nullptr, nullptr, nullptr, 0 },
- { "d17", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM, 60, 60 }, nullptr, nullptr, nullptr, 0 },
- { "d18", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM, 61, 61 }, nullptr, nullptr, nullptr, 0 },
- { "d19", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM, 62, 62 }, nullptr, nullptr, nullptr, 0 },
- { "d20", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM, 63, 63 }, nullptr, nullptr, nullptr, 0 },
- { "d21", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM, 64, 64 }, nullptr, nullptr, nullptr, 0 },
- { "d22", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM, 65, 65 }, nullptr, nullptr, nullptr, 0 },
- { "d23", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM, 66, 66 }, nullptr, nullptr, nullptr, 0 },
- { "d24", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM, 67, 67 }, nullptr, nullptr, nullptr, 0 },
- { "d25", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM, 68, 68 }, nullptr, nullptr, nullptr, 0 },
- { "d26", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM, 69, 69 }, nullptr, nullptr, nullptr, 0 },
- { "d27", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM, 70, 70 }, nullptr, nullptr, nullptr, 0 },
- { "d28", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM, 71, 71 }, nullptr, nullptr, nullptr, 0 },
- { "d29", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM, 72, 72 }, nullptr, nullptr, nullptr, 0 },
- { "d30", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, 73, 73 }, nullptr, nullptr, nullptr, 0 },
- { "d31", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, 74, 74 }, nullptr, nullptr, nullptr, 0 },
- { "d0", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM, 75, 75 }, g_d0_regs, nullptr, nullptr, 0 },
- { "d1", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM, 76, 76 }, g_d1_regs, nullptr, nullptr, 0 },
- { "d2", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM, 77, 77 }, g_d2_regs, nullptr, nullptr, 0 },
- { "d3", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM, 78, 78 }, g_d3_regs, nullptr, nullptr, 0 },
- { "d4", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM, 79, 79 }, g_d4_regs, nullptr, nullptr, 0 },
- { "d5", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM, 80, 80 }, g_d5_regs, nullptr, nullptr, 0 },
- { "d6", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM, 81, 81 }, g_d6_regs, nullptr, nullptr, 0 },
- { "d7", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM, 82, 82 }, g_d7_regs, nullptr, nullptr, 0 },
- { "d8", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM, 83, 83 }, g_d8_regs, nullptr, nullptr, 0 },
- { "d9", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM, 84, 84 }, g_d9_regs, nullptr, nullptr, 0 },
- { "d10", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM, 85, 85 }, g_d10_regs, nullptr, nullptr, 0 },
- { "d11", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM, 86, 86 }, g_d11_regs, nullptr, nullptr, 0 },
- { "d12", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM, 87, 87 }, g_d12_regs, nullptr, nullptr, 0 },
- { "d13", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM, 88, 88 }, g_d13_regs, nullptr, nullptr, 0 },
- { "d14", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM, 89, 89 }, g_d14_regs, nullptr, nullptr, 0 },
- { "d15", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM, 90, 90 }, g_d15_regs, nullptr, nullptr, 0 },
- { "q0", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q0, LLDB_INVALID_REGNUM, 91, 91 }, g_q0_regs, nullptr, nullptr, 0 },
- { "q1", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q1, LLDB_INVALID_REGNUM, 92, 92 }, g_q1_regs, nullptr, nullptr, 0 },
- { "q2", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q2, LLDB_INVALID_REGNUM, 93, 93 }, g_q2_regs, nullptr, nullptr, 0 },
- { "q3", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q3, LLDB_INVALID_REGNUM, 94, 94 }, g_q3_regs, nullptr, nullptr, 0 },
- { "q4", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q4, LLDB_INVALID_REGNUM, 95, 95 }, g_q4_regs, nullptr, nullptr, 0 },
- { "q5", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q5, LLDB_INVALID_REGNUM, 96, 96 }, g_q5_regs, nullptr, nullptr, 0 },
- { "q6", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q6, LLDB_INVALID_REGNUM, 97, 97 }, g_q6_regs, nullptr, nullptr, 0 },
- { "q7", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q7, LLDB_INVALID_REGNUM, 98, 98 }, g_q7_regs, nullptr, nullptr, 0 },
- { "q8", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q8, LLDB_INVALID_REGNUM, 99, 99 }, g_q8_regs, nullptr, nullptr, 0 },
- { "q9", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q9, LLDB_INVALID_REGNUM, 100, 100 }, g_q9_regs, nullptr, nullptr, 0 },
- { "q10", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q10, LLDB_INVALID_REGNUM, 101, 101 }, g_q10_regs, nullptr, nullptr, 0 },
- { "q11", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q11, LLDB_INVALID_REGNUM, 102, 102 }, g_q11_regs, nullptr, nullptr, 0 },
- { "q12", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q12, LLDB_INVALID_REGNUM, 103, 103 }, g_q12_regs, nullptr, nullptr, 0 },
- { "q13", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q13, LLDB_INVALID_REGNUM, 104, 104 }, g_q13_regs, nullptr, nullptr, 0 },
- { "q14", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q14, LLDB_INVALID_REGNUM, 105, 105 }, g_q14_regs, nullptr, nullptr, 0 },
- { "q15", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q15, LLDB_INVALID_REGNUM, 106, 106 }, g_q15_regs, nullptr, nullptr, 0 }
+// NAME ALT SZ OFF ENCODING FORMAT EH_FRAME DWARF GENERIC PROCESS PLUGIN LLDB VALUE REGS INVALIDATE REGS
+// ====== ====== === === ============= ========== =================== =================== ====================== ============= ==== ========== ===============
+ { "r0", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1,0, 0 }, nullptr, nullptr },
+ { "r1", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2,1, 1 }, nullptr, nullptr },
+ { "r2", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3,2, 2 }, nullptr, nullptr },
+ { "r3", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4,3, 3 }, nullptr, nullptr },
+ { "r4", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, 4, 4 }, nullptr, nullptr },
+ { "r5", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, 5, 5 }, nullptr, nullptr },
+ { "r6", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, 6, 6 }, nullptr, nullptr },
+ { "r7", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, 7, 7 }, nullptr, nullptr },
+ { "r8", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, 8, 8 }, nullptr, nullptr },
+ { "r9", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, 9, 9 }, nullptr, nullptr },
+ { "r10", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r10, dwarf_r10, LLDB_INVALID_REGNUM, 10, 10 }, nullptr, nullptr },
+ { "r11", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r11, dwarf_r11, LLDB_INVALID_REGNUM, 11, 11 }, nullptr, nullptr },
+ { "r12", nullptr, 4, 0, eEncodingUint, eFormatHex, { ehframe_r12, dwarf_r12, LLDB_INVALID_REGNUM, 12, 12 }, nullptr, nullptr },
+ { "sp", "r13", 4, 0, eEncodingUint, eFormatHex, { ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, 13, 13 }, nullptr, nullptr },
+ { "lr", "r14", 4, 0, eEncodingUint, eFormatHex, { ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, 14, 14 }, nullptr, nullptr },
+ { "pc", "r15", 4, 0, eEncodingUint, eFormatHex, { ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, 15, 15 }, nullptr, nullptr },
+ { "f0", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 16, 16 }, nullptr, nullptr },
+ { "f1", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 17, 17 }, nullptr, nullptr },
+ { "f2", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 18, 18 }, nullptr, nullptr },
+ { "f3", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 19, 19 }, nullptr, nullptr },
+ { "f4", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 20, 20 }, nullptr, nullptr },
+ { "f5", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 21, 21 }, nullptr, nullptr },
+ { "f6", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 22, 22 }, nullptr, nullptr },
+ { "f7", nullptr, 12, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 23, 23 }, nullptr, nullptr },
+ { "fps", nullptr, 4, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 24, 24 }, nullptr, nullptr },
+ { "cpsr","flags", 4, 0, eEncodingUint, eFormatHex, { ehframe_cpsr, dwarf_cpsr, LLDB_INVALID_REGNUM, 25, 25 }, nullptr, nullptr },
+ { "s0", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s0, LLDB_INVALID_REGNUM, 26, 26 }, nullptr, nullptr },
+ { "s1", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s1, LLDB_INVALID_REGNUM, 27, 27 }, nullptr, nullptr },
+ { "s2", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s2, LLDB_INVALID_REGNUM, 28, 28 }, nullptr, nullptr },
+ { "s3", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s3, LLDB_INVALID_REGNUM, 29, 29 }, nullptr, nullptr },
+ { "s4", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s4, LLDB_INVALID_REGNUM, 30, 30 }, nullptr, nullptr },
+ { "s5", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s5, LLDB_INVALID_REGNUM, 31, 31 }, nullptr, nullptr },
+ { "s6", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s6, LLDB_INVALID_REGNUM, 32, 32 }, nullptr, nullptr },
+ { "s7", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s7, LLDB_INVALID_REGNUM, 33, 33 }, nullptr, nullptr },
+ { "s8", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s8, LLDB_INVALID_REGNUM, 34, 34 }, nullptr, nullptr },
+ { "s9", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s9, LLDB_INVALID_REGNUM, 35, 35 }, nullptr, nullptr },
+ { "s10", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s10, LLDB_INVALID_REGNUM, 36, 36 }, nullptr, nullptr },
+ { "s11", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s11, LLDB_INVALID_REGNUM, 37, 37 }, nullptr, nullptr },
+ { "s12", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s12, LLDB_INVALID_REGNUM, 38, 38 }, nullptr, nullptr },
+ { "s13", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s13, LLDB_INVALID_REGNUM, 39, 39 }, nullptr, nullptr },
+ { "s14", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s14, LLDB_INVALID_REGNUM, 40, 40 }, nullptr, nullptr },
+ { "s15", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s15, LLDB_INVALID_REGNUM, 41, 41 }, nullptr, nullptr },
+ { "s16", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s16, LLDB_INVALID_REGNUM, 42, 42 }, nullptr, nullptr },
+ { "s17", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s17, LLDB_INVALID_REGNUM, 43, 43 }, nullptr, nullptr },
+ { "s18", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s18, LLDB_INVALID_REGNUM, 44, 44 }, nullptr, nullptr },
+ { "s19", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s19, LLDB_INVALID_REGNUM, 45, 45 }, nullptr, nullptr },
+ { "s20", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s20, LLDB_INVALID_REGNUM, 46, 46 }, nullptr, nullptr },
+ { "s21", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s21, LLDB_INVALID_REGNUM, 47, 47 }, nullptr, nullptr },
+ { "s22", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s22, LLDB_INVALID_REGNUM, 48, 48 }, nullptr, nullptr },
+ { "s23", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s23, LLDB_INVALID_REGNUM, 49, 49 }, nullptr, nullptr },
+ { "s24", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s24, LLDB_INVALID_REGNUM, 50, 50 }, nullptr, nullptr },
+ { "s25", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s25, LLDB_INVALID_REGNUM, 51, 51 }, nullptr, nullptr },
+ { "s26", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s26, LLDB_INVALID_REGNUM, 52, 52 }, nullptr, nullptr },
+ { "s27", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s27, LLDB_INVALID_REGNUM, 53, 53 }, nullptr, nullptr },
+ { "s28", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s28, LLDB_INVALID_REGNUM, 54, 54 }, nullptr, nullptr },
+ { "s29", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s29, LLDB_INVALID_REGNUM, 55, 55 }, nullptr, nullptr },
+ { "s30", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s30, LLDB_INVALID_REGNUM, 56, 56 }, nullptr, nullptr },
+ { "s31", nullptr, 4, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_s31, LLDB_INVALID_REGNUM, 57, 57 }, nullptr, nullptr },
+ { "fpscr",nullptr, 4, 0, eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 58, 58 }, nullptr, nullptr },
+ { "d16", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d16, LLDB_INVALID_REGNUM, 59, 59 }, nullptr, nullptr },
+ { "d17", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d17, LLDB_INVALID_REGNUM, 60, 60 }, nullptr, nullptr },
+ { "d18", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d18, LLDB_INVALID_REGNUM, 61, 61 }, nullptr, nullptr },
+ { "d19", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d19, LLDB_INVALID_REGNUM, 62, 62 }, nullptr, nullptr },
+ { "d20", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d20, LLDB_INVALID_REGNUM, 63, 63 }, nullptr, nullptr },
+ { "d21", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d21, LLDB_INVALID_REGNUM, 64, 64 }, nullptr, nullptr },
+ { "d22", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d22, LLDB_INVALID_REGNUM, 65, 65 }, nullptr, nullptr },
+ { "d23", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d23, LLDB_INVALID_REGNUM, 66, 66 }, nullptr, nullptr },
+ { "d24", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d24, LLDB_INVALID_REGNUM, 67, 67 }, nullptr, nullptr },
+ { "d25", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d25, LLDB_INVALID_REGNUM, 68, 68 }, nullptr, nullptr },
+ { "d26", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d26, LLDB_INVALID_REGNUM, 69, 69 }, nullptr, nullptr },
+ { "d27", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d27, LLDB_INVALID_REGNUM, 70, 70 }, nullptr, nullptr },
+ { "d28", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d28, LLDB_INVALID_REGNUM, 71, 71 }, nullptr, nullptr },
+ { "d29", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d29, LLDB_INVALID_REGNUM, 72, 72 }, nullptr, nullptr },
+ { "d30", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, 73, 73 }, nullptr, nullptr },
+ { "d31", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, 74, 74 }, nullptr, nullptr },
+ { "d0", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d0, LLDB_INVALID_REGNUM, 75, 75 }, g_d0_regs, nullptr },
+ { "d1", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d1, LLDB_INVALID_REGNUM, 76, 76 }, g_d1_regs, nullptr },
+ { "d2", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d2, LLDB_INVALID_REGNUM, 77, 77 }, g_d2_regs, nullptr },
+ { "d3", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d3, LLDB_INVALID_REGNUM, 78, 78 }, g_d3_regs, nullptr },
+ { "d4", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d4, LLDB_INVALID_REGNUM, 79, 79 }, g_d4_regs, nullptr },
+ { "d5", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d5, LLDB_INVALID_REGNUM, 80, 80 }, g_d5_regs, nullptr },
+ { "d6", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d6, LLDB_INVALID_REGNUM, 81, 81 }, g_d6_regs, nullptr },
+ { "d7", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d7, LLDB_INVALID_REGNUM, 82, 82 }, g_d7_regs, nullptr },
+ { "d8", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d8, LLDB_INVALID_REGNUM, 83, 83 }, g_d8_regs, nullptr },
+ { "d9", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d9, LLDB_INVALID_REGNUM, 84, 84 }, g_d9_regs, nullptr },
+ { "d10", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d10, LLDB_INVALID_REGNUM, 85, 85 }, g_d10_regs, nullptr },
+ { "d11", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d11, LLDB_INVALID_REGNUM, 86, 86 }, g_d11_regs, nullptr },
+ { "d12", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d12, LLDB_INVALID_REGNUM, 87, 87 }, g_d12_regs, nullptr },
+ { "d13", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d13, LLDB_INVALID_REGNUM, 88, 88 }, g_d13_regs, nullptr },
+ { "d14", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d14, LLDB_INVALID_REGNUM, 89, 89 }, g_d14_regs, nullptr },
+ { "d15", nullptr, 8, 0, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d15, LLDB_INVALID_REGNUM, 90, 90 }, g_d15_regs, nullptr },
+ { "q0", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q0, LLDB_INVALID_REGNUM, 91, 91 }, g_q0_regs, nullptr },
+ { "q1", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q1, LLDB_INVALID_REGNUM, 92, 92 }, g_q1_regs, nullptr },
+ { "q2", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q2, LLDB_INVALID_REGNUM, 93, 93 }, g_q2_regs, nullptr },
+ { "q3", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q3, LLDB_INVALID_REGNUM, 94, 94 }, g_q3_regs, nullptr },
+ { "q4", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q4, LLDB_INVALID_REGNUM, 95, 95 }, g_q4_regs, nullptr },
+ { "q5", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q5, LLDB_INVALID_REGNUM, 96, 96 }, g_q5_regs, nullptr },
+ { "q6", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q6, LLDB_INVALID_REGNUM, 97, 97 }, g_q6_regs, nullptr },
+ { "q7", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q7, LLDB_INVALID_REGNUM, 98, 98 }, g_q7_regs, nullptr },
+ { "q8", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q8, LLDB_INVALID_REGNUM, 99, 99 }, g_q8_regs, nullptr },
+ { "q9", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q9, LLDB_INVALID_REGNUM, 100, 100 }, g_q9_regs, nullptr },
+ { "q10", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q10, LLDB_INVALID_REGNUM, 101, 101 }, g_q10_regs, nullptr },
+ { "q11", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q11, LLDB_INVALID_REGNUM, 102, 102 }, g_q11_regs, nullptr },
+ { "q12", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q12, LLDB_INVALID_REGNUM, 103, 103 }, g_q12_regs, nullptr },
+ { "q13", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q13, LLDB_INVALID_REGNUM, 104, 104 }, g_q13_regs, nullptr },
+ { "q14", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q14, LLDB_INVALID_REGNUM, 105, 105 }, g_q14_regs, nullptr },
+ { "q15", nullptr, 16, 0, eEncodingVector, eFormatVectorOfUInt8, { LLDB_INVALID_REGNUM, dwarf_q15, LLDB_INVALID_REGNUM, 106, 106 }, g_q15_regs, nullptr }
};
// clang-format on
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 66e33592ba632..2b01da289d63e 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -509,17 +509,6 @@ void ProcessGDBRemote::BuildDynamicRegisterInfo(bool force) {
SplitCommaSeparatedRegisterNumberString(value, reg_info.value_regs, 16);
} else if (name.equals("invalidate-regs")) {
SplitCommaSeparatedRegisterNumberString(value, reg_info.invalidate_regs, 16);
- } else if (name.equals("dynamic_size_dwarf_expr_bytes")) {
- size_t dwarf_opcode_len = value.size() / 2;
- assert(dwarf_opcode_len > 0);
-
- reg_info.dwarf_opcode_bytes.resize(dwarf_opcode_len);
-
- StringExtractor opcode_extractor(value);
- uint32_t ret_val =
- opcode_extractor.GetHexBytesAvail(reg_info.dwarf_opcode_bytes);
- assert(dwarf_opcode_len == ret_val);
- UNUSED_IF_ASSERT_DISABLED(ret_val);
}
}
@@ -4308,17 +4297,6 @@ bool ParseRegisters(XMLNode feature_node, GdbServerTargetInfo &target_info,
} else if (name == "invalidate_regnums") {
SplitCommaSeparatedRegisterNumberString(
value, reg_info.invalidate_regs, 0);
- } else if (name == "dynamic_size_dwarf_expr_bytes") {
- std::string opcode_string = value.str();
- size_t dwarf_opcode_len = opcode_string.length() / 2;
- assert(dwarf_opcode_len > 0);
-
- reg_info.dwarf_opcode_bytes.resize(dwarf_opcode_len);
- StringExtractor opcode_extractor(opcode_string);
- uint32_t ret_val =
- opcode_extractor.GetHexBytesAvail(reg_info.dwarf_opcode_bytes);
- assert(dwarf_opcode_len == ret_val);
- UNUSED_IF_ASSERT_DISABLED(ret_val);
} else {
Log *log(ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(
GDBR_LOG_PROCESS));
@@ -4546,10 +4524,6 @@ void ProcessGDBRemote::AddRemoteRegisters(
local_regnum},
regs_with_sentinel(remote_reg_info.value_regs),
regs_with_sentinel(remote_reg_info.invalidate_regs),
- !remote_reg_info.dwarf_opcode_bytes.empty()
- ? remote_reg_info.dwarf_opcode_bytes.data()
- : nullptr,
- remote_reg_info.dwarf_opcode_bytes.size(),
};
if (abi_sp)
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index 962bb807d9641..e61702227a34e 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -58,7 +58,6 @@ struct RemoteRegisterInfo {
uint32_t regnum_remote = LLDB_INVALID_REGNUM;
std::vector<uint32_t> value_regs;
std::vector<uint32_t> invalidate_regs;
- std::vector<uint8_t> dwarf_opcode_bytes;
};
class ThreadGDBRemote;
diff --git a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp
index 7e309e8322a81..7184dbacb08d6 100644
--- a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp
+++ b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp
@@ -30,36 +30,35 @@ using namespace minidump;
#define DEF_R(i) \
{ \
"r" #i, nullptr, 4, OFFSET(r) + i * 4, eEncodingUint, eFormatHex, \
- {ehframe_r##i, dwarf_r##i, INV, INV, reg_r##i}, \
- nullptr, nullptr, nullptr, 0 \
+ {ehframe_r##i, dwarf_r##i, INV, INV, reg_r##i}, nullptr, nullptr, \
}
#define DEF_R_ARG(i, n) \
{ \
"r" #i, "arg" #n, 4, OFFSET(r) + i * 4, eEncodingUint, eFormatHex, \
- {ehframe_r##i, dwarf_r##i, LLDB_REGNUM_GENERIC_ARG1 + i, INV, reg_r##i}, \
- nullptr, nullptr, nullptr, 0 \
+ {ehframe_r##i, dwarf_r##i, LLDB_REGNUM_GENERIC_ARG1 + i, INV, \
+ reg_r##i}, \
+ nullptr, nullptr, \
}
#define DEF_D(i) \
{ \
"d" #i, nullptr, 8, OFFSET(d) + i * 8, eEncodingVector, \
eFormatVectorOfUInt8, {dwarf_d##i, dwarf_d##i, INV, INV, reg_d##i}, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEF_S(i) \
{ \
"s" #i, nullptr, 4, OFFSET(s) + i * 4, eEncodingIEEE754, eFormatFloat, \
- {dwarf_s##i, dwarf_s##i, INV, INV, reg_s##i}, \
- nullptr, nullptr, nullptr, 0 \
+ {dwarf_s##i, dwarf_s##i, INV, INV, reg_s##i}, nullptr, nullptr, \
}
#define DEF_Q(i) \
{ \
"q" #i, nullptr, 16, OFFSET(q) + i * 16, eEncodingVector, \
eFormatVectorOfUInt8, {dwarf_q##i, dwarf_q##i, INV, INV, reg_q##i}, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
// Zero based LLDB register numbers for this register context
@@ -177,8 +176,7 @@ static RegisterInfo g_reg_info_apple_fp = {
{ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, INV, reg_r7},
nullptr,
nullptr,
- nullptr,
- 0};
+};
static RegisterInfo g_reg_info_fp = {
"fp",
@@ -190,8 +188,7 @@ static RegisterInfo g_reg_info_fp = {
{ehframe_r11, dwarf_r11, LLDB_REGNUM_GENERIC_FP, INV, reg_r11},
nullptr,
nullptr,
- nullptr,
- 0};
+};
// Register info definitions for this register context
static RegisterInfo g_reg_infos[] = {
@@ -217,8 +214,7 @@ static RegisterInfo g_reg_infos[] = {
{ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, INV, reg_sp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"r14",
4,
@@ -228,8 +224,7 @@ static RegisterInfo g_reg_infos[] = {
{ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, INV, reg_lr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
"r15",
4,
@@ -239,8 +234,7 @@ static RegisterInfo g_reg_infos[] = {
{ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, INV, reg_pc},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"cpsr",
"psr",
4,
@@ -250,8 +244,7 @@ static RegisterInfo g_reg_infos[] = {
{ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS, INV, reg_cpsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpscr",
nullptr,
8,
@@ -261,8 +254,7 @@ static RegisterInfo g_reg_infos[] = {
{INV, INV, INV, INV, reg_fpscr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
DEF_D(0),
DEF_D(1),
DEF_D(2),
diff --git a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp
index e2b7c0e362a77..e606ec9c3b644 100644
--- a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp
+++ b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp
@@ -29,48 +29,48 @@ using namespace minidump;
{ \
"x" #i, nullptr, 8, OFFSET(x) + i * 8, eEncodingUint, eFormatHex, \
{arm64_dwarf::x##i, arm64_dwarf::x##i, INV, INV, reg_x##i}, \
- nullptr, nullptr, nullptr, 0 \
+ nullptr, nullptr, \
}
#define DEF_W(i) \
{ \
"w" #i, nullptr, 4, OFFSET(x) + i * 8, eEncodingUint, eFormatHex, \
- {INV, INV, INV, INV, reg_w##i}, nullptr, nullptr, nullptr, 0 \
+ {INV, INV, INV, INV, reg_w##i}, nullptr, nullptr, \
}
#define DEF_X_ARG(i, n) \
{ \
"x" #i, "arg" #n, 8, OFFSET(x) + i * 8, eEncodingUint, eFormatHex, \
{arm64_dwarf::x##i, arm64_dwarf::x##i, LLDB_REGNUM_GENERIC_ARG1 + i, \
- INV, reg_x##i}, nullptr, nullptr, nullptr, 0 \
+ INV, reg_x##i}, nullptr, nullptr, \
}
#define DEF_V(i) \
{ \
"v" #i, nullptr, 16, OFFSET(v) + i * 16, eEncodingVector, \
eFormatVectorOfUInt8, {arm64_dwarf::v##i, arm64_dwarf::v##i, INV, INV, \
- reg_v##i}, nullptr, nullptr, nullptr, 0 \
+ reg_v##i}, nullptr, nullptr, \
}
#define DEF_D(i) \
{ \
"d" #i, nullptr, 8, OFFSET(v) + i * 16, eEncodingVector, \
eFormatVectorOfUInt8, {INV, INV, INV, INV, reg_d##i}, nullptr, \
- nullptr, nullptr, 0 \
+ nullptr, \
}
#define DEF_S(i) \
{ \
"s" #i, nullptr, 4, OFFSET(v) + i * 16, eEncodingVector, \
eFormatVectorOfUInt8, {INV, INV, INV, INV, reg_s##i}, nullptr, \
- nullptr, nullptr, 0 \
+ nullptr, \
}
#define DEF_H(i) \
{ \
"h" #i, nullptr, 2, OFFSET(v) + i * 16, eEncodingVector, \
eFormatVectorOfUInt8, {INV, INV, INV, INV, reg_h##i}, nullptr, \
- nullptr, nullptr, 0 \
+ nullptr, \
}
// Zero based LLDB register numbers for this register context
@@ -316,8 +316,7 @@ static RegisterInfo g_reg_infos[] = {
{arm64_dwarf::x29, arm64_dwarf::x29, LLDB_REGNUM_GENERIC_FP, INV, reg_fp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"lr",
"x30",
8,
@@ -327,8 +326,7 @@ static RegisterInfo g_reg_infos[] = {
{arm64_dwarf::x30, arm64_dwarf::x30, LLDB_REGNUM_GENERIC_RA, INV, reg_lr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"sp",
"x31",
8,
@@ -338,8 +336,7 @@ static RegisterInfo g_reg_infos[] = {
{arm64_dwarf::x31, arm64_dwarf::x31, LLDB_REGNUM_GENERIC_SP, INV, reg_sp},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"pc",
nullptr,
8,
@@ -349,8 +346,7 @@ static RegisterInfo g_reg_infos[] = {
{arm64_dwarf::pc, arm64_dwarf::pc, LLDB_REGNUM_GENERIC_PC, INV, reg_pc},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// w0 - w31
DEF_W(0),
DEF_W(1),
@@ -393,8 +389,7 @@ static RegisterInfo g_reg_infos[] = {
{INV, arm64_dwarf::cpsr, LLDB_REGNUM_GENERIC_FLAGS, INV, reg_cpsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpsr",
nullptr,
4,
@@ -404,8 +399,7 @@ static RegisterInfo g_reg_infos[] = {
{INV, INV, INV, INV, reg_fpsr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
{"fpcr",
nullptr,
4,
@@ -415,8 +409,7 @@ static RegisterInfo g_reg_infos[] = {
{INV, INV, INV, INV, reg_fpcr},
nullptr,
nullptr,
- nullptr,
- 0},
+ },
// v0 - v31
DEF_V(0),
DEF_V(1),
diff --git a/lldb/source/Target/DynamicRegisterInfo.cpp b/lldb/source/Target/DynamicRegisterInfo.cpp
index 2dbaa7d56c03f..396a13d6add40 100644
--- a/lldb/source/Target/DynamicRegisterInfo.cpp
+++ b/lldb/source/Target/DynamicRegisterInfo.cpp
@@ -42,7 +42,6 @@ void DynamicRegisterInfo::MoveFrom(DynamicRegisterInfo &&info) {
m_set_names = std::move(info.m_set_names);
m_value_regs_map = std::move(info.m_value_regs_map);
m_invalidate_regs_map = std::move(info.m_invalidate_regs_map);
- m_dynamic_reg_size_map = std::move(info.m_dynamic_reg_size_map);
m_reg_data_byte_size = info.m_reg_data_byte_size;
m_finalized = info.m_finalized;
@@ -273,25 +272,6 @@ DynamicRegisterInfo::SetRegisterInfo(const StructuredData::Dictionary &dict,
reg_info.byte_size = bitsize / 8;
- llvm::StringRef dwarf_opcode_string;
- if (reg_info_dict->GetValueForKeyAsString("dynamic_size_dwarf_expr_bytes",
- dwarf_opcode_string)) {
- reg_info.dynamic_size_dwarf_len = dwarf_opcode_string.size() / 2;
- assert(reg_info.dynamic_size_dwarf_len > 0);
-
- std::vector<uint8_t> dwarf_opcode_bytes(reg_info.dynamic_size_dwarf_len);
- uint32_t j;
- StringExtractor opcode_extractor(dwarf_opcode_string);
- uint32_t ret_val = opcode_extractor.GetHexBytesAvail(dwarf_opcode_bytes);
- UNUSED_IF_ASSERT_DISABLED(ret_val);
- assert(ret_val == reg_info.dynamic_size_dwarf_len);
-
- for (j = 0; j < reg_info.dynamic_size_dwarf_len; ++j)
- m_dynamic_reg_size_map[i].push_back(dwarf_opcode_bytes[j]);
-
- reg_info.dynamic_size_dwarf_expr_bytes = m_dynamic_reg_size_map[i].data();
- }
-
llvm::StringRef format_str;
if (reg_info_dict->GetValueForKeyAsString("format", format_str, nullptr)) {
if (OptionArgParser::ToFormat(format_str.str().c_str(), reg_info.format,
@@ -419,14 +399,6 @@ void DynamicRegisterInfo::AddRegister(RegisterInfo reg_info,
// invalidate until Finalize() is called
reg_info.invalidate_regs = nullptr;
}
- if (reg_info.dynamic_size_dwarf_expr_bytes) {
- for (i = 0; i < reg_info.dynamic_size_dwarf_len; ++i)
- m_dynamic_reg_size_map[reg_num].push_back(
- reg_info.dynamic_size_dwarf_expr_bytes[i]);
-
- reg_info.dynamic_size_dwarf_expr_bytes =
- m_dynamic_reg_size_map[reg_num].data();
- }
m_regs.push_back(reg_info);
uint32_t set = GetRegisterSetIndexByName(set_name, true);
@@ -773,7 +745,6 @@ void DynamicRegisterInfo::Clear() {
m_set_names.clear();
m_value_regs_map.clear();
m_invalidate_regs_map.clear();
- m_dynamic_reg_size_map.clear();
m_reg_data_byte_size = 0;
m_finalized = false;
}
diff --git a/lldb/source/Target/RegisterContext.cpp b/lldb/source/Target/RegisterContext.cpp
index 0e50e650dd235..7364660650e8f 100644
--- a/lldb/source/Target/RegisterContext.cpp
+++ b/lldb/source/Target/RegisterContext.cpp
@@ -77,44 +77,6 @@ RegisterContext::GetRegisterInfoByName(llvm::StringRef reg_name,
return nullptr;
}
-uint32_t
-RegisterContext::UpdateDynamicRegisterSize(const lldb_private::ArchSpec &arch,
- RegisterInfo *reg_info) {
- ExecutionContext exe_ctx(CalculateThread());
-
- // In MIPS, the floating point registers size is depends on FR bit of SR
- // register. if SR.FR == 1 then all floating point registers are 64 bits.
- // else they are all 32 bits.
-
- int expr_result;
- uint32_t addr_size = arch.GetAddressByteSize();
- const uint8_t *dwarf_opcode_ptr = reg_info->dynamic_size_dwarf_expr_bytes;
- const size_t dwarf_opcode_len = reg_info->dynamic_size_dwarf_len;
-
- DataExtractor dwarf_data(dwarf_opcode_ptr, dwarf_opcode_len,
- arch.GetByteOrder(), addr_size);
- ModuleSP opcode_ctx;
- DWARFExpression dwarf_expr(opcode_ctx, dwarf_data, nullptr);
- Value result;
- Status error;
- if (dwarf_expr.Evaluate(&exe_ctx, this, opcode_ctx, dwarf_data, nullptr,
- eRegisterKindDWARF, nullptr, nullptr, result,
- &error)) {
- expr_result = result.GetScalar().SInt(-1);
- switch (expr_result) {
- case 0:
- return 4;
- case 1:
- return 8;
- default:
- return reg_info->byte_size;
- }
- } else {
- printf("Error executing DwarfExpression::Evaluate %s\n", error.AsCString());
- return reg_info->byte_size;
- }
-}
-
const RegisterInfo *RegisterContext::GetRegisterInfo(lldb::RegisterKind kind,
uint32_t num) {
const uint32_t reg_num = ConvertRegisterKindToRegisterNumber(kind, num);
diff --git a/lldb/unittests/Target/DynamicRegisterInfoTest.cpp b/lldb/unittests/Target/DynamicRegisterInfoTest.cpp
index 14a34dde28344..a4884440a50c4 100644
--- a/lldb/unittests/Target/DynamicRegisterInfoTest.cpp
+++ b/lldb/unittests/Target/DynamicRegisterInfoTest.cpp
@@ -37,7 +37,7 @@ class DynamicRegisterInfoTest : public ::testing::Test {
lldb::eFormatUnsigned,
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,
next_regnum, next_regnum},
- nullptr, nullptr, nullptr, 0
+ nullptr, nullptr
};
if (!value_regs.empty()) {
@@ -140,7 +140,7 @@ TEST_F(DynamicRegisterInfoTest, add_supplementary_register) {
lldb::eFormatUnsigned,
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, eax,
eax},
- value_regs, nullptr, nullptr, 0
+ value_regs, nullptr
};
info.AddSupplementaryRegister(eax_reg, group);
@@ -148,7 +148,7 @@ TEST_F(DynamicRegisterInfoTest, add_supplementary_register) {
"ax", nullptr, 2, LLDB_INVALID_INDEX32, lldb::eEncodingUint,
lldb::eFormatUnsigned,
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, ax, ax},
- value_regs, nullptr, nullptr, 0
+ value_regs, nullptr
};
info.AddSupplementaryRegister(ax_reg, group);
@@ -156,7 +156,7 @@ TEST_F(DynamicRegisterInfoTest, add_supplementary_register) {
"al", nullptr, 1, LLDB_INVALID_INDEX32, lldb::eEncodingUint,
lldb::eFormatUnsigned,
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, al, al},
- value_regs, nullptr, nullptr, 0
+ value_regs, nullptr
};
info.AddSupplementaryRegister(al_reg, group);
diff --git a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp
index 77bc3a5e6eefe..61d4e8147a39b 100644
--- a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp
+++ b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp
@@ -157,8 +157,6 @@ Expected<RegisterInfo> RegisterInfoParser::create(StringRef Response) {
},
nullptr,
nullptr,
- nullptr, // Dwarf expression opcode bytes pointer
- 0 // Dwarf expression opcode bytes length
};
Info.name = ConstString(Elements["name"]).GetCString();
if (!Info.name)
More information about the lldb-commits
mailing list