* src/vm/vm.cpp (VM::abort): Removed.

(VM::abort_errnum, VM::abort_errno): Likewise.
* src/vm/vm.hpp (VM): Likewise.
* src/vm/os.cpp (os::abort): New function.
(os::abort_errnum, os::abort_errno): Likewise.
* src/vm/os.hpp (os): Likewise.
* src/mm/gc-boehm.cpp,
src/threads/posix/condition-posix.hpp,
src/threads/posix/mutex-posix.hpp,
src/threads/posix/thread-posix.hpp,
src/vm/assertion.cpp,
src/vm/exceptions.cpp,
src/vm/jit/optimizing/bytecode_escape.c,
src/vm/primitive.cpp,
src/vm/properties.cpp,
src/vm/string.cpp,
src/vm/suck.cpp: Related changes.

diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp
index 55a820f051c53cede4546a92a7863fd7378a0554..bfd612b010cf6be5879a74d721929707d003057f 100644 (file)
--- a/src/mm/gc-boehm.cpp
+++ b/src/mm/gc-boehm.cpp
@@ -240,7 +240,7 @@ void *gc_out_of_memory(size_t bytes_requested)
 
        if (in_gc_out_of_memory) {
                /* this is all we can do... */
-               VM::get_current()->abort("gc_out_of_memory: out of memory");
+               os::abort("gc_out_of_memory: out of memory");
        }
 
        in_gc_out_of_memory = true;

diff --git a/src/threads/posix/condition-posix.hpp b/src/threads/posix/condition-posix.hpp
index 1307195cc90dca1676b8439803057807f1b57a39..cbaebd7c94678c9dc60d08f13a4a928b82b73937 100644 (file)
--- a/src/threads/posix/condition-posix.hpp
+++ b/src/threads/posix/condition-posix.hpp
@@ -31,7 +31,6 @@
 #include <pthread.h>
 #include <time.h>
 
-#include "vm/vm.hpp"
 
 #ifdef __cplusplus
 
@@ -54,6 +53,10 @@ public:
 };
 
 
+// Includes.
+#include "vm/os.hpp"
+
+
 /**
  * Initialize a POSIX condition variable.
  */
@@ -64,7 +67,7 @@ inline Condition::Condition()
        result = pthread_cond_init(&_cond, NULL);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Condition::Condition(): pthread_cond_init failed");
+               os::abort_errnum(result, "Condition::Condition(): pthread_cond_init failed");
        }
 }
 
@@ -79,7 +82,7 @@ inline Condition::~Condition()
        result = pthread_cond_destroy(&_cond);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Condition::~Condition(): pthread_cond_destroy failed");
+               os::abort_errnum(result, "Condition::~Condition(): pthread_cond_destroy failed");
        }
 }
 
@@ -95,7 +98,7 @@ inline void Condition::broadcast()
        result = pthread_cond_broadcast(&_cond);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Condition::broadcast(): pthread_cond_broadcast failed");
+               os::abort_errnum(result, "Condition::broadcast(): pthread_cond_broadcast failed");
        }
 }
 
@@ -111,7 +114,7 @@ inline void Condition::signal()
        result = pthread_cond_signal(&_cond);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Condition::signal(): pthread_cond_signal failed");
+               os::abort_errnum(result, "Condition::signal(): pthread_cond_signal failed");
        }
 }
 
@@ -137,7 +140,7 @@ inline void Condition::wait(Mutex* mutex)
        result = pthread_cond_wait(&_cond, &(mutex->_mutex));
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Condition::wait(): pthread_cond_wait failed");
+               os::abort_errnum(result, "Condition::wait(): pthread_cond_wait failed");
        }
 }
 

diff --git a/src/threads/posix/mutex-posix.hpp b/src/threads/posix/mutex-posix.hpp
index db9851cc6c230a141ae99a985ee6ce5df32ca56c..e7206d5f51a8553f065db5614310cef4c800786a 100644 (file)
--- a/src/threads/posix/mutex-posix.hpp
+++ b/src/threads/posix/mutex-posix.hpp
@@ -64,7 +64,7 @@ typedef struct Mutex Mutex;
 
 
 // Includes.
-#include "vm/vm.hpp"
+#include "vm/os.hpp"
 
 
 #ifdef __cplusplus
@@ -77,19 +77,19 @@ inline Mutex::Mutex()
        int result = pthread_mutexattr_init(&_attr);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_init failed");
