* src/native/vm/openjdk/sun_misc_Perf.cpp: Added new file.

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

diff --git a/src/native/vm/nativevm.cpp b/src/native/vm/nativevm.cpp
index a61f61920a7792201cf92bb3c1bcdad6c161d57b..1894c9019364c15b27b5876015a5948d5e8b8612 100644 (file)
--- a/src/native/vm/nativevm.cpp
+++ b/src/native/vm/nativevm.cpp
@@ -30,18 +30,21 @@
 #include "native/vm/nativevm.hpp"
 
 #include "vm/class.hpp"
+#include "vm/exceptions.hpp"
 #include "vm/initialize.hpp"
 #include "vm/method.hpp"
 #include "vm/options.h"
 #include "vm/os.hpp"
 
 #if defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-# include "mm/memory.h"
+# include "mm/memory.hpp"
 
 # include "native/native.hpp"
 
 # include "native/vm/openjdk/hpi.hpp"
 
+# include "toolbox/sequence.hpp"
+
 # include "vm/globals.hpp"
 # include "vm/properties.hpp"
 # include "vm/utf8.h"
@@ -99,25 +102,20 @@ void nativevm_preinit(void)
        Properties& properties = vm->get_properties();
        const char* boot_library_path = properties.get("sun.boot.library.path");
 
-       size_t len =
-               os::strlen(boot_library_path) +
-               os::strlen("/libjava.so") +
-               os::strlen("0");
-
-       char* p = MNEW(char, len);
+       // Use sequence builder to assemble library path.
+       SequenceBuilder sb;
 
-       os::strcpy(p, boot_library_path);
-       os::strcat(p, "/libjava.so");
+       sb.cat(boot_library_path);
+       sb.cat("/libjava.so");
 
-       utf* u = utf_new_char(p);
+       // XXX This should actually be sb.export_symbol()
+       utf* u = utf_new_char(sb.c_str());
 
        NativeLibrary nl(u);
        void* handle = nl.open();
 
        if (handle == NULL)
-               os::abort("nativevm_init: failed to open libjava.so at: %s", p);
-
-       MFREE(p, char, len);
+               os::abort("nativevm_init: failed to open libjava.so at: %s", sb.c_str());
 
        NativeLibraries& nls = vm->get_nativelibraries();
        nls.add(nl);
@@ -126,6 +124,7 @@ void nativevm_preinit(void)
        HPI& hpi = vm->get_hpi();
        hpi.initialize();
 
+       _Jv_sun_misc_Perf_init();
        _Jv_sun_misc_Unsafe_init();
 
 # else
@@ -161,7 +160,7 @@ void nativevm_preinit(void)
 
 *******************************************************************************/
 
-void nativevm_init(void)
+bool nativevm_init(void)
 {
        TRACESUBSYSTEMINITIALIZATION("nativevm_init");
 
@@ -180,10 +179,13 @@ void nativevm_init(void)
                                                                                         false);
 
        if (m == NULL)
-               os::abort("nativevm_init: Error resolving java.lang.System.initializeSystemClass()");
+               return false;
 
        (void) vm_call_method(m, NULL);
 
+       if (exceptions_get_exception() != NULL)
+               return false;
+
 # else
 #  error unknown classpath configuration
 # endif
@@ -195,6 +197,8 @@ void nativevm_init(void)
 #else
 # error unknown Java configuration
 #endif
+
+       return true;
 }