* src/native/vm/VMClass.c (getDeclaredMethods): Set the method's class

in java.lang.reflect.Method.

* src/native/vm/Method.c (toolbox/logging.h, vm/jit/stacktrace.h):
Removed.

* src/native/vm/VMSystem.c (identityHashCode): Use casts.

diff --git a/src/native/vm/Method.c b/src/native/vm/Method.c
index a7425edbf4472fcd8a19a1d1e9ee401fd3680aa7..e540ac0f8e34e163b65ab57669ee433bda1a59ef 100644 (file)
--- a/src/native/vm/Method.c
+++ b/src/native/vm/Method.c
@@ -29,7 +29,7 @@
    Changes: Joseph Wenninger
             Christian Thalinger
 
-   $Id: Method.c 4406 2006-02-03 13:19:36Z twisti $
+   $Id: Method.c 4485 2006-02-12 00:30:13Z twisti $
 
 */
 
@@ -45,14 +45,12 @@
 #include "native/include/java_lang_Object.h"
 #include "native/include/java_lang_Class.h"
 #include "native/include/java_lang_reflect_Method.h"
-#include "toolbox/logging.h"
 #include "vm/access.h"
 #include "vm/global.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/initialize.h"
 #include "vm/stringlocal.h"
-#include "vm/jit/stacktrace.h"
 
 
 /*

diff --git a/src/native/vm/VMClass.c b/src/native/vm/VMClass.c
index 6ca26c0af31dd6678dcf288f6a83dbbf4ba24805..7fcdf383e9dbd313f3a2636a6697ce456c2faa3a 100644 (file)
--- a/src/native/vm/VMClass.c
+++ b/src/native/vm/VMClass.c
@@ -29,14 +29,16 @@
    Changes: Joseph Wenninger
             Christian Thalinger
 
-   $Id: VMClass.c 4357 2006-01-22 23:33:38Z twisti $
+   $Id: VMClass.c 4485 2006-02-12 00:30:13Z twisti $
 
 */
 
 
+#include "config.h"
+
+#include <assert.h>
 #include <string.h>
 
-#include "config.h"
 #include "vm/types.h"
 
 #include "mm/memory.h"
@@ -508,7 +510,7 @@ JNIEXPORT java_objectarray* JNICALL Java_java_lang_VMClass_getDeclaredMethods(JN
 
                        rm = (java_lang_reflect_Method *) o;
 
-                       rm->declaringClass = klass;
+                       rm->declaringClass = m->class;
                        rm->name           = javastring_new(m->name);
                        rm->slot           = i;
 

diff --git a/src/native/vm/VMSystem.c b/src/native/vm/VMSystem.c
index 3808f3aa7d0408560d879401b61c80812c8b9a05..7da06846e8bbf257a3d948be5388b51bfc6fe9a9 100644 (file)
--- a/src/native/vm/VMSystem.c
+++ b/src/native/vm/VMSystem.c
@@ -29,7 +29,7 @@
    Changes: Joseph Wenninger
             Christian Thalinger
 
-   $Id: VMSystem.c 4357 2006-01-22 23:33:38Z twisti $
+   $Id: VMSystem.c 4485 2006-02-12 00:30:13Z twisti $
 
 */
 
@@ -139,9 +139,9 @@ JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy(JNIEnv *env, jclass cla
  * Method:    identityHashCode
  * Signature: (Ljava/lang/Object;)I
  */
-JNIEXPORT s4 JNICALL Java_java_lang_VMSystem_identityHashCode(JNIEnv *env, jclass clazz, java_lang_Object *par1)
+JNIEXPORT s4 JNICALL Java_java_lang_VMSystem_identityHashCode(JNIEnv *env, jclass clazz, java_lang_Object *o)
 {
-       return ((char *) par1) - ((char *) 0);
+       return (s4) ((ptrint) o);
 }