From: Michael Starzinger Date: Wed, 20 Aug 2008 14:55:14 +0000 (+0200) Subject: * src/native/vm/cldc1.1/java_lang_Object.cpp: Use getter function instead of X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=6f81dffa69f3f37a456694a11cd85628bd2e6f69;p=cacao.git * src/native/vm/cldc1.1/java_lang_Object.cpp: Use getter function instead of LLNI macro to determine objects class. * src/native/vm/gnuclasspath/java_lang_VMObject.cpp: Likewise. * src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp: Likewise. * src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp: Likewise. * src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp: Likewise. --- diff --git a/src/native/vm/cldc1.1/java_lang_Object.cpp b/src/native/vm/cldc1.1/java_lang_Object.cpp index 14711dcd7..2f934c6a4 100644 --- a/src/native/vm/cldc1.1/java_lang_Object.cpp +++ b/src/native/vm/cldc1.1/java_lang_Object.cpp @@ -52,16 +52,14 @@ extern "C" { */ JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass(JNIEnv *env, jobject obj) { - classinfo *c; - if (obj == NULL) { exceptions_throw_nullpointerexception(); return NULL; } - LLNI_class_get(obj, c); + java_lang_Object o(obj); - return (jclass) LLNI_classinfo_wrap(c); + return (jclass) LLNI_classinfo_wrap(o.get_Class()); } diff --git a/src/native/vm/gnuclasspath/java_lang_VMObject.cpp b/src/native/vm/gnuclasspath/java_lang_VMObject.cpp index a671f9b4f..b5af0cdef 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMObject.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMObject.cpp @@ -39,6 +39,7 @@ #include "vm/builtin.h" #include "vm/exceptions.hpp" +#include "vm/javaobjects.hpp" #include "vm/utf8.h" @@ -52,16 +53,14 @@ extern "C" { */ JNIEXPORT jclass JNICALL Java_java_lang_VMObject_getClass(JNIEnv *env, jclass clazz, jobject obj) { - classinfo *c; - if (obj == NULL) { exceptions_throw_nullpointerexception(); return NULL; } - LLNI_class_get(obj, c); + java_lang_Object o(obj); - return (jclass) LLNI_classinfo_wrap(c); + return (jclass) LLNI_classinfo_wrap(o.get_Class()); } diff --git a/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp b/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp index 3a7b67ff2..180914bea 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMSystem.cpp @@ -65,6 +65,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy(JNIEnv *env, jclass cla JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode(JNIEnv *env, jclass clazz, jobject obj) { java_lang_Object o(obj); + return o.get_hashcode(); } diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp index 756ef407d..ffb0bb737 100644 --- a/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp +++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMConstructor.cpp @@ -148,9 +148,7 @@ JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMConstructor_declaredAnnotatio if (declaredAnnotations == NULL) { java_handle_bytearray_t* annotations = rvmc.get_annotations(); classinfo* declaringClass = rvmc.get_clazz(); - - classinfo *referer; - LLNI_class_get(_this, referer); + classinfo* referer = rvmc.get_Class(); declaredAnnotations = Reflection::get_declaredannotations(annotations, declaringClass, referer); @@ -174,9 +172,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_lang_reflect_VMConstructor_getParameter java_handle_bytearray_t* parameterAnnotations = rvmc.get_parameterAnnotations(); methodinfo* m = rvmc.get_method(); - - classinfo* referer; - LLNI_class_get((java_lang_reflect_VMConstructor*) _this, referer); + classinfo* referer = rvmc.get_Class(); java_handle_objectarray_t* oa = Reflection::get_parameterannotations(parameterAnnotations, m, referer); diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp index 8a100bbe3..476237936 100644 --- a/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp +++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMField.cpp @@ -1134,9 +1134,7 @@ JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMField_declaredAnnotations(JNI if (declaredAnnotations == NULL) { java_handle_bytearray_t* annotations = rvmf.get_annotations(); classinfo* declaringClass = rvmf.get_clazz(); - - classinfo* referer; - LLNI_class_get(_this, referer); + classinfo* referer = rvmf.get_Class(); declaredAnnotations = Reflection::get_declaredannotations(annotations, declaringClass, referer); diff --git a/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp b/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp index 561ab3882..7be27fd6b 100644 --- a/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp +++ b/src/native/vm/gnuclasspath/java_lang_reflect_VMMethod.cpp @@ -193,8 +193,7 @@ JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMMethod_getDefaultValue(JNIEnv return NULL; } - classinfo *referer; - LLNI_class_get((java_lang_reflect_VMMethod *) _this, referer); + classinfo *referer = rvmm.get_Class(); m_parseAnnotationDefault = class_resolveclassmethod( class_sun_reflect_annotation_AnnotationParser, @@ -232,9 +231,7 @@ JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMMethod_declaredAnnotations(JN if (declaredAnnotations == NULL) { java_handle_bytearray_t* annotations = rvmm.get_annotations(); classinfo* declaringClass = rvmm.get_clazz(); - - classinfo *referer; - LLNI_class_get((java_lang_reflect_VMMethod *) _this, referer); + classinfo* referer = rvmm.get_Class(); declaredAnnotations = Reflection::get_declaredannotations(annotations, declaringClass, referer); @@ -255,9 +252,7 @@ JNIEXPORT jobjectArray JNICALL Java_java_lang_reflect_VMMethod_getParameterAnnot java_lang_reflect_VMMethod rvmm(_this); java_handle_bytearray_t* parameterAnnotations = rvmm.get_parameterAnnotations(); methodinfo* m = rvmm.get_method(); - - classinfo* referer; - LLNI_class_get((java_lang_reflect_VMMethod *) _this, referer); + classinfo* referer = rvmm.get_Class(); java_handle_objectarray_t* oa = Reflection::get_parameterannotations(parameterAnnotations, m, referer); return (jobjectArray) oa;