remove some dead target hooks, subsumed by isLegalAddressingMode

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

diff --git a/include/llvm/Target/TargetLowering.h b/include/llvm/Target/TargetLowering.h
index 97b12b4d40ce850433b15a9922b2e1e274f8cbc6..6bf72a3d15d649526a26d2aea75e1bdadc589ca6 100644 (file)
--- a/include/llvm/Target/TargetLowering.h
+++ b/include/llvm/Target/TargetLowering.h
@@ -893,17 +893,6 @@ public:
   /// scale of the target addressing mode for load / store of the given type.
   virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
-  /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-  /// and V works for isLegalAddressImmediate _and_ both can be applied
-  /// simultaneously to the same instruction.
-  virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                                    const Type* Ty) const;
-  /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-  /// and GV works for isLegalAddressImmediate _and_ both can be applied
-  /// simultaneously to the same instruction.
-  virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                                    const Type* Ty) const;
-
   //===--------------------------------------------------------------------===//
   // Div utility functions
   //

diff --git a/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
index 195b1504a577be075ae9527d7a27786a4693dc70..51d8187aa17629f2c7dad436e304ef556090f3cd 100644 (file)
--- a/lib/CodeGen/SelectionDAG/TargetLowering.cpp
+++ b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
@@ -1993,23 +1993,6 @@ bool TargetLowering::isLegalAddressScale(int64_t S, const Type *Ty) const {
   return false;
 }
 
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and V works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                               const Type* Ty) const {
-  return false;
-}
-
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and GV works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                               const Type* Ty) const {
-
-  return false;
-}
-
 // Magic for divide replacement
 
 struct ms {

diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
index ef8ab012bb5b360964f12cf30f3574cbbf53aefc..0b64cfeb6e60a76cd6ab58540934c218ff42a13a 100644 (file)
--- a/lib/Target/ARM/ARMISelLowering.cpp
+++ b/lib/Target/ARM/ARMISelLowering.cpp
@@ -1441,24 +1441,6 @@ bool ARMTargetLowering::isLegalAddressScale(int64_t S, const Type *Ty) const {
   }
 }
 
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and V works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                               const Type* Ty) const {
-  if (V == 0)
-    return isLegalAddressScale(S, Ty);
-  return false;
-}
-
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and GV works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                                  const Type* Ty) const {
-  return false;
-}
-
 static bool getIndexedAddressParts(SDNode *Ptr, MVT::ValueType VT,
                                    bool isSEXTLoad, SDOperand &Base,
                                    SDOperand &Offset, bool &isInc,

diff --git a/lib/Target/ARM/ARMISelLowering.h b/lib/Target/ARM/ARMISelLowering.h
index 9842b9248bda88e97654f59575f63f6732ce6a27..71a115e1fcd9efc8d15c4888a89dcd5df444c54b 100644 (file)
--- a/lib/Target/ARM/ARMISelLowering.h
+++ b/lib/Target/ARM/ARMISelLowering.h
@@ -99,18 +99,6 @@ namespace llvm {
     /// type.
     virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
-    /// isLegalAddressScaleAndImm - Return true if S works for 
-    /// IsLegalAddressScale and V works for isLegalAddressImmediate _and_ 
-    /// both can be applied simultaneously to the same instruction.
-    virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                           const Type *Ty) const;
-
-    /// isLegalAddressScaleAndImm - Return true if S works for 
-    /// IsLegalAddressScale and GV works for isLegalAddressImmediate _and_
-    /// both can be applied simultaneously to the same instruction.
-    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                           const Type *Ty) const;
-
     /// getPreIndexedAddressParts - returns true by value, base pointer and
     /// offset pointer and addressing mode by reference if the node's address
     /// can be legally represented as pre-indexed load / store address.

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 18c5b32a0418b4335b7d9fc2f65d95911dfaa229..395338a8f3c940d336baa3258b798d0be377ee2f 100644 (file)
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -4127,22 +4127,6 @@ bool X86TargetLowering::isLegalAddressScale(int64_t S, const Type *Ty) const {
   }
 }
 
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and V works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool X86TargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                               const Type* Ty) const {
-  return isLegalAddressScale(S, Ty) && isLegalAddressImmediate(V, Ty);
-}
-
-/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
-/// and GV works for isLegalAddressImmediate _and_ both can be applied
-/// simultaneously to the same instruction.
-bool X86TargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                                  const Type* Ty) const {
-  return isLegalAddressScale(S, Ty) && isLegalAddressImmediate(GV);
-}
-
 /// isShuffleMaskLegal - Targets can use this to indicate that they only
 /// support *some* VECTOR_SHUFFLE operations, those with specific masks.
 /// By default, if a target supports the VECTOR_SHUFFLE node, all mask values

diff --git a/lib/Target/X86/X86ISelLowering.h b/lib/Target/X86/X86ISelLowering.h
index 610ea0029cdc02184b188d5d7c136954db4a9690..7a41cddf727e7202591b7c65504425d5c26ce82b 100644 (file)
--- a/lib/Target/X86/X86ISelLowering.h
+++ b/lib/Target/X86/X86ISelLowering.h
@@ -353,18 +353,6 @@ namespace llvm {
     /// type.
     virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
-    /// isLegalAddressScaleAndImm - Return true if S works for 
-    /// IsLegalAddressScale and V works for isLegalAddressImmediate _and_ 
-    /// both can be applied simultaneously to the same instruction.
-    virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
-                                           const Type *Ty) const;
-
-    /// isLegalAddressScaleAndImm - Return true if S works for 
-    /// IsLegalAddressScale and GV works for isLegalAddressImmediate _and_
-    /// both can be applied simultaneously to the same instruction.
-    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
-                                           const Type *Ty) const;
-
     /// isShuffleMaskLegal - Targets can use this to indicate that they only
     /// support *some* VECTOR_SHUFFLE operations, those with specific masks.
     /// By default, if a target supports the VECTOR_SHUFFLE node, all mask