* src/vm/jit/code.c (code_find_codeinfo_for_pc): Use void* instead of

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

diff --git a/src/vm/jit/x86_64/linux/md-os.c b/src/vm/jit/x86_64/linux/md-os.c
index da050b8da316734fb7534fa2439b66bd501ec306..78e9dde4b36bf2997c7a8096f8ef5606b004d662 100644 (file)
--- a/src/vm/jit/x86_64/linux/md-os.c
+++ b/src/vm/jit/x86_64/linux/md-os.c
@@ -37,11 +37,13 @@
 #include "vm/types.h"
 
 #include "vm/jit/x86_64/codegen.h"
+#include "vm/jit/x86_64/md.h"
 
 #if defined(ENABLE_THREADS)
 # include "threads/native/threads.h"
 #endif
 
+#include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/signallocal.h"
 
@@ -59,6 +61,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
        ucontext_t     *_uc;
        mcontext_t     *_mc;
+       void           *pv;
        u1             *sp;
        u1             *ra;
        u1             *xpc;
@@ -70,7 +73,7 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        int             type;
        intptr_t        val;
        void           *p;
-       java_handle_t  *o;
+       java_object_t  *o;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
@@ -78,9 +81,10 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        /* ATTENTION: Don't use CACAO's internal REG_* defines as they are
           different to the ones in <ucontext.h>. */
 
+       pv  = NULL;                 /* is resolved during stackframeinfo creation */
        sp  = (u1 *) _mc->gregs[REG_RSP];
        xpc = (u1 *) _mc->gregs[REG_RIP];
-       ra  = xpc;                          /* return address is equal to xpc     */
+       ra  = xpc;                              /* return address is equal to XPC */
 
 #if 0
        /* check for StackOverflowException */
@@ -152,14 +156,23 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
                val = _mc->gregs[d];
 
                if (type == EXCEPTION_HARDWARE_COMPILER) {
+                       /* The PV from the compiler stub is equal to the XPC. */
+
+                       pv = xpc;
+
                        /* 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. */
+                       /* Skip the RA on the stack. */
 
                        sp = sp + 1 * SIZEOF_VOID_P;
+
+                       /* The XPC is the RA minus 1, because the RA points to the
+                          instruction after the call. */
+
+                       xpc = ra - 3;
                }
        }
        else {
@@ -171,21 +184,18 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
        /* Handle the type. */
 
-       p = signal_handle(type, val, NULL, sp, ra, xpc, _p);
+       p = signal_handle(type, val, pv, sp, ra, xpc, _p);
 
        /* Set registers. */
 
        if (type == EXCEPTION_HARDWARE_COMPILER) {
                if (p == NULL) {
-                       o = exceptions_get_and_clear_exception();
-
-                       log_println("compiler exception");
-                       ra = ra - 3;                     /* XPC is before the actual call */
+                       o = builtin_retrieve_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_R10] = (uintptr_t) xpc;           /* REG_ITMP2_XPC */
                        _mc->gregs[REG_RIP] = (uintptr_t) asm_handle_exception;
                }
                else {
@@ -372,7 +382,7 @@ void md_replace_executionstate_read(executionstate_t *es, void *context)
        _mc = &_uc->uc_mcontext;
 
        /* read special registers */
-       es->pc = (u1 *) _mc->gregs[REG_RSP];
+       es->pc = (u1 *) _mc->gregs[REG_RIP];
        es->sp = (u1 *) _mc->gregs[REG_RSP];
        es->pv = NULL;