Merged revisions 8245-8298 via svnmerge from

[cacao.git] / src / vm / jit / i386 / linux / md-os.c

diff --git a/src/vm/jit/i386/linux/md-os.c b/src/vm/jit/i386/linux/md-os.c
index bf5d64804d820b0756a62cbffe0b6b09d2284c0a..031c6774afe8aa75d8ac377a6d89c01d12536e05 100644 (file)
--- a/src/vm/jit/i386/linux/md-os.c
+++ b/src/vm/jit/i386/linux/md-os.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-os.c 7667 2007-04-05 00:16:05Z michi $
+   $Id: md-os.c 8299 2007-08-13 08:41:18Z michi $
 
 */
 
@@ -31,14 +31,11 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <ucontext.h>
 
 #include "vm/types.h"
 
-#if defined(ENABLE_GC_CACAO)
-# include "mm/cacao-gc/gc.h"
-#endif
-
 #include "vm/jit/i386/codegen.h"
 
 #include "threads/threads-common.h"
@@ -59,20 +56,21 @@
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t        *_uc;
-       mcontext_t        *_mc;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       u1                 opc;
-       u1                 mod;
-       u1                 rm;
-       s4                 d;
-       s4                 disp;
-       ptrint             val;
-       s4                 type;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       u1              opc;
+       u1              mod;
+       u1              rm;
+       s4              d;
+       s4              disp;
+       ptrint          val;
+       s4              type;
+       void           *p;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
@@ -111,17 +109,26 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                /* this was a normal NPE */
 
                type = EXCEPTION_HARDWARE_NULLPOINTER;
+               val  = 0;
        }
 
-       /* generate appropriate exception */
+       /* create stackframeinfo */
+
+       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
+
+       /* Handle the type. */
+
+       p = signal_handle(xpc, type, val);
+
+       /* remove stackframeinfo */
 
-       o = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val);
+       stacktrace_remove_stackframeinfo(&sfi);
 
        /* set registers */
 
-       _mc->gregs[REG_EAX] = (ptrint) o;
-       _mc->gregs[REG_ECX] = (ptrint) xpc;                      /* REG_ITMP2_XPC */
-       _mc->gregs[REG_EIP] = (ptrint) asm_handle_exception;
+       _mc->gregs[REG_EAX] = (intptr_t) p;
+       _mc->gregs[REG_ECX] = (intptr_t) xpc;                    /* REG_ITMP2_XPC */
+       _mc->gregs[REG_EIP] = (intptr_t) asm_handle_exception;
 }
 
 
@@ -134,15 +141,16 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
 void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t        *_uc;
-       mcontext_t        *_mc;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       s4                 type;
-       ptrint             val;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       s4              type;
+       ptrint          val;
+       void           *p;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
@@ -157,13 +165,21 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
        type = EXCEPTION_HARDWARE_ARITHMETIC;
        val  = 0;
 
-       /* generate appropriate exception */
+       /* create stackframeinfo */
 
-       o = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val);
+       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
 
-       _mc->gregs[REG_EAX] = (ptrint) o;
-       _mc->gregs[REG_ECX] = (ptrint) xpc;                      /* REG_ITMP2_XPC */
-       _mc->gregs[REG_EIP] = (ptrint) asm_handle_exception;
+       /* Handle the type. */
+
+       p = signal_handle(xpc, type, val);
+
+       /* remove stackframeinfo */
+
+       stacktrace_remove_stackframeinfo(&sfi);
+
+       _mc->gregs[REG_EAX] = (intptr_t) p;
+       _mc->gregs[REG_ECX] = (intptr_t) xpc;                    /* REG_ITMP2_XPC */
+       _mc->gregs[REG_EIP] = (intptr_t) asm_handle_exception;
 }
 
 
@@ -184,9 +200,6 @@ void md_signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p)
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
 
-       /* assume there is a GC pending */
-       assert(gc_pending);
-
        /* get the PC and SP for this thread */
        pc = (u1 *) _mc->gregs[REG_EIP];
        sp = (u1 *) _mc->gregs[REG_ESP];
@@ -223,15 +236,28 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 #endif
 
 
+/* md_critical_section_restart *************************************************
+
+   Search the critical sections tree for a matching section and set
+   the PC to the restart point, if necessary.
+
+*******************************************************************************/
+
 #if defined(ENABLE_THREADS)
-void thread_restartcriticalsection(ucontext_t *uc)
+void md_critical_section_restart(ucontext_t *_uc)
 {
-       void *critical;
+       mcontext_t *_mc;
+       u1         *pc;
+       u1         *npc;
+
+       _mc = &_uc->uc_mcontext;
+
+       pc = (u1 *) _mc->gregs[REG_EIP];
 
-       critical = critical_find_restart_point((void *) uc->uc_mcontext.gregs[REG_EIP]);
+       npc = critical_find_restart_point(pc);
 
-       if (critical)
-               uc->uc_mcontext.gregs[REG_EIP] = (ptrint) critical;
+       if (npc != NULL)
+               _mc->gregs[REG_EIP] = (ptrint) npc;
 }
 #endif