1. Make MCSection an abstract class.
2. Move section switch printing to MCSection virtual method which takes a
TAI. This eliminates textual formatting stuff from TLOF.
3. Eliminate SwitchToSectionDirective, getSectionFlagsAsString, and
TLOFELF::AtIsCommentChar.
llvm-svn: 78510
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 68cd4a49..61577a5 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -94,18 +94,7 @@
if (NS == 0) return;
- // If section is named we need to switch into it via special '.section'
- // directive and also append funky flags. Otherwise - section name is just
- // some magic assembler directive.
- if (!NS->isDirective()) {
- SmallString<32> FlagsStr;
- getObjFileLowering().getSectionFlagsAsString(NS->getKind(), FlagsStr, *TAI);
-
- O << TAI->getSwitchToSectionDirective()
- << CurrentSection->getName() << FlagsStr.c_str() << '\n';
- } else {
- O << CurrentSection->getName() << '\n';
- }
+ NS->PrintSwitchToSection(*TAI, O);
}
void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const {
diff --git a/llvm/lib/MC/MCSection.cpp b/llvm/lib/MC/MCSection.cpp
index ec6078ea..a1f5664 100644
--- a/llvm/lib/MC/MCSection.cpp
+++ b/llvm/lib/MC/MCSection.cpp
@@ -9,8 +9,14 @@
#include "llvm/MC/MCSection.h"
#include "llvm/MC/MCContext.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Support/raw_ostream.h"
using namespace llvm;
+//===----------------------------------------------------------------------===//
+// MCSection
+//===----------------------------------------------------------------------===//
+
MCSection::~MCSection() {
}
@@ -22,26 +28,124 @@
Entry = this;
}
-MCSection *MCSection::
-Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
- return new (Ctx) MCSection(Name, IsDirective, K, Ctx);
-}
-
+//===----------------------------------------------------------------------===//
+// MCSectionELF
+//===----------------------------------------------------------------------===//
MCSectionELF *MCSectionELF::
Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
return new (Ctx) MCSectionELF(Name, IsDirective, K, Ctx);
}
+void MCSectionELF::PrintSwitchToSection(const TargetAsmInfo &TAI,
+ raw_ostream &OS) const {
+ if (isDirective()) {
+ OS << getName() << '\n';
+ return;
+ }
+
+ OS << "\t.section\t" << getName();
+
+ // Handle the weird solaris syntax if desired.
+ if (TAI.usesSunStyleELFSectionSwitchSyntax() &&
+ !getKind().isMergeableConst() && !getKind().isMergeableCString()) {
+ if (!getKind().isMetadata())
+ OS << ",#alloc";
+ if (getKind().isText())
+ OS << ",#execinstr";
+ if (getKind().isWriteable())
+ OS << ",#write";
+ if (getKind().isThreadLocal())
+ OS << ",#tls";
+ } else {
+ OS << ",\"";
+
+ if (!getKind().isMetadata())
+ OS << 'a';
+ if (getKind().isText())
+ OS << 'x';
+ if (getKind().isWriteable())
+ OS << 'w';
+ if (getKind().isMergeable1ByteCString() ||
+ getKind().isMergeable2ByteCString() ||
+ getKind().isMergeable4ByteCString() ||
+ getKind().isMergeableConst4() ||
+ getKind().isMergeableConst8() ||
+ getKind().isMergeableConst16())
+ OS << 'M';
+ if (getKind().isMergeable1ByteCString() ||
+ getKind().isMergeable2ByteCString() ||
+ getKind().isMergeable4ByteCString())
+ OS << 'S';
+ if (getKind().isThreadLocal())
+ OS << 'T';
+
+ OS << "\",";
+
+ // If comment string is '@', e.g. as on ARM - use '%' instead
+ if (TAI.getCommentString()[0] == '@')
+ OS << '%';
+ else
+ OS << '@';
+
+ if (getKind().isBSS() || getKind().isThreadBSS())
+ OS << "nobits";
+ else
+ OS << "progbits";
+
+ if (getKind().isMergeable1ByteCString()) {
+ OS << ",1";
+ } else if (getKind().isMergeable2ByteCString()) {
+ OS << ",2";
+ } else if (getKind().isMergeable4ByteCString()) {
+ OS << ",4";
+ } else if (getKind().isMergeableConst4()) {
+ OS << ",4";
+ } else if (getKind().isMergeableConst8()) {
+ OS << ",8";
+ } else if (getKind().isMergeableConst16()) {
+ OS << ",16";
+ }
+ }
+}
+
+//===----------------------------------------------------------------------===//
+// MCSectionMachO
+//===----------------------------------------------------------------------===//
MCSectionMachO *MCSectionMachO::
Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
return new (Ctx) MCSectionMachO(Name, IsDirective, K, Ctx);
}
+void MCSectionMachO::PrintSwitchToSection(const TargetAsmInfo &TAI,
+ raw_ostream &OS) const {
+ if (!isDirective())
+ OS << "\t.section\t" << getName() << '\n';
+ else
+ OS << getName() << '\n';
+}
+
+//===----------------------------------------------------------------------===//
+// MCSectionCOFF
+//===----------------------------------------------------------------------===//
MCSectionCOFF *MCSectionCOFF::
Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) {
return new (Ctx) MCSectionCOFF(Name, IsDirective, K, Ctx);
}
+void MCSectionCOFF::PrintSwitchToSection(const TargetAsmInfo &TAI,
+ raw_ostream &OS) const {
+
+ if (isDirective()) {
+ OS << getName() << '\n';
+ return;
+ }
+ OS << "\t.section\t" << getName() << ",\"";
+ if (getKind().isText())
+ OS << 'x';
+ if (getKind().isWriteable())
+ OS << 'w';
+ OS << "\"\n";
+}
diff --git a/llvm/lib/Target/ARM/ARMTargetObjectFile.h b/llvm/lib/Target/ARM/ARMTargetObjectFile.h
index 55f13b1..9a9f5bb 100644
--- a/llvm/lib/Target/ARM/ARMTargetObjectFile.h
+++ b/llvm/lib/Target/ARM/ARMTargetObjectFile.h
@@ -16,7 +16,7 @@
class ARMElfTargetObjectFile : public TargetLoweringObjectFileELF {
public:
- ARMElfTargetObjectFile() : TargetLoweringObjectFileELF(true) {}
+ ARMElfTargetObjectFile() : TargetLoweringObjectFileELF() {}
void Initialize(MCContext &Ctx, const TargetMachine &TM) {
TargetLoweringObjectFileELF::Initialize(Ctx, TM);
diff --git a/llvm/lib/Target/PIC16/PIC16Section.h b/llvm/lib/Target/PIC16/PIC16Section.h
index 0880141..4c2ae05 100644
--- a/llvm/lib/Target/PIC16/PIC16Section.h
+++ b/llvm/lib/Target/PIC16/PIC16Section.h
@@ -16,6 +16,7 @@
#include "llvm/MC/MCSection.h"
#include "llvm/MC/MCContext.h"
+#include "llvm/Support/raw_ostream.h"
namespace llvm {
@@ -28,9 +29,14 @@
SectionKind K, MCContext &Ctx) {
return new (Ctx) MCSectionPIC16(Name, IsDirective, K, Ctx);
}
+
+
+ virtual void PrintSwitchToSection(const TargetAsmInfo &TAI,
+ raw_ostream &OS) const {
+ OS << getName() << '\n';
+ }
+
};
-
-
} // end namespace llvm
diff --git a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
index 50fba39..fdd1ae0 100644
--- a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
+++ b/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp
@@ -33,7 +33,6 @@
ZeroDirective = NULL;
AsciiDirective = " dt ";
AscizDirective = NULL;
- SwitchToSectionDirective = "";
RomData8bitsDirective = " dw ";
RomData16bitsDirective = " rom_di ";
diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
index c2b1888..0cbd597 100644
--- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -60,7 +60,7 @@
static TargetLoweringObjectFile *CreateTLOF(const PPCTargetMachine &TM) {
if (TM.getSubtargetImpl()->isDarwin())
return new TargetLoweringObjectFileMachO();
- return new TargetLoweringObjectFileELF(false, true);
+ return new TargetLoweringObjectFileELF(true);
}
diff --git a/llvm/lib/Target/TargetAsmInfo.cpp b/llvm/lib/Target/TargetAsmInfo.cpp
index 5ec36b6..6ac54e0 100644
--- a/llvm/lib/Target/TargetAsmInfo.cpp
+++ b/llvm/lib/Target/TargetAsmInfo.cpp
@@ -53,7 +53,6 @@
AlignDirective = "\t.align\t";
AlignmentIsInBytes = true;
TextAlignFillValue = 0;
- SwitchToSectionDirective = "\t.section\t";
JumpTableDirective = 0;
GlobalDirective = "\t.globl\t";
SetDirective = 0;
diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp
index bd3b376..e41e7a9 100644
--- a/llvm/lib/Target/TargetLoweringObjectFile.cpp
+++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp
@@ -404,91 +404,6 @@
return getELFSection(GV->getSection().c_str(), false, Kind);
}
-
-
-
-void TargetLoweringObjectFileELF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str,
- const TargetAsmInfo &TAI) const {
- // Handle the weird solaris syntax if desired.
- if (TAI.usesSunStyleELFSectionSwitchSyntax() &&
- !Kind.isMergeableConst() && !Kind.isMergeableCString()) {
- // FIXME: Inefficient.
- std::string Res;
- if (!Kind.isMetadata())
- Res += ",#alloc";
- if (Kind.isText())
- Res += ",#execinstr";
- if (Kind.isWriteable())
- Res += ",#write";
- if (Kind.isThreadLocal())
- Res += ",#tls";
- Str.append(Res.begin(), Res.end());
- return;
- }
-
- Str.push_back(',');
- Str.push_back('"');
-
- if (!Kind.isMetadata())
- Str.push_back('a');
- if (Kind.isText())
- Str.push_back('x');
- if (Kind.isWriteable())
- Str.push_back('w');
- if (Kind.isMergeable1ByteCString() ||
- Kind.isMergeable2ByteCString() ||
- Kind.isMergeable4ByteCString() ||
- Kind.isMergeableConst4() ||
- Kind.isMergeableConst8() ||
- Kind.isMergeableConst16())
- Str.push_back('M');
- if (Kind.isMergeable1ByteCString() ||
- Kind.isMergeable2ByteCString() ||
- Kind.isMergeable4ByteCString())
- Str.push_back('S');
- if (Kind.isThreadLocal())
- Str.push_back('T');
-
- Str.push_back('"');
- Str.push_back(',');
-
- // If comment string is '@', e.g. as on ARM - use '%' instead
- if (AtIsCommentChar)
- Str.push_back('%');
- else
- Str.push_back('@');
-
- const char *KindStr;
- if (Kind.isBSS() || Kind.isThreadBSS())
- KindStr = "nobits";
- else
- KindStr = "progbits";
-
- Str.append(KindStr, KindStr+strlen(KindStr));
-
- if (Kind.isMergeable1ByteCString()) {
- Str.push_back(',');
- Str.push_back('1');
- } else if (Kind.isMergeable2ByteCString()) {
- Str.push_back(',');
- Str.push_back('2');
- } else if (Kind.isMergeable4ByteCString()) {
- Str.push_back(',');
- Str.push_back('4');
- } else if (Kind.isMergeableConst4()) {
- Str.push_back(',');
- Str.push_back('4');
- } else if (Kind.isMergeableConst8()) {
- Str.push_back(',');
- Str.push_back('8');
- } else if (Kind.isMergeableConst16()) {
- Str.push_back(',');
- Str.push_back('1');
- Str.push_back('6');
- }
-}
-
static const char *getSectionPrefixForUniqueGlobal(SectionKind Kind) {
if (Kind.isText()) return ".gnu.linkonce.t.";
@@ -865,21 +780,6 @@
return getCOFFSection(GV->getSection().c_str(), false, Kind);
}
-
-void TargetLoweringObjectFileCOFF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str,
- const TargetAsmInfo &TAI) const {
- // FIXME: Inefficient.
- std::string Res = ",\"";
- if (Kind.isText())
- Res += 'x';
- if (Kind.isWriteable())
- Res += 'w';
- Res += "\"";
-
- Str.append(Res.begin(), Res.end());
-}
-
static const char *getCOFFSectionPrefixForUniqueGlobal(SectionKind Kind) {
if (Kind.isText())
return ".text$linkonce";