From 2a6db3c351426828450bcbad50f9851144793e55 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 8 Jan 2005 08:08:56 +0000 Subject: [PATCH] Add support for FP->INT conversions and back. llvm-svn: 19369 --- llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 5 +++ .../lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 11 +++++ .../CodeGen/SelectionDAG/SelectionDAGISel.cpp | 43 +++++++++++-------- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 4d6d0ebacaed..e42d7f27c387 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -575,6 +575,11 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { case ISD::TRUNCATE: case ISD::FP_EXTEND: case ISD::FP_ROUND: + case ISD::FP_TO_SINT: + case ISD::FP_TO_UINT: + case ISD::SINT_TO_FP: + case ISD::UINT_TO_FP: + switch (getTypeAction(Node->getOperand(0).getValueType())) { case Legal: Tmp1 = LegalizeOp(Node->getOperand(0)); diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 4ad651718f56..57a66f448b2e 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -396,6 +396,8 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT, case ISD::SIGN_EXTEND: return getConstant(C->getSignExtended(), VT); case ISD::ZERO_EXTEND: return getConstant(Val, VT); case ISD::TRUNCATE: return getConstant(Val, VT); + case ISD::SINT_TO_FP: return getConstantFP(C->getSignExtended(), VT); + case ISD::UINT_TO_FP: return getConstantFP(C->getValue(), VT); } } @@ -404,6 +406,10 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT, case ISD::FP_ROUND: case ISD::FP_EXTEND: return getConstantFP(C->getValue(), VT); + case ISD::FP_TO_SINT: + return getConstant((int64_t)C->getValue(), VT); + case ISD::FP_TO_UINT: + return getConstant((uint64_t)C->getValue(), VT); } unsigned OpOpcode = Operand.Val->getOpcode(); @@ -821,6 +827,11 @@ void SDNode::dump() const { case ISD::FP_ROUND: std::cerr << "fp_round"; break; case ISD::FP_EXTEND: std::cerr << "fp_extend"; break; + case ISD::SINT_TO_FP: std::cerr << "sint_to_fp"; break; + case ISD::UINT_TO_FP: std::cerr << "uint_to_fp"; break; + case ISD::FP_TO_SINT: std::cerr << "fp_to_sint"; break; + case ISD::FP_TO_UINT: std::cerr << "fp_to_uint"; break; + // Control flow instructions case ISD::BR: std::cerr << "br"; break; case ISD::BRCOND: std::cerr << "brcond"; break; diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 167d2f7e3594..820a4fb310ab 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -434,24 +434,33 @@ void SelectionDAGLowering::visitCast(User &I) { if (N.getValueType() == DestTy) { setValue(&I, N); // noop cast. - return; - } else if (isInteger(SrcTy) && isInteger(DestTy)) { - if (DestTy < SrcTy) // Truncating cast? - setValue(&I, DAG.getNode(ISD::TRUNCATE, DestTy, N)); - else if (I.getOperand(0)->getType()->isSigned()) - setValue(&I, DAG.getNode(ISD::SIGN_EXTEND, DestTy, N)); - else - setValue(&I, DAG.getNode(ISD::ZERO_EXTEND, DestTy, N)); - return; - } else if (isFloatingPoint(SrcTy) && isFloatingPoint(DestTy)) { - if (DestTy < SrcTy) // Rounding cast? - setValue(&I, DAG.getNode(ISD::FP_ROUND, DestTy, N)); - else - setValue(&I, DAG.getNode(ISD::FP_EXTEND, DestTy, N)); + } else if (isInteger(SrcTy)) { + if (isInteger(DestTy)) { // Int -> Int cast + if (DestTy < SrcTy) // Truncating cast? + setValue(&I, DAG.getNode(ISD::TRUNCATE, DestTy, N)); + else if (I.getOperand(0)->getType()->isSigned()) + setValue(&I, DAG.getNode(ISD::SIGN_EXTEND, DestTy, N)); + else + setValue(&I, DAG.getNode(ISD::ZERO_EXTEND, DestTy, N)); + } else { // Int -> FP cast + if (I.getOperand(0)->getType()->isSigned()) + setValue(&I, DAG.getNode(ISD::SINT_TO_FP, DestTy, N)); + else + setValue(&I, DAG.getNode(ISD::UINT_TO_FP, DestTy, N)); + } } else { - // F->I or I->F - // FIXME: implement integer/fp conversions! - assert(0 && "This CAST is not yet implemented!\n"); + assert(isFloatingPoint(SrcTy) && "Unknown value type!"); + if (isFloatingPoint(DestTy)) { // FP -> FP cast + if (DestTy < SrcTy) // Rounding cast? + setValue(&I, DAG.getNode(ISD::FP_ROUND, DestTy, N)); + else + setValue(&I, DAG.getNode(ISD::FP_EXTEND, DestTy, N)); + } else { // FP -> Int cast. + if (I.getType()->isSigned()) + setValue(&I, DAG.getNode(ISD::FP_TO_SINT, DestTy, N)); + else + setValue(&I, DAG.getNode(ISD::FP_TO_UINT, DestTy, N)); + } } }