* src/vm/jit/x86_64/linux/md-os.c (md_signal_handler_sigsegv): Removed
[cacao.git] / src / vm / jit / x86_64 / linux / md-os.c
index 69a9b2b47baace592d7ca116aa06eb9b4e77b1b5..a814540e73701878e9283f7235a21d92652ae512 100644 (file)
@@ -57,7 +57,6 @@
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo  sfi;
        ucontext_t     *_uc;
        mcontext_t     *_mc;
        u1             *sp;
@@ -71,6 +70,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        int             type;
        intptr_t        val;
        void           *p;
+       java_handle_t  *o;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
@@ -150,6 +150,17 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                }
 
                val = _mc->gregs[d];
+
+               if (type == EXCEPTION_HARDWARE_COMPILER) {
+                       /* We use a framesize of zero here because the call pushed
+                          the return addres onto the stack. */
+
+                       ra = md_stacktrace_get_returnaddress(sp, 0);
+
+                       /* And remove the RA from the stack. */
+
+                       sp = sp + 1 * SIZEOF_VOID_P;
+               }
        }
        else {
                /* this was a normal NPE */
@@ -158,23 +169,33 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                val  = 0;
        }
 
-       /* create stackframeinfo */
-
-       stacktrace_create_extern_stackframeinfo(&sfi, NULL, sp, ra, xpc);
-
        /* Handle the type. */
 
-       p = signal_handle(xpc, type, val);
+       p = signal_handle(type, val, NULL, sp, ra, xpc, _p);
 
-       /* remove stackframeinfo */
+       /* Set registers. */
 
-       stacktrace_remove_stackframeinfo(&sfi);
+       if (type == EXCEPTION_HARDWARE_COMPILER) {
+               if (p == NULL) {
+                       o = exceptions_get_and_clear_exception();
 
-       /* set registers */
+                       ra = ra - 3;                     /* XPC is before the actual call */
 
-       _mc->gregs[REG_RAX] = (intptr_t) p;
-       _mc->gregs[REG_R10] = (intptr_t) xpc;                    /* REG_ITMP2_XPC */
-       _mc->gregs[REG_RIP] = (intptr_t) asm_handle_exception;
+                       _mc->gregs[REG_RSP] = (uintptr_t) sp;    /* Remove RA from stack. */
+
+                       _mc->gregs[REG_RAX] = (uintptr_t) o;
+                       _mc->gregs[REG_R10] = (uintptr_t) ra;            /* REG_ITMP2_XPC */
+                       _mc->gregs[REG_RIP] = (uintptr_t) asm_handle_exception;
+               }
+               else {
+                       _mc->gregs[REG_RIP] = (uintptr_t) p;
+               }
+       }
+       else {
+               _mc->gregs[REG_RAX] = (uintptr_t) p;
+               _mc->gregs[REG_R10] = (uintptr_t) xpc;               /* REG_ITMP2_XPC */
+               _mc->gregs[REG_RIP] = (uintptr_t) asm_handle_exception;
+       }
 }
 
 
@@ -187,7 +208,6 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
 void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
 {
-       stackframeinfo  sfi;
        ucontext_t     *_uc;
        mcontext_t     *_mc;
        u1             *pv;
@@ -214,17 +234,9 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
        type = EXCEPTION_HARDWARE_ARITHMETIC;
        val  = 0;
 
-       /* create stackframeinfo */
-
-       stacktrace_create_extern_stackframeinfo(&sfi, pv, sp, ra, xpc);
-
        /* Handle the type. */
 
-       p = signal_handle(xpc, type, val);
-
-       /* remove stackframeinfo */
-
-       stacktrace_remove_stackframeinfo(&sfi);
+       p = signal_handle(type, val, pv, sp, ra, xpc, _p);
 
        /* set registers */
 
@@ -234,6 +246,54 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
 }
 
 
