[vmkit-commits] [vmkit] r76732 - in /vmkit/trunk/lib: JnJVM/Compiler/JavaAOTCompiler.cpp JnJVM/Compiler/JavaJIT.h JnJVM/Compiler/JavaJITOpcodes.cpp JnJVM/Compiler/LowerConstantCalls.cpp N3/VMCore/CLIJit.cpp N3/VMCore/LowerArrayLength.cpp N3/VMCore/Opcodes.cpp N3/VMCore/VMCache.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Jul 22 02:35:34 PDT 2009
Author: geoffray
Date: Wed Jul 22 04:35:27 2009
New Revision: 76732
URL: http://llvm.org/viewvc/llvm-project?rev=76732&view=rev
Log:
Move to new LLVM API.
Modified:
vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h
vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp
vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp
vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
vmkit/trunk/lib/N3/VMCore/VMCache.cpp
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Wed Jul 22 04:35:27 2009
@@ -783,7 +783,7 @@
}
ATy = ArrayType::get(JnjvmModule::JavaClassType, cl->nbInterfaces);
- Constant* interfaces = ConstantArray::get(ATy, TempElmts);
+ Constant* interfaces = Context.getConstantArray(ATy, TempElmts);
interfaces = new GlobalVariable(Mod, ATy, true,
GlobalValue::InternalLinkage,
interfaces, "");
@@ -855,7 +855,7 @@
TempElts.push_back(CreateConstantFromAttribut(field.attributs[i]));
}
- Constant* attributs = ConstantArray::get(ATy, TempElts);
+ Constant* attributs = Context.getConstantArray(ATy, TempElts);
TempElts.clear();
attributs = new GlobalVariable(*getLLVMModule(), ATy, true,
GlobalValue::InternalLinkage,
@@ -909,7 +909,7 @@
TempElts.push_back(CreateConstantFromAttribut(method.attributs[i]));
}
- Constant* attributs = ConstantArray::get(ATy, TempElts);
+ Constant* attributs = Context.getConstantArray(ATy, TempElts);
TempElts.clear();
attributs = new GlobalVariable(Mod, ATy, true,
GlobalValue::InternalLinkage,
@@ -1061,7 +1061,7 @@
Constant* fields = 0;
if (cl->nbStaticFields + cl->nbVirtualFields) {
- fields = ConstantArray::get(ATy, TempElts);
+ fields = Context.getConstantArray(ATy, TempElts);
TempElts.clear();
fields = new GlobalVariable(Mod, ATy, false,
GlobalValue::InternalLinkage,
@@ -1108,7 +1108,7 @@
Constant* methods = 0;
if (cl->nbVirtualMethods + cl->nbStaticMethods) {
- methods = ConstantArray::get(ATy, TempElts);
+ methods = Context.getConstantArray(ATy, TempElts);
TempElts.clear();
GlobalVariable* GV = new GlobalVariable(Mod, ATy, false,
GlobalValue::InternalLinkage,
@@ -1153,7 +1153,7 @@
TempElts.push_back(CreateConstantFromAttribut(cl->attributs[i]));
}
- Constant* attributs = ConstantArray::get(ATy, TempElts);
+ Constant* attributs = Context.getConstantArray(ATy, TempElts);
TempElts.clear();
attributs = new GlobalVariable(*getLLVMModule(), ATy, true,
GlobalValue::InternalLinkage,
@@ -1176,7 +1176,7 @@
const llvm::Type* TempTy = JnjvmModule::JavaClassType;
ATy = ArrayType::get(TempTy, cl->nbInnerClasses);
- Constant* innerClasses = ConstantArray::get(ATy, TempElts);
+ Constant* innerClasses = Context.getConstantArray(ATy, TempElts);
innerClasses = new GlobalVariable(*getLLVMModule(), ATy, true,
GlobalValue::InternalLinkage,
innerClasses, "");
@@ -1253,7 +1253,7 @@
}
}
- Cts.push_back(ConstantArray::get(ATy, Vals));
+ Cts.push_back(Context.getConstantArray(ATy, Vals));
return ConstantStruct::get(STy, Cts);
}
@@ -1277,7 +1277,7 @@
Vals.push_back(Context.getConstantInt(Type::Int16Ty, val->elements[i]));
}
- Cts.push_back(ConstantArray::get(ATy, Vals));
+ Cts.push_back(Context.getConstantArray(ATy, Vals));
return ConstantStruct::get(STy, Cts);
@@ -1389,7 +1389,7 @@
Constant* Cl = getVirtualTable(VT->secondaryTypes[i]);
TempElmts.push_back(Cl);
}
- Constant* display = ConstantArray::get(DTy, TempElmts);
+ Constant* display = Context.getConstantArray(DTy, TempElmts);
TempElmts.clear();
display = new GlobalVariable(*getLLVMModule(), DTy, true,
@@ -1422,7 +1422,7 @@
}
}
- Constant* Array = ConstantArray::get(ATy, Elemts);
+ Constant* Array = Context.getConstantArray(ATy, Elemts);
return Array;
}
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h Wed Jul 22 04:35:27 2009
@@ -63,7 +63,7 @@
TheCompiler = C;
module = TheCompiler->getIntrinsics();
llvmFunction = func;
- llvmContext = func->getContext();
+ llvmContext = &func->getContext();
inlining = false;
callsStackWalker = false;
endNode = 0;
Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp Wed Jul 22 04:35:27 2009
@@ -2056,7 +2056,7 @@
} else {
BasicBlock* ifFalse = createBasicBlock("false type compare");
BranchInst::Create(endBlock, ifFalse, cmp, currentBlock);
- node->addIncoming(llvmContext->getConstantIntFalse(), currentBlock);
+ node->addIncoming(llvmContext->getFalse(), currentBlock);
currentBlock = ifFalse;
}
Modified: vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/LowerConstantCalls.cpp Wed Jul 22 04:35:27 2009
@@ -119,7 +119,7 @@
JavaLLVMCompiler* TheCompiler =
(JavaLLVMCompiler*)meth->classDef->classLoader->getCompiler();
JnjvmModule* module = TheCompiler->getIntrinsics();
- LLVMContext* Context = F.getContext();
+ LLVMContext* Context = &F.getContext();
bool Changed = false;
for (Function::iterator BI = F.begin(), BE = F.end(); BI != BE; BI++) {
BasicBlock *Cur = BI;
@@ -132,7 +132,7 @@
Value* Arg = Cmp->getOperand(0);
if (isVirtual(meth->access) && Arg == F.arg_begin()) {
Changed = true;
- Cmp->replaceAllUsesWith(Context->getConstantIntFalse());
+ Cmp->replaceAllUsesWith(Context->getFalse());
Cmp->eraseFromParent();
break;
}
@@ -141,7 +141,7 @@
Instruction* CI = Ca.getInstruction();
if (CI && Ca.getCalledValue() == module->JavaObjectAllocateFunction) {
Changed = true;
- Cmp->replaceAllUsesWith(Context->getConstantIntFalse());
+ Cmp->replaceAllUsesWith(Context->getFalse());
Cmp->eraseFromParent();
break;
}
@@ -472,14 +472,13 @@
} else if (V == module->GetArrayClassFunction) {
const llvm::Type* Ty =
PointerType::getUnqual(module->JavaCommonClassType);
- Constant* nullValue = F.getContext()->getNullValue(Ty);
+ Constant* nullValue = Context->getNullValue(Ty);
// Check if we have already proceed this call.
if (Call.getArgument(1) == nullValue) {
BasicBlock* NBB = II->getParent()->splitBasicBlock(II);
I->getParent()->getTerminator()->eraseFromParent();
- Constant* init =
- F.getContext()->getNullValue(module->JavaClassArrayType);
+ Constant* init = Context->getNullValue(module->JavaClassArrayType);
GlobalVariable* GV =
new GlobalVariable(*(F.getParent()), module->JavaClassArrayType,
false, GlobalValue::ExternalLinkage,
@@ -551,7 +550,7 @@
Value* res = new ICmpInst(CI, ICmpInst::ICMP_EQ, CurVT, VT2, "");
- node->addIncoming(Context->getConstantIntTrue(), CI->getParent());
+ node->addIncoming(Context->getTrue(), CI->getParent());
BranchInst::Create(CurEndBlock, FailedBlock, res, CI);
Value* Args[2] = { VT1, VT2 };
@@ -670,9 +669,9 @@
// Final block, that gets the result.
PHINode* node = PHINode::Create(Type::Int1Ty, "", BB9);
node->reserveOperandSpace(3);
- node->addIncoming(Context->getConstantIntTrue(), CI->getParent());
- node->addIncoming(Context->getConstantIntFalse(), BB7);
- node->addIncoming(Context->getConstantIntTrue(), BB5);
+ node->addIncoming(Context->getTrue(), CI->getParent());
+ node->addIncoming(Context->getFalse(), BB7);
+ node->addIncoming(Context->getTrue(), BB5);
// Don't forget to jump to the next block.
BranchInst::Create(EndBlock, BB9);
Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Wed Jul 22 04:35:27 2009
@@ -113,7 +113,7 @@
args.push_back(zero);
if (boxed) {
ConstantInt* CI = dyn_cast<ConstantInt>(field->offset);
- args.push_back(llvmFunction->getContext()->getConstantInt(CI->getValue() + 1));
+ args.push_back(llvmFunction->getContext().getConstantInt(CI->getValue() + 1));
} else {
args.push_back(field->offset);
}
@@ -125,7 +125,7 @@
args.push_back(zero);
if (boxed) {
ConstantInt* CI = dyn_cast<ConstantInt>(field->offset);
- args.push_back(llvmFunction->getContext()->getConstantInt(CI->getValue() + 1));
+ args.push_back(llvmFunction->getContext().getConstantInt(CI->getValue() + 1));
} else {
args.push_back(field->offset);
}
@@ -631,7 +631,7 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(obj, module->ptrType, "", currentBlock));
params.push_back(module->constantInt8Zero);
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memset_i32, params.begin(), params.end(),
"", currentBlock);
@@ -738,14 +738,14 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(ptr, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
params.push_back(new BitCastInst(val, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(), "", currentBlock);
} else {
type = field->signature->naturalType;
if (val == constantVMObjectNull) {
- val = llvmFunction->getContext()->getNullValue(type);
+ val = llvmFunction->getContext().getNullValue(type);
} else if (type != valType) {
val = changeType(val, type);
}
@@ -771,7 +771,7 @@
const Type* type = field->signature->naturalType;
const Type* valType = val->getType();
if (val == constantVMObjectNull) {
- val = llvmFunction->getContext()->getNullValue(type);
+ val = llvmFunction->getContext().getNullValue(type);
} else if (type != valType) {
val = changeType(val, type);
}
@@ -780,7 +780,7 @@
void CLIJit::JITVerifyNull(Value* obj) {
CLIJit* jit = this;
- Constant* zero = llvmFunction->getContext()->getNullValue(obj->getType());
+ Constant* zero = llvmFunction->getContext().getNullValue(obj->getType());
Value* test = new ICmpInst(*jit->currentBlock, ICmpInst::ICMP_EQ, obj,
zero, "");
@@ -950,7 +950,7 @@
void* natPtr = NativeUtil::nativeLookup(compilingClass, compilingMethod);
Value* valPtr =
- ConstantExpr::getIntToPtr(llvmFunction->getContext()->getConstantInt(Type::Int64Ty, (uint64)natPtr),
+ ConstantExpr::getIntToPtr(llvmFunction->getContext().getConstantInt(Type::Int64Ty, (uint64)natPtr),
PointerType::getUnqual(funcType));
Value* result = CallInst::Create(valPtr, nativeArgs.begin(),
@@ -1225,7 +1225,7 @@
cl->resolveType(false, false, genMethod);
AllocaInst* alloc = new AllocaInst(cl->naturalType, "", currentBlock);
if (cl->naturalType->isSingleValueType()) {
- new StoreInst(llvmFunction->getContext()->getNullValue(cl->naturalType), alloc, false,
+ new StoreInst(llvmFunction->getContext().getNullValue(cl->naturalType), alloc, false,
currentBlock);
} else {
uint64 size = module->getTypeSize(cl->naturalType);
@@ -1234,7 +1234,7 @@
params.push_back(new BitCastInst(alloc, module->ptrType, "",
currentBlock));
params.push_back(module->constantInt8Zero);
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memset_i32, params.begin(),
params.end(), "", currentBlock);
@@ -1282,7 +1282,7 @@
currentBlock));
params.push_back(new BitCastInst(endNode, module->ptrType, "",
currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantFour);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(),
"", currentBlock);
@@ -1402,7 +1402,7 @@
cl->resolveType(false, false, genMethod);
AllocaInst* alloc = new AllocaInst(cl->naturalType, "", currentBlock);
if (cl->naturalType->isSingleValueType()) {
- new StoreInst(llvmFunction->getContext()->getNullValue(cl->naturalType), alloc, false,
+ new StoreInst(llvmFunction->getContext().getNullValue(cl->naturalType), alloc, false,
currentBlock);
} else {
uint64 size = module->getTypeSize(cl->naturalType);
@@ -1411,7 +1411,7 @@
params.push_back(new BitCastInst(alloc, module->ptrType, "",
currentBlock));
params.push_back(module->constantInt8Zero);
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memset_i32, params.begin(),
params.end(), "", currentBlock);
Modified: vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp Wed Jul 22 04:35:27 2009
@@ -46,7 +46,7 @@
Changed = true;
Value* val = CI->getOperand(1); // get the array
std::vector<Value*> args; //size= 2
- args.push_back(F.getContext()->getConstantInt(Type::Int32Ty, 0));
+ args.push_back(F.getContext().getConstantInt(Type::Int32Ty, 0));
args.push_back(n3::VMArray::sizeOffset());
Value* ptr = GetElementPtrInst::Create(val, args.begin(), args.end(),
"", CI);
Modified: vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Opcodes.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Opcodes.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Opcodes.cpp Wed Jul 22 04:35:27 2009
@@ -176,7 +176,7 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(local, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
params.push_back(new BitCastInst(val, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(), "", currentBlock);
} else {
@@ -195,7 +195,7 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(ret, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
params.push_back(new BitCastInst(val, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(), "", currentBlock);
return ret;
@@ -230,13 +230,13 @@
#if N3_EXECUTE > 1
if (bytecodes[i] == 0xFE) {
std::vector<llvm::Value*> args;
- args.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, (int64_t)OpcodeNamesFE[bytecodes[i + 1]]));
- args.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, (int64_t)compilingMethod));
+ args.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, (int64_t)OpcodeNamesFE[bytecodes[i + 1]]));
+ args.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, (int64_t)compilingMethod));
CallInst::Create(printExecutionLLVM, args.begin(), args.end(), "", currentBlock);
} else {
std::vector<llvm::Value*> args;
- args.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, (int64_t)OpcodeNames[bytecodes[i]]));
- args.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, (int64_t)compilingMethod));
+ args.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, (int64_t)OpcodeNames[bytecodes[i]]));
+ args.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, (int64_t)compilingMethod));
CallInst::Create(printExecutionLLVM, args.begin(), args.end(), "", currentBlock);
}
#endif
@@ -343,7 +343,7 @@
#define TEST(name, read, cmpf, cmpi, offset) case name : { \
uint32 tmp = i; \
Value* val2 = pop(); \
- Value* val1 = llvmFunction->getContext()->getNullValue(val2->getType()); \
+ Value* val1 = llvmFunction->getContext().getNullValue(val2->getType()); \
BasicBlock* ifTrue = opcodeInfos[tmp + offset + read(bytecodes, i)].newBlock; \
Value* test = 0; \
if (val1->getType()->isFloatingPoint()) { \
@@ -705,7 +705,7 @@
uint32 index = 0;
for (std::vector<BasicBlock*>::iterator i = leaves.begin(),
e = leaves.end(); i!= e; ++i, ++index) {
- inst->addCase(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, index), *i);
+ inst->addCase(llvmFunction->getContext().getConstantInt(Type::Int32Ty, index), *i);
}
//currentBlock = bb2;
@@ -749,22 +749,22 @@
}
case LDC_I4 : {
- push(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, readS4(bytecodes, i)));
+ push(llvmFunction->getContext().getConstantInt(Type::Int32Ty, readS4(bytecodes, i)));
break;
}
case LDC_I8 : {
- push(llvmFunction->getContext()->getConstantInt(Type::Int64Ty, readS8(bytecodes, i)));
+ push(llvmFunction->getContext().getConstantInt(Type::Int64Ty, readS8(bytecodes, i)));
break;
}
case LDC_R4 : {
- push(llvmFunction->getContext()->getConstantFP(Type::FloatTy, readFloat(bytecodes, i)));
+ push(llvmFunction->getContext().getConstantFP(Type::FloatTy, readFloat(bytecodes, i)));
break;
}
case LDC_R8 : {
- push(llvmFunction->getContext()->getConstantFP(Type::DoubleTy, readDouble(bytecodes, i)));
+ push(llvmFunction->getContext().getConstantFP(Type::DoubleTy, readDouble(bytecodes, i)));
break;
}
@@ -819,7 +819,7 @@
}
case LDC_I4_S : {
- push(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, readS1(bytecodes, i)));
+ push(llvmFunction->getContext().getConstantInt(Type::Int32Ty, readS1(bytecodes, i)));
break;
}
@@ -954,7 +954,7 @@
}
if (res) {
Value* expr = ConstantExpr::getIntToPtr(
- llvmFunction->getContext()->getConstantInt(Type::Int64Ty,
+ llvmFunction->getContext().getConstantInt(Type::Int64Ty,
uint64_t (leaveIndex++)),
VMObject::llvmType);
@@ -986,7 +986,7 @@
}
if (res) {
Value* expr = ConstantExpr::getIntToPtr(
- llvmFunction->getContext()->getConstantInt(Type::Int64Ty,
+ llvmFunction->getContext().getConstantInt(Type::Int64Ty,
uint64_t (leaveIndex++)),
VMObject::llvmType);
@@ -1022,7 +1022,7 @@
case NEG : {
Value* val = pop();
push(BinaryOperator::CreateSub(
- llvmFunction->getContext()->getNullValue(val->getType()),
+ llvmFunction->getContext().getNullValue(val->getType()),
val, "", currentBlock));
break;
}
@@ -1030,7 +1030,7 @@
case NOP : break;
case NOT : {
- push(BinaryOperator::CreateNot(*(llvmFunction->getContext()), pop(), "", currentBlock));
+ push(BinaryOperator::CreateNot(llvmFunction->getContext(), pop(), "", currentBlock));
break;
}
@@ -1262,7 +1262,7 @@
sint32 index = next + offset;
assert(index > 0);
BasicBlock* BB = opcodeInfos[index].newBlock;
- SI->addCase(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, t), BB);
+ SI->addCase(llvmFunction->getContext().getConstantInt(Type::Int32Ty, t), BB);
}
break;
}
@@ -1313,7 +1313,7 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(ptr, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
params.push_back(new BitCastInst(val, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(), "", currentBlock);
@@ -1385,8 +1385,8 @@
Value* obj = pop();
Value* cmp = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, obj,
- llvmFunction->getContext()->getNullValue(obj->getType()), "");
- Constant* nullVirtual = llvmFunction->getContext()->getNullValue(dcl->virtualType);
+ llvmFunction->getContext().getNullValue(obj->getType()), "");
+ Constant* nullVirtual = llvmFunction->getContext().getNullValue(dcl->virtualType);
BasicBlock* isInstEndBlock = createBasicBlock("end isinst");
@@ -1580,7 +1580,7 @@
uint32 value = readU4(bytecodes, i);
uint32 index = value & 0xfffffff;
const UTF8* utf8 = compilingClass->assembly->readUserString(index);
- Value* val = ConstantExpr::getIntToPtr(llvmFunction->getContext()->getConstantInt(Type::Int64Ty, (int64_t)utf8),
+ Value* val = ConstantExpr::getIntToPtr(llvmFunction->getContext().getConstantInt(Type::Int64Ty, (int64_t)utf8),
module->ptrType);
Value* res = CallInst::Create(newStringLLVM, val, "", currentBlock);
/*CLIString * str =
@@ -1812,7 +1812,7 @@
std::vector<Value*> params;
params.push_back(new BitCastInst(val, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
params.push_back(new BitCastInst(ptr, PointerType::getUnqual(Type::Int8Ty), "", currentBlock));
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memcpy_i32, params.begin(), params.end(), "", currentBlock);
@@ -1963,7 +1963,7 @@
params.push_back(new BitCastInst(pop(), module->ptrType, "",
currentBlock));
params.push_back(module->constantInt8Zero);
- params.push_back(llvmFunction->getContext()->getConstantInt(Type::Int32Ty, size));
+ params.push_back(llvmFunction->getContext().getConstantInt(Type::Int32Ty, size));
params.push_back(module->constantZero);
CallInst::Create(module->llvm_memset_i32, params.begin(),
params.end(), "", currentBlock);
Modified: vmkit/trunk/lib/N3/VMCore/VMCache.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMCache.cpp?rev=76732&r1=76731&r2=76732&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMCache.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMCache.cpp Wed Jul 22 04:35:27 2009
@@ -92,7 +92,7 @@
Value* five = module->constantFive;
Value* llvmEnv =
- ConstantExpr::getIntToPtr(llvmFunction->getContext()->getConstantInt(Type::Int64Ty, uint64_t (enveloppe)),
+ ConstantExpr::getIntToPtr(llvmFunction->getContext().getConstantInt(Type::Int64Ty, uint64_t (enveloppe)),
Enveloppe::llvmType);
std::vector<Value*> args1;
More information about the vmkit-commits
mailing list