+               os::abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_init failed");
        }
 
        result = pthread_mutexattr_settype(&_attr, PTHREAD_MUTEX_RECURSIVE);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_settype failed");
+               os::abort_errnum(result, "Mutex::Mutex(): pthread_mutexattr_settype failed");
        }
 
        result = pthread_mutex_init(&_mutex, &_attr);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::Mutex(): pthread_mutex_init failed");
+               os::abort_errnum(result, "Mutex::Mutex(): pthread_mutex_init failed");
        }
 }
 
@@ -102,13 +102,13 @@ inline Mutex::~Mutex()
        int result = pthread_mutexattr_destroy(&_attr);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::~Mutex(): pthread_mutexattr_destroy failed");
+               os::abort_errnum(result, "Mutex::~Mutex(): pthread_mutexattr_destroy failed");
        }
 
        result = pthread_mutex_destroy(&_mutex);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::~Mutex(): pthread_mutex_destroy failed");
+               os::abort_errnum(result, "Mutex::~Mutex(): pthread_mutex_destroy failed");
        }
 }
 
@@ -127,7 +127,7 @@ inline void Mutex::lock()
        int result = pthread_mutex_lock(&_mutex);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::lock(): pthread_mutex_lock failed");
+               os::abort_errnum(result, "Mutex::lock(): pthread_mutex_lock failed");
        }
 }
 
@@ -141,7 +141,7 @@ inline void Mutex::unlock()
        int result = pthread_mutex_unlock(&_mutex);
 
        if (result != 0) {
-               VM::get_current()->abort_errnum(result, "Mutex::unlock: pthread_mutex_unlock failed");
+               os::abort_errnum(result, "Mutex::unlock: pthread_mutex_unlock failed");
        }
 }
 

diff --git a/src/threads/posix/thread-posix.hpp b/src/threads/posix/thread-posix.hpp
index 89c6d1671ee46eb6dd5b78262b7f40d24704f5d1..8d3b4a78325dfd5a8c3369eafe7c662674a2cab2 100644 (file)
--- a/src/threads/posix/thread-posix.hpp
+++ b/src/threads/posix/thread-posix.hpp
@@ -43,6 +43,10 @@
 #include "threads/condition.hpp"
 #include "threads/mutex.hpp"
 
+#include "toolbox/list.h"
+
+#include "vm/global.h"
+
 
 /* threadobject ****************************************************************
 

diff --git a/src/vm/assertion.cpp b/src/vm/assertion.cpp
index 6279371783194189a15690f9d5df7da1077fe99e..3bb52451cd992394026d76b2a5f1665e3c770c3d 100644 (file)
--- a/src/vm/assertion.cpp
+++ b/src/vm/assertion.cpp
@@ -36,7 +36,6 @@
 #include "vm/assertion.hpp"
 #include "vm/global.h"
 #include "vm/os.hpp"
-#include "vm/vm.hpp"
 
 
 /* -ea/-da options ************************************************************/
@@ -76,7 +75,7 @@ void assertion_ea_da(const char *name, bool enabled)
        buf = os::strdup(name);
 
        if (buf == NULL) {
-               VM::get_current()->abort_errno("assertion_ea_da: strdup failed");
+               os::abort_errno("assertion_ea_da: strdup failed");
        }
 
        if ((len > 2) && (strcmp(name + (len - 3), "...") == 0)) {

diff --git a/src/vm/exceptions.cpp b/src/vm/exceptions.cpp
index 92f2f19b0b1a247e3da18b6cc437d0633bb77863..551c6023e6449ea46c5135316d5076421e90439f 100644 (file)
--- a/src/vm/exceptions.cpp
+++ b/src/vm/exceptions.cpp
@@ -241,7 +241,7 @@ static void exceptions_abort(utf *classname, utf *message)
 
        log_finish();
 
-       VM::get_current()->abort("Aborting...");
+       os::abort("Aborting...");
 }
 
 
@@ -2011,7 +2011,7 @@ void exceptions_print_stacktrace(void)
                                                                         false);
 
                if (m == NULL)
-                       VM::get_current()->abort("exceptions_print_stacktrace: printStackTrace()V not found");
+                       os::abort("exceptions_print_stacktrace: printStackTrace()V not found");
 
                /* Print message. */
 

