diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h --- a/lldb/include/lldb/lldb-private-types.h +++ b/lldb/include/lldb/lldb-private-types.h @@ -62,6 +62,8 @@ /// this register changes. For example, the invalidate list for eax would be /// rax ax, ah, and al. uint32_t *invalidate_regs; + // Will be replaced with register flags info in the next patch. + void *unused; llvm::ArrayRef data(const uint8_t *context_base) const { return llvm::ArrayRef(context_base + byte_offset, byte_size); diff --git a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp --- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp +++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp @@ -46,7 +46,7 @@ DEFINE_REG_NAME(dwarf_num), DEFINE_REG_NAME_STR(str_name), \ 0, 0, eEncodingInvalid, eFormatDefault, \ { dwarf_num, dwarf_num, generic_num, LLDB_INVALID_REGNUM, dwarf_num }, \ - nullptr, nullptr \ + nullptr, nullptr, nullptr, \ } #define DEFINE_REGISTER_STUB(dwarf_num, str_name) \ diff --git a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp --- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp @@ -52,6 +52,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r1", nullptr, @@ -63,6 +64,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r2", nullptr, @@ -74,6 +76,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r3", nullptr, @@ -85,6 +88,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r4", nullptr, @@ -96,6 +100,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r5", nullptr, @@ -107,6 +112,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r6", nullptr, @@ -118,6 +124,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r7", nullptr, @@ -129,6 +136,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8", nullptr, @@ -140,6 +148,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9", nullptr, @@ -151,6 +160,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10", nullptr, @@ -162,6 +172,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11", nullptr, @@ -173,6 +184,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12", nullptr, @@ -184,6 +196,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"sp", "r13", @@ -195,6 +208,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"lr", "r14", @@ -206,6 +220,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"pc", "r15", @@ -217,6 +232,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"cpsr", "psr", @@ -228,6 +244,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s0", nullptr, @@ -239,6 +256,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s1", nullptr, @@ -250,6 +268,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s2", nullptr, @@ -261,6 +280,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s3", nullptr, @@ -272,6 +292,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s4", nullptr, @@ -283,6 +304,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s5", nullptr, @@ -294,6 +316,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s6", nullptr, @@ -305,6 +328,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s7", nullptr, @@ -316,6 +340,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s8", nullptr, @@ -327,6 +352,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s9", nullptr, @@ -338,6 +364,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s10", nullptr, @@ -349,6 +376,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s11", nullptr, @@ -360,6 +388,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s12", nullptr, @@ -371,6 +400,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s13", nullptr, @@ -382,6 +412,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s14", nullptr, @@ -393,6 +424,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s15", nullptr, @@ -404,6 +436,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s16", nullptr, @@ -415,6 +448,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s17", nullptr, @@ -426,6 +460,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s18", nullptr, @@ -437,6 +472,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s19", nullptr, @@ -448,6 +484,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s20", nullptr, @@ -459,6 +496,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s21", nullptr, @@ -470,6 +508,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s22", nullptr, @@ -481,6 +520,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s23", nullptr, @@ -492,6 +532,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s24", nullptr, @@ -503,6 +544,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s25", nullptr, @@ -514,6 +556,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s26", nullptr, @@ -525,6 +568,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s27", nullptr, @@ -536,6 +580,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s28", nullptr, @@ -547,6 +592,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s29", nullptr, @@ -558,6 +604,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s30", nullptr, @@ -569,6 +616,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s31", nullptr, @@ -580,6 +628,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"fpscr", nullptr, @@ -591,6 +640,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d0", nullptr, @@ -602,6 +652,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d1", nullptr, @@ -613,6 +664,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d2", nullptr, @@ -624,6 +676,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d3", nullptr, @@ -635,6 +688,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d4", nullptr, @@ -646,6 +700,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d5", nullptr, @@ -657,6 +712,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d6", nullptr, @@ -668,6 +724,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d7", nullptr, @@ -679,6 +736,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d8", nullptr, @@ -690,6 +748,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d9", nullptr, @@ -701,6 +760,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d10", nullptr, @@ -712,6 +772,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d11", nullptr, @@ -723,6 +784,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d12", nullptr, @@ -734,6 +796,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d13", nullptr, @@ -745,6 +808,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d14", nullptr, @@ -756,6 +820,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d15", nullptr, @@ -767,6 +832,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d16", nullptr, @@ -778,6 +844,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d17", nullptr, @@ -789,6 +856,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d18", nullptr, @@ -800,6 +868,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d19", nullptr, @@ -811,6 +880,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d20", nullptr, @@ -822,6 +892,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d21", nullptr, @@ -833,6 +904,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d22", nullptr, @@ -844,6 +916,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d23", nullptr, @@ -855,6 +928,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d24", nullptr, @@ -866,6 +940,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d25", nullptr, @@ -877,6 +952,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d26", nullptr, @@ -888,6 +964,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d27", nullptr, @@ -899,6 +976,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d28", nullptr, @@ -910,6 +988,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d29", nullptr, @@ -921,6 +1000,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d30", nullptr, @@ -932,6 +1012,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d31", nullptr, @@ -943,6 +1024,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8_usr", nullptr, @@ -954,6 +1036,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9_usr", nullptr, @@ -965,6 +1048,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10_usr", nullptr, @@ -976,6 +1060,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11_usr", nullptr, @@ -987,6 +1072,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12_usr", nullptr, @@ -998,6 +1084,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_usr", "sp_usr", @@ -1009,6 +1096,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_usr", "lr_usr", @@ -1020,6 +1108,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8_fiq", nullptr, @@ -1031,6 +1120,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9_fiq", nullptr, @@ -1042,6 +1132,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10_fiq", nullptr, @@ -1053,6 +1144,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11_fiq", nullptr, @@ -1064,6 +1156,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12_fiq", nullptr, @@ -1075,6 +1168,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_fiq", "sp_fiq", @@ -1086,6 +1180,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_fiq", "lr_fiq", @@ -1097,6 +1192,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_irq", "sp_irq", @@ -1108,6 +1204,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_irq", "lr_irq", @@ -1119,6 +1216,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_abt", "sp_abt", @@ -1130,6 +1228,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_abt", "lr_abt", @@ -1141,6 +1240,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_und", "sp_und", @@ -1152,6 +1252,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_und", "lr_und", @@ -1163,6 +1264,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_svc", "sp_svc", @@ -1174,6 +1276,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_svc", "lr_svc", @@ -1185,6 +1288,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }}; static const uint32_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp --- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp +++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp @@ -55,6 +55,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r1", nullptr, @@ -66,6 +67,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r2", nullptr, @@ -77,6 +79,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r3", nullptr, @@ -88,6 +91,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r4", nullptr, @@ -99,6 +103,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r5", nullptr, @@ -110,6 +115,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r6", nullptr, @@ -121,6 +127,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r7", nullptr, @@ -132,6 +139,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8", nullptr, @@ -143,6 +151,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9", nullptr, @@ -154,6 +163,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10", nullptr, @@ -165,6 +175,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11", nullptr, @@ -176,6 +187,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12", nullptr, @@ -187,6 +199,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"sp", "r13", @@ -198,6 +211,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"lr", "r14", @@ -209,6 +223,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"pc", "r15", @@ -220,6 +235,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"cpsr", "psr", @@ -231,6 +247,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s0", nullptr, @@ -242,6 +259,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s1", nullptr, @@ -253,6 +271,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s2", nullptr, @@ -264,6 +283,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s3", nullptr, @@ -275,6 +295,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s4", nullptr, @@ -286,6 +307,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s5", nullptr, @@ -297,6 +319,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s6", nullptr, @@ -308,6 +331,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s7", nullptr, @@ -319,6 +343,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s8", nullptr, @@ -330,6 +355,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s9", nullptr, @@ -341,6 +367,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s10", nullptr, @@ -352,6 +379,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s11", nullptr, @@ -363,6 +391,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s12", nullptr, @@ -374,6 +403,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s13", nullptr, @@ -385,6 +415,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s14", nullptr, @@ -396,6 +427,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s15", nullptr, @@ -407,6 +439,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s16", nullptr, @@ -418,6 +451,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s17", nullptr, @@ -429,6 +463,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s18", nullptr, @@ -440,6 +475,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s19", nullptr, @@ -451,6 +487,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s20", nullptr, @@ -462,6 +499,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s21", nullptr, @@ -473,6 +511,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s22", nullptr, @@ -484,6 +523,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s23", nullptr, @@ -495,6 +535,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s24", nullptr, @@ -506,6 +547,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s25", nullptr, @@ -517,6 +559,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s26", nullptr, @@ -528,6 +571,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s27", nullptr, @@ -539,6 +583,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s28", nullptr, @@ -550,6 +595,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s29", nullptr, @@ -561,6 +607,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s30", nullptr, @@ -572,6 +619,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"s31", nullptr, @@ -583,6 +631,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"fpscr", nullptr, @@ -594,6 +643,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d0", nullptr, @@ -605,6 +655,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d1", nullptr, @@ -616,6 +667,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d2", nullptr, @@ -627,6 +679,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d3", nullptr, @@ -638,6 +691,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d4", nullptr, @@ -649,6 +703,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d5", nullptr, @@ -660,6 +715,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d6", nullptr, @@ -671,6 +727,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d7", nullptr, @@ -682,6 +739,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d8", nullptr, @@ -693,6 +751,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d9", nullptr, @@ -704,6 +763,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d10", nullptr, @@ -715,6 +775,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d11", nullptr, @@ -726,6 +787,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d12", nullptr, @@ -737,6 +799,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d13", nullptr, @@ -748,6 +811,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d14", nullptr, @@ -759,6 +823,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d15", nullptr, @@ -770,6 +835,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d16", nullptr, @@ -781,6 +847,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d17", nullptr, @@ -792,6 +859,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d18", nullptr, @@ -803,6 +871,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d19", nullptr, @@ -814,6 +883,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d20", nullptr, @@ -825,6 +895,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d21", nullptr, @@ -836,6 +907,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d22", nullptr, @@ -847,6 +919,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d23", nullptr, @@ -858,6 +931,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d24", nullptr, @@ -869,6 +943,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d25", nullptr, @@ -880,6 +955,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d26", nullptr, @@ -891,6 +967,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d27", nullptr, @@ -902,6 +979,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d28", nullptr, @@ -913,6 +991,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d29", nullptr, @@ -924,6 +1003,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d30", nullptr, @@ -935,6 +1015,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"d31", nullptr, @@ -946,6 +1027,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8_usr", nullptr, @@ -957,6 +1039,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9_usr", nullptr, @@ -968,6 +1051,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10_usr", nullptr, @@ -979,6 +1063,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11_usr", nullptr, @@ -990,6 +1075,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12_usr", nullptr, @@ -1001,6 +1087,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_usr", "sp_usr", @@ -1012,6 +1099,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_usr", "lr_usr", @@ -1023,6 +1111,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8_fiq", nullptr, @@ -1034,6 +1123,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9_fiq", nullptr, @@ -1045,6 +1135,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10_fiq", nullptr, @@ -1056,6 +1147,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11_fiq", nullptr, @@ -1067,6 +1159,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12_fiq", nullptr, @@ -1078,6 +1171,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_fiq", "sp_fiq", @@ -1089,6 +1183,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_fiq", "lr_fiq", @@ -1100,6 +1195,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_irq", "sp_irq", @@ -1111,6 +1207,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_irq", "lr_irq", @@ -1122,6 +1219,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_abt", "sp_abt", @@ -1133,6 +1231,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_abt", "lr_abt", @@ -1144,6 +1243,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13_und", "sp_und", @@ -1155,6 +1255,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_und", "lr_und", @@ -1166,6 +1267,8 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, + }, {"r13_svc", "sp_svc", @@ -1177,6 +1280,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14_svc", "lr_svc", @@ -1188,6 +1292,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }}; static const uint32_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp --- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp +++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp @@ -45,6 +45,7 @@ {0, 0, LLDB_INVALID_REGNUM, 0, 0}, nullptr, nullptr, + nullptr, }, {"r01", "", @@ -55,6 +56,7 @@ {1, 1, LLDB_INVALID_REGNUM, 1, 1}, nullptr, nullptr, + nullptr, }, {"r02", "", @@ -65,6 +67,7 @@ {2, 2, LLDB_INVALID_REGNUM, 2, 2}, nullptr, nullptr, + nullptr, }, {"r03", "", @@ -75,6 +78,7 @@ {3, 3, LLDB_INVALID_REGNUM, 3, 3}, nullptr, nullptr, + nullptr, }, {"r04", "", @@ -85,6 +89,7 @@ {4, 4, LLDB_INVALID_REGNUM, 4, 4}, nullptr, nullptr, + nullptr, }, {"r05", "", @@ -95,6 +100,7 @@ {5, 5, LLDB_INVALID_REGNUM, 5, 5}, nullptr, nullptr, + nullptr, }, {"r06", "", @@ -105,6 +111,7 @@ {6, 6, LLDB_INVALID_REGNUM, 6, 6}, nullptr, nullptr, + nullptr, }, {"r07", "", @@ -115,6 +122,7 @@ {7, 7, LLDB_INVALID_REGNUM, 7, 7}, nullptr, nullptr, + nullptr, }, {"r08", "", @@ -125,6 +133,7 @@ {8, 8, LLDB_INVALID_REGNUM, 8, 8}, nullptr, nullptr, + nullptr, }, {"r09", "", @@ -135,6 +144,7 @@ {9, 9, LLDB_INVALID_REGNUM, 9, 9}, nullptr, nullptr, + nullptr, }, {"r10", "", @@ -145,6 +155,7 @@ {10, 10, LLDB_INVALID_REGNUM, 10, 10}, nullptr, nullptr, + nullptr, }, {"r11", "", @@ -155,6 +166,7 @@ {11, 11, LLDB_INVALID_REGNUM, 11, 11}, nullptr, nullptr, + nullptr, }, {"r12", "", @@ -165,6 +177,7 @@ {12, 12, LLDB_INVALID_REGNUM, 12, 12}, nullptr, nullptr, + nullptr, }, {"r13", "", @@ -175,6 +188,7 @@ {13, 13, LLDB_INVALID_REGNUM, 13, 13}, nullptr, nullptr, + nullptr, }, {"r14", "", @@ -185,6 +199,7 @@ {14, 14, LLDB_INVALID_REGNUM, 14, 14}, nullptr, nullptr, + nullptr, }, {"r15", "", @@ -195,6 +210,7 @@ {15, 15, LLDB_INVALID_REGNUM, 15, 15}, nullptr, nullptr, + nullptr, }, {"r16", "", @@ -205,6 +221,7 @@ {16, 16, LLDB_INVALID_REGNUM, 16, 16}, nullptr, nullptr, + nullptr, }, {"r17", "", @@ -215,6 +232,7 @@ {17, 17, LLDB_INVALID_REGNUM, 17, 17}, nullptr, nullptr, + nullptr, }, {"r18", "", @@ -225,6 +243,7 @@ {18, 18, LLDB_INVALID_REGNUM, 18, 18}, nullptr, nullptr, + nullptr, }, {"r19", "", @@ -235,6 +254,7 @@ {19, 19, LLDB_INVALID_REGNUM, 19, 19}, nullptr, nullptr, + nullptr, }, {"r20", "", @@ -245,6 +265,7 @@ {20, 20, LLDB_INVALID_REGNUM, 20, 20}, nullptr, nullptr, + nullptr, }, {"r21", "", @@ -255,6 +276,7 @@ {21, 21, LLDB_INVALID_REGNUM, 21, 21}, nullptr, nullptr, + nullptr, }, {"r22", "", @@ -265,6 +287,7 @@ {22, 22, LLDB_INVALID_REGNUM, 22, 22}, nullptr, nullptr, + nullptr, }, {"r23", "", @@ -275,6 +298,7 @@ {23, 23, LLDB_INVALID_REGNUM, 23, 23}, nullptr, nullptr, + nullptr, }, {"r24", "", @@ -285,6 +309,7 @@ {24, 24, LLDB_INVALID_REGNUM, 24, 24}, nullptr, nullptr, + nullptr, }, {"r25", "", @@ -295,6 +320,7 @@ {25, 25, LLDB_INVALID_REGNUM, 25, 25}, nullptr, nullptr, + nullptr, }, {"r26", "", @@ -305,6 +331,7 @@ {26, 26, LLDB_INVALID_REGNUM, 26, 26}, nullptr, nullptr, + nullptr, }, {"r27", "", @@ -315,6 +342,7 @@ {27, 27, LLDB_INVALID_REGNUM, 27, 27}, nullptr, nullptr, + nullptr, }, {"r28", "", @@ -325,6 +353,7 @@ {28, 28, LLDB_INVALID_REGNUM, 28, 28}, nullptr, nullptr, + nullptr, }, {"sp", "r29", @@ -335,6 +364,7 @@ {29, 29, LLDB_REGNUM_GENERIC_SP, 29, 29}, nullptr, nullptr, + nullptr, }, {"fp", "r30", @@ -345,6 +375,7 @@ {30, 30, LLDB_REGNUM_GENERIC_FP, 30, 30}, nullptr, nullptr, + nullptr, }, {"lr", "r31", @@ -355,6 +386,7 @@ {31, 31, LLDB_REGNUM_GENERIC_RA, 31, 31}, nullptr, nullptr, + nullptr, }, {"sa0", "", @@ -365,6 +397,7 @@ {32, 32, LLDB_INVALID_REGNUM, 32, 32}, nullptr, nullptr, + nullptr, }, {"lc0", "", @@ -375,6 +408,7 @@ {33, 33, LLDB_INVALID_REGNUM, 33, 33}, nullptr, nullptr, + nullptr, }, {"sa1", "", @@ -385,6 +419,7 @@ {34, 34, LLDB_INVALID_REGNUM, 34, 34}, nullptr, nullptr, + nullptr, }, {"lc1", "", @@ -395,6 +430,7 @@ {35, 35, LLDB_INVALID_REGNUM, 35, 35}, nullptr, nullptr, + nullptr, }, // --> hexagon-v4/5/55/56-sim.xml {"p3_0", @@ -406,6 +442,8 @@ {36, 36, LLDB_INVALID_REGNUM, 36, 36}, nullptr, nullptr, + nullptr, + }, // PADDING { {"p00", @@ -417,6 +455,7 @@ {37, 37, LLDB_INVALID_REGNUM, 37, 37}, nullptr, nullptr, + nullptr, }, // } {"m0", @@ -428,6 +467,7 @@ {38, 38, LLDB_INVALID_REGNUM, 38, 38}, nullptr, nullptr, + nullptr, }, {"m1", "", @@ -438,6 +478,7 @@ {39, 39, LLDB_INVALID_REGNUM, 39, 39}, nullptr, nullptr, + nullptr, }, {"usr", "", @@ -448,6 +489,7 @@ {40, 40, LLDB_INVALID_REGNUM, 40, 40}, nullptr, nullptr, + nullptr, }, {"pc", "", @@ -458,6 +500,7 @@ {41, 41, LLDB_REGNUM_GENERIC_PC, 41, 41}, nullptr, nullptr, + nullptr, }, {"ugp", "", @@ -468,6 +511,7 @@ {42, 42, LLDB_INVALID_REGNUM, 42, 42}, nullptr, nullptr, + nullptr, }, {"gp", "", @@ -478,6 +522,7 @@ {43, 43, LLDB_INVALID_REGNUM, 43, 43}, nullptr, nullptr, + nullptr, }, {"cs0", "", @@ -488,6 +533,7 @@ {44, 44, LLDB_INVALID_REGNUM, 44, 44}, nullptr, nullptr, + nullptr, }, {"cs1", "", @@ -498,6 +544,7 @@ {45, 45, LLDB_INVALID_REGNUM, 45, 45}, nullptr, nullptr, + nullptr, }, // PADDING { {"p01", @@ -509,6 +556,7 @@ {46, 46, LLDB_INVALID_REGNUM, 46, 46}, nullptr, nullptr, + nullptr, }, {"p02", "", @@ -519,6 +567,7 @@ {47, 47, LLDB_INVALID_REGNUM, 47, 47}, nullptr, nullptr, + nullptr, }, {"p03", "", @@ -529,6 +578,7 @@ {48, 48, LLDB_INVALID_REGNUM, 48, 48}, nullptr, nullptr, + nullptr, }, {"p04", "", @@ -539,6 +589,7 @@ {49, 49, LLDB_INVALID_REGNUM, 49, 49}, nullptr, nullptr, + nullptr, }, {"p05", "", @@ -549,6 +600,7 @@ {50, 50, LLDB_INVALID_REGNUM, 50, 50}, nullptr, nullptr, + nullptr, }, {"p06", "", @@ -559,6 +611,7 @@ {51, 51, LLDB_INVALID_REGNUM, 51, 51}, nullptr, nullptr, + nullptr, }, {"p07", "", @@ -569,6 +622,7 @@ {52, 52, LLDB_INVALID_REGNUM, 52, 52}, nullptr, nullptr, + nullptr, }, {"p08", "", @@ -579,6 +633,7 @@ {53, 53, LLDB_INVALID_REGNUM, 53, 53}, nullptr, nullptr, + nullptr, }, {"p09", "", @@ -589,6 +644,7 @@ {54, 54, LLDB_INVALID_REGNUM, 54, 54}, nullptr, nullptr, + nullptr, }, {"p10", "", @@ -599,6 +655,7 @@ {55, 55, LLDB_INVALID_REGNUM, 55, 55}, nullptr, nullptr, + nullptr, }, {"p11", "", @@ -609,6 +666,7 @@ {56, 56, LLDB_INVALID_REGNUM, 56, 56}, nullptr, nullptr, + nullptr, }, {"p12", "", @@ -619,6 +677,7 @@ {57, 57, LLDB_INVALID_REGNUM, 57, 57}, nullptr, nullptr, + nullptr, }, {"p13", "", @@ -629,6 +688,7 @@ {58, 58, LLDB_INVALID_REGNUM, 58, 58}, nullptr, nullptr, + nullptr, }, {"p14", "", @@ -639,6 +699,7 @@ {59, 59, LLDB_INVALID_REGNUM, 59, 59}, nullptr, nullptr, + nullptr, }, {"p15", "", @@ -649,6 +710,7 @@ {60, 60, LLDB_INVALID_REGNUM, 60, 60}, nullptr, nullptr, + nullptr, }, {"p16", "", @@ -659,6 +721,7 @@ {61, 61, LLDB_INVALID_REGNUM, 61, 61}, nullptr, nullptr, + nullptr, }, {"p17", "", @@ -669,6 +732,7 @@ {62, 62, LLDB_INVALID_REGNUM, 62, 62}, nullptr, nullptr, + nullptr, }, {"p18", "", @@ -679,6 +743,7 @@ {63, 63, LLDB_INVALID_REGNUM, 63, 63}, nullptr, nullptr, + nullptr, }, // } {"sgp0", @@ -690,6 +755,7 @@ {64, 64, LLDB_INVALID_REGNUM, 64, 64}, nullptr, nullptr, + nullptr, }, // PADDING { {"p19", @@ -701,6 +767,7 @@ {65, 65, LLDB_INVALID_REGNUM, 65, 65}, nullptr, nullptr, + nullptr, }, // } {"stid", @@ -712,6 +779,7 @@ {66, 66, LLDB_INVALID_REGNUM, 66, 66}, nullptr, nullptr, + nullptr, }, {"elr", "", @@ -722,6 +790,7 @@ {67, 67, LLDB_INVALID_REGNUM, 67, 67}, nullptr, nullptr, + nullptr, }, {"badva0", "", @@ -732,6 +801,7 @@ {68, 68, LLDB_INVALID_REGNUM, 68, 68}, nullptr, nullptr, + nullptr, }, {"badva1", "", @@ -742,6 +812,7 @@ {69, 69, LLDB_INVALID_REGNUM, 69, 69}, nullptr, nullptr, + nullptr, }, {"ssr", "", @@ -752,6 +823,7 @@ {70, 70, LLDB_INVALID_REGNUM, 70, 70}, nullptr, nullptr, + nullptr, }, {"ccr", "", @@ -762,6 +834,7 @@ {71, 71, LLDB_INVALID_REGNUM, 71, 71}, nullptr, nullptr, + nullptr, }, {"htid", "", @@ -772,6 +845,7 @@ {72, 72, LLDB_INVALID_REGNUM, 72, 72}, nullptr, nullptr, + nullptr, }, // PADDING { {"p20", @@ -783,6 +857,7 @@ {73, 73, LLDB_INVALID_REGNUM, 73, 73}, nullptr, nullptr, + nullptr, }, // } {"imask", @@ -794,6 +869,7 @@ {74, 74, LLDB_INVALID_REGNUM, 74, 74}, nullptr, nullptr, + nullptr, }, // PADDING { {"p21", @@ -805,6 +881,7 @@ {75, 75, LLDB_INVALID_REGNUM, 75, 75}, nullptr, nullptr, + nullptr, }, {"p22", "", @@ -815,6 +892,7 @@ {76, 76, LLDB_INVALID_REGNUM, 76, 76}, nullptr, nullptr, + nullptr, }, {"p23", "", @@ -825,6 +903,7 @@ {77, 77, LLDB_INVALID_REGNUM, 77, 77}, nullptr, nullptr, + nullptr, }, {"p24", "", @@ -835,6 +914,7 @@ {78, 78, LLDB_INVALID_REGNUM, 78, 78}, nullptr, nullptr, + nullptr, }, {"p25", "", @@ -845,6 +925,7 @@ {79, 79, LLDB_INVALID_REGNUM, 79, 79}, nullptr, nullptr, + nullptr, }, // } {"g0", @@ -856,6 +937,7 @@ {80, 80, LLDB_INVALID_REGNUM, 80, 80}, nullptr, nullptr, + nullptr, }, {"g1", "", @@ -866,6 +948,7 @@ {81, 81, LLDB_INVALID_REGNUM, 81, 81}, nullptr, nullptr, + nullptr, }, {"g2", "", @@ -876,6 +959,7 @@ {82, 82, LLDB_INVALID_REGNUM, 82, 82}, nullptr, nullptr, + nullptr, }, {"g3", "", @@ -886,6 +970,7 @@ {83, 83, LLDB_INVALID_REGNUM, 83, 83}, nullptr, nullptr, + nullptr, }}; static const uint32_t k_num_register_infos = diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp @@ -94,6 +94,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r1", "AT", @@ -105,6 +106,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r2", "v0", @@ -116,6 +118,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r3", "v1", @@ -127,6 +130,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r4", nullptr, @@ -138,6 +142,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r5", nullptr, @@ -149,6 +154,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r6", nullptr, @@ -160,6 +166,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r7", nullptr, @@ -171,6 +178,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8", "arg5", @@ -182,6 +190,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9", "arg6", @@ -193,6 +202,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10", "arg7", @@ -204,6 +214,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11", "arg8", @@ -215,6 +226,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12", nullptr, @@ -226,6 +238,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13", nullptr, @@ -237,6 +250,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14", nullptr, @@ -248,6 +262,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r15", nullptr, @@ -259,6 +274,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r16", nullptr, @@ -270,6 +286,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r17", nullptr, @@ -281,6 +298,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r18", nullptr, @@ -292,6 +310,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r19", nullptr, @@ -303,6 +322,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r20", nullptr, @@ -314,6 +334,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r21", nullptr, @@ -325,6 +346,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r22", nullptr, @@ -336,6 +358,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r23", nullptr, @@ -347,6 +370,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r24", nullptr, @@ -358,6 +382,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r25", nullptr, @@ -369,6 +394,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r26", nullptr, @@ -380,6 +406,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r27", nullptr, @@ -391,6 +418,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r28", "gp", @@ -402,6 +430,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r29", nullptr, @@ -413,6 +442,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r30", nullptr, @@ -424,6 +454,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r31", nullptr, @@ -435,6 +466,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"sr", nullptr, @@ -446,6 +478,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"lo", nullptr, @@ -457,6 +490,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"hi", nullptr, @@ -468,6 +502,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"bad", nullptr, @@ -479,6 +514,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"cause", nullptr, @@ -490,6 +526,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"pc", nullptr, @@ -501,6 +538,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, }; diff --git a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp --- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp +++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp @@ -94,6 +94,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r1", "AT", @@ -105,6 +106,8 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, + }, {"r2", "v0", @@ -116,6 +119,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r3", "v1", @@ -127,6 +131,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r4", nullptr, @@ -138,6 +143,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r5", nullptr, @@ -149,6 +155,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r6", nullptr, @@ -160,6 +167,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r7", nullptr, @@ -171,6 +179,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r8", nullptr, @@ -182,6 +191,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r9", nullptr, @@ -193,6 +203,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r10", nullptr, @@ -204,6 +215,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r11", nullptr, @@ -215,6 +227,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r12", nullptr, @@ -226,6 +239,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r13", nullptr, @@ -237,6 +251,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r14", nullptr, @@ -248,6 +263,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r15", nullptr, @@ -259,6 +275,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r16", nullptr, @@ -270,6 +287,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r17", nullptr, @@ -281,6 +299,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r18", nullptr, @@ -292,6 +311,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r19", nullptr, @@ -303,6 +323,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r20", nullptr, @@ -314,6 +335,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r21", nullptr, @@ -325,6 +347,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r22", nullptr, @@ -336,6 +359,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r23", nullptr, @@ -347,6 +371,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r24", nullptr, @@ -358,6 +383,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r25", nullptr, @@ -369,6 +395,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r26", nullptr, @@ -380,6 +407,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r27", nullptr, @@ -391,6 +419,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r28", "gp", @@ -402,6 +431,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r29", nullptr, @@ -413,6 +443,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r30", nullptr, @@ -424,6 +455,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"r31", nullptr, @@ -435,6 +467,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"sr", nullptr, @@ -446,6 +479,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"lo", nullptr, @@ -457,6 +491,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"hi", nullptr, @@ -468,6 +503,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"bad", nullptr, @@ -479,6 +515,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"cause", nullptr, @@ -490,6 +527,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, {"pc", nullptr, @@ -501,6 +539,7 @@ LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }, }; diff --git a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp --- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp +++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp @@ -114,7 +114,7 @@ #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4) \ { \ #reg, alt, 8, 0, eEncodingUint, eFormatHex, {kind1, kind2, kind3, kind4 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } static const RegisterInfo g_register_infos[] = { @@ -203,6 +203,7 @@ {dwarf_cfa, dwarf_cfa, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, nullptr, + nullptr, }}; static const uint32_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp --- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp +++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp @@ -117,7 +117,7 @@ #name, alt, size, 0, eEncodingUint, eFormatHex, \ {dwarf_##name##_s390x, dwarf_##name##_s390x, generic, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM }, \ - nullptr, nullptr, \ + nullptr, 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 --- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp +++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp @@ -36,7 +36,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, 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 --- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp @@ -177,7 +177,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - nullptr, nullptr, + nullptr, nullptr, nullptr, #define REG_CONTEXT_SIZE \ (sizeof(RegisterContextDarwin_arm::GPR) + \ sizeof(RegisterContextDarwin_arm::FPU) + \ @@ -200,6 +200,7 @@ {ehframe_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r0}, nullptr, nullptr, + nullptr, }, {"r1", nullptr, @@ -210,6 +211,7 @@ {ehframe_r1, dwarf_r1, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r1}, nullptr, nullptr, + nullptr, }, {"r2", nullptr, @@ -220,6 +222,7 @@ {ehframe_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r2}, nullptr, nullptr, + nullptr, }, {"r3", nullptr, @@ -230,6 +233,7 @@ {ehframe_r3, dwarf_r3, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r3}, nullptr, nullptr, + nullptr, }, {"r4", nullptr, @@ -240,6 +244,7 @@ {ehframe_r4, dwarf_r4, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r4}, nullptr, nullptr, + nullptr, }, {"r5", nullptr, @@ -250,6 +255,7 @@ {ehframe_r5, dwarf_r5, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r5}, nullptr, nullptr, + nullptr, }, {"r6", nullptr, @@ -260,6 +266,7 @@ {ehframe_r6, dwarf_r6, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r6}, nullptr, nullptr, + nullptr, }, {"r7", nullptr, @@ -271,6 +278,7 @@ gpr_r7}, nullptr, nullptr, + nullptr, }, {"r8", nullptr, @@ -281,6 +289,7 @@ {ehframe_r8, dwarf_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r8}, nullptr, nullptr, + nullptr, }, {"r9", nullptr, @@ -291,6 +300,7 @@ {ehframe_r9, dwarf_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r9}, nullptr, nullptr, + nullptr, }, {"r10", nullptr, @@ -302,6 +312,7 @@ gpr_r10}, nullptr, nullptr, + nullptr, }, {"r11", nullptr, @@ -313,6 +324,7 @@ gpr_r11}, nullptr, nullptr, + nullptr, }, {"r12", nullptr, @@ -324,6 +336,7 @@ gpr_r12}, nullptr, nullptr, + nullptr, }, {"sp", "r13", @@ -335,6 +348,7 @@ gpr_sp}, nullptr, nullptr, + nullptr, }, {"lr", "r14", @@ -346,6 +360,7 @@ gpr_lr}, nullptr, nullptr, + nullptr, }, {"pc", "r15", @@ -357,6 +372,7 @@ gpr_pc}, nullptr, nullptr, + nullptr, }, {"cpsr", "psr", @@ -368,6 +384,7 @@ gpr_cpsr}, nullptr, nullptr, + nullptr, }, {"s0", @@ -380,6 +397,7 @@ fpu_s0}, nullptr, nullptr, + nullptr, }, {"s1", nullptr, @@ -391,6 +409,7 @@ fpu_s1}, nullptr, nullptr, + nullptr, }, {"s2", nullptr, @@ -402,6 +421,7 @@ fpu_s2}, nullptr, nullptr, + nullptr, }, {"s3", nullptr, @@ -413,6 +433,7 @@ fpu_s3}, nullptr, nullptr, + nullptr, }, {"s4", nullptr, @@ -424,6 +445,7 @@ fpu_s4}, nullptr, nullptr, + nullptr, }, {"s5", nullptr, @@ -435,6 +457,7 @@ fpu_s5}, nullptr, nullptr, + nullptr, }, {"s6", nullptr, @@ -446,6 +469,7 @@ fpu_s6}, nullptr, nullptr, + nullptr, }, {"s7", nullptr, @@ -457,6 +481,7 @@ fpu_s7}, nullptr, nullptr, + nullptr, }, {"s8", nullptr, @@ -468,6 +493,7 @@ fpu_s8}, nullptr, nullptr, + nullptr, }, {"s9", nullptr, @@ -479,6 +505,7 @@ fpu_s9}, nullptr, nullptr, + nullptr, }, {"s10", nullptr, @@ -490,6 +517,7 @@ fpu_s10}, nullptr, nullptr, + nullptr, }, {"s11", nullptr, @@ -501,6 +529,7 @@ fpu_s11}, nullptr, nullptr, + nullptr, }, {"s12", nullptr, @@ -512,6 +541,7 @@ fpu_s12}, nullptr, nullptr, + nullptr, }, {"s13", nullptr, @@ -523,6 +553,7 @@ fpu_s13}, nullptr, nullptr, + nullptr, }, {"s14", nullptr, @@ -534,6 +565,7 @@ fpu_s14}, nullptr, nullptr, + nullptr, }, {"s15", nullptr, @@ -545,6 +577,7 @@ fpu_s15}, nullptr, nullptr, + nullptr, }, {"s16", nullptr, @@ -556,6 +589,7 @@ fpu_s16}, nullptr, nullptr, + nullptr, }, {"s17", nullptr, @@ -567,6 +601,7 @@ fpu_s17}, nullptr, nullptr, + nullptr, }, {"s18", nullptr, @@ -578,6 +613,7 @@ fpu_s18}, nullptr, nullptr, + nullptr, }, {"s19", nullptr, @@ -589,6 +625,7 @@ fpu_s19}, nullptr, nullptr, + nullptr, }, {"s20", nullptr, @@ -600,6 +637,7 @@ fpu_s20}, nullptr, nullptr, + nullptr, }, {"s21", nullptr, @@ -611,6 +649,7 @@ fpu_s21}, nullptr, nullptr, + nullptr, }, {"s22", nullptr, @@ -622,6 +661,7 @@ fpu_s22}, nullptr, nullptr, + nullptr, }, {"s23", nullptr, @@ -633,6 +673,7 @@ fpu_s23}, nullptr, nullptr, + nullptr, }, {"s24", nullptr, @@ -644,6 +685,7 @@ fpu_s24}, nullptr, nullptr, + nullptr, }, {"s25", nullptr, @@ -655,6 +697,7 @@ fpu_s25}, nullptr, nullptr, + nullptr, }, {"s26", nullptr, @@ -666,6 +709,7 @@ fpu_s26}, nullptr, nullptr, + nullptr, }, {"s27", nullptr, @@ -677,6 +721,7 @@ fpu_s27}, nullptr, nullptr, + nullptr, }, {"s28", nullptr, @@ -688,6 +733,7 @@ fpu_s28}, nullptr, nullptr, + nullptr, }, {"s29", nullptr, @@ -699,6 +745,7 @@ fpu_s29}, nullptr, nullptr, + nullptr, }, {"s30", nullptr, @@ -710,6 +757,7 @@ fpu_s30}, nullptr, nullptr, + nullptr, }, {"s31", nullptr, @@ -721,6 +769,7 @@ fpu_s31}, nullptr, nullptr, + nullptr, }, {"fpscr", nullptr, @@ -732,6 +781,7 @@ LLDB_INVALID_REGNUM, fpu_fpscr}, nullptr, nullptr, + nullptr, }, {"exception", @@ -744,6 +794,7 @@ LLDB_INVALID_REGNUM, exc_exception}, nullptr, nullptr, + nullptr, }, {"fsr", nullptr, @@ -755,6 +806,7 @@ LLDB_INVALID_REGNUM, exc_fsr}, nullptr, nullptr, + nullptr, }, {"far", nullptr, @@ -766,6 +818,7 @@ LLDB_INVALID_REGNUM, exc_far}, nullptr, nullptr, + nullptr, }, {DEFINE_DBG(bvr, 0)}, diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp --- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.cpp @@ -59,7 +59,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - NULL, NULL + NULL, 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 --- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp @@ -154,7 +154,7 @@ {LLDB_INVALID_REGNUM, dwarf_##reg##i, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ fpu_##reg##i }, \ - nullptr, nullptr, + nullptr, nullptr, nullptr, #define DEFINE_EXC(reg) \ #reg, NULL, sizeof(((RegisterContextDarwin_i386::EXC *) NULL)->reg), \ @@ -175,96 +175,112 @@ gpr_eax}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ebx, nullptr), {ehframe_ebx, dwarf_ebx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_ebx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ecx, nullptr), {ehframe_ecx, dwarf_ecx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_ecx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(edx, nullptr), {ehframe_edx, dwarf_edx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_edx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(edi, nullptr), {ehframe_edi, dwarf_edi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_edi}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(esi, nullptr), {ehframe_esi, dwarf_esi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_esi}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ebp, "fp"), {ehframe_ebp, dwarf_ebp, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM, gpr_ebp}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(esp, "sp"), {ehframe_esp, dwarf_esp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM, gpr_esp}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ss, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_ss}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(eflags, "flags"), {ehframe_eflags, dwarf_eflags, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM, gpr_eflags}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(eip, "pc"), {ehframe_eip, dwarf_eip, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM, gpr_eip}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(cs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_cs}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ds, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_ds}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(es, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_es}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(fs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_fs}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(gs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_gs}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fcw), @@ -272,60 +288,70 @@ LLDB_INVALID_REGNUM, fpu_fcw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fsw), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_fsw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ftw), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ftw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fop), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_fop}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ip), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ip}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(cs), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_cs}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(dp), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_dp}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ds), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ds}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(mxcsr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_mxcsr}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(mxcsrmask), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_mxcsrmask}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_VECT(stmm, 0)}, {DEFINE_FPU_VECT(stmm, 1)}, @@ -349,18 +375,21 @@ LLDB_INVALID_REGNUM, exc_trapno}, nullptr, nullptr, + nullptr, }, {DEFINE_EXC(err), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, exc_err}, nullptr, nullptr, + nullptr, }, {DEFINE_EXC(faultvaddr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, exc_faultvaddr}, nullptr, nullptr, + nullptr, }}; static size_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp --- a/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp @@ -172,7 +172,7 @@ {ehframe_dwarf_fpu_##reg##i, \ ehframe_dwarf_fpu_##reg##i, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, fpu_##reg##i }, \ - nullptr, nullptr, + nullptr, nullptr, nullptr, #define DEFINE_EXC(reg) \ #reg, NULL, sizeof(((RegisterContextDarwin_x86_64::EXC *) NULL)->reg), \ EXC_OFFSET(reg), eEncodingUint, eFormatHex @@ -194,126 +194,147 @@ LLDB_INVALID_REGNUM, gpr_rax}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rbx, nullptr), {ehframe_dwarf_gpr_rbx, ehframe_dwarf_gpr_rbx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_rbx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rcx, nullptr), {ehframe_dwarf_gpr_rcx, ehframe_dwarf_gpr_rcx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_rcx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rdx, nullptr), {ehframe_dwarf_gpr_rdx, ehframe_dwarf_gpr_rdx, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_rdx}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rdi, nullptr), {ehframe_dwarf_gpr_rdi, ehframe_dwarf_gpr_rdi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_rdi}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rsi, nullptr), {ehframe_dwarf_gpr_rsi, ehframe_dwarf_gpr_rsi, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_rsi}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rbp, "fp"), {ehframe_dwarf_gpr_rbp, ehframe_dwarf_gpr_rbp, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM, gpr_rbp}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rsp, "sp"), {ehframe_dwarf_gpr_rsp, ehframe_dwarf_gpr_rsp, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM, gpr_rsp}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r8, nullptr), {ehframe_dwarf_gpr_r8, ehframe_dwarf_gpr_r8, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r8}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r9, nullptr), {ehframe_dwarf_gpr_r9, ehframe_dwarf_gpr_r9, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r9}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r10, nullptr), {ehframe_dwarf_gpr_r10, ehframe_dwarf_gpr_r10, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r10}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r11, nullptr), {ehframe_dwarf_gpr_r11, ehframe_dwarf_gpr_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r11}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r12, nullptr), {ehframe_dwarf_gpr_r12, ehframe_dwarf_gpr_r12, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r12}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r13, nullptr), {ehframe_dwarf_gpr_r13, ehframe_dwarf_gpr_r13, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r13}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r14, nullptr), {ehframe_dwarf_gpr_r14, ehframe_dwarf_gpr_r14, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r14}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(r15, nullptr), {ehframe_dwarf_gpr_r15, ehframe_dwarf_gpr_r15, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_r15}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rip, "pc"), {ehframe_dwarf_gpr_rip, ehframe_dwarf_gpr_rip, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM, gpr_rip}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(rflags, "flags"), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM, gpr_rflags}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(cs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_cs}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(fs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_fs}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(gs, nullptr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_gs}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fcw), @@ -321,60 +342,70 @@ LLDB_INVALID_REGNUM, fpu_fcw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fsw), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_fsw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ftw), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ftw}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(fop), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_fop}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ip), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ip}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(cs), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_cs}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(dp), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_dp}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(ds), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_ds}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(mxcsr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_mxcsr}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_UINT(mxcsrmask), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, fpu_mxcsrmask}, nullptr, nullptr, + nullptr, }, {DEFINE_FPU_VECT(stmm, 0)}, {DEFINE_FPU_VECT(stmm, 1)}, @@ -406,18 +437,21 @@ LLDB_INVALID_REGNUM, exc_trapno}, nullptr, nullptr, + nullptr, }, {DEFINE_EXC(err), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, exc_err}, nullptr, nullptr, + nullptr, }, {DEFINE_EXC(faultvaddr), {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, exc_faultvaddr}, nullptr, nullptr, + nullptr, }}; static size_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp --- a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp @@ -99,6 +99,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, + nullptr, nullptr}) {} size_t RegisterContextLinux_i386::GetGPRSizeStatic() { return sizeof(GPR); } diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp --- a/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp @@ -163,6 +163,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}, nullptr, + nullptr, nullptr}), m_register_info_p(GetRegisterInfoPtr(target_arch)), m_register_info_count(GetRegisterInfoCount(target_arch)), diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp --- a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_i386.cpp @@ -41,6 +41,7 @@ #reg, alt, sizeof(((GPR *)nullptr)->reg), GPR_OFFSET(reg), eEncodingUint, \ eFormatHex, \ {kind1, kind2, kind3, kind4, lldb_##reg##_i386 }, nullptr, nullptr, \ + nullptr, \ } // 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 --- a/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp @@ -49,6 +49,7 @@ #reg, alt, sizeof(((GPR *)nullptr)->reg), GPR_OFFSET(reg), eEncodingUint, \ eFormatHex, \ {kind1, kind2, kind3, kind4, lldb_##reg##_x86_64 }, nullptr, nullptr, \ + nullptr, \ } typedef struct _FPReg { @@ -79,7 +80,7 @@ eEncodingUint, eFormatVectorOfUInt64, \ {dwarf_##reg##_x86_64, dwarf_##reg##_x86_64, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, lldb_##reg##_x86_64 }, \ - nullptr, nullptr, \ + nullptr, 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 --- a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm.cpp @@ -38,7 +38,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ dbg_##reg##i }, \ - NULL, NULL, + NULL, 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 --- 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, 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 --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h @@ -350,7 +350,7 @@ #name, nullptr, size, FPU_OFFSET(offset), eEncodingIEEE754, eFormatFloat, \ {LLDB_INVALID_REGNUM, dwarf_##name, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, fpu_##name }, \ - g_##qreg##_contained, g_##name##_invalidates, \ + g_##qreg##_contained, g_##name##_invalidates, nullptr, \ } #define FPU_QREG(name, offset) \ @@ -359,7 +359,7 @@ eFormatVectorOfUInt8, \ {LLDB_INVALID_REGNUM, dwarf_##name, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, fpu_##name }, \ - nullptr, g_##name##_invalidates, \ + nullptr, g_##name##_invalidates, nullptr, \ } static RegisterInfo g_register_infos_arm[] = { @@ -381,6 +381,7 @@ gpr_r0}, nullptr, nullptr, + nullptr, }, { "r1", @@ -393,6 +394,7 @@ gpr_r1}, nullptr, nullptr, + nullptr, }, { "r2", @@ -405,6 +407,7 @@ gpr_r2}, nullptr, nullptr, + nullptr, }, { "r3", @@ -417,6 +420,7 @@ gpr_r3}, nullptr, nullptr, + nullptr, }, { "r4", @@ -429,6 +433,7 @@ gpr_r4}, nullptr, nullptr, + nullptr, }, { "r5", @@ -441,6 +446,7 @@ gpr_r5}, nullptr, nullptr, + nullptr, }, { "r6", @@ -453,6 +459,7 @@ gpr_r6}, nullptr, nullptr, + nullptr, }, { "r7", @@ -465,6 +472,7 @@ gpr_r7}, nullptr, nullptr, + nullptr, }, { "r8", @@ -477,6 +485,7 @@ gpr_r8}, nullptr, nullptr, + nullptr, }, { "r9", @@ -489,6 +498,7 @@ gpr_r9}, nullptr, nullptr, + nullptr, }, { "r10", @@ -501,6 +511,7 @@ gpr_r10}, nullptr, nullptr, + nullptr, }, { "r11", @@ -513,6 +524,7 @@ gpr_r11}, nullptr, nullptr, + nullptr, }, { "r12", @@ -525,6 +537,7 @@ gpr_r12}, nullptr, nullptr, + nullptr, }, { "sp", @@ -537,6 +550,7 @@ gpr_sp}, nullptr, nullptr, + nullptr, }, { "lr", @@ -549,6 +563,7 @@ gpr_lr}, nullptr, nullptr, + nullptr, }, { "pc", @@ -561,6 +576,7 @@ gpr_pc}, nullptr, nullptr, + nullptr, }, { "cpsr", @@ -573,6 +589,7 @@ LLDB_INVALID_REGNUM, gpr_cpsr}, nullptr, nullptr, + nullptr, }, FPU_REG(s0, 4, 0, q0), @@ -619,6 +636,7 @@ LLDB_INVALID_REGNUM, fpu_fpscr}, nullptr, nullptr, + nullptr, }, FPU_REG(d0, 8, 0, q0), @@ -682,6 +700,7 @@ LLDB_INVALID_REGNUM, exc_exception}, nullptr, nullptr, + nullptr, }, { "fsr", @@ -694,6 +713,7 @@ LLDB_INVALID_REGNUM, exc_fsr}, nullptr, nullptr, + nullptr, }, { "far", @@ -706,6 +726,7 @@ LLDB_INVALID_REGNUM, exc_far}, nullptr, nullptr, + nullptr, }, {DEFINE_DBG(bvr, 0)}, diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h @@ -491,6 +491,7 @@ { \ #reg, nullptr, 8, GPR_OFFSET(gpr_##reg), lldb::eEncodingUint, \ lldb::eFormatHex, GPR64_KIND(reg, generic_kind), nullptr, nullptr, \ + nullptr, \ } // Defines a 64-bit general purpose register @@ -498,6 +499,7 @@ { \ #reg, #alt, 8, GPR_OFFSET(gpr_##reg), lldb::eEncodingUint, \ lldb::eFormatHex, GPR64_KIND(reg, generic_kind), nullptr, nullptr, \ + nullptr, \ } // Defines a 32-bit general purpose pseudo register @@ -506,14 +508,14 @@ #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, \ + g_contained_##xreg, g_##wreg##_invalidates, nullptr, \ } // 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, \ + lldb::eFormatVectorOfUInt8, VREG_KIND(reg), nullptr, nullptr, nullptr, \ } // Defines S and D pseudo registers mapping over corresponding vector register @@ -521,7 +523,7 @@ { \ #reg, nullptr, size, FPU_OFFSET(fpu_##vreg - fpu_v0) + offset, \ lldb::eEncodingIEEE754, lldb::eFormatFloat, LLDB_KIND(fpu_##reg), \ - g_contained_##vreg, g_##reg##_invalidates, \ + g_contained_##vreg, g_##reg##_invalidates, nullptr, \ } // Defines miscellaneous status and control registers like cpsr, fpsr etc @@ -529,13 +531,14 @@ { \ #reg, nullptr, size, TYPE##_OFFSET_NAME(reg), lldb::eEncodingUint, \ lldb::eFormatHex, MISC_##TYPE##_KIND(lldb_kind), nullptr, nullptr, \ + nullptr, \ } // Defines pointer authentication mask registers #define DEFINE_EXTENSION_REG(reg) \ { \ #reg, nullptr, 8, 0, lldb::eEncodingUint, lldb::eFormatHex, \ - KIND_ALL_INVALID, nullptr, nullptr, \ + KIND_ALL_INVALID, nullptr, 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 --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h @@ -311,6 +311,7 @@ { \ #vreg, nullptr, 16, 0, lldb::eEncodingVector, lldb::eFormatVectorOfUInt8, \ VREG_KIND(vreg), g_contained_##zreg, g_sve_##vreg##_invalidates, \ + nullptr, \ } // Defines S and D pseudo registers mapping over corresponding vector register @@ -318,20 +319,21 @@ { \ #reg, nullptr, size, 0, lldb::eEncodingIEEE754, lldb::eFormatFloat, \ LLDB_KIND(fpu_##reg), g_contained_##zreg, g_sve_##reg##_invalidates, \ + nullptr, \ } // 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, \ + SVE_REG_KIND(reg), nullptr, 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, \ + SVE_REG_KIND(reg), nullptr, 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 --- 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, 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, 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, nullptr, nullptr, \ } #define DEFINE_FP_MM(reg, i, streg) \ @@ -95,6 +95,7 @@ LLDB_INVALID_REGNUM, lldb_mm##i##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##streg##_32, \ RegisterContextPOSIX_x86::g_invalidate_##streg##_32, \ + nullptr, \ } #define DEFINE_XMM(reg, i) \ @@ -104,7 +105,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, nullptr, nullptr, \ } // I believe the YMM registers use dwarf_xmm_%_i386 register numbers and then @@ -116,7 +117,7 @@ {LLDB_INVALID_REGNUM, dwarf_xmm##i##_i386, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_i386 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_BNDR(reg, i) \ @@ -125,7 +126,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, nullptr, nullptr, \ } #define DEFINE_BNDC(name, i) \ @@ -135,7 +136,7 @@ eFormatVectorOfUInt8, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, lldb_##name##_i386 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_DR(reg, i) \ @@ -145,7 +146,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_i386 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_GPR_PSEUDO_16(reg16, reg32) \ @@ -157,6 +158,7 @@ lldb_##reg16##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ RegisterContextPOSIX_x86::g_invalidate_##reg32, \ + nullptr, \ } #define DEFINE_GPR_PSEUDO_8H(reg8, reg32) \ @@ -168,6 +170,7 @@ lldb_##reg8##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ RegisterContextPOSIX_x86::g_invalidate_##reg32, \ + nullptr, \ } #define DEFINE_GPR_PSEUDO_8L(reg8, reg32) \ @@ -179,6 +182,7 @@ lldb_##reg8##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ RegisterContextPOSIX_x86::g_invalidate_##reg32, \ + nullptr, \ } static RegisterInfo g_register_infos_i386[] = { diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h @@ -48,7 +48,7 @@ { \ #reg, #alt, 8, GPR_OFFSET(gpr_##reg##_loongarch - gpr_first_loongarch), \ lldb::eEncodingUint, lldb::eFormatHex, \ - GPR64_KIND(gpr_##reg, generic_kind), nullptr, nullptr \ + GPR64_KIND(gpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } // Defines a 64-bit floating point register @@ -57,21 +57,21 @@ { \ #reg, #alt, 8, FPR_OFFSET(fpr_##reg##_loongarch - fpr_first_loongarch), \ lldb::eEncodingUint, lldb::eFormatHex, \ - FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr \ + FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } #define DEFINE_FCC(reg, generic_kind) \ { \ #reg, nullptr, 1, FCC_OFFSET(fpr_##reg##_loongarch - fpr_fcc0_loongarch), \ lldb::eEncodingUint, lldb::eFormatHex, \ - FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr \ + FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } #define DEFINE_FCSR(reg, generic_kind) \ { \ #reg, nullptr, 4, FCSR_OFFSET, \ lldb::eEncodingUint, lldb::eFormatHex, \ - FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr \ + FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } // clang-format on diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h @@ -30,7 +30,7 @@ GPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ gpr_##reg##_mips64 }, \ - NULL, NULL \ + NULL, NULL, NULL, \ } #define DEFINE_FPR(reg, alt, kind1, kind2, kind3) \ @@ -39,7 +39,7 @@ FPR_OFFSET(reg), eEncodingIEEE754, eFormatFloat, \ {kind1, kind2, kind3, LLDB_INVALID_REGNUM, \ fpr_##reg##_mips64 }, \ - NULL, NULL, \ + NULL, NULL, NULL, \ } #define DEFINE_FPR_INFO(reg, alt, kind1, kind2, kind3) \ @@ -48,7 +48,7 @@ FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, LLDB_INVALID_REGNUM, \ fpr_##reg##_mips64 }, \ - NULL, NULL, \ + NULL, NULL, NULL, \ } diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h --- 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, 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, 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, NULL, NULL, \ } // General purpose registers. EH_Frame, DWARF, @@ -124,6 +124,7 @@ {dwarf_fpscr_powerpc, dwarf_fpscr_powerpc, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, fpr_fpscr_powerpc}, \ NULL, \ + NULL, \ NULL, \ }, \ DEFINE_VMX(v0, LLDB_INVALID_REGNUM), \ @@ -167,6 +168,7 @@ {dwarf_vrsave_powerpc, dwarf_vrsave_powerpc, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, vmx_vrsave_powerpc}, \ NULL, \ + NULL, \ NULL, \ }, \ {"vscr", \ @@ -179,6 +181,7 @@ LLDB_INVALID_REGNUM, vmx_vscr_powerpc}, \ NULL, \ NULL, \ + NULL, \ }, static RegisterInfo g_register_infos_powerpc64[] = { diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h --- 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, 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, 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, NULL, NULL, \ } // General purpose registers. @@ -136,6 +136,7 @@ LLDB_INVALID_REGNUM, fpr_fpscr_ppc64}, \ NULL, \ NULL, \ + NULL, \ }, \ DEFINE_VMX_PPC64(vr0, LLDB_INVALID_REGNUM), \ DEFINE_VMX_PPC64(vr1, LLDB_INVALID_REGNUM), \ @@ -179,6 +180,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, vmx_vscr_ppc64}, \ NULL, \ NULL, \ + NULL, \ }, \ {"vrsave", \ NULL, \ @@ -191,6 +193,7 @@ LLDB_INVALID_REGNUM, vmx_vrsave_ppc64}, \ NULL, \ NULL, \ + NULL, \ }, /* */ typedef struct _GPR_PPC64 { diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h --- 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, 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, 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, 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, NULL, NULL, \ } // General purpose registers. @@ -147,6 +147,7 @@ LLDB_INVALID_REGNUM, fpr_fpscr_ppc64le}, \ NULL, \ NULL, \ + NULL, \ }, \ DEFINE_VMX(vr0, LLDB_INVALID_REGNUM), \ DEFINE_VMX(vr1, LLDB_INVALID_REGNUM), \ @@ -190,6 +191,7 @@ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, vmx_vscr_ppc64le}, \ NULL, \ NULL, \ + NULL, \ }, \ {"vrsave", \ NULL, \ @@ -202,6 +204,7 @@ LLDB_INVALID_REGNUM, vmx_vrsave_ppc64le}, \ NULL, \ NULL, \ + NULL, \ }, \ DEFINE_VSX(vs0, LLDB_INVALID_REGNUM), \ DEFINE_VSX(vs1, LLDB_INVALID_REGNUM), \ diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h @@ -50,7 +50,7 @@ { \ #reg, #alt, 8, GPR_OFFSET(gpr_##reg##_riscv - gpr_first_riscv), \ lldb::eEncodingUint, lldb::eFormatHex, \ - GPR64_KIND(gpr_##reg, generic_kind), nullptr, nullptr \ + GPR64_KIND(gpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } #define DEFINE_FPR64(reg, generic_kind) DEFINE_FPR64_ALT(reg, reg, generic_kind) @@ -61,7 +61,7 @@ { \ #reg, #alt, size, FPR_OFFSET(fpr_##reg##_riscv - fpr_first_riscv), \ lldb::eEncodingUint, lldb::eFormatHex, \ - FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr \ + FPR64_KIND(fpr_##reg, generic_kind), nullptr, nullptr, nullptr, \ } // clang-format on diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h --- 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, 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, 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, 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, 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 --- 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, 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, 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, nullptr, nullptr, \ } #define DEFINE_FP_MM(reg, i, streg) \ @@ -96,6 +96,7 @@ LLDB_INVALID_REGNUM, lldb_mm##i##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##streg##_64, \ RegisterContextPOSIX_x86::g_invalidate_##streg##_64, \ + nullptr, \ } #define DEFINE_XMM(reg, i) \ @@ -106,7 +107,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, nullptr, nullptr, \ } #define DEFINE_YMM(reg, i) \ @@ -117,7 +118,7 @@ dwarf_##reg##i##h_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_BNDR(reg, i) \ @@ -128,7 +129,7 @@ dwarf_##reg##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_BNDC(name, i) \ @@ -137,7 +138,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, nullptr, nullptr, \ } #define DEFINE_DR(reg, i) \ @@ -147,7 +148,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - nullptr, nullptr, \ + nullptr, nullptr, nullptr, \ } #define DEFINE_GPR_PSEUDO_32(reg32, reg64) \ @@ -159,6 +160,7 @@ lldb_##reg32##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ RegisterContextPOSIX_x86::g_invalidate_##reg64, \ + nullptr, \ } #define DEFINE_GPR_PSEUDO_16(reg16, reg64) \ @@ -170,6 +172,7 @@ lldb_##reg16##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ RegisterContextPOSIX_x86::g_invalidate_##reg64, \ + nullptr, \ } #define DEFINE_GPR_PSEUDO_8H(reg8, reg64) \ @@ -181,6 +184,7 @@ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ RegisterContextPOSIX_x86::g_invalidate_##reg64, \ + nullptr, \ } #define DEFINE_GPR_PSEUDO_8L(reg8, reg64) \ @@ -192,6 +196,7 @@ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ RegisterContextPOSIX_x86::g_invalidate_##reg64, \ + nullptr \ } #define DEFINE_FPR_32(name, reg, kind1, kind2, kind3, kind4, reg64) \ @@ -200,6 +205,7 @@ {kind1, kind2, kind3, kind4, lldb_##name##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ RegisterContextPOSIX_x86::g_invalidate_##reg64, \ + nullptr, \ } // clang-format off diff --git a/lldb/source/Plugins/Process/Windows/Common/arm/RegisterContextWindows_arm.cpp b/lldb/source/Plugins/Process/Windows/Common/arm/RegisterContextWindows_arm.cpp --- a/lldb/source/Plugins/Process/Windows/Common/arm/RegisterContextWindows_arm.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/arm/RegisterContextWindows_arm.cpp @@ -34,7 +34,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - NULL, NULL + NULL, NULL, NULL // Include RegisterInfos_arm to declare our g_register_infos_arm structure. #define DECLARE_REGISTER_INFOS_ARM_STRUCT diff --git a/lldb/source/Plugins/Process/Windows/Common/arm64/RegisterContextWindows_arm64.cpp b/lldb/source/Plugins/Process/Windows/Common/arm64/RegisterContextWindows_arm64.cpp --- a/lldb/source/Plugins/Process/Windows/Common/arm64/RegisterContextWindows_arm64.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/arm64/RegisterContextWindows_arm64.cpp @@ -37,7 +37,7 @@ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - NULL, NULL + NULL, NULL, NULL // Include RegisterInfos_arm64 to declare our g_register_infos_arm64 structure. #define DECLARE_REGISTER_INFOS_ARM64_STRUCT diff --git a/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp b/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp --- a/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp +++ b/lldb/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp @@ -62,60 +62,70 @@ LLDB_INVALID_REGNUM, lldb_eax_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ebx, nullptr), {ehframe_ebx_i386, dwarf_ebx_i386, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_ebx_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ecx, nullptr), {ehframe_ecx_i386, dwarf_ecx_i386, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_ecx_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(edx, nullptr), {ehframe_edx_i386, dwarf_edx_i386, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_edx_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(edi, nullptr), {ehframe_edi_i386, dwarf_edi_i386, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_edi_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(esi, nullptr), {ehframe_esi_i386, dwarf_esi_i386, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_esi_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(ebp, "fp"), {ehframe_ebp_i386, dwarf_ebp_i386, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM, lldb_ebp_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(esp, "sp"), {ehframe_esp_i386, dwarf_esp_i386, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM, lldb_esp_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR(eip, "pc"), {ehframe_eip_i386, dwarf_eip_i386, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM, lldb_eip_i386}, nullptr, nullptr, + nullptr, }, {DEFINE_GPR_BIN(eflags, "flags"), {ehframe_eflags_i386, dwarf_eflags_i386, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM, lldb_eflags_i386}, nullptr, nullptr, + nullptr, }, }; static size_t k_num_register_infos = std::size(g_register_infos); diff --git a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp --- a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp +++ b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM.cpp @@ -31,6 +31,7 @@ { \ "r" #i, nullptr, 4, OFFSET(r) + i * 4, eEncodingUint, eFormatHex, \ {ehframe_r##i, dwarf_r##i, INV, INV, reg_r##i}, nullptr, nullptr, \ + nullptr, \ } #define DEF_R_ARG(i, n) \ @@ -38,27 +39,28 @@ "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, 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, 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, \ } #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, nullptr, nullptr, \ } // Zero based LLDB register numbers for this register context @@ -176,6 +178,7 @@ {ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, INV, reg_r7}, nullptr, nullptr, + nullptr, }; static RegisterInfo g_reg_info_fp = { @@ -188,6 +191,7 @@ {ehframe_r11, dwarf_r11, LLDB_REGNUM_GENERIC_FP, INV, reg_r11}, nullptr, nullptr, + nullptr, }; // Register info definitions for this register context @@ -214,6 +218,7 @@ {ehframe_sp, dwarf_sp, LLDB_REGNUM_GENERIC_SP, INV, reg_sp}, nullptr, nullptr, + nullptr, }, {"lr", "r14", @@ -224,6 +229,7 @@ {ehframe_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, INV, reg_lr}, nullptr, nullptr, + nullptr, }, {"pc", "r15", @@ -234,6 +240,7 @@ {ehframe_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, INV, reg_pc}, nullptr, nullptr, + nullptr, }, {"cpsr", "psr", @@ -244,6 +251,7 @@ {ehframe_cpsr, dwarf_cpsr, LLDB_REGNUM_GENERIC_FLAGS, INV, reg_cpsr}, nullptr, nullptr, + nullptr, }, {"fpscr", nullptr, @@ -254,6 +262,7 @@ {INV, INV, INV, INV, reg_fpscr}, nullptr, nullptr, + nullptr, }, DEF_D(0), DEF_D(1), diff --git a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp --- a/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp +++ b/lldb/source/Plugins/Process/minidump/RegisterContextMinidump_ARM64.cpp @@ -29,48 +29,48 @@ { \ "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, 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, \ + {INV, INV, INV, INV, reg_w##i}, nullptr, 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, \ + INV, reg_x##i}, nullptr, 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, \ + reg_v##i}, nullptr, 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, 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, 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, nullptr, \ } // Zero based LLDB register numbers for this register context @@ -316,6 +316,7 @@ {arm64_dwarf::x29, arm64_dwarf::x29, LLDB_REGNUM_GENERIC_FP, INV, reg_fp}, nullptr, nullptr, + nullptr, }, {"lr", "x30", @@ -326,6 +327,7 @@ {arm64_dwarf::x30, arm64_dwarf::x30, LLDB_REGNUM_GENERIC_RA, INV, reg_lr}, nullptr, nullptr, + nullptr, }, {"sp", "x31", @@ -336,6 +338,7 @@ {arm64_dwarf::x31, arm64_dwarf::x31, LLDB_REGNUM_GENERIC_SP, INV, reg_sp}, nullptr, nullptr, + nullptr, }, {"pc", nullptr, @@ -346,6 +349,7 @@ {arm64_dwarf::pc, arm64_dwarf::pc, LLDB_REGNUM_GENERIC_PC, INV, reg_pc}, nullptr, nullptr, + nullptr, }, // w0 - w31 DEF_W(0), @@ -389,6 +393,7 @@ {INV, arm64_dwarf::cpsr, LLDB_REGNUM_GENERIC_FLAGS, INV, reg_cpsr}, nullptr, nullptr, + nullptr, }, {"fpsr", nullptr, @@ -399,6 +404,7 @@ {INV, INV, INV, INV, reg_fpsr}, nullptr, nullptr, + nullptr, }, {"fpcr", nullptr, @@ -409,6 +415,7 @@ {INV, INV, INV, INV, reg_fpcr}, nullptr, nullptr, + nullptr, }, // v0 - v31 DEF_V(0), diff --git a/lldb/source/Target/DynamicRegisterInfo.cpp b/lldb/source/Target/DynamicRegisterInfo.cpp --- a/lldb/source/Target/DynamicRegisterInfo.cpp +++ b/lldb/source/Target/DynamicRegisterInfo.cpp @@ -407,7 +407,7 @@ {reg.regnum_ehframe, reg.regnum_dwarf, reg.regnum_generic, reg.regnum_remote, local_regnum}, // value_regs and invalidate_regs are filled by Finalize() - nullptr, nullptr + nullptr, nullptr, nullptr }; m_regs.push_back(reg_info); diff --git a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp --- a/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp +++ b/lldb/unittests/tools/lldb-server/tests/MessageObjects.cpp @@ -157,6 +157,7 @@ }, nullptr, nullptr, + nullptr, }; Info.name = ConstString(Elements["name"]).GetCString(); if (!Info.name)