[llvm-branch-commits] [llvm-branch] r86072 - in /llvm/branches/Apple/Leela: include/llvm/CodeGen/AsmPrinter.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp lib/Target/X86/AsmPrinter/X86MCInstLower.cpp

[Bill Wendling]

Author: void
Date: Wed Nov  4 17:47:51 2009
New Revision: 86072

URL: http://llvm.org/viewvc/llvm-project?rev=86072&view=rev
Log:
$ svn merge -c 86041 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86041 into '.':
U    include/llvm/CodeGen/AsmPrinter.h
U    lib/CodeGen/AsmPrinter/AsmPrinter.cpp
U    lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
U    lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
U    lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp


Modified:
    llvm/branches/Apple/Leela/include/llvm/CodeGen/AsmPrinter.h
    llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/branches/Apple/Leela/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
    llvm/branches/Apple/Leela/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
    llvm/branches/Apple/Leela/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp

Modified: llvm/branches/Apple/Leela/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/CodeGen/AsmPrinter.h?rev=86072&r1=86071&r2=86072&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/CodeGen/AsmPrinter.h Wed Nov  4 17:47:51 2009
@@ -374,8 +374,10 @@
     /// printImplicitDef - This method prints the specified machine instruction
     /// that is an implicit def.
     virtual void printImplicitDef(const MachineInstr *MI) const;
-    
-    
+
+    /// printKill - This method prints the specified kill machine instruction.
+    virtual void printKill(const MachineInstr *MI) const;
+
     /// printPICJumpTableSetLabel - This method prints a set label for the
     /// specified MachineBasicBlock for a jumptable entry.
     virtual void printPICJumpTableSetLabel(unsigned uid,

Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=86072&r1=86071&r2=86072&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Wed Nov  4 17:47:51 2009
@@ -1590,6 +1590,17 @@
     << TRI->getName(MI->getOperand(0).getReg());
 }
 
+void AsmPrinter::printKill(const MachineInstr *MI) const {
+  if (!VerboseAsm) return;
+  O.PadToColumn(MAI->getCommentColumn());
+  O << MAI->getCommentString() << " kill:";
+  for (unsigned n = 0, e = MI->getNumOperands(); n != e; ++n) {
+    const MachineOperand &op = MI->getOperand(n);
+    assert(op.isReg() && "KILL instruction must have only register operands");
+    O << ' ' << TRI->getName(op.getReg()) << (op.isDef() ? "<def>" : "<kill>");
+  }
+}
+
 /// printLabel - This method prints a local label used by debug and
 /// exception handling tables.
 void AsmPrinter::printLabel(const MachineInstr *MI) const {

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp?rev=86072&r1=86071&r2=86072&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp Wed Nov  4 17:47:51 2009
@@ -1346,6 +1346,7 @@
     printLabel(MI);
     return;
   case TargetInstrInfo::KILL:
+    printKill(MI);
     return;
   case TargetInstrInfo::INLINEASM:
     O << '\t';

Modified: llvm/branches/Apple/Leela/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp?rev=86072&r1=86071&r2=86072&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp Wed Nov  4 17:47:51 2009
@@ -306,6 +306,7 @@
     printLabel(MI);
     return;
   case TargetInstrInfo::KILL:
+    printKill(MI);
     return;
   case TargetInstrInfo::INLINEASM:
     O << '\t';

Modified: llvm/branches/Apple/Leela/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp?rev=86072&r1=86071&r2=86072&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp Wed Nov  4 17:47:51 2009
@@ -412,6 +412,7 @@
     printImplicitDef(MI);
     return;
   case TargetInstrInfo::KILL:
+    printKill(MI);
     return;
   case X86::MOVPC32r: {
     MCInst TmpInst;