+/* md_signal_handler_sigill ****************************************************
+
+   Signal handler for patchers.
+
+*******************************************************************************/
+
+void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
+{
+       ucontext_t     *_uc;
+       mcontext_t     *_mc;
+       u1             *pv;
+       u1             *sp;
+       u1             *ra;
+       u1             *xpc;
+       int             type;
+       intptr_t        val;
+       void           *p;
+
+       _uc = (ucontext_t *) _p;
+       _mc = &_uc->uc_mcontext;
+
+       /* ATTENTION: Don't use CACAO's internal REG_* defines as they are
+          different to the ones in <ucontext.h>. */
+
+       pv  = NULL;
+       sp  = (u1 *) _mc->gregs[REG_RSP];
+       xpc = (u1 *) _mc->gregs[REG_RIP];
+       ra  = xpc;                          /* return address is equal to xpc     */
+
+       /* This is a patcher. */
+
+       type = EXCEPTION_HARDWARE_PATCHER;
+       val  = 0;
+
+       /* Handle the type. */
+
+       p = signal_handle(type, val, pv, sp, ra, xpc, _p);
+
+       /* set registers */
+
+       if (p != NULL) {
+               _mc->gregs[REG_RAX] = (intptr_t) p;
+               _mc->gregs[REG_R10] = (intptr_t) xpc;                /* REG_ITMP2_XPC */
+               _mc->gregs[REG_RIP] = (intptr_t) asm_handle_exception;
+       }
+}
+
+
 /* md_signal_handler_sigusr1 ***************************************************
 
    Signal handler for suspending threads.
@@ -293,6 +353,147 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 #endif
 
 
+/* md_replace_executionstate_read **********************************************
+
+   Read the given context into an executionstate for Replacement.
+
+*******************************************************************************/
+
+#if defined(ENABLE_REPLACEMENT)
+void md_replace_executionstate_read(executionstate_t *es, void *context)
+{
+       ucontext_t *_uc;
+       mcontext_t *_mc;
+       s4          i;
+       s4          d;
+
+       _uc = (ucontext_t *) context;
+       _mc = &_uc->uc_mcontext;
+
+       /* read special registers */
+       es->pc = (u1 *) _mc->gregs[REG_RSP];
+       es->sp = (u1 *) _mc->gregs[REG_RSP];
+       es->pv = NULL;
+
+       /* read integer registers */
+       for (i = 0; i < INT_REG_CNT; i++) {
+               /* XXX FIX ME! */
+
+               switch (i) {
+               case 0:  /* REG_RAX == 13 */
+                       d = REG_RAX;
+                       break;
+               case 1:  /* REG_RCX == 14 */
+                       d = REG_RCX;
+                       break;
+               case 2:  /* REG_RDX == 12 */
+                       d = REG_RDX;
+                       break;
+               case 3:  /* REG_RBX == 11 */
+                       d = REG_RBX;
+                       break;
+               case 4:  /* REG_RSP == 15 */
+                       d = REG_RSP;
+                       break;
+               case 5:  /* REG_RBP == 10 */
+                       d = REG_RBP;
+                       break;
+               case 6:  /* REG_RSI == 9  */
+                       d = REG_RSI;
+                       break;
+               case 7:  /* REG_RDI == 8  */
+                       d = REG_RDI;
+                       break;
+               case 8:  /* REG_R8  == 0  */
+               case 9:  /* REG_R9  == 1  */
+               case 10: /* REG_R10 == 2  */
+               case 11: /* REG_R11 == 3  */
+               case 12: /* REG_R12 == 4  */
+               case 13: /* REG_R13 == 5  */
+               case 14: /* REG_R14 == 6  */
+               case 15: /* REG_R15 == 7  */
+                       d = i - 8;
+                       break;
+               }
+
+               es->intregs[i] = _mc->gregs[d];
+       }
+
+       /* read float registers */
+       for (i = 0; i < FLT_REG_CNT; i++)
+               es->fltregs[i] = 0xdeadbeefdeadbeefL;
+}
+#endif
+
+
+/* md_replace_executionstate_write *********************************************
+
+   Write the given executionstate back to the context for Replacement.
+
+*******************************************************************************/
+
+#if defined(ENABLE_REPLACEMENT)
+void md_replace_executionstate_write(executionstate_t *es, void *context)
+{
+       ucontext_t *_uc;
+       mcontext_t *_mc;
+       s4          i;
+       s4          d;
+
+       _uc = (ucontext_t *) context;
+       _mc = &_uc->uc_mcontext;
+
+       /* write integer registers */
+       for (i = 0; i < INT_REG_CNT; i++) {
+               /* XXX FIX ME! */
+
+               switch (i) {
+               case 0:  /* REG_RAX == 13 */
+                       d = REG_RAX;
+                       break;
+               case 1:  /* REG_RCX == 14 */
+                       d = REG_RCX;
+                       break;
+               case 2:  /* REG_RDX == 12 */
+                       d = REG_RDX;
+                       break;
+               case 3:  /* REG_RBX == 11 */
+                       d = REG_RBX;
+                       break;
+               case 4:  /* REG_RSP == 15 */
+                       d = REG_RSP;
+                       break;
+               case 5:  /* REG_RBP == 10 */
+                       d = REG_RBP;
+                       break;
+               case 6:  /* REG_RSI == 9  */
+                       d = REG_RSI;
+                       break;
+               case 7:  /* REG_RDI == 8  */
+                       d = REG_RDI;
+                       break;
+               case 8:  /* REG_R8  == 0  */
+               case 9:  /* REG_R9  == 1  */
+               case 10: /* REG_R10 == 2  */
+               case 11: /* REG_R11 == 3  */
+               case 12: /* REG_R12 == 4  */
+               case 13: /* REG_R13 == 5  */
+               case 14: /* REG_R14 == 6  */
+               case 15: /* REG_R15 == 7  */
+                       d = i - 8;
+                       break;
+               }
+
+               _mc->gregs[d] = es->intregs[i];
+       }
+
+       /* write special registers */
+       _mc->gregs[REG_RIP] = (ptrint) es->pc;
+       _mc->gregs[REG_RSP] = (ptrint) es->sp;
+}
+#endif
+
+
 /* md_critical_section_restart *************************************************
 
    Search the critical sections tree for a matching section and set