diff --git a/src/vm/jit/optimizing/bytecode_escape.c b/src/vm/jit/optimizing/bytecode_escape.c
index 4eb9bdc7ca850d3d06c81a18f96b71f2b734690e..ac9456ab0b40f90a50ad232567b4a36ea7b3c6c4 100644 (file)
--- a/src/vm/jit/optimizing/bytecode_escape.c
+++ b/src/vm/jit/optimizing/bytecode_escape.c
@@ -38,7 +38,7 @@
 #include "vm/references.h"
 #include "vm/resolve.h"
 
-#include "vm/jit/ir/bytecode.hpp"
+#include "vm/jit/ir/bytecode.h"
 #include "vm/jit/optimizing/escape.h"
 
 #include <assert.h>

diff --git a/src/vm/os.cpp b/src/vm/os.cpp
index b5e8592ae7e83d8e8535255f6f2b754aef83bab0..f581650dade66d263d886af0b37852f51ddb258e 100644 (file)
--- a/src/vm/os.cpp
+++ b/src/vm/os.cpp
@@ -61,6 +61,78 @@
 #include "vm/vm.hpp"
 
 
+/**
+ * Prints an error message and aborts the VM.
+ *
+ * @param text Error message to print.
+ */
+void os::abort(const char* text, ...)
+{
+       va_list ap;
+
+       // Print the log message.
+       log_start();
+
+       va_start(ap, text);
+       log_vprint(text, ap);
+       va_end(ap);
+
+       log_finish();
+
+       // Print a backtrace.
+       os::print_backtrace();
+
+       // Now abort the VM.
+       os::abort();
+}
+
+
+/**
+ * Prints an error message, appends ":" plus the strerror-message of
+ * errnum and aborts the VM.
+ *
+ * @param errnum Error number.
+ * @param text   Error message to print.
+ */
+void os::abort_errnum(int errnum, const char* text, ...)
+{
+       va_list ap;
+
+       // Print the log message.
+       log_start();
+
+       va_start(ap, text);
+       log_vprint(text, ap);
+       va_end(ap);
+
+       // Print the strerror-message of errnum.
+       log_print(": %s", os::strerror(errnum));
+
+       log_finish();
+
+       // Print a backtrace.
+       os::print_backtrace();
+
+       // Now abort the VM.
+       os::abort();
+}
+
+
+/**
+ * Equal to abort_errnum, but uses errno to get the error number.
+ *
+ * @param text Error message to print.
+ */
+void os::abort_errno(const char* text, ...)
+{
+       va_list ap;
+
+       va_start(ap, text);
+       abort_errnum(errno, text, ap);
+       va_end(ap);
+}
+
+
 /**
  * Maps anonymous memory, even on systems not defining
  * MAP_ANON(YMOUS).
@@ -85,7 +157,7 @@ void* os::mmap_anonymous(void *addr, size_t len, int prot, int flags)
        fd = open("/dev/zero", O_RDONLY, 0);
 
        if (fd == -1)
-               VM::get_current()->abort_errno("os::mmap_anonymous: open failed");
+               os::abort_errno("os::mmap_anonymous: open failed");
 
        p = mmap(addr, len, prot, flags, fd, 0);
 #endif
@@ -95,7 +167,7 @@ void* os::mmap_anonymous(void *addr, size_t len, int prot, int flags)
 #else
        if (p == (void *) -1)
 #endif
-               VM::get_current()->abort_errno("os::mmap_anonymous: mmap failed");
+               os::abort_errno("os::mmap_anonymous: mmap failed");
 
        return p;
 }

diff --git a/src/vm/os.hpp b/src/vm/os.hpp
index dd70c65c80fe04ba7fd7e15f2e0a2fcf636feba1..966b08fa0e72dd8eedd1d62af62c186f5f0304a6 100644 (file)
--- a/src/vm/os.hpp
+++ b/src/vm/os.hpp
@@ -160,6 +160,9 @@ public:
        static inline char*   strerror(int errnum);
 
        // Convenience functions.
+       static void  abort(const char* text, ...);
+       static void  abort_errnum(int errnum, const char* text, ...);
+       static void  abort_errno(const char* text, ...);
        static void* mmap_anonymous(void *addr, size_t len, int prot, int flags);
        static void  print_backtrace();
        static int   processors_online();

diff --git a/src/vm/primitive.cpp b/src/vm/primitive.cpp
index be03f75e035e68c7a29436e1e02fd289b3303061..f87212534dc9b6036c4b093da19d42cef25a26e6 100644 (file)
--- a/src/vm/primitive.cpp
+++ b/src/vm/primitive.cpp
@@ -36,9 +36,9 @@
 #include "vm/globals.hpp"
 #include "vm/javaobjects.hpp"
 #include "vm/options.h"
+#include "vm/os.hpp"
 #include "vm/primitive.hpp"
 #include "vm/utf8.h"
-#include "vm/vm.hpp"
 
 
 /* primitivetype_table *********************************************************
@@ -412,7 +412,7 @@ java_handle_t* Primitive::box(int type, imm_union value)
                break;
        default:
                o = NULL;
-               VM::get_current()->abort("primitive_box: invalid primitive type %d", type);
+               os::abort("primitive_box: invalid primitive type %d", type);
        }
 
        return o;
@@ -473,7 +473,7 @@ imm_union Primitive::unbox(java_handle_t *h)
                value.a = h;
                break;
        default:
-               VM::get_current()->abort("Primitive::unbox: invalid primitive type %d", type);
+               os::abort("Primitive::unbox: invalid primitive type %d", type);
        }
 
        return value;

diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp
index b5868faa95817d1b857be2dc3ec9ef4fa01bd139..333606976253142104383e2585d28f698690f880 100644 (file)
--- a/src/vm/properties.cpp
+++ b/src/vm/properties.cpp
@@ -75,7 +75,7 @@ Properties::Properties()
        p = MNEW(char, 4096);
 
        if (os::readlink("/proc/self/exe", p, 4095) == -1)
-               VM::get_current()->abort_errno("readlink failed");
+               os::abort_errno("readlink failed");
 
        /* We have a path like:
 

diff --git a/src/vm/string.cpp b/src/vm/string.cpp
index 67f28268e974ff9e91cf5671c0544bb72e07cdfe..57708118c93fd9bd15c50574fb0f98cfe4ccfccf 100644 (file)
--- a/src/vm/string.cpp
+++ b/src/vm/string.cpp
@@ -49,7 +49,6 @@
 #include "vm/statistics.h"
 #include "vm/string.hpp"
 #include "vm/utf8.h"
-#include "vm/vm.hpp"
 
 
 /* global variables ***********************************************************/
