* src/vm/jit/linenumbertable.c (linenumbertable_create, linenumbertable_linenumber_fo...

[cacao.git] / src / vm / jit / s390 / md.c

diff --git a/src/vm/jit/s390/md.c b/src/vm/jit/s390/md.c
index 626f382349d2a094da487cd131ea13722a6b67f8..1371bc1ccc9847ba207e6f031e54856bb1bf4f6e 100644 (file)
--- a/src/vm/jit/s390/md.c
+++ b/src/vm/jit/s390/md.c
@@ -244,6 +244,8 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
                        /* The return address in is REG_RA */
 
                        ra = (u1 *)_mc->gregs[REG_RA];
+
+                       xpc = ra - 2;
                }
 
                /* Handle the type. */
@@ -253,7 +255,8 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
                if (EXCEPTION_HARDWARE_COMPILER == type) {
                        if (NULL == p) {
                                _mc->gregs[REG_ITMP3_XPTR] = (intptr_t) builtin_retrieve_exception();
-                               _mc->gregs[REG_ITMP1_XPC]  = (intptr_t) xpc;
+                               _mc->gregs[REG_ITMP1_XPC]  = (intptr_t) ra - 2;
+                               _mc->gregs[REG_PV]         = (intptr_t) md_codegen_get_pv_from_pc(ra);
                                _mc->psw.addr              = (intptr_t) asm_handle_exception;
                        } else {
                                _mc->gregs[REG_PV]         = (intptr_t) p;
@@ -679,7 +682,7 @@ void md_handle_exception(int32_t *regs, int64_t *fregs, int32_t *out) {
 
                        /* new xpc is call before return address */
 
-                       xpc = ra;
+                       xpc = ra - 2;
 
                } else {
                        xpc = handler;