[vmkit-commits] [vmkit] r59140 - in /vmkit/trunk: include/mvm/ include/mvm/Threads/ lib/JnJVM/Classpath/ lib/JnJVM/VMCore/ lib/Mvm/Runtime/
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Nov 12 07:41:16 PST 2008
Author: geoffray
Date: Wed Nov 12 09:41:10 2008
New Revision: 59140
URL: http://llvm.org/viewvc/llvm-project?rev=59140&view=rev
Log:
Add a virtual machine field to mvm::Thread and let
subclasses of virtual machine cast it to its actual type.
Modified:
vmkit/trunk/include/mvm/Allocator.h
vmkit/trunk/include/mvm/Threads/Thread.h
vmkit/trunk/include/mvm/VirtualMachine.h
vmkit/trunk/lib/JnJVM/Classpath/Classpath.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathField.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClassLoader.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.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/Classpath/ClasspathVMThrowable.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.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/JavaString.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp
vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp
vmkit/trunk/lib/Mvm/Runtime/Object.cpp
Modified: vmkit/trunk/include/mvm/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Allocator.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Allocator.h (original)
+++ vmkit/trunk/include/mvm/Allocator.h Wed Nov 12 09:41:10 2008
@@ -75,154 +75,8 @@
void Deallocate(void* obj) {}
- static void* ThreadAllocate(size_t sz);
- static void* VMAllocate(size_t sz);
};
-template <class T>
-class STLVMAllocator {
-public:
- // type definitions
- typedef T value_type;
- typedef T* pointer;
- typedef const T* const_pointer;
- typedef T& reference;
- typedef const T& const_reference;
- typedef std::size_t size_type;
- typedef std::ptrdiff_t difference_type;
-
- // rebind allocator to type U
- template <class U>
- struct rebind {
- typedef STLVMAllocator<U> other;
- };
-
- // return address of values
- pointer address (reference value) const {
- return &value;
- }
- const_pointer address (const_reference value) const {
- return &value;
- }
-
-
- STLVMAllocator() {}
- template<class T2> STLVMAllocator(STLVMAllocator<T2>&) {}
-
- ~STLVMAllocator() {}
-
- size_type max_size () const {
- return std::numeric_limits<std::size_t>::max() / sizeof(T);
- }
-
- // allocate but don't initialize num elements of type T
- pointer allocate (size_type num, const void* = 0) {
- pointer ret = (pointer)mvm::BumpPtrAllocator::VMAllocate(num*sizeof(T));
- return ret;
- }
-
- // initialize elements of allocated storage p with value value
- void construct (pointer p, const T& value) {
- // initialize memory with placement new
- new((void*)p)T(value);
- }
-
- // destroy elements of initialized storage p
- void destroy (pointer p) {
- // destroy objects by calling their destructor
- p->~T();
- }
-
- // deallocate storage p of deleted elements
- void deallocate (pointer p, size_type num) {}
-};
-
-// return that all specializations of this allocator are interchangeable
-template <class T1, class T2>
-bool operator== (const STLVMAllocator<T1>&,
- const STLVMAllocator<T2>&) {
- return true;
-}
-
-template <class T1, class T2>
-bool operator!= (const STLVMAllocator<T1>&,
- const STLVMAllocator<T2>&) {
- return false;
-}
-
-template <class T>
-class STLThreadAllocator {
-public:
- // type definitions
- typedef T value_type;
- typedef T* pointer;
- typedef const T* const_pointer;
- typedef T& reference;
- typedef const T& const_reference;
- typedef std::size_t size_type;
- typedef std::ptrdiff_t difference_type;
-
- // rebind allocator to type U
- template <class U>
- struct rebind {
- typedef STLThreadAllocator<U> other;
- };
-
- // return address of values
- pointer address (reference value) const {
- return &value;
- }
- const_pointer address (const_reference value) const {
- return &value;
- }
-
-
- STLThreadAllocator() {}
- template<class T2> STLThreadAllocator(STLThreadAllocator<T2>&) {}
-
- ~STLThreadAllocator() {}
-
- size_type max_size () const {
- return std::numeric_limits<std::size_t>::max() / sizeof(T);
- }
-
- // allocate but don't initialize num elements of type T
- pointer allocate (size_type num, const void* = 0) {
- pointer ret = (pointer)mvm::BumpPtrAllocator::ThreadAllocate(num*sizeof(T));
- return ret;
- }
-
- // initialize elements of allocated storage p with value value
- void construct (pointer p, const T& value) {
- // initialize memory with placement new
- new((void*)p)T(value);
- }
-
- // destroy elements of initialized storage p
- void destroy (pointer p) {
- // destroy objects by calling their destructor
- p->~T();
- }
-
- // deallocate storage p of deleted elements
- void deallocate (pointer p, size_type num) {}
-};
-
-// return that all specializations of this allocator are interchangeable
-template <class T1, class T2>
-bool operator== (const STLThreadAllocator<T1>&,
- const STLThreadAllocator<T2>&) {
- return true;
-}
-
-template <class T1, class T2>
-bool operator!= (const STLThreadAllocator<T1>&,
- const STLThreadAllocator<T2>&) {
- return false;
-}
-
-
-
class PermanentObject {
public:
void* operator new(size_t sz, BumpPtrAllocator& allocator) {
Modified: vmkit/trunk/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Thread.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Thread.h (original)
+++ vmkit/trunk/include/mvm/Threads/Thread.h Wed Nov 12 09:41:10 2008
@@ -21,8 +21,7 @@
namespace mvm {
-class BumpPtrAllocator;
-
+class VirtualMachine;
class CircularBase {
CircularBase *_next;
@@ -91,14 +90,8 @@
public:
- /// vmAllocator - Virtual machine specific allocator.
- ///
- mvm::BumpPtrAllocator* vmAllocator;
+ VirtualMachine* vm;
- /// threadAllocator - Current allocator for the thread. Useful for things
- /// like class loaders which do not allocate per-vm.
- mvm::BumpPtrAllocator* threadAllocator;
-
/// baseSP - The base stack pointer.
///
void* baseSP;
Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Wed Nov 12 09:41:10 2008
@@ -15,6 +15,7 @@
#ifndef MVM_VIRTUALMACHINE_H
#define MVM_VIRTUALMACHINE_H
+#include "mvm/Allocator.h"
#include "mvm/CompilationUnit.h"
#include "mvm/Object.h"
@@ -41,7 +42,9 @@
static CompilationUnit* initialiseCLIVM();
static VirtualMachine* createCLIVM(CompilationUnit* C = 0);
-
+
+ mvm::Allocator gcAllocator;
+
};
Modified: vmkit/trunk/lib/JnJVM/Classpath/Classpath.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/Classpath.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/Classpath.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/Classpath.cpp Wed Nov 12 09:41:10 2008
@@ -30,7 +30,7 @@
jclass Cl) {
verifyNull(Cl);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, true);
if (cl->lookupMethodDontThrow(vm->bootstrapLoader->clinitName,
vm->bootstrapLoader->clinitType, true,
@@ -51,7 +51,7 @@
#endif
jobject Field, jobject obj, jboolean val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setInt8Field((JavaObject*)obj, (uint8)val);
@@ -64,7 +64,7 @@
#endif
jobject Field, jobject obj, jbyte val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setInt8Field((JavaObject*)obj, (uint8)val);
@@ -77,7 +77,7 @@
#endif
jobject Field, jobject obj, jchar val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setInt16Field((JavaObject*)obj, (uint16)val);
@@ -90,7 +90,7 @@
#endif
jobject Field, jobject obj, jshort val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setInt16Field((JavaObject*)obj, (sint16)val);
@@ -103,7 +103,7 @@
#endif
jobject Field, jobject obj, jint val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setInt32Field((JavaObject*)obj, (sint32)val);
@@ -116,7 +116,7 @@
#endif
jobject Field, jobject obj, jlong val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setLongField((JavaObject*)obj, (sint64)val);
@@ -129,7 +129,7 @@
#endif
jobject Field, jobject obj, jfloat val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setFloatField((JavaObject*)obj, (float)val);
@@ -142,7 +142,7 @@
#endif
jobject Field, jobject obj, jdouble val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setDoubleField((JavaObject*)obj, (double)val);
@@ -155,7 +155,7 @@
#endif
jobject Field, jobject obj, jobject val) {
verifyNull(obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
field->setObjectField((JavaObject*)obj, (JavaObject*)val);
@@ -167,7 +167,7 @@
jclass clazz,
#endif
jclass target, jclass constr, jobject cons) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, target, true);
JavaObject* res = cl->doNew(vm);
JavaField* field = vm->upcalls->constructorSlot;
@@ -182,7 +182,7 @@
jclass thisClass,
#endif
jclass arrayType, jint arrayLength) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* base = NativeUtil::resolvedImplClass(vm, arrayType, true);
JnjvmClassLoader* loader = base->classLoader;
const UTF8* name = base->getName();
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathConstructor.cpp Wed Nov 12 09:41:10 2008
@@ -46,7 +46,7 @@
#endif
jobject cons) {
verifyNull(cons);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = vm->upcalls->constructorSlot;
JavaMethod* meth = (JavaMethod*)(field->getInt32Field((JavaObject*)cons));
UserClass* cl = internalGetClass(vm, meth, cons);
@@ -61,7 +61,7 @@
#endif
jobject cons) {
verifyNull(cons);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = vm->upcalls->constructorSlot;
JavaMethod* meth = (JavaMethod*)(field->getInt32Field((JavaObject*)cons));
return meth->access;
@@ -76,7 +76,7 @@
jclass Clazz,
jint _meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaMethod* meth = (JavaMethod*)_meth;
JavaArray* args = (JavaArray*)_args;
sint32 nbArgs = args ? args->size : 0;
@@ -135,7 +135,7 @@
#endif
jobject cons) {
verifyNull(cons);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = vm->upcalls->constructorSlot;
JavaMethod* meth = (JavaMethod*)field->getInt32Field((JavaObject*)cons);
UserClass* cl = internalGetClass(vm, meth, cons);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathField.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathField.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathField.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathField.cpp Wed Nov 12 09:41:10 2008
@@ -36,7 +36,7 @@
JNIEnv *env,
#endif
jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)obj);
return field->access;
@@ -47,7 +47,7 @@
JNIEnv *env,
#endif
jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)obj);
UserClass* fieldCl = internalGetClass(vm, field, obj);
@@ -61,7 +61,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
const Typedef* type = field->getSignature();
@@ -99,7 +99,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -138,7 +138,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -170,7 +170,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -211,7 +211,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -242,7 +242,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -274,7 +274,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -307,7 +307,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -349,7 +349,7 @@
JNIEnv *env,
#endif
jobject Field, jobject _obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -419,7 +419,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jobject val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
void** buf = (void**)alloca(sizeof(uint64));
@@ -470,7 +470,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jboolean val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -499,7 +499,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jbyte val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -537,7 +537,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jchar val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -573,7 +573,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jshort val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
@@ -610,7 +610,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jint val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -644,7 +644,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jlong val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -676,7 +676,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jfloat val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -706,7 +706,7 @@
JNIEnv *env,
#endif
jobject Field, jobject obj, jdouble val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
JavaObject* Obj = (JavaObject*)obj;
@@ -735,7 +735,7 @@
#endif
JavaObject* Unsafe,
JavaObject* Field) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->fieldSlot;
JavaField* field = (JavaField*)slot->getInt32Field((JavaObject*)Field);
return (jlong)field->ptrOffset;
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathMethod.cpp Wed Nov 12 09:41:10 2008
@@ -46,7 +46,7 @@
JNIEnv *env,
#endif
jobject Meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->methodSlot;
JavaMethod* meth = (JavaMethod*)slot->getInt32Field((JavaObject*)Meth);
return meth->access;
@@ -57,7 +57,7 @@
JNIEnv *env,
#endif
jobject Meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->methodSlot;
JavaMethod* meth = (JavaMethod*)slot->getInt32Field((JavaObject*)Meth);
UserClass* cl = internalGetClass(vm, meth, Meth);
@@ -71,7 +71,7 @@
JNIEnv *env,
#endif
jobject Meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->methodSlot;
JavaMethod* meth = (JavaMethod*)slot->getInt32Field((JavaObject*)Meth);
UserClass* cl = internalGetClass(vm, meth, Meth);
@@ -85,7 +85,7 @@
#endif
jobject Meth, jobject _obj, jobject _args, jclass Cl, jint _meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaMethod* meth = (JavaMethod*)_meth;
JavaArray* args = (JavaArray*)_args;
sint32 nbArgs = args ? args->size : 0;
@@ -145,7 +145,7 @@
\
if (exc) { \
if (exc->classOf->isAssignableFrom(vm->upcalls->newException)) { \
- JavaThread::get()->isolate->invocationTargetException(exc); \
+ JavaThread::get()->getJVM()->invocationTargetException(exc); \
} else { \
JavaThread::throwException(exc); \
} \
@@ -219,7 +219,7 @@
#endif
jobject _meth) {
verifyNull(_meth);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* slot = vm->upcalls->methodSlot;
JavaMethod* meth = (JavaMethod*)slot->getInt32Field((JavaObject*)_meth);
UserClass* cl = internalGetClass(vm, meth, _meth);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp Wed Nov 12 09:41:10 2008
@@ -51,7 +51,7 @@
jboolean clinit,
jobject loader) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JnjvmClassLoader* JCL =
JnjvmClassLoader::getJnjvmLoaderFromJavaObject((JavaObject*)loader, vm);
UserCommonClass* cl = JCL->lookupClassFromJavaString((JavaString*)str, vm,
@@ -75,7 +75,7 @@
jclass Cl,
jboolean publicOnly) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false);
if (cl->isArray() || cl->isInterface() || cl->isPrimitive()) {
@@ -108,7 +108,7 @@
jclass Cl,
jboolean publicOnly) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false);
Classpath* upcalls = vm->upcalls;
@@ -144,7 +144,7 @@
jclass Cl,
jboolean ignore) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false);
return cl->getAccess();
}
@@ -155,7 +155,7 @@
jclass clazz,
#endif
jobject Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = ((JavaObjectClass*)Cl)->getClass();
const UTF8* iname = cl->getName();
@@ -181,7 +181,7 @@
jclass clazz,
#endif
jclass Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false);
return cl->isInterface();
@@ -193,7 +193,7 @@
jclass clazz,
#endif
jclass Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = ((JavaObjectClass*)Cl)->getClass();
if (cl->isArray()) {
@@ -234,7 +234,7 @@
jclass clazz,
#endif
jclass Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = ((JavaObjectClass*)Cl)->getClass();
if (cl->isInterface())
return 0;
@@ -261,7 +261,7 @@
jclass clazz,
#endif
jclass Cl, jboolean publicOnly) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false)->asClass();
if (!cl) {
@@ -293,7 +293,7 @@
jclass clazz,
#endif
jclass Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false);
ArrayObject* ret =
(ArrayObject*)vm->upcalls->classArrayClass->doNew(cl->nbInterfaces, vm);
@@ -311,7 +311,7 @@
jclass clazz,
#endif
jclass Cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false)->asClass();
if (cl) {
cl->resolveInnerOuterClasses();
@@ -330,7 +330,7 @@
jclass clazz,
#endif
jclass Cl, bool publicOnly) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = NativeUtil::resolvedImplClass(vm, Cl, false)->asClass();
if (cl) {
cl->resolveInnerOuterClasses();
@@ -364,7 +364,7 @@
#endif
jclass Cl) {
// TODO implement me
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClassArray* array = vm->upcalls->constructorArrayAnnotation;
return (jobjectArray)array->doNew(0, vm);
}
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClassLoader.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClassLoader.cpp Wed Nov 12 09:41:10 2008
@@ -32,7 +32,7 @@
#endif
jchar byteId) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClassPrimitive* prim =
UserClassPrimitive::byteIdToPrimitive(byteId, vm->upcalls);
if (!prim)
@@ -50,7 +50,7 @@
jobject loader,
jobject _name) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaString* name = (JavaString*)_name;
const UTF8* utf8 = name->strToUTF8(vm);
JnjvmClassLoader* JCL =
@@ -69,7 +69,7 @@
#endif
jobject _str,
jboolean doResolve) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaString* str = (JavaString*)_str;
JnjvmClassLoader* JCL = vm->bootstrapLoader;
@@ -93,7 +93,7 @@
jint off,
jint len,
jobject pd) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JnjvmClassLoader* JCL =
JnjvmClassLoader::getJnjvmLoaderFromJavaObject((JavaObject*)loader, vm);
@@ -112,7 +112,7 @@
#endif
jclass Cl) {
verifyNull(Cl);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
NativeUtil::resolvedImplClass(vm, Cl, false);
}
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMObject.cpp Wed Nov 12 09:41:10 2008
@@ -32,7 +32,7 @@
JavaObject* src = (JavaObject*)_src;
UserCommonClass* cl = src->classOf;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
uint64 size = 0;
if (cl->isArray()) {
size = sizeof(JavaArray) + ((JavaArray*)src)->size *
@@ -55,7 +55,7 @@
jobject _obj) {
JavaObject* obj = (JavaObject*)_obj;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
return (jobject)(obj->classOf->getClassDelegatee(vm));
}
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMRuntime.cpp Wed Nov 12 09:41:10 2008
@@ -39,7 +39,7 @@
jobject _strLib) {
JavaString* strLib = (JavaString*)_strLib;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
const UTF8* utf8Lib = strLib->value;
uint32 stLib = strLib->offset;
@@ -72,7 +72,7 @@
jobject _str,
jobject _loader) {
JavaString* str = (JavaString*)_str;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JnjvmClassLoader* loader =
JnjvmClassLoader::getJnjvmLoaderFromJavaObject((JavaObject*)_loader, vm);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMStackWalker.cpp Wed Nov 12 09:41:10 2008
@@ -102,7 +102,7 @@
jclass clazz,
#endif
) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
int* ips[100];
int real_size = mvm::MvmModule::getBacktrace((void**)(void*)ips, 100);
#ifdef ISOLATE_SHARING
@@ -146,7 +146,7 @@
extern "C" JavaObject* getCallingClass() {
UserClass* cl = JavaJIT::getCallingClass();
- if (cl) return cl->getClassDelegatee(JavaThread::get()->isolate);
+ if (cl) return cl->getClassDelegatee(JavaThread::get()->getJVM());
return 0;
}
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystem.cpp Wed Nov 12 09:41:10 2008
@@ -34,7 +34,7 @@
jint dstart,
jint len) {
- jnjvm::Jnjvm *vm = JavaThread::get()->isolate;
+ jnjvm::Jnjvm *vm = JavaThread::get()->getJVM();
JavaArray* src = (JavaArray*)_src;
JavaArray* dst = (JavaArray*)_dst;
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMSystemProperties.cpp Wed Nov 12 09:41:10 2008
@@ -55,7 +55,7 @@
jobject _prop) {
JavaObject* prop = (JavaObject*)_prop;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
const char* tmp;
setProperty(vm, prop, "java.vm.specification.version", "1.0");
setProperty(vm, prop, "java.vm.specification.vendor",
@@ -123,7 +123,7 @@
}
extern "C" void propertiesPostInit(JavaObject* prop) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
for (std::vector<std::pair<char*, char*> >::iterator i =
vm->postProperties.begin(), e = vm->postProperties.end(); i!= e; i++) {
setProperty(vm, prop, i->first, i->second);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp Wed Nov 12 09:41:10 2008
@@ -42,7 +42,7 @@
static void start(JavaThread* thread) {
- Jnjvm* vm = thread->isolate;
+ Jnjvm* vm = thread->getJVM();
// Ok, now that the thread is created we can set the the value of vmdata,
// which is the JavaThread object.
@@ -85,7 +85,7 @@
JNIEnv *env,
#endif
jobject _vmThread, sint64 stackSize) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaObject* vmThread = (JavaObject*)_vmThread;
// Classpath has set this field.
@@ -102,7 +102,7 @@
JNIEnv *env,
#endif
jobject _vmthread) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaObject* vmthread = (JavaObject*)_vmthread;
JavaField* field = vm->upcalls->vmdataVMThread;
// It's possible that the thread to be interrupted has not finished
@@ -140,7 +140,7 @@
JNIEnv *env,
#endif
jobject _vmthread) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaObject* vmthread = (JavaObject*)_vmthread;
JavaField* field = vm->upcalls->vmdataVMThread;
JavaThread* th = (JavaThread*)field->getObjectField(vmthread);
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp Wed Nov 12 09:41:10 2008
@@ -37,7 +37,7 @@
jclass clazz,
#endif
jobject throwable) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
int** stack =
(int**)vm->gcAllocator.allocateTemporaryMemory(sizeof(int*) * 100);
int real_size = mvm::MvmModule::getBacktrace((void**)stack, 100);
@@ -50,7 +50,7 @@
JavaObject* consStackElement(JavaMethod* meth, int* ip) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaObject* methodName = vm->internalUTF8ToStr(meth->name);
Class* cl = meth->classDef;
const UTF8* internal = cl->name->internalToJava(vm, 0, cl->name->size);
@@ -78,7 +78,7 @@
}
ArrayObject* recGetStackTrace(int** stack, uint32 first, uint32 rec) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
if (stack[first] != 0) {
JavaMethod* meth = JavaJIT::IPToJavaMethod(stack[first]);
if (meth) {
@@ -98,7 +98,7 @@
JNIEnv *env,
#endif
jobject vmthrow, jobject throwable) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = vm->upcalls->vmDataVMThrowable;
int** stack = (int**)field->getObjectField((JavaObject*)vmthrow);
uint32 first = 0;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Wed Nov 12 09:41:10 2008
@@ -467,7 +467,7 @@
JavaMethod* res = lookupMethodDontThrow(name, type, isStatic, recurse,
methodCl);
if (!res) {
- JavaThread::get()->isolate->noSuchMethodError(this, name);
+ JavaThread::get()->getJVM()->noSuchMethodError(this, name);
}
return res;
}
@@ -520,7 +520,7 @@
JavaField* res = lookupFieldDontThrow(name, type, isStatic, recurse,
definingClass);
if (!res) {
- JavaThread::get()->isolate->noSuchFieldError(this, name);
+ JavaThread::get()->getJVM()->noSuchFieldError(this, name);
}
return res;
}
@@ -692,7 +692,7 @@
const UTF8* utf8 = ctpInfo->UTF8At(ctpInfo->ctpDef[idx]);
InitField(obj, (JavaObject*)ctpInfo->resolveString(utf8, idx));
} else {
- JavaThread::get()->isolate->
+ JavaThread::get()->getJVM()->
unknownError("unknown constant %s\n", type->printString());
}
}
@@ -840,7 +840,7 @@
Reader reader(bytes);
uint32 magic = reader.readU4();
if (magic != Jnjvm::Magic) {
- JavaThread::get()->isolate->classFormatError("bad magic number %p", magic);
+ JavaThread::get()->getJVM()->classFormatError("bad magic number %p", magic);
}
/* uint16 minor = */ reader.readU2();
/* uint16 major = */ reader.readU2();
@@ -855,7 +855,7 @@
ctpInfo->resolveClassName(reader.readU2());
if (!(thisClassName->equals(name))) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"try to load %s and found class named %s",
printString(), thisClassName->printString());
}
@@ -995,6 +995,6 @@
#ifdef ISOLATE
TaskClassMirror& CommonClass::getCurrentTaskClassMirror() {
- return IsolateInfo[JavaThread::get()->isolate->IsolateID];
+ return IsolateInfo[JavaThread::get()->getJVM()->IsolateID];
}
#endif
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp Wed Nov 12 09:41:10 2008
@@ -44,7 +44,7 @@
static uint32 unimplemented(JavaConstantPool* ctp, Reader& reader, uint32 index) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"unknown constant pool at index %d",
index);
return 1;
@@ -184,7 +184,7 @@
const UTF8* JavaConstantPool::UTF8At(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantUTF8)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for utf8 at entry %d", entry);
}
@@ -231,7 +231,7 @@
float JavaConstantPool::FloatAt(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantFloat)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for float at entry %d", entry);
}
return ((float*)ctpDef)[entry];
@@ -240,7 +240,7 @@
sint32 JavaConstantPool::IntegerAt(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantInteger)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for integer at entry %d", entry);
}
return ((sint32*)ctpDef)[entry];
@@ -249,7 +249,7 @@
sint64 JavaConstantPool::LongAt(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantLong)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for long at entry %d", entry);
}
return Reader::readLong(ctpDef[entry], ctpDef[entry + 1]);
@@ -258,7 +258,7 @@
double JavaConstantPool::DoubleAt(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantDouble)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for double at entry %d", entry);
}
return Reader::readDouble(ctpDef[entry], ctpDef[entry + 1]);
@@ -267,7 +267,7 @@
CommonClass* JavaConstantPool::isClassLoaded(uint32 entry) {
if (! ((entry > 0) && (entry < ctpSize) &&
typeAt(entry) == ConstantClass)) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for class at entry %d", entry);
}
return (CommonClass*)ctpRes[entry];
@@ -317,7 +317,7 @@
void* res = ctpRes[index];
if (!res) {
if (typeAt(index) != ConstantNameAndType) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for name/type at entry %d", index);
}
sint32 entry = ctpDef[index];
@@ -333,7 +333,7 @@
void* res = ctpRes[index];
if (!res) {
if (typeAt(index) != ConstantNameAndType) {
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for name/type at entry %d", index);
}
sint32 entry = ctpDef[index];
@@ -347,7 +347,7 @@
Typedef* JavaConstantPool::infoOfField(uint32 index) {
if (typeAt(index) != ConstantFieldref)
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for field at entry %d", index);
return resolveNameAndType(ctpDef[index] & 0xFFFF);
}
@@ -356,7 +356,7 @@
CommonClass*& cl, JavaMethod*& meth) {
uint8 id = typeAt(index);
if (id != ConstantMethodref && id != ConstantInterfaceMethodref)
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for method at entry %d", index);
Signdef* sign = resolveNameAndSign(ctpDef[index] & 0xFFFF);
@@ -383,7 +383,7 @@
Signdef*& sign) {
uint8 id = typeAt(index);
if (id != ConstantMethodref && id != ConstantInterfaceMethodref)
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for method at entry %d", index);
sign = resolveNameAndSign(ctpDef[index] & 0xFFFF);
@@ -399,7 +399,7 @@
JavaMethod*& meth) {
uint8 id = typeAt(index);
if (id != ConstantMethodref && id != ConstantInterfaceMethodref)
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for method at entry %d", index);
sign = resolveNameAndSign(ctpDef[index] & 0xFFFF);
@@ -432,7 +432,7 @@
uint8 id = typeAt(index);
if (id != ConstantMethodref && id != ConstantInterfaceMethodref)
- JavaThread::get()->isolate->classFormatError(
+ JavaThread::get()->getJVM()->classFormatError(
"bad constant pool number for method at entry %d", index);
Signdef* sign = resolveNameAndSign(ctpDef[index] & 0xFFFF);
@@ -491,7 +491,7 @@
}
JavaString* JavaConstantPool::resolveString(const UTF8* utf8, uint16 index) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaString* str = vm->internalUTF8ToStr(utf8);
return str;
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp Wed Nov 12 09:41:10 2008
@@ -185,8 +185,8 @@
fprintf(stderr, "Native function %s not found. Probably "
"not implemented by JnJVM?\n", compilingMethod->printString());
JavaJIT::printBacktrace();
- JavaThread::get()->isolate->unknownError("can not find native method %s",
- compilingMethod->printString());
+ JavaThread::get()->getJVM()->unknownError("can not find native method %s",
+ compilingMethod->printString());
}
@@ -263,7 +263,7 @@
uint32 nargs = func->arg_size() + 1 + (stat ? 1 : 0);
std::vector<Value*> nativeArgs;
- int64_t jniEnv = (int64_t)&(JavaThread::get()->isolate->jniEnv);
+ int64_t jniEnv = (int64_t)&(JavaThread::get()->getJVM()->jniEnv);
nativeArgs.push_back(
ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty, jniEnv),
module->ptrType));
@@ -492,7 +492,7 @@
Attribut* codeAtt = compilingMethod->lookupAttribut(Attribut::codeAttribut);
if (!codeAtt) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
vm->unknownError("unable to find the code attribut in %s",
compilingMethod->printString());
}
@@ -650,7 +650,7 @@
Attribut* codeAtt = compilingMethod->lookupAttribut(Attribut::codeAttribut);
if (!codeAtt) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
vm->unknownError("unable to find the code attribut in %s",
compilingMethod->printString());
}
@@ -983,7 +983,7 @@
}
if (exc) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
vm->noClassDefFoundError(exc);
}
@@ -1195,7 +1195,7 @@
}
#endif
} else {
- JavaThread::get()->isolate->unknownError("unknown type %d", type);
+ JavaThread::get()->getJVM()->unknownError("unknown type %d", type);
}
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp Wed Nov 12 09:41:10 2008
@@ -61,7 +61,7 @@
} else if (t == JavaArray::T_DOUBLE) {
return I_DOUBLE;
} else {
- JavaThread::get()->isolate->unknownError("unknown array type %d\n", t);
+ JavaThread::get()->getJVM()->unknownError("unknown array type %d\n", t);
return 0;
}
}
@@ -2181,7 +2181,7 @@
}
default :
- JavaThread::get()->isolate->unknownError("unknown bytecode");
+ JavaThread::get()->getJVM()->unknownError("unknown bytecode");
}
}
@@ -2527,7 +2527,7 @@
default :
- JavaThread::get()->isolate->unknownError("unknown bytecode");
+ JavaThread::get()->getJVM()->unknownError("unknown bytecode");
}
}
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Wed Nov 12 09:41:10 2008
@@ -180,7 +180,7 @@
if (thread->interruptFlag != 0) {
mutexThread.unlock();
thread->interruptFlag = 0;
- thread->isolate->interruptedException(this);
+ thread->getJVM()->interruptedException(this);
} else {
uint32_t recur = l->lock.recursionCount();
bool timeout = false;
@@ -207,11 +207,11 @@
if (interrupted) {
thread->interruptFlag = 0;
- thread->isolate->interruptedException(this);
+ thread->getJVM()->interruptedException(this);
}
}
} else {
- JavaThread::get()->isolate->illegalMonitorStateException(this);
+ JavaThread::get()->getJVM()->illegalMonitorStateException(this);
}
}
@@ -228,7 +228,7 @@
LockObj * l = changeToFatlock();
l->getCond()->notify();
} else {
- JavaThread::get()->isolate->illegalMonitorStateException(this);
+ JavaThread::get()->getJVM()->illegalMonitorStateException(this);
}
}
@@ -237,6 +237,6 @@
LockObj * l = changeToFatlock();
l->getCond()->notifyAll();
} else {
- JavaThread::get()->isolate->illegalMonitorStateException(this);
+ JavaThread::get()->getJVM()->illegalMonitorStateException(this);
}
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.h Wed Nov 12 09:41:10 2008
@@ -193,7 +193,7 @@
#define verifyNull(obj) {}
#else
#define verifyNull(obj) \
- if (obj == 0) JavaThread::get()->isolate->nullPointerException("");
+ if (obj == 0) JavaThread::get()->getJVM()->nullPointerException("");
#endif
virtual void print(mvm::PrintBuffer* buf) const;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Wed Nov 12 09:41:10 2008
@@ -128,7 +128,7 @@
JavaField* field = cl->lookupField(utf8, sign->keyName, true, true, &fieldCl);
- fieldCl->initialiseClass(JavaThread::get()->isolate);
+ fieldCl->initialiseClass(JavaThread::get()->getJVM());
JavaObject* obj = ((UserClass*)fieldCl)->getStaticInstance();
assert(obj && "No static instance in static field lookup");
@@ -143,7 +143,7 @@
extern "C" void* stringLookup(UserClass* cl, uint32 index) {
UserConstantPool* ctpInfo = cl->getConstantPool();
const UTF8* utf8 = ctpInfo->UTF8AtForString(index);
- JavaString* str = JavaThread::get()->isolate->internalUTF8ToStr(utf8);
+ JavaString* str = JavaThread::get()->getJVM()->internalUTF8ToStr(utf8);
#ifdef ISOLATE_SHARING
ctpInfo->ctpRes[index] = str;
#endif
@@ -164,7 +164,7 @@
JavaConstantPool* shared = ctpInfo->getSharedPool();
uint32 clIndex = shared->getClassIndexFromMethod(index);
UserClass* refCl = (UserClass*)ctpInfo->loadClass(clIndex);
- refCl->initialiseClass(JavaThread::get()->isolate);
+ refCl->initialiseClass(JavaThread::get()->getJVM());
CommonClass* baseCl = 0;
const UTF8* utf8 = 0;
@@ -274,7 +274,7 @@
JavaThread* th = JavaThread::get();
jmp_buf* buf = th->sjlj_buffers.back();
th->sjlj_buffers.pop_back();
- mvm::Allocator& allocator = th->isolate->gcAllocator;
+ mvm::Allocator& allocator = th->getJVM()->gcAllocator;
allocator.freeTemporaryMemory(buf);
if (JavaThread::get()->pendingException) {
th->throwPendingException();
@@ -283,45 +283,45 @@
extern "C" void* getSJLJBuffer() {
JavaThread* th = JavaThread::get();
- mvm::Allocator& allocator = th->isolate->gcAllocator;
+ mvm::Allocator& allocator = th->getJVM()->gcAllocator;
void** buf = (void**)allocator.allocateTemporaryMemory(sizeof(jmp_buf));
th->sjlj_buffers.push_back((jmp_buf*)buf);
return (void*)buf;
}
extern "C" void jnjvmNullPointerException() {
- JavaThread::get()->isolate->nullPointerException("null");
+ JavaThread::get()->getJVM()->nullPointerException("null");
}
extern "C" void negativeArraySizeException(sint32 val) {
- JavaThread::get()->isolate->negativeArraySizeException(val);
+ JavaThread::get()->getJVM()->negativeArraySizeException(val);
}
extern "C" void outOfMemoryError(sint32 val) {
- JavaThread::get()->isolate->outOfMemoryError(val);
+ JavaThread::get()->getJVM()->outOfMemoryError(val);
}
extern "C" void jnjvmClassCastException(JavaObject* obj, UserCommonClass* cl) {
- JavaThread::get()->isolate->classCastException(obj, cl);
+ JavaThread::get()->getJVM()->classCastException(obj, cl);
}
extern "C" void indexOutOfBoundsException(JavaObject* obj, sint32 index) {
- JavaThread::get()->isolate->indexOutOfBounds(obj, index);
+ JavaThread::get()->getJVM()->indexOutOfBounds(obj, index);
}
extern "C" UserCommonClass* jnjvmRuntimeInitialiseClass(UserCommonClass* cl) {
- cl->initialiseClass(JavaThread::get()->isolate);
+ cl->initialiseClass(JavaThread::get()->getJVM());
return cl;
}
extern "C" JavaObject* getClassDelegatee(UserCommonClass* cl) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
return cl->getClassDelegatee(vm);
}
static JavaArray* multiCallNewIntern(UserClassArray* cl, uint32 len,
sint32* dims, Jnjvm* vm) {
- if (len <= 0) JavaThread::get()->isolate->unknownError("Can not happen");
+ if (len <= 0) JavaThread::get()->getJVM()->unknownError("Can not happen");
JavaArray* _res = cl->doNew(dims[0], vm);
if (len > 1) {
ArrayObject* res = (ArrayObject*)_res;
@@ -336,11 +336,11 @@
} else {
for (uint32 i = 1; i < len; ++i) {
sint32 p = dims[i];
- if (p < 0) JavaThread::get()->isolate->negativeArraySizeException(p);
+ if (p < 0) JavaThread::get()->getJVM()->negativeArraySizeException(p);
}
}
} else {
- JavaThread::get()->isolate->unknownError("Can not happen");
+ JavaThread::get()->getJVM()->unknownError("Can not happen");
}
}
return _res;
@@ -353,13 +353,13 @@
for (uint32 i = 0; i < len; ++i){
dims[i] = va_arg(ap, int);
}
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
return multiCallNewIntern(cl, len, dims, vm);
}
extern "C" void JavaObjectAquire(JavaObject* obj) {
#ifdef SERVICE_VM
- ServiceDomain* vm = (ServiceDomain*)JavaThread::get()->isolate;
+ ServiceDomain* vm = (ServiceDomain*)JavaThread::get()->getJVM();
if (!(vm->GC->isMyObject(obj))) {
vm->serviceError(vm, "I'm locking an object I don't own");
}
@@ -371,7 +371,7 @@
extern "C" void JavaObjectRelease(JavaObject* obj) {
verifyNull(obj);
#ifdef SERVICE_VM
- ServiceDomain* vm = (ServiceDomain*)JavaThread::get()->isolate;
+ ServiceDomain* vm = (ServiceDomain*)JavaThread::get()->getJVM();
if (!(vm->GC->isMyObject(obj))) {
vm->serviceError(vm, "I'm unlocking an object I don't own");
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp Wed Nov 12 09:41:10 2008
@@ -50,7 +50,7 @@
}
void JavaString::stringDestructor(JavaString* str) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
assert(vm && "No vm when destroying a string");
if (str->value) vm->hashStr.remove(str->value, str);
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp Wed Nov 12 09:41:10 2008
@@ -30,14 +30,13 @@
if (javaThread) javaThread->print(buf);
}
-JavaThread::JavaThread(JavaObject* thread, JavaObject* vmth, Jnjvm* vm) {
+JavaThread::JavaThread(JavaObject* thread, JavaObject* vmth, Jnjvm* isolate) {
javaThread = thread;
vmThread = vmth;
- isolate = vm;
+ vm = isolate;
interruptFlag = 0;
state = StateRunning;
pendingException = 0;
- vmAllocator = &isolate->allocator;
#ifdef SERVICE_VM
ServiceDomain* domain = (ServiceDomain*)vm;
domain->startExecution();
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h Wed Nov 12 09:41:10 2008
@@ -30,7 +30,6 @@
static VirtualTable *VT;
JavaObject* javaThread;
JavaObject* vmThread;
- Jnjvm* isolate;
mvm::LockNormal lock;
mvm::Cond varcond;
JavaObject* pendingException;
@@ -53,6 +52,11 @@
static JavaThread* get() {
return (JavaThread*)mvm::Thread::get();
}
+
+ Jnjvm* getJVM() {
+ return (Jnjvm*)vm;
+ }
+
static JavaObject* currentThread() {
JavaThread* result = get();
if (result != 0)
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp Wed Nov 12 09:41:10 2008
@@ -27,10 +27,10 @@
static void typeError(const UTF8* name, short int l) {
if (l != 0) {
- JavaThread::get()->isolate->
+ JavaThread::get()->getJVM()->
unknownError("wrong type %d in %s", l, name->printString());
} else {
- JavaThread::get()->isolate->
+ JavaThread::get()->getJVM()->
unknownError("wrong type %s", name->printString());
}
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp Wed Nov 12 09:41:10 2008
@@ -608,7 +608,7 @@
}
extern "C" JavaString* internString(JavaString* obj) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
const UTF8* utf8 = obj->strToUTF8(vm);
return vm->UTF8ToStr(utf8);
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jni.cpp Wed Nov 12 09:41:10 2008
@@ -82,7 +82,7 @@
BEGIN_EXCEPTION
JnjvmClassLoader* loader = 0;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* currentClass = JavaJIT::getCallingClass();
if (currentClass) loader = currentClass->classLoader;
else loader = vm->bootstrapLoader;
@@ -131,7 +131,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl2 = NativeUtil::resolvedImplClass(vm, sup, false);
UserCommonClass* cl1 = NativeUtil::resolvedImplClass(vm, sub, false);
@@ -154,7 +154,7 @@
BEGIN_EXCEPTION
JavaThread* th = JavaThread::get();
- Jnjvm* vm = th->isolate;
+ Jnjvm* vm = th->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
if (cl->isArray()) assert(0 && "implement me");
JavaObject* res = ((UserClass*)cl)->doNew(vm);
@@ -229,10 +229,10 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
- if (cl->isArray()) JavaThread::get()->isolate->unknownError("implement me");
- return (jobject)((UserClass*)cl)->doNew(JavaThread::get()->isolate);
+ if (cl->isArray()) JavaThread::get()->getJVM()->unknownError("implement me");
+ return (jobject)((UserClass*)cl)->doNew(JavaThread::get()->getJVM());
END_EXCEPTION
return 0;
@@ -245,7 +245,7 @@
va_list ap;
va_start(ap, methodID);
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* res = cl->doNew(vm);
meth->invokeIntSpecialAP(vm, cl, res, ap);
@@ -268,7 +268,7 @@
const jvalue *args) {
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaMethod* meth = (JavaMethod*)methodID;
Class* cl = (Class*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* res = cl->doNew(vm);
@@ -285,7 +285,7 @@
BEGIN_EXCEPTION
verifyNull((JavaObject*)obj);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
return (jclass)((JavaObject*)obj)->classOf->getClassDelegatee(vm);
END_EXCEPTION
@@ -324,7 +324,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
const UTF8* name = vm->asciizToInternalUTF8(aname);
const UTF8* type = vm->asciizToInternalUTF8(atype);
@@ -345,7 +345,7 @@
va_start(ap, methodID);
JavaObject* self = (JavaObject*)obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, self->classOf);
JavaObject* res = meth->invokeJavaObjectVirtualAP(vm, cl, self, ap);
va_end(ap);
@@ -378,7 +378,7 @@
va_start(ap, methodID);
JavaObject* self = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, self->classOf);
uint32 res = meth->invokeIntVirtualAP(vm, cl, self, ap);
va_end(ap);
@@ -471,7 +471,7 @@
va_start(ap, methodID);
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
uint32 res = meth->invokeIntVirtualAP(vm, cl, obj, ap);
va_end(ap);
@@ -526,7 +526,7 @@
va_start(ap, methodID);
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
jfloat res = meth->invokeFloatVirtualAP(vm, cl, obj, ap);
va_end(ap);
@@ -560,7 +560,7 @@
va_start(ap, methodID);
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
jdouble res = meth->invokeDoubleVirtualAP(vm, cl, obj, ap);
va_end(ap);
@@ -578,7 +578,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
return meth->invokeDoubleVirtualAP(vm, cl, obj, args);
@@ -604,7 +604,7 @@
va_start(ap, methodID);
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
meth->invokeIntVirtualAP(vm, cl, obj, ap);
va_end(ap);
@@ -620,7 +620,7 @@
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
meth->invokeIntVirtualAP(vm, cl, obj, args);
@@ -841,7 +841,7 @@
va_start(ap, methodID);
JavaObject* obj = (JavaObject*)_obj;
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromVirtualMethod(vm, meth, obj->classOf);
meth->invokeIntSpecialAP(vm, cl, obj, ap);
va_end(ap);
@@ -868,7 +868,7 @@
BEGIN_EXCEPTION
// TODO: find a better place to store the UTF8
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
return (jfieldID)
cl->lookupField(cl->classLoader->asciizConstructUTF8(name),
@@ -1111,7 +1111,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
const UTF8* name = vm->asciizToInternalUTF8(aname);
const UTF8* type = vm->asciizToInternalUTF8(atype);
@@ -1152,7 +1152,7 @@
va_list ap;
va_start(ap, methodID);
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromStaticMethod(vm, meth, clazz);
uint32 res = meth->invokeIntStaticAP(vm, cl, ap);
va_end(ap);
@@ -1328,7 +1328,7 @@
va_list ap;
va_start(ap, methodID);
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromStaticMethod(vm, meth, clazz);
meth->invokeIntStaticAP(vm, cl, ap);
va_end(ap);
@@ -1343,7 +1343,7 @@
BEGIN_EXCEPTION
JavaMethod* meth = (JavaMethod*)methodID;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserClass* cl = getClassFromStaticMethod(vm, meth, clazz);
meth->invokeIntStaticAP(vm, cl, args);
@@ -1363,7 +1363,7 @@
BEGIN_EXCEPTION
// TODO: find a better place to store the UTF8
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* cl = NativeUtil::resolvedImplClass(vm, clazz, true);
return (jfieldID)
cl->lookupField(cl->classLoader->asciizConstructUTF8(name),
@@ -1379,7 +1379,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1394,7 +1394,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1409,7 +1409,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1424,7 +1424,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1439,7 +1439,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1454,7 +1454,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1469,7 +1469,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1484,7 +1484,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1499,7 +1499,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1515,7 +1515,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1530,7 +1530,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1545,7 +1545,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1560,7 +1560,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1575,7 +1575,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1590,7 +1590,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1605,7 +1605,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1620,7 +1620,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1635,7 +1635,7 @@
BEGIN_EXCEPTION
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaField* field = (JavaField*)fieldID;
UserClass* cl = (UserClass*)NativeUtil::resolvedImplClass(vm, clazz, true);
JavaObject* Stat = cl->getStaticInstance();
@@ -1741,7 +1741,7 @@
ArrayObject* JA = (ArrayObject*)array;
if (index >= JA->size)
- JavaThread::get()->isolate->indexOutOfBounds(JA, index);
+ JavaThread::get()->getJVM()->indexOutOfBounds(JA, index);
return (jobject)JA->elements[index];
END_EXCEPTION
@@ -1757,7 +1757,7 @@
ArrayObject* JA = (ArrayObject*)array;
if (index >= JA->size)
- JavaThread::get()->isolate->indexOutOfBounds(JA, index);
+ JavaThread::get()->getJVM()->indexOutOfBounds(JA, index);
JA->elements[index] = (JavaObject*)val;
END_EXCEPTION
@@ -2137,7 +2137,7 @@
jint GetJavaVM(JNIEnv *env, JavaVM **vm) {
BEGIN_EXCEPTION
- Jnjvm* myvm = JavaThread::get()->isolate;
+ Jnjvm* myvm = JavaThread::get()->getJVM();
(*vm) = (JavaVM*)(void*)(&(myvm->javavmEnv));
return 0;
END_EXCEPTION
@@ -2281,7 +2281,7 @@
BEGIN_EXCEPTION
JavaObject* th = JavaThread::currentThread();
- Jnjvm* myvm = JavaThread::get()->isolate;
+ Jnjvm* myvm = JavaThread::get()->getJVM();
if (th != 0) {
(*env) = &(myvm->jniEnv);
return JNI_OK;
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Wed Nov 12 09:41:10 2008
@@ -218,7 +218,7 @@
if (exc->classOf->isAssignableFrom(vm->upcalls->newException)) {
Classpath* upcalls = classLoader->bootstrapLoader->upcalls;
UserClass* clExcp = upcalls->ExceptionInInitializerError;
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaObject* obj = clExcp->doNew(vm);
if (!obj) {
fprintf(stderr, "implement me");
@@ -849,7 +849,7 @@
}
void Jnjvm::mainJavaStart(JavaThread* thread) {
- Jnjvm* vm = thread->isolate;
+ Jnjvm* vm = thread->getJVM();
vm->bootstrapThread = thread;
vm->loadBootstrap();
@@ -964,7 +964,7 @@
void Jnjvm::mainCompilerStart(JavaThread* th) {
- Jnjvm* vm = th->isolate;
+ Jnjvm* vm = th->getJVM();
try {
JnjvmBootstrapLoader* bootstrapLoader = vm->bootstrapLoader;
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h Wed Nov 12 09:41:10 2008
@@ -104,7 +104,6 @@
/// allocator - Memory allocator of this JVM.
///
mvm::BumpPtrAllocator allocator;
- mvm::Allocator gcAllocator;
/// throwable - The java/lang/Throwable class. In an isolate
/// environment, generated code references this field.
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Wed Nov 12 09:41:10 2008
@@ -313,7 +313,7 @@
UserClass* cl = internalLoad(name);
if (!cl && doThrow) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
if (name->equals(bootstrapLoader->NoClassDefFoundError)) {
vm->unknownError("Unable to load NoClassDefFoundError");
}
@@ -582,7 +582,7 @@
}
JavaString* JnjvmBootstrapLoader::UTF8ToStr(const UTF8* val) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
JavaString* res = vm->internalUTF8ToStr(val);
strings.push_back(res);
return res;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Wed Nov 12 09:41:10 2008
@@ -151,7 +151,7 @@
if (I == End) {
JavaObject* obj = isStaticCompiling() ? 0 :
- cl->getClassDelegatee(JavaThread::get()->isolate);
+ cl->getClassDelegatee(JavaThread::get()->getJVM());
assert((obj || isStaticCompiling()) && "Delegatee not created");
Constant* cons =
ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty, uint64(obj)),
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Wed Nov 12 09:41:10 2008
@@ -45,7 +45,7 @@
// a callback does not involve UserClass, therefore we wouldn't know
// which class to initialize.
if (!isVirtual(meth->access))
- cl->initialiseClass(JavaThread::get()->isolate);
+ cl->initialiseClass(JavaThread::get()->getJVM());
#endif
meth->compiledPtr();
@@ -106,7 +106,7 @@
((void**)meth->classDef->virtualVT)[offset] = val;
} else {
#ifndef ISOLATE_SHARING
- meth->classDef->initialiseClass(JavaThread::get()->isolate);
+ meth->classDef->initialiseClass(JavaThread::get()->getJVM());
#endif
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp Wed Nov 12 09:41:10 2008
@@ -27,7 +27,7 @@
using namespace jnjvm;
Jnjvm* NativeUtil::myVM(JNIEnv* env) {
- return JavaThread::get()->isolate;
+ return JavaThread::get()->getJVM();
}
void JavaMethod::jniConsFromMeth(char* buf) const {
@@ -339,7 +339,7 @@
}
JavaObject* NativeUtil::getClassType(JnjvmClassLoader* loader, Typedef* type) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
UserCommonClass* res = type->assocClass(loader);
assert(res && "No associated class");
return res->getClassDelegatee(vm);
@@ -347,7 +347,7 @@
ArrayObject* NativeUtil::getParameterTypes(JnjvmClassLoader* loader,
JavaMethod* meth) {
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
std::vector<Typedef*>& args = meth->getSignature()->args;
ArrayObject* res =
(ArrayObject*)vm->upcalls->classArrayClass->doNew(args.size(), vm);
@@ -364,7 +364,7 @@
ArrayObject* NativeUtil::getExceptionTypes(UserClass* cl, JavaMethod* meth) {
Attribut* exceptionAtt = meth->lookupAttribut(Attribut::exceptionsAttribut);
- Jnjvm* vm = JavaThread::get()->isolate;
+ Jnjvm* vm = JavaThread::get()->getJVM();
if (exceptionAtt == 0) {
return (ArrayObject*)vm->upcalls->classArrayClass->doNew(0, vm);
} else {
Modified: vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp Wed Nov 12 09:41:10 2008
@@ -66,7 +66,7 @@
if ((n < start) || (n > end))
- JavaThread::get()->isolate->unknownError("out of range %d %d", n, end);
+ JavaThread::get()->getJVM()->unknownError("out of range %d %d", n, end);
cursor = n;
}
Modified: vmkit/trunk/lib/Mvm/Runtime/Object.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Object.cpp?rev=59140&r1=59139&r2=59140&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Object.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Object.cpp Wed Nov 12 09:41:10 2008
@@ -112,15 +112,3 @@
}
buf->write("\"");
}
-
-void* mvm::BumpPtrAllocator::VMAllocate(size_t sz) {
- mvm::BumpPtrAllocator* allocator = mvm::Thread::get()->vmAllocator;
- assert(allocator && "No allocator when vm allocating");
- return allocator->Allocate(sz);
-}
-
-void* mvm::BumpPtrAllocator::ThreadAllocate(size_t sz) {
- mvm::BumpPtrAllocator* allocator = mvm::Thread::get()->threadAllocator;
- assert(allocator && "No allocator when thread allocating");
- return allocator->Allocate(sz);
-}
More information about the vmkit-commits
mailing list