* src/vm/jit/powerpc64/linux/md-os.c: Simplified signal handlers.
[cacao.git] / src / vm / jit / powerpc64 / linux / md-os.c
index 977992e33b2c4439eb3c50ea5f416cdec376527b..23b1a541576a046aea522a06286879a92b11d194 100644 (file)
@@ -1,7 +1,8 @@
 /* src/vm/jit/powerpc64/linux/md-os.c - machine dependent PowerPC64 Linux functions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2005, 2006, 2007, 2008, 2009
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+   Copyright (C) 2008 Theobroma Systems Ltd.
 
    This file is part of CACAO.
 
 
 #include "threads/thread.hpp"
 
-#include "vm/jit/builtin.hpp"
-#include "vm/signallocal.h"
-#include "vm/os.hpp"
+#include "vm/signallocal.hpp"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/executionstate.h"
-
-#if defined(ENABLE_PROFILING)
-# include "vm/jit/optimizing/profile.h"
-#endif
-
-#include "vm/jit/trap.h"
+#include "vm/jit/trap.hpp"
 
 
-/* md_signal_handler_sigsegv ***************************************************
-       Signal handler for hardware-exceptions.
-
-*******************************************************************************/
-
+/**
+ * Signal handler for hardware-exceptions.
+ */
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t     *_uc;
-       mcontext_t     *_mc;
-       u1             *pv;
-       u1             *sp;
-       u1             *ra;
-       u1             *xpc;
-       u4              mcode;
-       int             s1;
-       int16_t         disp;
-       int             d;
-       int             type;
-       intptr_t        addr;
-       intptr_t        val;
-       void           *p;
-
-       _uc = (ucontext_t *) _p;
-       _mc = &(_uc->uc_mcontext);
-
-       /* get register values */
-
-       pv = (u1*) _mc->gp_regs[REG_PV];
-       sp = (u1*) _mc->gp_regs[REG_SP];
-       ra = (u1*) _mc->gp_regs[PT_LNK];                     /* correct for leafs */
-       xpc =(u1*) _mc->gp_regs[PT_NIP];
-
-       /* get the 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);
-
-       val  = _mc->gp_regs[d];
-
-       if (s1 == REG_ZERO) {
-               /* We use the exception type as load displacement. */
-               type = disp;
-
-               if (type == TRAP_COMPILER) {
-                       /* The XPC is the RA minus 1, because the RA points to the
-                          instruction after the call. */
+       ucontext_t* _uc = (ucontext_t *) _p;
+       mcontext_t* _mc = &(_uc->uc_mcontext);
 
-                       xpc = ra - 4;
-               }
-       }
-       else {
-               /* Normal NPE. */
-               addr = _mc->gp_regs[s1];
-               type = (int) addr;
-       }
+       void* xpc = (void*) _mc->gp_regs[PT_NIP];
 
-       /* Handle the trap. */
-
-       p = trap_handle(type, val, pv, sp, ra, xpc, _p);
-
-       /* Set registers. */
-
-       switch (type) {
-       case TRAP_COMPILER:
-               if (p != NULL) {
-                       _mc->gp_regs[REG_PV] = (uintptr_t) p;
-                       _mc->gp_regs[PT_NIP] = (uintptr_t) p;
-                       break;
-               }
-
-               /* Get and set the PV from the parent Java method. */
-
-               pv = md_codegen_get_pv_from_pc(ra);
-
-               _mc->gp_regs[REG_PV] = (uintptr_t) pv;
-
-               /* Get the exception object. */
-
-               p = builtin_retrieve_exception();
+       // Handle the trap.
+       trap_handle(TRAP_SIGSEGV, xpc, _p);
+}
 
-               assert(p != NULL);
 
-               /* fall-through */
+/**
+ * Signal handler for patcher calls.
+ */
+void md_signal_handler_sigill(int sig, siginfo_t* siginfo, void* _p)
+{
+       ucontext_t* _uc = (ucontext_t*) _p;
+       mcontext_t* _mc = &(_uc->uc_mcontext);
 
-       case TRAP_PATCHER:
-               if (p == NULL)
-                       break;
+       void* xpc =(void*) _mc->gp_regs[PT_NIP];
 
-               /* fall-through */
-               
-       default:
-               _mc->gp_regs[REG_ITMP1_XPTR] = (uintptr_t) p;
-               _mc->gp_regs[REG_ITMP2_XPC]  = (uintptr_t) xpc;
-               _mc->gp_regs[PT_NIP]         = (uintptr_t) asm_handle_exception;
-       }
+       // Handle the trap.
+       trap_handle(TRAP_SIGILL, xpc, _p);
 }
 
 
