diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 36 | ||||
| -rw-r--r-- | lib/Target/IA64/IA64ISelDAGToDAG.cpp | 6 |
2 files changed, 28 insertions, 14 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index f4ee33f..156c739 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -979,20 +979,32 @@ SDOperand SelectionDAG::FoldSetCC(MVT::ValueType VT, SDOperand N1, APFloat::cmpResult R = N1C->getValueAPF().compare(N2C->getValueAPF()); switch (Cond) { default: break; - case ISD::SETOEQ: - case ISD::SETEQ: return getConstant(R==APFloat::cmpEqual, VT); - case ISD::SETONE: - case ISD::SETNE: return getConstant(R==APFloat::cmpGreaterThan || + case ISD::SETEQ: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETOEQ: return getConstant(R==APFloat::cmpEqual, VT); + case ISD::SETNE: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETONE: return getConstant(R==APFloat::cmpGreaterThan || R==APFloat::cmpLessThan, VT); - case ISD::SETOLT: - case ISD::SETLT: return getConstant(R==APFloat::cmpLessThan, VT); - case ISD::SETOGT: - case ISD::SETGT: return getConstant(R==APFloat::cmpGreaterThan, VT); - case ISD::SETOLE: - case ISD::SETLE: return getConstant(R==APFloat::cmpLessThan || + case ISD::SETLT: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETOLT: return getConstant(R==APFloat::cmpLessThan, VT); + case ISD::SETGT: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETOGT: return getConstant(R==APFloat::cmpGreaterThan, VT); + case ISD::SETLE: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETOLE: return getConstant(R==APFloat::cmpLessThan || R==APFloat::cmpEqual, VT); - case ISD::SETOGE: - case ISD::SETGE: return getConstant(R==APFloat::cmpGreaterThan || + case ISD::SETGE: if (R==APFloat::cmpUnordered) + return getNode(ISD::UNDEF, VT); + // fall through + case ISD::SETOGE: return getConstant(R==APFloat::cmpGreaterThan || R==APFloat::cmpEqual, VT); case ISD::SETO: return getConstant(R!=APFloat::cmpUnordered, VT); case ISD::SETUO: return getConstant(R==APFloat::cmpUnordered, VT); diff --git a/lib/Target/IA64/IA64ISelDAGToDAG.cpp b/lib/Target/IA64/IA64ISelDAGToDAG.cpp index 7421978..7fa90b0 100644 --- a/lib/Target/IA64/IA64ISelDAGToDAG.cpp +++ b/lib/Target/IA64/IA64ISelDAGToDAG.cpp @@ -404,9 +404,11 @@ SDNode *IA64DAGToDAGISel::Select(SDOperand Op) { SDOperand Chain = CurDAG->getEntryNode(); // this is a constant, so.. SDOperand V; - if (cast<ConstantFPSDNode>(N)->getValueAPF().isPosZero()) { + ConstantFPSDNode* N2 = cast<ConstantFPSDNode>(N); + if (N2->getValueAPF().isPosZero()) { V = CurDAG->getCopyFromReg(Chain, IA64::F0, MVT::f64); - } else if (cast<ConstantFPSDNode>(N)->isExactlyValue(APFloat(+1.0))) { + } else if (N2->isExactlyValue(N2->getValueType(0) == MVT::f32 ? + APFloat(+1.0f) : APFloat(+1.0))) { V = CurDAG->getCopyFromReg(Chain, IA64::F1, MVT::f64); } else assert(0 && "Unexpected FP constant!"); |