* Merged executionstate branch.

[cacao.git] / src / native / vm / gnu / gnu_classpath_VMStackWalker.c

diff --git a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
index 1243f7c1181a99766c329a9207ec6ca36f75a9f4..eca8f531a7935dde6fa5d7df6319180b85d306ac 100644 (file)
--- a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
+++ b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
@@ -1,9 +1,7 @@
 /* src/native/vm/gnu/gnu_classpath_VMStackWalker.c
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: gnu_classpath_VMStackWalker.c 7297 2007-02-07 14:59:56Z twisti $
-
 */
 
 
@@ -31,16 +27,44 @@
 
 #include "native/jni.h"
 #include "native/native.h"
+
 #include "native/include/java_lang_Class.h"
 #include "native/include/java_lang_ClassLoader.h"
 
-#include "vm/builtin.h"
+#include "native/include/gnu_classpath_VMStackWalker.h"
+
 #include "vm/global.h"
 
 #include "vm/jit/stacktrace.h"
 
 #include "vmcore/class.h"
-#include "vmcore/options.h"
+#include "vmcore/utf8.h"
+
+
+/* native methods implemented by this file ************************************/
+
+static JNINativeMethod methods[] = {
+       { "getClassContext",         "()[Ljava/lang/Class;",      (void *) (ptrint) &Java_gnu_classpath_VMStackWalker_getClassContext         },
+       { "getCallingClass",         "()Ljava/lang/Class;",       (void *) (ptrint) &Java_gnu_classpath_VMStackWalker_getCallingClass         },
+       { "getCallingClassLoader",   "()Ljava/lang/ClassLoader;", (void *) (ptrint) &Java_gnu_classpath_VMStackWalker_getCallingClassLoader   },
+       { "firstNonNullClassLoader", "()Ljava/lang/ClassLoader;", (void *) (ptrint) &Java_gnu_classpath_VMStackWalker_firstNonNullClassLoader },
+};
+
+
+/* _Jv_gnu_classpath_VMStackWalker_init ****************************************
+
+   Register native functions.
+
+*******************************************************************************/
+
+void _Jv_gnu_classpath_VMStackWalker_init(void)
+{
+       utf *u;
+
+       u = utf_new_char("gnu/classpath/VMStackWalker");
+
+       native_method_register(u, methods, NATIVE_METHODS_COUNT);
+}
 
 
 /*
@@ -48,9 +72,9 @@
  * Method:    getClassContext
  * Signature: ()[Ljava/lang/Class;
  */
-JNIEXPORT java_objectarray* JNICALL Java_gnu_classpath_VMStackWalker_getClassContext(JNIEnv *env, jclass clazz)
+JNIEXPORT java_handle_objectarray_t* JNICALL Java_gnu_classpath_VMStackWalker_getClassContext(JNIEnv *env, jclass clazz)
 {
-       java_objectarray *oa;
+       java_handle_objectarray_t *oa;
 
        oa = stacktrace_getClassContext();
 
@@ -65,17 +89,11 @@ JNIEXPORT java_objectarray* JNICALL Java_gnu_classpath_VMStackWalker_getClassCon
  */
 JNIEXPORT java_lang_Class* JNICALL Java_gnu_classpath_VMStackWalker_getCallingClass(JNIEnv *env, jclass clazz)
 {
-       java_objectarray *oa;
-
-       oa = stacktrace_getClassContext();
+       classinfo *c;
 
-       if (oa == NULL)
-               return NULL;
+       c = stacktrace_get_caller_class(2);
 
-       if (oa->header.size < 2)
-               return NULL;
-
-       return (java_lang_Class *) oa->data[1];
+       return (java_lang_Class *) c;
 }
 
 
@@ -86,20 +104,11 @@ JNIEXPORT java_lang_Class* JNICALL Java_gnu_classpath_VMStackWalker_getCallingCl
  */
 JNIEXPORT java_lang_ClassLoader* JNICALL Java_gnu_classpath_VMStackWalker_getCallingClassLoader(JNIEnv *env, jclass clazz)
 {
-       java_objectarray  *oa;
-       classinfo         *c;
-       java_objectheader *cl;
-
-       oa = stacktrace_getClassContext();
+       classinfo     *c;
+       classloader_t *cl;
 
-       if (oa == NULL)
-               return NULL;
-
-       if (oa->header.size < 2)
-               return NULL;
-        
-       c  = (classinfo *) oa->data[1];
-       cl = c->classloader;
+       c  = stacktrace_get_caller_class(2);
+       cl = class_get_classloader(c);
 
        return (java_lang_ClassLoader *) cl;
 }
@@ -112,25 +121,11 @@ JNIEXPORT java_lang_ClassLoader* JNICALL Java_gnu_classpath_VMStackWalker_getCal
  */
 JNIEXPORT java_lang_ClassLoader* JNICALL Java_gnu_classpath_VMStackWalker_firstNonNullClassLoader(JNIEnv *env, jclass clazz)
 {
-       java_objectarray  *oa;
-       classinfo         *c;
-       java_objectheader *cl;
-       s4                 i;
-
-       oa = stacktrace_getClassContext();
+       classloader_t *cl;
 
-       if (oa == NULL)
-               return NULL;
+       cl = stacktrace_first_nonnull_classloader();
 
-       for (i = 0; i < oa->header.size; i++) {
-               c  = (classinfo *) oa->data[i];
-               cl = c->classloader;
-
-               if (cl != NULL)
-                       return (java_lang_ClassLoader *) cl;
-       }
-
-       return NULL;
+       return (java_lang_ClassLoader *) cl;
 }