RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-13 22:58:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use StringRef in MCSectionMachO (NFC)

Browse Source 
llvm-svn: 283284
This commit is contained in:
Mehdi Amini 2016-10-05 01:02:34 +00:00
parent 8721c31f63
commit 1ab7cb5cc2
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/MC/MCSectionMachO.cpp
View File

@ -17,10 +17,10 @@ using namespace llvm;
/// types. This *must* be kept in order with and stay synchronized with the /// types. This *must* be kept in order with and stay synchronized with the
/// section type list. /// section type list.
static const struct { static const struct {
const char *AssemblerName, *EnumName; StringRef AssemblerName, EnumName;
} SectionTypeDescriptors[MachO::LAST_KNOWN_SECTION_TYPE+1] = { } SectionTypeDescriptors[MachO::LAST_KNOWN_SECTION_TYPE+1] = {
{ "regular", "S_REGULAR" }, // 0x00 { "regular", "S_REGULAR" }, // 0x00
{ nullptr, "S_ZEROFILL" }, // 0x01 { StringRef(), "S_ZEROFILL" }, // 0x01
{ "cstring_literals", "S_CSTRING_LITERALS" }, // 0x02 { "cstring_literals", "S_CSTRING_LITERALS" }, // 0x02
{ "4byte_literals", "S_4BYTE_LITERALS" }, // 0x03 { "4byte_literals", "S_4BYTE_LITERALS" }, // 0x03
{ "8byte_literals", "S_8BYTE_LITERALS" }, // 0x04 { "8byte_literals", "S_8BYTE_LITERALS" }, // 0x04
@ -31,11 +31,11 @@ static const struct {
{ "mod_init_funcs", "S_MOD_INIT_FUNC_POINTERS" }, // 0x09 { "mod_init_funcs", "S_MOD_INIT_FUNC_POINTERS" }, // 0x09
{ "mod_term_funcs", "S_MOD_TERM_FUNC_POINTERS" }, // 0x0A { "mod_term_funcs", "S_MOD_TERM_FUNC_POINTERS" }, // 0x0A
{ "coalesced", "S_COALESCED" }, // 0x0B { "coalesced", "S_COALESCED" }, // 0x0B
{ nullptr, /*FIXME??*/ "S_GB_ZEROFILL" }, // 0x0C { StringRef(), /*FIXME??*/ "S_GB_ZEROFILL" }, // 0x0C
{ "interposing", "S_INTERPOSING" }, // 0x0D { "interposing", "S_INTERPOSING" }, // 0x0D
{ "16byte_literals", "S_16BYTE_LITERALS" }, // 0x0E { "16byte_literals", "S_16BYTE_LITERALS" }, // 0x0E
{ nullptr, /*FIXME??*/ "S_DTRACE_DOF" }, // 0x0F { StringRef(), /*FIXME??*/ "S_DTRACE_DOF" }, // 0x0F
{ nullptr, /*FIXME??*/ "S_LAZY_DYLIB_SYMBOL_POINTERS" }, // 0x10 { StringRef(), /*FIXME??*/ "S_LAZY_DYLIB_SYMBOL_POINTERS" }, // 0x10
{ "thread_local_regular", "S_THREAD_LOCAL_REGULAR" }, // 0x11 { "thread_local_regular", "S_THREAD_LOCAL_REGULAR" }, // 0x11
{ "thread_local_zerofill", "S_THREAD_LOCAL_ZEROFILL" }, // 0x12 { "thread_local_zerofill", "S_THREAD_LOCAL_ZEROFILL" }, // 0x12
{ "thread_local_variables", "S_THREAD_LOCAL_VARIABLES" }, // 0x13 { "thread_local_variables", "S_THREAD_LOCAL_VARIABLES" }, // 0x13
@ -51,7 +51,7 @@ static const struct {
/// by attribute, instead it is searched. /// by attribute, instead it is searched.
static const struct { static const struct {
unsigned AttrFlag; unsigned AttrFlag;
const char *AssemblerName, *EnumName; StringRef AssemblerName, EnumName;
} SectionAttrDescriptors[] = { } SectionAttrDescriptors[] = {
#define ENTRY(ASMNAME, ENUM) \ #define ENTRY(ASMNAME, ENUM) \
{ MachO::ENUM, ASMNAME, #ENUM }, { MachO::ENUM, ASMNAME, #ENUM },
@ -62,11 +62,11 @@ ENTRY("no_dead_strip", S_ATTR_NO_DEAD_STRIP)
ENTRY("live_support", S_ATTR_LIVE_SUPPORT) ENTRY("live_support", S_ATTR_LIVE_SUPPORT)
ENTRY("self_modifying_code", S_ATTR_SELF_MODIFYING_CODE) ENTRY("self_modifying_code", S_ATTR_SELF_MODIFYING_CODE)
ENTRY("debug", S_ATTR_DEBUG) ENTRY("debug", S_ATTR_DEBUG)
ENTRY(nullptr /*FIXME*/, S_ATTR_SOME_INSTRUCTIONS) ENTRY(StringRef() /*FIXME*/, S_ATTR_SOME_INSTRUCTIONS)
ENTRY(nullptr /*FIXME*/, S_ATTR_EXT_RELOC) ENTRY(StringRef() /*FIXME*/, S_ATTR_EXT_RELOC)
ENTRY(nullptr /*FIXME*/, S_ATTR_LOC_RELOC) ENTRY(StringRef() /*FIXME*/, S_ATTR_LOC_RELOC)
#undef ENTRY #undef ENTRY
{ 0, "none", nullptr }, // used if section has no attributes but has a stub size { 0, "none", StringRef() }, // used if section has no attributes but has a stub size
}; };
MCSectionMachO::MCSectionMachO(StringRef Segment, StringRef Section, MCSectionMachO::MCSectionMachO(StringRef Segment, StringRef Section,
@ -105,7 +105,7 @@ void MCSectionMachO::PrintSwitchToSection(const MCAsmInfo &MAI,
assert(SectionType <= MachO::LAST_KNOWN_SECTION_TYPE && assert(SectionType <= MachO::LAST_KNOWN_SECTION_TYPE &&
"Invalid SectionType specified!"); "Invalid SectionType specified!");
if (SectionTypeDescriptors[SectionType].AssemblerName) { if (!SectionTypeDescriptors[SectionType].AssemblerName.empty()) {
OS << ','; OS << ',';
OS << SectionTypeDescriptors[SectionType].AssemblerName; OS << SectionTypeDescriptors[SectionType].AssemblerName;
} else { } else {
@ -138,7 +138,7 @@ void MCSectionMachO::PrintSwitchToSection(const MCAsmInfo &MAI,
SectionAttrs &= ~SectionAttrDescriptors[i].AttrFlag; SectionAttrs &= ~SectionAttrDescriptors[i].AttrFlag;
OS << Separator; OS << Separator;
if (SectionAttrDescriptors[i].AssemblerName) if (!SectionAttrDescriptors[i].AssemblerName.empty())
OS << SectionAttrDescriptors[i].AssemblerName; OS << SectionAttrDescriptors[i].AssemblerName;
else else
OS << "<<" << SectionAttrDescriptors[i].EnumName << ">>"; OS << "<<" << SectionAttrDescriptors[i].EnumName << ">>";
@ -212,8 +212,7 @@ std::string MCSectionMachO::ParseSectionSpecifier(StringRef Spec, // In.
auto TypeDescriptor = std::find_if( auto TypeDescriptor = std::find_if(
std::begin(SectionTypeDescriptors), std::end(SectionTypeDescriptors), std::begin(SectionTypeDescriptors), std::end(SectionTypeDescriptors),
[&](decltype(*SectionTypeDescriptors) &Descriptor) { [&](decltype(*SectionTypeDescriptors) &Descriptor) {
return Descriptor.AssemblerName && return SectionType == Descriptor.AssemblerName;
SectionType == Descriptor.AssemblerName;
}); });
// If we didn't find the section type, reject it. // If we didn't find the section type, reject it.
@ -241,8 +240,7 @@ std::string MCSectionMachO::ParseSectionSpecifier(StringRef Spec, // In.
auto AttrDescriptorI = std::find_if( auto AttrDescriptorI = std::find_if(
std::begin(SectionAttrDescriptors), std::end(SectionAttrDescriptors), std::begin(SectionAttrDescriptors), std::end(SectionAttrDescriptors),
[&](decltype(*SectionAttrDescriptors) &Descriptor) { [&](decltype(*SectionAttrDescriptors) &Descriptor) {
return Descriptor.AssemblerName && return SectionAttr.trim() == Descriptor.AssemblerName;
SectionAttr.trim() == Descriptor.AssemblerName;
}); });
if (AttrDescriptorI == std::end(SectionAttrDescriptors)) if (AttrDescriptorI == std::end(SectionAttrDescriptors))
return "mach-o section specifier has invalid attribute"; return "mach-o section specifier has invalid attribute";