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

The asm printer has a mangler. Don't keep a second pointer to it.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193616 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-10-29 16:11:22 +00:00
parent 54818dc746
commit d11a4c4ca2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Target/X86/X86MCInstLower.cpp
View File

@ -34,14 +34,12 @@ namespace {
/// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst. /// X86MCInstLower - This class is used to lower an MachineInstr into an MCInst.
class X86MCInstLower { class X86MCInstLower {
MCContext &Ctx; MCContext &Ctx;
Mangler *Mang;
const MachineFunction &MF; const MachineFunction &MF;
const TargetMachine &TM; const TargetMachine &TM;
const MCAsmInfo &MAI; const MCAsmInfo &MAI;
X86AsmPrinter &AsmPrinter; X86AsmPrinter &AsmPrinter;
public: public:
X86MCInstLower(Mangler *mang, const MachineFunction &MF, X86MCInstLower(const MachineFunction &MF, X86AsmPrinter &asmprinter);
X86AsmPrinter &asmprinter);
void Lower(const MachineInstr *MI, MCInst &OutMI) const; void Lower(const MachineInstr *MI, MCInst &OutMI) const;
@ -50,13 +48,16 @@ public:
private: private:
MachineModuleInfoMachO &getMachOMMI() const; MachineModuleInfoMachO &getMachOMMI() const;
Mangler *getMang() const {
return AsmPrinter.Mang;
}
}; };
} // end anonymous namespace } // end anonymous namespace
X86MCInstLower::X86MCInstLower(Mangler *mang, const MachineFunction &mf, X86MCInstLower::X86MCInstLower(const MachineFunction &mf,
X86AsmPrinter &asmprinter) X86AsmPrinter &asmprinter)
: Ctx(mf.getContext()), Mang(mang), MF(mf), TM(mf.getTarget()), : Ctx(mf.getContext()), MF(mf), TM(mf.getTarget()),
MAI(*TM.getMCAsmInfo()), AsmPrinter(asmprinter) {} MAI(*TM.getMCAsmInfo()), AsmPrinter(asmprinter) {}
MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const { MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const {
@ -81,7 +82,7 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
MO.getTargetFlags() == X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE) MO.getTargetFlags() == X86II::MO_DARWIN_HIDDEN_NONLAZY_PIC_BASE)
isImplicitlyPrivate = true; isImplicitlyPrivate = true;
Mang->getNameWithPrefix(Name, GV, isImplicitlyPrivate); getMang()->getNameWithPrefix(Name, GV, isImplicitlyPrivate);
} else if (MO.isSymbol()) { } else if (MO.isSymbol()) {
Name += MAI.getGlobalPrefix(); Name += MAI.getGlobalPrefix();
Name += MO.getSymbolName(); Name += MO.getSymbolName();
@ -110,7 +111,7 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
assert(MO.isGlobal() && "Extern symbol not handled yet"); assert(MO.isGlobal() && "Extern symbol not handled yet");
StubSym = StubSym =
MachineModuleInfoImpl:: MachineModuleInfoImpl::
StubValueTy(Mang->getSymbol(MO.getGlobal()), StubValueTy(getMang()->getSymbol(MO.getGlobal()),
!MO.getGlobal()->hasInternalLinkage()); !MO.getGlobal()->hasInternalLinkage());
} }
return Sym; return Sym;
@ -124,7 +125,7 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
assert(MO.isGlobal() && "Extern symbol not handled yet"); assert(MO.isGlobal() && "Extern symbol not handled yet");
StubSym = StubSym =
MachineModuleInfoImpl:: MachineModuleInfoImpl::
StubValueTy(Mang->getSymbol(MO.getGlobal()), StubValueTy(getMang()->getSymbol(MO.getGlobal()),
!MO.getGlobal()->hasInternalLinkage()); !MO.getGlobal()->hasInternalLinkage());
} }
return Sym; return Sym;
@ -140,7 +141,7 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
if (MO.isGlobal()) { if (MO.isGlobal()) {
StubSym = StubSym =
MachineModuleInfoImpl:: MachineModuleInfoImpl::
StubValueTy(Mang->getSymbol(MO.getGlobal()), StubValueTy(getMang()->getSymbol(MO.getGlobal()),
!MO.getGlobal()->hasInternalLinkage()); !MO.getGlobal()->hasInternalLinkage());
} else { } else {
Name.erase(Name.end()-5, Name.end()); Name.erase(Name.end()-5, Name.end());
@ -686,7 +687,7 @@ static void LowerTlsAddr(MCStreamer &OutStreamer,
} }
void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) { void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
X86MCInstLower MCInstLowering(Mang, *MF, *this); X86MCInstLower MCInstLowering(*MF, *this);
switch (MI->getOpcode()) { switch (MI->getOpcode()) {
case TargetOpcode::DBG_VALUE: case TargetOpcode::DBG_VALUE:
llvm_unreachable("Should be handled target independently"); llvm_unreachable("Should be handled target independently");