Remove redundant foldMemoryOperand variants and other code clean up.

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

2 files changed, 39 insertions, 67 deletions

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index 29f401a..122dd9e 100644
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -1140,73 +1140,58 @@ X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned i,
 }
 
 
-MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum,
-                                                 int FrameIndex) const {
-  // Check switch flag 
-  if (NoFusing) return NULL;
-  SmallVector<MachineOperand,4> MOs;
-  MOs.push_back(MachineOperand::CreateFrameIndex(FrameIndex));
-  return foldMemoryOperand(MI, OpNum, MOs);
-}
-
 MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI,
-                                              SmallVectorImpl<unsigned> &UseOps,
+                                              SmallVectorImpl<unsigned> &Ops,
                                               int FrameIndex) const {
   // Check switch flag 
   if (NoFusing) return NULL;
 
-  if (UseOps.size() == 1)
-    return foldMemoryOperand(MI, UseOps[0], FrameIndex);
-  else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1)
+  if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) {
+    unsigned NewOpc = 0;
+    switch (MI->getOpcode()) {
+    default: return NULL;
+    case X86::TEST8rr:  NewOpc = X86::CMP8ri; break;
+    case X86::TEST16rr: NewOpc = X86::CMP16ri; break;
+    case X86::TEST32rr: NewOpc = X86::CMP32ri; break;
+    case X86::TEST64rr: NewOpc = X86::CMP64ri32; break;
+    }
+    // Change to CMPXXri r, 0 first.
+    MI->setInstrDescriptor(TII.get(NewOpc));
+    MI->getOperand(1).ChangeToImmediate(0);
+  } else if (Ops.size() != 1)
     return NULL;
 
-  unsigned NewOpc = 0;
-  switch (MI->getOpcode()) {
-  default: return NULL;
-  case X86::TEST8rr:  NewOpc = X86::CMP8ri; break;
-  case X86::TEST16rr: NewOpc = X86::CMP16ri; break;
-  case X86::TEST32rr: NewOpc = X86::CMP32ri; break;
-  case X86::TEST64rr: NewOpc = X86::CMP64ri32; break;
-  }
-  // Change to CMPXXri r, 0 first.
-  MI->setInstrDescriptor(TII.get(NewOpc));
-  MI->getOperand(1).ChangeToImmediate(0);
-  return foldMemoryOperand(MI, 0, FrameIndex);
-}
-
-MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI, unsigned OpNum,
-                                                 MachineInstr *LoadMI) const {
-  // Check switch flag 
-  if (NoFusing) return NULL;
   SmallVector<MachineOperand,4> MOs;
-  unsigned NumOps = TII.getNumOperands(LoadMI->getOpcode());
-  for (unsigned i = NumOps - 4; i != NumOps; ++i)
-    MOs.push_back(LoadMI->getOperand(i));
-  return foldMemoryOperand(MI, OpNum, MOs);
+  MOs.push_back(MachineOperand::CreateFrameIndex(FrameIndex));
+  return foldMemoryOperand(MI, Ops[0], MOs);
 }
 
 MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr *MI,
-                                                 SmallVectorImpl<unsigned> &UseOps,
+                                                 SmallVectorImpl<unsigned> &Ops,
                                                  MachineInstr *LoadMI) const {
   // Check switch flag 
   if (NoFusing) return NULL;
 
-  if (UseOps.size() == 1)
-    return foldMemoryOperand(MI, UseOps[0], LoadMI);
-  else if (UseOps.size() != 2 || UseOps[0] != 0 && UseOps[1] != 1)
+  if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) {
+    unsigned NewOpc = 0;
+    switch (MI->getOpcode()) {
+    default: return NULL;
+    case X86::TEST8rr:  NewOpc = X86::CMP8ri; break;
+    case X86::TEST16rr: NewOpc = X86::CMP16ri; break;
+    case X86::TEST32rr: NewOpc = X86::CMP32ri; break;
+    case X86::TEST64rr: NewOpc = X86::CMP64ri32; break;
+    }
+    // Change to CMPXXri r, 0 first.
+    MI->setInstrDescriptor(TII.get(NewOpc));
+    MI->getOperand(1).ChangeToImmediate(0);
+  } else if (Ops.size() != 1)
     return NULL;
-  unsigned NewOpc = 0;
-  switch (MI->getOpcode()) {
-  default: return NULL;
-  case X86::TEST8rr:  NewOpc = X86::CMP8ri; break;
-  case X86::TEST16rr: NewOpc = X86::CMP16ri; break;
-  case X86::TEST32rr: NewOpc = X86::CMP32ri; break;
-  case X86::TEST64rr: NewOpc = X86::CMP64ri32; break;
-  }
-  // Change to CMPXXri r, 0 first.
-  MI->setInstrDescriptor(TII.get(NewOpc));
-  MI->getOperand(1).ChangeToImmediate(0);
-  return foldMemoryOperand(MI, 0, LoadMI);
+
+  SmallVector<MachineOperand,4> MOs;
+  unsigned NumOps = TII.getNumOperands(LoadMI->getOpcode());
+  for (unsigned i = NumOps - 4; i != NumOps; ++i)
+    MOs.push_back(LoadMI->getOperand(i));
+  return foldMemoryOperand(MI, Ops[0], MOs);
 }
 
 
diff --git a/lib/Target/X86/X86RegisterInfo.h b/lib/Target/X86/X86RegisterInfo.h
index 53f0844..c74d2e7 100644
--- a/lib/Target/X86/X86RegisterInfo.h
+++ b/lib/Target/X86/X86RegisterInfo.h
@@ -133,32 +133,19 @@ public:
 
   /// foldMemoryOperand - If this target supports it, fold a load or store of
   /// the specified stack slot into the specified machine instruction for the
-  /// specified operand.  If this is possible, the target should perform the
+  /// specified operand(s).  If this is possible, the target should perform the
   /// folding and return true, otherwise it should return false.  If it folds
   /// the instruction, it is likely that the MachineInstruction the iterator
   /// references has been changed.
   MachineInstr* foldMemoryOperand(MachineInstr* MI,
-                                  unsigned OpNum,
-                                  int FrameIndex) const;
-
-  /// foldMemoryOperand - Same as previous except it tries to fold instruction
-  /// with multiple uses of the same register.
-  MachineInstr* foldMemoryOperand(MachineInstr* MI,
-                                  SmallVectorImpl<unsigned> &UseOps,
+                                  SmallVectorImpl<unsigned> &Ops,
                                   int FrameIndex) const;
 
   /// foldMemoryOperand - Same as the previous version except it allows folding
   /// of any load and store from / to any address, not just from a specific
   /// stack slot.
   MachineInstr* foldMemoryOperand(MachineInstr* MI,
-                                  unsigned OpNum,
-                                  MachineInstr* LoadMI) const;
-
-  /// foldMemoryOperand - Same as the previous version except it allows folding
-  /// of any load and store from / to any address, not just from a specific
-  /// stack slot.
-  MachineInstr* foldMemoryOperand(MachineInstr* MI,
-                                  SmallVectorImpl<unsigned> &UseOps,
+                                  SmallVectorImpl<unsigned> &Ops,
                                   MachineInstr* LoadMI) const;
 
   /// getOpcodeAfterMemoryFold - Returns the opcode of the would be new