OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[llvm-readobj] Delete redundant 'static' from namespace scope 'static const'. NFC 

By default, such a non-template variable of non-volatile const-qualified type
having namespace-scope has internal linkage ([basic.link]), so no need for `static`.
This commit is contained in:
Fangrui Song 2021-10-18 22:21:54 -07:00
parent cc3115cd1d
commit b68bf98c0a
7 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/tools/llvm-readobj/COFFDumper.cpp
View File

@ -337,7 +337,7 @@ void COFFDumper::printBinaryBlockWithRelocs(StringRef Label,
} }
} }
static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = { const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_UNKNOWN ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_UNKNOWN ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AM33 ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AM33 ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AMD64 ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AMD64 ),
@ -362,7 +362,7 @@ static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_WCEMIPSV2) LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_WCEMIPSV2)
}; };
static const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = { const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_RELOCS_STRIPPED ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_RELOCS_STRIPPED ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_EXECUTABLE_IMAGE ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_EXECUTABLE_IMAGE ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_LINE_NUMS_STRIPPED ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_LINE_NUMS_STRIPPED ),
@ -380,7 +380,7 @@ static const EnumEntry<COFF::Characteristics> ImageFileCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_BYTES_REVERSED_HI ) LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_BYTES_REVERSED_HI )
}; };
static const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = { const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_UNKNOWN ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_UNKNOWN ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_NATIVE ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_NATIVE ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_WINDOWS_GUI ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_WINDOWS_GUI ),
@ -394,7 +394,7 @@ static const EnumEntry<COFF::WindowsSubsystem> PEWindowsSubsystem[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_XBOX ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SUBSYSTEM_XBOX ),
}; };
static const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = { const EnumEntry<COFF::DLLCharacteristics> PEDLLCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE ),
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY ),
@ -453,7 +453,7 @@ ImageSectionCharacteristics[] = {
LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SCN_MEM_WRITE ) LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_SCN_MEM_WRITE )
}; };
static const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = { const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = {
{ "Null" , COFF::IMAGE_SYM_TYPE_NULL }, { "Null" , COFF::IMAGE_SYM_TYPE_NULL },
{ "Void" , COFF::IMAGE_SYM_TYPE_VOID }, { "Void" , COFF::IMAGE_SYM_TYPE_VOID },
{ "Char" , COFF::IMAGE_SYM_TYPE_CHAR }, { "Char" , COFF::IMAGE_SYM_TYPE_CHAR },
@ -472,14 +472,14 @@ static const EnumEntry<COFF::SymbolBaseType> ImageSymType[] = {
{ "DWord" , COFF::IMAGE_SYM_TYPE_DWORD } { "DWord" , COFF::IMAGE_SYM_TYPE_DWORD }
}; };
static const EnumEntry<COFF::SymbolComplexType> ImageSymDType[] = { const EnumEntry<COFF::SymbolComplexType> ImageSymDType[] = {
{ "Null" , COFF::IMAGE_SYM_DTYPE_NULL }, { "Null" , COFF::IMAGE_SYM_DTYPE_NULL },
{ "Pointer" , COFF::IMAGE_SYM_DTYPE_POINTER }, { "Pointer" , COFF::IMAGE_SYM_DTYPE_POINTER },
{ "Function", COFF::IMAGE_SYM_DTYPE_FUNCTION }, { "Function", COFF::IMAGE_SYM_DTYPE_FUNCTION },
{ "Array" , COFF::IMAGE_SYM_DTYPE_ARRAY } { "Array" , COFF::IMAGE_SYM_DTYPE_ARRAY }
}; };
static const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = { const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = {
{ "EndOfFunction" , COFF::IMAGE_SYM_CLASS_END_OF_FUNCTION }, { "EndOfFunction" , COFF::IMAGE_SYM_CLASS_END_OF_FUNCTION },
{ "Null" , COFF::IMAGE_SYM_CLASS_NULL }, { "Null" , COFF::IMAGE_SYM_CLASS_NULL },
{ "Automatic" , COFF::IMAGE_SYM_CLASS_AUTOMATIC }, { "Automatic" , COFF::IMAGE_SYM_CLASS_AUTOMATIC },
@ -509,7 +509,7 @@ static const EnumEntry<COFF::SymbolStorageClass> ImageSymClass[] = {
{ "CLRToken" , COFF::IMAGE_SYM_CLASS_CLR_TOKEN } { "CLRToken" , COFF::IMAGE_SYM_CLASS_CLR_TOKEN }
}; };
static const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = { const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = {
{ "NoDuplicates", COFF::IMAGE_COMDAT_SELECT_NODUPLICATES }, { "NoDuplicates", COFF::IMAGE_COMDAT_SELECT_NODUPLICATES },
{ "Any" , COFF::IMAGE_COMDAT_SELECT_ANY }, { "Any" , COFF::IMAGE_COMDAT_SELECT_ANY },
{ "SameSize" , COFF::IMAGE_COMDAT_SELECT_SAME_SIZE }, { "SameSize" , COFF::IMAGE_COMDAT_SELECT_SAME_SIZE },
@ -519,7 +519,7 @@ static const EnumEntry<COFF::COMDATType> ImageCOMDATSelect[] = {
{ "Newest" , COFF::IMAGE_COMDAT_SELECT_NEWEST } { "Newest" , COFF::IMAGE_COMDAT_SELECT_NEWEST }
}; };
static const EnumEntry<COFF::DebugType> ImageDebugType[] = { const EnumEntry<COFF::DebugType> ImageDebugType[] = {
{"Unknown", COFF::IMAGE_DEBUG_TYPE_UNKNOWN}, {"Unknown", COFF::IMAGE_DEBUG_TYPE_UNKNOWN},
{"COFF", COFF::IMAGE_DEBUG_TYPE_COFF}, {"COFF", COFF::IMAGE_DEBUG_TYPE_COFF},
{"CodeView", COFF::IMAGE_DEBUG_TYPE_CODEVIEW}, {"CodeView", COFF::IMAGE_DEBUG_TYPE_CODEVIEW},
@ -548,7 +548,7 @@ WeakExternalCharacteristics[] = {
{ "Alias" , COFF::IMAGE_WEAK_EXTERN_SEARCH_ALIAS } { "Alias" , COFF::IMAGE_WEAK_EXTERN_SEARCH_ALIAS }
}; };
static const EnumEntry<uint32_t> SubSectionTypes[] = { const EnumEntry<uint32_t> SubSectionTypes[] = {
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Symbols), LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Symbols),
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Lines), LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, Lines),
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, StringTable), LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, StringTable),
@ -564,13 +564,13 @@ static const EnumEntry<uint32_t> SubSectionTypes[] = {
LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, CoffSymbolRVA), LLVM_READOBJ_ENUM_CLASS_ENT(DebugSubsectionKind, CoffSymbolRVA),
}; };
static const EnumEntry<uint32_t> FrameDataFlags[] = { const EnumEntry<uint32_t> FrameDataFlags[] = {
LLVM_READOBJ_ENUM_ENT(FrameData, HasSEH), LLVM_READOBJ_ENUM_ENT(FrameData, HasSEH),
LLVM_READOBJ_ENUM_ENT(FrameData, HasEH), LLVM_READOBJ_ENUM_ENT(FrameData, HasEH),
LLVM_READOBJ_ENUM_ENT(FrameData, IsFunctionStart), LLVM_READOBJ_ENUM_ENT(FrameData, IsFunctionStart),
}; };
static const EnumEntry<uint8_t> FileChecksumKindNames[] = { const EnumEntry<uint8_t> FileChecksumKindNames[] = {
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, None), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, None),
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, MD5), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, MD5),
LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA1), LLVM_READOBJ_ENUM_CLASS_ENT(FileChecksumKind, SHA1),

