[vmkit-commits] [vmkit] r62848 - in /vmkit/trunk/lib/JnJVM: Classpath/ClasspathConstructor.cpp Classpath/ClasspathMethod.cpp Classpath/ClasspathVMObject.cpp Classpath/ClasspathVMSystem.cpp Classpath/ClasspathVMSystemProperties.cpp Classpath/ClasspathVMThread.cpp VMCore/JavaObject.cpp VMCore/JavaObject.h VMCore/JavaRuntimeJIT.cpp VMCore/JavaThread.h VMCore/Jni.cpp VMCore/Jnjvm.cpp VMCore/JnjvmClassLoader.cpp VMCore/JnjvmModule.cpp VMCore/VirtualTables.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Fri Jan 23 05:04:10 PST 2009
Author: geoffray
Date: Fri Jan 23 07:04:06 2009
New Revision: 62848
URL: http://llvm.org/viewvc/llvm-project?rev=62848&view=rev
Log:
Make the "classof" field of Java objects private.
Modified:
vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp Fri Jan 23 07:04:06 2009
@@ -112,7 +112,7 @@
th->clearException();
}
if (excp) {
- if (excp->classOf->isAssignableFrom(vm->upcalls->newException)) {
+ if (excp->getClass()->isAssignableFrom(vm->upcalls->newException)) {
// If it's an exception, we encapsule it in an
// invocationTargetException
vm->invocationTargetException(excp);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp Fri Jan 23 07:04:06 2009
@@ -114,12 +114,12 @@
if (isVirtual(meth->access)) {
verifyNull(obj);
- if (!(obj->classOf->isAssignableFrom(cl))) {
- vm->illegalArgumentExceptionForMethod(meth, cl, obj->classOf);
+ if (!(obj->getClass()->isAssignableFrom(cl))) {
+ vm->illegalArgumentExceptionForMethod(meth, cl, obj->getClass());
}
#ifdef ISOLATE_SHARING
if (isInterface(cl->classDef->access)) {
- cl = obj->classOf->lookupClassFromMethod(meth);
+ cl = obj->getClass()->lookupClassFromMethod(meth);
} else {
cl = Meth->getClass();
}
@@ -157,7 +157,7 @@
} \
\
if (exc) { \
- if (exc->classOf->isAssignableFrom(vm->upcalls->newException)) { \
+ if (exc->getClass()->isAssignableFrom(vm->upcalls->newException)) { \
th->getJVM()->invocationTargetException(exc); \
} else { \
th->throwException(exc); \
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp Fri Jan 23 07:04:06 2009
@@ -32,7 +32,7 @@
BEGIN_NATIVE_EXCEPTION(0)
JavaObject* src = (JavaObject*)_src;
- UserCommonClass* cl = src->classOf;
+ UserCommonClass* cl = src->getClass();
Jnjvm* vm = JavaThread::get()->getJVM();
uint64 size = 0;
if (cl->isArray()) {
@@ -70,7 +70,7 @@
JavaObject* obj = (JavaObject*)_obj;
Jnjvm* vm = JavaThread::get()->getJVM();
- res = (jobject)(obj->classOf->getClassDelegatee(vm));
+ res = (jobject)(obj->getClass()->getClassDelegatee(vm));
END_NATIVE_EXCEPTION
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp Fri Jan 23 07:04:06 2009
@@ -40,12 +40,12 @@
verifyNull(src);
verifyNull(dst);
- if (!(src->classOf->isArray() && dst->classOf->isArray())) {
+ if (!(src->getClass()->isArray() && dst->getClass()->isArray())) {
vm->arrayStoreException();
}
- UserClassArray* ts = (UserClassArray*)src->classOf;
- UserClassArray* td = (UserClassArray*)dst->classOf;
+ UserClassArray* ts = (UserClassArray*)src->getClass();
+ UserClassArray* td = (UserClassArray*)dst->getClass();
UserCommonClass* dstType = td->baseClass();
UserCommonClass* srcType = ts->baseClass();
@@ -74,7 +74,7 @@
while (i < sstart + len && !doThrow) {
JavaObject* cur = ((ArrayObject*)src)->elements[i];
if (cur) {
- if (!(cur->classOf->isAssignableFrom(dstType))) {
+ if (!(cur->getClass()->isAssignableFrom(dstType))) {
doThrow = true;
len = i;
}
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp Fri Jan 23 07:04:06 2009
@@ -26,7 +26,7 @@
static void setProperty(Jnjvm* vm, JavaObject* prop, const char* key,
const char* val) {
- vm->upcalls->setProperty->invokeIntSpecial(vm, (UserClass*)prop->classOf,
+ vm->upcalls->setProperty->invokeIntSpecial(vm, (UserClass*)prop->getClass(),
prop,
vm->asciizToStr(key),
vm->asciizToStr(val));
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp Fri Jan 23 07:04:06 2009
@@ -45,7 +45,7 @@
assert(javaThread && "Didn't fix the javaThread of a jnjvm thread");
field->setObjectField(vmThread, (JavaObject*)(void*)thread);
- UserClass* vmthClass = (UserClass*)vmThread->classOf;
+ UserClass* vmthClass = (UserClass*)vmThread->getClass();
ThreadSystem& ts = vm->threadSystem;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Fri Jan 23 07:04:06 2009
@@ -77,7 +77,7 @@
extern "C" void printJavaObject(const JavaObject* obj, mvm::PrintBuffer* buf) {
buf->write("JavaObject<");
- CommonClass::printClassName(obj->classOf->getName(), buf);
+ CommonClass::printClassName(obj->getClass()->getName(), buf);
fprintf(stderr, "%p\n", ((void**)obj->getVirtualTable())[9]);
buf->write(">");
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h Fri Jan 23 07:04:06 2009
@@ -120,14 +120,20 @@
/// waitIntern - internal wait on a monitor
///
void waitIntern(struct timeval *info, bool timed);
-
-public:
-
/// classOf - The class of this object.
///
UserCommonClass* classOf;
+public:
+
+ /// getClass - Returns the class of this object.
+ ///
+ UserCommonClass* getClass() const {
+ return classOf;
+ }
+
+
/// lock - The monitor of this object. Most of the time null.
///
mvm::ThinLock<LockObj, JavaObject> lock;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Fri Jan 23 07:04:06 2009
@@ -34,11 +34,11 @@
Enveloppe* enveloppe = cache->enveloppe;
- UserCommonClass* ocl = obj->classOf;
+ UserCommonClass* ocl = obj->getClass();
#ifndef SERVICE
- assert((obj->classOf->isClass() &&
- obj->classOf->asClass()->isInitializing()) &&
+ assert((obj->getClass()->isClass() &&
+ obj->getClass()->asClass()->isInitializing()) &&
"Class not ready in a virtual lookup.");
#endif
@@ -189,13 +189,13 @@
va_start(ap, index);
JavaObject* obj = va_arg(ap, JavaObject*);
va_end(ap);
- assert((obj->classOf->isClass() &&
- obj->classOf->asClass()->isInitializing()) &&
+ assert((obj->getClass()->isClass() &&
+ obj->getClass()->asClass()->isInitializing()) &&
"Class not ready in a virtual lookup.");
// Arg, the bytecode is buggy! Perform the lookup on the object class
// and do not update offset.
- lookup = obj->classOf->isArray() ? obj->classOf->super :
- obj->classOf->asClass();
+ lookup = obj->getClass()->isArray() ? obj->getClass()->super :
+ obj->getClass()->asClass();
dmeth = lookup->lookupMethod(utf8, sign->keyName, false, true, 0);
} else {
caller->getConstantPool()->ctpRes[index] = (void*)dmeth->offset;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h Fri Jan 23 07:04:06 2009
@@ -184,7 +184,7 @@
bool compareException(UserClass* cl) {
JavaObject* pe = pendingException;
assert(pe && "no pending exception?");
- bool val = pe->classOf->subclassOf(cl);
+ bool val = pe->getClass()->subclassOf(cl);
return val;
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp Fri Jan 23 07:04:06 2009
@@ -89,7 +89,7 @@
Jnjvm* vm = myVM(env);
Classpath* upcalls = vm->upcalls;
JavaObject* meth = (JavaObject*)method;
- UserCommonClass* cl = meth->classOf;
+ UserCommonClass* cl = meth->getClass();
if (cl == upcalls->newConstructor) {
return (jmethodID)((JavaObjectMethod*)meth)->getInternalMethod();
} else if (cl == upcalls->newMethod) {
@@ -276,7 +276,7 @@
verifyNull((JavaObject*)obj);
Jnjvm* vm = JavaThread::get()->getJVM();
- return (jclass)((JavaObject*)obj)->classOf->getClassDelegatee(vm);
+ return (jclass)((JavaObject*)obj)->getClass()->getClassDelegatee(vm);
END_JNI_EXCEPTION
return 0;
@@ -337,7 +337,7 @@
JavaObject* self = (JavaObject*)obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, self->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, self->getClass());
JavaObject* res = meth->invokeJavaObjectVirtualAP(vm, cl, self, ap);
va_end(ap);
return (jobject)res;
@@ -355,7 +355,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jobject)meth->invokeJavaObjectVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -380,7 +380,7 @@
JavaObject* self = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, self->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, self->getClass());
uint32 res = meth->invokeIntVirtualAP(vm, cl, self, ap);
va_end(ap);
return res;
@@ -398,7 +398,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jboolean)meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -427,7 +427,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jbyte)meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -457,7 +457,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jchar)meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -487,7 +487,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jshort)meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -513,7 +513,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
uint32 res = meth->invokeIntVirtualAP(vm, cl, obj, ap);
va_end(ap);
return res;
@@ -531,7 +531,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jint)meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -562,7 +562,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jlong)meth->invokeLongVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -588,7 +588,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
jfloat res = meth->invokeFloatVirtualAP(vm, cl, obj, ap);
va_end(ap);
return res;
@@ -606,7 +606,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jfloat)meth->invokeFloatVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -632,7 +632,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
jdouble res = meth->invokeDoubleVirtualAP(vm, cl, obj, ap);
va_end(ap);
return res;
@@ -650,7 +650,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
return (jdouble)meth->invokeDoubleVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -676,7 +676,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
meth->invokeIntVirtualAP(vm, cl, obj, ap);
va_end(ap);
@@ -692,7 +692,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
meth->invokeIntVirtualAP(vm, cl, obj, args);
END_JNI_EXCEPTION
@@ -913,7 +913,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
Jnjvm* vm = JavaThread::get()->getJVM();
- UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
+ UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->getClass());
meth->invokeIntSpecialAP(vm, cl, obj, ap);
va_end(ap);
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Fri Jan 23 07:04:06 2009
@@ -227,7 +227,7 @@
// ExceptionInInitializerError cannot be created because an
// OutOfMemoryError occurs, then instead use an OutOfMemoryError object
// in place of E in the following step.
- if (exc->classOf->isAssignableFrom(vm->upcalls->newException)) {
+ if (exc->getClass()->isAssignableFrom(vm->upcalls->newException)) {
Classpath* upcalls = classLoader->bootstrapLoader->upcalls;
UserClass* clExcp = upcalls->ExceptionInInitializerError;
Jnjvm* vm = self->getJVM();
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Fri Jan 23 07:04:06 2009
@@ -286,8 +286,8 @@
isolate = I;
JavaMethod* meth = bootstrapLoader->upcalls->loadInClassLoader;
- loader->classOf->asClass()->lookupMethodDontThrow(meth->name, meth->type,
- false, true, &loadClass);
+ loader->getClass()->asClass()->lookupMethodDontThrow(meth->name, meth->type,
+ false, true, &loadClass);
assert(loadClass && "Loader does not have a loadClass function");
#if defined(SERVICE)
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Fri Jan 23 07:04:06 2009
@@ -232,7 +232,7 @@
return SI->second;
} else {
assert(str && "No string given");
- LLVMClassInfo* LCI = (LLVMClassInfo*)getClassInfo((Class*)str->classOf);
+ LLVMClassInfo* LCI = (LLVMClassInfo*)getClassInfo((Class*)str->getClass());
const llvm::Type* Ty = LCI->getVirtualType();
GlobalVariable* varGV =
new GlobalVariable(Ty->getContainedType(0), false,
@@ -659,7 +659,7 @@
}
Constant* JnjvmModule::CreateConstantFromJavaString(JavaString* str) {
- Class* cl = (Class*)str->classOf;
+ Class* cl = (Class*)str->getClass();
LLVMClassInfo* LCI = (LLVMClassInfo*)getClassInfo(cl);
const StructType* STy =
dyn_cast<StructType>(LCI->getVirtualType()->getContainedType(0));
Modified: vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp?rev=62848&r1=62847&r2=62848&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Fri Jan 23 07:04:06 2009
@@ -44,7 +44,7 @@
#undef INIT
void ArrayObject::TRACER {
- if (classOf) classOf->classLoader->MARK_AND_TRACE;
+ if (getClass()) getClass()->classLoader->MARK_AND_TRACE;
for (sint32 i = 0; i < size; i++) {
if (elements[i]) elements[i]->MARK_AND_TRACE;
}
@@ -99,7 +99,7 @@
}
void JavaObject::TRACER {
- if (classOf) classOf->classLoader->MARK_AND_TRACE;
+ if (getClass()) getClass()->classLoader->MARK_AND_TRACE;
LockObj* l = lockObj();
if (l) l->MARK_AND_TRACE;
}
@@ -109,7 +109,7 @@
#else
extern "C" void JavaObjectTracer(JavaObject* obj) {
#endif
- if (obj->classOf) obj->classOf->classLoader->MARK_AND_TRACE;
+ if (obj->getClass()) obj->getClass()->classLoader->MARK_AND_TRACE;
LockObj* l = obj->lockObj();
if (l) l->MARK_AND_TRACE;
}
More information about the vmkit-commits
mailing list