[vmkit-commits] [vmkit] r136136 - in /vmkit/trunk/lib/J3/Compiler: JavaJIT.cpp JavaJITOpcodes.cpp LowerConstantCalls.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Jul 26 13:51:47 PDT 2011
Author: geoffray
Date: Tue Jul 26 15:51:46 2011
New Revision: 136136
URL: http://llvm.org/viewvc/llvm-project?rev=136136&view=rev
Log:
Update to new LLVM API.
Modified:
vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=136136&r1=136135&r2=136136&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Tue Jul 26 15:51:46 2011
@@ -173,7 +173,7 @@
Value* VT = CallInst::Create(intrinsics->GetVTFunction, args[0], "",
currentBlock);
- Value* FuncPtr = GetElementPtrInst::Create(VT, indexes2, indexes2 + 2, "", currentBlock);
+ Value* FuncPtr = GetElementPtrInst::Create(VT, indexes2, "", currentBlock);
Value* Func = new LoadInst(FuncPtr, "", currentBlock);
@@ -224,7 +224,7 @@
intrinsics->OffsetThreadInMutatorThreadConstant,
intrinsics->OffsetIsolateIDInThreadConstant };
- return GetElementPtrInst::Create(mutatorThreadPtr, GEP, GEP + 3, "", currentBlock);
+ return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
}
llvm::Value* JavaJIT::getVMPtr(llvm::Value* mutatorThreadPtr) {
@@ -232,7 +232,7 @@
intrinsics->OffsetThreadInMutatorThreadConstant,
intrinsics->OffsetVMInThreadConstant };
- return GetElementPtrInst::Create(mutatorThreadPtr, GEP, GEP + 3, "", currentBlock);
+ return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
}
llvm::Value* JavaJIT::getDoYieldPtr(llvm::Value* mutatorThreadPtr) {
@@ -240,7 +240,7 @@
intrinsics->OffsetThreadInMutatorThreadConstant,
intrinsics->OffsetDoYieldInThreadConstant };
- return GetElementPtrInst::Create(mutatorThreadPtr, GEP, GEP + 3, "", currentBlock);
+ return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
}
llvm::Value* JavaJIT::getCXXExceptionPtr(llvm::Value* mutatorThreadPtr) {
@@ -248,21 +248,21 @@
intrinsics->OffsetThreadInMutatorThreadConstant,
intrinsics->OffsetCXXExceptionInThreadConstant };
- return GetElementPtrInst::Create(mutatorThreadPtr, GEP, GEP + 3, "", currentBlock);
+ return GetElementPtrInst::Create(mutatorThreadPtr, GEP, "", currentBlock);
}
llvm::Value* JavaJIT::getJNIEnvPtr(llvm::Value* javaThreadPtr) {
Value* GEP[2] = { intrinsics->constantZero,
intrinsics->OffsetJNIInJavaThreadConstant };
- return GetElementPtrInst::Create(javaThreadPtr, GEP, GEP + 2, "", currentBlock);
+ return GetElementPtrInst::Create(javaThreadPtr, GEP, "", currentBlock);
}
llvm::Value* JavaJIT::getJavaExceptionPtr(llvm::Value* javaThreadPtr) {
Value* GEP[2] = { intrinsics->constantZero,
intrinsics->OffsetJavaExceptionInJavaThreadConstant };
- return GetElementPtrInst::Create(javaThreadPtr, GEP, GEP + 2, "", currentBlock);
+ return GetElementPtrInst::Create(javaThreadPtr, GEP, "", currentBlock);
}
@@ -531,8 +531,7 @@
std::vector<Value*> gep;
gep.push_back(intrinsics->constantZero);
gep.push_back(intrinsics->JavaObjectLockOffsetConstant);
- Value* lockPtr = GetElementPtrInst::Create(obj, gep.begin(), gep.end(), "",
- currentBlock);
+ Value* lockPtr = GetElementPtrInst::Create(obj, gep, "", currentBlock);
Value* lock = new LoadInst(lockPtr, "", currentBlock);
lock = new PtrToIntInst(lock, intrinsics->pointerSizeType, "", currentBlock);
@@ -579,8 +578,7 @@
std::vector<Value*> gep;
gep.push_back(intrinsics->constantZero);
gep.push_back(intrinsics->JavaObjectLockOffsetConstant);
- Value* lockPtr = GetElementPtrInst::Create(obj, gep.begin(), gep.end(), "",
- currentBlock);
+ Value* lockPtr = GetElementPtrInst::Create(obj, gep, "", currentBlock);
lockPtr = new BitCastInst(lockPtr,
PointerType::getUnqual(intrinsics->pointerSizeType),
"", currentBlock);
@@ -1282,8 +1280,7 @@
Value* val = new BitCastInst(obj, arrayType, "", currentBlock);
Value* indexes[3] = { zero, intrinsics->JavaArrayElementsOffsetConstant, index };
- Value* ptr = GetElementPtrInst::Create(val, indexes, indexes + 3, "",
- currentBlock);
+ Value* ptr = GetElementPtrInst::Create(val, indexes, "", currentBlock);
return ptr;
@@ -1748,8 +1745,7 @@
Value* objectConvert = new BitCastInst(object, type, "", currentBlock);
Value* args[2] = { intrinsics->constantZero, LFI->getOffset() };
- Value* ptr = llvm::GetElementPtrInst::Create(objectConvert,
- args, args + 2, "",
+ Value* ptr = llvm::GetElementPtrInst::Create(objectConvert, args, "",
currentBlock);
return ptr;
}
@@ -1773,7 +1769,7 @@
object, "", TheCompiler->useCooperativeGC(), currentBlock);
Value* tmp = new BitCastInst(object, Pty, "", currentBlock);
Value* args[2] = { zero, ptr };
- ptr = GetElementPtrInst::Create(tmp, args, args + 2, "", currentBlock);
+ ptr = GetElementPtrInst::Create(tmp, args, "", currentBlock);
}
return new BitCastInst(ptr, fieldTypePtr, "", currentBlock);
@@ -2046,7 +2042,7 @@
Value* indices[2] = { intrinsics->constantZero, Index };
- Instruction* ptr_18 = GetElementPtrInst::Create(IMT, indices, indices + 2, "",
+ Instruction* ptr_18 = GetElementPtrInst::Create(IMT, indices, "",
currentBlock);
Instruction* int32_19 = new LoadInst(ptr_18, "", false, currentBlock);
int32_19 = new PtrToIntInst(int32_19, intrinsics->pointerSizeType, "",
@@ -2198,8 +2194,7 @@
ptr_21_indices.push_back(intrinsics->constantZero);
ptr_21_indices.push_back(intrinsics->OffsetAccessInCommonClassConstant);
Instruction* ptr_21 =
- GetElementPtrInst::Create(ptr_20, ptr_21_indices.begin(),
- ptr_21_indices.end(), "", label_bb);
+ GetElementPtrInst::Create(ptr_20, ptr_21_indices, "", label_bb);
LoadInst* int32_22 = new LoadInst(ptr_21, "", false, label_bb);
Value* cmp = BinaryOperator::CreateAnd(int32_22, intrinsics->IsArrayConstant, "",
label_bb);
@@ -2255,16 +2250,14 @@
intrinsics->OffsetBaseClassInArrayClassConstant };
Instruction* temp = new BitCastInst(ptr_20, intrinsics->JavaClassArrayType, "",
log_label_entry);
- Instruction* ptr_10 = GetElementPtrInst::Create(temp, ptr_10_indices,
- ptr_10_indices + 2, "",
+ Instruction* ptr_10 = GetElementPtrInst::Create(temp, ptr_10_indices, "",
log_label_entry);
LoadInst* ptr_11 = new LoadInst(ptr_10, "", false, log_label_entry);
Value* ptr_12_indices[2] = { intrinsics->constantZero,
intrinsics->OffsetAccessInCommonClassConstant };
- Instruction* ptr_12 = GetElementPtrInst::Create(ptr_11, ptr_12_indices,
- ptr_12_indices + 2, "",
+ Instruction* ptr_12 = GetElementPtrInst::Create(ptr_11, ptr_12_indices, "",
log_label_entry);
LoadInst* int16_13 = new LoadInst(ptr_12, "", false, log_label_entry);
@@ -2282,8 +2275,7 @@
temp = new BitCastInst(ptr_11, intrinsics->JavaClassPrimitiveType, "",
log_label_bb);
GetElementPtrInst* ptr_18 = GetElementPtrInst::Create(temp, ptr_11_indices,
- ptr_11_indices + 2, "",
- log_label_bb);
+ "", log_label_bb);
LoadInst* int32_20 = new LoadInst(ptr_18, "", false, log_label_bb);
int32_start = BinaryOperator::CreateShl(int32_start, int32_20, "",
@@ -2302,11 +2294,11 @@
Value* indexes[3] = { intrinsics->constantZero,
intrinsics->JavaArrayElementsOffsetConstant,
int32_start };
- Instruction* ptr_42 = GetElementPtrInst::Create(ptr_src, indexes, indexes + 3,
+ Instruction* ptr_42 = GetElementPtrInst::Create(ptr_src, indexes,
"", log_label_bb);
indexes[2] = int32_start2;
- Instruction* ptr_44 = GetElementPtrInst::Create(ptr_dst, indexes, indexes + 3,
+ Instruction* ptr_44 = GetElementPtrInst::Create(ptr_dst, indexes,
"", log_label_bb);
BranchInst::Create(label_memmove, log_label_bb);
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=136136&r1=136135&r2=136136&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Tue Jul 26 15:51:46 2011
@@ -2162,8 +2162,7 @@
// Set the size
Value* gep4[2] = { intrinsics->constantZero,
intrinsics->JavaArraySizeOffsetConstant };
- Value* GEP = GetElementPtrInst::Create(cast, gep4, gep4 + 2,
- "", currentBlock);
+ Value* GEP = GetElementPtrInst::Create(cast, gep4, "", currentBlock);
arg1 = new IntToPtrInst(arg1, intrinsics->ptrType, "", currentBlock);
new StoreInst(arg1, GEP, currentBlock);
Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=136136&r1=136135&r2=136136&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Tue Jul 26 15:51:46 2011
@@ -39,12 +39,11 @@
static Value* getTCM(J3Intrinsics* intrinsics, Value* Arg, Instruction* CI) {
Value* GEP[2] = { intrinsics->constantZero,
intrinsics->OffsetTaskClassMirrorInClassConstant };
- Value* TCMArray = GetElementPtrInst::Create(Arg, GEP, GEP + 2, "", CI);
+ Value* TCMArray = GetElementPtrInst::Create(Arg, GEP, "", CI);
Value* GEP2[2] = { intrinsics->constantZero, intrinsics->constantZero };
- Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, GEP2 + 2, "",
- CI);
+ Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, "", CI);
return TCM;
}
@@ -52,12 +51,11 @@
static Value* getDelegatee(J3Intrinsics* intrinsics, Value* Arg, Instruction* CI) {
Value* GEP[2] = { intrinsics->constantZero,
intrinsics->constantZero };
- Value* TCMArray = GetElementPtrInst::Create(Arg, GEP, GEP + 2, "", CI);
+ Value* TCMArray = GetElementPtrInst::Create(Arg, GEP, "", CI);
Value* GEP2[2] = { intrinsics->constantZero, intrinsics->constantZero };
- Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, GEP2 + 2, "",
- CI);
+ Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, "", CI);
return new LoadInst(TCM, "", CI);
}
@@ -170,8 +168,7 @@
"", CI);
Value* args[2] = { intrinsics->constantZero,
intrinsics->JavaArraySizeOffsetConstant };
- Value* ptr = GetElementPtrInst::Create(array, args, args + 2,
- "", CI);
+ Value* ptr = GetElementPtrInst::Create(array, args, "", CI);
Value* load = new LoadInst(ptr, "", CI);
load = new PtrToIntInst(load, Type::getInt32Ty(*Context), "", CI);
CI->replaceAllUsesWith(load);
@@ -180,8 +177,7 @@
Changed = true;
Value* val = Call.getArgument(0); // get the object
Value* indexes[2] = { intrinsics->constantZero, intrinsics->constantZero };
- Value* VTPtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
CI->replaceAllUsesWith(VT);
CI->eraseFromParent();
@@ -190,8 +186,7 @@
Value* val = Call.getArgument(0); // get the VT
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetIMTInVTConstant };
- Value* IMTPtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
- "", CI);
+ Value* IMTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* IMT = new LoadInst(IMTPtr, "", CI);
IMT = new BitCastInst(IMT, CI->getType(), "", CI);
CI->replaceAllUsesWith(IMT);
@@ -201,14 +196,12 @@
Value* val = Call.getArgument(0); // get the object
Value* args2[2] = { intrinsics->constantZero,
intrinsics->JavaObjectVTOffsetConstant };
- Value* VTPtr = GetElementPtrInst::Create(val, args2, args2 + 2,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, args2, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
Value* args3[2] = { intrinsics->constantZero,
intrinsics->OffsetClassInVTConstant };
- Value* clPtr = GetElementPtrInst::Create(VT, args3, args3 + 2,
- "", CI);
+ Value* clPtr = GetElementPtrInst::Create(VT, args3, "", CI);
Value* cl = new LoadInst(clPtr, "", CI);
cl = new BitCastInst(cl, intrinsics->JavaCommonClassType, "", CI);
@@ -221,8 +214,7 @@
Value* indexes[3] = { intrinsics->constantZero,
intrinsics->constantZero,
intrinsics->OffsetVTInClassConstant };
- Value* VTPtr = GetElementPtrInst::Create(val, indexes, indexes + 3,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
CI->replaceAllUsesWith(VT);
CI->eraseFromParent();
@@ -232,8 +224,7 @@
Value* val = Call.getArgument(0);
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetVTInClassConstant };
- Value* VTPtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
CI->replaceAllUsesWith(VT);
CI->eraseFromParent();
@@ -244,8 +235,7 @@
Value* indexes[3] = { intrinsics->constantZero,
intrinsics->constantZero,
intrinsics->OffsetVTInClassConstant };
- Value* VTPtr = GetElementPtrInst::Create(val, indexes, indexes + 3,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
CI->replaceAllUsesWith(VT);
CI->eraseFromParent();
@@ -255,8 +245,7 @@
Value* val = Call.getArgument(0);
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetBaseClassVTInVTConstant };
- Value* VTPtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
- "", CI);
+ Value* VTPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* VT = new LoadInst(VTPtr, "", CI);
VT = new BitCastInst(VT, intrinsics->VTType, "", CI);
CI->replaceAllUsesWith(VT);
@@ -267,8 +256,7 @@
Value* val = Call.getArgument(0);
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetObjectSizeInClassConstant };
- Value* SizePtr = GetElementPtrInst::Create(val, indexes, indexes + 2,
- "", CI);
+ Value* SizePtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* Size = new LoadInst(SizePtr, "", CI);
CI->replaceAllUsesWith(Size);
CI->eraseFromParent();
@@ -277,8 +265,7 @@
Value* val = Call.getArgument(0);
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetDepthInVTConstant };
- Value* DepthPtr = GetElementPtrInst::Create(val, indexes,
- indexes + 2, "", CI);
+ Value* DepthPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Value* Depth = new LoadInst(DepthPtr, "", CI);
Depth = new PtrToIntInst(Depth, Type::getInt32Ty(*Context), "", CI);
CI->replaceAllUsesWith(Depth);
@@ -288,8 +275,7 @@
Value* val = Call.getArgument(0);
Value* indexes[2] = { intrinsics->constantZero,
intrinsics->OffsetDisplayInVTConstant };
- Value* DisplayPtr = GetElementPtrInst::Create(val, indexes,
- indexes + 2, "", CI);
+ Value* DisplayPtr = GetElementPtrInst::Create(val, indexes, "", CI);
Type* Ty = PointerType::getUnqual(intrinsics->VTType);
DisplayPtr = new BitCastInst(DisplayPtr, Ty, "", CI);
CI->replaceAllUsesWith(DisplayPtr);
@@ -345,8 +331,7 @@
Value* GEP[2] =
{ intrinsics->constantZero,
intrinsics->OffsetInitializedInTaskClassMirrorConstant };
- Value* StatusPtr = GetElementPtrInst::Create(TCM, GEP, GEP + 2, "",
- CI);
+ Value* StatusPtr = GetElementPtrInst::Create(TCM, GEP, "", CI);
Value* test = new LoadInst(StatusPtr, "", CI);
@@ -540,13 +525,11 @@
ConstantInt* CC = ConstantInt::get(Type::getInt32Ty(*Context),
JavaVirtualTable::getOffsetIndex());
Value* indices[2] = { intrinsics->constantZero, CC };
- Value* Offset = GetElementPtrInst::Create(VT2, indices, indices + 2,
- "", CI);
+ Value* Offset = GetElementPtrInst::Create(VT2, indices, "", CI);
Offset = new LoadInst(Offset, "", false, CI);
Offset = new PtrToIntInst(Offset, Type::getInt32Ty(*Context), "", CI);
indices[1] = Offset;
- Value* CurVT = GetElementPtrInst::Create(VT1, indices, indices + 2,
- "", CI);
+ Value* CurVT = GetElementPtrInst::Create(VT1, indices, "", CI);
CurVT = new LoadInst(CurVT, "", false, CI);
CurVT = new BitCastInst(CurVT, intrinsics->VTType, "", CI);
@@ -599,8 +582,7 @@
ConstantInt* cacheIndex =
ConstantInt::get(Type::getInt32Ty(*Context), JavaVirtualTable::getCacheIndex());
Value* indices[2] = { intrinsics->constantZero, cacheIndex };
- Instruction* CachePtr =
- GetElementPtrInst::Create(VT1, indices, indices + 2, "", CI);
+ Instruction* CachePtr = GetElementPtrInst::Create(VT1, indices, "", CI);
CachePtr = new BitCastInst(CachePtr, Ty, "", CI);
Value* Cache = new LoadInst(CachePtr, "", false, CI);
ICmpInst* cmp1 = new ICmpInst(CI, ICmpInst::ICMP_EQ, Cache, VT2, "");
@@ -618,9 +600,7 @@
ConstantInt* sizeIndex = ConstantInt::get(Type::getInt32Ty(*Context),
JavaVirtualTable::getNumSecondaryTypesIndex());
indices[1] = sizeIndex;
- Instruction* Size = GetElementPtrInst::Create(VT1, indices,
- indices + 2, "",
- Preheader);
+ Instruction* Size = GetElementPtrInst::Create(VT1, indices, "", Preheader);
Size = new LoadInst(Size, "", false, Preheader);
Size = new PtrToIntInst(Size, Type::getInt32Ty(*Context), "", Preheader);
@@ -628,7 +608,7 @@
JavaVirtualTable::getSecondaryTypesIndex());
indices[1] = secondaryTypesIndex;
Instruction* secondaryTypes =
- GetElementPtrInst::Create(VT1, indices, indices + 2, "", Preheader);
+ GetElementPtrInst::Create(VT1, indices, "", Preheader);
secondaryTypes = new LoadInst(secondaryTypes, "", false, Preheader);
secondaryTypes = new BitCastInst(secondaryTypes, Ty, "", Preheader);
BranchInst::Create(BB7, Preheader);
More information about the vmkit-commits
mailing list