sink the 'name' and 'isdirective' state out of MCSection into its derived classes.
This totally optimizes PIC16 sections by not having an 'isdirective' bit anymore!! ;-)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78517 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index a71174a..0aed948 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -100,13 +100,6 @@
return false;
}
-/// Allow printing sections directly to a raw_ostream with proper quoting.
-static inline raw_ostream &operator<<(raw_ostream &os, const MCSection *S) {
- if (NeedsQuoting(S->getName()))
- return os << '"' << S->getName() << '"';
- return os << S->getName();
-}
-
/// Allow printing symbols directly to a raw_ostream with proper quoting.
static inline raw_ostream &operator<<(raw_ostream &os, const MCSymbol *S) {
if (NeedsQuoting(S->getName()))
@@ -144,10 +137,8 @@
if (Section != CurSection) {
CurSection = Section;
- // FIXME: Really we would like the segment, flags, etc. to be separate
- // values instead of embedded in the name. Not all assemblers understand all
- // this stuff though.
- OS << ".section " << Section << "\n";
+ // FIXME: Needs TargetAsmInfo!
+ Section->PrintSwitchToSection(*(const TargetAsmInfo*)0, OS);
}
}
@@ -228,7 +219,12 @@
// FIXME: Really we would like the segment and section names as well as the
// section type to be separate values instead of embedded in the name. Not
// all assemblers understand all this stuff though.
- OS << ".zerofill " << Section;
+ OS << ".zerofill ";
+
+ // This is a mach-o specific directive.
+ OS << '"' << ((MCSectionMachO*)Section)->getName() << '"';
+
+
if (Symbol != NULL) {
OS << ',' << Symbol << ',' << Size;
if (Pow2Alignment != 0)
diff --git a/lib/MC/MCSection.cpp b/lib/MC/MCSection.cpp
index a1f5664..80a80e7 100644
--- a/lib/MC/MCSection.cpp
+++ b/lib/MC/MCSection.cpp
@@ -20,13 +20,6 @@
MCSection::~MCSection() {
}
-MCSection::MCSection(const StringRef &N, bool isDirective, SectionKind K,
- MCContext &Ctx)
- : Name(N), IsDirective(isDirective), Kind(K) {
- MCSection *&Entry = Ctx.Sections[Name];
- assert(Entry == 0 && "Multiple sections with the same name created");
- Entry = this;
-}
//===----------------------------------------------------------------------===//
// MCSectionELF
@@ -37,6 +30,13 @@
return new (Ctx) MCSectionELF(Name, IsDirective, K, Ctx);
}
+MCSectionELF::MCSectionELF(const StringRef &name, bool isDirective,
+ SectionKind K, MCContext &Ctx)
+ : MCSection(K), Name(name), IsDirective(isDirective) {
+ Ctx.SetSection(Name, this);
+}
+
+
void MCSectionELF::PrintSwitchToSection(const TargetAsmInfo &TAI,
raw_ostream &OS) const {
if (isDirective()) {
@@ -118,6 +118,12 @@
return new (Ctx) MCSectionMachO(Name, IsDirective, K, Ctx);
}
+MCSectionMachO::MCSectionMachO(const StringRef &name, bool isDirective,
+ SectionKind K, MCContext &Ctx)
+ : MCSection(K), Name(name), IsDirective(isDirective) {
+ Ctx.SetSection(Name, this);
+}
+
void MCSectionMachO::PrintSwitchToSection(const TargetAsmInfo &TAI,
raw_ostream &OS) const {
if (!isDirective())
@@ -135,6 +141,13 @@
return new (Ctx) MCSectionCOFF(Name, IsDirective, K, Ctx);
}
+MCSectionCOFF::MCSectionCOFF(const StringRef &name, bool isDirective,
+ SectionKind K, MCContext &Ctx)
+ : MCSection(K), Name(name), IsDirective(isDirective) {
+ Ctx.SetSection(Name, this);
+}
+
+
void MCSectionCOFF::PrintSwitchToSection(const TargetAsmInfo &TAI,
raw_ostream &OS) const {