6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Unbreak ARM / Thumb soft FP support.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49012 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2008-04-01 01:50:16 +00:00
parent 2ffbcaccd1
commit 110cf48752
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
View File

@@ -5450,7 +5450,14 @@ ExpandIntToFP(bool isSigned, MVT::ValueType DestTy, SDOperand Source) {
} }
RTLIB::Libcall LC; RTLIB::Libcall LC;
if (SourceVT == MVT::i64) { if (SourceVT == MVT::i32) {
if (DestTy == MVT::f32)
LC = isSigned ? RTLIB::SINTTOFP_I64_F32 : RTLIB::UINTTOFP_I64_F32;
else {
assert(DestTy == MVT::f64 && "Unknown fp value type!");
LC = isSigned ? RTLIB::SINTTOFP_I32_F64 : RTLIB::UINTTOFP_I32_F64;
}
} else if (SourceVT == MVT::i64) {
if (DestTy == MVT::f32) if (DestTy == MVT::f32)
LC = RTLIB::SINTTOFP_I64_F32; LC = RTLIB::SINTTOFP_I64_F32;
else if (DestTy == MVT::f64) else if (DestTy == MVT::f64)
@@ -5481,7 +5488,7 @@ ExpandIntToFP(bool isSigned, MVT::ValueType DestTy, SDOperand Source) {
SDOperand HiPart; SDOperand HiPart;
SDOperand Result = ExpandLibCall(TLI.getLibcallName(LC), Source.Val, isSigned, SDOperand Result = ExpandLibCall(TLI.getLibcallName(LC), Source.Val, isSigned,
HiPart); HiPart);
if (Result.getValueType() != DestTy) if (Result.getValueType() != DestTy && HiPart.Val)
Result = DAG.getNode(ISD::BUILD_PAIR, DestTy, Result, HiPart); Result = DAG.getNode(ISD::BUILD_PAIR, DestTy, Result, HiPart);
return Result; return Result;
} }
@@ -6773,7 +6780,8 @@ void SelectionDAGLegalize::ExpandOp(SDOperand Op, SDOperand &Lo, SDOperand &Hi){
Lo = ExpandIntToFP(Node->getOpcode() == ISD::SINT_TO_FP, VT, Lo = ExpandIntToFP(Node->getOpcode() == ISD::SINT_TO_FP, VT,
Node->getOperand(0)); Node->getOperand(0));
ExpandOp(Lo, Lo, Hi); if (getTypeAction(Lo.getValueType()) == Expand)
ExpandOp(Lo, Lo, Hi);
break; break;
} }
} }

16
lib/Target/ARM/ARMISelLowering.cpp
View File

@@ -248,16 +248,20 @@ ARMTargetLowering::ARMTargetLowering(TargetMachine &TM)
setOperationAction(ISD::FCOS , MVT::f64, Expand); setOperationAction(ISD::FCOS , MVT::f64, Expand);
setOperationAction(ISD::FREM , MVT::f64, Expand); setOperationAction(ISD::FREM , MVT::f64, Expand);
setOperationAction(ISD::FREM , MVT::f32, Expand); setOperationAction(ISD::FREM , MVT::f32, Expand);
setOperationAction(ISD::FCOPYSIGN, MVT::f64, Custom); if (!UseSoftFloat && Subtarget->hasVFP2() && !Subtarget->isThumb()) {
setOperationAction(ISD::FCOPYSIGN, MVT::f32, Custom); setOperationAction(ISD::FCOPYSIGN, MVT::f64, Custom);
setOperationAction(ISD::FCOPYSIGN, MVT::f32, Custom);
}
setOperationAction(ISD::FPOW , MVT::f64, Expand); setOperationAction(ISD::FPOW , MVT::f64, Expand);
setOperationAction(ISD::FPOW , MVT::f32, Expand); setOperationAction(ISD::FPOW , MVT::f32, Expand);
// int <-> fp are custom expanded into bit_convert + ARMISD ops. // int <-> fp are custom expanded into bit_convert + ARMISD ops.
setOperationAction(ISD::SINT_TO_FP, MVT::i32, Custom); if (!UseSoftFloat && Subtarget->hasVFP2() && !Subtarget->isThumb()) {
setOperationAction(ISD::UINT_TO_FP, MVT::i32, Custom); setOperationAction(ISD::SINT_TO_FP, MVT::i32, Custom);
setOperationAction(ISD::FP_TO_UINT, MVT::i32, Custom); setOperationAction(ISD::UINT_TO_FP, MVT::i32, Custom);
setOperationAction(ISD::FP_TO_SINT, MVT::i32, Custom); setOperationAction(ISD::FP_TO_UINT, MVT::i32, Custom);
setOperationAction(ISD::FP_TO_SINT, MVT::i32, Custom);
}
// We have target-specific dag combine patterns for the following nodes: // We have target-specific dag combine patterns for the following nodes:
// ARMISD::FMRRD - No need to call setTargetDAGCombine // ARMISD::FMRRD - No need to call setTargetDAGCombine

10
test/CodeGen/ARM/fpconv.ll
View File

@@ -9,6 +9,16 @@
; RUN: grep fsitod %t ; RUN: grep fsitod %t
; RUN: grep fuitos %t ; RUN: grep fuitos %t
; RUN: grep fuitod %t ; RUN: grep fuitod %t
; RUN: llvm-as < %s | llc -march=arm > %t
; RUN: grep truncdfsf2 %t
; RUN: grep extendsfdf2 %t
; RUN: grep fixsfsi %t
; RUN: grep fixunssfsi %t
; RUN: grep fixdfsi %t
; RUN: grep fixunsdfsi %t
; RUN: grep floatdisf %t
; RUN: grep floatsidf %t
; RUN: llvm-as < %s | llc -march=thumb
define float @f1(double %x) { define float @f1(double %x) {
entry: entry: