[vmkit-commits] [vmkit] r180303 - Reverting the changes made to this files with the aim of porting to GNUClasspath 0.99. the chaes destroy the porting to OpenJDK.
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 09:52:45 PDT 2013
Author: peter.senna
Date: Thu Apr 25 11:51:06 2013
New Revision: 180303
URL: http://llvm.org/viewvc/llvm-project?rev=180303&view=rev
Log:
Reverting the changes made to this files with the aim of porting to GNUClasspath 0.99. the chaes destroy the porting to OpenJDK.
(cherry picked from commit 677cee481b8235d0bafb8741920f9c3aa9d70e4c)
Modified:
vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc
vmkit/trunk/lib/j3/ClassLib/ClasspathField.inc
vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc
Modified: vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc?rev=180303&r1=180302&r2=180303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClasspathConstructor.inc Thu Apr 25 11:51:06 2013
@@ -25,75 +25,75 @@ using namespace j3;
extern "C" {
-
-
-JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMConstructor_getParameterTypes(
+JNIEXPORT jobject JNICALL Java_java_lang_reflect_Constructor_getParameterTypes(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMConstructor* cons) {
+JavaObjectConstructor* cons) {
- JavaObject* res = 0;
- UserCommonClass* cls = 0;
- JavaMethod* method = 0;
- // Local object references
- llvm_gcroot(cons, 0);
- llvm_gcroot(res, 0);
-
- BEGIN_NATIVE_EXCEPTION(0)
- // Store local reference
- verifyNull(cons);
- cls = (UserCommonClass*)JavaObjectVMConstructor::getClass(cons);
- method = JavaObjectVMConstructor::getInternalMethod(cons);
- res = method->getParameterTypes(cls->classLoader);
+ JavaObject* res = 0;
- END_NATIVE_EXCEPTION
+ llvm_gcroot(cons, 0);
+ llvm_gcroot(res, 0);
+
+ BEGIN_NATIVE_EXCEPTION(0)
- return (jobject)res;
+ verifyNull(cons);
+ UserClass* cl = JavaObjectConstructor::getClass(cons);
+ JavaMethod* meth = JavaObjectConstructor::getInternalMethod(cons);
+ JnjvmClassLoader* loader = cl->classLoader;
+
+ res = meth->getParameterTypes(loader);
+ END_NATIVE_EXCEPTION
+
+ return (jobject)res;
}
-JNIEXPORT jint JNICALL Java_java_lang_reflect_VMConstructor_getModifiersInternal(
+JNIEXPORT jint JNICALL Java_java_lang_reflect_Constructor_getModifiersInternal(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMConstructor* cons) {
+JavaObjectConstructor* cons) {
- jint res = 0;
+ llvm_gcroot(cons, 0);
+ jint res = 0;
- JavaMethod* method = 0;
- // Local object references
- llvm_gcroot(cons, 0);
+ BEGIN_NATIVE_EXCEPTION(0)
- BEGIN_NATIVE_EXCEPTION(0)
- // Store local reference
- verifyNull(cons);
- method = JavaObjectVMConstructor::getInternalMethod(cons);
- res = method->access;
+ verifyNull(cons);
+ JavaMethod* meth = JavaObjectConstructor::getInternalMethod(cons);
+ res = meth->access;
- END_NATIVE_EXCEPTION
+ END_NATIVE_EXCEPTION
- return res;
+ return res;
}
-JavaObject* proceedRealConstructor(ArrayObject* args,
- UserCommonClass* clazz, JavaMethod* method)
+JavaObject* proceedConstructor(JavaObjectConstructor* cons,
+ ArrayObject* args,
+ JavaObject* Clazz, jint index)
__attribute__ ((noinline));
-JavaObject* proceedRealConstructor(ArrayObject* args,
- UserCommonClass* clazz, JavaMethod* method) {
+JavaObject* proceedConstructor(JavaObjectConstructor* cons,
+ ArrayObject* args,
+ JavaObject* Clazz, jint index) {
JavaObject* res = 0;
JavaObject* excp = 0;
+ llvm_gcroot(cons, 0);
llvm_gcroot(args, 0);
+ llvm_gcroot(Clazz, 0);
llvm_gcroot(res, 0);
llvm_gcroot(excp, 0);
Jnjvm* vm = JavaThread::get()->getJVM();
+ JavaMethod* meth = JavaObjectConstructor::getInternalMethod(cons);
+ UserClass* cl = JavaObjectConstructor::getClass(cons);
sint32 nbArgs = args ? ArrayObject::getSize(args) : 0;
- Signdef* sign = method->getSignature();
+ Signdef* sign = meth->getSignature();
sint32 size = sign->nbArguments;
- if (isAbstract(clazz->access)) vm->instantiationException(clazz);
+ if (isAbstract(cl->access)) vm->instantiationException(cl);
vmkit::ThreadAllocator allocator;
// Allocate a buffer to store the arguments.
@@ -101,7 +101,8 @@ JavaObject* proceedRealConstructor(Array
(jvalue*)allocator.Allocate(size * sizeof(jvalue)) : NULL;
if (nbArgs == size) {
- UserClass* cl = clazz->asClass();
+ UserCommonClass* _cl = UserCommonClass::resolvedImplClass(vm, Clazz, false);
+ UserClass* cl = _cl->asClass();
if (cl) {
cl->initialiseClass(vm);
res = cl->doNew(vm);
@@ -118,7 +119,7 @@ JavaObject* proceedRealConstructor(Array
JavaThread* th = JavaThread::get();
TRY {
- method->invokeIntSpecialBuf(vm, cl, res, buf);
+ meth->invokeIntSpecialBuf(vm, cl, res, buf);
} CATCH {
excp = th->getJavaException();
} END_CATCH;
@@ -146,75 +147,71 @@ JavaObject* proceedRealConstructor(Array
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMConstructor_construct(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Constructor_constructNative(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMConstructor* cons, ArrayObject* args) {
+JavaObjectConstructor* cons, ArrayObject* args, JavaObject* Clazz, jint index) {
JavaObject* res = 0;
- JavaMethod* m = 0;
- UserCommonClass* cls = 0;
llvm_gcroot(res, 0);
llvm_gcroot(cons, 0);
llvm_gcroot(args, 0);
+ llvm_gcroot(Clazz, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(cons);
- cls = (UserCommonClass*)JavaObjectVMConstructor::getClass(cons);
- m = JavaObjectVMConstructor::getInternalMethod(cons);
- res = proceedRealConstructor(args, cls, m);
+ res = proceedConstructor(cons, args, Clazz, index);
END_NATIVE_EXCEPTION
+
return res;
}
JNIEXPORT
-ArrayObject* JNICALL Java_java_lang_reflect_VMConstructor_getExceptionTypes(
+ArrayObject* JNICALL Java_java_lang_reflect_Constructor_getExceptionTypes(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMConstructor* cons) {
+JavaObjectConstructor* cons) {
ArrayObject* res = 0;
- JavaMethod* m = 0;
- UserCommonClass* cls = 0;
+
llvm_gcroot(res, 0);
llvm_gcroot(cons, 0);
BEGIN_NATIVE_EXCEPTION(0)
verifyNull(cons);
- cls = (UserCommonClass*)JavaObjectVMConstructor::getClass(cons);
- m = JavaObjectVMConstructor::getInternalMethod(cons);
- JnjvmClassLoader* loader = cls->classLoader;
- res = (ArrayObject*)m->getExceptionTypes(loader);
+ UserClass* cl = JavaObjectConstructor::getClass(cons);
+ JavaMethod* meth = JavaObjectConstructor::getInternalMethod(cons);
+ JnjvmClassLoader* loader = cl->classLoader;
- END_NATIVE_EXCEPTION
+ res = (ArrayObject*)meth->getExceptionTypes(loader);
+ END_NATIVE_EXCEPTION
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMConstructor_getSignature(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Constructor_getSignature(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMConstructor* cons) {
+JavaObjectConstructor* Meth) {
JavaObject* result = 0;
- JavaMethod* m = 0;
+
llvm_gcroot(result, 0);
- llvm_gcroot(cons, 0);
+ llvm_gcroot(Meth, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(cons);
- m = JavaObjectVMConstructor::getInternalMethod(cons);
+ verifyNull(Meth);
+ JavaMethod* meth = JavaObjectConstructor::getInternalMethod(Meth);
Jnjvm* vm = JavaThread::get()->getJVM();
- result = vm->internalUTF8ToStr(m->type);
+ result = vm->internalUTF8ToStr(meth->type);
END_NATIVE_EXCEPTION
Modified: vmkit/trunk/lib/j3/ClassLib/ClasspathField.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClasspathField.inc?rev=180303&r1=180302&r2=180303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClasspathField.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClasspathField.inc Thu Apr 25 11:51:06 2013
@@ -19,20 +19,19 @@ using namespace j3;
extern "C" {
-JNIEXPORT jint JNICALL Java_java_lang_reflect_VMField_getModifiersInternal(
+
+JNIEXPORT jint JNICALL Java_java_lang_reflect_Field_getModifiersInternal(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field) {
+JavaObjectField* Field) {
jint res = 0;
llvm_gcroot(Field, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
-
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
res = field->access;
END_NATIVE_EXCEPTION
@@ -40,11 +39,11 @@ JavaObjectVMField* Field) {
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMField_getType(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Field_getType(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field) {
+JavaObjectField* Field) {
JavaObject* res = 0;
@@ -52,26 +51,24 @@ JavaObjectVMField* Field) {
llvm_gcroot(res, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
- Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cls = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
-
- JnjvmClassLoader* loader = cls->classLoader;
- UserCommonClass* fieldCl = field->getSignature()->assocClass(loader);
- res = fieldCl->getClassDelegatee(vm);
+ Jnjvm* vm = JavaThread::get()->getJVM();
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
+ JnjvmClassLoader* loader = cl->classLoader;
+ UserCommonClass* fieldCl = field->getSignature()->assocClass(loader);
+ res = fieldCl->getClassDelegatee(vm);
END_NATIVE_EXCEPTION
return res;
}
-JNIEXPORT jint JNICALL Java_java_lang_reflect_VMField_getInt(
+JNIEXPORT jint JNICALL Java_java_lang_reflect_Field_getInt(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jint res = 0;
@@ -79,15 +76,15 @@ JavaObjectVMField* Field, JavaObject* ob
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
const Typedef* type = field->getSignature();
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -132,11 +129,11 @@ JavaObjectVMField* Field, JavaObject* ob
}
-JNIEXPORT jlong JNICALL Java_java_lang_reflect_VMField_getLong(
+JNIEXPORT jlong JNICALL Java_java_lang_reflect_Field_getLong(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jlong res = 0;
@@ -144,14 +141,14 @@ JavaObjectVMField* Field, JavaObject* ob
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -202,11 +199,11 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT jboolean JNICALL Java_java_lang_reflect_VMField_getBoolean(
+JNIEXPORT jboolean JNICALL Java_java_lang_reflect_Field_getBoolean(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jboolean res = 0;
@@ -214,14 +211,14 @@ JavaObjectVMField* Field, JavaObject* ob
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -248,25 +245,25 @@ JavaObjectVMField* Field, JavaObject* ob
}
-JNIEXPORT jfloat JNICALL Java_java_lang_reflect_VMField_getFloat(
+JNIEXPORT jfloat JNICALL Java_java_lang_reflect_Field_getFloat(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jfloat res = 0;
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -323,25 +320,25 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT jbyte JNICALL Java_java_lang_reflect_VMField_getByte(
+JNIEXPORT jbyte JNICALL Java_java_lang_reflect_Field_getByte(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jbyte res = 0;
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -367,25 +364,25 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT jchar JNICALL Java_java_lang_reflect_VMField_getChar(
+JNIEXPORT jchar JNICALL Java_java_lang_reflect_Field_getChar(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jchar res = 0;
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -412,11 +409,11 @@ JavaObjectVMField* Field, JavaObject* ob
}
-JNIEXPORT jshort JNICALL Java_java_lang_reflect_VMField_getShort(
+JNIEXPORT jshort JNICALL Java_java_lang_reflect_Field_getShort(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jshort res = 0;
@@ -424,14 +421,14 @@ JavaObjectVMField* Field, JavaObject* ob
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
+
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -463,26 +460,25 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT jdouble JNICALL Java_java_lang_reflect_VMField_getDouble(
+JNIEXPORT jdouble JNICALL Java_java_lang_reflect_Field_getDouble(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
jdouble res = 0;
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -544,11 +540,11 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMField_get(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Field_get(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj) {
+JavaObjectField* Field, JavaObject* obj) {
JavaObject* res = 0;
@@ -557,15 +553,14 @@ JavaObjectVMField* Field, JavaObject* ob
llvm_gcroot(res, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -627,11 +622,11 @@ JavaObjectVMField* Field, JavaObject* ob
return res;
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_set(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_set(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, JavaObject* val) {
+JavaObjectField* Field, JavaObject* obj, JavaObject* val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
@@ -640,15 +635,14 @@ JavaObjectVMField* Field, JavaObject* ob
BEGIN_NATIVE_EXCEPTION(0)
Jnjvm* vm = JavaThread::get()->getJVM();
- verifyNull(Field);
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
jvalue buf;
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -719,25 +713,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setBoolean(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setBoolean(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jboolean val) {
+JavaObjectField* Field, JavaObject* obj, jboolean val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -762,25 +755,24 @@ JavaObjectVMField* Field, JavaObject* ob
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setByte(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setByte(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jbyte val) {
+JavaObjectField* Field, JavaObject* obj, jbyte val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -834,25 +826,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setChar(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setChar(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jchar val) {
+JavaObjectField* Field, JavaObject* obj, jchar val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -899,25 +890,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setShort(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setShort(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jshort val) {
+JavaObjectField* Field, JavaObject* obj, jshort val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -964,25 +954,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setInt(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setInt(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jint val) {
+JavaObjectField* Field, JavaObject* obj, jint val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -1024,25 +1013,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setLong(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setLong(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jlong val) {
+JavaObjectField* Field, JavaObject* obj, jlong val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -1078,25 +1066,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setFloat(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setFloat(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jfloat val) {
+JavaObjectField* Field, JavaObject* obj, jfloat val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
@@ -1126,25 +1113,24 @@ JavaObjectVMField* Field, JavaObject* ob
END_NATIVE_EXCEPTION
}
-JNIEXPORT void JNICALL Java_java_lang_reflect_VMField_setDouble(
+JNIEXPORT void JNICALL Java_java_lang_reflect_Field_setDouble(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMField* Field, JavaObject* obj, jdouble val) {
+JavaObjectField* Field, JavaObject* obj, jdouble val) {
llvm_gcroot(Field, 0);
llvm_gcroot(obj, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Field);
Jnjvm* vm = JavaThread::get()->getJVM();
- UserCommonClass* cl = (UserCommonClass*)JavaObjectVMField::getClass(Field);
- JavaField* field = JavaObjectVMField::getInternalField(Field);
+ UserClass* cl = JavaObjectField::getClass(Field);
+ JavaField* field = JavaObjectField::getInternalField(Field);
bool stat = isStatic(field->access);
if (stat) {
- cl->asClass()->initialiseClass(vm);
+ cl->initialiseClass(vm);
} else {
verifyNull(obj);
}
Modified: vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc?rev=180303&r1=180302&r2=180303&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClasspathMethod.inc Thu Apr 25 11:51:06 2013
@@ -25,18 +25,18 @@ using namespace j3;
extern "C" {
-JNIEXPORT jint JNICALL Java_java_lang_reflect_VMMethod_getModifiersInternal(
+JNIEXPORT jint JNICALL Java_java_lang_reflect_Method_getModifiersInternal(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth) {
+JavaObjectMethod* Meth) {
jint res = 0;
llvm_gcroot(Meth, 0);
BEGIN_NATIVE_EXCEPTION(0)
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
res = meth->access;
END_NATIVE_EXCEPTION
@@ -44,22 +44,21 @@ JavaObjectVMMethod* Meth) {
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMMethod_getReturnType(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Method_getReturnType(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth) {
+JavaObjectMethod* Meth) {
JavaObject* res = 0;
llvm_gcroot(Meth, 0);
llvm_gcroot(res, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Meth);
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
- UserCommonClass* cls = (UserCommonClass*)JavaObjectVMMethod::getClass(Meth);
- JnjvmClassLoader* loader = cls->classLoader;
+ UserClass* cl = JavaObjectMethod::getClass(Meth);
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
+ JnjvmClassLoader* loader = cl->classLoader;
res = meth->getReturnType(loader);
END_NATIVE_EXCEPTION
@@ -68,22 +67,22 @@ JavaObjectVMMethod* Meth) {
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMMethod_getParameterTypes(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Method_getParameterTypes(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth) {
+JavaObjectMethod* Meth) {
JavaObject* res = 0;
llvm_gcroot(Meth, 0);
llvm_gcroot(res, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Meth);
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
- UserCommonClass* cls = (UserCommonClass*)JavaObjectVMMethod::getClass(Meth);
- JnjvmClassLoader* loader = cls->classLoader;
+ UserClass* cl = JavaObjectMethod::getClass(Meth);
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
+ JnjvmClassLoader* loader = cl->classLoader;
+
res = meth->getParameterTypes(loader);
END_NATIVE_EXCEPTION
@@ -91,13 +90,12 @@ JavaObjectVMMethod* Meth) {
return res;
}
-
-JavaObject* proceedVMMethod(JavaObjectVMMethod* Meth, JavaObject* obj,
- ArrayObject* args)
+JavaObject* proceedMethod(JavaObjectMethod* Meth, JavaObject* obj,
+ ArrayObject* args, JavaObject* Cl, jint index)
__attribute__((noinline));
-JavaObject* proceedVMMethod(JavaObjectVMMethod* Meth, JavaObject* obj,
- ArrayObject* args) {
+JavaObject* proceedMethod(JavaObjectMethod* Meth, JavaObject* obj,
+ ArrayObject* args, JavaObject* Cl, jint index) {
JavaObject* res = 0;
JavaObject* exc = 0;
@@ -106,11 +104,12 @@ JavaObject* proceedVMMethod(JavaObjectVM
llvm_gcroot(Meth, 0);
llvm_gcroot(obj, 0);
llvm_gcroot(args, 0);
+ llvm_gcroot(Cl, 0);
llvm_gcroot(exc, 0);
Jnjvm* vm = JavaThread::get()->getJVM();
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
- UserCommonClass* _cl = (UserCommonClass*)JavaObjectVMMethod::getClass(Meth);
+
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
sint32 nbArgs = args ? ArrayObject::getSize(args) : 0;
Signdef* sign = meth->getSignature();
@@ -121,7 +120,7 @@ JavaObject* proceedVMMethod(JavaObjectVM
(jvalue*)allocator.Allocate(size * sizeof(jvalue)) : NULL;
if (nbArgs == size) {
- //UserCommonClass* _cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
+ UserCommonClass* _cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
UserClass* cl = (UserClass*)_cl;
if (isVirtual(meth->access)) {
@@ -235,32 +234,33 @@ JavaObject* proceedVMMethod(JavaObjectVM
#undef RUN_METH
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMMethod_invoke(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Method_invokeNative(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth, JavaObject* obj, ArrayObject* args) {
+JavaObjectMethod* Meth, JavaObject* obj, ArrayObject* args, JavaObject* Cl, jint index) {
JavaObject* res = 0;
llvm_gcroot(res, 0);
llvm_gcroot(Meth, 0);
llvm_gcroot(obj, 0);
llvm_gcroot(args, 0);
+ llvm_gcroot(Cl, 0);
BEGIN_NATIVE_EXCEPTION(0)
- verifyNull(Meth);
- res = proceedVMMethod(Meth, obj, args);
+
+ res = proceedMethod(Meth, obj, args, Cl, index);
END_NATIVE_EXCEPTION
return res;
}
-JNIEXPORT ArrayObject* JNICALL Java_java_lang_reflect_VMMethod_getExceptionTypes(
+JNIEXPORT ArrayObject* JNICALL Java_java_lang_reflect_Method_getExceptionTypes(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth) {
+JavaObjectMethod* Meth) {
ArrayObject* res = 0;
llvm_gcroot(Meth, 0);
@@ -269,10 +269,9 @@ JavaObjectVMMethod* Meth) {
BEGIN_NATIVE_EXCEPTION(0)
verifyNull(Meth);
-
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
- UserCommonClass* cls = (UserCommonClass*)JavaObjectVMMethod::getClass(Meth);
- JnjvmClassLoader* loader = cls->classLoader;
+ UserClass* cl = JavaObjectMethod::getClass(Meth);
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
+ JnjvmClassLoader* loader = cl->classLoader;
res = meth->getExceptionTypes(loader);
END_NATIVE_EXCEPTION
@@ -280,11 +279,11 @@ JavaObjectVMMethod* Meth) {
return res;
}
-JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_VMMethod_getSignature(
+JNIEXPORT JavaObject* JNICALL Java_java_lang_reflect_Method_getSignature(
#ifdef NATIVE_JNI
JNIEnv *env,
#endif
-JavaObjectVMMethod* Meth) {
+JavaObjectMethod* Meth) {
JavaObject* result = 0;
llvm_gcroot(Meth, 0);
@@ -293,7 +292,7 @@ JavaObjectVMMethod* Meth) {
BEGIN_NATIVE_EXCEPTION(0)
verifyNull(Meth);
- JavaMethod* meth = JavaObjectVMMethod::getInternalMethod(Meth);
+ JavaMethod* meth = JavaObjectMethod::getInternalMethod(Meth);
Jnjvm* vm = JavaThread::get()->getJVM();
result = vm->internalUTF8ToStr(meth->type);
More information about the vmkit-commits
mailing list