* 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 58b02579cb0e6b3532d275f30d420348821b020c..955979fc39165442943a7e76082a2c4b58d2bd5a 100644 (file)
--- a/src/vm/jit/powerpc/darwin/md-os.c
+++ b/src/vm/jit/powerpc/darwin/md-os.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/powerpc/darwin/md-os.c - machine dependent PowerPC Darwin functions
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,84 +19,137 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
-   Changes:
-
-   $Id: md-os.c 2998 2005-07-12 09:16:53Z 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 "config.h"
+#include "vm/types.h"
 
-#include "vm/jit/powerpc/types.h"
+#include "vm/jit/powerpc/codegen.h"
 #include "vm/jit/powerpc/darwin/md-abi.h"
 
 #include "vm/exceptions.h"
 #include "vm/global.h"
+#include "vm/signallocal.h"
 #include "vm/stringlocal.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/stacktrace.h"
 
 
-/* signal_handler_sigsegv ******************************************************
+/* md_signal_handler_sigsegv ***************************************************
 
-   NullPointerException signal handler for hardware null pointer check.
+   NullPointerException signal handler for hardware null pointer
+   check.
 
 *******************************************************************************/
 
-void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
+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;
-       functionptr         ra;
-       functionptr         xpc;
+       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];
+
+       e = exceptions_new_hardware_exception(pv, sp, ra, xpc, s1, disp, addr, val);
+
+       /* set registers */
+
+       _ss->r11  = (ptrint) e;
+       _ss->r12  = (ptrint) xpc;
+       _ss->srr0 = (ptrint) asm_handle_exception;
+}
+
 
-       instr = *((u4 *) _ss->srr0);
-       reg = (instr >> 16) & 31;
-       addr = gregs[reg];
+/* md_signal_handler_sigusr2 ***************************************************
 
-       if (addr == 0) {
-               pv = (u1 *) _ss->r13;
-               sp = (u1 *) _ss->r1;
-               ra = (functionptr) _ss->lr;              /* this is correct for leafs */
-               xpc = (functionptr) _ss->srr0;
+   Signal handler for profiling sampling.
 
-               _ss->r11 = (ptrint) stacktrace_hardware_nullpointerexception(pv, sp, ra, xpc);
+*******************************************************************************/
+
+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;
+       ppc_thread_state_t *_ss;
+       void               *critical;
+
+       _mc = _uc->uc_mcontext;
+       _ss = &_mc->ss;
 
-               _ss->r12 = (ptrint) xpc;
-               _ss->srr0 = (ptrint) asm_handle_exception;
+       critical = critical_find_restart_point((void *) _ss->srr0);
 
-       } else {
-               throw_cacao_exception_exit(string_java_lang_InternalError,
-                                          "Segmentation fault: 0x%08lx at 0x%08lx",
-                                          addr, _ss->srr0);
-       }
+       if (critical)
+               _ss->srr0 = (ptrint) critical;
 }
+#endif
 
 
 /*