CellSPU:
(a) Remove conditionally removed code in SelectXAddr. Basically, hope for the
best that the A-form and D-form address predicates catch everything before
the code decides to emit a X-form address.
(b) Expand vector store test cases to include the usual suspects.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60034 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/CellSPU/SPUISelDAGToDAG.cpp b/lib/Target/CellSPU/SPUISelDAGToDAG.cpp
index 159da46..a2144d3 100644
--- a/lib/Target/CellSPU/SPUISelDAGToDAG.cpp
+++ b/lib/Target/CellSPU/SPUISelDAGToDAG.cpp
@@ -591,33 +591,11 @@
SDValue &Index) {
if (!SelectAFormAddr(Op, N, Base, Index)
&& !SelectDFormAddr(Op, N, Base, Index)) {
-#if 0
- // Default form of a X-form address is r(r) in operands 0 and 1:
- SDValue Op0 = N.getOperand(0);
- SDValue Op1 = N.getOperand(1);
-
- if ((Op0.getOpcode() == ISD::Register
- || Op.getOpcode() == ISD::CopyFromReg)
- && (Op1.getOpcode() == ISD::Register
- || Op.getOpcode() == ISD::CopyFromReg)) {
- if (Op.getOpcode() == ISD::Register)
- Base = Op0;
- else
- Base = Op0.getOperand(1);
-
- if (Op1.getOpcode() == ISD::Register)
- Index = Op1;
- else
- Index = Op1.getOperand(1);
-
- return true;
- }
-#else
- // All else fails, punt and use an X-form address:
+ // If the address is neither A-form or D-form, punt and use an X-form
+ // address:
Base = N.getOperand(0);
Index = N.getOperand(1);
return true;
-#endif
}
return false;