Rename ISD::MemOpAddrMode to ISD::MemIndexedMode

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

2 files changed, 14 insertions, 14 deletions

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
index 95daced87b..fb187a6c79 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
@@ -165,11 +165,11 @@ std::string DOTGraphTraits<SelectionDAG*>::getNodeLabel(const SDNode *Node,
     if (doExt)
       Op = Op + MVT::getValueTypeString(LD->getLoadedVT()) + ">";
 
-    Op += LD->getAddressingModeName(LD->getAddressingMode());
+    Op += LD->getIndexedModeName(LD->getAddressingMode());
   } else if (const StoreSDNode *ST = dyn_cast<StoreSDNode>(Node)) {
     if (ST->isTruncatingStore())
       Op = Op + "<trunc " + MVT::getValueTypeString(ST->getStoredVT()) + ">";
-    Op += ST->getAddressingModeName(ST->getAddressingMode());
+    Op += ST->getIndexedModeName(ST->getAddressingMode());
   }
   
   return Op;
diff --git a/lib/Target/TargetSelectionDAG.td b/lib/Target/TargetSelectionDAG.td
index 554991564b..45f5005d1e 100644
--- a/lib/Target/TargetSelectionDAG.td
+++ b/lib/Target/TargetSelectionDAG.td
@@ -551,7 +551,7 @@ def truncstoref32 : PatFrag<(ops node:$val, node:$ptr),
 def pre_store : PatFrag<(ops node:$val, node:$base, node:$offset),
                         (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            !ST->isTruncatingStore();
   }
@@ -561,7 +561,7 @@ def pre_store : PatFrag<(ops node:$val, node:$base, node:$offset),
 def pre_truncsti1 : PatFrag<(ops node:$val, node:$base, node:$offset),
                             (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i1;
   }
@@ -570,7 +570,7 @@ def pre_truncsti1 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def pre_truncsti8 : PatFrag<(ops node:$val, node:$base, node:$offset),
                             (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i8;
   }
@@ -579,7 +579,7 @@ def pre_truncsti8 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def pre_truncsti16 : PatFrag<(ops node:$val, node:$base, node:$offset),
                              (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i16;
   }
@@ -588,7 +588,7 @@ def pre_truncsti16 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def pre_truncsti32 : PatFrag<(ops node:$val, node:$base, node:$offset),
                              (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i32;
   }
@@ -597,7 +597,7 @@ def pre_truncsti32 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def pre_truncstf32 : PatFrag<(ops node:$val, node:$base, node:$offset),
                              (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::PRE_INC || AM == ISD::PRE_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::f32;
   }
@@ -607,7 +607,7 @@ def pre_truncstf32 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def post_store : PatFrag<(ops node:$val, node:$ptr, node:$offset),
                          (ist node:$val, node:$ptr, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return !ST->isTruncatingStore() &&
             (AM == ISD::POST_INC || AM == ISD::POST_DEC);
   }
@@ -617,7 +617,7 @@ def post_store : PatFrag<(ops node:$val, node:$ptr, node:$offset),
 def post_truncsti1 : PatFrag<(ops node:$val, node:$base, node:$offset),
                              (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::POST_INC || AM == ISD::POST_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i1;
   }
@@ -626,7 +626,7 @@ def post_truncsti1 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def post_truncsti8 : PatFrag<(ops node:$val, node:$base, node:$offset),
                              (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::POST_INC || AM == ISD::POST_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i8;
   }
@@ -635,7 +635,7 @@ def post_truncsti8 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def post_truncsti16 : PatFrag<(ops node:$val, node:$base, node:$offset),
                               (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::POST_INC || AM == ISD::POST_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i16;
   }
@@ -644,7 +644,7 @@ def post_truncsti16 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def post_truncsti32 : PatFrag<(ops node:$val, node:$base, node:$offset),
                               (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::POST_INC || AM == ISD::POST_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::i32;
   }
@@ -653,7 +653,7 @@ def post_truncsti32 : PatFrag<(ops node:$val, node:$base, node:$offset),
 def post_truncstf32 : PatFrag<(ops node:$val, node:$base, node:$offset),
                               (ist node:$val, node:$base, node:$offset), [{
   if (StoreSDNode *ST = dyn_cast<StoreSDNode>(N)) {
-    ISD::MemOpAddrMode AM = ST->getAddressingMode();
+    ISD::MemIndexedMode AM = ST->getAddressingMode();
     return (AM == ISD::POST_INC || AM == ISD::POST_DEC) &&
            ST->isTruncatingStore() && ST->getStoredVT() == MVT::f32;
   }