* Merged gc7-branch to default.
[cacao.git] / src / vm / signal.c
index c40d0c79160b80fbdc6dd028d5e54b1ea90ab376..f11a67bc6dabfeea24f6fa7d76deb7bbc753b53c 100644 (file)
@@ -1,9 +1,7 @@
 /* src/vm/signal.c - machine independent signal 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.
 
@@ -28,7 +26,6 @@
 #include "config.h"
 
 #include <assert.h>
-#include <errno.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
 /* If we compile with -ansi on darwin, <sys/types.h> is not
  included. So let's do it here. */
 # include <sys/types.h>
+# include <sys/utsname.h>
 #endif
 
 #include "arch.h"
 
-#include "mm/memory.h"
-
-#if defined(ENABLE_THREADS)
-# include "threads/threads-common.h"
-#else
-# include "threads/none/threads.h"
-#endif
-
-#include "toolbox/logging.h"
+#include "threads/thread.h"
 
 #include "vm/exceptions.h"
 #include "vm/signallocal.h"
 #include "vm/vm.h"
 
-#include "vm/jit/codegen-common.h"
-#include "vm/jit/disass.h"
-#include "vm/jit/patcher-common.h"
-
 #include "vmcore/options.h"
 
 #if defined(ENABLE_STATISTICS)
@@ -82,6 +68,8 @@ bool signal_init(void)
 #if !defined(__CYGWIN__)
        sigset_t mask;
 
+       TRACESUBSYSTEMINITIALIZATION("signal_init");
+
 #if defined(__LINUX__) && defined(ENABLE_THREADS)
        /* XXX Remove for exact-GC. */
        if (threads_pthreads_implementation_nptl) {
@@ -92,22 +80,22 @@ bool signal_init(void)
           this thread. */
 
        if (sigemptyset(&mask) != 0)
-               vm_abort("signal_init: sigemptyset failed: %s", strerror(errno));
+               vm_abort_errno("signal_init: sigemptyset failed");
 
-#if !defined(WITH_CLASSPATH_SUN)
+#if !defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
        /* Let OpenJDK handle SIGINT itself. */
 
        if (sigaddset(&mask, SIGINT) != 0)
-               vm_abort("signal_init: sigaddset failed: %s", strerror(errno));
+               vm_abort_errno("signal_init: sigaddset failed");
 #endif
 
 #if !defined(__FREEBSD__)
        if (sigaddset(&mask, SIGQUIT) != 0)
-               vm_abort("signal_init: sigaddset failed: %s", strerror(errno));
+               vm_abort_errno("signal_init: sigaddset failed");
 #endif
 
        if (sigprocmask(SIG_BLOCK, &mask, NULL) != 0)
-               vm_abort("signal_init: sigprocmask failed: %s", strerror(errno));
+               vm_abort_errno("signal_init: sigprocmask failed");
 
 #if defined(__LINUX__) && defined(ENABLE_THREADS)
        /* XXX Remove for exact-GC. */
@@ -145,7 +133,7 @@ bool signal_init(void)
                                                           SA_NODEFER | SA_SIGINFO);
 #  endif
 
-#  if defined(__ARM__) || defined(__S390__)
+#  if defined(__ARM__) || defined(__I386__) || defined(__S390__) || defined(__X86_64__) || defined(__M68K__)
                /* XXX use better defines for that (in arch.h) */
                /* SIGILL handler */
 
@@ -163,7 +151,36 @@ bool signal_init(void)
 # if defined(ENABLE_INTRP)
        }
 # endif
-#endif /* !defined(ENABLE_INTRP) */
+
+#if defined(__DARWIN__)
+       do {
+               struct utsname name;
+               kern_return_t kr;
+
+               /* Check if we're on 10.4 (Tiger/8.x) or earlier */
+               if (uname(&name) != 0) 
+                       break;
+
+               /* Make sure the string is large enough */
+               /* Check the major number (ascii comparison) */
+               /* Verify that we're not looking at '10.' by checking for a trailing period. */
+               if (name.release[0] == '\0' || name.release[0] > '8' || name.release[1] != '.')
+                       break;
+
+               /* Reset CrashReporter's task signal handler */
+               kr = task_set_exception_ports(mach_task_self(),
+                                                                         EXC_MASK_BAD_ACCESS
+#  if defined(__I386__)
+                                                                         | EXC_MASK_BAD_INSTRUCTION
+#endif
+                                                                         , MACH_PORT_NULL,
+                                                                         EXCEPTION_STATE_IDENTITY,
+                                                                         MACHINE_THREAD_STATE);
+
+               assert(kr == KERN_SUCCESS);
+       } while (false);
+#endif
+#endif /* !defined(ENABLE_JIT) */
 
 #if defined(ENABLE_THREADS)
        /* SIGHUP handler for threads_thread_interrupt */
@@ -206,92 +223,13 @@ void signal_register_signal(int signum, functionptr handler, int flags)
        function = (void (*)(int, siginfo_t *, void *)) handler;
 
        if (sigemptyset(&act.sa_mask) != 0)
-               vm_abort("signal_register_signal: sigemptyset failed: %s",
-                                strerror(errno));
+               vm_abort_errno("signal_register_signal: sigemptyset failed");
 
        act.sa_sigaction = function;
        act.sa_flags     = flags;
 
        if (sigaction(signum, &act, NULL) != 0)
-               vm_abort("signal_register_signal: sigaction failed: %s",
-                                strerror(errno));
-}
-
-
-/* signal_handle ***************************************************************
-
-   Handles the signal caught by a signal handler and calls the correct
-   function.
-
-*******************************************************************************/
-
-void *signal_handle(void *xpc, int type, intptr_t val)
-{
-       void          *p;
-       int32_t        index;
-       java_object_t *o;
-
-       switch (type) {
-       case EXCEPTION_HARDWARE_NULLPOINTER:
-               p = exceptions_new_nullpointerexception();
-               break;
-
-       case EXCEPTION_HARDWARE_ARITHMETIC:
-               p = exceptions_new_arithmeticexception();
-               break;
-
-       case EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS:
-               index = (s4) val;
-               p = exceptions_new_arrayindexoutofboundsexception(index);
-               break;
-
-       case EXCEPTION_HARDWARE_CLASSCAST:
-               o = (java_object_t *) val;
-               p = exceptions_new_classcastexception(o);
-               break;
-
-       case EXCEPTION_HARDWARE_EXCEPTION:
-               p = exceptions_fillinstacktrace();
-               break;
-
-       case EXCEPTION_HARDWARE_PATCHER:
-#if defined(ENABLE_REPLACEMENT)
-               if (replace_me_wrapper(xpc)) {
-                       p = NULL;
-                       break;
-               }
-#endif
-               p = patcher_handler(xpc);
-               break;
-
-       default:
-               /* Let's try to get a backtrace. */
-
-               codegen_get_pv_from_pc(xpc);
-
-               /* If that does not work, print more debug info. */
-
-               log_println("exceptions_new_hardware_exception: unknown exception type %d", type);
-
-#if SIZEOF_VOID_P == 8
-               log_println("PC=0x%016lx", xpc);
-#else
-               log_println("PC=0x%08x", xpc);
-#endif
-
-#if defined(ENABLE_DISASSEMBLER)
-               log_println("machine instruction at PC:");
-               disassinstr(xpc);
-#endif
-
-               vm_abort("Exiting...");
-
-               /* keep compiler happy */
-
-               p = NULL;
-       }
-
-       return p;
+               vm_abort_errno("signal_register_signal: sigaction failed");
 }
 
 
@@ -312,25 +250,25 @@ static void signal_thread(void)
        t = THREADOBJECT;
 
        if (sigemptyset(&mask) != 0)
-               vm_abort("signal_thread: sigemptyset failed: %s", strerror(errno));
+               vm_abort_errno("signal_thread: sigemptyset failed");
 
-#if !defined(WITH_CLASSPATH_SUN)
+#if !defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
        /* Let OpenJDK handle SIGINT itself. */
 
        if (sigaddset(&mask, SIGINT) != 0)
-               vm_abort("signal_thread: sigaddset failed: %s", strerror(errno));
+               vm_abort_errno("signal_thread: sigaddset failed");
 #endif
 
 #if !defined(__FREEBSD__)
        if (sigaddset(&mask, SIGQUIT) != 0)
-               vm_abort("signal_thread: sigaddset failed: %s", strerror(errno));
+               vm_abort_errno("signal_thread: sigaddset failed");
 #endif
 
        for (;;) {
                /* just wait for a signal */
 
 #if defined(ENABLE_THREADS)
-               threads_thread_state_waiting(t);
+               thread_set_state_waiting(t);
 #endif
 
                /* XXX We don't check for an error here, although the man-page
@@ -339,11 +277,11 @@ static void signal_thread(void)
                   revisit this code with our new exact-GC. */
 
 /*             if (sigwait(&mask, &sig) != 0) */
-/*                     vm_abort("signal_thread: sigwait failed: %s", strerror(errno)); */
+/*                     vm_abort_errno("signal_thread: sigwait failed"); */
                (void) sigwait(&mask, &sig);
 
 #if defined(ENABLE_THREADS)
-               threads_thread_state_runnable(t);
+               thread_set_state_runnable(t);
 #endif
 
                /* Handle the signal. */