6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-23 01:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Migrate the X86 AsmPrinter away from using the subtarget when

Browse Source 
dealing with module level emission. Currently this is using
the Triple to determine, but eventually the logic should
probably migrate to TLOF.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228332 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2015-02-05 19:06:45 +00:00
parent ec5eba025e
commit d63e18f179
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Target/X86/X86AsmPrinter.cpp
View File

@ -47,6 +47,8 @@ using namespace llvm;
/// runOnMachineFunction - Emit the function body. /// runOnMachineFunction - Emit the function body.
/// ///
bool X86AsmPrinter::runOnMachineFunction(MachineFunction &MF) { bool X86AsmPrinter::runOnMachineFunction(MachineFunction &MF) {
Subtarget = &MF.getSubtarget<X86Subtarget>();
SMShadowTracker.startFunction(MF); SMShadowTracker.startFunction(MF);
SetupMachineFunction(MF); SetupMachineFunction(MF);
@ -505,13 +507,15 @@ bool X86AsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
} }
void X86AsmPrinter::EmitStartOfAsmFile(Module &M) { void X86AsmPrinter::EmitStartOfAsmFile(Module &M) {
if (Subtarget->isTargetMachO()) Triple TT(TM.getTargetTriple());
if (TT.isOSBinFormatMachO())
OutStreamer.SwitchSection(getObjFileLowering().getTextSection()); OutStreamer.SwitchSection(getObjFileLowering().getTextSection());
if (Subtarget->isTargetCOFF()) { if (TT.isOSBinFormatCOFF()) {
// Emit an absolute @feat.00 symbol. This appears to be some kind of // Emit an absolute @feat.00 symbol. This appears to be some kind of
// compiler features bitfield read by link.exe. // compiler features bitfield read by link.exe.
if (!Subtarget->is64Bit()) { if (TT.getArch() == Triple::x86) {
MCSymbol *S = MMI->getContext().GetOrCreateSymbol(StringRef("@feat.00")); MCSymbol *S = MMI->getContext().GetOrCreateSymbol(StringRef("@feat.00"));
OutStreamer.BeginCOFFSymbolDef(S); OutStreamer.BeginCOFFSymbolDef(S);
OutStreamer.EmitCOFFSymbolStorageClass(COFF::IMAGE_SYM_CLASS_STATIC); OutStreamer.EmitCOFFSymbolStorageClass(COFF::IMAGE_SYM_CLASS_STATIC);
@ -578,20 +582,21 @@ void X86AsmPrinter::GenerateExportDirective(const MCSymbol *Sym, bool IsData) {
SmallString<128> Directive; SmallString<128> Directive;
raw_svector_ostream OS(Directive); raw_svector_ostream OS(Directive);
StringRef Name = Sym->getName(); StringRef Name = Sym->getName();
Triple TT(TM.getTargetTriple());
if (Subtarget->isTargetKnownWindowsMSVC()) if (TT.isKnownWindowsMSVCEnvironment())
OS << " /EXPORT:"; OS << " /EXPORT:";
else else
OS << " -export:"; OS << " -export:";
if ((Subtarget->isTargetWindowsGNU() || Subtarget->isTargetWindowsCygwin()) && if ((TT.isWindowsGNUEnvironment() || TT.isWindowsCygwinEnvironment()) &&
(Name[0] == getDataLayout().getGlobalPrefix())) (Name[0] == getDataLayout().getGlobalPrefix()))
Name = Name.drop_front(); Name = Name.drop_front();
OS << Name; OS << Name;
if (IsData) { if (IsData) {
if (Subtarget->isTargetKnownWindowsMSVC()) if (TT.isKnownWindowsMSVCEnvironment())
OS << ",DATA"; OS << ",DATA";
else else
OS << ",data"; OS << ",data";
@ -602,7 +607,9 @@ void X86AsmPrinter::GenerateExportDirective(const MCSymbol *Sym, bool IsData) {
} }
void X86AsmPrinter::EmitEndOfAsmFile(Module &M) { void X86AsmPrinter::EmitEndOfAsmFile(Module &M) {
if (Subtarget->isTargetMachO()) { Triple TT(TM.getTargetTriple());
if (TT.isOSBinFormatMachO()) {
// All darwin targets use mach-o. // All darwin targets use mach-o.
MachineModuleInfoMachO &MMIMacho = MachineModuleInfoMachO &MMIMacho =
MMI->getObjFileInfo<MachineModuleInfoMachO>(); MMI->getObjFileInfo<MachineModuleInfoMachO>();
@ -676,13 +683,14 @@ void X86AsmPrinter::EmitEndOfAsmFile(Module &M) {
OutStreamer.EmitAssemblerFlag(MCAF_SubsectionsViaSymbols); OutStreamer.EmitAssemblerFlag(MCAF_SubsectionsViaSymbols);
} }
if (Subtarget->isTargetKnownWindowsMSVC() && MMI->usesVAFloatArgument()) { if (TT.isKnownWindowsMSVCEnvironment() && MMI->usesVAFloatArgument()) {
StringRef SymbolName = Subtarget->is64Bit() ? "_fltused" : "__fltused"; StringRef SymbolName =
(TT.getArch() == Triple::x86_64) ? "_fltused" : "__fltused";
MCSymbol *S = MMI->getContext().GetOrCreateSymbol(SymbolName); MCSymbol *S = MMI->getContext().GetOrCreateSymbol(SymbolName);
OutStreamer.EmitSymbolAttribute(S, MCSA_Global); OutStreamer.EmitSymbolAttribute(S, MCSA_Global);
} }
if (Subtarget->isTargetCOFF()) { if (TT.isOSBinFormatCOFF()) {
// Necessary for dllexport support // Necessary for dllexport support
std::vector<const MCSymbol*> DLLExportedFns, DLLExportedGlobals; std::vector<const MCSymbol*> DLLExportedFns, DLLExportedGlobals;
@ -718,7 +726,7 @@ void X86AsmPrinter::EmitEndOfAsmFile(Module &M) {
} }
} }
if (Subtarget->isTargetELF()) { if (TT.isOSBinFormatELF()) {
const TargetLoweringObjectFileELF &TLOFELF = const TargetLoweringObjectFileELF &TLOFELF =
static_cast<const TargetLoweringObjectFileELF &>(getObjFileLowering()); static_cast<const TargetLoweringObjectFileELF &>(getObjFileLowering());

4
lib/Target/X86/X86AsmPrinter.h
View File

@ -87,9 +87,7 @@ class LLVM_LIBRARY_VISIBILITY X86AsmPrinter : public AsmPrinter {
public: public:
explicit X86AsmPrinter(TargetMachine &TM, explicit X86AsmPrinter(TargetMachine &TM,
std::unique_ptr<MCStreamer> Streamer) std::unique_ptr<MCStreamer> Streamer)
: AsmPrinter(TM, std::move(Streamer)), SM(*this), SMShadowTracker(TM) { : AsmPrinter(TM, std::move(Streamer)), SM(*this), SMShadowTracker(TM) {}
Subtarget = &TM.getSubtarget<X86Subtarget>();
}
const char *getPassName() const override { const char *getPassName() const override {
return "X86 Assembly / Object Emitter"; return "X86 Assembly / Object Emitter";