@@ -187,36 +109,31 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 
 void md_executionstate_read(executionstate_t *es, void *context)
 {
-#if 0
        ucontext_t    *_uc;
        mcontext_t    *_mc;
-       unsigned long *_gregs;
        s4              i;
 
        _uc = (ucontext_t *) context;
-
-       _mc    = _uc->uc_mcontext.uc_regs;
-       _gregs = _mc->gregs;
+       _mc = &(_uc->uc_mcontext);
 
        /* read special registers */
-       es->pc = (u1 *) _gregs[PT_NIP];
-       es->sp = (u1 *) _gregs[REG_SP];
-       es->pv = (u1 *) _gregs[REG_PV];
-       es->ra = (u1 *) _gregs[PT_LNK];
+       es->pc = (u1 *) _mc->gp_regs[PT_NIP];
+       es->sp = (u1 *) _mc->gp_regs[REG_SP];
+       es->pv = (u1 *) _mc->gp_regs[REG_PV];
+       es->ra = (u1 *) _mc->gp_regs[PT_LNK];
 
        /* read integer registers */
        for (i = 0; i < INT_REG_CNT; i++)
-               es->intregs[i] = _gregs[i];
+               es->intregs[i] = _mc->gp_regs[i];
 
        /* read float registers */
        /* Do not use the assignment operator '=', as the type of
         * the _mc->fpregs[i] can cause invalid conversions. */
 
-       assert(sizeof(_mc->fpregs.fpregs) == sizeof(es->fltregs));
-       os_memcpy(&es->fltregs, &_mc->fpregs.fpregs, sizeof(_mc->fpregs.fpregs));
-#endif
-
-       vm_abort("md_executionstate_read: IMPLEMENT ME!");
+       // The assertion below will fail because _mc->fp_regs[] also
+       // contains the "fpscr" register.
+       //assert(sizeof(_mc->fp_regs) == sizeof(es->fltregs));
+       os_memcpy(&es->fltregs, &_mc->fp_regs, sizeof(es->fltregs));
 }
 
 
@@ -228,36 +145,31 @@ void md_executionstate_read(executionstate_t *es, void *context)
 
 void md_executionstate_write(executionstate_t *es, void *context)
 {
-#if 0
        ucontext_t    *_uc;
        mcontext_t    *_mc;
-       unsigned long *_gregs;
        s4              i;
 
        _uc = (ucontext_t *) context;
-
-       _mc    = _uc->uc_mcontext.uc_regs;
-       _gregs = _mc->gregs;
+       _mc = &(_uc->uc_mcontext);
 
        /* write integer registers */
        for (i = 0; i < INT_REG_CNT; i++)
-               _gregs[i] = es->intregs[i];
+               _mc->gp_regs[i] = es->intregs[i];
 
        /* write float registers */
        /* Do not use the assignment operator '=', as the type of
         * the _mc->fpregs[i] can cause invalid conversions. */
 
-       assert(sizeof(_mc->fpregs.fpregs) == sizeof(es->fltregs));
-       os_memcpy(&_mc->fpregs.fpregs, &es->fltregs, sizeof(_mc->fpregs.fpregs));
+       // The assertion below will fail because _mc->fp_regs[] also
+       // contains the "fpscr" register.
+       //assert(sizeof(_mc->fp_regs) == sizeof(es->fltregs));
+       os_memcpy(&_mc->fp_regs, &es->fltregs, sizeof(es->fltregs));
 
        /* write special registers */
-       _gregs[PT_NIP] = (ptrint) es->pc;
-       _gregs[REG_SP] = (ptrint) es->sp;
-       _gregs[REG_PV] = (ptrint) es->pv;
-       _gregs[PT_LNK] = (ptrint) es->ra;
-#endif
-
-       vm_abort("md_executionstate_write: IMPLEMENT ME!");
+       _mc->gp_regs[PT_NIP] = (ptrint) es->pc;
+       _mc->gp_regs[REG_SP] = (ptrint) es->sp;
+       _mc->gp_regs[REG_PV] = (ptrint) es->pv;
+       _mc->gp_regs[PT_LNK] = (ptrint) es->ra;
 }