[llvm-commits] [llvm] r108952 - in /llvm/trunk/lib/Target/X86: X86MCInstLower.cpp X86MCInstLower.h

[Chris Lattner]

Author: lattner
Date: Tue Jul 20 17:35:40 2010
New Revision: 108952

URL: http://llvm.org/viewvc/llvm-project?rev=108952&view=rev
Log:
continue pushing dependencies around.

Modified:
    llvm/trunk/lib/Target/X86/X86MCInstLower.cpp
    llvm/trunk/lib/Target/X86/X86MCInstLower.h

Modified: llvm/trunk/lib/Target/X86/X86MCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86MCInstLower.cpp?rev=108952&r1=108951&r2=108952&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86MCInstLower.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86MCInstLower.cpp Tue Jul 20 17:35:40 2010
@@ -29,10 +29,10 @@
 using namespace llvm;
 
 X86MCInstLower::X86MCInstLower(MCContext &ctx, Mangler *mang,
-                               X86AsmPrinter &asmprinter,
-                               const TargetMachine &tm)
-: Ctx(ctx), Mang(mang), AsmPrinter(asmprinter), MF(*AsmPrinter.MF),
-  TM(tm), MAI(*TM.getMCAsmInfo()) {}
+                               const MachineFunction &mf,
+                               X86AsmPrinter &asmprinter)
+: Ctx(ctx), Mang(mang), MF(mf), TM(mf.getTarget()), MAI(*TM.getMCAsmInfo()),
+  AsmPrinter(asmprinter) {}
 
 MachineModuleInfoMachO &X86MCInstLower::getMachOMMI() const {
   return MF.getMMI().getObjFileInfo<MachineModuleInfoMachO>();
@@ -505,7 +505,7 @@
 
 
 void X86AsmPrinter::EmitInstruction(const MachineInstr *MI) {
-  X86MCInstLower MCInstLowering(OutContext, Mang, *this, TM);
+  X86MCInstLower MCInstLowering(OutContext, Mang, *MF, *this);
   switch (MI->getOpcode()) {
   case TargetOpcode::DBG_VALUE:
     if (isVerbose() && OutStreamer.hasRawTextSupport()) {

Modified: llvm/trunk/lib/Target/X86/X86MCInstLower.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86MCInstLower.h?rev=108952&r1=108951&r2=108952&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86MCInstLower.h (original)
+++ llvm/trunk/lib/Target/X86/X86MCInstLower.h Tue Jul 20 17:35:40 2010
@@ -30,13 +30,14 @@
 class LLVM_LIBRARY_VISIBILITY X86MCInstLower {
   MCContext &Ctx;
   Mangler *Mang;
-  X86AsmPrinter &AsmPrinter;
   const MachineFunction &MF;
   const TargetMachine &TM;
   const MCAsmInfo &MAI;
+
+  X86AsmPrinter &AsmPrinter;
 public:
-  X86MCInstLower(MCContext &ctx, Mangler *mang, X86AsmPrinter &asmprinter,
-                 const TargetMachine &TM);
+  X86MCInstLower(MCContext &ctx, Mangler *mang, const MachineFunction &MF,
+                 X86AsmPrinter &asmprinter);
   
   void Lower(const MachineInstr *MI, MCInst &OutMI) const;