* Removed all Id tags.

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

diff --git a/src/vm/jit/mips/linux/md-os.c b/src/vm/jit/mips/linux/md-os.c
index 71b4f0c25d0ab158b4bb0182dc2de471fc8f1395..1be89759caaed3e42fbcc03ec18f3b902e98046e 100644 (file)
--- a/src/vm/jit/mips/linux/md-os.c
+++ b/src/vm/jit/mips/linux/md-os.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-os.c 7570 2007-03-24 22:20:09Z twisti $
-
 */
 
 
@@ -32,6 +30,7 @@
 #include <assert.h>
 #include <sgidefs.h> /* required for _MIPS_SIM_ABI* defines (before signal.h) */
 #include <signal.h>
+#include <stdint.h>
 #include <ucontext.h>
 
 #include "vm/types.h"
@@ -41,8 +40,7 @@
 
 #include "mm/gc-common.h"
 
-#include "vm/exceptions.h"
-#include "vm/stringlocal.h"
+#include "vm/signallocal.h"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/stacktrace.h"
@@ -85,22 +83,23 @@ void md_init(void)
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t        *_uc;
-       mcontext_t        *_mc;
-       greg_t            *_gregs;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       unsigned int       cause;
-       u4                 mcode;
-       s4                 d;
-       s4                 s1;
-       s4                 disp;
-       ptrint             val;
-       ptrint             addr;
-       s4                 type;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       greg_t         *_gregs;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       unsigned int    cause;
+       u4              mcode;
+       int             d;
+       int             s1;
+       int16_t         disp;
+       intptr_t        val;
+       intptr_t        addr;
+       int             type;
+       void           *p;
 
        _uc    = (struct ucontext *) _p;
        _mc    = &_uc->uc_mcontext;
@@ -119,17 +118,14 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        sp  = (u1 *) (ptrint) _gregs[REG_SP];
        ra  = (u1 *) (ptrint) _gregs[REG_RA];        /* this is correct for leafs */
 
-#if defined(__UCLIBC__)
-       xpc = (u1 *) (ptrint) _gregs[CTX_EPC];
+#if !defined(__UCLIBC__) && ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 5))
+       /* NOTE: We only need this for pre glibc-2.5. */
 
-#error how to get the cause?
-#else
        xpc = (u1 *) (ptrint) _mc->pc;
 
        /* get the cause of this exception */
 
        cause = _mc->cause;
-#endif
 
        /* check the cause to find the faulting instruction */
 
@@ -143,7 +139,11 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        case 0x00000010:
                /* AdEL: XPC is of the following instruction */
                xpc = xpc - 4;
+               break;
        }
+#else
+       xpc = (u1 *) (ptrint) _gregs[CTX_EPC];
+#endif
 
        /* get exception-throwing instruction */
 
@@ -153,14 +153,13 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        s1   = M_ITYPE_GET_RS(mcode);
        disp = M_ITYPE_GET_IMM(mcode);
 
-       val   = _gregs[d];
-
        /* check for special-load */
 
        if (s1 == REG_ZERO) {
                /* we use the exception type as load displacement */
 
                type = disp;
+               val  = _gregs[d];
        }
        else {
                /* This is a normal NPE: addr must be NULL and the NPE-type
@@ -168,22 +167,40 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
                addr = _gregs[s1];
                type = (s4) addr;
+               val  = 0;
        }
 
-       /* generate appropriate exception */
+       /* create stackframeinfo */
+
+       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
+
+       /* Handle the type. */
 
-       o = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val);
+       p = signal_handle(xpc, type, val);
 
-       /* set registers */
+       /* remove stackframeinfo */
 
-       _gregs[REG_ITMP1_XPTR] = (ptrint) o;
-       _gregs[REG_ITMP2_XPC]  = (ptrint) xpc;
+       stacktrace_remove_stackframeinfo(&sfi);
 
+       /* set registers (only if exception object ready) */
+
+       if (p != NULL) {
+               _gregs[REG_ITMP1_XPTR] = (intptr_t) p;
+               _gregs[REG_ITMP2_XPC]  = (intptr_t) xpc;
+
+#if defined(__UCLIBC__)
+               _gregs[CTX_EPC]        = (intptr_t) asm_handle_exception;
+#else
+               _mc->pc                = (intptr_t) asm_handle_exception;
+#endif
+       }
+       else {
 #if defined(__UCLIBC__)
-       _gregs[CTX_EPC]        = (ptrint) asm_handle_exception;
+               _gregs[CTX_EPC]        = (intptr_t) xpc;
 #else
-       _mc->pc                = (ptrint) asm_handle_exception;
+               _mc->pc                = (intptr_t) xpc;
 #endif
+       }
 }
 
 
@@ -198,8 +215,15 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 }
 
 
+/* 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)
 {
        mcontext_t *_mc;
        u1         *pc;