merged volatile memory barriers

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

diff --git a/src/vm/jit/alpha/linux/md-os.c b/src/vm/jit/alpha/linux/md-os.c
index d752d57fccde5d6ebd348be135b1db39918ef00e..2d02d8c48c261cade25bbcff46aa138540a95e3c 100644 (file)
--- a/src/vm/jit/alpha/linux/md-os.c
+++ b/src/vm/jit/alpha/linux/md-os.c
@@ -2,6 +2,7 @@
 
    Copyright (C) 1996-2005, 2006, 2007, 2008
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+   Copyright (C) 2008, 2009 Theobroma Systems Ltd.
 
    This file is part of CACAO.
 
@@ -37,146 +38,43 @@
 
 #include "threads/thread.hpp"
 
-#include "vm/builtin.h"
-#include "vm/signallocal.h"
-#include "vm/os.hpp"
+#include "vm/signallocal.hpp"
 
-#include "vm/jit/asmpart.h"
 #include "vm/jit/executionstate.h"
-#include "vm/jit/trap.h"
+#include "vm/jit/trap.hpp"
 
 
-/* md_signal_handler_sigsegv ***************************************************
-
-   NullPointerException signal handler for hardware null pointer
-   check.
-
-*******************************************************************************/
-
+/**
+ * NullPointerException signal handler for hardware null pointer check.
+ */
 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;
-       s4              d;
-       s4              s1;
-       s4              disp;
-       intptr_t        val;
-       intptr_t        addr;
-       int             type;
-       void           *p;
-
-       _uc = (ucontext_t *) _p;
-       _mc = &_uc->uc_mcontext;
-
-       pv  = (u1 *) _mc->sc_regs[REG_PV];
-       sp  = (u1 *) _mc->sc_regs[REG_SP];
-       ra  = (u1 *) _mc->sc_regs[REG_RA];           /* this is correct for leafs */
-       xpc = (u1 *) _mc->sc_pc;
-
-       /* get exception-throwing instruction */
-
-       mcode = *((u4 *) xpc);
-
-       d    = M_MEM_GET_Ra(mcode);
-       s1   = M_MEM_GET_Rb(mcode);
-       disp = M_MEM_GET_Memory_disp(mcode);
-
-       val  = _mc->sc_regs[d];
-
-       /* check for special-load */
-
-       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. */
-
-                       xpc = ra - 4;
-               }
-       }
-       else {
-               /* This is a normal NPE: addr must be NULL and the NPE-type
-                  define is 0. */
-
-               addr = _mc->sc_regs[s1];
-               type = (int) addr;
-       }
-
-       /* Handle the trap. */
-
-       p = trap_handle(type, val, pv, sp, ra, xpc, _p);
+       ucontext_t* _uc = (ucontext_t *) _p;
+       mcontext_t* _mc = &_uc->uc_mcontext;
 
-       /* Set registers. */
+       void* xpc = (void*) _mc->sc_pc;
 
-       switch (type) {
-       case TRAP_COMPILER:
-               if (p != NULL) {
-                       _mc->sc_regs[REG_PV] = (uintptr_t) p;
-                       _mc->sc_pc           = (uintptr_t) p;
-                       break;
-               }
-
-               /* Get and set the PV from the parent Java method. */
-
-               pv = md_codegen_get_pv_from_pc(ra);
-
-               _mc->sc_regs[REG_PV] = (uintptr_t) pv;
-
-               /* Get the exception object. */
-
-               p = builtin_retrieve_exception();
-
-               assert(p != NULL);
-
-               /* fall-through */
-
-       case TRAP_PATCHER:
-               if (p == NULL)
-                       break;
-
-               /* fall-through */
-               
-       default:
-               _mc->sc_regs[REG_ITMP1_XPTR] = (uintptr_t) p;
-               _mc->sc_regs[REG_ITMP2_XPC]  = (uintptr_t) xpc;
-               _mc->sc_pc                   = (uintptr_t) asm_handle_exception;
-       }
+       // Handle the trap.
+       trap_handle(TRAP_SIGSEGV, xpc, _p);
 }
 
 
-/* md_signal_handler_sigusr1 ***************************************************
-
-   Signal handler for suspending threads.
-
-*******************************************************************************/
-
-#if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
-void md_signal_handler_sigusr1(int sig, siginfo_t *siginfo, void *_p)
+/**
+ * Illegal Instruction signal handler for hardware exception checks.
+ */
+void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t *_uc;
-       mcontext_t *_mc;
-       u1         *pc;
-       u1         *sp;
+       ucontext_t* _uc = (ucontext_t*) _p;
+       mcontext_t* _mc = &_uc->uc_mcontext;
 
-       _uc = (ucontext_t *) _p;
-       _mc = &_uc->uc_mcontext;
+       void* xpc = (void*) _mc->sc_pc;
 
-       /* get the PC and SP for this thread */
-       pc = (u1 *) _mc->sc_pc;
-       sp = (u1 *) _mc->sc_regs[REG_SP];
+       // The PC points to the instruction after the illegal instruction.
+       xpc = (void*) (((uintptr_t) xpc) - 4);
 
-       /* now suspend the current thread */
-       threads_suspend_ack(pc, sp);
+       // Handle the trap.
+       trap_handle(TRAP_SIGILL, xpc, _p);
 }
-#endif
 
 
 /* md_signal_handler_sigusr2 ***************************************************