* src/vmcore/linker.c (build_display): Removed superfluous recursion; return

[cacao.git] / src / native / native.h

diff --git a/src/native/native.h b/src/native/native.h
index b0603f097087e6475fd6aafecf9509dbd720fdf2..974a02bc0046a9ebe1be80985ccbd27ff8023174 100644 (file)
--- a/src/native/native.h
+++ b/src/native/native.h
@@ -1,9 +1,7 @@
 /* src/native/native.h - table of native functions
 
-   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: native.h 7912 2007-05-18 13:12:09Z twisti $
-
 */
 
 
@@ -32,15 +28,18 @@
 
 #include "config.h"
 
-#if !defined(WITH_STATIC_CLASSPATH)
+#if defined(ENABLE_LTDL) && defined(HAVE_LTDL_H)
 # include <ltdl.h>
 #endif
 
+#include <stdint.h>
+
 #include "native/jni.h"
 
 #include "vm/global.h"
 
 #include "vmcore/class.h"
+#include "vmcore/loader.h"
 #include "vmcore/method.h"
 #include "vmcore/utf8.h"
 
@@ -50,17 +49,6 @@
 #define NATIVE_METHODS_COUNT    sizeof(methods) / sizeof(JNINativeMethod)
 
 
-/* table for locating native methods */
-
-typedef struct nativeref nativeref;
-typedef struct nativecompref nativecompref;
-
-
-#if !defined(WITH_STATIC_CLASSPATH)
-typedef struct hashtable_library_loader_entry hashtable_library_loader_entry;
-typedef struct hashtable_library_name_entry hashtable_library_name_entry;
-
-
 /* native_methods_node_t ******************************************************/
 
 typedef struct native_methods_node_t native_methods_node_t;
@@ -75,15 +63,21 @@ struct native_methods_node_t {
 
 /* hashtable_library_loader_entry *********************************************/
 
+#if defined(ENABLE_LTDL)
+typedef struct hashtable_library_loader_entry hashtable_library_loader_entry;
+typedef struct hashtable_library_name_entry   hashtable_library_name_entry;
+
 struct hashtable_library_loader_entry {
-       java_objectheader              *loader;  /* class loader                  */
+       classloader_t                  *loader;  /* class loader                  */
        hashtable_library_name_entry   *namelink;/* libs loaded by this loader    */
        hashtable_library_loader_entry *hashlink;/* link for external chaining    */
 };
+#endif
 
 
 /* hashtable_library_name_entry ***********************************************/
 
+#if defined(ENABLE_LTDL)
 struct hashtable_library_name_entry {
        utf                          *name;      /* library name                  */
        lt_dlhandle                   handle;    /* libtool library handle        */
@@ -92,58 +86,23 @@ struct hashtable_library_name_entry {
 #endif
 
 
-struct nativeref {
-       char       *classname;
-       char       *methodname;
-       char       *descriptor;
-       bool        isstatic;
-       functionptr func;
-};
-
-/* table for fast string comparison */
-
-struct nativecompref {
-       utf        *classname;
-       utf        *methodname;
-       utf        *descriptor;
-       bool        isstatic;
-       functionptr func;
-};
-
-
 /* function prototypes ********************************************************/
 
 bool native_init(void);
 
-void native_method_register(utf *classname, JNINativeMethod *methods, s4 count);
-
-#if defined(WITH_STATIC_CLASSPATH)
-
-functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
-                                                               bool isstatic);
-
-#else /* defined(WITH_STATIC_CLASSPATH) */
+void        native_method_register(utf *classname, const JNINativeMethod *methods, int32_t count);
+functionptr native_method_resolve(methodinfo *m);
 
+#if defined(ENABLE_LTDL)
 lt_dlhandle native_library_open(utf *filename);
-void        native_library_add(utf *filename, java_objectheader *loader,
-                                                          lt_dlhandle handle);
-
-hashtable_library_name_entry *native_library_find(utf *filename,
-                                                                                                 java_objectheader *loader);
-
-functionptr native_resolve_function(methodinfo *m);
-
-#endif /* defined(WITH_STATIC_CLASSPATH) */
-
-java_objectheader *native_new_and_init(classinfo *c);
-
-java_objectheader *native_new_and_init_string(classinfo *c,
-                                                                                         java_objectheader *s);
-
-java_objectheader *native_new_and_init_int(classinfo *c, s4 i);
+void        native_library_close(lt_dlhandle handle);
+void        native_library_add(utf *filename, classloader_t *loader, lt_dlhandle handle);
+hashtable_library_name_entry *native_library_find(utf *filename, classloader_t *loader);
+int         native_library_load(JNIEnv *env, utf *name, classloader_t *cl);
+#endif
 
-java_objectheader *native_new_and_init_throwable(classinfo *c,
-                                                                                                java_objectheader *t);
+java_handle_t *native_new_and_init(classinfo *c);
+java_handle_t *native_new_and_init_string(classinfo *c, java_handle_t *s);
 
 #endif /* _NATIVE_H */
 
@@ -159,4 +118,5 @@ java_objectheader *native_new_and_init_throwable(classinfo *c,
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */