[vmkit-commits] [vmkit] r121134 - in /vmkit/branches/multi-vm/lib: J3/Classpath/ClasspathVMRuntime.inc J3/Compiler/JavaAOTCompiler.cpp J3/Compiler/JavaJIT.cpp J3/Compiler/JavaJITCompiler.cpp J3/Compiler/LowerConstantCalls.cpp J3/VMCore/JavaClass.cpp J3/VMCore/JavaClass.h J3/VMCore/JavaRuntimeJIT.cpp J3/VMCore/JnjvmConfig.h Mvm/CommonThread/ctthread.cpp
Gael Thomas
gael.thomas at lip6.fr
Tue Dec 7 07:02:20 PST 2010
Author: gthomas
Date: Tue Dec 7 09:02:20 2010
New Revision: 121134
URL: http://llvm.org/viewvc/llvm-project?rev=121134&view=rev
Log:
remove all ISOLATE-depend code
Modified:
vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMRuntime.inc
vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
vmkit/branches/multi-vm/lib/J3/Compiler/JavaJIT.cpp
vmkit/branches/multi-vm/lib/J3/Compiler/JavaJITCompiler.cpp
vmkit/branches/multi-vm/lib/J3/Compiler/LowerConstantCalls.cpp
vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp
vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h
vmkit/branches/multi-vm/lib/J3/VMCore/JavaRuntimeJIT.cpp
vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmConfig.h
vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp
Modified: vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMRuntime.inc?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMRuntime.inc (original)
+++ vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMRuntime.inc Tue Dec 7 09:02:20 2010
@@ -181,7 +181,7 @@
jclass clazz,
#endif
jint par1) {
-#if defined(ISOLATE) || defined(ISOLATE_SHARING)
+#if defined(ISOLATE_SHARING)
// TODO: do a longjmp
exit(par1);
#else
Modified: vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp Tue Dec 7 09:02:20 2010
@@ -228,10 +228,6 @@
}
Constant* JavaAOTCompiler::getJavaClassPtr(CommonClass* cl) {
-#ifdef ISOLATE
- abort();
- return 0;
-#else
// Make sure it's emitted.
getJavaClass(cl);
@@ -248,7 +244,6 @@
Constant* Ptr = ConstantExpr::getGetElementPtr(TCMArray, GEP2, 2);
return Ptr;
-#endif
}
JavaObject* JavaAOTCompiler::getFinalObject(llvm::Value* obj) {
@@ -476,10 +471,6 @@
}
Constant* JavaAOTCompiler::getStaticInstance(Class* classDef) {
-#ifdef ISOLATE
- assert(0 && "Should not be here");
- abort();
-#endif
static_instance_iterator End = staticInstances.end();
static_instance_iterator I = staticInstances.find(classDef);
if (I == End) {
Modified: vmkit/branches/multi-vm/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/JavaJIT.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/JavaJIT.cpp Tue Dec 7 09:02:20 2010
@@ -1373,10 +1373,7 @@
uint8 type = ctpInfo->typeAt(index);
if (type == JavaConstantPool::ConstantString) {
-#if defined(ISOLATE)
- abort();
-#else
-
+
if (TheCompiler->isStaticCompiling()) {
const UTF8* utf8 = ctpInfo->UTF8At(ctpInfo->ctpDef[index]);
JavaString* str = *(compilingClass->classLoader->UTF8ToStr(utf8));
@@ -1397,7 +1394,7 @@
push(val, false, upcalls->newString);
}
}
-#endif
+
} else if (type == JavaConstantPool::ConstantLong) {
push(ConstantInt::get(Type::getInt64Ty(*llvmContext), ctpInfo->LongAt(index)),
false);
@@ -1978,7 +1975,7 @@
Cl = invoke(intrinsics->InitialisationCheckFunction, Cl, "",
currentBlock);
}
-#if !defined(ISOLATE) && !defined(ISOLATE_SHARING)
+#if !defined(ISOLATE_SHARING)
if (needsCheck) {
CallInst::Create(intrinsics->ForceInitialisationCheckFunction, Cl, "",
currentBlock);
@@ -2085,7 +2082,7 @@
Value* ptr = ldResolved(index, true, NULL, LAI.llvmTypePtr);
bool final = false;
-#if !defined(ISOLATE) && !defined(ISOLATE_SHARING)
+#if !defined(ISOLATE_SHARING)
JnjvmBootstrapLoader* JBL = compilingClass->classLoader->bootstrapLoader;
if (!compilingMethod->name->equals(JBL->clinitName)) {
JavaField* field = compilingClass->ctpInfo->lookupField(index, true);
Modified: vmkit/branches/multi-vm/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/JavaJITCompiler.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/JavaJITCompiler.cpp Tue Dec 7 09:02:20 2010
@@ -155,10 +155,6 @@
}
Constant* JavaJITCompiler::getStaticInstance(Class* classDef) {
-#ifdef ISOLATE
- assert(0 && "Should not be here");
- abort();
-#endif
void* obj = classDef->getStaticInstance();
if (!obj) {
classDef->acquire();
Modified: vmkit/branches/multi-vm/lib/J3/Compiler/LowerConstantCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/LowerConstantCalls.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/LowerConstantCalls.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/LowerConstantCalls.cpp Tue Dec 7 09:02:20 2010
@@ -42,59 +42,6 @@
#endif
-#ifdef ISOLATE
-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* threadId = CallInst::Create(intrinsics->llvm_frameaddress,
- intrinsics->constantZero, "", CI);
- threadId = new PtrToIntInst(threadId, intrinsics->pointerSizeType, "", CI);
- threadId = BinaryOperator::CreateAnd(threadId, intrinsics->constantThreadIDMask,
- "", CI);
-
- threadId = new IntToPtrInst(threadId, intrinsics->ptr32Type, "", CI);
-
- Value* GEP1[2] = { intrinsics->OffsetThreadInMutatorThreadConstant, intrinsics->OffsetIsolateInThreadConstant }
- Value* IsolateID = GetElementPtrInst::Create(threadId, GEP1, GEP1 + 2, "", CI);
-
- IsolateID = new LoadInst(IsolateID, "", CI);
-
- Value* GEP2[2] = { intrinsics->constantZero, IsolateID };
-
- Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, GEP2 + 2, "",
- CI);
- return TCM;
-}
-
-static Value* getDelegatee(J3Intrinsics* intrinsics, Value* Arg, Instruction* CI) {
- Value* GEP[2] = { intrinsics->constantZero,
- intrinsics->constantTwo };
- Value* TCMArray = GetElementPtrInst::Create(Arg, GEP, GEP + 2, "", CI);
-
- Value* threadId = CallInst::Create(intrinsics->llvm_frameaddress,
- intrinsics->constantZero, "", CI);
- threadId = new PtrToIntInst(threadId, intrinsics->pointerSizeType, "", CI);
- threadId = BinaryOperator::CreateAnd(threadId, intrinsics->constantThreadIDMask,
- "", CI);
-
- threadId = new IntToPtrInst(threadId, intrinsics->ptr32Type, "", CI);
-
- Value* GEP1[2] = { intrinsics->OffsetThreadInMutatorThreadConstant, intrinsics->OffsetIsolateInThreadConstant }
- Value* IsolateID = GetElementPtrInst::Create(threadId, GEP1, GEP1 + 2, "", CI);
-
- IsolateID = new LoadInst(IsolateID, "", CI);
-
- Value* GEP2[2] = { intrinsics->constantZero, IsolateID };
-
- Value* TCM = GetElementPtrInst::Create(TCMArray, GEP2, GEP2 + 2, "",
- CI);
- return new LoadInst(TCM, "", CI);
-}
-
-#else
-
static Value* getTCM(J3Intrinsics* intrinsics, Value* Arg, Instruction* CI) {
Value* GEP[2] = { intrinsics->constantZero,
intrinsics->OffsetTaskClassMirrorInClassConstant };
@@ -120,7 +67,6 @@
return new LoadInst(TCM, "", CI);
}
-#endif
bool LowerConstantCalls::runOnFunction(Function& F) {
LLVMContext* Context = &F.getContext();
@@ -362,18 +308,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);
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.cpp Tue Dec 7 09:02:20 2010
@@ -925,11 +925,6 @@
}
#ifndef ISOLATE_SHARING
-#ifdef ISOLATE
-void Class::resolveClass() {
- UNIMPLEMENTED();
-}
-#else
void Class::resolveClass() {
if (isResolved() || isErroneous()) return;
resolveParents();
@@ -939,7 +934,6 @@
&(getCurrentTaskClassMirror().status), loaded, resolved);
assert(isResolved() || isErroneous());
}
-#endif
#else
void Class::resolveClass() {
assert(status >= resolved &&
@@ -1044,34 +1038,6 @@
}
}
-
-#ifdef ISOLATE
-TaskClassMirror& Class::getCurrentTaskClassMirror() {
- return IsolateInfo[JavaThread::get()->getJVM()->IsolateID];
-}
-
-JavaObject* CommonClass::getDelegatee() {
- return delegatee[JavaThread::get()->getJVM()->IsolateID];
-}
-
-JavaObject** CommonClass::getDelegateePtr() {
- return &(delegatee[JavaThread::get()->getJVM()->IsolateID]);
-}
-
-JavaObject* CommonClass::setDelegatee(JavaObject* val) {
- JavaObject* prev = NULL;
- llvm_gcroot(val, 0);
- llvm_gcroot(prev, 0);
- JavaObject** obj = &(delegatee[JavaThread::get()->getJVM()->IsolateID]);
-
- prev = (JavaObject*)__sync_val_compare_and_swap((uintptr_t)obj, NULL, val);
-
- if (!prev) return val;
- else return prev;
-}
-
-#else
-
JavaObject* CommonClass::setDelegatee(JavaObject* val) {
JavaObject* prev = NULL;
llvm_gcroot(val, 0);
@@ -1082,8 +1048,6 @@
else return prev;
}
-#endif
-
UserCommonClass* UserCommonClass::resolvedImplClass(Jnjvm* vm,
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaClass.h Tue Dec 7 09:02:20 2010
@@ -341,7 +341,7 @@
///
JavaObject* setDelegatee(JavaObject* val);
-#if !defined(ISOLATE) && !defined(ISOLATE_SHARING)
+#if !defined(ISOLATE_SHARING)
/// getDelegatee - Get the java/lang/Class object representing this class.
///
JavaObject* getDelegatee() const {
@@ -355,11 +355,6 @@
return delegatee;
}
-#else
-#if defined(ISOLATE)
- JavaObject* getDelegatee();
- JavaObject** getDelegateePtr();
-#endif
#endif
/// resolvedImplClass - Return the internal representation of the
@@ -691,8 +686,6 @@
///
void broadcastClass();
-#ifndef ISOLATE
-
/// getCurrentTaskClassMirror - Get the class task mirror of the executing
/// isolate.
///
@@ -724,35 +717,6 @@
getCurrentTaskClassMirror().status = resolving;
}
-
-#else
-
- TaskClassMirror& getCurrentTaskClassMirror();
-
- bool isReadyForCompilation() {
- return false;
- }
-
- void setResolved() {
- for (uint32 i = 0; i < NR_ISOLATES; ++i) {
- IsolateInfo[i].status = resolved;
- }
- }
-
- void setIsResolving() {
- for (uint32 i = 0; i < NR_ISOLATES; ++i) {
- IsolateInfo[i].status = resolving;
- }
- }
-
- void setErroneous() {
- for (uint32 i = 0; i < NR_ISOLATES; ++i) {
- IsolateInfo[i].status = erroneous;
- }
- }
-
-#endif
-
/// getStaticInstance - Get the memory that holds static variables.
///
void* getStaticInstance() {
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaRuntimeJIT.cpp Tue Dec 7 09:02:20 2010
@@ -552,9 +552,7 @@
UserConstantPool* ctpInfo = cl->getConstantPool();
const UTF8* utf8 = ctpInfo->UTF8At(ctpInfo->ctpDef[index]);
str = cl->classLoader->UTF8ToStr(utf8);
-#if defined(ISOLATE_SHARING) || !defined(ISOLATE)
ctpInfo->ctpRes[index] = str;
-#endif
END_NATIVE_EXCEPTION
Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmConfig.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmConfig.h?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmConfig.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmConfig.h Tue Dec 7 09:02:20 2010
@@ -34,10 +34,6 @@
#endif
-#ifdef ISOLATE
-#define NR_ISOLATES 32
-#else
#define NR_ISOLATES 1
-#endif
#endif // JNJVM_CONFIG_H
Modified: vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp?rev=121134&r1=121133&r2=121134&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp Tue Dec 7 09:02:20 2010
@@ -467,10 +467,8 @@
sigaction(SIGSEGV, &sa, NULL);
- assert(th->MyVM && "VM not set in a thread");
-#ifdef ISOLATE
- th->IsolateID = th->MyVM->IsolateID;
-#endif
+ assert(th->vmkit && "VM not set in a thread");
+
th->vmkit->rendezvous.prepareForJoin();
th->routine(th);
th->vmkit->unregisterRunningThread(th);
More information about the vmkit-commits
mailing list