[vmkit-commits] [vmkit] r77313 - in /vmkit/trunk/lib: JnJVM/Compiler/JavaAOTCompiler.cpp JnJVM/Compiler/JavaJIT.cpp Mvm/Compiler/JIT.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Jul 28 03:01:35 PDT 2009
Author: geoffray
Date: Tue Jul 28 05:01:17 2009
New Revision: 77313
URL: http://llvm.org/viewvc/llvm-project?rev=77313&view=rev
Log:
Move to new LLVM API.
Modified:
vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=77313&r1=77312&r2=77313&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Tue Jul 28 05:01:17 2009
@@ -360,11 +360,11 @@
field.getLongField(obj));
Elts.push_back(CI);
} else if (prim->isFloat()) {
- Constant* CF = Context.getConstantFP(Type::FloatTy,
+ Constant* CF = ConstantFP::get(Type::FloatTy,
field.getFloatField(obj));
Elts.push_back(CF);
} else if (prim->isDouble()) {
- Constant* CF = Context.getConstantFP(Type::DoubleTy,
+ Constant* CF = ConstantFP::get(Type::DoubleTy,
field.getDoubleField(obj));
Elts.push_back(CF);
} else {
@@ -390,9 +390,9 @@
if (Ty == Type::Int64Ty) {
Elts.push_back(ConstantInt::get(Ty, (uint64)ctpInfo->LongAt(idx)));
} else if (Ty == Type::DoubleTy) {
- Elts.push_back(Context.getConstantFP(Ty, ctpInfo->DoubleAt(idx)));
+ Elts.push_back(ConstantFP::get(Ty, ctpInfo->DoubleAt(idx)));
} else if (Ty == Type::FloatTy) {
- Elts.push_back(Context.getConstantFP(Ty, ctpInfo->FloatAt(idx)));
+ Elts.push_back(ConstantFP::get(Ty, ctpInfo->FloatAt(idx)));
} else {
Elts.push_back(ConstantInt::get(Ty, (uint64)ctpInfo->IntegerAt(idx)));
}
@@ -409,7 +409,7 @@
}
}
- return Context.getConstantStruct(STy, Elts);
+ return ConstantStruct::get(STy, Elts);
}
Constant* JavaAOTCompiler::getStaticInstance(Class* classDef) {
@@ -524,7 +524,7 @@
Constant* L = ConstantInt::get(Type::Int64Ty, 0);
Elmts.push_back(ConstantExpr::getIntToPtr(L, JnjvmModule::ptrType));
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
Constant* JavaAOTCompiler::CreateConstantFromJavaClass(CommonClass* cl) {
@@ -555,7 +555,7 @@
// constructor
Elmts.push_back(Context.getNullValue(JnjvmModule::JavaObjectType));
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
Constant* JavaAOTCompiler::CreateConstantFromJavaObject(JavaObject* obj) {
@@ -636,11 +636,11 @@
field.getLongField(obj));
TempElts.push_back(CI);
} else if (prim->isFloat()) {
- Constant* CF = Context.getConstantFP(Type::FloatTy,
+ Constant* CF = ConstantFP::get(Type::FloatTy,
field.getFloatField(obj));
TempElts.push_back(CF);
} else if (prim->isDouble()) {
- Constant* CF = Context.getConstantFP(Type::DoubleTy,
+ Constant* CF = ConstantFP::get(Type::DoubleTy,
field.getDoubleField(obj));
TempElts.push_back(CF);
} else {
@@ -657,7 +657,7 @@
}
}
}
- CurConstant = Context.getConstantStruct(STy, TempElts);
+ CurConstant = ConstantStruct::get(STy, TempElts);
}
return CurConstant;
@@ -691,7 +691,7 @@
Elmts.push_back(ConstantInt::get(Type::Int32Ty, str->cachedHashCode));
Elmts.push_back(ConstantInt::get(Type::Int32Ty, str->offset));
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
@@ -706,7 +706,7 @@
Elmts.push_back(Context.getNullValue(STy->getContainedType(2)));
Elmts.push_back(getEnveloppe(CN->enveloppe));
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
Constant* JavaAOTCompiler::CreateConstantFromEnveloppe(Enveloppe* val) {
@@ -731,7 +731,7 @@
Elmts.push_back(getNativeClass(val->classDef));
Elmts.push_back(firstCache);
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
@@ -752,7 +752,7 @@
// nbb
Elmts.push_back(ConstantInt::get(Type::Int32Ty, attribut.nbb));
- return Context.getConstantStruct(STy, Elmts);
+ return ConstantStruct::get(STy, Elmts);
}
Constant* JavaAOTCompiler::CreateConstantFromCommonClass(CommonClass* cl) {
@@ -823,7 +823,7 @@
TempTy = JnjvmModule::VTType;
CommonClassElts.push_back(Mod.getContext().getNullValue(TempTy));
}
- return Context.getConstantStruct(STy, CommonClassElts);
+ return ConstantStruct::get(STy, CommonClassElts);
}
Constant* JavaAOTCompiler::CreateConstantFromJavaField(JavaField& field) {
@@ -883,7 +883,7 @@
//JInfo
FieldElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
- return Context.getConstantStruct(STy, FieldElts);
+ return ConstantStruct::get(STy, FieldElts);
}
Constant* JavaAOTCompiler::CreateConstantFromJavaMethod(JavaMethod& method) {
@@ -961,7 +961,7 @@
//JInfo
MethodElts.push_back(Context.getNullValue(JnjvmModule::ptrType));
- return Context.getConstantStruct(STy, MethodElts);
+ return ConstantStruct::get(STy, MethodElts);
}
Constant* JavaAOTCompiler::CreateConstantFromClassPrimitive(ClassPrimitive* cl) {
@@ -978,7 +978,7 @@
// primSize
ClassElts.push_back(ConstantInt::get(Type::Int32Ty, cl->logSize));
- return Context.getConstantStruct(STy, ClassElts);
+ return ConstantStruct::get(STy, ClassElts);
}
Constant* JavaAOTCompiler::CreateConstantFromClassArray(ClassArray* cl) {
@@ -1000,7 +1000,7 @@
ClassElts.push_back(Cl);
- return Context.getConstantStruct(STy, ClassElts);
+ return ConstantStruct::get(STy, ClassElts);
}
Constant* JavaAOTCompiler::CreateConstantFromClass(Class* cl) {
@@ -1029,7 +1029,7 @@
TempElts.push_back(ConstantInt::get(Type::Int8Ty, status));
TempElts.push_back(ConstantInt::get(Type::Int1Ty, status == ready ? 1 : 0));
TempElts.push_back(getStaticInstance(cl));
- Constant* CStr[1] = { Context.getConstantStruct(TCMTy, TempElts) };
+ Constant* CStr[1] = { ConstantStruct::get(TCMTy, TempElts) };
TempElts.clear();
ClassElts.push_back(Context.getConstantArray(ATy, CStr, 1));
@@ -1218,7 +1218,7 @@
// JInfo
ClassElts.push_back(Mod.getContext().getNullValue(JnjvmModule::ptrType));
- return Context.getConstantStruct(STy, ClassElts);
+ return ConstantStruct::get(STy, ClassElts);
}
template<typename T>
@@ -1244,7 +1244,7 @@
if (Ty->isInteger()) {
Vals.push_back(ConstantInt::get(Ty, (uint64)val->elements[i]));
} else if (Ty->isFloatingPoint()) {
- Vals.push_back(Context.getConstantFP(Ty, (double)(size_t)val->elements[i]));
+ Vals.push_back(ConstantFP::get(Ty, (double)(size_t)val->elements[i]));
} else {
if (val->elements[i]) {
Vals.push_back(getFinalObject((JavaObject*)(size_t)val->elements[i]));
@@ -1256,7 +1256,7 @@
Cts.push_back(Context.getConstantArray(ATy, Vals));
- return Context.getConstantStruct(STy, Cts);
+ return ConstantStruct::get(STy, Cts);
}
Constant* JavaAOTCompiler::CreateConstantFromUTF8(const UTF8* val) {
@@ -1280,7 +1280,7 @@
Cts.push_back(Context.getConstantArray(ATy, Vals));
- return Context.getConstantStruct(STy, Cts);
+ return ConstantStruct::get(STy, Cts);
}
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp?rev=77313&r1=77312&r2=77313&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Tue Jul 28 05:01:17 2009
@@ -1215,13 +1215,13 @@
push(ConstantInt::get(Type::Int64Ty, ctpInfo->LongAt(index)),
false);
} else if (type == JavaConstantPool::ConstantDouble) {
- push(llvmContext->getConstantFP(Type::DoubleTy, ctpInfo->DoubleAt(index)),
+ push(ConstantFP::get(Type::DoubleTy, ctpInfo->DoubleAt(index)),
false);
} else if (type == JavaConstantPool::ConstantInteger) {
push(ConstantInt::get(Type::Int32Ty, ctpInfo->IntegerAt(index)),
false);
} else if (type == JavaConstantPool::ConstantFloat) {
- push(llvmContext->getConstantFP(Type::FloatTy, ctpInfo->FloatAt(index)),
+ push(ConstantFP::get(Type::FloatTy, ctpInfo->FloatAt(index)),
false);
} else if (type == JavaConstantPool::ConstantClass) {
UserCommonClass* cl = 0;
@@ -1936,10 +1936,10 @@
push(ConstantInt::get(Type::Int64Ty, val), false);
} else if (prim->isFloat()) {
float val = (float)field->getFloatField(Obj);
- push(llvmContext->getConstantFP(Type::FloatTy, val), false);
+ push(ConstantFP::get(Type::FloatTy, val), false);
} else if (prim->isDouble()) {
double val = (double)field->getDoubleField(Obj);
- push(llvmContext->getConstantFP(Type::DoubleTy, val), false);
+ push(ConstantFP::get(Type::DoubleTy, val), false);
} else {
abort();
}
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=77313&r1=77312&r2=77313&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Tue Jul 28 05:01:17 2009
@@ -116,26 +116,26 @@
constantMaxInt = ConstantInt::get(Type::Int32Ty, MaxInt);
constantMinLong = ConstantInt::get(Type::Int64Ty, MinLong);
constantMaxLong = ConstantInt::get(Type::Int64Ty, MaxLong);
- constantFloatZero = globalContext->getConstantFP(Type::FloatTy, 0.0f);
- constantFloatOne = globalContext->getConstantFP(Type::FloatTy, 1.0f);
- constantFloatTwo = globalContext->getConstantFP(Type::FloatTy, 2.0f);
- constantDoubleZero = globalContext->getConstantFP(Type::DoubleTy, 0.0);
- constantDoubleOne = globalContext->getConstantFP(Type::DoubleTy, 1.0);
- constantMaxIntFloat = globalContext->getConstantFP(Type::FloatTy, MaxIntFloat);
- constantMinIntFloat = globalContext->getConstantFP(Type::FloatTy, MinIntFloat);
- constantMinLongFloat = globalContext->getConstantFP(Type::FloatTy, MinLongFloat);
- constantMinLongDouble = globalContext->getConstantFP(Type::DoubleTy, MinLongDouble);
- constantMaxLongFloat = globalContext->getConstantFP(Type::FloatTy, MaxLongFloat);
- constantMaxIntDouble = globalContext->getConstantFP(Type::DoubleTy, MaxIntDouble);
- constantMinIntDouble = globalContext->getConstantFP(Type::DoubleTy, MinIntDouble);
- constantMaxLongDouble = globalContext->getConstantFP(Type::DoubleTy, MaxLongDouble);
- constantMaxLongDouble = globalContext->getConstantFP(Type::DoubleTy, MaxLongDouble);
- constantFloatInfinity = globalContext->getConstantFP(Type::FloatTy, MaxFloat);
- constantFloatMinusInfinity = globalContext->getConstantFP(Type::FloatTy, MinFloat);
- constantDoubleInfinity = globalContext->getConstantFP(Type::DoubleTy, MaxDouble);
- constantDoubleMinusInfinity = globalContext->getConstantFP(Type::DoubleTy, MinDouble);
- constantDoubleMinusZero = globalContext->getConstantFP(Type::DoubleTy, -0.0);
- constantFloatMinusZero = globalContext->getConstantFP(Type::FloatTy, -0.0f);
+ constantFloatZero = ConstantFP::get(Type::FloatTy, 0.0f);
+ constantFloatOne = ConstantFP::get(Type::FloatTy, 1.0f);
+ constantFloatTwo = ConstantFP::get(Type::FloatTy, 2.0f);
+ constantDoubleZero = ConstantFP::get(Type::DoubleTy, 0.0);
+ constantDoubleOne = ConstantFP::get(Type::DoubleTy, 1.0);
+ constantMaxIntFloat = ConstantFP::get(Type::FloatTy, MaxIntFloat);
+ constantMinIntFloat = ConstantFP::get(Type::FloatTy, MinIntFloat);
+ constantMinLongFloat = ConstantFP::get(Type::FloatTy, MinLongFloat);
+ constantMinLongDouble = ConstantFP::get(Type::DoubleTy, MinLongDouble);
+ constantMaxLongFloat = ConstantFP::get(Type::FloatTy, MaxLongFloat);
+ constantMaxIntDouble = ConstantFP::get(Type::DoubleTy, MaxIntDouble);
+ constantMinIntDouble = ConstantFP::get(Type::DoubleTy, MinIntDouble);
+ constantMaxLongDouble = ConstantFP::get(Type::DoubleTy, MaxLongDouble);
+ constantMaxLongDouble = ConstantFP::get(Type::DoubleTy, MaxLongDouble);
+ constantFloatInfinity = ConstantFP::get(Type::FloatTy, MaxFloat);
+ constantFloatMinusInfinity = ConstantFP::get(Type::FloatTy, MinFloat);
+ constantDoubleInfinity = ConstantFP::get(Type::DoubleTy, MaxDouble);
+ constantDoubleMinusInfinity = ConstantFP::get(Type::DoubleTy, MinDouble);
+ constantDoubleMinusZero = ConstantFP::get(Type::DoubleTy, -0.0);
+ constantFloatMinusZero = ConstantFP::get(Type::FloatTy, -0.0f);
constantThreadIDMask = ConstantInt::get(pointerSizeType, mvm::Thread::IDMask);
constantStackOverflowMask =
ConstantInt::get(pointerSizeType, mvm::Thread::StackOverflowMask);
More information about the vmkit-commits
mailing list