cleanups.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108947 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-07-20 22:23:57 +00:00
parent 1a34c83caf
commit 7648bd428b
2 changed files with 10 additions and 14 deletions

View File

@@ -28,14 +28,12 @@
#include "llvm/Type.h" #include "llvm/Type.h"
using namespace llvm; using namespace llvm;
X86MCInstLower::X86MCInstLower(MCContext &ctx, Mangler *mang,
const X86Subtarget &X86MCInstLower::getSubtarget() const { X86AsmPrinter &asmprinter)
return AsmPrinter.getSubtarget(); : Ctx(ctx), Mang(mang), AsmPrinter(asmprinter), MMI(AsmPrinter.MMI) {}
}
MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const { MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const {
assert(getSubtarget().isTargetDarwin() &&"Can only get MachO info on darwin"); return MMI->getObjFileInfo<MachineModuleInfoMachO>();
return AsmPrinter.MMI->getObjFileInfo<MachineModuleInfoMachO>();
} }
@@ -90,7 +88,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(AsmPrinter.Mang->getSymbol(MO.getGlobal()), StubValueTy(Mang->getSymbol(MO.getGlobal()),
!MO.getGlobal()->hasInternalLinkage()); !MO.getGlobal()->hasInternalLinkage());
} }
return Sym; return Sym;
@@ -104,7 +102,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(AsmPrinter.Mang->getSymbol(MO.getGlobal()), StubValueTy(Mang->getSymbol(MO.getGlobal()),
!MO.getGlobal()->hasInternalLinkage()); !MO.getGlobal()->hasInternalLinkage());
} }
return Sym; return Sym;
@@ -120,7 +118,7 @@ GetSymbolFromOperand(const MachineOperand &MO) const {
if (MO.isGlobal()) { if (MO.isGlobal()) {
StubSym = StubSym =
MachineModuleInfoImpl:: MachineModuleInfoImpl::
StubValueTy(AsmPrinter.Mang->getSymbol(MO.getGlobal()), StubValueTy(Mang->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());

View File

@@ -18,22 +18,20 @@ namespace llvm {
class MCOperand; class MCOperand;
class MCSymbol; class MCSymbol;
class MachineInstr; class MachineInstr;
class MachineModuleInfo;
class MachineModuleInfoMachO; class MachineModuleInfoMachO;
class MachineOperand; class MachineOperand;
class Mangler; class Mangler;
class X86AsmPrinter; class X86AsmPrinter;
class X86Subtarget;
/// 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 LLVM_LIBRARY_VISIBILITY X86MCInstLower { class LLVM_LIBRARY_VISIBILITY X86MCInstLower {
MCContext &Ctx; MCContext &Ctx;
Mangler *Mang; Mangler *Mang;
X86AsmPrinter &AsmPrinter; X86AsmPrinter &AsmPrinter;
MachineModuleInfo *MMI;
const X86Subtarget &getSubtarget() const;
public: public:
X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter) X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter);
: Ctx(ctx), Mang(mang), AsmPrinter(asmprinter) {}
void Lower(const MachineInstr *MI, MCInst &OutMI) const; void Lower(const MachineInstr *MI, MCInst &OutMI) const;