* Removed all Id tags.

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

diff --git a/src/vm/jit/powerpc/darwin/md-os.c b/src/vm/jit/powerpc/darwin/md-os.c
index d7749c4b9c732e34d84effc62c032c94ce058ae8..2086b8eac341d7c1242b6cc4a2830aa1687081f2 100644 (file)
--- a/src/vm/jit/powerpc/darwin/md-os.c
+++ b/src/vm/jit/powerpc/darwin/md-os.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-os.c 8178 2007-07-05 11:13:20Z michi $
-
 */
 
 
@@ -31,6 +29,7 @@
 
 #include <assert.h>
 #include <signal.h>
+#include <stdint.h>
 #include <ucontext.h>
 
 #include "vm/types.h"
@@ -70,13 +69,13 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        u1                 *ra;
        u1                 *xpc;
        u4                  mcode;
-       s4                  s1;
-       s4                  disp;
-       s4                  d;
-       ptrint             addr;
-       ptrint             val;
-       s4                 type;
-       java_objectheader *o;
+       int                 s1;
+       int16_t             disp;
+       int                 d;
+       intptr_t            addr;
+       intptr_t            val;
+       int                 type;
+       void               *p;
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
@@ -121,15 +120,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) */
 
-       _ss->r11  = (ptrint) o;
-       _ss->r12  = (ptrint) xpc;
-       _ss->srr0 = (ptrint) asm_handle_exception;
+       if (p != NULL) {
+               _ss->r11  = (intptr_t) p;
+               _ss->r12  = (intptr_t) xpc;
+               _ss->srr0 = (intptr_t) asm_handle_exception;
+       }
 }
 
 
@@ -151,10 +160,10 @@ void md_signal_handler_sigtrap(int sig, siginfo_t *siginfo, void *_p)
        u1                 *ra;
        u1                 *xpc;
        u4                  mcode;
-       s4                  s1;
-       ptrint              val;
-       s4                  type;
-       java_objectheader  *o;
+       int                 s1;
+       intptr_t            val;
+       int                 type;
+       void               *p;
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
@@ -182,15 +191,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 */
 
-       _ss->r11  = (ptrint) o;
-       _ss->r12  = (ptrint) xpc;
-       _ss->srr0 = (ptrint) asm_handle_exception;
+       _ss->r11  = (intptr_t) p;
+       _ss->r12  = (intptr_t) xpc;
+       _ss->srr0 = (intptr_t) asm_handle_exception;
 }