88
llvm/tools/llvm-readobj/ELFDumper.cpp
View File

@ -966,19 +966,19 @@ findNotEmptySectionByAddress(const ELFO &Obj, StringRef FileName,
return nullptr; return nullptr;
} }
static const EnumEntry<unsigned> ElfClass[] = { const EnumEntry<unsigned> ElfClass[] = {
{"None", "none", ELF::ELFCLASSNONE}, {"None", "none", ELF::ELFCLASSNONE},
{"32-bit", "ELF32", ELF::ELFCLASS32}, {"32-bit", "ELF32", ELF::ELFCLASS32},
{"64-bit", "ELF64", ELF::ELFCLASS64}, {"64-bit", "ELF64", ELF::ELFCLASS64},
}; };
static const EnumEntry<unsigned> ElfDataEncoding[] = { const EnumEntry<unsigned> ElfDataEncoding[] = {
{"None", "none", ELF::ELFDATANONE}, {"None", "none", ELF::ELFDATANONE},
{"LittleEndian", "2's complement, little endian", ELF::ELFDATA2LSB}, {"LittleEndian", "2's complement, little endian", ELF::ELFDATA2LSB},
{"BigEndian", "2's complement, big endian", ELF::ELFDATA2MSB}, {"BigEndian", "2's complement, big endian", ELF::ELFDATA2MSB},
}; };
static const EnumEntry<unsigned> ElfObjectFileType[] = { const EnumEntry<unsigned> ElfObjectFileType[] = {
{"None", "NONE (none)", ELF::ET_NONE}, {"None", "NONE (none)", ELF::ET_NONE},
{"Relocatable", "REL (Relocatable file)", ELF::ET_REL}, {"Relocatable", "REL (Relocatable file)", ELF::ET_REL},
{"Executable", "EXEC (Executable file)", ELF::ET_EXEC}, {"Executable", "EXEC (Executable file)", ELF::ET_EXEC},
@ -986,7 +986,7 @@ static const EnumEntry<unsigned> ElfObjectFileType[] = {
{"Core", "CORE (Core file)", ELF::ET_CORE}, {"Core", "CORE (Core file)", ELF::ET_CORE},
}; };
static const EnumEntry<unsigned> ElfOSABI[] = { const EnumEntry<unsigned> ElfOSABI[] = {
{"SystemV", "UNIX - System V", ELF::ELFOSABI_NONE}, {"SystemV", "UNIX - System V", ELF::ELFOSABI_NONE},
{"HPUX", "UNIX - HP-UX", ELF::ELFOSABI_HPUX}, {"HPUX", "UNIX - HP-UX", ELF::ELFOSABI_HPUX},
{"NetBSD", "UNIX - NetBSD", ELF::ELFOSABI_NETBSD}, {"NetBSD", "UNIX - NetBSD", ELF::ELFOSABI_NETBSD},
@ -1007,22 +1007,22 @@ static const EnumEntry<unsigned> ElfOSABI[] = {
{"Standalone", "Standalone App", ELF::ELFOSABI_STANDALONE} {"Standalone", "Standalone App", ELF::ELFOSABI_STANDALONE}
}; };
static const EnumEntry<unsigned> AMDGPUElfOSABI[] = { const EnumEntry<unsigned> AMDGPUElfOSABI[] = {
{"AMDGPU_HSA", "AMDGPU - HSA", ELF::ELFOSABI_AMDGPU_HSA}, {"AMDGPU_HSA", "AMDGPU - HSA", ELF::ELFOSABI_AMDGPU_HSA},
{"AMDGPU_PAL", "AMDGPU - PAL", ELF::ELFOSABI_AMDGPU_PAL}, {"AMDGPU_PAL", "AMDGPU - PAL", ELF::ELFOSABI_AMDGPU_PAL},
{"AMDGPU_MESA3D", "AMDGPU - MESA3D", ELF::ELFOSABI_AMDGPU_MESA3D} {"AMDGPU_MESA3D", "AMDGPU - MESA3D", ELF::ELFOSABI_AMDGPU_MESA3D}
}; };
static const EnumEntry<unsigned> ARMElfOSABI[] = { const EnumEntry<unsigned> ARMElfOSABI[] = {
{"ARM", "ARM", ELF::ELFOSABI_ARM} {"ARM", "ARM", ELF::ELFOSABI_ARM}
}; };
static const EnumEntry<unsigned> C6000ElfOSABI[] = { const EnumEntry<unsigned> C6000ElfOSABI[] = {
{"C6000_ELFABI", "Bare-metal C6000", ELF::ELFOSABI_C6000_ELFABI}, {"C6000_ELFABI", "Bare-metal C6000", ELF::ELFOSABI_C6000_ELFABI},
{"C6000_LINUX", "Linux C6000", ELF::ELFOSABI_C6000_LINUX} {"C6000_LINUX", "Linux C6000", ELF::ELFOSABI_C6000_LINUX}
}; };
static const EnumEntry<unsigned> ElfMachineType[] = { const EnumEntry<unsigned> ElfMachineType[] = {
ENUM_ENT(EM_NONE, "None"), ENUM_ENT(EM_NONE, "None"),
ENUM_ENT(EM_M32, "WE32100"), ENUM_ENT(EM_M32, "WE32100"),
ENUM_ENT(EM_SPARC, "Sparc"), ENUM_ENT(EM_SPARC, "Sparc"),
@ -1188,19 +1188,19 @@ static const EnumEntry<unsigned> ElfMachineType[] = {
ENUM_ENT(EM_VE, "NEC SX-Aurora Vector Engine"), ENUM_ENT(EM_VE, "NEC SX-Aurora Vector Engine"),
}; };
static const EnumEntry<unsigned> ElfSymbolBindings[] = { const EnumEntry<unsigned> ElfSymbolBindings[] = {
{"Local", "LOCAL", ELF::STB_LOCAL}, {"Local", "LOCAL", ELF::STB_LOCAL},
{"Global", "GLOBAL", ELF::STB_GLOBAL}, {"Global", "GLOBAL", ELF::STB_GLOBAL},
{"Weak", "WEAK", ELF::STB_WEAK}, {"Weak", "WEAK", ELF::STB_WEAK},
{"Unique", "UNIQUE", ELF::STB_GNU_UNIQUE}}; {"Unique", "UNIQUE", ELF::STB_GNU_UNIQUE}};
static const EnumEntry<unsigned> ElfSymbolVisibilities[] = { const EnumEntry<unsigned> ElfSymbolVisibilities[] = {
{"DEFAULT", "DEFAULT", ELF::STV_DEFAULT}, {"DEFAULT", "DEFAULT", ELF::STV_DEFAULT},
{"INTERNAL", "INTERNAL", ELF::STV_INTERNAL}, {"INTERNAL", "INTERNAL", ELF::STV_INTERNAL},
{"HIDDEN", "HIDDEN", ELF::STV_HIDDEN}, {"HIDDEN", "HIDDEN", ELF::STV_HIDDEN},
{"PROTECTED", "PROTECTED", ELF::STV_PROTECTED}}; {"PROTECTED", "PROTECTED", ELF::STV_PROTECTED}};
static const EnumEntry<unsigned> AMDGPUSymbolTypes[] = { const EnumEntry<unsigned> AMDGPUSymbolTypes[] = {
{ "AMDGPU_HSA_KERNEL", ELF::STT_AMDGPU_HSA_KERNEL } { "AMDGPU_HSA_KERNEL", ELF::STT_AMDGPU_HSA_KERNEL }
}; };
@ -1211,7 +1211,7 @@ static const char *getGroupType(uint32_t Flag) {
return "(unknown)"; return "(unknown)";
} }
static const EnumEntry<unsigned> ElfSectionFlags[] = { const EnumEntry<unsigned> ElfSectionFlags[] = {
ENUM_ENT(SHF_WRITE, "W"), ENUM_ENT(SHF_WRITE, "W"),
ENUM_ENT(SHF_ALLOC, "A"), ENUM_ENT(SHF_ALLOC, "A"),
ENUM_ENT(SHF_EXECINSTR, "X"), ENUM_ENT(SHF_EXECINSTR, "X"),
@ -1227,20 +1227,20 @@ static const EnumEntry<unsigned> ElfSectionFlags[] = {
ENUM_ENT(SHF_EXCLUDE, "E"), ENUM_ENT(SHF_EXCLUDE, "E"),
}; };
static const EnumEntry<unsigned> ElfXCoreSectionFlags[] = { const EnumEntry<unsigned> ElfXCoreSectionFlags[] = {
ENUM_ENT(XCORE_SHF_CP_SECTION, ""), ENUM_ENT(XCORE_SHF_CP_SECTION, ""),
ENUM_ENT(XCORE_SHF_DP_SECTION, "") ENUM_ENT(XCORE_SHF_DP_SECTION, "")
}; };
static const EnumEntry<unsigned> ElfARMSectionFlags[] = { const EnumEntry<unsigned> ElfARMSectionFlags[] = {
ENUM_ENT(SHF_ARM_PURECODE, "y") ENUM_ENT(SHF_ARM_PURECODE, "y")
}; };
static const EnumEntry<unsigned> ElfHexagonSectionFlags[] = { const EnumEntry<unsigned> ElfHexagonSectionFlags[] = {
ENUM_ENT(SHF_HEX_GPREL, "") ENUM_ENT(SHF_HEX_GPREL, "")
}; };
static const EnumEntry<unsigned> ElfMipsSectionFlags[] = { const EnumEntry<unsigned> ElfMipsSectionFlags[] = {
ENUM_ENT(SHF_MIPS_NODUPES, ""), ENUM_ENT(SHF_MIPS_NODUPES, ""),
ENUM_ENT(SHF_MIPS_NAMES, ""), ENUM_ENT(SHF_MIPS_NAMES, ""),
ENUM_ENT(SHF_MIPS_LOCAL, ""), ENUM_ENT(SHF_MIPS_LOCAL, ""),
@ -1251,7 +1251,7 @@ static const EnumEntry<unsigned> ElfMipsSectionFlags[] = {
ENUM_ENT(SHF_MIPS_STRING, "") ENUM_ENT(SHF_MIPS_STRING, "")
}; };
static const EnumEntry<unsigned> ElfX86_64SectionFlags[] = { const EnumEntry<unsigned> ElfX86_64SectionFlags[] = {
ENUM_ENT(SHF_X86_64_LARGE, "l") ENUM_ENT(SHF_X86_64_LARGE, "l")
}; };
@ -1398,13 +1398,13 @@ static std::string getGNUPtType(unsigned Arch, unsigned Type) {
return Seg.drop_front(3).str(); return Seg.drop_front(3).str();
} }
static const EnumEntry<unsigned> ElfSegmentFlags[] = { const EnumEntry<unsigned> ElfSegmentFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, PF_X), LLVM_READOBJ_ENUM_ENT(ELF, PF_X),
LLVM_READOBJ_ENUM_ENT(ELF, PF_W), LLVM_READOBJ_ENUM_ENT(ELF, PF_W),
LLVM_READOBJ_ENUM_ENT(ELF, PF_R) LLVM_READOBJ_ENUM_ENT(ELF, PF_R)
}; };
static const EnumEntry<unsigned> ElfHeaderMipsFlags[] = { const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
ENUM_ENT(EF_MIPS_NOREORDER, "noreorder"), ENUM_ENT(EF_MIPS_NOREORDER, "noreorder"),
ENUM_ENT(EF_MIPS_PIC, "pic"), ENUM_ENT(EF_MIPS_PIC, "pic"),
ENUM_ENT(EF_MIPS_CPIC, "cpic"), ENUM_ENT(EF_MIPS_CPIC, "cpic"),
@ -1450,7 +1450,7 @@ static const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
ENUM_ENT(EF_MIPS_ARCH_64R6, "mips64r6") ENUM_ENT(EF_MIPS_ARCH_64R6, "mips64r6")
}; };
static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = { const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630),
@ -1504,7 +1504,7 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion3[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_V3) LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_V3)
}; };
static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = { const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_NONE),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R600),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630), LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_MACH_R600_R630),
@ -1562,7 +1562,7 @@ static const EnumEntry<unsigned> ElfHeaderAMDGPUFlagsABIVersion4[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_ON_V4) LLVM_READOBJ_ENUM_ENT(ELF, EF_AMDGPU_FEATURE_SRAMECC_ON_V4)
}; };
static const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = { const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
ENUM_ENT(EF_RISCV_RVC, "RVC"), ENUM_ENT(EF_RISCV_RVC, "RVC"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"), ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"), ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
@ -1570,7 +1570,7 @@ static const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
ENUM_ENT(EF_RISCV_RVE, "RVE") ENUM_ENT(EF_RISCV_RVE, "RVE")
}; };
static const EnumEntry<unsigned> ElfHeaderAVRFlags[] = { const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR1), LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR1),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR2), LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR2),
LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR25), LLVM_READOBJ_ENUM_ENT(ELF, EF_AVR_ARCH_AVR25),
@ -1593,30 +1593,30 @@ static const EnumEntry<unsigned> ElfHeaderAVRFlags[] = {
}; };
static const EnumEntry<unsigned> ElfSymOtherFlags[] = { const EnumEntry<unsigned> ElfSymOtherFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, STV_INTERNAL), LLVM_READOBJ_ENUM_ENT(ELF, STV_INTERNAL),
LLVM_READOBJ_ENUM_ENT(ELF, STV_HIDDEN), LLVM_READOBJ_ENUM_ENT(ELF, STV_HIDDEN),
LLVM_READOBJ_ENUM_ENT(ELF, STV_PROTECTED) LLVM_READOBJ_ENUM_ENT(ELF, STV_PROTECTED)
}; };
static const EnumEntry<unsigned> ElfMipsSymOtherFlags[] = { const EnumEntry<unsigned> ElfMipsSymOtherFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL), LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL),
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT), LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT),
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PIC), LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PIC),
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MICROMIPS) LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MICROMIPS)
}; };
static const EnumEntry<unsigned> ElfAArch64SymOtherFlags[] = { const EnumEntry<unsigned> ElfAArch64SymOtherFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, STO_AARCH64_VARIANT_PCS) LLVM_READOBJ_ENUM_ENT(ELF, STO_AARCH64_VARIANT_PCS)
}; };
static const EnumEntry<unsigned> ElfMips16SymOtherFlags[] = { const EnumEntry<unsigned> ElfMips16SymOtherFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL), LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_OPTIONAL),
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT), LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_PLT),
LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MIPS16) LLVM_READOBJ_ENUM_ENT(ELF, STO_MIPS_MIPS16)
}; };
static const EnumEntry<unsigned> ElfRISCVSymOtherFlags[] = { const EnumEntry<unsigned> ElfRISCVSymOtherFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, STO_RISCV_VARIANT_CC)}; LLVM_READOBJ_ENUM_ENT(ELF, STO_RISCV_VARIANT_CC)};
static const char *getElfMipsOptionsOdkType(unsigned Odk) { static const char *getElfMipsOptionsOdkType(unsigned Odk) {
@ -2071,7 +2071,7 @@ template <typename ELFT> void ELFDumper<ELFT>::printVersionInfo() {
#define LLVM_READOBJ_DT_FLAG_ENT(prefix, enum) \ #define LLVM_READOBJ_DT_FLAG_ENT(prefix, enum) \
{ #enum, prefix##_##enum } { #enum, prefix##_##enum }
static const EnumEntry<unsigned> ElfDynamicDTFlags[] = { const EnumEntry<unsigned> ElfDynamicDTFlags[] = {
LLVM_READOBJ_DT_FLAG_ENT(DF, ORIGIN), LLVM_READOBJ_DT_FLAG_ENT(DF, ORIGIN),
LLVM_READOBJ_DT_FLAG_ENT(DF, SYMBOLIC), LLVM_READOBJ_DT_FLAG_ENT(DF, SYMBOLIC),
LLVM_READOBJ_DT_FLAG_ENT(DF, TEXTREL), LLVM_READOBJ_DT_FLAG_ENT(DF, TEXTREL),
@ -2079,7 +2079,7 @@ static const EnumEntry<unsigned> ElfDynamicDTFlags[] = {
LLVM_READOBJ_DT_FLAG_ENT(DF, STATIC_TLS) LLVM_READOBJ_DT_FLAG_ENT(DF, STATIC_TLS)
}; };
static const EnumEntry<unsigned> ElfDynamicDTFlags1[] = { const EnumEntry<unsigned> ElfDynamicDTFlags1[] = {
LLVM_READOBJ_DT_FLAG_ENT(DF_1, NOW), LLVM_READOBJ_DT_FLAG_ENT(DF_1, NOW),
LLVM_READOBJ_DT_FLAG_ENT(DF_1, GLOBAL), LLVM_READOBJ_DT_FLAG_ENT(DF_1, GLOBAL),
LLVM_READOBJ_DT_FLAG_ENT(DF_1, GROUP), LLVM_READOBJ_DT_FLAG_ENT(DF_1, GROUP),
@ -2109,7 +2109,7 @@ static const EnumEntry<unsigned> ElfDynamicDTFlags1[] = {
LLVM_READOBJ_DT_FLAG_ENT(DF_1, PIE), LLVM_READOBJ_DT_FLAG_ENT(DF_1, PIE),
}; };
static const EnumEntry<unsigned> ElfDynamicDTMipsFlags[] = { const EnumEntry<unsigned> ElfDynamicDTMipsFlags[] = {
LLVM_READOBJ_DT_FLAG_ENT(RHF, NONE), LLVM_READOBJ_DT_FLAG_ENT(RHF, NONE),
LLVM_READOBJ_DT_FLAG_ENT(RHF, QUICKSTART), LLVM_READOBJ_DT_FLAG_ENT(RHF, QUICKSTART),
LLVM_READOBJ_DT_FLAG_ENT(RHF, NOTPOT), LLVM_READOBJ_DT_FLAG_ENT(RHF, NOTPOT),
@ -2948,7 +2948,7 @@ MipsGOTParser<ELFT>::getPltSym(const Entry *E) const {
} }
} }
static const EnumEntry<unsigned> ElfMipsISAExtType[] = { const EnumEntry<unsigned> ElfMipsISAExtType[] = {
{"None", Mips::AFL_EXT_NONE}, {"None", Mips::AFL_EXT_NONE},
{"Broadcom SB-1", Mips::AFL_EXT_SB1}, {"Broadcom SB-1", Mips::AFL_EXT_SB1},
{"Cavium Networks Octeon", Mips::AFL_EXT_OCTEON}, {"Cavium Networks Octeon", Mips::AFL_EXT_OCTEON},
@ -2971,7 +2971,7 @@ static const EnumEntry<unsigned> ElfMipsISAExtType[] = {
{"Toshiba R3900", Mips::AFL_EXT_3900} {"Toshiba R3900", Mips::AFL_EXT_3900}
}; };
static const EnumEntry<unsigned> ElfMipsASEFlags[] = { const EnumEntry<unsigned> ElfMipsASEFlags[] = {
{"DSP", Mips::AFL_ASE_DSP}, {"DSP", Mips::AFL_ASE_DSP},
{"DSPR2", Mips::AFL_ASE_DSPR2}, {"DSPR2", Mips::AFL_ASE_DSPR2},
{"Enhanced VA Scheme", Mips::AFL_ASE_EVA}, {"Enhanced VA Scheme", Mips::AFL_ASE_EVA},
@ -2989,7 +2989,7 @@ static const EnumEntry<unsigned> ElfMipsASEFlags[] = {
{"GINV", Mips::AFL_ASE_GINV}, {"GINV", Mips::AFL_ASE_GINV},
}; };
static const EnumEntry<unsigned> ElfMipsFpABIType[] = { const EnumEntry<unsigned> ElfMipsFpABIType[] = {
{"Hard or soft float", Mips::Val_GNU_MIPS_ABI_FP_ANY}, {"Hard or soft float", Mips::Val_GNU_MIPS_ABI_FP_ANY},
{"Hard float (double precision)", Mips::Val_GNU_MIPS_ABI_FP_DOUBLE}, {"Hard float (double precision)", Mips::Val_GNU_MIPS_ABI_FP_DOUBLE},
{"Hard float (single precision)", Mips::Val_GNU_MIPS_ABI_FP_SINGLE}, {"Hard float (single precision)", Mips::Val_GNU_MIPS_ABI_FP_SINGLE},
@ -5030,7 +5030,7 @@ static bool printLLVMOMPOFFLOADNote(raw_ostream &OS, uint32_t NoteType,
return true; return true;
} }
static const EnumEntry<unsigned> FreeBSDFeatureCtlFlags[] = { const EnumEntry<unsigned> FreeBSDFeatureCtlFlags[] = {
{"ASLR_DISABLE", NT_FREEBSD_FCTL_ASLR_DISABLE}, {"ASLR_DISABLE", NT_FREEBSD_FCTL_ASLR_DISABLE},
{"PROTMAX_DISABLE", NT_FREEBSD_FCTL_PROTMAX_DISABLE}, {"PROTMAX_DISABLE", NT_FREEBSD_FCTL_PROTMAX_DISABLE},
{"STKGAP_DISABLE", NT_FREEBSD_FCTL_STKGAP_DISABLE}, {"STKGAP_DISABLE", NT_FREEBSD_FCTL_STKGAP_DISABLE},
@ -5294,14 +5294,14 @@ static void printCoreNote(raw_ostream &OS, const CoreNote &Note) {
} }
} }
static const NoteType GenericNoteTypes[] = { const NoteType GenericNoteTypes[] = {
{ELF::NT_VERSION, "NT_VERSION (version)"}, {ELF::NT_VERSION, "NT_VERSION (version)"},
{ELF::NT_ARCH, "NT_ARCH (architecture)"}, {ELF::NT_ARCH, "NT_ARCH (architecture)"},
{ELF::NT_GNU_BUILD_ATTRIBUTE_OPEN, "OPEN"}, {ELF::NT_GNU_BUILD_ATTRIBUTE_OPEN, "OPEN"},
{ELF::NT_GNU_BUILD_ATTRIBUTE_FUNC, "func"}, {ELF::NT_GNU_BUILD_ATTRIBUTE_FUNC, "func"},
}; };
static const NoteType GNUNoteTypes[] = { const NoteType GNUNoteTypes[] = {
{ELF::NT_GNU_ABI_TAG, "NT_GNU_ABI_TAG (ABI version tag)"}, {ELF::NT_GNU_ABI_TAG, "NT_GNU_ABI_TAG (ABI version tag)"},
{ELF::NT_GNU_HWCAP, "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"}, {ELF::NT_GNU_HWCAP, "NT_GNU_HWCAP (DSO-supplied software HWCAP info)"},
{ELF::NT_GNU_BUILD_ID, "NT_GNU_BUILD_ID (unique build ID bitstring)"}, {ELF::NT_GNU_BUILD_ID, "NT_GNU_BUILD_ID (unique build ID bitstring)"},
@ -5309,7 +5309,7 @@ static const NoteType GNUNoteTypes[] = {
{ELF::NT_GNU_PROPERTY_TYPE_0, "NT_GNU_PROPERTY_TYPE_0 (property note)"}, {ELF::NT_GNU_PROPERTY_TYPE_0, "NT_GNU_PROPERTY_TYPE_0 (property note)"},
}; };
static const NoteType FreeBSDCoreNoteTypes[] = { const NoteType FreeBSDCoreNoteTypes[] = {
{ELF::NT_FREEBSD_THRMISC, "NT_THRMISC (thrmisc structure)"}, {ELF::NT_FREEBSD_THRMISC, "NT_THRMISC (thrmisc structure)"},
{ELF::NT_FREEBSD_PROCSTAT_PROC, "NT_PROCSTAT_PROC (proc data)"}, {ELF::NT_FREEBSD_PROCSTAT_PROC, "NT_PROCSTAT_PROC (proc data)"},
{ELF::NT_FREEBSD_PROCSTAT_FILES, "NT_PROCSTAT_FILES (files data)"}, {ELF::NT_FREEBSD_PROCSTAT_FILES, "NT_PROCSTAT_FILES (files data)"},
@ -5323,7 +5323,7 @@ static const NoteType FreeBSDCoreNoteTypes[] = {
{ELF::NT_FREEBSD_PROCSTAT_AUXV, "NT_PROCSTAT_AUXV (auxv data)"}, {ELF::NT_FREEBSD_PROCSTAT_AUXV, "NT_PROCSTAT_AUXV (auxv data)"},
}; };
static const NoteType FreeBSDNoteTypes[] = { const NoteType FreeBSDNoteTypes[] = {
{ELF::NT_FREEBSD_ABI_TAG, "NT_FREEBSD_ABI_TAG (ABI version tag)"}, {ELF::NT_FREEBSD_ABI_TAG, "NT_FREEBSD_ABI_TAG (ABI version tag)"},
{ELF::NT_FREEBSD_NOINIT_TAG, "NT_FREEBSD_NOINIT_TAG (no .init tag)"}, {ELF::NT_FREEBSD_NOINIT_TAG, "NT_FREEBSD_NOINIT_TAG (no .init tag)"},
{ELF::NT_FREEBSD_ARCH_TAG, "NT_FREEBSD_ARCH_TAG (architecture tag)"}, {ELF::NT_FREEBSD_ARCH_TAG, "NT_FREEBSD_ARCH_TAG (architecture tag)"},
@ -5331,7 +5331,7 @@ static const NoteType FreeBSDNoteTypes[] = {
"NT_FREEBSD_FEATURE_CTL (FreeBSD feature control)"}, "NT_FREEBSD_FEATURE_CTL (FreeBSD feature control)"},
}; };
static const NoteType AMDNoteTypes[] = { const NoteType AMDNoteTypes[] = {
{ELF::NT_AMD_HSA_CODE_OBJECT_VERSION, {ELF::NT_AMD_HSA_CODE_OBJECT_VERSION,
"NT_AMD_HSA_CODE_OBJECT_VERSION (AMD HSA Code Object Version)"}, "NT_AMD_HSA_CODE_OBJECT_VERSION (AMD HSA Code Object Version)"},
{ELF::NT_AMD_HSA_HSAIL, "NT_AMD_HSA_HSAIL (AMD HSA HSAIL Properties)"}, {ELF::NT_AMD_HSA_HSAIL, "NT_AMD_HSA_HSAIL (AMD HSA HSAIL Properties)"},
@ -5341,11 +5341,11 @@ static const NoteType AMDNoteTypes[] = {
{ELF::NT_AMD_PAL_METADATA, "NT_AMD_PAL_METADATA (AMD PAL Metadata)"}, {ELF::NT_AMD_PAL_METADATA, "NT_AMD_PAL_METADATA (AMD PAL Metadata)"},
}; };
static const NoteType AMDGPUNoteTypes[] = { const NoteType AMDGPUNoteTypes[] = {
{ELF::NT_AMDGPU_METADATA, "NT_AMDGPU_METADATA (AMDGPU Metadata)"}, {ELF::NT_AMDGPU_METADATA, "NT_AMDGPU_METADATA (AMDGPU Metadata)"},
}; };
static const NoteType LLVMOMPOFFLOADNoteTypes[] = { const NoteType LLVMOMPOFFLOADNoteTypes[] = {
{ELF::NT_LLVM_OPENMP_OFFLOAD_VERSION, {ELF::NT_LLVM_OPENMP_OFFLOAD_VERSION,
"NT_LLVM_OPENMP_OFFLOAD_VERSION (image format version)"}, "NT_LLVM_OPENMP_OFFLOAD_VERSION (image format version)"},
{ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER, {ELF::NT_LLVM_OPENMP_OFFLOAD_PRODUCER,
@ -5354,7 +5354,7 @@ static const NoteType LLVMOMPOFFLOADNoteTypes[] = {
"NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION (producing toolchain version)"}, "NT_LLVM_OPENMP_OFFLOAD_PRODUCER_VERSION (producing toolchain version)"},
}; };
static const NoteType CoreNoteTypes[] = { const NoteType CoreNoteTypes[] = {
{ELF::NT_PRSTATUS, "NT_PRSTATUS (prstatus structure)"}, {ELF::NT_PRSTATUS, "NT_PRSTATUS (prstatus structure)"},
{ELF::NT_FPREGSET, "NT_FPREGSET (floating point registers)"}, {ELF::NT_FPREGSET, "NT_FPREGSET (floating point registers)"},
{ELF::NT_PRPSINFO, "NT_PRPSINFO (prpsinfo structure)"}, {ELF::NT_PRPSINFO, "NT_PRPSINFO (prpsinfo structure)"},
@ -6711,7 +6711,7 @@ void LLVMELFDumper<ELFT>::printVersionSymbolSection(const Elf_Shdr *Sec) {
} }
} }
static const EnumEntry<unsigned> SymVersionFlags[] = { const EnumEntry<unsigned> SymVersionFlags[] = {
{"Base", "BASE", VER_FLG_BASE}, {"Base", "BASE", VER_FLG_BASE},
{"Weak", "WEAK", VER_FLG_WEAK}, {"Weak", "WEAK", VER_FLG_WEAK},
{"Info", "INFO", VER_FLG_INFO}}; {"Info", "INFO", VER_FLG_INFO}};

30
llvm/tools/llvm-readobj/MachODumper.cpp
View File

@ -74,7 +74,7 @@ std::unique_ptr<ObjDumper> createMachODumper(const object::MachOObjectFile &Obj,
} // namespace llvm } // namespace llvm
static const EnumEntry<uint32_t> MachOMagics[] = { const EnumEntry<uint32_t> MachOMagics[] = {
{ "Magic", MachO::MH_MAGIC }, { "Magic", MachO::MH_MAGIC },
{ "Cigam", MachO::MH_CIGAM }, { "Cigam", MachO::MH_CIGAM },
{ "Magic64", MachO::MH_MAGIC_64 }, { "Magic64", MachO::MH_MAGIC_64 },
@ -83,7 +83,7 @@ static const EnumEntry<uint32_t> MachOMagics[] = {
{ "FatCigam", MachO::FAT_CIGAM }, { "FatCigam", MachO::FAT_CIGAM },
}; };
static const EnumEntry<uint32_t> MachOHeaderFileTypes[] = { const EnumEntry<uint32_t> MachOHeaderFileTypes[] = {
{ "Relocatable", MachO::MH_OBJECT }, { "Relocatable", MachO::MH_OBJECT },
{ "Executable", MachO::MH_EXECUTE }, { "Executable", MachO::MH_EXECUTE },
{ "FixedVMLibrary", MachO::MH_FVMLIB }, { "FixedVMLibrary", MachO::MH_FVMLIB },
@ -97,7 +97,7 @@ static const EnumEntry<uint32_t> MachOHeaderFileTypes[] = {
{ "KextBundle", MachO::MH_KEXT_BUNDLE }, { "KextBundle", MachO::MH_KEXT_BUNDLE },
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuTypes[] = { const EnumEntry<uint32_t> MachOHeaderCpuTypes[] = {
{ "Any" , static_cast<uint32_t>(MachO::CPU_TYPE_ANY) }, { "Any" , static_cast<uint32_t>(MachO::CPU_TYPE_ANY) },
{ "X86" , MachO::CPU_TYPE_X86 }, { "X86" , MachO::CPU_TYPE_X86 },
{ "X86-64" , MachO::CPU_TYPE_X86_64 }, { "X86-64" , MachO::CPU_TYPE_X86_64 },
@ -109,7 +109,7 @@ static const EnumEntry<uint32_t> MachOHeaderCpuTypes[] = {
{ "PowerPC64" , MachO::CPU_TYPE_POWERPC64 }, { "PowerPC64" , MachO::CPU_TYPE_POWERPC64 },
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX86[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX86[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_I386_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_I386_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_386), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_386),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_486), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_486),
@ -132,13 +132,13 @@ static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX86[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_XEON_MP), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_XEON_MP),
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX64[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesX64[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_64_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_64_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_ARCH1), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_ARCH1),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_64_H), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_X86_64_H),
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V4T), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V4T),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V6), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V6),
@ -153,17 +153,17 @@ static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V7EM), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM_V7EM),
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_V8), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_V8),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E),
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesSPARC[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesSPARC[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_SPARC_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_SPARC_ALL),
}; };
static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesPPC[] = { const EnumEntry<uint32_t> MachOHeaderCpuSubtypesPPC[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_ALL), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_ALL),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_601), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_601),
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_602), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_602),
@ -179,7 +179,7 @@ static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesPPC[] = {
LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_970), LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_POWERPC_970),
}; };
static const EnumEntry<uint32_t> MachOHeaderFlags[] = { const EnumEntry<uint32_t> MachOHeaderFlags[] = {
LLVM_READOBJ_ENUM_ENT(MachO, MH_NOUNDEFS), LLVM_READOBJ_ENUM_ENT(MachO, MH_NOUNDEFS),
LLVM_READOBJ_ENUM_ENT(MachO, MH_INCRLINK), LLVM_READOBJ_ENUM_ENT(MachO, MH_INCRLINK),
LLVM_READOBJ_ENUM_ENT(MachO, MH_DYLDLINK), LLVM_READOBJ_ENUM_ENT(MachO, MH_DYLDLINK),
@ -208,7 +208,7 @@ static const EnumEntry<uint32_t> MachOHeaderFlags[] = {
LLVM_READOBJ_ENUM_ENT(MachO, MH_APP_EXTENSION_SAFE), LLVM_READOBJ_ENUM_ENT(MachO, MH_APP_EXTENSION_SAFE),
}; };
static const EnumEntry<unsigned> MachOSectionTypes[] = { const EnumEntry<unsigned> MachOSectionTypes[] = {
{ "Regular" , MachO::S_REGULAR }, { "Regular" , MachO::S_REGULAR },
{ "ZeroFill" , MachO::S_ZEROFILL }, { "ZeroFill" , MachO::S_ZEROFILL },
{ "CStringLiterals" , MachO::S_CSTRING_LITERALS }, { "CStringLiterals" , MachO::S_CSTRING_LITERALS },
@ -233,7 +233,7 @@ static const EnumEntry<unsigned> MachOSectionTypes[] = {
{ "ThreadLocalInitFunctionPointers", MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS } { "ThreadLocalInitFunctionPointers", MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS }
}; };
static const EnumEntry<unsigned> MachOSectionAttributes[] = { const EnumEntry<unsigned> MachOSectionAttributes[] = {
{ "LocReloc" , 1 << 0 /*S_ATTR_LOC_RELOC */ }, { "LocReloc" , 1 << 0 /*S_ATTR_LOC_RELOC */ },
{ "ExtReloc" , 1 << 1 /*S_ATTR_EXT_RELOC */ }, { "ExtReloc" , 1 << 1 /*S_ATTR_EXT_RELOC */ },
{ "SomeInstructions" , 1 << 2 /*S_ATTR_SOME_INSTRUCTIONS */ }, { "SomeInstructions" , 1 << 2 /*S_ATTR_SOME_INSTRUCTIONS */ },
@ -246,7 +246,7 @@ static const EnumEntry<unsigned> MachOSectionAttributes[] = {
{ "PureInstructions" , 1 << 23 /*S_ATTR_PURE_INSTRUCTIONS */ }, { "PureInstructions" , 1 << 23 /*S_ATTR_PURE_INSTRUCTIONS */ },
}; };
static const EnumEntry<unsigned> MachOSymbolRefTypes[] = { const EnumEntry<unsigned> MachOSymbolRefTypes[] = {
{ "UndefinedNonLazy", 0 }, { "UndefinedNonLazy", 0 },
{ "ReferenceFlagUndefinedLazy", 1 }, { "ReferenceFlagUndefinedLazy", 1 },
{ "ReferenceFlagDefined", 2 }, { "ReferenceFlagDefined", 2 },
@ -255,7 +255,7 @@ static const EnumEntry<unsigned> MachOSymbolRefTypes[] = {
{ "ReferenceFlagPrivateUndefinedLazy", 5 } { "ReferenceFlagPrivateUndefinedLazy", 5 }
}; };
static const EnumEntry<unsigned> MachOSymbolFlags[] = { const EnumEntry<unsigned> MachOSymbolFlags[] = {
{ "ThumbDef", 0x8 }, { "ThumbDef", 0x8 },
{ "ReferencedDynamically", 0x10 }, { "ReferencedDynamically", 0x10 },
{ "NoDeadStrip", 0x20 }, { "NoDeadStrip", 0x20 },
@ -266,7 +266,7 @@ static const EnumEntry<unsigned> MachOSymbolFlags[] = {
{ "ColdFunc", 0x400 }, { "ColdFunc", 0x400 },
}; };
static const EnumEntry<unsigned> MachOSymbolTypes[] = { const EnumEntry<unsigned> MachOSymbolTypes[] = {
{ "Undef", 0x0 }, { "Undef", 0x0 },
{ "Abs", 0x2 }, { "Abs", 0x2 },
{ "Indirect", 0xA }, { "Indirect", 0xA },

6
llvm/tools/llvm-readobj/WasmDumper.cpp
View File

@ -20,7 +20,7 @@ using namespace object;
namespace { namespace {
static const EnumEntry<unsigned> WasmSymbolTypes[] = { const EnumEntry<unsigned> WasmSymbolTypes[] = {
#define ENUM_ENTRY(X) \ #define ENUM_ENTRY(X) \
{ #X, wasm::WASM_SYMBOL_TYPE_##X } { #X, wasm::WASM_SYMBOL_TYPE_##X }
ENUM_ENTRY(FUNCTION), ENUM_ENTRY(DATA), ENUM_ENTRY(GLOBAL), ENUM_ENTRY(FUNCTION), ENUM_ENTRY(DATA), ENUM_ENTRY(GLOBAL),
@ -28,7 +28,7 @@ static const EnumEntry<unsigned> WasmSymbolTypes[] = {
#undef ENUM_ENTRY #undef ENUM_ENTRY
}; };
static const EnumEntry<uint32_t> WasmSectionTypes[] = { const EnumEntry<uint32_t> WasmSectionTypes[] = {
#define ENUM_ENTRY(X) \ #define ENUM_ENTRY(X) \
{ #X, wasm::WASM_SEC_##X } { #X, wasm::WASM_SEC_##X }
ENUM_ENTRY(CUSTOM), ENUM_ENTRY(TYPE), ENUM_ENTRY(IMPORT), ENUM_ENTRY(CUSTOM), ENUM_ENTRY(TYPE), ENUM_ENTRY(IMPORT),
@ -39,7 +39,7 @@ static const EnumEntry<uint32_t> WasmSectionTypes[] = {
#undef ENUM_ENTRY #undef ENUM_ENTRY
}; };
static const EnumEntry<unsigned> WasmSymbolFlags[] = { const EnumEntry<unsigned> WasmSymbolFlags[] = {
#define ENUM_ENTRY(X) \ #define ENUM_ENTRY(X) \
{ #X, wasm::WASM_SYMBOL_##X } { #X, wasm::WASM_SYMBOL_##X }
ENUM_ENTRY(BINDING_GLOBAL), ENUM_ENTRY(BINDING_GLOBAL),

4
llvm/tools/llvm-readobj/Win64EHDumper.cpp
View File

@ -16,13 +16,13 @@ using namespace llvm;
using namespace llvm::object; using namespace llvm::object;
using namespace llvm::Win64EH; using namespace llvm::Win64EH;
static const EnumEntry<unsigned> UnwindFlags[] = { const EnumEntry<unsigned> UnwindFlags[] = {
{ "ExceptionHandler", UNW_ExceptionHandler }, { "ExceptionHandler", UNW_ExceptionHandler },
{ "TerminateHandler", UNW_TerminateHandler }, { "TerminateHandler", UNW_TerminateHandler },
{ "ChainInfo" , UNW_ChainInfo } { "ChainInfo" , UNW_ChainInfo }
}; };
static const EnumEntry<unsigned> UnwindOpInfo[] = { const EnumEntry<unsigned> UnwindOpInfo[] = {
{ "RAX", 0 }, { "RAX", 0 },
{ "RCX", 1 }, { "RCX", 1 },
{ "RDX", 2 }, { "RDX", 2 },

16
llvm/tools/llvm-readobj/XCOFFDumper.cpp
View File

@ -112,7 +112,7 @@ void XCOFFDumper::printRelocations() {
printRelocations<XCOFFSectionHeader32, XCOFFRelocation32>(Obj.sections32()); printRelocations<XCOFFSectionHeader32, XCOFFRelocation32>(Obj.sections32());
} }
static const EnumEntry<XCOFF::RelocationType> RelocationTypeNameclass[] = { const EnumEntry<XCOFF::RelocationType> RelocationTypeNameclass[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(R_POS), ECase(R_RL), ECase(R_RLA), ECase(R_NEG), ECase(R_POS), ECase(R_RL), ECase(R_RLA), ECase(R_NEG),
@ -172,14 +172,14 @@ void XCOFFDumper::printRelocations(ArrayRef<Shdr> Sections) {
} }
} }
static const EnumEntry<XCOFF::CFileStringType> FileStringType[] = { const EnumEntry<XCOFF::CFileStringType> FileStringType[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(XFT_FN), ECase(XFT_CT), ECase(XFT_CV), ECase(XFT_CD) ECase(XFT_FN), ECase(XFT_CT), ECase(XFT_CV), ECase(XFT_CD)
#undef ECase #undef ECase
}; };
static const EnumEntry<XCOFF::SymbolAuxType> SymAuxType[] = { const EnumEntry<XCOFF::SymbolAuxType> SymAuxType[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(AUX_EXCEPT), ECase(AUX_FCN), ECase(AUX_SYM), ECase(AUX_FILE), ECase(AUX_EXCEPT), ECase(AUX_FCN), ECase(AUX_SYM), ECase(AUX_FILE),
@ -217,7 +217,7 @@ static const EnumEntry<XCOFF::StorageMappingClass> CsectStorageMappingClass[] =
#undef ECase #undef ECase
}; };
static const EnumEntry<XCOFF::SymbolType> CsectSymbolTypeClass[] = { const EnumEntry<XCOFF::SymbolType> CsectSymbolTypeClass[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(XTY_ER), ECase(XTY_SD), ECase(XTY_LD), ECase(XTY_CM) ECase(XTY_ER), ECase(XTY_SD), ECase(XTY_LD), ECase(XTY_CM)
@ -267,7 +267,7 @@ void XCOFFDumper::printSectAuxEntForStat(
W.printNumber("NumberOfLineNum", AuxEntPtr->NumberOfLineNum); W.printNumber("NumberOfLineNum", AuxEntPtr->NumberOfLineNum);
} }
static const EnumEntry<XCOFF::StorageClass> SymStorageClass[] = { const EnumEntry<XCOFF::StorageClass> SymStorageClass[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(C_NULL), ECase(C_AUTO), ECase(C_EXT), ECase(C_STAT), ECase(C_NULL), ECase(C_AUTO), ECase(C_EXT), ECase(C_STAT),
@ -316,14 +316,14 @@ static StringRef GetSymbolValueName(XCOFF::StorageClass SC) {
} }
} }
static const EnumEntry<XCOFF::CFileLangId> CFileLangIdClass[] = { const EnumEntry<XCOFF::CFileLangId> CFileLangIdClass[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(TB_C), ECase(TB_CPLUSPLUS) ECase(TB_C), ECase(TB_CPLUSPLUS)
#undef ECase #undef ECase
}; };
static const EnumEntry<XCOFF::CFileCpuId> CFileCpuIdClass[] = { const EnumEntry<XCOFF::CFileCpuId> CFileCpuIdClass[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(TCPU_PPC64), ECase(TCPU_COM), ECase(TCPU_970) ECase(TCPU_PPC64), ECase(TCPU_COM), ECase(TCPU_970)
@ -534,7 +534,7 @@ void XCOFFDumper::printNeededLibraries() {
} }
} }
static const EnumEntry<XCOFF::SectionTypeFlags> SectionTypeFlagsNames[] = { const EnumEntry<XCOFF::SectionTypeFlags> SectionTypeFlagsNames[] = {
#define ECase(X) \ #define ECase(X) \
{ #X, XCOFF::X } { #X, XCOFF::X }
ECase(STYP_PAD), ECase(STYP_DWARF), ECase(STYP_TEXT), ECase(STYP_PAD), ECase(STYP_DWARF), ECase(STYP_TEXT),

2
llvm/tools/llvm-readobj/llvm-readobj.cpp
View File

@ -65,7 +65,7 @@ enum ID {
#include "Opts.inc" #include "Opts.inc"
#undef PREFIX #undef PREFIX
static const opt::OptTable::Info InfoTable[] = { const opt::OptTable::Info InfoTable[] = {
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
HELPTEXT, METAVAR, VALUES) \ HELPTEXT, METAVAR, VALUES) \
{ \ { \