* src/vm/jit/trap.cpp (trap_handle) [__MIPS__]: Use executionstate for trap
[cacao.git] / src / vm / jit / mips / linux / md-os.c
index 31dc479e5c9018071a62c6b5e5abfbc6c1d448ae..e96052f300272ed85144f5b279a3b085220c1cdf 100644 (file)
 #include "vm/jit/mips/md.h"
 #include "vm/jit/mips/md-abi.h"
 
-#include "mm/gc-common.h"
-#include "mm/memory.h"
+#include "mm/gc.hpp"
+#include "mm/memory.hpp"
 
-#include "vm/exceptions.h"
-#include "vm/signallocal.h"
+#include "vm/signallocal.hpp"
+#include "vm/os.hpp"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/stacktrace.h"
-#include "vm/jit/trap.h"
+#include "vm/jit/executionstate.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;
@@ -120,7 +119,8 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        sp  = (u1 *) (ptrint) _gregs[REG_SP];
        ra  = (u1 *) (ptrint) _gregs[REG_RA];        /* this is correct for leafs */
 
-#if !defined(__UCLIBC__) && ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 5))
+#if !defined(__UCLIBC__)
+# if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 5))
        /* NOTE: We only need this for pre glibc-2.5. */
 
        xpc = (u1 *) (ptrint) _mc->pc;
@@ -143,6 +143,9 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                xpc = xpc - 4;
                break;
        }
+# else
+       xpc = (u1 *) (ptrint) _mc->pc;
+# endif
 #else
        xpc = (u1 *) (ptrint) _gregs[CTX_EPC];
 #endif
@@ -181,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
        }
 }
@@ -249,39 +247,104 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 }
 
 
-/* md_critical_section_restart *************************************************
+/**
+ * Read the given context into an executionstate.
+ *
+ * @param es      execution state
+ * @param context machine context
+ */
+void md_executionstate_read(executionstate_t* es, void* context)
+{
+       ucontext_t* _uc;
+       mcontext_t* _mc;
+       greg_t*     _gregs;
+       int         i;
 
-   Search the critical sections tree for a matching section and set
-   the PC to the restart point, if necessary.
+       vm_abort("md_executionstate_read: PLEASE REVISE ME!");
 
-*******************************************************************************/
+       _uc = (ucontext_t*) context;
+       _mc = &_uc->uc_mcontext;
 
-#if defined(ENABLE_THREADS)
-void md_critical_section_restart(ucontext_t *_uc)
-{
-       mcontext_t *_mc;
-       u1         *pc;
-       u1         *npc;
+#if defined(__UCLIBC__)
+       _gregs = _mc->gpregs;
+#else  
+       _gregs = _mc->gregs;
+#endif
 
-       _mc = &_uc->uc_mcontext;
+       /* Read special registers. */
+
+       /* In glibc's ucontext.h the registers are defined as long long,
+          even for MIPS32, so we cast them.  This is not the case for
+          uClibc. */
 
 #if defined(__UCLIBC__)
-       pc = (u1 *) (ptrint) _mc->gpregs[CTX_EPC];
+       es->pc = _gregs[CTX_EPC];
 #else
-       pc = (u1 *) (ptrint) _mc->pc;
+       es->pc = (void*) (uintptr_t) _mc->pc;
 #endif
 
-       npc = critical_find_restart_point(pc);
+       es->sp = (void*) (uintptr_t) _gregs[REG_SP];
+       es->pv = (void*) (uintptr_t) _gregs[REG_PV];
+       es->ra = (void*) (uintptr_t) _gregs[REG_RA];
+
+       /* Read integer registers. */
+
+       for (i = 0; i < INT_REG_CNT; i++)
+               es->intregs[i] = _gregs[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.fp_r) == sizeof(es->fltregs));
+       os_memcpy(&es->fltregs, &_mc->fpregs.fp_r, sizeof(_mc->fpregs.fp_r));
+}
+
+
+/**
+ * Write the given executionstate back to the context.
+ *
+ * @param es      execution state
+ * @param context machine context
+ */
+void md_executionstate_write(executionstate_t* es, void* context)
+{
+       ucontext_t* _uc;
+       mcontext_t* _mc;
+       greg_t*     _gregs;
+       int         i;
+
+       vm_abort("md_executionstate_write: PLEASE REVISE ME!");
+
+       _uc = (ucontext_t *) context;
+       _mc = &_uc->uc_mcontext;
+
+       /* Write integer registers. */
+
+       for (i = 0; i < INT_REG_CNT; i++)
+               _gregs[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.fp_r) == sizeof(es->fltregs));
+       os_memcpy(&_mc->fpregs.fp_r, &es->fltregs, sizeof(_mc->fpregs.fp_r));
+
+       /* Write special registers. */
 
-       if (npc != NULL) {
 #if defined(__UCLIBC__)
-               _mc->gpregs[CTX_EPC] = (ptrint) npc;
+       _gregs[CTX_EPC] = es->pc;
 #else
-               _mc->pc              = (ptrint) npc;
+       _mc->pc         = (uintptr_t) es->pc;
 #endif
-       }
+
+       _gregs[REG_SP]  = (uintptr_t) es->sp;
+       _gregs[REG_PV]  = (uintptr_t) es->pv;
+       _gregs[REG_RA]  = (uintptr_t) es->ra;
 }
-#endif
 
 
 /*