Use PPCISD::CALL instead of ISD::CALL

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

diff --git a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
index a859d0acb6f58e823eecf7327f306b1bf5fbb9a7..f6683c2ef0e76ed601b56adf37018ed1f08dd9f9 100644 (file)
--- a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+++ b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
@@ -821,8 +821,7 @@ SDOperand PPCDAGToDAGISel::Select(SDOperand Op) {
   case ISD::ADD_PARTS:          return SelectADD_PARTS(Op);
   case ISD::SUB_PARTS:          return SelectSUB_PARTS(Op);
   case ISD::SETCC:              return SelectSETCC(Op);
-  case ISD::CALL:               return SelectCALL(Op);
-  case ISD::TAILCALL:           return SelectCALL(Op);
+  case PPCISD::CALL:            return SelectCALL(Op);
   case PPCISD::GlobalBaseReg:   return getGlobalBaseReg();
     
   case ISD::FrameIndex: {

diff --git a/lib/Target/PowerPC/PPCISelLowering.cpp b/lib/Target/PowerPC/PPCISelLowering.cpp
index b8094d7248649f8495c3eee4f285cc8b49886275..2b0cbcd19577b97c1aa805c800550fca6ed1d386 100644 (file)
--- a/lib/Target/PowerPC/PPCISelLowering.cpp
+++ b/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -666,7 +666,7 @@ PPCTargetLowering::LowerCallTo(SDOperand Chain,
                                unsigned CallingConv, bool isTailCall,
                                SDOperand Callee, ArgListTy &Args,
                                SelectionDAG &DAG) {
-  // args_to_use will accumulate outgoing args for the ISD::CALL case in
+  // args_to_use will accumulate outgoing args for the PPCISD::CALL case in
   // SelectExpr to use to put the arguments in the appropriate registers.
   std::vector<SDOperand> args_to_use;
   
@@ -844,8 +844,11 @@ PPCTargetLowering::LowerCallTo(SDOperand Chain,
   if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee))
     Callee = DAG.getTargetGlobalAddress(G->getGlobal(), MVT::i32);
   
-  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(PPCISD::CALL, RetVals, Ops);
   Chain = TheCall.getValue(RetTyVT != MVT::isVoid);
   Chain = DAG.getNode(ISD::CALLSEQ_END, MVT::Other, Chain,
                       DAG.getConstant(NumBytes, getPointerTy()));

diff --git a/lib/Target/PowerPC/PPCISelLowering.h b/lib/Target/PowerPC/PPCISelLowering.h
index 9170514b27f78dd9f4ccddb0845b0b370e3ec66b..9f6b77beec65ba1af13e4fd11082d56ac8275621 100644 (file)
--- a/lib/Target/PowerPC/PPCISelLowering.h
+++ b/lib/Target/PowerPC/PPCISelLowering.h
@@ -59,9 +59,12 @@ namespace llvm {
       /// code.
       SRL, SRA, SHL,
 
+      /// CALL - A function call.
+      CALL,
+      
       /// Return with a flag operand, matched by 'blr'
       RET_FLAG,
-};
+    };
   }  
   
   class PPCTargetLowering : public TargetLowering {