From 3eb83b4a0df13cd5d7f3ae4a04253c909163eb03 Mon Sep 17 00:00:00 2001 From: Eugene Zelenko Date: Wed, 21 Sep 2016 00:59:22 +0000 Subject: [PATCH] Fix Clang initialization and Clang-tidy modernize-use-nullptr warnings in source/Plugins/Process/Utility. Differential revision: https://reviews.llvm.org/D24694 llvm-svn: 282041 --- .../Utility/RegisterContextNetBSD_x86_64.cpp | 62 +++++++++++--------- .../Plugins/Process/Utility/RegisterInfos_i386.h | 61 ++++++++++--------- .../Plugins/Process/Utility/RegisterInfos_x86_64.h | 68 +++++++++++----------- 3 files changed, 97 insertions(+), 94 deletions(-) diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp index 8ad00a6..4f64a8c 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextNetBSD_x86_64.cpp @@ -1,19 +1,18 @@ -//===-- RegisterContextNetBSD_x86_64.cpp ----------------------*- C++ -*-===// +//===-- RegisterContextNetBSD_x86_64.cpp ------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // // This file is distributed under the University of Illinois Open Source // License. See LICENSE.TXT for details. // -//===---------------------------------------------------------------------===// - -#include -#include - -#include "llvm/Support/Compiler.h" +//===----------------------------------------------------------------------===// #include "RegisterContextNetBSD_x86_64.h" #include "RegisterContextPOSIX_x86.h" +#include "llvm/ADT/Triple.h" +#include "llvm/Support/Compiler.h" +#include +#include using namespace lldb_private; using namespace lldb; @@ -89,10 +88,10 @@ struct UserArea { LLVM_EXTENSION offsetof(XSAVE, ymmh[0]) + (32 * reg_index)) // Number of bytes needed to represent a FPR. -#define FPR_SIZE(reg) sizeof(((FXSAVE *)NULL)->reg) +#define FPR_SIZE(reg) sizeof(((FXSAVE *)nullptr)->reg) // Number of bytes needed to represent the i'th FP register. -#define FP_SIZE sizeof(((MMSReg *)NULL)->bytes) +#define FP_SIZE sizeof(((MMSReg *)nullptr)->bytes) // Number of bytes needed to represent an XMM register. #define XMM_SIZE sizeof(XMMReg) @@ -105,101 +104,106 @@ struct UserArea { // Note that the size and offset will be updated by platform-specific classes. #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4) \ { \ - #reg, alt, sizeof(((GPR *) NULL)->reg), \ + #reg, alt, sizeof(((GPR *)nullptr)->reg), \ GPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##reg##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4) \ { \ - #name, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ + #name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##name##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FP_ST(reg, i) \ { \ - #reg #i, NULL, FP_SIZE, \ + #reg #i, nullptr, FP_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ 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 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FP_MM(reg, i) \ { \ - #reg #i, NULL, sizeof(uint64_t), \ + #reg #i, nullptr, sizeof(uint64_t), \ LLVM_EXTENSION FPR_OFFSET( \ stmm[i]), eEncodingUint, eFormatHex, \ {dwarf_mm##i##_x86_64, dwarf_mm##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_mm##i##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_XMM(reg, i) \ { \ - #reg #i, NULL, XMM_SIZE, \ + #reg #i, nullptr, XMM_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ reg[i]), eEncodingVector, eFormatVectorOfUInt8, \ {dwarf_##reg##i##_x86_64, dwarf_##reg##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_YMM(reg, i) \ { \ - #reg #i, NULL, YMM_SIZE, \ + #reg #i, nullptr, YMM_SIZE, \ LLVM_EXTENSION YMM_OFFSET(i), eEncodingVector, eFormatVectorOfUInt8, \ {dwarf_##reg##i##h_x86_64, \ dwarf_##reg##i##h_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_GPR_PSEUDO_32(reg32, reg64) \ { \ - #reg32, NULL, 4, \ + #reg32, nullptr, 4, \ GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg32##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_16(reg16, reg64) \ { \ - #reg16, NULL, 2, \ + #reg16, nullptr, 2, \ GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg16##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8H(reg8, reg64) \ { \ - #reg8, NULL, 1, GPR_OFFSET(reg64) + 1, eEncodingUint, eFormatHex, \ + #reg8, nullptr, 1, GPR_OFFSET(reg64) + 1, eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64,\ + nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8L(reg8, reg64) \ { \ - #reg8, NULL, 1, GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ + #reg8, nullptr, 1, GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64,\ + nullptr, 0 \ } static RegisterInfo g_register_infos_x86_64[] = { diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h index 72c2ac6..8597d0c 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h @@ -7,12 +7,9 @@ // //===----------------------------------------------------------------------===// -// C Includes -#include - -// C++ Includes -// Other libraries and framework includes #include "llvm/Support/Compiler.h" +#include +#include // Project includes @@ -46,11 +43,11 @@ // Number of bytes needed to represent a FPR. #if !defined(FPR_SIZE) -#define FPR_SIZE(reg) sizeof(((FXSAVE *)NULL)->reg) +#define FPR_SIZE(reg) sizeof(((FXSAVE *)nullptr)->reg) #endif // Number of bytes needed to represent the i'th FP register. -#define FP_SIZE sizeof(((MMSReg *)NULL)->bytes) +#define FP_SIZE sizeof(((MMSReg *)nullptr)->bytes) // Number of bytes needed to represent an XMM register. #define XMM_SIZE sizeof(XMMReg) @@ -65,124 +62,126 @@ // Note that the size and offset will be updated by platform-specific classes. #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4) \ { \ - #reg, alt, sizeof(((GPR *) NULL)->reg), \ + #reg, alt, sizeof(((GPR *)nullptr)->reg), \ GPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##reg##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4) \ { \ - #name, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ + #name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##name##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } // RegisterKind: EHFrame, DWARF, Generic, Process Plugin, LLDB #define DEFINE_FP_ST(reg, i) \ { \ - #reg #i, NULL, FP_SIZE, \ + #reg #i, nullptr, FP_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ stmm[i]), eEncodingVector, eFormatVectorOfUInt8, \ {ehframe_st##i##_i386, dwarf_st##i##_i386, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, lldb_st##i##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FP_MM(reg, i) \ { \ - #reg #i, NULL, sizeof(uint64_t), \ + #reg #i, nullptr, sizeof(uint64_t), \ LLVM_EXTENSION FPR_OFFSET( \ stmm[i]), eEncodingUint, eFormatHex, \ {ehframe_mm##i##_i386, dwarf_mm##i##_i386, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_mm##i##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_XMM(reg, i) \ { \ - #reg #i, NULL, XMM_SIZE, \ + #reg #i, nullptr, XMM_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ reg[i]), eEncodingVector, eFormatVectorOfUInt8, \ {ehframe_##reg##i##_i386, dwarf_##reg##i##_i386, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, lldb_##reg##i##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } // I believe the YMM registers use dwarf_xmm_%_i386 register numbers and then // differentiate based on register size. #define DEFINE_YMM(reg, i) \ { \ - #reg #i, NULL, YMM_SIZE, \ + #reg #i, nullptr, YMM_SIZE, \ LLVM_EXTENSION YMM_OFFSET(i), eEncodingVector, eFormatVectorOfUInt8, \ {LLDB_INVALID_REGNUM, dwarf_xmm##i##_i386, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_BNDR(reg, i) \ { \ - #reg #i, NULL, BNDR_SIZE, \ + #reg #i, nullptr, BNDR_SIZE, \ 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 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_BNDC(name, i) \ { \ - #name, NULL, BNDC_SIZE, \ + #name, nullptr, BNDC_SIZE, \ LLVM_EXTENSION BNDC_OFFSET(i), eEncodingVector, \ eFormatVectorOfUInt8, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, lldb_##name##_i386 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_DR(reg, i) \ { \ - #reg #i, NULL, DR_SIZE, \ + #reg #i, nullptr, DR_SIZE, \ DR_OFFSET(i), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_GPR_PSEUDO_16(reg16, reg32) \ { \ - #reg16, NULL, 2, \ + #reg16, nullptr, 2, \ GPR_OFFSET(reg32), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg16##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ - RegisterContextPOSIX_x86::g_invalidate_##reg32, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8H(reg8, reg32) \ { \ - #reg8, NULL, 1, \ + #reg8, nullptr, 1, \ GPR_OFFSET(reg32) + 1, eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ - RegisterContextPOSIX_x86::g_invalidate_##reg32, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8L(reg8, reg32) \ { \ - #reg8, NULL, 1, \ + #reg8, nullptr, 1, \ GPR_OFFSET(reg32), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_i386 }, \ RegisterContextPOSIX_x86::g_contained_##reg32, \ - RegisterContextPOSIX_x86::g_invalidate_##reg32, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg32, nullptr, 0 \ } static RegisterInfo g_register_infos_i386[] = { diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h index ee6ac98..2ba8059 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h @@ -7,12 +7,9 @@ // //===----------------------------------------------------------------------===// -// C Includes -#include - -// C++ Includes -// Other libraries and framework includes #include "llvm/Support/Compiler.h" +#include +#include // Project includes @@ -45,10 +42,10 @@ #ifdef DECLARE_REGISTER_INFOS_X86_64_STRUCT // Number of bytes needed to represent a FPR. -#define FPR_SIZE(reg) sizeof(((FXSAVE *)NULL)->reg) +#define FPR_SIZE(reg) sizeof(((FXSAVE *)nullptr)->reg) // Number of bytes needed to represent the i'th FP register. -#define FP_SIZE sizeof(((MMSReg *)NULL)->bytes) +#define FP_SIZE sizeof(((MMSReg *)nullptr)->bytes) // Number of bytes needed to represent an XMM register. #define XMM_SIZE sizeof(XMMReg) @@ -60,140 +57,143 @@ #define BNDR_SIZE sizeof(MPXReg) #define BNDC_SIZE sizeof(MPXCsr) -#define DR_SIZE sizeof(((DBG *)NULL)->dr[0]) +#define DR_SIZE sizeof(((DBG *)nullptr)->dr[0]) // RegisterKind: EHFrame, DWARF, Generic, Process Plugin, LLDB // Note that the size and offset will be updated by platform-specific classes. #define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4) \ { \ - #reg, alt, sizeof(((GPR *) NULL)->reg), \ + #reg, alt, sizeof(((GPR *)nullptr)->reg), \ GPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##reg##_x86_64 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4) \ { \ - #name, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ + #name, nullptr, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, eFormatHex, \ {kind1, kind2, kind3, kind4, \ lldb_##name##_x86_64 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FP_ST(reg, i) \ { \ - #reg #i, NULL, FP_SIZE, \ + #reg #i, nullptr, FP_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ 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 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_FP_MM(reg, i) \ { \ - #reg #i, NULL, sizeof(uint64_t), \ + #reg #i, nullptr, sizeof(uint64_t), \ LLVM_EXTENSION FPR_OFFSET( \ stmm[i]), eEncodingUint, eFormatHex, \ {dwarf_mm##i##_x86_64, dwarf_mm##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_mm##i##_x86_64 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_XMM(reg, i) \ { \ - #reg #i, NULL, XMM_SIZE, \ + #reg #i, nullptr, XMM_SIZE, \ LLVM_EXTENSION FPR_OFFSET( \ reg[i]), eEncodingVector, eFormatVectorOfUInt8, \ {dwarf_##reg##i##_x86_64, dwarf_##reg##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_YMM(reg, i) \ { \ - #reg #i, NULL, YMM_SIZE, \ + #reg #i, nullptr, YMM_SIZE, \ LLVM_EXTENSION YMM_OFFSET(i), eEncodingVector, eFormatVectorOfUInt8, \ {dwarf_##reg##i##h_x86_64, \ dwarf_##reg##i##h_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_BNDR(reg, i) \ { \ - #reg #i, NULL, BNDR_SIZE, \ + #reg #i, nullptr, BNDR_SIZE, \ LLVM_EXTENSION BNDR_OFFSET(i), eEncodingVector, eFormatVectorOfUInt64, \ {dwarf_##reg##i##_x86_64, \ dwarf_##reg##i##_x86_64, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg##i##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_BNDC(name, i) \ { \ - #name, NULL, BNDC_SIZE, \ + #name, nullptr, BNDC_SIZE, \ LLVM_EXTENSION BNDC_OFFSET(i), eEncodingVector, eFormatVectorOfUInt8, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, lldb_##name##_x86_64 }, \ - NULL, NULL \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_DR(reg, i) \ { \ - #reg #i, NULL, DR_SIZE, \ + #reg #i, nullptr, DR_SIZE, \ DR_OFFSET(i), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM }, \ - NULL, NULL, NULL, 0 \ + nullptr, nullptr, nullptr, 0 \ } #define DEFINE_GPR_PSEUDO_32(reg32, reg64) \ { \ - #reg32, NULL, 4, \ + #reg32, nullptr, 4, \ GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg32##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_16(reg16, reg64) \ { \ - #reg16, NULL, 2, \ + #reg16, nullptr, 2, \ GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg16##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8H(reg8, reg64) \ { \ - #reg8, NULL, 1, \ + #reg8, nullptr, 1, \ GPR_OFFSET(reg64) + 1, eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } + #define DEFINE_GPR_PSEUDO_8L(reg8, reg64) \ { \ - #reg8, NULL, 1, \ + #reg8, nullptr, 1, \ GPR_OFFSET(reg64), eEncodingUint, eFormatHex, \ {LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \ lldb_##reg8##_x86_64 }, \ RegisterContextPOSIX_x86::g_contained_##reg64, \ - RegisterContextPOSIX_x86::g_invalidate_##reg64, NULL, 0 \ + RegisterContextPOSIX_x86::g_invalidate_##reg64, nullptr, 0 \ } // clang-format off -- 2.7.4