* Merged in twisti-branch.

[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 01a50b22ec292e5968a6ee5dfbc521e80dba9d9c..955979fc39165442943a7e76082a2c4b58d2bd5a 100644 (file)
--- a/src/vm/jit/powerpc/darwin/md-os.c
+++ b/src/vm/jit/powerpc/darwin/md-os.c
@@ -26,20 +26,20 @@
 
    Authors: Christian Thalinger
 
-   Changes:
-
-   $Id: md-os.c 4961 2006-05-26 12:25:51Z twisti $
+   $Id: md-os.c 6186 2006-12-12 22:35:31Z twisti $
 
 */
 
 
 #include "config.h"
 
+#include <assert.h>
 #include <signal.h>
 #include <ucontext.h>
 
 #include "vm/types.h"
 
+#include "vm/jit/powerpc/codegen.h"
 #include "vm/jit/powerpc/darwin/md-abi.h"
 
 #include "vm/exceptions.h"
@@ -62,56 +62,85 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        ucontext_t         *_uc;
        mcontext_t          _mc;
        ppc_thread_state_t *_ss;
-       ptrint             *gregs;
-       u4                  instr;
-       s4                  reg;
-       ptrint              addr;
        u1                 *pv;
        u1                 *sp;
        u1                 *ra;
        u1                 *xpc;
+       u4                  mcode;
+       s4                  s1;
+       s4                  disp;
+       s4                  d;
+       ptrint             *gregs;
+       ptrint              addr;
+       ptrint              val;
+       java_objectheader  *e;
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
        _ss = &_mc->ss;
 
-       /* check for NullPointerException */
+       /* get register values */
+
+       pv  = (u1 *) _ss->r13;
+       sp  = (u1 *) _ss->r1;
+       ra  = (u1 *) _ss->lr;                    /* this is correct for leafs */
+       xpc = (u1 *) _ss->srr0;
+
+       /* get exception-throwing instruction */
+
+       mcode = *((u4 *) xpc);
+
+       s1   = M_INSTR_OP2_IMM_A(mcode);
+       disp = M_INSTR_OP2_IMM_I(mcode);
+       d    = M_INSTR_OP2_IMM_D(mcode);
 
        gregs = &_ss->r0;
+       addr  = gregs[s1];
+       val   = gregs[d];
 
-       instr = *((u4 *) _ss->srr0);
-       reg = (instr >> 16) & 31;
-       addr = gregs[reg];
+       e = exceptions_new_hardware_exception(pv, sp, ra, xpc, s1, disp, addr, val);
 
-       if (addr == 0) {
-               pv  = (u1 *) _ss->r13;
-               sp  = (u1 *) _ss->r1;
-               ra  = (u1 *) _ss->lr;              /* this is correct for leafs */
-               xpc = (u1 *) _ss->srr0;
+       /* set registers */
+
+       _ss->r11  = (ptrint) e;
+       _ss->r12  = (ptrint) xpc;
+       _ss->srr0 = (ptrint) asm_handle_exception;
+}
 
-               _ss->r11 =
-                       (ptrint) stacktrace_hardware_nullpointerexception(pv, sp, ra, xpc);
 
-               _ss->r12 = (ptrint) xpc;
-               _ss->srr0 = (ptrint) asm_handle_exception;
+/* md_signal_handler_sigusr2 ***************************************************
+
+   Signal handler for profiling sampling.
+
+*******************************************************************************/
 
-       } else {
-               throw_cacao_exception_exit(string_java_lang_InternalError,
-                                          "Segmentation fault: 0x%08lx at 0x%08lx",
-                                          addr, _ss->srr0);
-       }
+void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
+{
+       threadobject       *t;
+       ucontext_t         *_uc;
+       mcontext_t          _mc;
+       ppc_thread_state_t *_ss;
+       u1                 *pc;
+
+       t = THREADOBJECT;
+
+       _uc = (ucontext_t *) _p;
+       _mc = _uc->uc_mcontext;
+       _ss = &_mc->ss;
+
+       pc = (u1 *) _ss->srr0;
+
+       t->pc = pc;
 }
 
 
 #if defined(ENABLE_THREADS)
 void thread_restartcriticalsection(ucontext_t *_uc)
 {
-       mcontext_t         *_mc;
+       mcontext_t          _mc;
        ppc_thread_state_t *_ss;
        void               *critical;
 
-       assert(0);
-
        _mc = _uc->uc_mcontext;
        _ss = &_mc->ss;