Index: lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp =================================================================== --- lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp +++ lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp @@ -42,7 +42,7 @@ // ======================= =================== =========================== // ======================= ====================== {"r0", - "arg1", + nullptr, 4, 0, eEncodingUint, @@ -54,7 +54,7 @@ nullptr, 0}, {"r1", - "arg2", + nullptr, 4, 0, eEncodingUint, @@ -66,7 +66,7 @@ nullptr, 0}, {"r2", - "arg3", + nullptr, 4, 0, eEncodingUint, @@ -78,7 +78,7 @@ nullptr, 0}, {"r3", - "arg4", + nullptr, 4, 0, eEncodingUint, Index: lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp =================================================================== --- lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp +++ lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp @@ -45,7 +45,7 @@ // ======================= ====================== ========== // =============== {"r0", - "arg1", + nullptr, 4, 0, eEncodingUint, @@ -57,7 +57,7 @@ nullptr, 0}, {"r1", - "arg2", + nullptr, 4, 0, eEncodingUint, @@ -69,7 +69,7 @@ nullptr, 0}, {"r2", - "arg3", + nullptr, 4, 0, eEncodingUint, @@ -81,7 +81,7 @@ nullptr, 0}, {"r3", - "arg4", + nullptr, 4, 0, eEncodingUint, Index: lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp =================================================================== --- lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp +++ lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp @@ -131,7 +131,7 @@ nullptr, 0}, {"r4", - "arg1", + nullptr, 4, 0, eEncodingUint, @@ -143,7 +143,7 @@ nullptr, 0}, {"r5", - "arg2", + nullptr, 4, 0, eEncodingUint, @@ -155,7 +155,7 @@ nullptr, 0}, {"r6", - "arg3", + nullptr, 4, 0, eEncodingUint, @@ -167,7 +167,7 @@ nullptr, 0}, {"r7", - "arg4", + nullptr, 4, 0, eEncodingUint, @@ -431,7 +431,7 @@ nullptr, 0}, {"r29", - "sp", + nullptr, 4, 0, eEncodingUint, @@ -443,7 +443,7 @@ nullptr, 0}, {"r30", - "fp", + nullptr, 4, 0, eEncodingUint, @@ -455,7 +455,7 @@ nullptr, 0}, {"r31", - "ra", + nullptr, 4, 0, eEncodingUint, Index: lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp =================================================================== --- lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp +++ lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp @@ -131,7 +131,7 @@ nullptr, 0}, {"r4", - "arg1", + nullptr, 8, 0, eEncodingUint, @@ -143,7 +143,7 @@ nullptr, 0}, {"r5", - "arg2", + nullptr, 8, 0, eEncodingUint, @@ -155,7 +155,7 @@ nullptr, 0}, {"r6", - "arg3", + nullptr, 8, 0, eEncodingUint, @@ -167,7 +167,7 @@ nullptr, 0}, {"r7", - "arg4", + nullptr, 8, 0, eEncodingUint, @@ -179,7 +179,7 @@ nullptr, 0}, {"r8", - "arg5", + nullptr, 8, 0, eEncodingUint, @@ -191,7 +191,7 @@ nullptr, 0}, {"r9", - "arg6", + nullptr, 8, 0, eEncodingUint, @@ -203,7 +203,7 @@ nullptr, 0}, {"r10", - "arg7", + nullptr, 8, 0, eEncodingUint, @@ -215,7 +215,7 @@ nullptr, 0}, {"r11", - "arg8", + nullptr, 8, 0, eEncodingUint, @@ -431,7 +431,7 @@ nullptr, 0}, {"r29", - "sp", + nullptr, 8, 0, eEncodingUint, @@ -443,7 +443,7 @@ nullptr, 0}, {"r30", - "fp", + nullptr, 8, 0, eEncodingUint, @@ -455,7 +455,7 @@ nullptr, 0}, {"r31", - "ra", + nullptr, 8, 0, eEncodingUint, Index: lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp =================================================================== --- lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp +++ lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp @@ -120,25 +120,25 @@ // Generic, Process Plugin DEFINE_GPR(r0, nullptr, dwarf_r0, dwarf_r0, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(r1, "sp", dwarf_r1, dwarf_r1, LLDB_REGNUM_GENERIC_SP, + DEFINE_GPR(r1, nullptr, dwarf_r1, dwarf_r1, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM), DEFINE_GPR(r2, nullptr, dwarf_r2, dwarf_r2, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(r3, "arg1", dwarf_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG1, + DEFINE_GPR(r3, nullptr, dwarf_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM), - DEFINE_GPR(r4, "arg2", dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG2, + DEFINE_GPR(r4, nullptr, dwarf_r4, dwarf_r4, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM), - DEFINE_GPR(r5, "arg3", dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG3, + DEFINE_GPR(r5, nullptr, dwarf_r5, dwarf_r5, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM), - DEFINE_GPR(r6, "arg4", dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG4, + DEFINE_GPR(r6, nullptr, dwarf_r6, dwarf_r6, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM), - DEFINE_GPR(r7, "arg5", dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG5, + DEFINE_GPR(r7, nullptr, dwarf_r7, dwarf_r7, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM), - DEFINE_GPR(r8, "arg6", dwarf_r8, dwarf_r8, LLDB_REGNUM_GENERIC_ARG6, + DEFINE_GPR(r8, nullptr, dwarf_r8, dwarf_r8, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM), - DEFINE_GPR(r9, "arg7", dwarf_r9, dwarf_r9, LLDB_REGNUM_GENERIC_ARG7, + DEFINE_GPR(r9, nullptr, dwarf_r9, dwarf_r9, LLDB_REGNUM_GENERIC_ARG7, LLDB_INVALID_REGNUM), - DEFINE_GPR(r10, "arg8", dwarf_r10, dwarf_r10, LLDB_REGNUM_GENERIC_ARG8, + DEFINE_GPR(r10, nullptr, dwarf_r10, dwarf_r10, LLDB_REGNUM_GENERIC_ARG8, LLDB_INVALID_REGNUM), DEFINE_GPR(r11, nullptr, dwarf_r11, dwarf_r11, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), @@ -182,15 +182,15 @@ LLDB_INVALID_REGNUM), DEFINE_GPR(r31, nullptr, dwarf_r31, dwarf_r31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(lr, "lr", dwarf_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, + DEFINE_GPR(lr, nullptr, dwarf_lr, dwarf_lr, LLDB_REGNUM_GENERIC_RA, LLDB_INVALID_REGNUM), - DEFINE_GPR(cr, "cr", dwarf_cr, dwarf_cr, LLDB_REGNUM_GENERIC_FLAGS, + DEFINE_GPR(cr, nullptr, dwarf_cr, dwarf_cr, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM), - DEFINE_GPR(xer, "xer", dwarf_xer, dwarf_xer, LLDB_INVALID_REGNUM, + DEFINE_GPR(xer, nullptr, dwarf_xer, dwarf_xer, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(ctr, "ctr", dwarf_ctr, dwarf_ctr, LLDB_INVALID_REGNUM, + DEFINE_GPR(ctr, nullptr, dwarf_ctr, dwarf_ctr, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(pc, "pc", dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, + DEFINE_GPR(pc, nullptr, dwarf_pc, dwarf_pc, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM), {nullptr, nullptr, Index: lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp =================================================================== --- lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp +++ lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp @@ -121,16 +121,16 @@ static const RegisterInfo g_register_infos[] = { DEFINE_REG(r0, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r1, 8, nullptr, LLDB_INVALID_REGNUM), - DEFINE_REG(r2, 8, "arg1", LLDB_REGNUM_GENERIC_ARG1), - DEFINE_REG(r3, 8, "arg2", LLDB_REGNUM_GENERIC_ARG2), - DEFINE_REG(r4, 8, "arg3", LLDB_REGNUM_GENERIC_ARG3), - DEFINE_REG(r5, 8, "arg4", LLDB_REGNUM_GENERIC_ARG4), - DEFINE_REG(r6, 8, "arg5", LLDB_REGNUM_GENERIC_ARG5), + DEFINE_REG(r2, 8, nullptr, LLDB_REGNUM_GENERIC_ARG1), + DEFINE_REG(r3, 8, nullptr, LLDB_REGNUM_GENERIC_ARG2), + DEFINE_REG(r4, 8, nullptr, LLDB_REGNUM_GENERIC_ARG3), + DEFINE_REG(r5, 8, nullptr, LLDB_REGNUM_GENERIC_ARG4), + DEFINE_REG(r6, 8, nullptr, LLDB_REGNUM_GENERIC_ARG5), DEFINE_REG(r7, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r8, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r9, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r10, 8, nullptr, LLDB_INVALID_REGNUM), - DEFINE_REG(r11, 8, "fp", LLDB_REGNUM_GENERIC_FP), + DEFINE_REG(r11, 8, nullptr, LLDB_REGNUM_GENERIC_FP), DEFINE_REG(r12, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r13, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(r14, 8, nullptr, LLDB_INVALID_REGNUM), @@ -151,8 +151,8 @@ DEFINE_REG(acr13, 4, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(acr14, 4, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(acr15, 4, nullptr, LLDB_INVALID_REGNUM), - DEFINE_REG(pswm, 8, "flags", LLDB_REGNUM_GENERIC_FLAGS), - DEFINE_REG(pswa, 8, "pc", LLDB_REGNUM_GENERIC_PC), + DEFINE_REG(pswm, 8, nullptr, LLDB_REGNUM_GENERIC_FLAGS), + DEFINE_REG(pswa, 8, nullptr, LLDB_REGNUM_GENERIC_PC), DEFINE_REG(f0, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(f1, 8, nullptr, LLDB_INVALID_REGNUM), DEFINE_REG(f2, 8, nullptr, LLDB_INVALID_REGNUM), Index: lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp +++ lldb/source/Plugins/Process/Utility/RegisterContextWindows_x86_64.cpp @@ -89,22 +89,22 @@ // =========================== ================== ================ ========================= ==================== DEFINE_GPR(rax, nullptr, dwarf_rax_x86_64, dwarf_rax_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(rbx, nullptr, dwarf_rbx_x86_64, dwarf_rbx_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(rcx, "arg4", dwarf_rcx_x86_64, dwarf_rcx_x86_64, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM), - DEFINE_GPR(rdx, "arg3", dwarf_rdx_x86_64, dwarf_rdx_x86_64, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM), - DEFINE_GPR(rdi, "arg1", dwarf_rdi_x86_64, dwarf_rdi_x86_64, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM), - DEFINE_GPR(rsi, "arg2", dwarf_rsi_x86_64, dwarf_rsi_x86_64, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM), - DEFINE_GPR(rbp, "fp", dwarf_rbp_x86_64, dwarf_rbp_x86_64, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM), - DEFINE_GPR(rsp, "sp", dwarf_rsp_x86_64, dwarf_rsp_x86_64, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM), - DEFINE_GPR(r8, "arg5", dwarf_r8_x86_64, dwarf_r8_x86_64, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM), - DEFINE_GPR(r9, "arg6", dwarf_r9_x86_64, dwarf_r9_x86_64, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM), + DEFINE_GPR(rcx, nullptr, dwarf_rcx_x86_64, dwarf_rcx_x86_64, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM), + DEFINE_GPR(rdx, nullptr, dwarf_rdx_x86_64, dwarf_rdx_x86_64, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM), + DEFINE_GPR(rdi, nullptr, dwarf_rdi_x86_64, dwarf_rdi_x86_64, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM), + DEFINE_GPR(rsi, nullptr, dwarf_rsi_x86_64, dwarf_rsi_x86_64, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM), + DEFINE_GPR(rbp, nullptr, dwarf_rbp_x86_64, dwarf_rbp_x86_64, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM), + DEFINE_GPR(rsp, nullptr, dwarf_rsp_x86_64, dwarf_rsp_x86_64, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM), + DEFINE_GPR(r8, nullptr, dwarf_r8_x86_64, dwarf_r8_x86_64, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM), + DEFINE_GPR(r9, nullptr, dwarf_r9_x86_64, dwarf_r9_x86_64, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM), DEFINE_GPR(r10, nullptr, dwarf_r10_x86_64, dwarf_r10_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r11, nullptr, dwarf_r11_x86_64, dwarf_r11_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r12, nullptr, dwarf_r12_x86_64, dwarf_r12_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r13, nullptr, dwarf_r13_x86_64, dwarf_r13_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r14, nullptr, dwarf_r14_x86_64, dwarf_r14_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r15, nullptr, dwarf_r15_x86_64, dwarf_r15_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(rip, "pc", dwarf_rip_x86_64, dwarf_rip_x86_64, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM), - DEFINE_GPR(rflags, "flags", dwarf_rflags_x86_64, dwarf_rflags_x86_64, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM), + DEFINE_GPR(rip, nullptr, dwarf_rip_x86_64, dwarf_rip_x86_64, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM), + DEFINE_GPR(rflags, nullptr, dwarf_rflags_x86_64, dwarf_rflags_x86_64, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM), DEFINE_GPR(cs, nullptr, dwarf_cs_x86_64, dwarf_cs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(fs, nullptr, dwarf_fs_x86_64, dwarf_fs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(gs, nullptr, dwarf_gs_x86_64, dwarf_gs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), Index: lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h +++ lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h @@ -47,16 +47,16 @@ // Generic, Process Plugin #define POWERPC_REGS \ DEFINE_GPR(r0, NULL, LLDB_INVALID_REGNUM) \ - , DEFINE_GPR(r1, "sp", LLDB_REGNUM_GENERIC_SP), \ + , DEFINE_GPR(r1, NULL, LLDB_REGNUM_GENERIC_SP), \ DEFINE_GPR(r2, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR(r3, "arg1", LLDB_REGNUM_GENERIC_ARG1), \ - DEFINE_GPR(r4, "arg2", LLDB_REGNUM_GENERIC_ARG2), \ - DEFINE_GPR(r5, "arg3", LLDB_REGNUM_GENERIC_ARG3), \ - DEFINE_GPR(r6, "arg4", LLDB_REGNUM_GENERIC_ARG4), \ - DEFINE_GPR(r7, "arg5", LLDB_REGNUM_GENERIC_ARG5), \ - DEFINE_GPR(r8, "arg6", LLDB_REGNUM_GENERIC_ARG6), \ - DEFINE_GPR(r9, "arg7", LLDB_REGNUM_GENERIC_ARG7), \ - DEFINE_GPR(r10, "arg8", LLDB_REGNUM_GENERIC_ARG8), \ + DEFINE_GPR(r3, NULL, LLDB_REGNUM_GENERIC_ARG1), \ + DEFINE_GPR(r4, NULL, LLDB_REGNUM_GENERIC_ARG2), \ + DEFINE_GPR(r5, NULL, LLDB_REGNUM_GENERIC_ARG3), \ + DEFINE_GPR(r6, NULL, LLDB_REGNUM_GENERIC_ARG4), \ + DEFINE_GPR(r7, NULL, LLDB_REGNUM_GENERIC_ARG5), \ + DEFINE_GPR(r8, NULL, LLDB_REGNUM_GENERIC_ARG6), \ + DEFINE_GPR(r9, NULL, LLDB_REGNUM_GENERIC_ARG7), \ + DEFINE_GPR(r10, NULL, LLDB_REGNUM_GENERIC_ARG8), \ DEFINE_GPR(r11, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r12, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r13, NULL, LLDB_INVALID_REGNUM), \ @@ -78,11 +78,11 @@ DEFINE_GPR(r29, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r30, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r31, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR(lr, "lr", LLDB_REGNUM_GENERIC_RA), \ - DEFINE_GPR(cr, "cr", LLDB_REGNUM_GENERIC_FLAGS), \ - DEFINE_GPR(xer, "xer", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(ctr, "ctr", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(pc, "pc", LLDB_REGNUM_GENERIC_PC), \ + DEFINE_GPR(lr, NULL, LLDB_REGNUM_GENERIC_RA), \ + DEFINE_GPR(cr, NULL, LLDB_REGNUM_GENERIC_FLAGS), \ + DEFINE_GPR(xer, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR(ctr, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR(pc, NULL, LLDB_REGNUM_GENERIC_PC), \ DEFINE_FPR(f0, LLDB_INVALID_REGNUM), \ DEFINE_FPR(f1, LLDB_INVALID_REGNUM), \ DEFINE_FPR(f2, LLDB_INVALID_REGNUM), \ Index: lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h +++ lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h @@ -56,16 +56,16 @@ // EH_Frame, Generic, Process Plugin #define PPC64_REGS \ DEFINE_GPR_PPC64(r0, NULL, LLDB_INVALID_REGNUM) \ - , DEFINE_GPR_PPC64(r1, "sp", LLDB_REGNUM_GENERIC_SP), \ + , DEFINE_GPR_PPC64(r1, NULL, LLDB_REGNUM_GENERIC_SP), \ DEFINE_GPR_PPC64(r2, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR_PPC64(r3, "arg1", LLDB_REGNUM_GENERIC_ARG1), \ - DEFINE_GPR_PPC64(r4, "arg2", LLDB_REGNUM_GENERIC_ARG2), \ - DEFINE_GPR_PPC64(r5, "arg3", LLDB_REGNUM_GENERIC_ARG3), \ - DEFINE_GPR_PPC64(r6, "arg4", LLDB_REGNUM_GENERIC_ARG4), \ - DEFINE_GPR_PPC64(r7, "arg5", LLDB_REGNUM_GENERIC_ARG5), \ - DEFINE_GPR_PPC64(r8, "arg6", LLDB_REGNUM_GENERIC_ARG6), \ - DEFINE_GPR_PPC64(r9, "arg7", LLDB_REGNUM_GENERIC_ARG7), \ - DEFINE_GPR_PPC64(r10, "arg8", LLDB_REGNUM_GENERIC_ARG8), \ + DEFINE_GPR_PPC64(r3, NULL, LLDB_REGNUM_GENERIC_ARG1), \ + DEFINE_GPR_PPC64(r4, NULL, LLDB_REGNUM_GENERIC_ARG2), \ + DEFINE_GPR_PPC64(r5, NULL, LLDB_REGNUM_GENERIC_ARG3), \ + DEFINE_GPR_PPC64(r6, NULL, LLDB_REGNUM_GENERIC_ARG4), \ + DEFINE_GPR_PPC64(r7, NULL, LLDB_REGNUM_GENERIC_ARG5), \ + DEFINE_GPR_PPC64(r8, NULL, LLDB_REGNUM_GENERIC_ARG6), \ + DEFINE_GPR_PPC64(r9, NULL, LLDB_REGNUM_GENERIC_ARG7), \ + DEFINE_GPR_PPC64(r10, NULL, LLDB_REGNUM_GENERIC_ARG8), \ DEFINE_GPR_PPC64(r11, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR_PPC64(r12, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR_PPC64(r13, NULL, LLDB_INVALID_REGNUM), \ @@ -87,12 +87,12 @@ DEFINE_GPR_PPC64(r29, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR_PPC64(r30, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR_PPC64(r31, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR_PPC64(cr, "cr", LLDB_REGNUM_GENERIC_FLAGS), \ - DEFINE_GPR_PPC64(msr, "msr", LLDB_INVALID_REGNUM), \ - DEFINE_GPR_PPC64(xer, "xer", LLDB_INVALID_REGNUM), \ - DEFINE_GPR_PPC64(lr, "lr", LLDB_REGNUM_GENERIC_RA), \ - DEFINE_GPR_PPC64(ctr, "ctr", LLDB_INVALID_REGNUM), \ - DEFINE_GPR_PPC64(pc, "pc", LLDB_REGNUM_GENERIC_PC), \ + DEFINE_GPR_PPC64(cr, NULL, LLDB_REGNUM_GENERIC_FLAGS), \ + DEFINE_GPR_PPC64(msr, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR_PPC64(xer, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR_PPC64(lr, NULL, LLDB_REGNUM_GENERIC_RA), \ + DEFINE_GPR_PPC64(ctr, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR_PPC64(pc, NULL, LLDB_REGNUM_GENERIC_PC), \ DEFINE_FPR_PPC64(f0, NULL, LLDB_INVALID_REGNUM), \ DEFINE_FPR_PPC64(f1, NULL, LLDB_INVALID_REGNUM), \ DEFINE_FPR_PPC64(f2, NULL, LLDB_INVALID_REGNUM), \ Index: lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h +++ lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h @@ -64,16 +64,16 @@ // EH_Frame, Generic, Process Plugin #define POWERPC_REGS \ DEFINE_GPR(r0, NULL, LLDB_INVALID_REGNUM) \ - , DEFINE_GPR(r1, "sp", LLDB_REGNUM_GENERIC_SP), \ + , DEFINE_GPR(r1, NULL, LLDB_REGNUM_GENERIC_SP), \ DEFINE_GPR(r2, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR(r3, "arg1", LLDB_REGNUM_GENERIC_ARG1), \ - DEFINE_GPR(r4, "arg2", LLDB_REGNUM_GENERIC_ARG2), \ - DEFINE_GPR(r5, "arg3", LLDB_REGNUM_GENERIC_ARG3), \ - DEFINE_GPR(r6, "arg4", LLDB_REGNUM_GENERIC_ARG4), \ - DEFINE_GPR(r7, "arg5", LLDB_REGNUM_GENERIC_ARG5), \ - DEFINE_GPR(r8, "arg6", LLDB_REGNUM_GENERIC_ARG6), \ - DEFINE_GPR(r9, "arg7", LLDB_REGNUM_GENERIC_ARG7), \ - DEFINE_GPR(r10, "arg8", LLDB_REGNUM_GENERIC_ARG8), \ + DEFINE_GPR(r3, NULL, LLDB_REGNUM_GENERIC_ARG1), \ + DEFINE_GPR(r4, NULL, LLDB_REGNUM_GENERIC_ARG2), \ + DEFINE_GPR(r5, NULL, LLDB_REGNUM_GENERIC_ARG3), \ + DEFINE_GPR(r6, NULL, LLDB_REGNUM_GENERIC_ARG4), \ + DEFINE_GPR(r7, NULL, LLDB_REGNUM_GENERIC_ARG5), \ + DEFINE_GPR(r8, NULL, LLDB_REGNUM_GENERIC_ARG6), \ + DEFINE_GPR(r9, NULL, LLDB_REGNUM_GENERIC_ARG7), \ + DEFINE_GPR(r10, NULL, LLDB_REGNUM_GENERIC_ARG8), \ DEFINE_GPR(r11, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r12, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r13, NULL, LLDB_INVALID_REGNUM), \ @@ -95,15 +95,15 @@ DEFINE_GPR(r29, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r30, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(r31, NULL, LLDB_INVALID_REGNUM), \ - DEFINE_GPR(pc, "pc", LLDB_REGNUM_GENERIC_PC), \ - DEFINE_GPR(msr, "msr", LLDB_INVALID_REGNUM), \ + DEFINE_GPR(pc, NULL, LLDB_REGNUM_GENERIC_PC), \ + DEFINE_GPR(msr, NULL, LLDB_INVALID_REGNUM), \ DEFINE_GPR(origr3, "orig_r3", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(ctr, "ctr", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(lr, "lr", LLDB_REGNUM_GENERIC_RA), \ - DEFINE_GPR(xer, "xer", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(cr, "cr", LLDB_REGNUM_GENERIC_FLAGS), \ - DEFINE_GPR(softe, "softe", LLDB_INVALID_REGNUM), \ - DEFINE_GPR(trap, "trap", LLDB_INVALID_REGNUM), \ + DEFINE_GPR(ctr, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR(lr, NULL, LLDB_REGNUM_GENERIC_RA), \ + DEFINE_GPR(xer, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR(cr, NULL, LLDB_REGNUM_GENERIC_FLAGS), \ + DEFINE_GPR(softe, NULL, LLDB_INVALID_REGNUM), \ + DEFINE_GPR(trap, NULL, LLDB_INVALID_REGNUM), \ DEFINE_FPR(f0, NULL, LLDB_INVALID_REGNUM), \ DEFINE_FPR(f1, NULL, LLDB_INVALID_REGNUM), \ DEFINE_FPR(f2, NULL, LLDB_INVALID_REGNUM), \ Index: lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h +++ lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h @@ -58,20 +58,20 @@ // General purpose registers. DEFINE_GPR(r0, 8, GPR_OFFSET(0), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r1, 8, GPR_OFFSET(1), nullptr, LLDB_INVALID_REGNUM), - DEFINE_GPR(r2, 8, GPR_OFFSET(2), "arg1", LLDB_REGNUM_GENERIC_ARG1), - DEFINE_GPR(r3, 8, GPR_OFFSET(3), "arg2", LLDB_REGNUM_GENERIC_ARG2), - DEFINE_GPR(r4, 8, GPR_OFFSET(4), "arg3", LLDB_REGNUM_GENERIC_ARG3), - DEFINE_GPR(r5, 8, GPR_OFFSET(5), "arg4", LLDB_REGNUM_GENERIC_ARG4), - DEFINE_GPR(r6, 8, GPR_OFFSET(6), "arg5", LLDB_REGNUM_GENERIC_ARG5), + DEFINE_GPR(r2, 8, GPR_OFFSET(2), nullptr, LLDB_REGNUM_GENERIC_ARG1), + DEFINE_GPR(r3, 8, GPR_OFFSET(3), nullptr, LLDB_REGNUM_GENERIC_ARG2), + DEFINE_GPR(r4, 8, GPR_OFFSET(4), nullptr, LLDB_REGNUM_GENERIC_ARG3), + DEFINE_GPR(r5, 8, GPR_OFFSET(5), nullptr, LLDB_REGNUM_GENERIC_ARG4), + DEFINE_GPR(r6, 8, GPR_OFFSET(6), nullptr, LLDB_REGNUM_GENERIC_ARG5), DEFINE_GPR(r7, 8, GPR_OFFSET(7), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r8, 8, GPR_OFFSET(8), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r9, 8, GPR_OFFSET(9), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r10, 8, GPR_OFFSET(10), nullptr, LLDB_INVALID_REGNUM), - DEFINE_GPR(r11, 8, GPR_OFFSET(11), "fp", LLDB_REGNUM_GENERIC_FP), + DEFINE_GPR(r11, 8, GPR_OFFSET(11), nullptr, LLDB_REGNUM_GENERIC_FP), DEFINE_GPR(r12, 8, GPR_OFFSET(12), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r13, 8, GPR_OFFSET(13), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(r14, 8, GPR_OFFSET(14), nullptr, LLDB_INVALID_REGNUM), - DEFINE_GPR(r15, 8, GPR_OFFSET(15), "sp", LLDB_REGNUM_GENERIC_SP), + DEFINE_GPR(r15, 8, GPR_OFFSET(15), nullptr, LLDB_REGNUM_GENERIC_SP), DEFINE_GPR(acr0, 4, ACR_OFFSET(0), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(acr1, 4, ACR_OFFSET(1), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(acr2, 4, ACR_OFFSET(2), nullptr, LLDB_INVALID_REGNUM), @@ -88,8 +88,8 @@ DEFINE_GPR(acr13, 4, ACR_OFFSET(13), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(acr14, 4, ACR_OFFSET(14), nullptr, LLDB_INVALID_REGNUM), DEFINE_GPR(acr15, 4, ACR_OFFSET(15), nullptr, LLDB_INVALID_REGNUM), - DEFINE_GPR(pswm, 8, 0, "flags", LLDB_REGNUM_GENERIC_FLAGS), - DEFINE_GPR(pswa, 8, 8, "pc", LLDB_REGNUM_GENERIC_PC), + DEFINE_GPR(pswm, 8, 0, nullptr, LLDB_REGNUM_GENERIC_FLAGS), + DEFINE_GPR(pswa, 8, 8, nullptr, LLDB_REGNUM_GENERIC_PC), // Floating point registers. DEFINE_FPR(f0, 8, FPR_OFFSET(0)), DEFINE_FPR(f1, 8, FPR_OFFSET(1)), Index: lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h =================================================================== --- lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h +++ lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h @@ -208,22 +208,22 @@ // =========================== ================== ================ ========================= ==================== DEFINE_GPR(rax, nullptr, dwarf_rax_x86_64, dwarf_rax_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(rbx, nullptr, dwarf_rbx_x86_64, dwarf_rbx_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(rcx, "arg4", dwarf_rcx_x86_64, dwarf_rcx_x86_64, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM), - DEFINE_GPR(rdx, "arg3", dwarf_rdx_x86_64, dwarf_rdx_x86_64, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM), - DEFINE_GPR(rdi, "arg1", dwarf_rdi_x86_64, dwarf_rdi_x86_64, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM), - DEFINE_GPR(rsi, "arg2", dwarf_rsi_x86_64, dwarf_rsi_x86_64, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM), - DEFINE_GPR(rbp, "fp", dwarf_rbp_x86_64, dwarf_rbp_x86_64, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM), - DEFINE_GPR(rsp, "sp", dwarf_rsp_x86_64, dwarf_rsp_x86_64, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM), - DEFINE_GPR(r8, "arg5", dwarf_r8_x86_64, dwarf_r8_x86_64, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM), - DEFINE_GPR(r9, "arg6", dwarf_r9_x86_64, dwarf_r9_x86_64, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM), + DEFINE_GPR(rcx, nullptr, dwarf_rcx_x86_64, dwarf_rcx_x86_64, LLDB_REGNUM_GENERIC_ARG4, LLDB_INVALID_REGNUM), + DEFINE_GPR(rdx, nullptr, dwarf_rdx_x86_64, dwarf_rdx_x86_64, LLDB_REGNUM_GENERIC_ARG3, LLDB_INVALID_REGNUM), + DEFINE_GPR(rdi, nullptr, dwarf_rdi_x86_64, dwarf_rdi_x86_64, LLDB_REGNUM_GENERIC_ARG1, LLDB_INVALID_REGNUM), + DEFINE_GPR(rsi, nullptr, dwarf_rsi_x86_64, dwarf_rsi_x86_64, LLDB_REGNUM_GENERIC_ARG2, LLDB_INVALID_REGNUM), + DEFINE_GPR(rbp, nullptr, dwarf_rbp_x86_64, dwarf_rbp_x86_64, LLDB_REGNUM_GENERIC_FP, LLDB_INVALID_REGNUM), + DEFINE_GPR(rsp, nullptr, dwarf_rsp_x86_64, dwarf_rsp_x86_64, LLDB_REGNUM_GENERIC_SP, LLDB_INVALID_REGNUM), + DEFINE_GPR(r8, nullptr, dwarf_r8_x86_64, dwarf_r8_x86_64, LLDB_REGNUM_GENERIC_ARG5, LLDB_INVALID_REGNUM), + DEFINE_GPR(r9, nullptr, dwarf_r9_x86_64, dwarf_r9_x86_64, LLDB_REGNUM_GENERIC_ARG6, LLDB_INVALID_REGNUM), DEFINE_GPR(r10, nullptr, dwarf_r10_x86_64, dwarf_r10_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r11, nullptr, dwarf_r11_x86_64, dwarf_r11_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r12, nullptr, dwarf_r12_x86_64, dwarf_r12_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r13, nullptr, dwarf_r13_x86_64, dwarf_r13_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r14, nullptr, dwarf_r14_x86_64, dwarf_r14_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(r15, nullptr, dwarf_r15_x86_64, dwarf_r15_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), - DEFINE_GPR(rip, "pc", dwarf_rip_x86_64, dwarf_rip_x86_64, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM), - DEFINE_GPR(rflags, "flags", dwarf_rflags_x86_64, dwarf_rflags_x86_64, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM), + DEFINE_GPR(rip, nullptr, dwarf_rip_x86_64, dwarf_rip_x86_64, LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM), + DEFINE_GPR(rflags, nullptr, dwarf_rflags_x86_64, dwarf_rflags_x86_64, LLDB_REGNUM_GENERIC_FLAGS, LLDB_INVALID_REGNUM), DEFINE_GPR(cs, nullptr, dwarf_cs_x86_64, dwarf_cs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(fs, nullptr, dwarf_fs_x86_64, dwarf_fs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), DEFINE_GPR(gs, nullptr, dwarf_gs_x86_64, dwarf_gs_x86_64, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM), Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp =================================================================== --- lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -888,14 +888,14 @@ 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", "arg1", 4, 0, eEncodingUint, eFormatHex, { ehframe_r0, dwarf_r0, LLDB_REGNUM_GENERIC_ARG1,0, 0 }, nullptr, nullptr, nullptr, 0 }, - { "r1", "arg2", 4, 0, eEncodingUint, eFormatHex, { ehframe_r1, dwarf_r1, LLDB_REGNUM_GENERIC_ARG2,1, 1 }, nullptr, nullptr, nullptr, 0 }, - { "r2", "arg3", 4, 0, eEncodingUint, eFormatHex, { ehframe_r2, dwarf_r2, LLDB_REGNUM_GENERIC_ARG3,2, 2 }, nullptr, nullptr, nullptr, 0 }, - { "r3", "arg4", 4, 0, eEncodingUint, eFormatHex, { ehframe_r3, dwarf_r3, LLDB_REGNUM_GENERIC_ARG4,3, 3 }, nullptr, nullptr, nullptr, 0 }, + { "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", "fp", 4, 0, eEncodingUint, eFormatHex, { ehframe_r7, dwarf_r7, LLDB_REGNUM_GENERIC_FP, 7, 7 }, 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 },