* src/vm/jit/trap.cpp (trap_handle) [__MIPS__]: Use executionstate for trap

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

diff --git a/src/vm/jit/mips/linux/md-os.c b/src/vm/jit/mips/linux/md-os.c
index e94b20d76faa8d962f9b7d5b6f4f726d1e780d6b..e96052f300272ed85144f5b279a3b085220c1cdf 100644 (file)
--- a/src/vm/jit/mips/linux/md-os.c
+++ b/src/vm/jit/mips/linux/md-os.c
@@ -38,14 +38,14 @@
 #include "vm/jit/mips/md-abi.h"
 
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "vm/signallocal.h"
+#include "vm/signallocal.hpp"
 #include "vm/os.hpp"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/executionstate.h"
-#include "vm/jit/trap.h"
+#include "vm/jit/trap.hpp"
 
 
 /* md_init *********************************************************************
@@ -101,7 +101,6 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        intptr_t        val;
        intptr_t        addr;
        int             type;
-       void           *p;
 
        _uc    = (struct ucontext *) _p;
        _mc    = &_uc->uc_mcontext;
@@ -185,58 +184,53 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
        /* Handle the trap. */
 
-       p = trap_handle(type, val, pv, sp, ra, xpc, _p);
+       trap_handle(type, val, pv, sp, ra, xpc, _p);
+}
+
 
-       /* Set registers. */
+/**
+ * Signal handler for patcher calls.
+ */
+void md_signal_handler_sigill(int sig, siginfo_t* siginfo, void* _p)
+{
+       ucontext_t* _uc = (struct ucontext *) _p;
+       mcontext_t* _mc = &_uc->uc_mcontext;
+       greg_t* _gregs;
 
-       switch (type) {
-       case TRAP_COMPILER:
-               if (p != NULL) {
-                       _gregs[REG_PV]  = (uintptr_t) p;
 #if defined(__UCLIBC__)
-                       _gregs[CTX_EPC] = (uintptr_t) p;
-#else
-                       _mc->pc         = (uintptr_t) p;
+       _gregs = _mc->gpregs;
+#else  
+       _gregs = _mc->gregs;
 #endif
-                       break;
-               }
 
-               /* Get and set the PV from the parent Java method. */
-
-               pv = md_codegen_get_pv_from_pc(ra);
-
-               _gregs[REG_PV] = (uintptr_t) pv;
-
-               /* Get the exception object. */
-
-               p = builtin_retrieve_exception();
-
-               assert(p != NULL);
-
-               /* fall-through */
-
-       case TRAP_PATCHER:
-               if (p == NULL) {
-                       /* We set the PC again because the cause may have changed
-                          the XPC. */
+       // In glibc's ucontext.h the registers are defined as long long
+       // int, even for MIPS32, so we cast them.  This is not the case
+       // for uClibc.
+       void* pv  = (void*) (uintptr_t) _gregs[REG_PV];
+       void* sp  = (void*) (uintptr_t) _gregs[REG_SP];
+       void* ra  = (void*) (uintptr_t) _gregs[REG_RA]; // The RA is correct for leaf methods.
 
 #if defined(__UCLIBC__)
-                       _gregs[CTX_EPC] = (uintptr_t) xpc;
+       void* xpc = (void*) (uintptr_t) _gregs[CTX_EPC];
 #else
-                       _mc->pc         = (uintptr_t) xpc;
+       void* xpc = (void*) (uintptr_t) _mc->pc;
 #endif
-                       break;
-               }
 
-               /* fall-through */
-               
-       default:
-               _gregs[REG_ITMP1_XPTR] = (uintptr_t) p;
-               _gregs[REG_ITMP2_XPC]  = (uintptr_t) xpc;
+       // This signal is always a patcher.
+       int      type = TRAP_PATCHER;
+       intptr_t val  = 0;
+
+       // Handle the trap.
+       void* p = trap_handle(type, val, pv, sp, ra, xpc, _p);
+
+       // Set registers
+       if (p == NULL) {
+               // We set the PC again because the cause may have changed the
+               // XPC.
 #if defined(__UCLIBC__)
-               _gregs[CTX_EPC]        = (uintptr_t) asm_handle_exception;
+               _gregs[CTX_EPC] = (uintptr_t) xpc;
 #else
-               _mc->pc                = (uintptr_t) asm_handle_exception;
+               _mc->pc         = (uintptr_t) xpc;
 #endif
        }
 }