Merged revisions 8245-8298 via svnmerge from

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

diff --git a/src/vm/jit/powerpc/linux/md-os.c b/src/vm/jit/powerpc/linux/md-os.c
index d5e90ef2fc2bb53bb66f2bb1b5f9edbc00c1afbd..ce41acbcf04a684ef2e14aebbc5c2f2e202033b9 100644 (file)
--- a/src/vm/jit/powerpc/linux/md-os.c
+++ b/src/vm/jit/powerpc/linux/md-os.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-os.c 8178 2007-07-05 11:13:20Z michi $
+   $Id: md-os.c 8283 2007-08-09 15:10:05Z twisti $
 
 */
 
@@ -30,6 +30,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <ucontext.h>
 
 #include "vm/types.h"
@@ -61,22 +62,22 @@
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo     sfi;
-       ucontext_t        *_uc;
-       mcontext_t        *_mc;
-       unsigned long     *_gregs;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       u4                 mcode;
-       s4                 s1;
-       s4                 disp;
-       s4                 d;
-       ptrint             addr;
-       ptrint             val;
-       s4                 type;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       unsigned long  *_gregs;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       u4              mcode;
+       int             s1;
+       int16_t         disp;
+       int             d;
+       intptr_t        addr;
+       intptr_t        val;
+       int             type;
+       void           *p;
 
        _uc = (ucontext_t *) _p;
 
@@ -121,15 +122,25 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                        vm_abort("md_signal_handler_sigsegv: faulting address is not NULL: addr=%p", addr);
        }
 
-       /* generate appropriate exception */
+       /* create stackframeinfo */
 
-       o = exceptions_new_hardware_exception(pv, sp, ra, xpc, type, val, &sfi);
+       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
 
-       /* set registers */
+       /* Handle the type. */
+
+       p = signal_handle(xpc, type, val);
+
+       /* remove stackframeinfo */
+
+       stacktrace_remove_stackframeinfo(&sfi);
+
+       /* set registers (only if exception object ready) */
 
-       _gregs[REG_ITMP1_XPTR] = (ptrint) o;
-       _gregs[REG_ITMP2_XPC]  = (ptrint) xpc;
-       _gregs[PT_NIP]         = (ptrint) asm_handle_exception;
+       if (p != NULL) {
+               _gregs[REG_ITMP1_XPTR] = (intptr_t) p;
+               _gregs[REG_ITMP2_XPC]  = (intptr_t) xpc;
+               _gregs[PT_NIP]         = (intptr_t) asm_handle_exception;
+       }
 }
 
 
@@ -141,19 +152,19 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
 void md_signal_handler_sigtrap(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo     sfi;
-       ucontext_t        *_uc;
-       mcontext_t        *_mc;
-       unsigned long     *_gregs;
-       u1                *pv;
-       u1                *sp;
-       u1                *ra;
-       u1                *xpc;
-       u4                 mcode;
-       s4                 s1;
-       ptrint             val;
-       s4                 type;
-       java_objectheader *o;
+       stackframeinfo  sfi;
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       unsigned long  *_gregs;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       u4              mcode;
+       int             s1;
+       intptr_t        val;
+       int             type;
+       void           *p;
 
        _uc = (ucontext_t *) _p;
 
@@ -181,15 +192,23 @@ void md_signal_handler_sigtrap(int sig, siginfo_t *siginfo, void *_p)
        type = EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS;
        val  = _gregs[s1];
 
-       /* 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 */
 
-       _gregs[REG_ITMP1_XPTR] = (ptrint) o;
-       _gregs[REG_ITMP2_XPC]  = (ptrint) xpc;
-       _gregs[PT_NIP]         = (ptrint) asm_handle_exception;
+       _gregs[REG_ITMP1_XPTR] = (intptr_t) p;
+       _gregs[REG_ITMP2_XPC]  = (intptr_t) xpc;
+       _gregs[PT_NIP]         = (intptr_t) asm_handle_exception;
 }