@@ -107,7 +106,7 @@ void stringtable_update(void)
                                
                                if (js.is_null() || (js.get_value() == NULL)) {
                                        /* error in hashtable found */
-                                       VM::get_current()->abort("stringtable_update: invalid literalstring in hashtable");
+                                       os::abort("stringtable_update: invalid literalstring in hashtable");
                                }
 
                                a = LLNI_UNWRAP(js.get_value());

diff --git a/src/vm/suck.cpp b/src/vm/suck.cpp
index cf5122872f59b1997bc461954f92d39be6a9b02c..01415a5368a900b6209d59129d7e28074ad4fb49 100644 (file)
--- a/src/vm/suck.cpp
+++ b/src/vm/suck.cpp
@@ -185,7 +185,7 @@ void suck_add(char *classpath)
                                }
 
 #else
-                               VM::get_current()->abort("suck_add: zip/jar files not supported");
+                               os::abort("suck_add: zip/jar files not supported");
 #endif
                        }
                        else {

diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp
index 20a9519bee7e52443c4a2ad6160c17d64d37ab3d..a1adfeb0ccb96824f50a0e60ca6d3756f119c50f 100644 (file)
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@ -728,7 +728,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* Install the exit handler. */
 
        if (atexit(vm_exit_handler))
-               VM::get_current()->abort("atexit failed: %s\n", strerror(errno));
+               os::abort("atexit failed: %s\n", strerror(errno));
 
        /* Set some options. */
 
@@ -1350,7 +1350,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* install architecture dependent signal handlers */
 
        if (!signal_init())
-               VM::get_current()->abort("vm_create: signal_init failed");
+               os::abort("vm_create: signal_init failed");
 
 #if defined(ENABLE_INTRP)
        /* Allocate main thread stack on the Java heap. */
@@ -1364,7 +1364,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* AFTER: threads_preinit */
 
        if (!string_init())
-               VM::get_current()->abort("vm_create: string_init failed");
+               os::abort("vm_create: string_init failed");
 
        /* AFTER: threads_preinit */
 
@@ -1373,7 +1373,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* AFTER: thread_preinit */
 
        if (!suck_init())
-               VM::get_current()->abort("vm_create: suck_init failed");
+               os::abort("vm_create: suck_init failed");
 
        suck_add_from_property("java.endorsed.dirs");
 
@@ -1395,7 +1395,7 @@ VM::VM(JavaVMInitArgs* vm_args)
           (must be done _after_ threads_preinit) */
 
        if (!classcache_init())
-               VM::get_current()->abort("vm_create: classcache_init failed");
+               os::abort("vm_create: classcache_init failed");
 
        /* Initialize the code memory management. */
        /* AFTER: threads_preinit */
@@ -1406,7 +1406,7 @@ VM::VM(JavaVMInitArgs* vm_args)
           threads_preinit) */
 
        if (!finalizer_init())
