Update foldMemoryOperand.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44621 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/CellSPU/SPURegisterInfo.cpp b/lib/Target/CellSPU/SPURegisterInfo.cpp
index 683d97652cfb1143dd28173599e96838a20e78f7..af2a270472fb83d24e19d5cbff35ce1fedfff479 100644 (file)
--- a/lib/Target/CellSPU/SPURegisterInfo.cpp
+++ b/lib/Target/CellSPU/SPURegisterInfo.cpp
@@ -501,10 +501,14 @@ BitVector SPURegisterInfo::getReservedRegs(const MachineFunction &MF) const {
 /// foldMemoryOperand - SPU, like PPC, can only fold spills into
 /// copy instructions, turning them into load/store instructions.
 MachineInstr *
-SPURegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum,
+SPURegisterInfo::foldMemoryOperand(MachineInstr *MI,
+                                   SmallVectorImpl<unsigned> &Ops,
                                    int FrameIndex) const
 {
 #if SOMEDAY_SCOTT_LOOKS_AT_ME_AGAIN
+  if (Ops.size() != 1) return NULL;
+
+  unsigned OpNum = Ops[0];
   unsigned Opc = MI->getOpcode();
   MachineInstr *NewMI = 0;
   
@@ -535,7 +539,8 @@ SPURegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum,
 
 /// General-purpose load/store fold to operand code
 MachineInstr *
-SPURegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum,
+SPURegisterInfo::foldMemoryOperand(MachineInstr *MI,
+                                   SmallVectorImpl<unsigned> &Ops,
                                    MachineInstr *LoadMI) const
 {
   return 0;

diff --git a/lib/Target/CellSPU/SPURegisterInfo.h b/lib/Target/CellSPU/SPURegisterInfo.h
index 1eca442cae8b87e7aadde6e7f7ed46bb9513b8b2..50066932cec81d87516293f6fbc9cdc0ca81b160 100644 (file)
--- a/lib/Target/CellSPU/SPURegisterInfo.h
+++ b/lib/Target/CellSPU/SPURegisterInfo.h
@@ -76,11 +76,13 @@ namespace llvm {
                       unsigned DestReg, const MachineInstr *Orig) const;
 
     //! Fold spills into load/store instructions
-    virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum,
+    virtual MachineInstr* foldMemoryOperand(MachineInstr* MI,
+                                            SmallVectorImpl<unsigned> &Ops,
                                             int FrameIndex) const;
 
     //! Fold any load/store to an operand
-    virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum,
+    virtual MachineInstr* foldMemoryOperand(MachineInstr* MI,
+                                            SmallVectorImpl<unsigned> &Ops,
                                             MachineInstr* LoadMI) const;
     
     //! Return the array of callee-saved registers