From 51d5b43cda213e3cac83700e39e47657c55fd362 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 31 Jul 2009 17:42:42 +0000 Subject: [PATCH] refactor section construction in TLOF to be through an explicit initialize method, which can be called when an MCContext is available. llvm-svn: 77687 --- .../llvm/Target/TargetLoweringObjectFile.h | 25 ++++++++++++++++--- llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 4 +++ llvm/lib/CodeGen/ELFWriter.cpp | 8 ++++++ llvm/lib/CodeGen/ELFWriter.h | 3 +++ llvm/lib/Target/ARM/ARMISelLowering.cpp | 2 +- llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 2 +- llvm/lib/Target/TargetLoweringObjectFile.cpp | 13 +++++----- llvm/lib/Target/X86/X86ISelLowering.cpp | 2 +- 8 files changed, 45 insertions(+), 14 deletions(-) diff --git a/llvm/include/llvm/Target/TargetLoweringObjectFile.h b/llvm/include/llvm/Target/TargetLoweringObjectFile.h index 6b2e91008cac..713b545bfd0e 100644 --- a/llvm/include/llvm/Target/TargetLoweringObjectFile.h +++ b/llvm/include/llvm/Target/TargetLoweringObjectFile.h @@ -19,6 +19,7 @@ #include "llvm/Target/TargetAsmInfo.h" namespace llvm { + class MCContext; /// SectionKind - This is a simple POD value that classifies the properties of /// a section. A global variable is classified into the deepest possible @@ -256,6 +257,12 @@ public: virtual ~TargetLoweringObjectFile(); + /// Initialize - this method must be called before any actual lowering is + /// done. This specifies the current context for codegen, and gives the + /// lowering implementations a chance to set up their default sections. + virtual void Initialize(MCContext &Ctx, const TargetMachine &TM) {} + + const Section *getTextSection() const { return TextSection; } const Section *getDataSection() const { return DataSection; } @@ -310,12 +317,17 @@ protected: class TargetLoweringObjectFileELF : public TargetLoweringObjectFile { bool AtIsCommentChar; // True if @ is the comment character on this target. + bool HasCrazyBSS; public: /// ELF Constructor - AtIsCommentChar is true if the CommentCharacter from TAI /// is "@". - TargetLoweringObjectFileELF(bool AtIsCommentChar = false, + TargetLoweringObjectFileELF(bool atIsCommentChar = false, // FIXME: REMOVE AFTER UNIQUING IS FIXED. - bool HasCrazyBSS = false); + bool hasCrazyBSS = false) + : AtIsCommentChar(atIsCommentChar), HasCrazyBSS(hasCrazyBSS) {} + + virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + /// getSectionForMergeableConstant - Given a mergeable constant with the /// specified size and relocation information, return a section that it @@ -342,6 +354,8 @@ protected: const Section *MergeableConst16Section; }; + + class TargetLoweringObjectFileMachO : public TargetLoweringObjectFile { const Section *TextCoalSection; const Section *ConstTextCoalSection; @@ -352,7 +366,9 @@ class TargetLoweringObjectFileMachO : public TargetLoweringObjectFile { const Section *EightByteConstantSection; const Section *SixteenByteConstantSection; public: - TargetLoweringObjectFileMachO(const TargetMachine &TM); + + virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + virtual const Section * SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind, Mangler *Mang, const TargetMachine &TM) const; @@ -365,7 +381,8 @@ public: class TargetLoweringObjectFileCOFF : public TargetLoweringObjectFile { public: - TargetLoweringObjectFileCOFF(); + virtual void Initialize(MCContext &Ctx, const TargetMachine &TM); + virtual void getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl &Str) const; diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 441f8057c8b8..7106c6ade816 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -173,6 +173,10 @@ void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const { } bool AsmPrinter::doInitialization(Module &M) { + // Initialize TargetLoweringObjectFile. + const_cast(getObjFileLowering()) + .Initialize(OutContext, TM); + Mang = new Mangler(M, TAI->getGlobalPrefix(), TAI->getPrivateGlobalPrefix(), TAI->getLinkerPrivateGlobalPrefix()); diff --git a/llvm/lib/CodeGen/ELFWriter.cpp b/llvm/lib/CodeGen/ELFWriter.cpp index bf2d0bd94cf6..230c5ac4be87 100644 --- a/llvm/lib/CodeGen/ELFWriter.cpp +++ b/llvm/lib/CodeGen/ELFWriter.cpp @@ -42,6 +42,7 @@ #include "llvm/CodeGen/ObjectCodeEmitter.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineConstantPool.h" +#include "llvm/MC/MCContext.h" #include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetELFWriterInfo.h" @@ -73,6 +74,7 @@ ObjectCodeEmitter *llvm::AddELFWriter(PassManagerBase &PM, ELFWriter::ELFWriter(raw_ostream &o, TargetMachine &tm) : MachineFunctionPass(&ID), O(o), TM(tm), + OutContext(*new MCContext()), is64Bit(TM.getTargetData()->getPointerSizeInBits() == 64), isLittleEndian(TM.getTargetData()->isLittleEndian()), ElfHdr(isLittleEndian, is64Bit) { @@ -89,11 +91,17 @@ ELFWriter::ELFWriter(raw_ostream &o, TargetMachine &tm) ELFWriter::~ELFWriter() { delete ElfCE; + delete &OutContext; } // doInitialization - Emit the file header and all of the global variables for // the module to the ELF file. bool ELFWriter::doInitialization(Module &M) { + // Initialize TargetLoweringObjectFile. + const TargetLoweringObjectFile &TLOF = + TM.getTargetLowering()->getObjFileLowering(); + const_cast(TLOF).Initialize(OutContext, TM); + Mang = new Mangler(M); // ELF Header diff --git a/llvm/lib/CodeGen/ELFWriter.h b/llvm/lib/CodeGen/ELFWriter.h index b8bfa7d2a0f1..ebcfe35ebaad 100644 --- a/llvm/lib/CodeGen/ELFWriter.h +++ b/llvm/lib/CodeGen/ELFWriter.h @@ -35,6 +35,7 @@ namespace llvm { class TargetELFWriterInfo; class raw_ostream; class SectionKind; + class MCContext; typedef std::vector::iterator ELFSymIter; typedef std::vector::iterator ELFSectionIter; @@ -65,6 +66,8 @@ namespace llvm { /// Target machine description. TargetMachine &TM; + MCContext &OutContext; + /// Target Elf Writer description. const TargetELFWriterInfo *TEW; diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp index 41ad069252b5..23e1037baac9 100644 --- a/llvm/lib/Target/ARM/ARMISelLowering.cpp +++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp @@ -106,7 +106,7 @@ void ARMTargetLowering::addQRTypeForNEON(MVT VT) { static TargetLoweringObjectFile *createTLOF(TargetMachine &TM) { if (TM.getSubtarget().isTargetDarwin()) - return new TargetLoweringObjectFileMachO(TM); + return new TargetLoweringObjectFileMachO(); return new TargetLoweringObjectFileELF(true); } diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index bfe0f6f2b010..9b0dd1f78266 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -59,7 +59,7 @@ cl::desc("enable preincrement load/store generation on PPC (experimental)"), static TargetLoweringObjectFile *CreateTLOF(const PPCTargetMachine &TM) { if (TM.getSubtargetImpl()->isDarwin()) - return new TargetLoweringObjectFileMachO(TM); + return new TargetLoweringObjectFileMachO(); return new TargetLoweringObjectFileELF(false, true); } diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp index a42911d92b9d..caeac30ef8a1 100644 --- a/llvm/lib/Target/TargetLoweringObjectFile.cpp +++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp @@ -261,10 +261,8 @@ getOrCreateSection(const char *Name, bool isDirective, // ELF //===----------------------------------------------------------------------===// -TargetLoweringObjectFileELF::TargetLoweringObjectFileELF(bool atIsCommentChar, - bool HasCrazyBSS) - : AtIsCommentChar(atIsCommentChar) { - +void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx, + const TargetMachine &TM) { if (!HasCrazyBSS) BSSSection_ = getOrCreateSection("\t.bss", true, SectionKind::BSS); else @@ -480,8 +478,8 @@ getSectionForMergeableConstant(SectionKind Kind) const { // MachO //===----------------------------------------------------------------------===// -TargetLoweringObjectFileMachO:: -TargetLoweringObjectFileMachO(const TargetMachine &TM) { +void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx, + const TargetMachine &TM) { TextSection = getOrCreateSection("\t.text", true, SectionKind::Text); DataSection = getOrCreateSection("\t.data", true, SectionKind::DataRel); @@ -592,7 +590,8 @@ getSectionForMergeableConstant(SectionKind Kind) const { // COFF //===----------------------------------------------------------------------===// -TargetLoweringObjectFileCOFF::TargetLoweringObjectFileCOFF() { +void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx, + const TargetMachine &TM) { TextSection = getOrCreateSection("\t.text", true, SectionKind::Text); DataSection = getOrCreateSection("\t.data", true, SectionKind::DataRel); } diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index bbc6ba5e16bf..70b1619425e6 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -55,7 +55,7 @@ static TargetLoweringObjectFile *createTLOF(X86TargetMachine &TM) { switch (TM.getSubtarget().TargetType) { default: llvm_unreachable("unknown subtarget type"); case X86Subtarget::isDarwin: - return new TargetLoweringObjectFileMachO(TM); + return new TargetLoweringObjectFileMachO(); case X86Subtarget::isELF: return new TargetLoweringObjectFileELF(); case X86Subtarget::isMingw: