[llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp AlphaISelLowering.cpp AlphaISelLowering.h

[Chris Lattner]

Changes in directory llvm/lib/Target/Alpha:

AlphaISelDAGToDAG.cpp updated: 1.29 -> 1.30
AlphaISelLowering.cpp updated: 1.32 -> 1.33
AlphaISelLowering.h updated: 1.12 -> 1.13
---
Log message:

Switch to AlphaISD::CALL instead of ISD::CALL


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

 AlphaISelDAGToDAG.cpp |    3 +--
 AlphaISelLowering.cpp |    8 ++++++--
 AlphaISelLowering.h   |    3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.29 llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.30
--- llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp:1.29	Sun Jan 22 17:37:17 2006
+++ llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp	Fri Jan 27 17:39:00 2006
@@ -161,8 +161,7 @@
   
   switch (N->getOpcode()) {
   default: break;
-  case ISD::TAILCALL:
-  case ISD::CALL: return SelectCALL(Op);
+  case AlphaISD::CALL: return SelectCALL(Op);
 
   case ISD::FrameIndex: {
     int FI = cast<FrameIndexSDNode>(N)->getIndex();


Index: llvm/lib/Target/Alpha/AlphaISelLowering.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelLowering.cpp:1.32 llvm/lib/Target/Alpha/AlphaISelLowering.cpp:1.33
--- llvm/lib/Target/Alpha/AlphaISelLowering.cpp:1.32	Wed Jan 25 17:33:32 2006
+++ llvm/lib/Target/Alpha/AlphaISelLowering.cpp	Fri Jan 27 17:39:00 2006
@@ -164,6 +164,7 @@
   case AlphaISD::GPRelLo: return "Alpha::GPRelLo";
   case AlphaISD::RelLit: return "Alpha::RelLit";
   case AlphaISD::GlobalBaseReg: return "Alpha::GlobalBaseReg";
+  case AlphaISD::CALL:   return "Alpha::CALL";
   case AlphaISD::DivCall: return "Alpha::DivCall";
   case AlphaISD::LDQ_: return "Alpha::LDQ_";
   case AlphaISD::LDT_: return "Alpha::LDT_";
@@ -357,8 +358,11 @@
     RetVals.push_back(ActualRetTyVT);
   RetVals.push_back(MVT::Other);
 
-  SDOperand TheCall = SDOperand(DAG.getCall(RetVals,
-                                            Chain, Callee, args_to_use), 0);
+  std::vector<SDOperand> Ops;
+  Ops.push_back(Chain);
+  Ops.push_back(Callee);
+  Ops.insert(Ops.end(), args_to_use.begin(), args_to_use.end());
+  SDOperand TheCall = DAG.getNode(AlphaISD::CALL, RetVals, Ops);
   Chain = TheCall.getValue(RetTyVT != MVT::isVoid);
   Chain = DAG.getNode(ISD::CALLSEQ_END, MVT::Other, Chain,
                       DAG.getConstant(NumBytes, getPointerTy()));


Index: llvm/lib/Target/Alpha/AlphaISelLowering.h
diff -u llvm/lib/Target/Alpha/AlphaISelLowering.h:1.12 llvm/lib/Target/Alpha/AlphaISelLowering.h:1.13
--- llvm/lib/Target/Alpha/AlphaISelLowering.h:1.12	Wed Jan 25 12:21:52 2006
+++ llvm/lib/Target/Alpha/AlphaISelLowering.h	Fri Jan 27 17:39:00 2006
@@ -37,6 +37,9 @@
 
       /// GlobalBaseReg - used to restore the GOT ptr
       GlobalBaseReg,
+      
+      /// CALL - Normal call.
+      CALL,
 
       /// DIVCALL - used for special library calls for div and rem
       DivCall,