Make the big switch: Change MCSectionMachO to represent a section *semantically*
instead of syntactically as a string. This means that it keeps track of the
segment, section, flags, etc directly and asmprints them in the right format.
This also includes parsing and validation support for llvm-mc and
"attribute(section)", so we should now start getting errors about invalid
section attributes from the compiler instead of the assembler on darwin.
Still todo:
1) Uniquing of darwin mcsections
2) Move all the Darwin stuff out to MCSectionMachO.[cpp|h]
3) there are a few FIXMEs, for example what is the syntax to get the
S_GB_ZEROFILL segment type?
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78547 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index ca61d55..9f79938 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -1286,19 +1286,21 @@
O << '\n';
if (!FnStubs.empty()) {
- const MCSection *StubSection;
- if (TM.getRelocationModel() == Reloc::PIC_)
- StubSection = TLOFMacho.getMachOSection(".section __TEXT,__picsymbolstu"
- "b4,symbol_stubs,none,16", true,
- SectionKind::getText());
- else
- StubSection = TLOFMacho.getMachOSection(".section __TEXT,__symbol_stub4"
- ",symbol_stubs,none,12", true,
- SectionKind::getText());
+ unsigned StubSize = 12;
+ const char *StubSectionName = "__symbol_stub4";
+
+ if (TM.getRelocationModel() == Reloc::PIC_) {
+ StubSize = 16;
+ StubSectionName = "__picsymbolstub4";
+ }
+
+ const MCSection *StubSection
+ = TLOFMacho.getMachOSection("__TEXT", StubSectionName,
+ MCSectionMachO::S_SYMBOL_STUBS,
+ StubSize, SectionKind::getText());
const MCSection *LazySymbolPointerSection
- = TLOFMacho.getMachOSection(".lazy_symbol_pointer", true,
- SectionKind::getMetadata());
+ = TLOFMacho.getLazySymbolPointerSection();
// Output stubs for dynamically-linked functions
for (StringMap<FnStubInfo>::iterator I = FnStubs.begin(),
@@ -1333,9 +1335,8 @@
// Output non-lazy-pointers for external and common global variables.
if (!GVNonLazyPtrs.empty()) {
- SwitchToSection(TLOFMacho.getMachOSection(".non_lazy_symbol_pointer",
- true,
- SectionKind::getMetadata()));
+ // Switch with ".non_lazy_symbol_pointer" directive.
+ SwitchToSection(TLOFMacho.getNonLazySymbolPointerSection());
for (StringMap<std::string>::iterator I = GVNonLazyPtrs.begin(),
E = GVNonLazyPtrs.end(); I != E; ++I) {
O << I->second << ":\n";
diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
index 9884ca3..73c9c03 100644
--- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
@@ -846,22 +846,19 @@
// Prime text sections so they are adjacent. This reduces the likelihood a
// large data or debug section causes a branch to exceed 16M limit.
-
TargetLoweringObjectFileMachO &TLOFMacho =
static_cast<TargetLoweringObjectFileMachO &>(getObjFileLowering());
- SwitchToSection(TLOFMacho.getMachOSection("\t.section __TEXT,__textcoal_nt,"
- "coalesced,pure_instructions", true,
- SectionKind::getText()));
+ SwitchToSection(TLOFMacho.getTextCoalSection());
if (TM.getRelocationModel() == Reloc::PIC_) {
- SwitchToSection(TLOFMacho.getMachOSection("\t.section __TEXT,__picsymbolstu"
- "b1,symbol_stubs,"
- "pure_instructions,32", true,
- SectionKind::getText()));
+ SwitchToSection(TLOFMacho.getMachOSection("__TEXT", "__picsymbolstub1",
+ MCSectionMachO::S_SYMBOL_STUBS |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 32, SectionKind::getText()));
} else if (TM.getRelocationModel() == Reloc::DynamicNoPIC) {
- SwitchToSection(TLOFMacho.getMachOSection("\t.section __TEXT,__symbol_stub1"
- ",symbol_stubs,"
- "pure_instructions,16", true,
- SectionKind::getText()));
+ SwitchToSection(TLOFMacho.getMachOSection("__TEXT","__symbol_stub1",
+ MCSectionMachO::S_SYMBOL_STUBS |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 16, SectionKind::getText()));
}
SwitchToSection(getObjFileLowering().getTextSection());
@@ -985,17 +982,20 @@
TargetLoweringObjectFileMachO &TLOFMacho =
static_cast<TargetLoweringObjectFileMachO &>(getObjFileLowering());
+
+ const MCSection *LSPSection = 0;
+ if (!FnStubs.empty()) // .lazy_symbol_pointer
+ LSPSection = TLOFMacho.getLazySymbolPointerSection();
+
+
// Output stubs for dynamically-linked functions
if (TM.getRelocationModel() == Reloc::PIC_ && !FnStubs.empty()) {
const MCSection *StubSection =
- TLOFMacho.getMachOSection("\t.section __TEXT,__picsymbolstub1,"
- "symbol_stubs,pure_instructions,32", true,
- SectionKind::getText());
- const MCSection *LSPSection =
- TLOFMacho.getMachOSection(".lazy_symbol_pointer", true,
- SectionKind::getMetadata());
-
- for (StringMap<FnStubInfo>::iterator I = FnStubs.begin(), E = FnStubs.end();
+ TLOFMacho.getMachOSection("__TEXT", "__picsymbolstub1",
+ MCSectionMachO::S_SYMBOL_STUBS |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 32, SectionKind::getText());
+ for (StringMap<FnStubInfo>::iterator I = FnStubs.begin(), E = FnStubs.end();
I != E; ++I) {
SwitchToSection(StubSection);
EmitAlignment(4);
@@ -1020,13 +1020,11 @@
O << (isPPC64 ? "\t.quad" : "\t.long") << " dyld_stub_binding_helper\n";
}
} else if (!FnStubs.empty()) {
- const MCSection *StubSection =
- TLOFMacho.getMachOSection("\t.section __TEXT,__symbol_stub1,symbol_stubs,"
- "pure_instructions,16", true,
- SectionKind::getText());
- const MCSection *LSPSection =
- TLOFMacho.getMachOSection(".lazy_symbol_pointer", true,
- SectionKind::getMetadata());
+ const MCSection *StubSection =
+ TLOFMacho.getMachOSection("__TEXT","__symbol_stub1",
+ MCSectionMachO::S_SYMBOL_STUBS |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 16, SectionKind::getText());
for (StringMap<FnStubInfo>::iterator I = FnStubs.begin(), E = FnStubs.end();
I != E; ++I) {
@@ -1063,10 +1061,8 @@
// Output macho stubs for external and common global variables.
if (!GVStubs.empty()) {
- const MCSection *TheSection =
- TLOFMacho.getMachOSection(".non_lazy_symbol_pointer", true,
- SectionKind::getMetadata());
- SwitchToSection(TheSection);
+ // Switch with ".non_lazy_symbol_pointer" directive.
+ SwitchToSection(TLOFMacho.getNonLazySymbolPointerSection());
for (StringMap<std::string>::iterator I = GVStubs.begin(),
E = GVStubs.end(); I != E; ++I) {
O << I->second << ":\n";
diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp
index e41e7a9..2cde7d9 100644
--- a/lib/Target/TargetLoweringObjectFile.cpp
+++ b/lib/Target/TargetLoweringObjectFile.cpp
@@ -510,118 +510,176 @@
const MCSection *TargetLoweringObjectFileMachO::
-getMachOSection(const char *Name, bool isDirective, SectionKind Kind) const {
- if (MCSection *S = getContext().GetSection(Name))
- return S;
- return MCSectionMachO::Create(Name, isDirective, Kind, getContext());
+getMachOSection(StringRef Segment, StringRef Section,
+ unsigned TypeAndAttributes,
+ unsigned Reserved2, SectionKind Kind) const {
+ // FIXME: UNIQUE HERE.
+ //if (MCSection *S = getContext().GetSection(Name))
+ // return S;
+
+ return MCSectionMachO::Create(Segment, Section, TypeAndAttributes, Reserved2,
+ Kind, getContext());
}
-
void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
const TargetMachine &TM) {
TargetLoweringObjectFile::Initialize(Ctx, TM);
- TextSection = getMachOSection("\t.text", true, SectionKind::getText());
- DataSection = getMachOSection("\t.data", true, SectionKind::getDataRel());
- CStringSection = getMachOSection("\t.cstring", true,
- SectionKind::getMergeable1ByteCString());
- UStringSection = getMachOSection("__TEXT,__ustring", false,
- SectionKind::getMergeable2ByteCString());
- FourByteConstantSection = getMachOSection("\t.literal4\n", true,
- SectionKind::getMergeableConst4());
- EightByteConstantSection = getMachOSection("\t.literal8\n", true,
- SectionKind::getMergeableConst8());
+ TextSection // .text
+ = getMachOSection("__TEXT", "__text",
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ SectionKind::getText());
+ DataSection // .data
+ = getMachOSection("__DATA", "__data", 0, SectionKind::getDataRel());
+
+ CStringSection // .cstring
+ = getMachOSection("__TEXT", "__cstring", MCSectionMachO::S_CSTRING_LITERALS,
+ SectionKind::getMergeable1ByteCString());
+ UStringSection
+ = getMachOSection("__TEXT","__ustring", 0,
+ SectionKind::getMergeable2ByteCString());
+ FourByteConstantSection // .literal4
+ = getMachOSection("__TEXT", "__literal4", MCSectionMachO::S_4BYTE_LITERALS,
+ SectionKind::getMergeableConst4());
+ EightByteConstantSection // .literal8
+ = getMachOSection("__TEXT", "__literal8", MCSectionMachO::S_8BYTE_LITERALS,
+ SectionKind::getMergeableConst8());
// ld_classic doesn't support .literal16 in 32-bit mode, and ld64 falls back
// to using it in -static mode.
+ SixteenByteConstantSection = 0;
if (TM.getRelocationModel() != Reloc::Static &&
TM.getTargetData()->getPointerSize() == 32)
- SixteenByteConstantSection =
- getMachOSection("\t.literal16\n", true,
+ SixteenByteConstantSection = // .literal16
+ getMachOSection("__TEXT", "__literal16",MCSectionMachO::S_16BYTE_LITERALS,
SectionKind::getMergeableConst16());
- else
- SixteenByteConstantSection = 0;
- ReadOnlySection = getMachOSection("\t.const", true,
- SectionKind::getReadOnly());
+ ReadOnlySection // .const
+ = getMachOSection("__TEXT", "__const", 0, SectionKind::getReadOnly());
- TextCoalSection =
- getMachOSection("\t__TEXT,__textcoal_nt,coalesced,pure_instructions",
- false, SectionKind::getText());
- ConstTextCoalSection = getMachOSection("\t__TEXT,__const_coal,coalesced",
- false, SectionKind::getText());
- ConstDataCoalSection = getMachOSection("\t__DATA,__const_coal,coalesced",
- false, SectionKind::getText());
- ConstDataSection = getMachOSection("\t.const_data", true,
- SectionKind::getReadOnlyWithRel());
- DataCoalSection = getMachOSection("\t__DATA,__datacoal_nt,coalesced",
- false, SectionKind::getDataRel());
+ TextCoalSection
+ = getMachOSection("__TEXT", "__textcoal_nt",
+ MCSectionMachO::S_COALESCED |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ SectionKind::getText());
+ ConstTextCoalSection
+ = getMachOSection("__TEXT", "__const_coal", MCSectionMachO::S_COALESCED,
+ SectionKind::getText());
+ ConstDataCoalSection
+ = getMachOSection("__DATA","__const_coal", MCSectionMachO::S_COALESCED,
+ SectionKind::getText());
+ ConstDataSection // .const_data
+ = getMachOSection("__DATA", "__const", 0,
+ SectionKind::getReadOnlyWithRel());
+ DataCoalSection
+ = getMachOSection("__DATA","__datacoal_nt", MCSectionMachO::S_COALESCED,
+ SectionKind::getDataRel());
if (TM.getRelocationModel() == Reloc::Static) {
- StaticCtorSection =
- getMachOSection(".constructor", true, SectionKind::getDataRel());
- StaticDtorSection =
- getMachOSection(".destructor", true, SectionKind::getDataRel());
+ StaticCtorSection
+ = getMachOSection("__TEXT", "__constructor", 0,SectionKind::getDataRel());
+ StaticDtorSection
+ = getMachOSection("__TEXT", "__destructor", 0, SectionKind::getDataRel());
} else {
- StaticCtorSection =
- getMachOSection(".mod_init_func", true, SectionKind::getDataRel());
- StaticDtorSection =
- getMachOSection(".mod_term_func", true, SectionKind::getDataRel());
+ StaticCtorSection
+ = getMachOSection("__DATA", "__mod_init_func",
+ MCSectionMachO::S_MOD_INIT_FUNC_POINTERS,
+ SectionKind::getDataRel());
+ StaticDtorSection
+ = getMachOSection("__DATA", "__mod_term_func",
+ MCSectionMachO::S_MOD_TERM_FUNC_POINTERS,
+ SectionKind::getDataRel());
}
// Exception Handling.
- LSDASection = getMachOSection("__DATA,__gcc_except_tab", false,
+ LSDASection = getMachOSection("__DATA", "__gcc_except_tab", 0,
SectionKind::getDataRel());
EHFrameSection =
- getMachOSection("__TEXT,__eh_frame,coalesced,no_toc+strip_static_syms"
- "+live_support", false, SectionKind::getReadOnly());
+ getMachOSection("__TEXT", "__eh_frame",
+ MCSectionMachO::S_COALESCED |
+ MCSectionMachO::S_ATTR_NO_TOC |
+ MCSectionMachO::S_ATTR_STRIP_STATIC_SYMS |
+ MCSectionMachO::S_ATTR_LIVE_SUPPORT,
+ SectionKind::getReadOnly());
// Debug Information.
- // FIXME: Don't use 'directive' syntax: need flags for debug/regular??
- // FIXME: Need __DWARF segment.
DwarfAbbrevSection =
- getMachOSection(".section __DWARF,__debug_abbrev,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_abbrev", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfInfoSection =
- getMachOSection(".section __DWARF,__debug_info,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_info", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfLineSection =
- getMachOSection(".section __DWARF,__debug_line,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_line", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfFrameSection =
- getMachOSection(".section __DWARF,__debug_frame,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_frame", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfPubNamesSection =
- getMachOSection(".section __DWARF,__debug_pubnames,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_pubnames", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfPubTypesSection =
- getMachOSection(".section __DWARF,__debug_pubtypes,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_pubtypes", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfStrSection =
- getMachOSection(".section __DWARF,__debug_str,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_str", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfLocSection =
- getMachOSection(".section __DWARF,__debug_loc,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_loc", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfARangesSection =
- getMachOSection(".section __DWARF,__debug_aranges,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_aranges", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfRangesSection =
- getMachOSection(".section __DWARF,__debug_ranges,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_ranges", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfMacroInfoSection =
- getMachOSection(".section __DWARF,__debug_macinfo,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_macinfo", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
DwarfDebugInlineSection =
- getMachOSection(".section __DWARF,__debug_inlined,regular,debug", true,
+ getMachOSection("__DWARF", "__debug_inlined", MCSectionMachO::S_ATTR_DEBUG,
SectionKind::getMetadata());
}
+/// getLazySymbolPointerSection - Return the section corresponding to
+/// the .lazy_symbol_pointer directive.
+const MCSection *TargetLoweringObjectFileMachO::
+getLazySymbolPointerSection() const {
+ return getMachOSection("__DATA", "__la_symbol_ptr",
+ MCSectionMachO::S_LAZY_SYMBOL_POINTERS,
+ SectionKind::getMetadata());
+}
+
+/// getNonLazySymbolPointerSection - Return the section corresponding to
+/// the .non_lazy_symbol_pointer directive.
+const MCSection *TargetLoweringObjectFileMachO::
+getNonLazySymbolPointerSection() const {
+ return getMachOSection("__DATA", "__nl_symbol_ptr",
+ MCSectionMachO::S_NON_LAZY_SYMBOL_POINTERS,
+ SectionKind::getMetadata());
+}
+
+
const MCSection *TargetLoweringObjectFileMachO::
getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind,
Mangler *Mang, const TargetMachine &TM) const {
- return getMachOSection(GV->getSection().c_str(), false, Kind);
+ // Parse the section specifier and create it if valid.
+ StringRef Segment, Section;
+ unsigned TAA, StubSize;
+ std::string ErrorCode =
+ MCSectionMachO::ParseSectionSpecifier(GV->getSection(), Segment, Section,
+ TAA, StubSize);
+ if (ErrorCode.empty())
+ return getMachOSection(Segment, Section, TAA, StubSize, Kind);
+
+
+ // If invalid, report the error with llvm_report_error.
+ llvm_report_error("Global variable '" + GV->getNameStr() +
+ "' has an invalid section specifier '" + GV->getSection() +
+ "': " + ErrorCode + ".");
+ // Fall back to dropping it into the data section.
+ return DataSection;
}
const MCSection *TargetLoweringObjectFileMachO::
diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index 59cff0f..ae0e599 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -918,9 +918,11 @@
// Output stubs for dynamically-linked functions
if (!FnStubs.empty()) {
const MCSection *TheSection =
- TLOFMacho.getMachOSection("\t.section __IMPORT,__jump_table,symbol_stubs,"
- "self_modifying_code+pure_instructions,5", true,
- SectionKind::getMetadata());
+ TLOFMacho.getMachOSection("__IMPORT", "__jump_table",
+ MCSectionMachO::S_SYMBOL_STUBS |
+ MCSectionMachO::S_ATTR_SELF_MODIFYING_CODE |
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 5, SectionKind::getMetadata());
SwitchToSection(TheSection);
for (StringMap<std::string>::iterator I = FnStubs.begin(),
E = FnStubs.end(); I != E; ++I)
@@ -932,8 +934,8 @@
// Output stubs for external and common global variables.
if (!GVStubs.empty()) {
const MCSection *TheSection =
- TLOFMacho.getMachOSection("\t.section __IMPORT,__pointers,"
- "non_lazy_symbol_pointers", true,
+ TLOFMacho.getMachOSection("__IMPORT", "__pointers",
+ MCSectionMachO::S_NON_LAZY_SYMBOL_POINTERS,
SectionKind::getMetadata());
SwitchToSection(TheSection);
for (StringMap<std::string>::iterator I = GVStubs.begin(),