[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp PPCInstrInfo.td

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCAsmPrinter.cpp updated: 1.110 -> 1.111
PPCInstrInfo.td updated: 1.142 -> 1.143
---
Log message:

disentangle call operands from branch operands a bit


---
Diffs of the changes:  (+9 -3)

 PPCAsmPrinter.cpp |    7 +++++--
 PPCInstrInfo.td   |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.110 llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.111
--- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp:1.110	Tue Nov 15 18:48:01 2005
+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp	Thu Nov 17 13:16:08 2005
@@ -148,10 +148,13 @@
       if (MI->getOperand(OpNo).isImmediate()) {
         O << "$+" << MI->getOperand(OpNo).getImmedValue();
       } else {
-        printOp(MI->getOperand(OpNo),
-                TM.getInstrInfo()->isCall(MI->getOpcode()));
+        printOp(MI->getOperand(OpNo));
       }
     }
+    void printCallOperand(const MachineInstr *MI, unsigned OpNo,
+                          MVT::ValueType VT) {
+      printOp(MI->getOperand(OpNo), true);
+    }
     void printAbsAddrOperand(const MachineInstr *MI, unsigned OpNo,
                              MVT::ValueType VT) {
      O << (int)MI->getOperand(OpNo).getImmedValue()*4;


Index: llvm/lib/Target/PowerPC/PPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.142 llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.143
--- llvm/lib/Target/PowerPC/PPCInstrInfo.td:1.142	Thu Nov 17 11:52:01 2005
+++ llvm/lib/Target/PowerPC/PPCInstrInfo.td	Thu Nov 17 13:16:08 2005
@@ -131,6 +131,9 @@
 def target : Operand<i32> {
   let PrintMethod = "printBranchOperand";
 }
+def calltarget : Operand<i32> {
+  let PrintMethod = "printCallOperand";
+}
 def aaddr : Operand<i32> {
   let PrintMethod = "printAbsAddrOperand";
 }
@@ -220,7 +223,7 @@
           LR,CTR,
           CR0,CR1,CR5,CR6,CR7] in {
   // Convenient aliases for call instructions
-  def BL  : IForm<18, 0, 1, (ops target:$func, variable_ops), "bl $func", BrB>;
+  def BL  : IForm<18, 0, 1, (ops calltarget:$func, variable_ops), "bl $func", BrB>;
   def BLA : IForm<18, 1, 1, (ops aaddr:$func, variable_ops), "bla $func", BrB>;
   def BCTRL : XLForm_2_ext<19, 528, 20, 0, 1, (ops variable_ops), "bctrl", BrB>;
 }