[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86AsmPrinter.h X86RegisterInfo.cpp

[Jim Laskey]

Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.94 -> 1.95
X86AsmPrinter.h updated: 1.42 -> 1.43
X86RegisterInfo.cpp updated: 1.197 -> 1.198
---
Log message:

Change the MachineDebugInfo to MachineModuleInfo to better reflect usage
for debugging and exception handling.


---
Diffs of the changes:  (+11 -11)

 X86ATTAsmPrinter.cpp |    4 ++--
 X86AsmPrinter.h      |    4 ++--
 X86RegisterInfo.cpp  |   14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.94 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.95
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.94	Wed Jan 24 20:53:24 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Fri Jan 26 15:22:28 2007
@@ -75,8 +75,8 @@
       Subtarget->isTargetELF() ||
       Subtarget->isTargetCygMing()) {
     // Let PassManager know we need debug information and relay
-    // the MachineDebugInfo address on to DwarfWriter.
-    DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+    // the MachineModuleInfo address on to DwarfWriter.
+    DW.SetModuleInfo(&getAnalysis<MachineModuleInfo>());
   }
 
   SetupMachineFunction(MF);


Index: llvm/lib/Target/X86/X86AsmPrinter.h
diff -u llvm/lib/Target/X86/X86AsmPrinter.h:1.42 llvm/lib/Target/X86/X86AsmPrinter.h:1.43
--- llvm/lib/Target/X86/X86AsmPrinter.h:1.42	Fri Jan 12 13:20:47 2007
+++ llvm/lib/Target/X86/X86AsmPrinter.h	Fri Jan 26 15:22:28 2007
@@ -21,7 +21,7 @@
 #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>
 
@@ -61,7 +61,7 @@
     if (Subtarget->isTargetDarwin() ||
         Subtarget->isTargetELF() ||
         Subtarget->isTargetCygMing()) {
-      AU.addRequired<MachineDebugInfo>();
+      AU.addRequired<MachineModuleInfo>();
     }
     MachineFunctionPass::getAnalysisUsage(AU);
   }


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.197 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.198
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.197	Fri Jan 26 08:34:52 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Fri Jan 26 15:22:28 2007
@@ -995,10 +995,10 @@
   const Function* Fn = MF.getFunction();
   const X86Subtarget* Subtarget = &MF.getTarget().getSubtarget<X86Subtarget>();
   MachineInstr *MI;
-  MachineDebugInfo *DebugInfo = MFI->getMachineDebugInfo();
+  MachineModuleInfo *MMI = MFI->getMachineModuleInfo();
   
   // Prepare for debug frame info.
-  bool hasInfo = DebugInfo && DebugInfo->hasInfo();
+  bool hasDebugInfo = MMI && MMI->hasDebugInfo();
   unsigned FrameLabelId = 0;
   
   // Get the number of bytes to allocate from the FrameInfo
@@ -1023,9 +1023,9 @@
     }
   }
 
-  if (hasInfo) {
+  if (hasDebugInfo) {
     // Mark effective beginning of when frame pointer becomes valid.
-    FrameLabelId = DebugInfo->NextLabelID();
+    FrameLabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(FrameLabelId);
   }
   
@@ -1053,8 +1053,8 @@
     MBB.insert(MBBI, MI);
   }
 
-  if (hasInfo) {
-    std::vector<MachineMove> &Moves = DebugInfo->getFrameMoves();
+  if (hasDebugInfo) {
+    std::vector<MachineMove> &Moves = MMI->getFrameMoves();
     
     if (NumBytes) {
       // Show update of SP.
@@ -1077,7 +1077,7 @@
     }
     
     // Mark effective beginning of when frame pointer is ready.
-    unsigned ReadyLabelId = DebugInfo->NextLabelID();
+    unsigned ReadyLabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, TII.get(X86::LABEL)).addImm(ReadyLabelId);
     
     MachineLocation FPDst(hasFP(MF) ? FramePtr : StackPtr);