* Merged with default branch at rev 16f3633aaa5a.

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

diff --git a/src/vm/jit/arm/linux/md-os.c b/src/vm/jit/arm/linux/md-os.c
index 0957136f454ae8a7da176270843c9fcf0d2e02dd..da889e87379581d30ac90c908a4a40b5f8e98eea 100644 (file)
--- a/src/vm/jit/arm/linux/md-os.c
+++ b/src/vm/jit/arm/linux/md-os.c
@@ -22,14 +22,13 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md.c 166 2006-01-22 23:38:44Z twisti $
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 
 #include "vm/types.h"
 
@@ -71,18 +70,18 @@ typedef struct ucontext {
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo     sfi;
-       ucontext_t        *_uc;
-       scontext_t        *_sc;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       u4                 mcode;
-       ptrint             addr;
-       s4                 type;
-       ptrint             val;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       scontext_t     *_sc;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       u4              mcode;
+       intptr_t        addr;
+       int             type;
+       intptr_t        val;
+       void           *p;
 
        _uc = (ucontext_t*) _p;
        _sc = &_uc->uc_mcontext;
@@ -97,6 +96,9 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
        /* get exception-throwing instruction */
 
+       if (xpc == NULL)
+               vm_abort("md_signal_handler_sigsegv: the program counter is NULL");
+
        mcode = *((s4 *) xpc);
 
        /* this is a NullPointerException */
@@ -108,15 +110,23 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        if (addr != 0)
                vm_abort("md_signal_handler_sigsegv: faulting address is not NULL: addr=%p", addr);
 
-       /* generate appropriate exception */
+       /* create stackframeinfo */
+
+       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
+
+       /* Handle the type. */
+
+       p = signal_handle(xpc, type, val);
 
-       o = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val, &sfi);
+       /* remove stackframeinfo */
+
+       stacktrace_remove_stackframeinfo(&sfi);
 
        /* set registers */
 
-       _sc->arm_r10 = (ptrint) o;
-       _sc->arm_fp  = (ptrint) xpc;
-       _sc->arm_pc  = (ptrint) asm_handle_exception;
+       _sc->arm_r10 = (intptr_t) p;
+       _sc->arm_fp  = (intptr_t) xpc;
+       _sc->arm_pc  = (intptr_t) asm_handle_exception;
 }
 
 
@@ -128,17 +138,17 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
 void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo     sfi;
-       ucontext_t        *_uc;
-       scontext_t        *_sc;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       u4                 mcode;
-       s4                 type;
-       ptrint             val;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       scontext_t     *_sc;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       u4              mcode;
+       int             type;
+       intptr_t        val;
+       void           *p;
 
        _uc = (ucontext_t*) _p;
        _sc = &_uc->uc_mcontext;
@@ -163,17 +173,25 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
        type = (mcode >> 8) & 0x0fff;
        val  = *((s4 *) _sc + OFFSET(scontext_t, arm_r0)/4 + (mcode & 0x0f));
 
-       /* 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, &sfi);
+       stacktrace_remove_stackframeinfo(&sfi);
 
        /* set registers if we have an exception, return continue execution
           otherwise (this is needed for patchers to work) */
 
-       if (o != NULL) {
-               _sc->arm_r10 = (ptrint) o;
-               _sc->arm_fp  = (ptrint) xpc;
-               _sc->arm_pc  = (ptrint) asm_handle_exception;
+       if (p != NULL) {
+               _sc->arm_r10 = (intptr_t) p;
+               _sc->arm_fp  = (intptr_t) xpc;
+               _sc->arm_pc  = (intptr_t) asm_handle_exception;
        }
 }