Fix off-by-one stack offset computations (dwarf information) for callee-saved

[oota-llvm.git] / lib / Target / X86 / X86AsmPrinter.h

diff --git a/lib/Target/X86/X86AsmPrinter.h b/lib/Target/X86/X86AsmPrinter.h
old mode 100755 (executable)
new mode 100644 (file)
index c5f521b..a32142c
--- a/lib/Target/X86/X86AsmPrinter.h
+++ b/lib/Target/X86/X86AsmPrinter.h
@@ -21,26 +21,20 @@
 #include "X86TargetMachine.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/DwarfWriter.h"
-#include "llvm/CodeGen/MachineDebugInfo.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/Support/Compiler.h"
 #include <set>
 
 
 namespace llvm {
 
-// FIXME: Move this to CodeGen/AsmPrinter.h
-namespace PICStyle {
-  enum X86AsmPICStyle {
-    Stub, GOT
-  };
-}
-
 struct VISIBILITY_HIDDEN X86SharedAsmPrinter : public AsmPrinter {
   DwarfWriter DW;
+  MachineModuleInfo *MMI;
 
   X86SharedAsmPrinter(std::ostream &O, X86TargetMachine &TM,
                       const TargetAsmInfo *T)
-    : AsmPrinter(O, TM, T), DW(O, this, T), X86PICStyle(PICStyle::GOT) {
+    : AsmPrinter(O, TM, T), DW(O, this, T), MMI(0) {
     Subtarget = &TM.getSubtarget<X86Subtarget>();
   }
 
@@ -55,7 +49,7 @@ struct VISIBILITY_HIDDEN X86SharedAsmPrinter : public AsmPrinter {
   //
   // This structure is using e.g. for name decoration for stdcall & fastcall'ed
   // function, since we have to use arguments' size for decoration.
-  typedef std::map<const Function*, X86FunctionInfo> FMFInfoMap;
+  typedef std::map<const Function*, X86MachineFunctionInfo> FMFInfoMap;
   FMFInfoMap FunctionInfoMap;
 
   void decorateName(std::string& Name, const GlobalValue* GV);
@@ -67,14 +61,12 @@ struct VISIBILITY_HIDDEN X86SharedAsmPrinter : public AsmPrinter {
     AU.setPreservesAll();
     if (Subtarget->isTargetDarwin() ||
         Subtarget->isTargetELF() ||
-        Subtarget->isTargetCygwin()) {
-      AU.addRequired<MachineDebugInfo>();
+        Subtarget->isTargetCygMing()) {
+      AU.addRequired<MachineModuleInfo>();
     }
-    MachineFunctionPass::getAnalysisUsage(AU);
+    AsmPrinter::getAnalysisUsage(AU);
   }
 
-  PICStyle::X86AsmPICStyle X86PICStyle;
-  
   const X86Subtarget *Subtarget;
 
   // Necessary for Darwin to print out the apprioriate types of linker stubs