commit cea117d2de0bfe422641e2ada4fef160e099a6b4
author Evan Cheng <evan.cheng@apple.com> Tue Jan 30 02:35:32 2007 +0000
committer Evan Cheng <evan.cheng@apple.com> Tue Jan 30 02:35:32 2007 +0000
tree c053fede929969535ad2a41bb3b5023c473df2f1
parent d1b2c1e88fe4a7728ca9739b0f1c6fd90a19c5fd

Change the operand orders to t_addrmode_s* to make it easier to morph
instructions that use these address modes to instructions that use
t_addrmode_sp.


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

lib/Target/ARM/ARMISelDAGToDAG.cpp

diff --git a/lib/Target/ARM/ARMISelDAGToDAG.cpp b/lib/Target/ARM/ARMISelDAGToDAG.cpp
index 4c6fce6..262c856 100644
--- a/lib/Target/ARM/ARMISelDAGToDAG.cpp
+++ b/lib/Target/ARM/ARMISelDAGToDAG.cpp
@@ -72,14 +72,14 @@
   bool SelectThumbAddrModeRR(SDOperand Op, SDOperand N, SDOperand &Base,
                              SDOperand &Offset);
   bool SelectThumbAddrModeRI5(SDOperand Op, SDOperand N, unsigned Scale,
-                              SDOperand &Base, SDOperand &Offset,
-                              SDOperand &OffImm);
+                              SDOperand &Base, SDOperand &OffImm,
+                              SDOperand &Offset);
   bool SelectThumbAddrModeS1(SDOperand Op, SDOperand N, SDOperand &Base,
-                             SDOperand &Offset, SDOperand &OffImm);
+                             SDOperand &OffImm, SDOperand &Offset);
   bool SelectThumbAddrModeS2(SDOperand Op, SDOperand N, SDOperand &Base,
-                             SDOperand &Offset, SDOperand &OffImm);
+                             SDOperand &OffImm, SDOperand &Offset);
   bool SelectThumbAddrModeS4(SDOperand Op, SDOperand N, SDOperand &Base,
-                             SDOperand &Offset, SDOperand &OffImm);
+                             SDOperand &OffImm, SDOperand &Offset);
   bool SelectThumbAddrModeSP(SDOperand Op, SDOperand N, SDOperand &Base,
                              SDOperand &OffImm);
 
@@ -375,7 +375,7 @@
 bool
 ARMDAGToDAGISel::SelectThumbAddrModeRI5(SDOperand Op, SDOperand N,
                                         unsigned Scale, SDOperand &Base,
-                                        SDOperand &Offset, SDOperand &OffImm) {
+                                        SDOperand &OffImm, SDOperand &Offset) {
   if (Scale == 4) {
     SDOperand TmpBase, TmpOffImm;
     if (SelectThumbAddrModeSP(Op, N, TmpBase, TmpOffImm))
@@ -413,21 +413,21 @@
 }
 
 bool ARMDAGToDAGISel::SelectThumbAddrModeS1(SDOperand Op, SDOperand N,
-                                            SDOperand &Base, SDOperand &Offset,
-                                            SDOperand &OffImm) {
-  return SelectThumbAddrModeRI5(Op, N, 1, Base, Offset, OffImm);
+                                            SDOperand &Base, SDOperand &OffImm,
+                                            SDOperand &Offset) {
+  return SelectThumbAddrModeRI5(Op, N, 1, Base, OffImm, Offset);
 }
 
 bool ARMDAGToDAGISel::SelectThumbAddrModeS2(SDOperand Op, SDOperand N,
-                                            SDOperand &Base, SDOperand &Offset,
-                                            SDOperand &OffImm) {
-  return SelectThumbAddrModeRI5(Op, N, 2, Base, Offset, OffImm);
+                                            SDOperand &Base, SDOperand &OffImm,
+                                            SDOperand &Offset) {
+  return SelectThumbAddrModeRI5(Op, N, 2, Base, OffImm, Offset);
 }
 
 bool ARMDAGToDAGISel::SelectThumbAddrModeS4(SDOperand Op, SDOperand N,
-                                            SDOperand &Base, SDOperand &Offset,
-                                            SDOperand &OffImm) {
-  return SelectThumbAddrModeRI5(Op, N, 4, Base, Offset, OffImm);
+                                            SDOperand &Base, SDOperand &OffImm,
+                                            SDOperand &Offset) {
+  return SelectThumbAddrModeRI5(Op, N, 4, Base, OffImm, Offset);
 }
 
 bool ARMDAGToDAGISel::SelectThumbAddrModeSP(SDOperand Op, SDOperand N,