-               VM::get_current()->abort("vm_create: finalizer_init failed");
+               os::abort("vm_create: finalizer_init failed");
 
        /* Initialize the JIT compiler. */
 
@@ -1438,13 +1438,13 @@ VM::VM(JavaVMInitArgs* vm_args)
 #endif
 
        if (!builtin_init())
-               VM::get_current()->abort("vm_create: builtin_init failed");
+               os::abort("vm_create: builtin_init failed");
 
        /* Initialize the native subsystem. */
        /* BEFORE: threads_init */
 
        if (!native_init())
-               VM::get_current()->abort("vm_create: native_init failed");
+               os::abort("vm_create: native_init failed");
 
        /* Register the native methods implemented in the VM. */
        /* BEFORE: threads_init */
@@ -1457,7 +1457,7 @@ VM::VM(JavaVMInitArgs* vm_args)
           (e.g. NewGlobalRef). */
 
        if (!jni_init())
-               VM::get_current()->abort("vm_create: jni_init failed");
+               os::abort("vm_create: jni_init failed");
 #endif
 
 #if defined(ENABLE_JNI) || defined(ENABLE_HANDLES)
@@ -1465,7 +1465,7 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* BEFORE: threads_init */
 
        if (!localref_table_init())
-               VM::get_current()->abort("vm_create: localref_table_init failed");
+               os::abort("vm_create: localref_table_init failed");
 #endif
 
        /* Iinitialize some important system classes. */
@@ -1486,14 +1486,14 @@ VM::VM(JavaVMInitArgs* vm_args)
        /* initialize profiling */
 
        if (!profile_init())
-               VM::get_current()->abort("vm_create: profile_init failed");
+               os::abort("vm_create: profile_init failed");
 #endif
 
 #if defined(ENABLE_THREADS)
        /* initialize recompilation */
 
        if (!recompile_init())
-               VM::get_current()->abort("vm_create: recompile_init failed");
+               os::abort("vm_create: recompile_init failed");
 
        /* start the signal handler thread */
 
@@ -1502,33 +1502,33 @@ VM::VM(JavaVMInitArgs* vm_args)
        if (threads_pthreads_implementation_nptl)
 #endif
                if (!signal_start_thread())
-                       VM::get_current()->abort("vm_create: signal_start_thread failed");
+                       os::abort("vm_create: signal_start_thread failed");
 
        /* finally, start the finalizer thread */
 
        if (!finalizer_start_thread())
-               VM::get_current()->abort("vm_create: finalizer_start_thread failed");
+               os::abort("vm_create: finalizer_start_thread failed");
 
 # if !defined(NDEBUG)
        /* start the memory profiling thread */
 
        if (opt_ProfileMemoryUsage || opt_ProfileGCMemoryUsage)
                if (!memory_start_thread())
-                       VM::get_current()->abort("vm_create: memory_start_thread failed");
+                       os::abort("vm_create: memory_start_thread failed");
 # endif
 
        /* start the recompilation thread (must be done before the
           profiling thread) */
 
        if (!recompile_start_thread())
-               VM::get_current()->abort("vm_create: recompile_start_thread failed");
+               os::abort("vm_create: recompile_start_thread failed");
 
 # if defined(ENABLE_PROFILING)
        /* start the profile sampling thread */
 
 /*     if (opt_prof) */
 /*             if (!profile_start_thread()) */
-/*                     VM::get_current()->abort("vm_create: profile_start_thread failed"); */
+/*                     os::abort("vm_create: profile_start_thread failed"); */
 # endif
 #endif
 
@@ -1812,7 +1812,7 @@ void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args)
           the application's main method exits. */
 
        if (!thread_detach_current_thread())
