diff options
120 files changed, 446 insertions, 445 deletions
diff --git a/llvm/include/llvm/CodeGen/AsmPrinter.h b/llvm/include/llvm/CodeGen/AsmPrinter.h index 11ae1e027a6..2778b419f66 100644 --- a/llvm/include/llvm/CodeGen/AsmPrinter.h +++ b/llvm/include/llvm/CodeGen/AsmPrinter.h @@ -48,7 +48,7 @@ namespace llvm { class MCStreamer; class DwarfWriter; class Mangler; - class TargetAsmInfo; + class MCAsmInfo; class TargetLoweringObjectFile; class Type; class formatted_raw_ostream; @@ -96,7 +96,7 @@ namespace llvm { /// Target Asm Printer information. /// - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; /// Target Register Information. /// @@ -149,7 +149,7 @@ namespace llvm { protected: explicit AsmPrinter(formatted_raw_ostream &o, TargetMachine &TM, - const TargetAsmInfo *T, bool V); + const MCAsmInfo *T, bool V); public: virtual ~AsmPrinter(); diff --git a/llvm/include/llvm/CodeGen/DwarfWriter.h b/llvm/include/llvm/CodeGen/DwarfWriter.h index 5c7ce0521be..9ae76686d30 100644 --- a/llvm/include/llvm/CodeGen/DwarfWriter.h +++ b/llvm/include/llvm/CodeGen/DwarfWriter.h @@ -34,7 +34,7 @@ class MachineInstr; class Value; class Module; class GlobalVariable; -class TargetAsmInfo; +class MCAsmInfo; class raw_ostream; class Instruction; class DICompileUnit; @@ -68,7 +68,7 @@ public: /// BeginModule - Emit all Dwarf sections that should come prior to the /// content. void BeginModule(Module *M, MachineModuleInfo *MMI, raw_ostream &OS, - AsmPrinter *A, const TargetAsmInfo *T); + AsmPrinter *A, const MCAsmInfo *T); /// EndModule - Emit all Dwarf sections that should come after the content. /// diff --git a/llvm/include/llvm/CodeGen/GCMetadata.h b/llvm/include/llvm/CodeGen/GCMetadata.h index e94aba388a4..04fd8bed972 100644 --- a/llvm/include/llvm/CodeGen/GCMetadata.h +++ b/llvm/include/llvm/CodeGen/GCMetadata.h @@ -42,7 +42,7 @@ namespace llvm { class AsmPrinter; class GCStrategy; class Constant; - class TargetAsmInfo; + class MCAsmInfo; namespace GC { diff --git a/llvm/include/llvm/CodeGen/GCMetadataPrinter.h b/llvm/include/llvm/CodeGen/GCMetadataPrinter.h index b693b1bbfc7..a3ffee9ded7 100644 --- a/llvm/include/llvm/CodeGen/GCMetadataPrinter.h +++ b/llvm/include/llvm/CodeGen/GCMetadataPrinter.h @@ -63,10 +63,10 @@ namespace llvm { /// beginAssembly/finishAssembly - Emit module metadata as assembly code. virtual void beginAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); + const MCAsmInfo &TAI); virtual void finishAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); + const MCAsmInfo &TAI); virtual ~GCMetadataPrinter(); }; diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h new file mode 100644 index 00000000000..fcce7a66da6 --- /dev/null +++ b/llvm/include/llvm/MC/MCAsmInfo.h @@ -0,0 +1,3 @@ + +#include "llvm/Target/TargetAsmInfo.h" + diff --git a/llvm/include/llvm/MC/MCAsmInfoCOFF.h b/llvm/include/llvm/MC/MCAsmInfoCOFF.h new file mode 100644 index 00000000000..73a0155daff --- /dev/null +++ b/llvm/include/llvm/MC/MCAsmInfoCOFF.h @@ -0,0 +1,2 @@ +#include "llvm/Target/COFFTargetAsmInfo.h" + diff --git a/llvm/include/llvm/MC/MCAsmInfoDarwin.h b/llvm/include/llvm/MC/MCAsmInfoDarwin.h new file mode 100644 index 00000000000..122adb21ef6 --- /dev/null +++ b/llvm/include/llvm/MC/MCAsmInfoDarwin.h @@ -0,0 +1 @@ +#include "llvm/Target/DarwinTargetAsmInfo.h" diff --git a/llvm/include/llvm/MC/MCSection.h b/llvm/include/llvm/MC/MCSection.h index 6a1f9d705df..56784d3bba3 100644 --- a/llvm/include/llvm/MC/MCSection.h +++ b/llvm/include/llvm/MC/MCSection.h @@ -20,7 +20,7 @@ namespace llvm { class MCContext; - class TargetAsmInfo; + class MCAsmInfo; class raw_ostream; /// MCSection - Instances of this class represent a uniqued identifier for a @@ -37,7 +37,7 @@ namespace llvm { SectionKind getKind() const { return Kind; } - virtual void PrintSwitchToSection(const TargetAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const = 0; }; @@ -62,7 +62,7 @@ namespace llvm { const std::string &getName() const { return Name; } bool isDirective() const { return IsDirective; } - virtual void PrintSwitchToSection(const TargetAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const; }; diff --git a/llvm/include/llvm/MC/MCSectionELF.h b/llvm/include/llvm/MC/MCSectionELF.h index 8e70e369619..05cda522322 100644 --- a/llvm/include/llvm/MC/MCSectionELF.h +++ b/llvm/include/llvm/MC/MCSectionELF.h @@ -48,7 +48,7 @@ public: /// ShouldOmitSectionDirective - Decides whether a '.section' directive /// should be printed before the section name bool ShouldOmitSectionDirective(const char *Name, - const TargetAsmInfo &TAI) const; + const MCAsmInfo &TAI) const; /// ShouldPrintSectionType - Only prints the section type if supported bool ShouldPrintSectionType(unsigned Ty) const; @@ -171,7 +171,7 @@ public: unsigned getType() const { return Type; } unsigned getFlags() const { return Flags; } - virtual void PrintSwitchToSection(const TargetAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const; @@ -179,7 +179,7 @@ public: /// MCSectionELF subclasses with target specific section flags should /// implement this method if they end up adding letters to the attributes /// list. - virtual void PrintTargetSpecificSectionFlags(const TargetAsmInfo &TAI, + virtual void PrintTargetSpecificSectionFlags(const MCAsmInfo &TAI, raw_ostream &OS) const { } diff --git a/llvm/include/llvm/MC/MCSectionMachO.h b/llvm/include/llvm/MC/MCSectionMachO.h index 04b2afa38c8..9279e2933fd 100644 --- a/llvm/include/llvm/MC/MCSectionMachO.h +++ b/llvm/include/llvm/MC/MCSectionMachO.h @@ -166,7 +166,7 @@ public: unsigned &TAA, // Out. unsigned &StubSize); // Out. - virtual void PrintSwitchToSection(const TargetAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const; }; diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h index 4d55990f8aa..001887323de 100644 --- a/llvm/include/llvm/MC/MCStreamer.h +++ b/llvm/include/llvm/MC/MCStreamer.h @@ -25,7 +25,7 @@ namespace llvm { class MCSymbol; class StringRef; class raw_ostream; - class TargetAsmInfo; + class MCAsmInfo; /// MCStreamer - Streaming machine code generation interface. This interface /// is intended to provide a programatic interface that is very similar to the @@ -241,7 +241,7 @@ namespace llvm { /// /// \arg AP - If given, an AsmPrinter to use for printing instructions. MCStreamer *createAsmStreamer(MCContext &Ctx, raw_ostream &OS, - const TargetAsmInfo &TAI, AsmPrinter *AP = 0); + const MCAsmInfo &TAI, AsmPrinter *AP = 0); // FIXME: These two may end up getting rolled into a single // createObjectStreamer interface, which implements the assembler backend, and diff --git a/llvm/include/llvm/Target/COFFTargetAsmInfo.h b/llvm/include/llvm/Target/COFFTargetAsmInfo.h index fd9fb45f0bd..b5e3d709239 100644 --- a/llvm/include/llvm/Target/COFFTargetAsmInfo.h +++ b/llvm/include/llvm/Target/COFFTargetAsmInfo.h @@ -1,4 +1,4 @@ -//===-- COFFTargetAsmInfo.h - COFF asm properties ---------------*- C++ -*-===// +//===-- MCAsmInfoCOFF.h - COFF asm properties -------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -10,12 +10,12 @@ #ifndef LLVM_COFF_TARGET_ASM_INFO_H #define LLVM_COFF_TARGET_ASM_INFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { - class COFFTargetAsmInfo : public TargetAsmInfo { + class COFFMCAsmInfo : public MCAsmInfo { protected: - explicit COFFTargetAsmInfo(); + explicit COFFMCAsmInfo(); }; } diff --git a/llvm/include/llvm/Target/DarwinTargetAsmInfo.h b/llvm/include/llvm/Target/DarwinTargetAsmInfo.h index 0834390600f..a91a0ddd5b9 100644 --- a/llvm/include/llvm/Target/DarwinTargetAsmInfo.h +++ b/llvm/include/llvm/Target/DarwinTargetAsmInfo.h @@ -1,4 +1,4 @@ -//===---- DarwinTargetAsmInfo.h - Darwin asm properties ---------*- C++ -*-===// +//===---- DarwinMCAsmInfo.h - Darwin asm properties -------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,7 +15,7 @@ #ifndef LLVM_DARWIN_TARGET_ASM_INFO_H #define LLVM_DARWIN_TARGET_ASM_INFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class GlobalValue; @@ -23,8 +23,8 @@ namespace llvm { class Type; class Mangler; - struct DarwinTargetAsmInfo : public TargetAsmInfo { - explicit DarwinTargetAsmInfo(); + struct DarwinMCAsmInfo : public MCAsmInfo { + explicit DarwinMCAsmInfo(); }; } diff --git a/llvm/include/llvm/Target/TargetAsmInfo.h b/llvm/include/llvm/Target/TargetAsmInfo.h index cb0e346a611..4f8d92b3fcd 100644 --- a/llvm/include/llvm/Target/TargetAsmInfo.h +++ b/llvm/include/llvm/Target/TargetAsmInfo.h @@ -1,4 +1,4 @@ -//===-- llvm/Target/TargetAsmInfo.h - Asm info ------------------*- C++ -*-===// +//===-- llvm/MC/MCAsmInfo.h - Asm info --------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -23,11 +23,11 @@ namespace llvm { template <typename T> class SmallVectorImpl; - /// TargetAsmInfo - This class is intended to be used as a base class for asm + /// MCAsmInfo - This class is intended to be used as a base class for asm /// properties and features specific to the target. namespace ExceptionHandling { enum ExceptionsType { None, Dwarf, SjLj }; } - class TargetAsmInfo { + class MCAsmInfo { protected: //===------------------------------------------------------------------===// // Properties to be set by the target writer, used to configure asm printer. @@ -310,8 +310,8 @@ namespace llvm { const char *const *AsmTransCBE; // Defaults to empty public: - explicit TargetAsmInfo(); - virtual ~TargetAsmInfo(); + explicit MCAsmInfo(); + virtual ~MCAsmInfo(); /// getSLEB128Size - Compute the number of bytes required for a signed /// leb128 value. diff --git a/llvm/include/llvm/Target/TargetInstrInfo.h b/llvm/include/llvm/Target/TargetInstrInfo.h index f8a01ab17ef..402f7a3c559 100644 --- a/llvm/include/llvm/Target/TargetInstrInfo.h +++ b/llvm/include/llvm/Target/TargetInstrInfo.h @@ -19,7 +19,7 @@ namespace llvm { -class TargetAsmInfo; +class MCAsmInfo; class TargetRegisterClass; class TargetRegisterInfo; class LiveVariables; @@ -464,7 +464,7 @@ public: /// Measure the specified inline asm to determine an approximation of its /// length. virtual unsigned getInlineAsmLength(const char *Str, - const TargetAsmInfo &TAI) const; + const MCAsmInfo &TAI) const; }; /// TargetInstrInfoImpl - This is the default implementation of diff --git a/llvm/include/llvm/Target/TargetLoweringObjectFile.h b/llvm/include/llvm/Target/TargetLoweringObjectFile.h index 2264d36df9e..7cb7b989195 100644 --- a/llvm/include/llvm/Target/TargetLoweringObjectFile.h +++ b/llvm/include/llvm/Target/TargetLoweringObjectFile.h @@ -25,7 +25,7 @@ namespace llvm { class GlobalValue; class StringRef; class TargetMachine; - class TargetAsmInfo; + class MCAsmInfo; class TargetLoweringObjectFile { MCContext *Ctx; diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h index e5ea27fb087..9614780beb5 100644 --- a/llvm/include/llvm/Target/TargetMachine.h +++ b/llvm/include/llvm/Target/TargetMachine.h @@ -21,7 +21,7 @@ namespace llvm { class Target; -class TargetAsmInfo; +class MCAsmInfo; class TargetData; class TargetSubtarget; class TargetInstrInfo; @@ -102,7 +102,7 @@ protected: // Can only create subclasses. /// AsmInfo - Contains target specific asm information. /// - const TargetAsmInfo *AsmInfo; + const MCAsmInfo *AsmInfo; public: virtual ~TargetMachine(); @@ -120,9 +120,9 @@ public: virtual TargetLowering *getTargetLowering() const { return 0; } virtual const TargetData *getTargetData() const { return 0; } - /// getTargetAsmInfo - Return target specific asm information. + /// getMCAsmInfo - Return target specific asm information. /// - const TargetAsmInfo *getTargetAsmInfo() const { return AsmInfo; } + const MCAsmInfo *getMCAsmInfo() const { return AsmInfo; } /// getSubtarget - This method returns a pointer to the specified type of /// TargetSubtarget. In debug builds, it verifies that the object being diff --git a/llvm/include/llvm/Target/TargetRegistry.h b/llvm/include/llvm/Target/TargetRegistry.h index ebdb36c26ec..8c9e357d652 100644 --- a/llvm/include/llvm/Target/TargetRegistry.h +++ b/llvm/include/llvm/Target/TargetRegistry.h @@ -27,7 +27,7 @@ namespace llvm { class AsmPrinter; class MCAsmParser; class Module; - class TargetAsmInfo; + class MCAsmInfo; class TargetAsmParser; class TargetMachine; class formatted_raw_ostream; @@ -46,14 +46,14 @@ namespace llvm { typedef unsigned (*TripleMatchQualityFnTy)(const std::string &TT); - typedef const TargetAsmInfo *(*AsmInfoCtorFnTy)(const Target &T, - const StringRef &TT); + typedef const MCAsmInfo *(*AsmInfoCtorFnTy)(const Target &T, + const StringRef &TT); typedef TargetMachine *(*TargetMachineCtorTy)(const Target &T, const std::string &TT, const std::string &Features); typedef AsmPrinter *(*AsmPrinterCtorTy)(formatted_raw_ostream &OS, TargetMachine &TM, - const TargetAsmInfo *TAI, + const MCAsmInfo *TAI, bool VerboseAsm); typedef TargetAsmParser *(*AsmParserCtorTy)(const Target &T, MCAsmParser &P); @@ -111,14 +111,14 @@ namespace llvm { bool hasAsmParser() const { return AsmParserCtorFn != 0; } - /// createAsmInfo - Create a TargetAsmInfo implementation for the specified + /// createAsmInfo - Create a MCAsmInfo implementation for the specified /// target triple. /// /// \arg Triple - This argument is used to determine the target machine /// feature set; it should always be provided. Generally this should be /// either the target triple from the module, or the target triple of the /// host if that does not exist. - const TargetAsmInfo *createAsmInfo(const StringRef &Triple) const { + const MCAsmInfo *createAsmInfo(const StringRef &Triple) const { if (!AsmInfoCtorFn) return 0; return AsmInfoCtorFn(*this, Triple); @@ -140,7 +140,7 @@ namespace llvm { /// createAsmPrinter - Create a target specific assembly printer pass. AsmPrinter *createAsmPrinter(formatted_raw_ostream &OS, TargetMachine &TM, - const TargetAsmInfo *TAI, bool Verbose) const { + const MCAsmInfo *TAI, bool Verbose) const { if (!AsmPrinterCtorFn) return 0; return AsmPrinterCtorFn(OS, TM, TAI, Verbose); @@ -243,7 +243,7 @@ namespace llvm { Target::TripleMatchQualityFnTy TQualityFn, bool HasJIT = false); - /// RegisterAsmInfo - Register a TargetAsmInfo implementation for the + /// RegisterAsmInfo - Register a MCAsmInfo implementation for the /// given target. /// /// Clients are responsible for ensuring that registration doesn't occur @@ -251,7 +251,7 @@ namespace llvm { /// this is done by initializing all targets at program startup. /// /// @param T - The target being registered. - /// @param Fn - A function to construct a TargetAsmInfo for the target. + /// @param Fn - A function to construct a MCAsmInfo for the target. static void RegisterAsmInfo(Target &T, Target::AsmInfoCtorFnTy Fn) { // Ignore duplicate registration. if (!T.AsmInfoCtorFn) @@ -340,16 +340,16 @@ namespace llvm { /// /// extern "C" void LLVMInitializeFooTarget() { /// extern Target TheFooTarget; - /// RegisterAsmInfo<FooTargetAsmInfo> X(TheFooTarget); + /// RegisterAsmInfo<FooMCAsmInfo> X(TheFooTarget); /// } - template<class TargetAsmInfoImpl> + template<class MCAsmInfoImpl> struct RegisterAsmInfo { RegisterAsmInfo(Target &T) { TargetRegistry::RegisterAsmInfo(T, &Allocator); } private: - static const TargetAsmInfo *Allocator(const Target &T, const StringRef &TT){ - return new TargetAsmInfoImpl(T, TT); + static const MCAsmInfo *Allocator(const Target &T, const StringRef &TT) { + return new MCAsmInfoImpl(T, TT); } }; @@ -406,7 +406,7 @@ namespace llvm { private: static AsmPrinter *Allocator(formatted_raw_ostream &OS, TargetMachine &TM, - const TargetAsmInfo *TAI, bool Verbose) { + const MCAsmInfo *TAI, bool Verbose) { return new AsmPrinterImpl(OS, TM, TAI, Verbose); } }; diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 8c2800ae2ae..e71af5c7544 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -32,7 +32,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/Mangler.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetLoweringObjectFile.h" @@ -50,7 +50,7 @@ AsmVerbose("asm-verbose", cl::desc("Add comments to directives."), char AsmPrinter::ID = 0; AsmPrinter::AsmPrinter(formatted_raw_ostream &o, TargetMachine &tm, - const TargetAsmInfo *T, bool VDef) + const MCAsmInfo *T, bool VDef) : MachineFunctionPass(&ID), FunctionNumber(0), O(o), TM(tm), TAI(T), TRI(tm.getRegisterInfo()), @@ -1792,7 +1792,7 @@ Indent(formatted_raw_ostream &out, int level, int scale = 2) { /// static void PrintChildLoopComment(formatted_raw_ostream &O, const MachineLoop *loop, - const TargetAsmInfo *TAI, + const MCAsmInfo *TAI, int FunctionNumber) { // Add child loop information for(MachineLoop::iterator cl = loop->begin(), diff --git a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp index a35ee285b30..3dbeef5ea6b 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp @@ -14,7 +14,7 @@ #include "DIE.h" #include "DwarfPrinter.h" #include "llvm/CodeGen/AsmPrinter.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Support/ErrorHandling.h" #include <ostream> @@ -224,8 +224,8 @@ unsigned DIEInteger::SizeOf(const TargetData *TD, unsigned Form) const { case dwarf::DW_FORM_data4: return sizeof(int32_t); case dwarf::DW_FORM_ref8: // Fall thru case dwarf::DW_FORM_data8: return sizeof(int64_t); - case dwarf::DW_FORM_udata: return TargetAsmInfo::getULEB128Size(Integer); - case dwarf::DW_FORM_sdata: return TargetAsmInfo::getSLEB128Size(Integer); + case dwarf::DW_FORM_udata: return MCAsmInfo::getULEB128Size(Integer); + case dwarf::DW_FORM_sdata: return MCAsmInfo::getSLEB128Size(Integer); default: llvm_unreachable("DIE Value form not supported yet"); break; } return 0; @@ -499,7 +499,7 @@ unsigned DIEBlock::SizeOf(const TargetData *TD, unsigned Form) const { case dwarf::DW_FORM_block1: return Size + sizeof(int8_t); case dwarf::DW_FORM_block2: return Size + sizeof(int16_t); case dwarf::DW_FORM_block4: return Size + sizeof(int32_t); - case dwarf::DW_FORM_block: return Size + TargetAsmInfo::getULEB128Size(Size); + case dwarf::DW_FORM_block: return Size + MCAsmInfo::getULEB128Size(Size); default: llvm_unreachable("Improper form for block"); break; } return 0; diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 66b340821cd..ca7ea6bc959 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -17,7 +17,7 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/MC/MCSection.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" @@ -224,7 +224,7 @@ DbgScope::~DbgScope() { } // end llvm namespace -DwarfDebug::DwarfDebug(raw_ostream &OS, AsmPrinter *A, const TargetAsmInfo *T) +DwarfDebug::DwarfDebug(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T) : Dwarf(OS, A, T, "dbg"), ModuleCU(0), AbbreviationsSet(InitAbbreviationsSetSize), Abbreviations(), ValuesSet(InitValuesSetSize), Values(), StringPool(), @@ -1794,7 +1794,7 @@ unsigned DwarfDebug::SizeAndOffsetDie(DIE *Die, unsigned Offset, bool Last) { Die->setOffset(Offset); // Start the size with the size of abbreviation code. - Offset += TargetAsmInfo::getULEB128Size(AbbrevNumber); + Offset += MCAsmInfo::getULEB128Size(AbbrevNumber); const SmallVector<DIEValue*, 32> &Values = Die->getValues(); const SmallVector<DIEAbbrevData, 8> &AbbrevData = Abbrev->getData(); diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h index 0844f609119..bd7cdf70b59 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h @@ -35,7 +35,7 @@ class DbgScope; class DbgConcreteScope; class MachineFrameInfo; class MachineModuleInfo; -class TargetAsmInfo; +class MCAsmInfo; class Timer; //===----------------------------------------------------------------------===// @@ -458,7 +458,7 @@ public: //===--------------------------------------------------------------------===// // Main entry points. // - DwarfDebug(raw_ostream &OS, AsmPrinter *A, const TargetAsmInfo *T); + DwarfDebug(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T); virtual ~DwarfDebug(); /// ShouldEmitDwarfDebug - Returns true if Dwarf debugging declarations should diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp index 81536894e09..cc575f5affd 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -18,7 +18,7 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineLocation.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" @@ -36,7 +36,7 @@ static TimerGroup &getDwarfTimerGroup() { } DwarfException::DwarfException(raw_ostream &OS, AsmPrinter *A, - const TargetAsmInfo *T) + const MCAsmInfo *T) : Dwarf(OS, A, T, "eh"), shouldEmitTable(false), shouldEmitMoves(false), shouldEmitTableModule(false), shouldEmitMovesModule(false), ExceptionTimer(0) { @@ -304,7 +304,7 @@ ComputeActionsTable(const SmallVectorImpl<const LandingPadInfo*> &LandingPads, for (std::vector<unsigned>::const_iterator I = FilterIds.begin(), E = FilterIds.end(); I != E; ++I) { FilterOffsets.push_back(Offset); - Offset -= TargetAsmInfo::getULEB128Size(*I); + Offset -= MCAsmInfo::getULEB128Size(*I); } FirstActions.reserve(LandingPads.size()); @@ -328,12 +328,12 @@ ComputeActionsTable(const SmallVectorImpl<const LandingPadInfo*> &LandingPads, const unsigned SizePrevIds = PrevLPI->TypeIds.size(); assert(Actions.size()); PrevAction = &Actions.back(); - SizeAction = TargetAsmInfo::getSLEB128Size(PrevAction->NextAction) + - TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + SizeAction = MCAsmInfo::getSLEB128Size(PrevAction->NextAction) + + MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); for (unsigned j = NumShared; j != SizePrevIds; ++j) { SizeAction -= - TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); SizeAction += -PrevAction->NextAction; PrevAction = PrevAction->Previous; } @@ -344,10 +344,10 @@ ComputeActionsTable(const SmallVectorImpl<const LandingPadInfo*> &LandingPads, int TypeID = TypeIds[J]; assert(-1 - TypeID < (int)FilterOffsets.size() && "Unknown filter id!"); int ValueForTypeID = TypeID < 0 ? FilterOffsets[-1 - TypeID] : TypeID; - unsigned SizeTypeID = TargetAsmInfo::getSLEB128Size(ValueForTypeID); + unsigned SizeTypeID = MCAsmInfo::getSLEB128Size(ValueForTypeID); int NextAction = SizeAction ? -(SizeAction + SizeTypeID) : 0; - SizeAction = SizeTypeID + TargetAsmInfo::getSLEB128Size(NextAction); + SizeAction = SizeTypeID + MCAsmInfo::getSLEB128Size(NextAction); SizeSiteActions += SizeAction; ActionEntry Action = { ValueForTypeID, NextAction, PrevAction }; @@ -556,22 +556,22 @@ void DwarfException::EmitExceptionTable() { SizeSites = CallSites.size() * (SiteStartSize + SiteLengthSize + LandingPadSize); for (unsigned i = 0, e = CallSites.size(); i < e; ++i) { - SizeSites += TargetAsmInfo::getULEB128Size(CallSites[i].Action); + SizeSites += MCAsmInfo::getULEB128Size(CallSites[i].Action); if (TAI->getExceptionHandlingType() == ExceptionHandling::SjLj) - SizeSites += TargetAsmInfo::getULEB128Size(i); + SizeSites += MCAsmInfo::getULEB128Size(i); } // Type infos. const unsigned TypeInfoSize = TD->getPointerSize(); // DW_EH_PE_absptr unsigned SizeTypes = TypeInfos.size() * TypeInfoSize; unsigned TypeOffset = sizeof(int8_t) + // Call site format - TargetAsmInfo::getULEB128Size(SizeSites) + // Call-site table length + MCAsmInfo::getULEB128Size(SizeSites) + // Call-site table length SizeSites + SizeActions + SizeTypes; unsigned TotalSize = sizeof(int8_t) + // LPStart format sizeof(int8_t) + // TType format (HaveTTData ? - TargetAsmInfo::getULEB128Size(TypeOffset) : 0) + // TType base offset + MCAsmInfo::getULEB128Size(TypeOffset) : 0) + // TType base offset TypeOffset; unsigned SizeAlign = (4 - TotalSize) & 3; diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.h b/llvm/lib/CodeGen/AsmPrinter/DwarfException.h index e165df4693d..5f4fda75028 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.h +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.h @@ -24,7 +24,7 @@ namespace llvm { struct LandingPadInfo; class MachineModuleInfo; -class TargetAsmInfo; +class MCAsmInfo; class Timer; class raw_ostream; @@ -164,7 +164,7 @@ public: //===--------------------------------------------------------------------===// // Main entry points. // - DwarfException(raw_ostream &OS, AsmPrinter *A, const TargetAsmInfo *T); + DwarfException(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T); virtual ~DwarfException(); /// BeginModule - Emit all exception information that should come prior to the diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp index cc05b53626a..1c72f5ae681 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp @@ -19,14 +19,14 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/Support/Dwarf.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetRegisterInfo.h" using namespace llvm; -Dwarf::Dwarf(raw_ostream &OS, AsmPrinter *A, const TargetAsmInfo *T, +Dwarf::Dwarf(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T, const char *flavor) : O(OS), Asm(A), TAI(T), TD(Asm->TM.getTargetData()), RI(Asm->TM.getRegisterInfo()), M(NULL), MF(NULL), MMI(NULL), diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h index 6e75992cb07..490544b340a 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.h @@ -25,7 +25,7 @@ namespace llvm { class MachineFunction; class MachineModuleInfo; class Module; - class TargetAsmInfo; + class MCAsmInfo; class TargetData; class TargetRegisterInfo; @@ -45,7 +45,7 @@ namespace llvm { /// TAI - Target asm information. /// - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; /// TD - Target data. /// @@ -80,7 +80,7 @@ namespace llvm { /// unsigned SetCounter; - Dwarf(raw_ostream &OS, AsmPrinter *A, const TargetAsmInfo *T, + Dwarf(raw_ostream &OS, AsmPrinter *A, const MCAsmInfo *T, const char *flavor); public: //===------------------------------------------------------------------===// @@ -88,7 +88,7 @@ namespace llvm { // const AsmPrinter *getAsm() const { return Asm; } MachineModuleInfo *getMMI() const { return MMI; } - const TargetAsmInfo *getTargetAsmInfo() const { return TAI; } + const MCAsmInfo *getMCAsmInfo() const { return TAI; } const TargetData *getTargetData() const { return TD; } void PrintRelDirective(bool Force32Bit = false, diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfWriter.cpp index fac1081eece..440b91c89ee 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfWriter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfWriter.cpp @@ -39,7 +39,7 @@ DwarfWriter::~DwarfWriter() { void DwarfWriter::BeginModule(Module *M, MachineModuleInfo *MMI, raw_ostream &OS, AsmPrinter *A, - const TargetAsmInfo *T) { + const MCAsmInfo *T) { DE = new DwarfException(OS, A, T); DD = new DwarfDebug(OS, A, T); DE->BeginModule(M, MMI); diff --git a/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp index af3bbc96e5a..fac3db2a46f 100644 --- a/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp @@ -16,7 +16,7 @@ #include "llvm/CodeGen/GCMetadataPrinter.h" #include "llvm/Module.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetMachine.h" @@ -30,10 +30,10 @@ namespace { class VISIBILITY_HIDDEN OcamlGCMetadataPrinter : public GCMetadataPrinter { public: void beginAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); + const MCAsmInfo &TAI); void finishAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI); + const MCAsmInfo &TAI); }; } @@ -44,7 +44,7 @@ Y("ocaml", "ocaml 3.10-compatible collector"); void llvm::linkOcamlGCPrinter() { } static void EmitCamlGlobal(const Module &M, raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI, const char *Id) { + const MCAsmInfo &TAI, const char *Id) { const std::string &MId = M.getModuleIdentifier(); std::string Mangled; @@ -64,7 +64,7 @@ static void EmitCamlGlobal(const Module &M, raw_ostream &OS, AsmPrinter &AP, } void OcamlGCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { + const MCAsmInfo &TAI) { AP.OutStreamer.SwitchSection(AP.getObjFileLowering().getTextSection()); EmitCamlGlobal(getModule(), OS, AP, TAI, "code_begin"); @@ -89,7 +89,7 @@ void OcamlGCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP, /// either condition is detected in a function which uses the GC. /// void OcamlGCMetadataPrinter::finishAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { + const MCAsmInfo &TAI) { const char *AddressDirective; int AddressAlignLog; if (AP.TM.getTargetData()->getPointerSize() == sizeof(int32_t)) { diff --git a/llvm/lib/CodeGen/ELFCodeEmitter.cpp b/llvm/lib/CodeGen/ELFCodeEmitter.cpp index b769e70ed2d..a6429f70001 100644 --- a/llvm/lib/CodeGen/ELFCodeEmitter.cpp +++ b/llvm/lib/CodeGen/ELFCodeEmitter.cpp @@ -23,7 +23,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetELFWriterInfo.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" diff --git a/llvm/lib/CodeGen/ELFWriter.cpp b/llvm/lib/CodeGen/ELFWriter.cpp index 55c35a46bf6..f2b45cd7c6c 100644 --- a/llvm/lib/CodeGen/ELFWriter.cpp +++ b/llvm/lib/CodeGen/ELFWriter.cpp @@ -44,7 +44,7 @@ #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCSectionELF.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetELFWriterInfo.h" #include "llvm/Target/TargetLowering.h" @@ -80,7 +80,7 @@ ELFWriter::ELFWriter(raw_ostream &o, TargetMachine &tm) isLittleEndian(TM.getTargetData()->isLittleEndian()), ElfHdr(isLittleEndian, is64Bit) { - TAI = TM.getTargetAsmInfo(); + TAI = TM.getMCAsmInfo(); TEW = TM.getELFWriterInfo(); // Create the object code emitter object for this target. diff --git a/llvm/lib/CodeGen/ELFWriter.h b/llvm/lib/CodeGen/ELFWriter.h index 2f8f625d967..1e438929c0c 100644 --- a/llvm/lib/CodeGen/ELFWriter.h +++ b/llvm/lib/CodeGen/ELFWriter.h @@ -32,7 +32,7 @@ namespace llvm { class MachineCodeEmitter; class MachineConstantPoolEntry; class ObjectCodeEmitter; - class TargetAsmInfo; + class MCAsmInfo; class TargetELFWriterInfo; class TargetLoweringObjectFile; class raw_ostream; @@ -88,7 +88,7 @@ namespace llvm { /// TAI - Target Asm Info, provide information about section names for /// globals and other target specific stuff. - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; //===------------------------------------------------------------------===// // Properties inferred automatically from the target machine. diff --git a/llvm/lib/CodeGen/GCMetadataPrinter.cpp b/llvm/lib/CodeGen/GCMetadataPrinter.cpp index 5a5ef84fa4e..d1e43d8e924 100644 --- a/llvm/lib/CodeGen/GCMetadataPrinter.cpp +++ b/llvm/lib/CodeGen/GCMetadataPrinter.cpp @@ -20,11 +20,11 @@ GCMetadataPrinter::GCMetadataPrinter() { } GCMetadataPrinter::~GCMetadataPrinter() { } void GCMetadataPrinter::beginAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { + const MCAsmInfo &TAI) { // Default is no action. } void GCMetadataPrinter::finishAssembly(raw_ostream &OS, AsmPrinter &AP, - const TargetAsmInfo &TAI) { + const MCAsmInfo &TAI) { // Default is no action. } diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp index 911e9a13ef3..adce1f30b36 100644 --- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp +++ b/llvm/lib/CodeGen/LLVMTargetMachine.cpp @@ -20,7 +20,7 @@ #include "llvm/CodeGen/GCStrategy.h" #include "llvm/CodeGen/MachineFunctionAnalysis.h" #include "llvm/Target/TargetOptions.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/CommandLine.h" @@ -108,7 +108,7 @@ bool LLVMTargetMachine::addAssemblyEmitter(PassManagerBase &PM, bool Verbose, formatted_raw_ostream &Out) { FunctionPass *Printer = - getTarget().createAsmPrinter(Out, *this, getTargetAsmInfo(), Verbose); + getTarget().createAsmPrinter(Out, *this, getMCAsmInfo(), Verbose); if (!Printer) return true; @@ -239,7 +239,7 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, // Turn exception handling constructs into something the code generators can // handle. - switch (getTargetAsmInfo()->getExceptionHandlingType()) + switch (getMCAsmInfo()->getExceptionHandlingType()) { case ExceptionHandling::SjLj: // SjLj piggy-backs on dwarf for this bit. The cleanups done apply to both diff --git a/llvm/lib/CodeGen/MachO.h b/llvm/lib/CodeGen/MachO.h index 247b4a6c0c4..cf8bbbf8fa6 100644 --- a/llvm/lib/CodeGen/MachO.h +++ b/llvm/lib/CodeGen/MachO.h @@ -21,7 +21,7 @@ namespace llvm { class GlobalValue; -class TargetAsmInfo; +class MCAsmInfo; /// MachOSym - This struct contains information about each symbol that is /// added to logical symbol table for the module. This is eventually @@ -68,7 +68,7 @@ struct MachOSym { }; MachOSym(const GlobalValue *gv, std::string name, uint8_t sect, - const TargetAsmInfo *TAI); + const MCAsmInfo *TAI); struct SymCmp { // FIXME: this does not appear to be sorting 'f' after 'F' diff --git a/llvm/lib/CodeGen/MachOCodeEmitter.cpp b/llvm/lib/CodeGen/MachOCodeEmitter.cpp index f8852dc4515..f87d1eb8a23 100644 --- a/llvm/lib/CodeGen/MachOCodeEmitter.cpp +++ b/llvm/lib/CodeGen/MachOCodeEmitter.cpp @@ -17,7 +17,7 @@ #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineJumpTableInfo.h" #include "llvm/CodeGen/MachineRelocation.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Support/ErrorHandling.h" @@ -35,7 +35,7 @@ MachOCodeEmitter::MachOCodeEmitter(MachOWriter &mow, MachOSection &mos) : ObjectCodeEmitter(&mos), MOW(mow), TM(MOW.TM) { is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64; isLittleEndian = TM.getTargetData()->isLittleEndian(); - TAI = TM.getTargetAsmInfo(); + TAI = TM.getMCAsmInfo(); } /// startFunction - This callback is invoked when a new machine function is diff --git a/llvm/lib/CodeGen/MachOCodeEmitter.h b/llvm/lib/CodeGen/MachOCodeEmitter.h index 96ba68f1dbf..0e1a0ec19b7 100644 --- a/llvm/lib/CodeGen/MachOCodeEmitter.h +++ b/llvm/lib/CodeGen/MachOCodeEmitter.h @@ -30,7 +30,7 @@ class MachOCodeEmitter : public ObjectCodeEmitter { /// machine directly, indicating what header values and flags to set. bool is64Bit, isLittleEndian; - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; /// Relocations - These are the relocations that the function needs, as /// emitted. diff --git a/llvm/lib/CodeGen/MachOWriter.cpp b/llvm/lib/CodeGen/MachOWriter.cpp index 0ce9044e858..6b7441e1656 100644 --- a/llvm/lib/CodeGen/MachOWriter.cpp +++ b/llvm/lib/CodeGen/MachOWriter.cpp @@ -29,7 +29,7 @@ #include "llvm/DerivedTypes.h" #include "llvm/Module.h" #include "llvm/PassManager.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetMachOWriterInfo.h" @@ -61,7 +61,7 @@ MachOWriter::MachOWriter(raw_ostream &o, TargetMachine &tm) is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64; isLittleEndian = TM.getTargetData()->isLittleEndian(); - TAI = TM.getTargetAsmInfo(); + TAI = TM.getMCAsmInfo(); // Create the machine code emitter object for this target. MachOCE = new MachOCodeEmitter(*this, *getTextSection(true)); @@ -743,7 +743,7 @@ void MachOWriter::InitMem(const Constant *C, uintptr_t Offset, //===----------------------------------------------------------------------===// MachOSym::MachOSym(const GlobalValue *gv, std::string name, uint8_t sect, - const TargetAsmInfo *TAI) : + const MCAsmInfo *TAI) : GV(gv), n_strx(0), n_type(sect == NO_SECT ? N_UNDF : N_SECT), n_sect(sect), n_desc(0), n_value(0) { diff --git a/llvm/lib/CodeGen/MachOWriter.h b/llvm/lib/CodeGen/MachOWriter.h index 9d8e9d450ba..0d6f1328f43 100644 --- a/llvm/lib/CodeGen/MachOWriter.h +++ b/llvm/lib/CodeGen/MachOWriter.h @@ -31,7 +31,7 @@ namespace llvm { struct MachOSym; class TargetData; class TargetMachine; - class TargetAsmInfo; + class MCAsmInfo; class ObjectCodeEmitter; class OutputBuffer; class raw_ostream; @@ -78,7 +78,7 @@ namespace llvm { bool is64Bit, isLittleEndian; // Target Asm Info - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; /// Header - An instance of MachOHeader that we will update while we build /// the file, and then emit during finalization. diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 6fcc3fdcd0d..e60a9455808 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Target/TargetLowering.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetMachine.h" @@ -530,7 +530,7 @@ TargetLowering::TargetLowering(TargetMachine &tm,TargetLoweringObjectFile *tlof) InitLibcallCallingConvs(LibcallCallingConvs); // Tell Legalize whether the assembler supports DEBUG_LOC. - const TargetAsmInfo *TASM = TM.getTargetAsmInfo(); + const MCAsmInfo *TASM = TM.getMCAsmInfo(); if (!TASM || !TASM->hasDotLocAndDotFile()) setOperationAction(ISD::DEBUG_LOC, MVT::Other, Expand); } diff --git a/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp index a3a050635fe..f7fb983e1ac 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp @@ -22,7 +22,7 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/ExecutionEngine/JITMemoryManager.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetFrameInfo.h" @@ -40,7 +40,7 @@ unsigned char* JITDwarfEmitter::EmitDwarfTable(MachineFunction& F, unsigned char* EndFunction) { const TargetMachine& TM = F.getTarget(); TD = TM.getTargetData(); - needsIndirectEncoding = TM.getTargetAsmInfo()->getNeedsIndirectEncoding(); + needsIndirectEncoding = TM.getMCAsmInfo()->getNeedsIndirectEncoding(); stackGrowthDirection = TM.getFrameInfo()->getStackGrowthDirection(); RI = TM.getRegisterInfo(); JCE = &jce; @@ -242,7 +242,7 @@ unsigned char* JITDwarfEmitter::EmitExceptionTable(MachineFunction* MF, for(std::vector<unsigned>::const_iterator I = FilterIds.begin(), E = FilterIds.end(); I != E; ++I) { FilterOffsets.push_back(Offset); - Offset -= TargetAsmInfo::getULEB128Size(*I); + Offset -= MCAsmInfo::getULEB128Size(*I); } // Compute the actions table and gather the first action index for each @@ -267,10 +267,10 @@ unsigned char* JITDwarfEmitter::EmitExceptionTable(MachineFunction* MF, const unsigned SizePrevIds = LandingPads[i-1]->TypeIds.size(); assert(Actions.size()); PrevAction = &Actions.back(); - SizeAction = TargetAsmInfo::getSLEB128Size(PrevAction->NextAction) + - TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + SizeAction = MCAsmInfo::getSLEB128Size(PrevAction->NextAction) + + MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); for (unsigned j = NumShared; j != SizePrevIds; ++j) { - SizeAction -= TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + SizeAction -= MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); SizeAction += -PrevAction->NextAction; PrevAction = PrevAction->Previous; } @@ -281,10 +281,10 @@ unsigned char* JITDwarfEmitter::EmitExceptionTable(MachineFunction* MF, int TypeID = TypeIds[I]; assert(-1-TypeID < (int)FilterOffsets.size() && "Unknown filter id!"); int ValueForTypeID = TypeID < 0 ? FilterOffsets[-1 - TypeID] : TypeID; - unsigned SizeTypeID = TargetAsmInfo::getSLEB128Size(ValueForTypeID); + unsigned SizeTypeID = MCAsmInfo::getSLEB128Size(ValueForTypeID); int NextAction = SizeAction ? -(SizeAction + SizeTypeID) : 0; - SizeAction = SizeTypeID + TargetAsmInfo::getSLEB128Size(NextAction); + SizeAction = SizeTypeID + MCAsmInfo::getSLEB128Size(NextAction); SizeSiteActions += SizeAction; ActionEntry Action = {ValueForTypeID, NextAction, PrevAction}; @@ -387,13 +387,13 @@ unsigned char* JITDwarfEmitter::EmitExceptionTable(MachineFunction* MF, sizeof(int32_t) + // Site length. sizeof(int32_t)); // Landing pad. for (unsigned i = 0, e = CallSites.size(); i < e; ++i) - SizeSites += TargetAsmInfo::getULEB128Size(CallSites[i].Action); + SizeSites += MCAsmInfo::getULEB128Size(CallSites[i].Action); unsigned SizeTypes = TypeInfos.size() * TD->getPointerSize(); unsigned TypeOffset = sizeof(int8_t) + // Call site format // Call-site table length - TargetAsmInfo::getULEB128Size(SizeSites) + + MCAsmInfo::getULEB128Size(SizeSites) + SizeSites + SizeActions + SizeTypes; // Begin the exception table. @@ -607,7 +607,7 @@ unsigned JITDwarfEmitter::GetDwarfTableSizeInBytes(MachineFunction& F, unsigned char* EndFunction) { const TargetMachine& TM = F.getTarget(); TD = TM.getTargetData(); - needsIndirectEncoding = TM.getTargetAsmInfo()->getNeedsIndirectEncoding(); + needsIndirectEncoding = TM.getMCAsmInfo()->getNeedsIndirectEncoding(); stackGrowthDirection = TM.getFrameInfo()->getStackGrowthDirection(); RI = TM.getRegisterInfo(); JCE = &jce; @@ -645,10 +645,10 @@ JITDwarfEmitter::GetEHFrameSizeInBytes(const Function* Personality, // If there is a personality and landing pads then point to the language // specific data area in the exception table. if (MMI->getPersonalityIndex()) { - FinalSize += TargetAsmInfo::getULEB128Size(4); + FinalSize += MCAsmInfo::getULEB128Size(4); FinalSize += PointerSize; } else { - FinalSize += TargetAsmInfo::getULEB128Size(0); + FinalSize += MCAsmInfo::getULEB128Size(0); } // Indicate locations of function specific callee saved registers in @@ -676,24 +676,24 @@ unsigned JITDwarfEmitter::GetCommonEHFrameSizeInBytes(const Function* Personalit FinalSize += 4; FinalSize += 1; FinalSize += Personality ? 5 : 3; // "zPLR" or "zR" - FinalSize += TargetAsmInfo::getULEB128Size(1); - FinalSize += TargetAsmInfo::getSLEB128Size(stackGrowth); + FinalSize += MCAsmInfo::getULEB128Size(1); + FinalSize += MCAsmInfo::getSLEB128Size(stackGrowth); FinalSize += 1; if (Personality) { - FinalSize += TargetAsmInfo::getULEB128Size(7); + FinalSize += MCAsmInfo::getULEB128Size(7); // Encoding FinalSize+= 1; //Personality FinalSize += PointerSize; - FinalSize += TargetAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); - FinalSize += TargetAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); + FinalSize += MCAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); + FinalSize += MCAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); } else { - FinalSize += TargetAsmInfo::getULEB128Size(1); - FinalSize += TargetAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); + FinalSize += MCAsmInfo::getULEB128Size(1); + FinalSize += MCAsmInfo::getULEB128Size(dwarf::DW_EH_PE_pcrel); } std::vector<MachineMove> Moves; @@ -745,12 +745,12 @@ JITDwarfEmitter::GetFrameMovesSizeInBytes(intptr_t BaseLabelPtr, } else { ++FinalSize; unsigned RegNum = RI->getDwarfRegNum(Src.getReg(), true); - FinalSize += TargetAsmInfo::getULEB128Size(RegNum); + FinalSize += MCAsmInfo::getULEB128Size(RegNum); } int Offset = -Src.getOffset(); - FinalSize += TargetAsmInfo::getULEB128Size(Offset); + FinalSize += MCAsmInfo::getULEB128Size(Offset); } else { llvm_unreachable("Machine move no supported yet."); } @@ -759,7 +759,7 @@ JITDwarfEmitter::GetFrameMovesSizeInBytes(intptr_t BaseLabelPtr, if (Dst.isReg()) { ++FinalSize; unsigned RegNum = RI->getDwarfRegNum(Dst.getReg(), true); - FinalSize += TargetAsmInfo::getULEB128Size(RegNum); + FinalSize += MCAsmInfo::getULEB128Size(RegNum); } else { llvm_unreachable("Machine move no supported yet."); } @@ -769,15 +769,15 @@ JITDwarfEmitter::GetFrameMovesSizeInBytes(intptr_t BaseLabelPtr, if (Offset < 0) { ++FinalSize; - FinalSize += TargetAsmInfo::getULEB128Size(Reg); - FinalSize += TargetAsmInfo::getSLEB128Size(Offset); + FinalSize += MCAsmInfo::getULEB128Size(Reg); + FinalSize += MCAsmInfo::getSLEB128Size(Offset); } else if (Reg < 64) { ++FinalSize; - FinalSize += TargetAsmInfo::getULEB128Size(Offset); + FinalSize += MCAsmInfo::getULEB128Size(Offset); } else { ++FinalSize; - FinalSize += TargetAsmInfo::getULEB128Size(Reg); - FinalSize += TargetAsmInfo::getULEB128Size(Offset); + FinalSize += MCAsmInfo::getULEB128Size(Reg); + FinalSize += MCAsmInfo::getULEB128Size(Offset); } } } @@ -820,7 +820,7 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { for(std::vector<unsigned>::const_iterator I = FilterIds.begin(), E = FilterIds.end(); I != E; ++I) { FilterOffsets.push_back(Offset); - Offset -= TargetAsmInfo::getULEB128Size(*I); + Offset -= MCAsmInfo::getULEB128Size(*I); } // Compute the actions table and gather the first action index for each @@ -845,10 +845,10 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { const unsigned SizePrevIds = LandingPads[i-1]->TypeIds.size(); assert(Actions.size()); PrevAction = &Actions.back(); - SizeAction = TargetAsmInfo::getSLEB128Size(PrevAction->NextAction) + - TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + SizeAction = MCAsmInfo::getSLEB128Size(PrevAction->NextAction) + + MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); for (unsigned j = NumShared; j != SizePrevIds; ++j) { - SizeAction -= TargetAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); + SizeAction -= MCAsmInfo::getSLEB128Size(PrevAction->ValueForTypeID); SizeAction += -PrevAction->NextAction; PrevAction = PrevAction->Previous; } @@ -859,10 +859,10 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { int TypeID = TypeIds[I]; assert(-1-TypeID < (int)FilterOffsets.size() && "Unknown filter id!"); int ValueForTypeID = TypeID < 0 ? FilterOffsets[-1 - TypeID] : TypeID; - unsigned SizeTypeID = TargetAsmInfo::getSLEB128Size(ValueForTypeID); + unsigned SizeTypeID = MCAsmInfo::getSLEB128Size(ValueForTypeID); int NextAction = SizeAction ? -(SizeAction + SizeTypeID) : 0; - SizeAction = SizeTypeID + TargetAsmInfo::getSLEB128Size(NextAction); + SizeAction = SizeTypeID + MCAsmInfo::getSLEB128Size(NextAction); SizeSiteActions += SizeAction; ActionEntry Action = {ValueForTypeID, NextAction, PrevAction}; @@ -965,18 +965,18 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { sizeof(int32_t) + // Site length. sizeof(int32_t)); // Landing pad. for (unsigned i = 0, e = CallSites.size(); i < e; ++i) - SizeSites += TargetAsmInfo::getULEB128Size(CallSites[i].Action); + SizeSites += MCAsmInfo::getULEB128Size(CallSites[i].Action); unsigned SizeTypes = TypeInfos.size() * TD->getPointerSize(); unsigned TypeOffset = sizeof(int8_t) + // Call site format // Call-site table length - TargetAsmInfo::getULEB128Size(SizeSites) + + MCAsmInfo::getULEB128Size(SizeSites) + SizeSites + SizeActions + SizeTypes; unsigned TotalSize = sizeof(int8_t) + // LPStart format sizeof(int8_t) + // TType format - TargetAsmInfo::getULEB128Size(TypeOffset) + // TType base offset + MCAsmInfo::getULEB128Size(TypeOffset) + // TType base offset TypeOffset; unsigned SizeAlign = (4 - TotalSize) & 3; @@ -1014,7 +1014,7 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { // Asm->EOL("Landing pad"); FinalSize += PointerSize; - FinalSize += TargetAsmInfo::getULEB128Size(S.Action); + FinalSize += MCAsmInfo::getULEB128Size(S.Action); // Asm->EOL("Action"); } @@ -1023,9 +1023,9 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { ActionEntry &Action = Actions[I]; //Asm->EOL("TypeInfo index"); - FinalSize += TargetAsmInfo::getSLEB128Size(Action.ValueForTypeID); + FinalSize += MCAsmInfo::getSLEB128Size(Action.ValueForTypeID); //Asm->EOL("Next action"); - FinalSize += TargetAsmInfo::getSLEB128Size(Action.NextAction); + FinalSize += MCAsmInfo::getSLEB128Size(Action.NextAction); } // Emit the type ids. @@ -1037,7 +1037,7 @@ JITDwarfEmitter::GetExceptionTableSizeInBytes(MachineFunction* MF) const { // Emit the filter typeids. for (unsigned j = 0, M = FilterIds.size(); j < M; ++j) { unsigned TypeID = FilterIds[j]; - FinalSize += TargetAsmInfo::getULEB128Size(TypeID); + FinalSize += MCAsmInfo::getULEB128Size(TypeID); //Asm->EOL("Filter TypeInfo index"); } diff --git a/llvm/lib/MC/MCAsmStreamer.cpp b/llvm/lib/MC/MCAsmStreamer.cpp index 655137d580c..32460c2b855 100644 --- a/llvm/lib/MC/MCAsmStreamer.cpp +++ b/llvm/lib/MC/MCAsmStreamer.cpp @@ -14,7 +14,7 @@ #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCSymbol.h" #include "llvm/MC/MCValue.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" @@ -24,10 +24,10 @@ namespace { class MCAsmStreamer : public MCStreamer { raw_ostream &OS; - const TargetAsmInfo &TAI; + const MCAsmInfo &TAI; AsmPrinter *Printer; public: - MCAsmStreamer(MCContext &Context, raw_ostream &_OS, const TargetAsmInfo &tai, + MCAsmStreamer(MCContext &Context, raw_ostream &_OS, const MCAsmInfo &tai, AsmPrinter *_AsmPrinter) : MCStreamer(Context), OS(_OS), TAI(tai), Printer(_AsmPrinter) {} ~MCAsmStreamer() {} @@ -314,6 +314,6 @@ void MCAsmStreamer::Finish() { } MCStreamer *llvm::createAsmStreamer(MCContext &Context, raw_ostream &OS, - const TargetAsmInfo &TAI, AsmPrinter *AP) { + const MCAsmInfo &TAI, AsmPrinter *AP) { return new MCAsmStreamer(Context, OS, TAI, AP); } diff --git a/llvm/lib/MC/MCSection.cpp b/llvm/lib/MC/MCSection.cpp index 3e837635f22..1f2896b7ccf 100644 --- a/llvm/lib/MC/MCSection.cpp +++ b/llvm/lib/MC/MCSection.cpp @@ -9,7 +9,7 @@ #include "llvm/MC/MCSection.h" #include "llvm/MC/MCContext.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; @@ -29,7 +29,7 @@ Create(const StringRef &Name, bool IsDirective, SectionKind K, MCContext &Ctx) { return new (Ctx) MCSectionCOFF(Name, IsDirective, K); } -void MCSectionCOFF::PrintSwitchToSection(const TargetAsmInfo &TAI, +void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const { if (isDirective()) { diff --git a/llvm/lib/MC/MCSectionELF.cpp b/llvm/lib/MC/MCSectionELF.cpp index fe0fcb3a064..96f8429ad92 100644 --- a/llvm/lib/MC/MCSectionELF.cpp +++ b/llvm/lib/MC/MCSectionELF.cpp @@ -10,7 +10,7 @@ #include "llvm/MC/MCSectionELF.h" #include "llvm/MC/MCContext.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" using namespace llvm; @@ -23,7 +23,7 @@ Create(const StringRef &Section, unsigned Type, unsigned Flags, // ShouldOmitSectionDirective - Decides whether a '.section' directive // should be printed before the section name bool MCSectionELF::ShouldOmitSectionDirective(const char *Name, - const TargetAsmInfo &TAI) const { + const MCAsmInfo &TAI) const { // FIXME: Does .section .bss/.data/.text work everywhere?? if (strcmp(Name, ".text") == 0 || @@ -44,7 +44,7 @@ bool MCSectionELF::ShouldPrintSectionType(unsigned Ty) const { return true; } -void MCSectionELF::PrintSwitchToSection(const TargetAsmInfo &TAI, +void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const { if (ShouldOmitSectionDirective(SectionName.c_str(), TAI)) { diff --git a/llvm/lib/MC/MCSectionMachO.cpp b/llvm/lib/MC/MCSectionMachO.cpp index 0cdffc85e83..5615398737c 100644 --- a/llvm/lib/MC/MCSectionMachO.cpp +++ b/llvm/lib/MC/MCSectionMachO.cpp @@ -72,7 +72,7 @@ Create(const StringRef &Segment, const StringRef &Section, Reserved2, K); } -void MCSectionMachO::PrintSwitchToSection(const TargetAsmInfo &TAI, +void MCSectionMachO::PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const { OS << "\t.section\t" << getSegmentName() << ',' << getSectionName(); diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp index 44e5c687b28..2362e776210 100644 --- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -21,7 +21,7 @@ #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineJumpTableInfo.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" using namespace llvm; @@ -405,7 +405,7 @@ static unsigned getNumJTEntries(const std::vector<MachineJumpTableEntry> &JT, unsigned ARMBaseInstrInfo::GetInstSizeInBytes(const MachineInstr *MI) const { const MachineBasicBlock &MBB = *MI->getParent(); const MachineFunction *MF = MBB.getParent(); - const TargetAsmInfo *TAI = MF->getTarget().getTargetAsmInfo(); + const MCAsmInfo *TAI = MF->getTarget().getMCAsmInfo(); // Basic size info comes from the TSFlags field. const TargetInstrDesc &TID = MI->getDesc(); diff --git a/llvm/lib/Target/ARM/ARMInstrInfo.cpp b/llvm/lib/Target/ARM/ARMInstrInfo.cpp index 71fce8c6ed6..4c92891c82b 100644 --- a/llvm/lib/Target/ARM/ARMInstrInfo.cpp +++ b/llvm/lib/Target/ARM/ARMInstrInfo.cpp @@ -21,7 +21,7 @@ #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineJumpTableInfo.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/CommandLine.h" using namespace llvm; diff --git a/llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp b/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp index 0c3df82bfe2..ed6f6b2b398 100644 --- a/llvm/lib/Target/ARM/ARMTargetAsmInfo.cpp +++ b/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- ARMTargetAsmInfo.cpp - ARM asm properties ---------------*- C++ -*-===// +//===-- ARMMCAsmInfo.cpp - ARM asm properties -------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,11 +7,11 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the ARMTargetAsmInfo properties. +// This file contains the declarations of the ARMMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "ARMTargetAsmInfo.h" +#include "ARMMCAsmInfo.h" using namespace llvm; static const char *const arm_asm_table[] = { @@ -40,7 +40,7 @@ static const char *const arm_asm_table[] = { 0,0 }; -ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo() { +ARMDarwinMCAsmInfo::ARMDarwinMCAsmInfo() { AsmTransCBE = arm_asm_table; Data64bitsDirective = 0; CommentString = "@"; @@ -52,7 +52,7 @@ ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo() { AbsoluteEHSectionOffsets = false; } -ARMELFTargetAsmInfo::ARMELFTargetAsmInfo() { +ARMELFMCAsmInfo::ARMELFMCAsmInfo() { AlignmentIsInBytes = false; Data64bitsDirective = 0; CommentString = "@"; diff --git a/llvm/lib/Target/ARM/ARMTargetAsmInfo.h b/llvm/lib/Target/ARM/ARMMCAsmInfo.h index 3fde8ba6307..e263ece1ac1 100644 --- a/llvm/lib/Target/ARM/ARMTargetAsmInfo.h +++ b/llvm/lib/Target/ARM/ARMMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- ARMTargetAsmInfo.h - ARM asm properties -------------*- C++ -*--====// +//=====-- ARMMCAsmInfo.h - ARM asm properties -------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,23 +7,23 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the ARMTargetAsmInfo class. +// This file contains the declaration of the ARMMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef LLVM_ARMTARGETASMINFO_H #define LLVM_ARMTARGETASMINFO_H -#include "llvm/Target/DarwinTargetAsmInfo.h" +#include "llvm/MC/MCAsmInfoDarwin.h" namespace llvm { - struct ARMDarwinTargetAsmInfo : public DarwinTargetAsmInfo { - explicit ARMDarwinTargetAsmInfo(); + struct ARMDarwinMCAsmInfo : public DarwinMCAsmInfo { + explicit ARMDarwinMCAsmInfo(); }; - struct ARMELFTargetAsmInfo : public TargetAsmInfo { - explicit ARMELFTargetAsmInfo(); + struct ARMELFMCAsmInfo : public MCAsmInfo { + explicit ARMELFMCAsmInfo(); }; } // namespace llvm diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index fdfa3a32e5a..ae5107aff2b 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "ARMTargetMachine.h" -#include "ARMTargetAsmInfo.h" +#include "ARMMCAsmInfo.h" #include "ARMFrameInfo.h" #include "ARM.h" #include "llvm/PassManager.h" @@ -27,14 +27,14 @@ static cl::opt<bool> DisableLdStOpti("disable-arm-loadstore-opti", cl::Hidden, static cl::opt<bool> DisableIfConversion("disable-arm-if-conversion",cl::Hidden, cl::desc("Disable if-conversion pass")); -static const TargetAsmInfo *createTargetAsmInfo(const Target &T, +static const MCAsmInfo *createMCAsmInfo(const Target &T, const StringRef &TT) { Triple TheTriple(TT); switch (TheTriple.getOS()) { case Triple::Darwin: - return new ARMDarwinTargetAsmInfo(); + return new ARMDarwinMCAsmInfo(); default: - return new ARMELFTargetAsmInfo(); + return new ARMELFMCAsmInfo(); } } @@ -45,8 +45,8 @@ extern "C" void LLVMInitializeARMTarget() { RegisterTargetMachine<ThumbTargetMachine> Y(TheThumbTarget); // Register the target asm info. - RegisterAsmInfoFn A(TheARMTarget, createTargetAsmInfo); - RegisterAsmInfoFn B(TheThumbTarget, createTargetAsmInfo); + RegisterAsmInfoFn A(TheARMTarget, createMCAsmInfo); + RegisterAsmInfoFn B(TheThumbTarget, createMCAsmInfo); } /// TargetMachine ctor - Create an ARM architecture model. diff --git a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index 4b0f92f6ce9..1b36b216437 100644 --- a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -29,7 +29,7 @@ #include "llvm/CodeGen/MachineJumpTableInfo.h" #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetMachine.h" @@ -111,7 +111,7 @@ namespace { bool InCPMode; public: explicit ARMAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), DW(0), AFI(NULL), MCP(NULL), InCPMode(false) { Subtarget = &TM.getSubtarget<ARMSubtarget>(); @@ -423,7 +423,7 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int OpNum, } static void printSOImm(formatted_raw_ostream &O, int64_t V, bool VerboseAsm, - const TargetAsmInfo *TAI) { + const MCAsmInfo *TAI) { // Break it up into two parts that make up a shifter immediate. V = ARM_AM::getSOImmVal(V); assert(V != -1 && "Not a valid so_imm value!"); diff --git a/llvm/lib/Target/Alpha/AlphaBranchSelector.cpp b/llvm/lib/Target/Alpha/AlphaBranchSelector.cpp index aca8ca73489..719ffaec3ea 100644 --- a/llvm/lib/Target/Alpha/AlphaBranchSelector.cpp +++ b/llvm/lib/Target/Alpha/AlphaBranchSelector.cpp @@ -17,7 +17,7 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/Support/Compiler.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" using namespace llvm; namespace { diff --git a/llvm/lib/Target/Alpha/AlphaTargetAsmInfo.cpp b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp index ebb89ecf526..b652a5305a0 100644 --- a/llvm/lib/Target/Alpha/AlphaTargetAsmInfo.cpp +++ b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- AlphaTargetAsmInfo.cpp - Alpha asm properties -----------*- C++ -*-===// +//===-- AlphaMCAsmInfo.cpp - Alpha asm properties ---------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,14 +7,14 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the AlphaTargetAsmInfo properties. +// This file contains the declarations of the AlphaMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "AlphaTargetAsmInfo.h" +#include "AlphaMCAsmInfo.h" using namespace llvm; -AlphaTargetAsmInfo::AlphaTargetAsmInfo(const Target &T, const StringRef &TT) { +AlphaMCAsmInfo::AlphaMCAsmInfo(const Target &T, const StringRef &TT) { AlignmentIsInBytes = false; PrivateGlobalPrefix = "$"; PICJumpTableDirective = ".gprel32"; diff --git a/llvm/lib/Target/Alpha/AlphaTargetAsmInfo.h b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.h index 20903c730f2..c27065d2842 100644 --- a/llvm/lib/Target/Alpha/AlphaTargetAsmInfo.h +++ b/llvm/lib/Target/Alpha/AlphaMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- AlphaTargetAsmInfo.h - Alpha asm properties ---------*- C++ -*--====// +//=====-- AlphaMCAsmInfo.h - Alpha asm properties -------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,21 +7,21 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the AlphaTargetAsmInfo class. +// This file contains the declaration of the AlphaMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef ALPHATARGETASMINFO_H #define ALPHATARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct AlphaTargetAsmInfo : public TargetAsmInfo { - explicit AlphaTargetAsmInfo(const Target &T, const StringRef &TT); + struct AlphaMCAsmInfo : public MCAsmInfo { + explicit AlphaMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp b/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp index 19218704a6f..b8bc13b6309 100644 --- a/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp +++ b/llvm/lib/Target/Alpha/AlphaTargetMachine.cpp @@ -12,7 +12,7 @@ #include "Alpha.h" #include "AlphaJITInfo.h" -#include "AlphaTargetAsmInfo.h" +#include "AlphaMCAsmInfo.h" #include "AlphaTargetMachine.h" #include "llvm/PassManager.h" #include "llvm/Support/FormattedStream.h" @@ -22,7 +22,7 @@ using namespace llvm; extern "C" void LLVMInitializeAlphaTarget() { // Register the target. RegisterTargetMachine<AlphaTargetMachine> X(TheAlphaTarget); - RegisterAsmInfo<AlphaTargetAsmInfo> Y(TheAlphaTarget); + RegisterAsmInfo<AlphaMCAsmInfo> Y(TheAlphaTarget); } AlphaTargetMachine::AlphaTargetMachine(const Target &T, const std::string &TT, diff --git a/llvm/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp b/llvm/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp index a19661d08d7..47701d1f0cf 100644 --- a/llvm/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp +++ b/llvm/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp @@ -22,7 +22,7 @@ #include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/DwarfWriter.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetRegistry.h" @@ -41,7 +41,7 @@ namespace { /// explicit AlphaAsmPrinter(formatted_raw_ostream &o, TargetMachine &tm, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(o, tm, T, V) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp b/llvm/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp index fd00ea5addd..1286e01d95b 100644 --- a/llvm/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp +++ b/llvm/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp @@ -24,7 +24,7 @@ #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetRegistry.h" @@ -40,7 +40,7 @@ namespace { class VISIBILITY_HIDDEN BlackfinAsmPrinter : public AsmPrinter { public: BlackfinAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *TAI, bool V) + const MCAsmInfo *TAI, bool V) : AsmPrinter(O, TM, TAI, V) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/Blackfin/BlackfinTargetAsmInfo.cpp b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp index 21087453efe..6d0f66cd7a5 100644 --- a/llvm/lib/Target/Blackfin/BlackfinTargetAsmInfo.cpp +++ b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- BlackfinTargetAsmInfo.cpp - Blackfin asm properties -----*- C++ -*-===// +//===-- BlackfinMCAsmInfo.cpp - Blackfin asm properties -------------------===// // // The LLVM Compiler Infrastructure // @@ -7,16 +7,15 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the BlackfinTargetAsmInfo properties. +// This file contains the declarations of the BlackfinMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "BlackfinTargetAsmInfo.h" +#include "BlackfinMCAsmInfo.h" using namespace llvm; -BlackfinTargetAsmInfo::BlackfinTargetAsmInfo(const Target &T, - const StringRef &TT) { +BlackfinMCAsmInfo::BlackfinMCAsmInfo(const Target &T, const StringRef &TT) { GlobalPrefix = "_"; CommentString = "//"; } diff --git a/llvm/lib/Target/Blackfin/BlackfinTargetAsmInfo.h b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.h index 8040f0fb212..0efc2952306 100644 --- a/llvm/lib/Target/Blackfin/BlackfinTargetAsmInfo.h +++ b/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.h @@ -1,4 +1,4 @@ -//===-- BlackfinTargetAsmInfo.h - Blackfin asm properties -----*- C++ -*--====// +//===-- BlackfinMCAsmInfo.h - Blackfin asm properties ---------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,21 +7,21 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the BlackfinTargetAsmInfo class. +// This file contains the declaration of the BlackfinMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef BLACKFINTARGETASMINFO_H #define BLACKFINTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct BlackfinTargetAsmInfo : public TargetAsmInfo { - explicit BlackfinTargetAsmInfo(const Target &T, const StringRef &TT); + struct BlackfinMCAsmInfo : public MCAsmInfo { + explicit BlackfinMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp b/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp index 4309a9be4d0..47ba2fe28f5 100644 --- a/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp +++ b/llvm/lib/Target/Blackfin/BlackfinTargetMachine.cpp @@ -12,7 +12,7 @@ #include "BlackfinTargetMachine.h" #include "Blackfin.h" -#include "BlackfinTargetAsmInfo.h" +#include "BlackfinMCAsmInfo.h" #include "llvm/PassManager.h" #include "llvm/Target/TargetRegistry.h" @@ -20,7 +20,7 @@ using namespace llvm; extern "C" void LLVMInitializeBlackfinTarget() { RegisterTargetMachine<BlackfinTargetMachine> X(TheBlackfinTarget); - RegisterAsmInfo<BlackfinTargetAsmInfo> Y(TheBlackfinTarget); + RegisterAsmInfo<BlackfinMCAsmInfo> Y(TheBlackfinTarget); } diff --git a/llvm/lib/Target/CBackend/CBackend.cpp b/llvm/lib/Target/CBackend/CBackend.cpp index f4418040e18..8099bb3e3b1 100644 --- a/llvm/lib/Target/CBackend/CBackend.cpp +++ b/llvm/lib/Target/CBackend/CBackend.cpp @@ -33,7 +33,7 @@ #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/Transforms/Scalar.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/Support/CallSite.h" @@ -86,7 +86,7 @@ namespace { Mangler *Mang; LoopInfo *LI; const Module *TheModule; - const TargetAsmInfo* TAsm; + const MCAsmInfo* TAsm; const TargetData* TD; std::map<const Type *, std::string> TypeNames; std::map<const ConstantFP *, unsigned> FPConstantMap; @@ -3239,7 +3239,7 @@ std::string CWriter::InterpretASMConstraint(InlineAsm::ConstraintInfo& c) { const char *const *table = 0; - // Grab the translation table from TargetAsmInfo if it exists. + // Grab the translation table from MCAsmInfo if it exists. if (!TAsm) { std::string Triple = TheModule->getTargetTriple(); if (Triple.empty()) diff --git a/llvm/lib/Target/COFFTargetAsmInfo.cpp b/llvm/lib/Target/COFFTargetAsmInfo.cpp index 87e85adcb43..7586eaceb63 100644 --- a/llvm/lib/Target/COFFTargetAsmInfo.cpp +++ b/llvm/lib/Target/COFFTargetAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- COFFTargetAsmInfo.cpp - COFF asm properties -------------*- C++ -*-===// +//===-- COFFMCAsmInfo.cpp - COFF asm properties -----------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,11 +12,11 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Target/COFFTargetAsmInfo.h" +#include "llvm/MC/MCAsmInfoCOFF.h" #include "llvm/ADT/SmallVector.h" using namespace llvm; -COFFTargetAsmInfo::COFFTargetAsmInfo() { +COFFMCAsmInfo::COFFMCAsmInfo() { GlobalPrefix = "_"; LCOMMDirective = "\t.lcomm\t"; COMMDirectiveTakesAlignment = false; diff --git a/llvm/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp b/llvm/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp index 399d4307309..82c0c2bc603 100644 --- a/llvm/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp +++ b/llvm/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp @@ -26,7 +26,7 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetOptions.h" @@ -53,7 +53,7 @@ namespace { std::set<std::string> FnStubs, GVStubs; public: explicit SPUAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) : + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V) {} virtual const char *getPassName() const { @@ -290,7 +290,7 @@ namespace { DwarfWriter *DW; public: explicit LinuxAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : SPUAsmPrinter(O, TM, T, V), DW(0) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/CellSPU/SPUTargetAsmInfo.cpp b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp index 4ae852df995..1c921ab87ff 100644 --- a/llvm/lib/Target/CellSPU/SPUTargetAsmInfo.cpp +++ b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- SPUTargetAsmInfo.cpp - Cell SPU asm properties ----------*- C++ -*-===// +//===-- SPUMCAsmInfo.cpp - Cell SPU asm properties ------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,14 +7,14 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the SPUTargetAsmInfo properties. +// This file contains the declarations of the SPUMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "SPUTargetAsmInfo.h" +#include "SPUMCAsmInfo.h" using namespace llvm; -SPULinuxTargetAsmInfo::SPULinuxTargetAsmInfo(const Target &T, const StringRef &TT) { +SPULinuxMCAsmInfo::SPULinuxMCAsmInfo(const Target &T, const StringRef &TT) { ZeroDirective = "\t.space\t"; SetDirective = "\t.set"; Data64bitsDirective = "\t.quad\t"; diff --git a/llvm/lib/Target/CellSPU/SPUTargetAsmInfo.h b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.h index b3c6bdaefd8..8d75ea84116 100644 --- a/llvm/lib/Target/CellSPU/SPUTargetAsmInfo.h +++ b/llvm/lib/Target/CellSPU/SPUMCAsmInfo.h @@ -1,4 +1,4 @@ -//===-- SPUTargetAsmInfo.h - Cell SPU asm properties -----------*- C++ -*--===// +//===-- SPUMCAsmInfo.h - Cell SPU asm properties ---------------*- C++ -*--===// // // The LLVM Compiler Infrastructure // @@ -7,21 +7,21 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the SPUTargetAsmInfo class. +// This file contains the declaration of the SPUMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef SPUTARGETASMINFO_H #define SPUTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct SPULinuxTargetAsmInfo : public TargetAsmInfo { - explicit SPULinuxTargetAsmInfo(const Target &T, const StringRef &TT); + struct SPULinuxMCAsmInfo : public MCAsmInfo { + explicit SPULinuxMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp b/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp index b904b9559d0..6500067849d 100644 --- a/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp +++ b/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp @@ -13,7 +13,7 @@ #include "SPU.h" #include "SPURegisterNames.h" -#include "SPUTargetAsmInfo.h" +#include "SPUMCAsmInfo.h" #include "SPUTargetMachine.h" #include "llvm/PassManager.h" #include "llvm/CodeGen/RegAllocRegistry.h" @@ -25,7 +25,7 @@ using namespace llvm; extern "C" void LLVMInitializeCellSPUTarget() { // Register the target. RegisterTargetMachine<SPUTargetMachine> X(TheCellSPUTarget); - RegisterAsmInfo<SPULinuxTargetAsmInfo> Y(TheCellSPUTarget); + RegisterAsmInfo<SPULinuxMCAsmInfo> Y(TheCellSPUTarget); } const std::pair<unsigned, int> * diff --git a/llvm/lib/Target/DarwinTargetAsmInfo.cpp b/llvm/lib/Target/DarwinTargetAsmInfo.cpp index c37b41b7001..8e8c6f838e3 100644 --- a/llvm/lib/Target/DarwinTargetAsmInfo.cpp +++ b/llvm/lib/Target/DarwinTargetAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- DarwinTargetAsmInfo.cpp - Darwin asm properties ---------*- C++ -*-===// +//===-- MCAsmInfoDarwin.cpp - Darwin asm properties -------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,10 +12,10 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Target/DarwinTargetAsmInfo.h" +#include "llvm/MC/MCAsmInfoDarwin.h" using namespace llvm; -DarwinTargetAsmInfo::DarwinTargetAsmInfo() { +DarwinMCAsmInfo::DarwinMCAsmInfo() { // Common settings for all Darwin targets. // Syntax: GlobalPrefix = "_"; diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp b/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp index 73c24eabaa4..a17b2b4ff55 100644 --- a/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp +++ b/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp @@ -15,7 +15,7 @@ #define DEBUG_TYPE "asm-printer" #include "MSP430.h" #include "MSP430InstrInfo.h" -#include "MSP430TargetAsmInfo.h" +#include "MSP430MCAsmInfo.h" #include "MSP430TargetMachine.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" @@ -44,7 +44,7 @@ namespace { class VISIBILITY_HIDDEN MSP430AsmPrinter : public AsmPrinter { public: MSP430AsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *TAI, bool V) + const MCAsmInfo *TAI, bool V) : AsmPrinter(O, TM, TAI, V) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/MSP430/MSP430TargetAsmInfo.cpp b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp index 56560d6c1e7..2309a5f63e6 100644 --- a/llvm/lib/Target/MSP430/MSP430TargetAsmInfo.cpp +++ b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- MSP430TargetAsmInfo.cpp - MSP430 asm properties -------------------===// +//===-- MSP430MCAsmInfo.cpp - MSP430 asm properties -----------------------===// // // The LLVM Compiler Infrastructure // @@ -7,13 +7,13 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the MSP430TargetAsmInfo properties. +// This file contains the declarations of the MSP430MCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "MSP430TargetAsmInfo.h" +#include "MSP430MCAsmInfo.h" using namespace llvm; -MSP430TargetAsmInfo::MSP430TargetAsmInfo(const Target &T, const StringRef &TT) { +MSP430MCAsmInfo::MSP430MCAsmInfo(const Target &T, const StringRef &TT) { AlignmentIsInBytes = false; } diff --git a/llvm/lib/Target/MSP430/MSP430TargetAsmInfo.h b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.h index 510e2390f80..8318029ae78 100644 --- a/llvm/lib/Target/MSP430/MSP430TargetAsmInfo.h +++ b/llvm/lib/Target/MSP430/MSP430MCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- MSP430TargetAsmInfo.h - MSP430 asm properties -------*- C++ -*--====// +//=====-- MSP430MCAsmInfo.h - MSP430 asm properties -----------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,20 +7,20 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the MSP430TargetAsmInfo class. +// This file contains the declaration of the MSP430MCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef MSP430TARGETASMINFO_H #define MSP430TARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct MSP430TargetAsmInfo : public TargetAsmInfo { - explicit MSP430TargetAsmInfo(const Target &T, const StringRef &TT); + struct MSP430MCAsmInfo : public MCAsmInfo { + explicit MSP430MCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp b/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp index 08190aa7cc8..5e21f8ea29e 100644 --- a/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp +++ b/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp @@ -12,18 +12,18 @@ //===----------------------------------------------------------------------===// #include "MSP430.h" -#include "MSP430TargetAsmInfo.h" +#include "MSP430MCAsmInfo.h" #include "MSP430TargetMachine.h" #include "llvm/PassManager.h" #include "llvm/CodeGen/Passes.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetRegistry.h" using namespace llvm; extern "C" void LLVMInitializeMSP430Target() { // Register the target. RegisterTargetMachine<MSP430TargetMachine> X(TheMSP430Target); - RegisterAsmInfo<MSP430TargetAsmInfo> Z(TheMSP430Target); + RegisterAsmInfo<MSP430MCAsmInfo> Z(TheMSP430Target); } MSP430TargetMachine::MSP430TargetMachine(const Target &T, diff --git a/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp index 9df23bcbb28..e942989f13d 100644 --- a/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp +++ b/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp @@ -29,7 +29,7 @@ #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetMachine.h" @@ -54,7 +54,7 @@ namespace { const MipsSubtarget *Subtarget; public: explicit MipsAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V) { Subtarget = &TM.getSubtarget<MipsSubtarget>(); } diff --git a/llvm/lib/Target/Mips/MipsTargetAsmInfo.cpp b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp index 3046f33ac04..d0bd87c21f1 100644 --- a/llvm/lib/Target/Mips/MipsTargetAsmInfo.cpp +++ b/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- MipsTargetAsmInfo.cpp - Mips asm properties -------------*- C++ -*-===// +//===-- MipsMCAsmInfo.cpp - Mips asm properties ---------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,14 +7,14 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the MipsTargetAsmInfo properties. +// This file contains the declarations of the MipsMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "MipsTargetAsmInfo.h" +#include "MipsMCAsmInfo.h" using namespace llvm; -MipsTargetAsmInfo::MipsTargetAsmInfo(const Target &T, const StringRef &TT) { +MipsMCAsmInfo::MipsMCAsmInfo(const Target &T, const StringRef &TT) { AlignmentIsInBytes = false; COMMDirectiveTakesAlignment = true; Data16bitsDirective = "\t.half\t"; diff --git a/llvm/lib/Target/Mips/MipsTargetAsmInfo.h b/llvm/lib/Target/Mips/MipsMCAsmInfo.h index fbb02362893..33a4b5edb25 100644 --- a/llvm/lib/Target/Mips/MipsTargetAsmInfo.h +++ b/llvm/lib/Target/Mips/MipsMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- MipsTargetAsmInfo.h - Mips asm properties -----------*- C++ -*--====// +//=====-- MipsMCAsmInfo.h - Mips asm properties ---------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,22 +7,22 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the MipsTargetAsmInfo class. +// This file contains the declaration of the MipsMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef MIPSTARGETASMINFO_H #define MIPSTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - class MipsTargetAsmInfo : public TargetAsmInfo { + class MipsMCAsmInfo : public MCAsmInfo { public: - explicit MipsTargetAsmInfo(const Target &T, const StringRef &TT); + explicit MipsMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/llvm/lib/Target/Mips/MipsTargetMachine.cpp index c09b6064c39..4fa5450df13 100644 --- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp +++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "Mips.h" -#include "MipsTargetAsmInfo.h" +#include "MipsMCAsmInfo.h" #include "MipsTargetMachine.h" #include "llvm/PassManager.h" #include "llvm/Target/TargetRegistry.h" @@ -22,8 +22,8 @@ extern "C" void LLVMInitializeMipsTarget() { // Register the target. RegisterTargetMachine<MipsTargetMachine> X(TheMipsTarget); RegisterTargetMachine<MipselTargetMachine> Y(TheMipselTarget); - RegisterAsmInfo<MipsTargetAsmInfo> A(TheMipsTarget); - RegisterAsmInfo<MipsTargetAsmInfo> B(TheMipselTarget); + RegisterAsmInfo<MipsMCAsmInfo> A(TheMipsTarget); + RegisterAsmInfo<MipsMCAsmInfo> B(TheMipselTarget); } // DataLayout --> Big-endian, 32-bit pointer/ABI/alignment diff --git a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp index 1522e4ca2e6..d6e95561a2f 100644 --- a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp +++ b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.cpp @@ -14,7 +14,7 @@ #include "PIC16AsmPrinter.h" #include "MCSectionPIC16.h" -#include "PIC16TargetAsmInfo.h" +#include "PIC16MCAsmInfo.h" #include "llvm/DerivedTypes.h" #include "llvm/Function.h" #include "llvm/Module.h" @@ -34,10 +34,10 @@ using namespace llvm; #include "PIC16GenAsmWriter.inc" PIC16AsmPrinter::PIC16AsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), DbgInfo(O, T) { PTLI = static_cast<PIC16TargetLowering*>(TM.getTargetLowering()); - PTAI = static_cast<const PIC16TargetAsmInfo*>(T); + PTAI = static_cast<const PIC16MCAsmInfo*>(T); PTOF = (PIC16TargetObjectFile*)&PTLI->getObjFileLowering(); } diff --git a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h index 3eea880a20a..35a87e0ed61 100644 --- a/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h +++ b/llvm/lib/Target/PIC16/AsmPrinter/PIC16AsmPrinter.h @@ -18,12 +18,11 @@ #include "PIC16.h" #include "PIC16TargetMachine.h" #include "PIC16DebugInfo.h" +#include "PIC16MCAsmInfo.h" #include "PIC16TargetObjectFile.h" #include "llvm/Analysis/DebugInfo.h" -#include "PIC16TargetAsmInfo.h" #include "llvm/CodeGen/AsmPrinter.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/TargetMachine.h" #include <list> #include <string> @@ -32,7 +31,7 @@ namespace llvm { class VISIBILITY_HIDDEN PIC16AsmPrinter : public AsmPrinter { public: explicit PIC16AsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V); + const MCAsmInfo *T, bool V); private: virtual const char *getPassName() const { return "PIC16 Assembly Printer"; @@ -71,7 +70,7 @@ namespace llvm { PIC16TargetObjectFile *PTOF; PIC16TargetLowering *PTLI; PIC16DbgInfo DbgInfo; - const PIC16TargetAsmInfo *PTAI; + const PIC16MCAsmInfo *PTAI; std::list<const char *> LibcallDecls; // List of extern decls. }; } // end of namespace diff --git a/llvm/lib/Target/PIC16/MCSectionPIC16.h b/llvm/lib/Target/PIC16/MCSectionPIC16.h index 66607c813fc..048f2771b67 100644 --- a/llvm/lib/Target/PIC16/MCSectionPIC16.h +++ b/llvm/lib/Target/PIC16/MCSectionPIC16.h @@ -32,7 +32,7 @@ namespace llvm { static MCSectionPIC16 *Create(const StringRef &Name, SectionKind K, MCContext &Ctx); - virtual void PrintSwitchToSection(const TargetAsmInfo &TAI, + virtual void PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const; }; diff --git a/llvm/lib/Target/PIC16/PIC16DebugInfo.h b/llvm/lib/Target/PIC16/PIC16DebugInfo.h index a46c06c1eab..1491716fc2f 100644 --- a/llvm/lib/Target/PIC16/PIC16DebugInfo.h +++ b/llvm/lib/Target/PIC16/PIC16DebugInfo.h @@ -16,7 +16,7 @@ #include "llvm/Analysis/DebugInfo.h" #include "llvm/Module.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include <map> namespace llvm { @@ -94,7 +94,7 @@ namespace llvm { class PIC16DbgInfo { formatted_raw_ostream &O; - const TargetAsmInfo *TAI; + const MCAsmInfo *TAI; std::string CurFile; unsigned CurLine; @@ -103,7 +103,7 @@ namespace llvm { bool EmitDebugDirectives; public: - PIC16DbgInfo(formatted_raw_ostream &o, const TargetAsmInfo *T) + PIC16DbgInfo(formatted_raw_ostream &o, const MCAsmInfo *T) : O(o), TAI(T) { CurFile = ""; CurLine = 0; diff --git a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp index 8b302916753..a17d1a8b1c2 100644 --- a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.cpp +++ b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- PIC16TargetAsmInfo.cpp - PIC16 asm properties ---------------------===// +//===-- PIC16MCAsmInfo.cpp - PIC16 asm properties -------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,11 +7,11 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the PIC16TargetAsmInfo properties. +// This file contains the declarations of the PIC16MCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "PIC16TargetAsmInfo.h" +#include "PIC16MCAsmInfo.h" // FIXME: Layering violation to get enums and static function, should be moved // to separate headers. @@ -19,7 +19,7 @@ #include "PIC16ISelLowering.h" using namespace llvm; -PIC16TargetAsmInfo::PIC16TargetAsmInfo(const Target &T, const StringRef &TT) { +PIC16MCAsmInfo::PIC16MCAsmInfo(const Target &T, const StringRef &TT) { CommentString = ";"; GlobalPrefix = PAN::getTagName(PAN::PREFIX_SYMBOL); GlobalDirective = "\tglobal\t"; @@ -43,8 +43,8 @@ PIC16TargetAsmInfo::PIC16TargetAsmInfo(const Target &T, const StringRef &TT) { HasSingleParameterDotFile = false; } -const char *PIC16TargetAsmInfo:: -getDataASDirective(unsigned Size, unsigned AS) const { +const char *PIC16MCAsmInfo::getDataASDirective(unsigned Size, + unsigned AS) const { if (AS != PIC16ISD::ROM_SPACE) return 0; diff --git a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.h index 23c5ebced63..e84db8532a1 100644 --- a/llvm/lib/Target/PIC16/PIC16TargetAsmInfo.h +++ b/llvm/lib/Target/PIC16/PIC16MCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- PIC16TargetAsmInfo.h - PIC16 asm properties ---------*- C++ -*--====// +//=====-- PIC16MCAsmInfo.h - PIC16 asm properties -------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,25 +7,25 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the PIC16TargetAsmInfo class. +// This file contains the declaration of the PIC16MCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef PIC16TARGETASMINFO_H #define PIC16TARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - class PIC16TargetAsmInfo : public TargetAsmInfo { + class PIC16MCAsmInfo : public MCAsmInfo { const char *RomData8bitsDirective; const char *RomData16bitsDirective; const char *RomData32bitsDirective; public: - PIC16TargetAsmInfo(const Target &T, const StringRef &TT); + PIC16MCAsmInfo(const Target &T, const StringRef &TT); virtual const char *getDataASDirective(unsigned size, unsigned AS) const; }; diff --git a/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp b/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp index 43d47ae5292..c9ebb5756cd 100644 --- a/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp +++ b/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp @@ -22,7 +22,7 @@ #define DEBUG_TYPE "pic16-codegen" #include "PIC16.h" #include "PIC16InstrInfo.h" -#include "PIC16TargetAsmInfo.h" +#include "PIC16MCAsmInfo.h" #include "PIC16TargetMachine.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstrBuilder.h" diff --git a/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp b/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp index 2cdaff344fe..08307e7cef3 100644 --- a/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp +++ b/llvm/lib/Target/PIC16/PIC16TargetMachine.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "PIC16.h" -#include "PIC16TargetAsmInfo.h" +#include "PIC16MCAsmInfo.h" #include "PIC16TargetMachine.h" #include "llvm/PassManager.h" #include "llvm/CodeGen/Passes.h" @@ -24,7 +24,7 @@ extern "C" void LLVMInitializePIC16Target() { // Register the target. Curretnly the codegen works for // enhanced pic16 mid-range. RegisterTargetMachine<PIC16TargetMachine> X(ThePIC16Target); - RegisterAsmInfo<PIC16TargetAsmInfo> A(ThePIC16Target); + RegisterAsmInfo<PIC16MCAsmInfo> A(ThePIC16Target); } diff --git a/llvm/lib/Target/PIC16/PIC16TargetObjectFile.cpp b/llvm/lib/Target/PIC16/PIC16TargetObjectFile.cpp index 07d8381800a..e6dfa674261 100644 --- a/llvm/lib/Target/PIC16/PIC16TargetObjectFile.cpp +++ b/llvm/lib/Target/PIC16/PIC16TargetObjectFile.cpp @@ -25,7 +25,7 @@ MCSectionPIC16 *MCSectionPIC16::Create(const StringRef &Name, } -void MCSectionPIC16::PrintSwitchToSection(const TargetAsmInfo &TAI, +void MCSectionPIC16::PrintSwitchToSection(const MCAsmInfo &TAI, raw_ostream &OS) const { OS << getName() << '\n'; } diff --git a/llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp index b56905ca139..3bcb1450dab 100644 --- a/llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp +++ b/llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp @@ -33,7 +33,7 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" @@ -87,7 +87,7 @@ namespace { uint64_t LabelID; public: explicit PPCAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), Subtarget(TM.getSubtarget<PPCSubtarget>()), LabelID(0) {} @@ -346,7 +346,7 @@ namespace { class VISIBILITY_HIDDEN PPCLinuxAsmPrinter : public PPCAsmPrinter { public: explicit PPCLinuxAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : PPCAsmPrinter(O, TM, T, V){} virtual const char *getPassName() const { @@ -372,7 +372,7 @@ namespace { formatted_raw_ostream &OS; public: explicit PPCDarwinAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : PPCAsmPrinter(O, TM, T, V), OS(O) {} virtual const char *getPassName() const { @@ -1151,7 +1151,7 @@ bool PPCDarwinAsmPrinter::doFinalization(Module &M) { /// static AsmPrinter *createPPCAsmPrinterPass(formatted_raw_ostream &o, TargetMachine &tm, - const TargetAsmInfo *tai, + const MCAsmInfo *tai, bool verbose) { const PPCSubtarget *Subtarget = &tm.getSubtarget<PPCSubtarget>(); diff --git a/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp b/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp index 27a54504323..0083598cf18 100644 --- a/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp +++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp @@ -22,7 +22,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" using namespace llvm; extern cl::opt<bool> EnablePPC32RS; // FIXME (64-bit): See PPCRegisterInfo.cpp. @@ -768,7 +768,7 @@ unsigned PPCInstrInfo::GetInstSizeInBytes(const MachineInstr *MI) const { case PPC::INLINEASM: { // Inline Asm: Variable size. const MachineFunction *MF = MI->getParent()->getParent(); const char *AsmStr = MI->getOperand(0).getSymbolName(); - return getInlineAsmLength(AsmStr, *MF->getTarget().getTargetAsmInfo()); + return getInlineAsmLength(AsmStr, *MF->getTarget().getMCAsmInfo()); } case PPC::DBG_LABEL: case PPC::EH_LABEL: diff --git a/llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp index 864475b30a8..c9ff842e9f1 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp +++ b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- PPCTargetAsmInfo.cpp - PPC asm properties ---------------*- C++ -*-===// +//===-- PPCMCAsmInfo.cpp - PPC asm properties -------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,14 +7,14 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the DarwinTargetAsmInfo properties. +// This file contains the declarations of the DarwinMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "PPCTargetAsmInfo.h" +#include "PPCMCAsmInfo.h" using namespace llvm; -PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(bool is64Bit) { +PPCDarwinMCAsmInfo::PPCDarwinMCAsmInfo(bool is64Bit) { PCSymbol = "."; CommentString = ";"; ExceptionsType = ExceptionHandling::Dwarf; @@ -24,7 +24,7 @@ PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(bool is64Bit) { AssemblerDialect = 1; // New-Style mnemonics. } -PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(bool is64Bit) { +PPCLinuxMCAsmInfo::PPCLinuxMCAsmInfo(bool is64Bit) { CommentString = "#"; GlobalPrefix = ""; PrivateGlobalPrefix = ".L"; diff --git a/llvm/lib/Target/PowerPC/PPCTargetAsmInfo.h b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.h index c7f8862e7ff..3f5118b8db1 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetAsmInfo.h +++ b/llvm/lib/Target/PowerPC/PPCMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- PPCTargetAsmInfo.h - PPC asm properties -------------*- C++ -*--====// +//=====-- PPCMCAsmInfo.h - PPC asm properties -----------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,24 +7,23 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the DarwinTargetAsmInfo class. +// This file contains the declaration of the DarwinMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef PPCTARGETASMINFO_H #define PPCTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" -#include "llvm/Target/DarwinTargetAsmInfo.h" +#include "llvm/MC/MCAsmInfoDarwin.h" namespace llvm { - struct PPCDarwinTargetAsmInfo : public DarwinTargetAsmInfo { - explicit PPCDarwinTargetAsmInfo(bool is64Bit); + struct PPCDarwinMCAsmInfo : public DarwinMCAsmInfo { + explicit PPCDarwinMCAsmInfo(bool is64Bit); }; - struct PPCLinuxTargetAsmInfo : public TargetAsmInfo { - explicit PPCLinuxTargetAsmInfo(bool is64Bit); + struct PPCLinuxMCAsmInfo : public MCAsmInfo { + explicit PPCLinuxMCAsmInfo(bool is64Bit); }; } // namespace llvm diff --git a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp index 41f4699fc06..de3a3d0b70d 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "PPC.h" -#include "PPCTargetAsmInfo.h" +#include "PPCMCAsmInfo.h" #include "PPCTargetMachine.h" #include "llvm/PassManager.h" #include "llvm/Target/TargetOptions.h" @@ -20,13 +20,13 @@ #include "llvm/Support/FormattedStream.h" using namespace llvm; -static const TargetAsmInfo *createTargetAsmInfo(const Target &T, +static const MCAsmInfo *createMCAsmInfo(const Target &T, const StringRef &TT) { Triple TheTriple(TT); bool isPPC64 = TheTriple.getArch() == Triple::ppc64; if (TheTriple.getOS() == Triple::Darwin) - return new PPCDarwinTargetAsmInfo(isPPC64); - return new PPCLinuxTargetAsmInfo(isPPC64); + return new PPCDarwinMCAsmInfo(isPPC64); + return new PPCLinuxMCAsmInfo(isPPC64); } @@ -35,8 +35,8 @@ extern "C" void LLVMInitializePowerPCTarget() { RegisterTargetMachine<PPC32TargetMachine> A(ThePPC32Target); RegisterTargetMachine<PPC64TargetMachine> B(ThePPC64Target); - RegisterAsmInfoFn C(ThePPC32Target, createTargetAsmInfo); - RegisterAsmInfoFn D(ThePPC64Target, createTargetAsmInfo); + RegisterAsmInfoFn C(ThePPC32Target, createMCAsmInfo); + RegisterAsmInfoFn D(ThePPC64Target, createMCAsmInfo); } diff --git a/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp b/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp index d39b6efa3e3..663315e2ebc 100644 --- a/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp +++ b/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp @@ -25,7 +25,7 @@ #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/ADT/Statistic.h" @@ -53,7 +53,7 @@ namespace { unsigned BBNumber; public: explicit SparcAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), BBNumber(0) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/Sparc/SparcTargetAsmInfo.cpp b/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp index 1794ebc5876..e9d1c38f828 100644 --- a/llvm/lib/Target/Sparc/SparcTargetAsmInfo.cpp +++ b/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- SparcTargetAsmInfo.cpp - Sparc asm properties ---------------------===// +//===-- SparcMCAsmInfo.cpp - Sparc asm properties -------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,16 +7,15 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the SparcTargetAsmInfo properties. +// This file contains the declarations of the SparcMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "SparcTargetAsmInfo.h" +#include "SparcMCAsmInfo.h" #include "llvm/ADT/SmallVector.h" using namespace llvm; -SparcELFTargetAsmInfo::SparcELFTargetAsmInfo(const Target &T, - const StringRef &TT) { +SparcELFMCAsmInfo::SparcELFMCAsmInfo(const Target &T, const StringRef &TT) { Data16bitsDirective = "\t.half\t"; Data32bitsDirective = "\t.word\t"; Data64bitsDirective = 0; // .xword is only supported by V9. diff --git a/llvm/lib/Target/Sparc/SparcTargetAsmInfo.h b/llvm/lib/Target/Sparc/SparcMCAsmInfo.h index edf81462428..12d6ef4a6f1 100644 --- a/llvm/lib/Target/Sparc/SparcTargetAsmInfo.h +++ b/llvm/lib/Target/Sparc/SparcMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- SparcTargetAsmInfo.h - Sparc asm properties ---------*- C++ -*--====// +//=====-- SparcMCAsmInfo.h - Sparc asm properties -------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,20 +7,20 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the SparcTargetAsmInfo class. +// This file contains the declaration of the SparcMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef SPARCTARGETASMINFO_H #define SPARCTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct SparcELFTargetAsmInfo : public TargetAsmInfo { - explicit SparcELFTargetAsmInfo(const Target &T, const StringRef &TT); + struct SparcELFMCAsmInfo : public MCAsmInfo { + explicit SparcELFMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp index 505e2b11d59..3a381151f94 100644 --- a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp +++ b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "SparcTargetAsmInfo.h" +#include "SparcMCAsmInfo.h" #include "SparcTargetMachine.h" #include "Sparc.h" #include "llvm/PassManager.h" @@ -20,7 +20,7 @@ using namespace llvm; extern "C" void LLVMInitializeSparcTarget() { // Register the target. RegisterTargetMachine<SparcTargetMachine> X(TheSparcTarget); - RegisterAsmInfo<SparcELFTargetAsmInfo> Y(TheSparcTarget); + RegisterAsmInfo<SparcELFMCAsmInfo> Y(TheSparcTarget); } diff --git a/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp index ae0dce0d67a..ecfc5bd54a4 100644 --- a/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp +++ b/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp @@ -27,7 +27,7 @@ #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetRegistry.h" @@ -44,7 +44,7 @@ namespace { class VISIBILITY_HIDDEN SystemZAsmPrinter : public AsmPrinter { public: SystemZAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *TAI, bool V) + const MCAsmInfo *TAI, bool V) : AsmPrinter(O, TM, TAI, V) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/SystemZ/SystemZTargetAsmInfo.cpp b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp index fc102124ba4..8ea11c95b27 100644 --- a/llvm/lib/Target/SystemZ/SystemZTargetAsmInfo.cpp +++ b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- SystemZTargetAsmInfo.cpp - SystemZ asm properties -----------------===// +//===-- SystemZMCAsmInfo.cpp - SystemZ asm properties ---------------------===// // // The LLVM Compiler Infrastructure // @@ -7,15 +7,14 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the SystemZTargetAsmInfo properties. +// This file contains the declarations of the SystemZMCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "SystemZTargetAsmInfo.h" +#include "SystemZMCAsmInfo.h" using namespace llvm; -SystemZTargetAsmInfo::SystemZTargetAsmInfo(const Target &T, - const StringRef &TT) { +SystemZMCAsmInfo::SystemZMCAsmInfo(const Target &T, const StringRef &TT) { AlignmentIsInBytes = true; PrivateGlobalPrefix = ".L"; diff --git a/llvm/lib/Target/SystemZ/SystemZTargetAsmInfo.h b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.h index 72345c87956..3bebcb74e37 100644 --- a/llvm/lib/Target/SystemZ/SystemZTargetAsmInfo.h +++ b/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.h @@ -1,4 +1,4 @@ -//====-- SystemZTargetAsmInfo.h - SystemZ asm properties -------*- C++ -*--===// +//====-- SystemZMCAsmInfo.h - SystemZ asm properties -----------*- C++ -*--===// // // The LLVM Compiler Infrastructure // @@ -7,21 +7,21 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the SystemZTargetAsmInfo class. +// This file contains the declaration of the SystemZMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef SystemZTARGETASMINFO_H #define SystemZTARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - struct SystemZTargetAsmInfo : public TargetAsmInfo { - explicit SystemZTargetAsmInfo(const Target &T, const StringRef &TT); + struct SystemZMCAsmInfo : public MCAsmInfo { + explicit SystemZMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp index 48ea5f5ebd7..990e0031c5e 100644 --- a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp +++ b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "SystemZTargetAsmInfo.h" +#include "SystemZMCAsmInfo.h" #include "SystemZTargetMachine.h" #include "SystemZ.h" #include "llvm/PassManager.h" @@ -17,7 +17,7 @@ using namespace llvm; extern "C" void LLVMInitializeSystemZTarget() { // Register the target. RegisterTargetMachine<SystemZTargetMachine> X(TheSystemZTarget); - RegisterAsmInfo<SystemZTargetAsmInfo> Y(TheSystemZTarget); + RegisterAsmInfo<SystemZMCAsmInfo> Y(TheSystemZTarget); } /// SystemZTargetMachine ctor - Create an ILP64 architecture model diff --git a/llvm/lib/Target/TargetAsmInfo.cpp b/llvm/lib/Target/TargetAsmInfo.cpp index 20a584916f7..c38bf703ec2 100644 --- a/llvm/lib/Target/TargetAsmInfo.cpp +++ b/llvm/lib/Target/TargetAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- TargetAsmInfo.cpp - Asm Info ---------------------------------------==// +//===-- MCAsmInfo.cpp - Asm Info -------------------------------------------==// // // The LLVM Compiler Infrastructure // @@ -12,12 +12,12 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include <cctype> #include <cstring> using namespace llvm; -TargetAsmInfo::TargetAsmInfo() { +MCAsmInfo::MCAsmInfo() { ZeroFillDirective = 0; NonexecutableStackDirective = 0; NeedsSet = false; @@ -85,11 +85,11 @@ TargetAsmInfo::TargetAsmInfo() { AsmTransCBE = 0; } -TargetAsmInfo::~TargetAsmInfo() { +MCAsmInfo::~MCAsmInfo() { } -unsigned TargetAsmInfo::getULEB128Size(unsigned Value) { +unsigned MCAsmInfo::getULEB128Size(unsigned Value) { unsigned Size = 0; do { Value >>= 7; @@ -98,7 +98,7 @@ unsigned TargetAsmInfo::getULEB128Size(unsigned Value) { return Size; } -unsigned TargetAsmInfo::getSLEB128Size(int Value) { +unsigned MCAsmInfo::getSLEB128Size(int Value) { unsigned Size = 0; int Sign = Value >> (8 * sizeof(Value) - 1); bool IsMore; diff --git a/llvm/lib/Target/TargetInstrInfo.cpp b/llvm/lib/Target/TargetInstrInfo.cpp index c3e6f4326e0..af8ef6ec1fe 100644 --- a/llvm/lib/Target/TargetInstrInfo.cpp +++ b/llvm/lib/Target/TargetInstrInfo.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Target/TargetInstrInfo.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Support/ErrorHandling.h" using namespace llvm; @@ -73,7 +73,7 @@ bool TargetInstrInfo::isUnpredicatedTerminator(const MachineInstr *MI) const { /// Variable-length instructions are not handled here; this function /// may be overloaded in the target code to do that. unsigned TargetInstrInfo::getInlineAsmLength(const char *Str, - const TargetAsmInfo &TAI) const { + const MCAsmInfo &TAI) const { // Count the number of instructions in the asm. diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp index b94fa68be92..fdf157a1e61 100644 --- a/llvm/lib/Target/TargetMachine.cpp +++ b/llvm/lib/Target/TargetMachine.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Support/CommandLine.h" diff --git a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index 5701c7cfef6..ca3d5284242 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -19,7 +19,7 @@ #include "X86COFF.h" #include "X86MachineFunctionInfo.h" #include "X86TargetMachine.h" -#include "X86TargetAsmInfo.h" +#include "X86MCAsmInfo.h" #include "llvm/CallingConv.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" @@ -37,7 +37,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/Mangler.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetOptions.h" using namespace llvm; diff --git a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h index a4c8f13958d..ef8ba6c14d4 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h +++ b/llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.h @@ -37,7 +37,7 @@ class VISIBILITY_HIDDEN X86ATTAsmPrinter : public AsmPrinter { const X86Subtarget *Subtarget; public: explicit X86ATTAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V) { Subtarget = &TM.getSubtarget<X86Subtarget>(); } diff --git a/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp index 52950aa323b..ff87960d27d 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp +++ b/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp @@ -15,7 +15,7 @@ #define DEBUG_TYPE "asm-printer" #include "llvm/MC/MCInst.h" #include "X86ATTAsmPrinter.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" using namespace llvm; diff --git a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp index 2e769a4d95e..3ca35c50da9 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp +++ b/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp @@ -17,7 +17,7 @@ #include "X86.h" #include "X86ATTAsmPrinter.h" #include "X86IntelAsmPrinter.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetRegistry.h" using namespace llvm; @@ -27,9 +27,9 @@ using namespace llvm; /// static AsmPrinter *createX86CodePrinterPass(formatted_raw_ostream &o, TargetMachine &tm, - const TargetAsmInfo *tai, + const MCAsmInfo *tai, bool verbose) { - if (tm.getTargetAsmInfo()->getAssemblerDialect() == 1) + if (tm.getMCAsmInfo()->getAssemblerDialect() == 1) return new X86IntelAsmPrinter(o, tm, tai, verbose); return new X86ATTAsmPrinter(o, tm, tai, verbose); } diff --git a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp index 141512e64c3..17182c37faf 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp +++ b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp @@ -16,7 +16,7 @@ #define DEBUG_TYPE "asm-printer" #include "X86IntelAsmPrinter.h" #include "X86InstrInfo.h" -#include "X86TargetAsmInfo.h" +#include "X86MCAsmInfo.h" #include "X86.h" #include "llvm/CallingConv.h" #include "llvm/Constants.h" @@ -27,7 +27,7 @@ #include "llvm/Assembly/Writer.h" #include "llvm/CodeGen/DwarfWriter.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Support/ErrorHandling.h" diff --git a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h index c7c5df20890..379e4e7269b 100644 --- a/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h +++ b/llvm/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h @@ -26,7 +26,7 @@ namespace llvm { struct VISIBILITY_HIDDEN X86IntelAsmPrinter : public AsmPrinter { explicit X86IntelAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V) {} virtual const char *getPassName() const { diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index b55267dce85..c2c34ee9071 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -31,7 +31,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetOptions.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" using namespace llvm; namespace { @@ -2993,7 +2993,7 @@ static unsigned GetInstSizeWithDesc(const MachineInstr &MI, const MachineFunction *MF = MI.getParent()->getParent(); const TargetInstrInfo &TII = *MF->getTarget().getInstrInfo(); FinalSize += TII.getInlineAsmLength(MI.getOperand(0).getSymbolName(), - *MF->getTarget().getTargetAsmInfo()); + *MF->getTarget().getMCAsmInfo()); break; } case TargetInstrInfo::DBG_LABEL: diff --git a/llvm/lib/Target/X86/X86TargetAsmInfo.cpp b/llvm/lib/Target/X86/X86MCAsmInfo.cpp index d978eb179de..9393fb8bcc2 100644 --- a/llvm/lib/Target/X86/X86TargetAsmInfo.cpp +++ b/llvm/lib/Target/X86/X86MCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- X86TargetAsmInfo.cpp - X86 asm properties ---------------*- C++ -*-===// +//===-- X86MCAsmInfo.cpp - X86 asm properties -----------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,11 +7,11 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declarations of the X86TargetAsmInfo properties. +// This file contains the declarations of the X86MCAsmInfo properties. // //===----------------------------------------------------------------------===// -#include "X86TargetAsmInfo.h" +#include "X86MCAsmInfo.h" #include "X86TargetMachine.h" #include "llvm/ADT/Triple.h" #include "llvm/Support/CommandLine.h" @@ -43,7 +43,7 @@ static const char *const x86_asm_table[] = { "{cc}", "cc", 0,0}; -X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const Triple &Triple) { +X86DarwinMCAsmInfo::X86DarwinMCAsmInfo(const Triple &Triple) { AsmTransCBE = x86_asm_table; AssemblerDialect = AsmWriterFlavor; @@ -76,7 +76,7 @@ X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const Triple &Triple) { AbsoluteEHSectionOffsets = false; } -X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const Triple &Triple) { +X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &Triple) { AsmTransCBE = x86_asm_table; AssemblerDialect = AsmWriterFlavor; @@ -101,13 +101,13 @@ X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const Triple &Triple) { NonexecutableStackDirective = "\t.section\t.note.GNU-stack,\"\",@progbits"; } -X86COFFTargetAsmInfo::X86COFFTargetAsmInfo(const Triple &Triple) { +X86COFFMCAsmInfo::X86COFFMCAsmInfo(const Triple &Triple) { AsmTransCBE = x86_asm_table; AssemblerDialect = AsmWriterFlavor; } -X86WinTargetAsmInfo::X86WinTargetAsmInfo(const Triple &Triple) { +X86WinMCAsmInfo::X86WinMCAsmInfo(const Triple &Triple) { AsmTransCBE = x86_asm_table; AssemblerDialect = AsmWriterFlavor; diff --git a/llvm/lib/Target/X86/X86MCAsmInfo.h b/llvm/lib/Target/X86/X86MCAsmInfo.h new file mode 100644 index 00000000000..7c1bfac6641 --- /dev/null +++ b/llvm/lib/Target/X86/X86MCAsmInfo.h @@ -0,0 +1,42 @@ +//=====-- X86MCAsmInfo.h - X86 asm properties -----------------*- C++ -*--====// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file contains the declaration of the X86MCAsmInfo class. +// +//===----------------------------------------------------------------------===// + +#ifndef X86TARGETASMINFO_H +#define X86TARGETASMINFO_H + +#include "llvm/MC/MCAsmInfo.h" +#include "llvm/MC/MCAsmInfoCOFF.h" +#include "llvm/MC/MCAsmInfoDarwin.h" + +namespace llvm { + class Triple; + + struct X86DarwinMCAsmInfo : public DarwinMCAsmInfo { + explicit X86DarwinMCAsmInfo(const Triple &Triple); + }; + + struct X86ELFMCAsmInfo : public MCAsmInfo { + explicit X86ELFMCAsmInfo(const Triple &Triple); + }; + + struct X86COFFMCAsmInfo : public COFFMCAsmInfo { + explicit X86COFFMCAsmInfo(const Triple &Triple); + }; + + struct X86WinMCAsmInfo : public MCAsmInfo { + explicit X86WinMCAsmInfo(const Triple &Triple); + }; + +} // namespace llvm + +#endif diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp index 112ff1ce24d..5d1ee17c37a 100644 --- a/llvm/lib/Target/X86/X86RegisterInfo.cpp +++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp @@ -30,7 +30,7 @@ #include "llvm/CodeGen/MachineLocation.h" #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" diff --git a/llvm/lib/Target/X86/X86TargetAsmInfo.h b/llvm/lib/Target/X86/X86TargetAsmInfo.h deleted file mode 100644 index 91de3682591..00000000000 --- a/llvm/lib/Target/X86/X86TargetAsmInfo.h +++ /dev/null @@ -1,42 +0,0 @@ -//=====-- X86TargetAsmInfo.h - X86 asm properties -------------*- C++ -*--====// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file contains the declaration of the X86TargetAsmInfo class. -// -//===----------------------------------------------------------------------===// - -#ifndef X86TARGETASMINFO_H -#define X86TARGETASMINFO_H - -#include "llvm/Target/TargetAsmInfo.h" -#include "llvm/Target/COFFTargetAsmInfo.h" -#include "llvm/Target/DarwinTargetAsmInfo.h" - -namespace llvm { - class Triple; - - struct X86DarwinTargetAsmInfo : public DarwinTargetAsmInfo { - explicit X86DarwinTargetAsmInfo(const Triple &Triple); - }; - - struct X86ELFTargetAsmInfo : public TargetAsmInfo { - explicit X86ELFTargetAsmInfo(const Triple &Triple); - }; - - struct X86COFFTargetAsmInfo : public COFFTargetAsmInfo { - explicit X86COFFTargetAsmInfo(const Triple &Triple); - }; - - struct X86WinTargetAsmInfo : public TargetAsmInfo { - explicit X86WinTargetAsmInfo(const Triple &Triple); - }; - -} // namespace llvm - -#endif diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 8c4e5d02bec..689cebd57b0 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "X86TargetAsmInfo.h" +#include "X86MCAsmInfo.h" #include "X86TargetMachine.h" #include "X86.h" #include "llvm/PassManager.h" @@ -22,20 +22,20 @@ #include "llvm/Target/TargetRegistry.h" using namespace llvm; -static const TargetAsmInfo *createTargetAsmInfo(const Target &T, +static const MCAsmInfo *createMCAsmInfo(const Target &T, const StringRef &TT) { Triple TheTriple(TT); switch (TheTriple.getOS()) { case Triple::Darwin: - return new X86DarwinTargetAsmInfo(TheTriple); + return new X86DarwinMCAsmInfo(TheTriple); case Triple::MinGW32: case Triple::MinGW64: case Triple::Cygwin: - return new X86COFFTargetAsmInfo(TheTriple); + return new X86COFFMCAsmInfo(TheTriple); case Triple::Win32: - return new X86WinTargetAsmInfo(TheTriple); + return new X86WinMCAsmInfo(TheTriple); default: - return new X86ELFTargetAsmInfo(TheTriple); + return new X86ELFMCAsmInfo(TheTriple); } } @@ -45,8 +45,8 @@ extern "C" void LLVMInitializeX86Target() { RegisterTargetMachine<X86_64TargetMachine> Y(TheX86_64Target); // Register the target asm info. - RegisterAsmInfoFn A(TheX86_32Target, createTargetAsmInfo); - RegisterAsmInfoFn B(TheX86_64Target, createTargetAsmInfo); + RegisterAsmInfoFn A(TheX86_32Target, createMCAsmInfo); + RegisterAsmInfoFn B(TheX86_64Target, createMCAsmInfo); } diff --git a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp index 88473495d13..bf32d697846 100644 --- a/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp +++ b/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp @@ -16,7 +16,7 @@ #include "XCore.h" #include "XCoreInstrInfo.h" #include "XCoreSubtarget.h" -#include "XCoreTargetAsmInfo.h" +#include "XCoreMCAsmInfo.h" #include "XCoreTargetMachine.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" @@ -56,7 +56,7 @@ namespace { const XCoreSubtarget &Subtarget; public: explicit XCoreAsmPrinter(formatted_raw_ostream &O, TargetMachine &TM, - const TargetAsmInfo *T, bool V) + const MCAsmInfo *T, bool V) : AsmPrinter(O, TM, T, V), DW(0), Subtarget(TM.getSubtarget<XCoreSubtarget>()) {} diff --git a/llvm/lib/Target/XCore/MCSectionXCore.cpp b/llvm/lib/Target/XCore/MCSectionXCore.cpp index d2bb9e47d8a..a40f0326a58 100644 --- a/llvm/lib/Target/XCore/MCSectionXCore.cpp +++ b/llvm/lib/Target/XCore/MCSectionXCore.cpp @@ -26,7 +26,7 @@ MCSectionXCore::Create(const StringRef &Section, unsigned Type, /// PrintTargetSpecificSectionFlags - This handles the XCore-specific cp/dp /// section flags. -void MCSectionXCore::PrintTargetSpecificSectionFlags(const TargetAsmInfo &TAI, +void MCSectionXCore::PrintTargetSpecificSectionFlags(const MCAsmInfo &TAI, raw_ostream &OS) const { if (getFlags() & MCSectionXCore::SHF_CP_SECTION) OS << 'c'; diff --git a/llvm/lib/Target/XCore/MCSectionXCore.h b/llvm/lib/Target/XCore/MCSectionXCore.h index e2e55bdaa62..7396f4e4c15 100644 --- a/llvm/lib/Target/XCore/MCSectionXCore.h +++ b/llvm/lib/Target/XCore/MCSectionXCore.h @@ -44,7 +44,7 @@ public: /// PrintTargetSpecificSectionFlags - This handles the XCore-specific cp/dp /// section flags. - virtual void PrintTargetSpecificSectionFlags(const TargetAsmInfo &TAI, + virtual void PrintTargetSpecificSectionFlags(const MCAsmInfo &TAI, raw_ostream &OS) const; }; diff --git a/llvm/lib/Target/XCore/XCoreTargetAsmInfo.cpp b/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp index 9cd87a57551..dffdda9a1fd 100644 --- a/llvm/lib/Target/XCore/XCoreTargetAsmInfo.cpp +++ b/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp @@ -1,4 +1,4 @@ -//===-- XCoreTargetAsmInfo.cpp - XCore asm properties ---------------------===// +//===-- XCoreMCAsmInfo.cpp - XCore asm properties -------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "XCoreTargetAsmInfo.h" +#include "XCoreMCAsmInfo.h" using namespace llvm; -XCoreTargetAsmInfo::XCoreTargetAsmInfo(const Target &T, const StringRef &TT) { +XCoreMCAsmInfo::XCoreMCAsmInfo(const Target &T, const StringRef &TT) { SupportsDebugInformation = true; Data16bitsDirective = "\t.short\t"; Data32bitsDirective = "\t.long\t"; diff --git a/llvm/lib/Target/XCore/XCoreTargetAsmInfo.h b/llvm/lib/Target/XCore/XCoreMCAsmInfo.h index 784288633ff..01f8e481a94 100644 --- a/llvm/lib/Target/XCore/XCoreTargetAsmInfo.h +++ b/llvm/lib/Target/XCore/XCoreMCAsmInfo.h @@ -1,4 +1,4 @@ -//=====-- XCoreTargetAsmInfo.h - XCore asm properties ---------*- C++ -*--====// +//=====-- XCoreMCAsmInfo.h - XCore asm properties -------------*- C++ -*--====// // // The LLVM Compiler Infrastructure // @@ -7,21 +7,21 @@ // //===----------------------------------------------------------------------===// // -// This file contains the declaration of the XCoreTargetAsmInfo class. +// This file contains the declaration of the XCoreMCAsmInfo class. // //===----------------------------------------------------------------------===// #ifndef XCORETARGETASMINFO_H #define XCORETARGETASMINFO_H -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" namespace llvm { class Target; class StringRef; - class XCoreTargetAsmInfo : public TargetAsmInfo { + class XCoreMCAsmInfo : public MCAsmInfo { public: - explicit XCoreTargetAsmInfo(const Target &T, const StringRef &TT); + explicit XCoreMCAsmInfo(const Target &T, const StringRef &TT); }; } // namespace llvm diff --git a/llvm/lib/Target/XCore/XCoreTargetMachine.cpp b/llvm/lib/Target/XCore/XCoreTargetMachine.cpp index b1afc7e61ae..75f2055ebf9 100644 --- a/llvm/lib/Target/XCore/XCoreTargetMachine.cpp +++ b/llvm/lib/Target/XCore/XCoreTargetMachine.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "XCoreTargetAsmInfo.h" +#include "XCoreMCAsmInfo.h" #include "XCoreTargetMachine.h" #include "XCore.h" #include "llvm/Module.h" @@ -40,5 +40,5 @@ bool XCoreTargetMachine::addInstSelector(PassManagerBase &PM, // Force static initialization. extern "C" void LLVMInitializeXCoreTarget() { RegisterTargetMachine<XCoreTargetMachine> X(TheXCoreTarget); - RegisterAsmInfo<XCoreTargetAsmInfo> Y(TheXCoreTarget); + RegisterAsmInfo<XCoreMCAsmInfo> Y(TheXCoreTarget); } diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp index 302ddb177cf..4f5b8a0ba27 100644 --- a/llvm/tools/llvm-mc/llvm-mc.cpp +++ b/llvm/tools/llvm-mc/llvm-mc.cpp @@ -239,7 +239,7 @@ static int AssembleInput(const char *ProgName) { OwningPtr<MCStreamer> Str; if (FileType == OFT_AssemblyFile) { - const TargetAsmInfo *TAI = TheTarget->createAsmInfo(TripleName); + const MCAsmInfo *TAI = TheTarget->createAsmInfo(TripleName); assert(TAI && "Unable to create target asm info!"); AP.reset(TheTarget->createAsmPrinter(*Out, *TM, TAI, true)); diff --git a/llvm/tools/lto/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp index 190578e2630..f76168e3f53 100644 --- a/llvm/tools/lto/LTOCodeGenerator.cpp +++ b/llvm/tools/lto/LTOCodeGenerator.cpp @@ -39,7 +39,7 @@ #include "llvm/System/Signals.h" #include "llvm/Target/SubtargetFeature.h" #include "llvm/Target/TargetOptions.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetRegistry.h" @@ -359,7 +359,7 @@ void LTOCodeGenerator::applyScopeRestrictions() // mark which symbols can not be internalized if ( !_mustPreserveSymbols.empty() ) { Mangler mangler(*mergedModule, - _target->getTargetAsmInfo()->getGlobalPrefix()); + _target->getMCAsmInfo()->getGlobalPrefix()); std::vector<const char*> mustPreserveList; for (Module::iterator f = mergedModule->begin(), e = mergedModule->end(); f != e; ++f) { @@ -395,7 +395,7 @@ bool LTOCodeGenerator::generateAssemblyCode(formatted_raw_ostream& out, Module* mergedModule = _linker.getModule(); // If target supports exception handling then enable it now. - switch (_target->getTargetAsmInfo()->getExceptionHandlingType()) { + switch (_target->getMCAsmInfo()->getExceptionHandlingType()) { case ExceptionHandling::Dwarf: llvm::DwarfExceptionHandling = true; break; diff --git a/llvm/tools/lto/LTOModule.cpp b/llvm/tools/lto/LTOModule.cpp index cbfb04861f5..e3a3cf637b8 100644 --- a/llvm/tools/lto/LTOModule.cpp +++ b/llvm/tools/lto/LTOModule.cpp @@ -28,7 +28,7 @@ #include "llvm/System/Path.h" #include "llvm/System/Process.h" #include "llvm/Target/SubtargetFeature.h" -#include "llvm/Target/TargetAsmInfo.h" +#include "llvm/MC/MCAsmInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/Target/TargetSelect.h" @@ -458,7 +458,7 @@ void LTOModule::lazyParseSymbols() _symbolsParsed = true; // Use mangler to add GlobalPrefix to names to match linker names. - Mangler mangler(*_module, _target->getTargetAsmInfo()->getGlobalPrefix()); + Mangler mangler(*_module, _target->getMCAsmInfo()->getGlobalPrefix()); // add chars used in ObjC method names so method names aren't mangled mangler.markCharAcceptable('['); mangler.markCharAcceptable(']'); |
