[llvm-commits] [llvm] r42043 - in /llvm/trunk: include/llvm/ExecutionEngine/GenericValue.h lib/ExecutionEngine/ExecutionEngine.cpp lib/ExecutionEngine/JIT/JIT.cpp
Dale Johannesen
dalej at apple.com
Mon Sep 17 11:44:13 PDT 2007
Author: johannes
Date: Mon Sep 17 13:44:13 2007
New Revision: 42043
URL: http://llvm.org/viewvc/llvm-project?rev=42043&view=rev
Log:
Implement x86 long double in jit (not really
complete, but common cases work)
Modified:
llvm/trunk/include/llvm/ExecutionEngine/GenericValue.h
llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp
Modified: llvm/trunk/include/llvm/ExecutionEngine/GenericValue.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/GenericValue.h?rev=42043&r1=42042&r2=42043&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/GenericValue.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/GenericValue.h Mon Sep 17 13:44:13 2007
@@ -31,7 +31,7 @@
struct { unsigned int first; unsigned int second; } UIntPairVal;
unsigned char Untyped[8];
};
- APInt IntVal;
+ APInt IntVal; // also used for long doubles
GenericValue() : DoubleVal(0.0), IntVal(1,0) {}
GenericValue(void *V) : PointerVal(V), IntVal(1,0) { }
Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=42043&r1=42042&r2=42043&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Mon Sep 17 13:44:13 2007
@@ -376,11 +376,13 @@
return GV;
}
case Instruction::FPTrunc: {
+ // FIXME long double
GenericValue GV = getConstantValue(Op0);
GV.FloatVal = float(GV.DoubleVal);
return GV;
}
case Instruction::FPExt:{
+ // FIXME long double
GenericValue GV = getConstantValue(Op0);
GV.DoubleVal = double(GV.FloatVal);
return GV;
@@ -389,16 +391,30 @@
GenericValue GV = getConstantValue(Op0);
if (CE->getType() == Type::FloatTy)
GV.FloatVal = float(GV.IntVal.roundToDouble());
- else
+ else if (CE->getType() == Type::DoubleTy)
GV.DoubleVal = GV.IntVal.roundToDouble();
+ else if (CE->getType() == Type::X86_FP80Ty) {
+ const uint64_t zero[] = {0, 0};
+ APFloat apf = APFloat(APInt(80, 2, zero));
+ (void)apf.convertFromInteger(GV.IntVal.getRawData(), 2, false,
+ APFloat::rmTowardZero);
+ GV.IntVal = apf.convertToAPInt();
+ }
return GV;
}
case Instruction::SIToFP: {
GenericValue GV = getConstantValue(Op0);
if (CE->getType() == Type::FloatTy)
GV.FloatVal = float(GV.IntVal.signedRoundToDouble());
- else
+ else if (CE->getType() == Type::DoubleTy)
GV.DoubleVal = GV.IntVal.signedRoundToDouble();
+ else if (CE->getType() == Type::X86_FP80Ty) {
+ const uint64_t zero[] = { 0, 0};
+ APFloat apf = APFloat(APInt(80, 2, zero));
+ (void)apf.convertFromInteger(GV.IntVal.getRawData(), 2, true,
+ APFloat::rmTowardZero);
+ GV.IntVal = apf.convertToAPInt();
+ }
return GV;
}
case Instruction::FPToUI: // double->APInt conversion handles sign
@@ -407,8 +423,16 @@
uint32_t BitWidth = cast<IntegerType>(CE->getType())->getBitWidth();
if (Op0->getType() == Type::FloatTy)
GV.IntVal = APIntOps::RoundFloatToAPInt(GV.FloatVal, BitWidth);
- else
+ else if (Op0->getType() == Type::DoubleTy)
GV.IntVal = APIntOps::RoundDoubleToAPInt(GV.DoubleVal, BitWidth);
+ else if (Op0->getType() == Type::X86_FP80Ty) {
+ APFloat apf = APFloat(GV.IntVal);
+ uint64_t v;
+ (void)apf.convertToInteger(&v, BitWidth,
+ CE->getOpcode()==Instruction::FPToSI,
+ APFloat::rmTowardZero);
+ GV.IntVal = v; // endian?
+ }
return GV;
}
case Instruction::PtrToInt: {
@@ -512,6 +536,35 @@
GV.DoubleVal = ::fmod(LHS.DoubleVal,RHS.DoubleVal); break;
}
break;
+ case Type::X86_FP80TyID:
+ case Type::PPC_FP128TyID:
+ case Type::FP128TyID: {
+ APFloat apfLHS = APFloat(LHS.IntVal);
+ switch (CE->getOpcode()) {
+ default: assert(0 && "Invalid long double opcode"); abort();
+ case Instruction::Add:
+ apfLHS.add(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
+ GV.IntVal = apfLHS.convertToAPInt();
+ break;
+ case Instruction::Sub:
+ apfLHS.subtract(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
+ GV.IntVal = apfLHS.convertToAPInt();
+ break;
+ case Instruction::Mul:
+ apfLHS.multiply(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
+ GV.IntVal = apfLHS.convertToAPInt();
+ break;
+ case Instruction::FDiv:
+ apfLHS.divide(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
+ GV.IntVal = apfLHS.convertToAPInt();
+ break;
+ case Instruction::FRem:
+ apfLHS.mod(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
+ GV.IntVal = apfLHS.convertToAPInt();
+ break;
+ }
+ }
+ break;
}
return GV;
}
@@ -530,6 +583,11 @@
case Type::DoubleTyID:
Result.DoubleVal = cast<ConstantFP>(C)->getValueAPF().convertToDouble();
break;
+ case Type::X86_FP80TyID:
+ case Type::FP128TyID:
+ case Type::PPC_FP128TyID:
+ Result.IntVal = cast <ConstantFP>(C)->getValueAPF().convertToAPInt();
+ break;
case Type::IntegerTyID:
Result.IntVal = cast<ConstantInt>(C)->getValue();
break;
@@ -583,6 +641,17 @@
case Type::DoubleTyID:
*((double*)Ptr) = Val.DoubleVal;
break;
+ case Type::X86_FP80TyID: {
+ uint16_t *Dest = (uint16_t*)Ptr;
+ const uint16_t *Src = (uint16_t*)Val.IntVal.getRawData();
+ // This is endian dependent, but it will only work on x86 anyway.
+ Dest[0] = Src[4];
+ Dest[1] = Src[0];
+ Dest[2] = Src[1];
+ Dest[3] = Src[2];
+ Dest[4] = Src[3];
+ break;
+ }
case Type::PointerTyID:
*((PointerTy*)Ptr) = Val.PointerVal;
break;
@@ -620,6 +689,17 @@
case Type::PointerTyID:
Result.PointerVal = *((PointerTy*)Ptr);
break;
+ case Type::X86_FP80TyID: {
+ // This is endian dependent, but it will only work on x86 anyway.
+ uint16_t x[8], *p = (uint16_t*)Ptr;
+ x[0] = p[1];
+ x[1] = p[2];
+ x[2] = p[3];
+ x[3] = p[4];
+ x[4] = p[0];
+ Result.IntVal = APInt(80, 2, x);
+ break;
+ }
default:
cerr << "Cannot load value of type " << *Ty << "!\n";
abort();
Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=42043&r1=42042&r2=42043&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Mon Sep 17 13:44:13 2007
@@ -178,6 +178,11 @@
case Type::DoubleTyID:
rv.DoubleVal = ((double(*)())(intptr_t)FPtr)();
return rv;
+ case Type::X86_FP80TyID:
+ case Type::FP128TyID:
+ case Type::PPC_FP128TyID:
+ assert(0 && "long double not supported yet");
+ return rv;
case Type::PointerTyID:
return PTOGV(((void*(*)())(intptr_t)FPtr)());
}
@@ -209,7 +214,11 @@
case Type::FloatTyID: C = ConstantFP ::get(ArgTy, APFloat(AV.FloatVal));
break;
case Type::DoubleTyID: C = ConstantFP ::get(ArgTy, APFloat(AV.DoubleVal));
- break;
+ break;
+ case Type::PPC_FP128TyID:
+ case Type::X86_FP80TyID:
+ case Type::FP128TyID: C = ConstantFP ::get(ArgTy, APFloat(AV.IntVal));
+ break;
case Type::PointerTyID:
void *ArgPtr = GVTOP(AV);
if (sizeof(void*) == 4) {
More information about the llvm-commits
mailing list