-               VM::get_current()->abort("vm_run: Could not detach main thread.");
+               os::abort("vm_run: Could not detach main thread.");
 #endif
 
        /* Destroy the JavaVM. */
@@ -2010,78 +2010,6 @@ void vm_exit_handler(void)
 }
 
 
-/**
- * Prints an error message and aborts the VM.
- *
- * @param text Error message to print.
- */
-void VM::abort(const char* text, ...)
-{
-       va_list ap;
-
-       // Print the log message.
-       log_start();
-
-       va_start(ap, text);
-       log_vprint(text, ap);
-       va_end(ap);
-
-       log_finish();
-
-       // Print a backtrace.
-       os::print_backtrace();
-
-       // Now abort the VM.
-       os::abort();
-}
-
-
-/**
- * Prints an error message, appends ":" plus the strerror-message of
- * errnum and aborts the VM.
- *
- * @param errnum Error number.
- * @param text   Error message to print.
- */
-void VM::abort_errnum(int errnum, const char* text, ...)
-{
-       va_list ap;
-
-       // Print the log message.
-       log_start();
-
-       va_start(ap, text);
-       log_vprint(text, ap);
-       va_end(ap);
-
-       // Print the strerror-message of errnum.
-       log_print(": %s", os::strerror(errnum));
-
-       log_finish();
-
-       // Print a backtrace.
-       os::print_backtrace();
-
-       // Now abort the VM.
-       os::abort();
-}
-
-
-/**
- * Equal to VM::abort_errnum, but uses errno to get the error number.
- *
- * @param text Error message to print.
- */
-void VM::abort_errno(const char* text, ...)
-{
-       va_list ap;
-
-       va_start(ap, text);
-       abort_errnum(errno, text, ap);
-       va_end(ap);
-}
-
-
 /* vm_abort_disassemble ********************************************************
 
    Prints an error message, disassemble the given code range (if
@@ -2128,7 +2056,7 @@ void vm_abort_disassemble(void *pc, int count, const char *text, ...)
                pc = disassinstr((u1*) pc);
 #endif
 
-       VM::get_current()->abort("Aborting...");
+       os::abort("Aborting...");
 }
 
 
@@ -2369,7 +2297,7 @@ static void vm_compile_method(char* mainname)
        }
 
        if (m == NULL)
-               VM::get_current()->abort("vm_compile_method: java.lang.NoSuchMethodException: %s.%s",
+               os::abort("vm_compile_method: java.lang.NoSuchMethodException: %s.%s",
                                 opt_method, opt_signature ? opt_signature : "");
                
        jit_compile(m);
@@ -2608,7 +2536,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
                break;
 
        default:
-               VM::get_current()->abort("vm_call_method_objectarray: invalid return type %d", m->parseddesc->returntype.primitivetype);
+               os::abort("vm_call_method_objectarray: invalid return type %d", m->parseddesc->returntype.primitivetype);
        }
 
        /* enter the nativeworld again */
@@ -2651,7 +2579,7 @@ void vm_abort(const char* text, ...)
        va_list ap;
 
        va_start(ap, text);
-       VM::get_current()->abort(text, ap);
+       os::abort(text, ap);
        va_end(ap);
 }
 
@@ -2660,7 +2588,7 @@ void vm_abort_errnum(int errnum, const char* text, ...)
        va_list ap;
 
        va_start(ap, text);
-       VM::get_current()->abort_errnum(errnum, text, ap);
+       os::abort_errnum(errnum, text, ap);
        va_end(ap);
 }
 
@@ -2669,7 +2597,7 @@ void vm_abort_errno(const char* text, ...)
        va_list ap;
 
        va_start(ap, text);
-       VM::get_current()->abort_errno(text, ap);
+       os::abort_errno(text, ap);
        va_end(ap);
 }
 

diff --git a/src/vm/vm.hpp b/src/vm/vm.hpp
index 3fd13dea756c800b9b729c31cc8d1a75f19ff4ae..4dc53ac81a0c5dd8b001aa2e9d8da88af9022fad 100644 (file)
--- a/src/vm/vm.hpp
+++ b/src/vm/vm.hpp
@@ -81,11 +81,6 @@ public:
        int64_t get_starttime()   { return _starttime; }
 
        Properties& get_properties() { return _properties; }
-
-       // Instance functions.
-       void abort(const char* text, ...);
-       void abort_errnum(int errnum, const char* text, ...);
-       void abort_errno(const char* text, ...);
 };
 
 #else