[vmkit-commits] [vmkit] r134317 - in /vmkit/trunk/lib/J3: Classpath/ClasspathVMRuntime.inc Compiler/JavaJIT.cpp Compiler/LLVMInfo.cpp Compiler/LowerConstantCalls.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Jul 2 04:12:25 PDT 2011
Author: geoffray
Date: Sat Jul 2 06:12:25 2011
New Revision: 134317
URL: http://llvm.org/viewvc/llvm-project?rev=134317&view=rev
Log:
Remove reference to old variables.
Modified:
vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc?rev=134317&r1=134316&r2=134317&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathVMRuntime.inc Sat Jul 2 06:12:25 2011
@@ -181,12 +181,7 @@
jclass clazz,
#endif
jint par1) {
-#if defined(ISOLATE) || defined(ISOLATE_SHARING)
- // TODO: do a longjmp
exit(par1);
-#else
- exit(par1);
-#endif
}
JNIEXPORT jlong Java_java_lang_VMRuntime_freeMemory(
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=134317&r1=134316&r2=134317&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Sat Jul 2 06:12:25 2011
@@ -1470,32 +1470,6 @@
const llvm::FunctionType* virtualType = LSI->getVirtualType();
llvm::Instruction* val = 0;
-#if defined(ISOLATE_SHARING)
- const Type* Ty = intrinsics->ConstantPoolType;
- Constant* Nil = Constant::getNullValue(Ty);
- GlobalVariable* GV = new GlobalVariable(*llvmFunction->getParent(),Ty, false,
- GlobalValue::ExternalLinkage, Nil,
- "");
- Value* res = new LoadInst(GV, "", false, currentBlock);
- Value* test = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, res, Nil, "");
-
- BasicBlock* trueCl = createBasicBlock("UserCtp OK");
- BasicBlock* falseCl = createBasicBlock("UserCtp Not OK");
- PHINode* node = llvm::PHINode::Create(Ty, 2, "", trueCl);
- node->addIncoming(res, currentBlock);
- BranchInst::Create(falseCl, trueCl, test, currentBlock);
- std::vector<Value*> Args;
- Args.push_back(ctpCache);
- Args.push_back(ConstantInt::get(Type::getInt32Ty(*llvmContext), index));
- Args.push_back(GV);
- res = CallInst::Create(intrinsics->SpecialCtpLookupFunction, Args.begin(),
- Args.end(), "", falseCl);
- node->addIncoming(res, falseCl);
- BranchInst::Create(trueCl, falseCl);
- currentBlock = trueCl;
- args.push_back(node);
-#endif
-
if (!meth) {
meth = ctpInfo->infoOfStaticOrSpecialMethod(index, ACC_VIRTUAL, signature);
}
Modified: vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp?rev=134317&r1=134316&r2=134317&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp Sat Jul 2 06:12:25 2011
@@ -235,10 +235,6 @@
llvmArgs.push_back(LAI.llvmType);
}
-#if defined(ISOLATE_SHARING)
- llvmArgs.push_back(Mod->getIntrinsics()->ConstantPoolType);
-#endif
-
LLVMAssessorInfo& LAI =
Compiler->getTypedefInfo(signature->getReturnType());
virtualType = FunctionType::get(LAI.llvmType, llvmArgs, false);
@@ -261,11 +257,6 @@
llvmArgs.push_back(LAI.llvmType);
}
-#if defined(ISOLATE_SHARING)
- // cached constant pool
- llvmArgs.push_back(Compiler->getIntrinsics()->ConstantPoolType);
-#endif
-
LLVMAssessorInfo& LAI =
Compiler->getTypedefInfo(signature->getReturnType());
staticType = FunctionType::get(LAI.llvmType, llvmArgs, false);
@@ -299,11 +290,6 @@
}
}
-#if defined(ISOLATE_SHARING)
- // cached constant pool
- llvmArgs.push_back(Compiler->getIntrinsics()->ConstantPoolType);
-#endif
-
LLVMAssessorInfo& LAI =
Compiler->getTypedefInfo(signature->getReturnType());
const llvm::Type* RetType =
@@ -343,9 +329,6 @@
BasicBlock* currentBlock = BasicBlock::Create(context, "enter", res);
Function::arg_iterator i = res->arg_begin();
Value *obj, *ptr, *func;
-#if defined(ISOLATE_SHARING)
- Value* ctp = i;
-#endif
++i;
func = i;
++i;
@@ -396,10 +379,6 @@
currentBlock);
}
-#if defined(ISOLATE_SHARING)
- Args.push_back(ctp);
-#endif
-
Value* val = CallInst::Create(func, Args.begin(), Args.end(), "",
currentBlock);
if (!signature->getReturnType()->isVoid()) {
@@ -435,9 +414,6 @@
BasicBlock* currentBlock = BasicBlock::Create(context, "enter", res);
Function::arg_iterator i = res->arg_begin();
Value *obj, *ap, *func;
-#if defined(ISOLATE_SHARING)
- Value* ctp = i;
-#endif
++i;
func = i;
++i;
@@ -476,10 +452,6 @@
Args.push_back(arg);
}
-#if defined(ISOLATE_SHARING)
- Args.push_back(ctp);
-#endif
-
Value* val = CallInst::Create(func, Args.begin(), Args.end(), "",
currentBlock);
if (!signature->getReturnType()->isVoid()) {
Modified: vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp?rev=134317&r1=134316&r2=134317&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LowerConstantCalls.cpp Sat Jul 2 06:12:25 2011
@@ -302,18 +302,6 @@
Value* Class = new LoadInst(ClassPtr, "", CI);
CI->replaceAllUsesWith(Class);
CI->eraseFromParent();
-#if defined(ISOLATE)
- } else if (V == intrinsics->GetStaticInstanceFunction) {
- Changed = true;
-
- Value* TCM = getTCM(intrinsics, Call.getArgument(0), CI);
- Constant* C = intrinsics->OffsetStaticInstanceInTaskClassMirrorConstant;
- Value* GEP[2] = { intrinsics->constantZero, C };
- Value* Replace = GetElementPtrInst::Create(TCM, GEP, GEP + 2, "", CI);
- Replace = new LoadInst(Replace, "", CI);
- CI->replaceAllUsesWith(Replace);
- CI->eraseFromParent();
-#endif
} else if (V == intrinsics->GetClassDelegateeFunction) {
Changed = true;
BasicBlock* NBB = II->getParent()->splitBasicBlock(II);
More information about the vmkit-commits
mailing list