[llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMISelDAGToDAG.cpp updated: 1.83 -> 1.84
---
Log message:

Match tblegen changes.

---
Diffs of the changes:  (+16 -10)

 ARMISelDAGToDAG.cpp |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.83 llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.84
--- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.83	Wed Nov  8 11:07:32 2006
+++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Wed Nov  8 14:32:04 2006
@@ -751,11 +751,14 @@
 
   SDNode *Select(SDOperand Op);
   virtual void InstructionSelectBasicBlock(SelectionDAG &DAG);
-  bool SelectAddrRegImm(SDOperand N, SDOperand &Offset, SDOperand &Base);
-  bool SelectAddrMode1(SDOperand N, SDOperand &Arg, SDOperand &Shift,
-		       SDOperand &ShiftType);
-  bool SelectAddrMode2(SDOperand N, SDOperand &Arg, SDOperand &Offset);
-  bool SelectAddrMode5(SDOperand N, SDOperand &Arg, SDOperand &Offset);
+  bool SelectAddrRegImm(SDOperand Op, SDOperand N, SDOperand &Offset,
+                        SDOperand &Base);
+  bool SelectAddrMode1(SDOperand Op, SDOperand N, SDOperand &Arg,
+                       SDOperand &Shift, SDOperand &ShiftType);
+  bool SelectAddrMode2(SDOperand Op, SDOperand N, SDOperand &Arg,
+                       SDOperand &Offset);
+  bool SelectAddrMode5(SDOperand Op, SDOperand N, SDOperand &Arg,
+                       SDOperand &Offset);
 
   // Include the pieces autogenerated from the target description.
 #include "ARMGenDAGISel.inc"
@@ -809,7 +812,8 @@
   return false;
 }
 
-bool ARMDAGToDAGISel::SelectAddrMode1(SDOperand N,
+bool ARMDAGToDAGISel::SelectAddrMode1(SDOperand Op,
+                                      SDOperand N,
 				      SDOperand &Arg,
 				      SDOperand &Shift,
 				      SDOperand &ShiftType) {
@@ -853,8 +857,8 @@
   return true;
 }
 
-bool ARMDAGToDAGISel::SelectAddrMode2(SDOperand N, SDOperand &Arg,
-                                      SDOperand &Offset) {
+bool ARMDAGToDAGISel::SelectAddrMode2(SDOperand Op, SDOperand N,
+                                      SDOperand &Arg, SDOperand &Offset) {
   //TODO: complete and cleanup!
   SDOperand Zero = CurDAG->getTargetConstant(0, MVT::i32);
   if (FrameIndexSDNode *FIN = dyn_cast<FrameIndexSDNode>(N)) {
@@ -882,7 +886,8 @@
   return true;
 }
 
-bool ARMDAGToDAGISel::SelectAddrMode5(SDOperand N, SDOperand &Arg,
+bool ARMDAGToDAGISel::SelectAddrMode5(SDOperand Op,
+                                      SDOperand N, SDOperand &Arg,
                                       SDOperand &Offset) {
   //TODO: detect offset
   Offset = CurDAG->getTargetConstant(0, MVT::i32);
@@ -891,7 +896,8 @@
 }
 
 //register plus/minus 12 bit offset
-bool ARMDAGToDAGISel::SelectAddrRegImm(SDOperand N, SDOperand &Offset,
+bool ARMDAGToDAGISel::SelectAddrRegImm(SDOperand Op,
+                                      SDOperand N, SDOperand &Offset,
 				    SDOperand &Base) {
   if (FrameIndexSDNode *FIN = dyn_cast<FrameIndexSDNode>(N)) {
     Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i32);