[llvm-commits] CVS: llvm/lib/Target/ARM/ARMInstrInfo.cpp ARMLoadStoreOptimizer.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMInstrInfo.cpp updated: 1.17 -> 1.18
ARMLoadStoreOptimizer.cpp updated: 1.6 -> 1.7
---
Log message:

findRegisterUseOperand() changed.

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

 ARMInstrInfo.cpp          |    4 ++--
 ARMLoadStoreOptimizer.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/ARM/ARMInstrInfo.cpp
diff -u llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.17 llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.18
--- llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.17	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.cpp	Mon Mar 26 17:41:48 2007
@@ -278,8 +278,8 @@
         for (unsigned j = 0; j < 2; ++j) {
           // Look at the two new MI's in reverse order.
           MachineInstr *NewMI = NewMIs[j];
-          MachineOperand *NMO = NewMI->findRegisterUseOperand(Reg);
-          if (!NMO)
+          int NIdx = NewMI->findRegisterUseOperand(Reg);
+          if (NIdx != -1)
             continue;
           LV.addVirtualRegisterKilled(Reg, NewMI);
           if (VI.removeKill(MI))


Index: llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
diff -u llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.6 llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.7
--- llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp:1.6	Wed Mar  7 20:55:08 2007
+++ llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp	Mon Mar 26 17:41:48 2007
@@ -221,7 +221,7 @@
     }
   }
 
-  bool BaseKill = Loc->findRegisterUseOperand(Base, true) != NULL;
+  bool BaseKill = Loc->findRegisterUseOperand(Base, true) != -1;
   if (mergeOps(MBB, ++Loc, SOffset, Base, BaseKill, Opcode,Scratch,Regs, TII)) {
     Merges.push_back(prior(Loc));
     for (unsigned i = SIndex, e = MemOps.size(); i != e; ++i) {