* src/cacaoh/dummy.c (resolve_handle_pending_exception): New function.

[cacao.git] / src / native / vm / nativevm.c

diff --git a/src/native/vm/nativevm.c b/src/native/vm/nativevm.c
index 029394433925b6213286f0dbc6ad77bc61ba20c6..e9eedb6740ea9f5c300f46f0126a957858d65701 100644 (file)
--- a/src/native/vm/nativevm.c
+++ b/src/native/vm/nativevm.c
@@ -1,9 +1,7 @@
 /* src/native/vm/nativevm.c - register the native functions
 
-   Copyright (C) 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) 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.c 7906 2007-05-14 17:25:33Z twisti $
-
 */
 
 
@@ -38,6 +34,7 @@
 #include "native/vm/nativevm.h"
 
 #include "vmcore/method.h"
+#include "vmcore/options.h"
 
 #if defined(WITH_CLASSPATH_SUN)
 # include "mm/memory.h"
@@ -66,6 +63,8 @@ bool nativevm_preinit(void)
 
 # if defined(WITH_CLASSPATH_GNU)
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_preinit");
+
        _Jv_gnu_classpath_VMStackWalker_init();
        _Jv_gnu_classpath_VMSystemProperties_init();
        _Jv_gnu_java_lang_management_VMClassLoadingMXBeanImpl_init();
@@ -101,6 +100,8 @@ bool nativevm_preinit(void)
        utf         *u;
        lt_dlhandle  handle;
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_preinit");
+
        boot_library_path = properties_get("sun.boot.library.path");
 
        len =
@@ -130,6 +131,8 @@ bool nativevm_preinit(void)
 
 #elif defined(ENABLE_JAVAME_CLDC1_1)
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_preinit");
+
        _Jv_com_sun_cldc_io_ResourceInputStream_init();
        _Jv_com_sun_cldc_io_j2me_socket_Protocol_init();
        _Jv_com_sun_cldchi_io_ConsoleOutputStream_init();
@@ -169,12 +172,16 @@ bool nativevm_init(void)
 
 # if defined(WITH_CLASSPATH_GNU)
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_init");
+
        /* nothing to do */
 
 # elif defined(WITH_CLASSPATH_SUN)
 
        methodinfo *m;
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_init");
+
        m = class_resolveclassmethod(class_java_lang_System,
                                                                 utf_new_char("initializeSystemClass"),
                                                                 utf_void__void,
@@ -194,6 +201,8 @@ bool nativevm_init(void)
 
 #elif defined(ENABLE_JAVAME_CLDC1_1)
 
+       TRACESUBSYSTEMINITIALIZATION("nativevm_init");
+
        /* nothing to do */
 
 #else