[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp PPCISelLowering.cpp PPCInstrInfo.h PPCInstrInfo.td PPCRegisterInfo.cpp

[Jim Laskey]

Changes in directory llvm/lib/Target/PowerPC:

PPCBranchSelector.cpp updated: 1.41 -> 1.42
PPCISelLowering.cpp updated: 1.246 -> 1.247
PPCInstrInfo.h updated: 1.20 -> 1.21
PPCInstrInfo.td updated: 1.271 -> 1.272
PPCRegisterInfo.cpp updated: 1.99 -> 1.100
---
Log message:

Make LABEL a builtin opcode.

---
Diffs of the changes:  (+6 -14)

 PPCBranchSelector.cpp |    3 +++
 PPCISelLowering.cpp   |    2 +-
 PPCInstrInfo.h        |    7 -------
 PPCInstrInfo.td       |    4 ----
 PPCRegisterInfo.cpp   |    4 ++--
 5 files changed, 6 insertions(+), 14 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.41 llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.42
--- llvm/lib/Target/PowerPC/PPCBranchSelector.cpp:1.41	Tue Dec 19 16:59:26 2006
+++ llvm/lib/Target/PowerPC/PPCBranchSelector.cpp	Fri Jan 26 08:34:51 2007
@@ -66,6 +66,9 @@
     const char *AsmStr = MI->getOperand(0).getSymbolName();
     return MF->getTarget().getTargetAsmInfo()->getInlineAsmLength(AsmStr);
   }
+  case PPC::LABEL: {
+    return 0;
+  }
   default:
     return 4; // PowerPC instructions are all 4 bytes
   }


Index: llvm/lib/Target/PowerPC/PPCISelLowering.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.246 llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.247
--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.246	Fri Jan  5 17:42:53 2007
+++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp	Fri Jan 26 08:34:51 2007
@@ -147,7 +147,7 @@
   setOperationAction(ISD::DEBUG_LOC, MVT::Other, Expand);
   // FIXME - use subtarget debug flags
   if (!TM.getSubtarget<PPCSubtarget>().isDarwin())
-    setOperationAction(ISD::DEBUG_LABEL, MVT::Other, Expand);
+    setOperationAction(ISD::LABEL, MVT::Other, Expand);
   
   // We want to legalize GlobalAddress and ConstantPool nodes into the 
   // appropriate instructions to materialize the address.


Index: llvm/lib/Target/PowerPC/PPCInstrInfo.h
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.h:1.20 llvm/lib/Target/PowerPC/PPCInstrInfo.h:1.21
--- llvm/lib/Target/PowerPC/PPCInstrInfo.h:1.20	Fri Nov 17 16:10:59 2006
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.h	Fri Jan 26 08:34:51 2007
@@ -77,13 +77,6 @@
   /// This is used for addressing modes.
   virtual const TargetRegisterClass *getPointerRegClass() const;  
 
-  /// getDWARF_LABELOpcode - Return the opcode of the target's DWARF_LABEL
-  /// instruction if it has one.  This is used by codegen passes that update
-  /// DWARF line number info as they modify the code.
-  virtual unsigned getDWARF_LABELOpcode() const {
-    return PPC::DWARF_LABEL;
-  }
-  
   // Return true if the instruction is a register to register move and
   // leave the source and dest operands in the passed parameters.
   //


Index: llvm/lib/Target/PowerPC/PPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.271 llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.272
--- llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.271	Fri Nov 17 18:32:03 2006
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.td	Fri Jan 26 08:34:51 2007
@@ -1015,10 +1015,6 @@
                       [(dwarf_loc (i32 imm:$line), (i32 imm:$col),
                                   (i32 imm:$file))]>;
 
-def DWARF_LABEL      : Pseudo<(ops i32imm:$id),
-                              "\n${:private}debug_loc$id:",
-                      [(dwarf_label (i32 imm:$id))]>;
-
 //===----------------------------------------------------------------------===//
 // PowerPC Instruction Patterns
 //


Index: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.99 llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.100
--- llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.99	Thu Jan 25 16:48:25 2007
+++ llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	Fri Jan 26 08:34:51 2007
@@ -822,7 +822,7 @@
   if (hasInfo) {
     // Mark effective beginning of when frame pointer becomes valid.
     FrameLabelId = DebugInfo->NextLabelID();
-    BuildMI(MBB, MBBI, TII.get(PPC::DWARF_LABEL)).addImm(FrameLabelId);
+    BuildMI(MBB, MBBI, TII.get(PPC::LABEL)).addImm(FrameLabelId);
   }
   
   // Adjust stack pointer: r1 += NegFrameSize.
@@ -902,7 +902,7 @@
     
     // Mark effective beginning of when frame pointer is ready.
     unsigned ReadyLabelId = DebugInfo->NextLabelID();
-    BuildMI(MBB, MBBI, TII.get(PPC::DWARF_LABEL)).addImm(ReadyLabelId);
+    BuildMI(MBB, MBBI, TII.get(PPC::LABEL)).addImm(ReadyLabelId);
     
     MachineLocation FPDst(HasFP ? (IsPPC64 ? PPC::X31 : PPC::R31) :
                                   (IsPPC64 ? PPC::X1 : PPC::R1));