* Merged in twisti-branch.

[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 298c8586676ca654ec7401603a570c735c16cfd9..c8ec58b42ea59aa505851de338839cb9ff30be89 100644 (file)
--- a/src/vm/jit/x86_64/linux/md-os.c
+++ b/src/vm/jit/x86_64/linux/md-os.c
@@ -35,10 +35,15 @@
 #include <stdlib.h>
 #include <ucontext.h>
 
+#include "vm/types.h"
+
+#include "vm/jit/x86_64/codegen.h"
+
 #if defined(ENABLE_THREADS)
 # include "threads/native/threads.h"
 #endif
 
+#include "vm/exceptions.h"
 #include "vm/signallocal.h"
 
 #include "vm/jit/asmpart.h"
@@ -47,18 +52,25 @@
 
 /* md_signal_handler_sigsegv ***************************************************
 
-   NullPointerException signal handler for hardware null pointer
-   check.
+   Signal handler for hardware exception.
 
 *******************************************************************************/
 
 void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 {
-       ucontext_t *_uc;
-       mcontext_t *_mc;
-       u1         *sp;
-       u1         *ra;
-       u1         *xpc;
+       ucontext_t        *_uc;
+       mcontext_t        *_mc;
+       u1                *sp;
+       u1                *ra;
+       u1                *xpc;
+       u1                 opc;
+       u1                 mod;
+       u1                 rm;
+       s4                 d;
+       s4                 disp;
+       ptrint             val;
+       s4                 type;
+       java_objectheader *o;
 
        _uc = (ucontext_t *) _p;
        _mc = &_uc->uc_mcontext;
@@ -76,9 +88,82 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        threads_check_stackoverflow(sp);
 #endif
 
-       _mc->gregs[REG_RAX] =
-               (ptrint) stacktrace_hardware_nullpointerexception(NULL, sp, ra, xpc);
-
+       /* get exception-throwing instruction */
+
+       opc = M_ALD_MEM_GET_OPC(xpc);
+       mod = M_ALD_MEM_GET_MOD(xpc);
+       rm  = M_ALD_MEM_GET_RM(xpc);
+
+       /* for values see emit_mov_mem_reg and emit_mem */
+
+       if ((opc == 0x8b) && (mod == 0) && (rm == 4)) {
+               /* this was a hardware-exception */
+
+               d    = M_ALD_MEM_GET_REG(xpc);
+               disp = M_ALD_MEM_GET_DISP(xpc);
+
+               /* we use the exception type as load displacement */
+
+               type = disp;
+
+               /* XXX FIX ME! */
+
+               /* ATTENTION: The _mc->gregs layout is even worse than on
+                  i386! See /usr/include/sys/ucontext.h.  We need a
+                  switch-case here... */
+
+               switch (d) {
+               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 = d - 8;
+                       break;
+               }
+
+               val = _mc->gregs[d];
+       }
+       else {
+               /* this was a normal NPE */
+
+               type = EXCEPTION_HARDWARE_NULLPOINTER;
+       }
+
+       /* generate appropriate exception */
+
+       o = exceptions_new_hardware_exception(NULL, sp, ra, xpc, type, val);
+
+       /* set registers */
+
+       _mc->gregs[REG_RAX] = (ptrint) o;
        _mc->gregs[REG_R10] = (ptrint) xpc;                      /* REG_ITMP2_XPC */
        _mc->gregs[REG_RIP] = (ptrint) asm_handle_exception;
 }