projects / cacao.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged branch subtype-trunk into default.
[cacao.git] / src / vm / jit / i386 / darwin / md-os.c
diff --git a/src/vm/jit/i386/darwin/md-os.c b/src/vm/jit/i386/darwin/md-os.c
index fda50b1e54eb3a86d85943c72943ac6656d7ddc3..b9f3afd9de575a9b1697f2dc96553ee273ff33eb 100644 (file)
--- a/src/vm/jit/i386/darwin/md-os.c
+++ b/src/vm/jit/i386/darwin/md-os.c
@@ -35,16 +35,15 @@
 #include "vm/jit/i386/codegen.h"
 #include "vm/jit/i386/md.h"
 
-#include "threads/thread.h"
+#include "threads/thread.hpp"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 #include "vm/global.h"
-#include "vm/signallocal.h"
-#include "vm/stringlocal.h"
+#include "vm/signallocal.hpp"
 
 #include "vm/jit/asmpart.h"
 #include "vm/jit/executionstate.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/stacktrace.hpp"
 #include "vm/jit/trap.h"
 
 #include "vm/jit/i386/codegen.h"
@@ -73,15 +72,14 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        intptr_t             val;
        int                  type;
        void                *p;
-       java_object_t       *o;
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
        pv  = NULL;                 /* is resolved during stackframeinfo creation */
-       sp  = (u1 *) _ss->esp;
-       xpc = (u1 *) _ss->eip;
+       sp  = (u1 *) _ss->__esp;
+       xpc = (u1 *) _ss->__eip;
        ra  = xpc;                              /* return address is equal to XPC */
 
        /* get exception-throwing instruction */
@@ -102,13 +100,13 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
 
                type = disp;
 
-               val = (d == 0) ? _ss->eax :
-                       ((d == 1) ? _ss->ecx :
-                       ((d == 2) ? _ss->edx :
-                       ((d == 3) ? _ss->ebx :
-                       ((d == 4) ? _ss->esp :
-                       ((d == 5) ? _ss->ebp :
-                       ((d == 6) ? _ss->esi : _ss->edi))))));
+               val = (d == 0) ? _ss->__eax :
+                       ((d == 1) ? _ss->__ecx :
+                       ((d == 2) ? _ss->__edx :
+                       ((d == 3) ? _ss->__ebx :
+                       ((d == 4) ? _ss->__esp :
+                       ((d == 5) ? _ss->__ebp :
+                       ((d == 6) ? _ss->__esi : _ss->__edi))))));
 
                if (type == TRAP_COMPILER) {
                        /* The PV from the compiler stub is equal to the XPC. */
@@ -143,23 +141,9 @@ void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        /* Set registers. */
 
        if (type == TRAP_COMPILER) {
-               if (p == NULL) { 
-                       o = builtin_retrieve_exception();
-
-                       _ss->esp = (uintptr_t) sp;    /* Remove RA from stack. */
-
-                       _ss->eax = (uintptr_t) o;
-                       _ss->ecx = (uintptr_t) xpc;            /* REG_ITMP2_XPC */
-                       _ss->eip = (uintptr_t) asm_handle_exception;
+               if (p == NULL) {
+                       _ss->__esp = (uintptr_t) sp;  /* Remove RA from stack. */
                }
-               else {
-                       _ss->eip = (uintptr_t) p;
-               }
-       }
-       else {
-               _ss->eax = (uintptr_t) p;
-               _ss->ecx = (uintptr_t) xpc;            /* REG_ITMP2_XPC */
-               _ss->eip = (uintptr_t) asm_handle_exception;
        }
 }
 
@@ -182,16 +166,15 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
        u1                  *xpc;
        int                  type;
        intptr_t             val;
-       void                *p;
 
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
        pv  = NULL;                 /* is resolved during stackframeinfo creation */
-       sp  = (u1 *) _ss->esp;
-       xpc = (u1 *) _ss->eip;
+       sp  = (u1 *) _ss->__esp;
+       xpc = (u1 *) _ss->__eip;
        ra  = xpc;                          /* return address is equal to xpc     */
 
        /* This is an ArithmeticException */
@@ -201,13 +184,7 @@ void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
 
        /* Handle the trap. */
 
-       p = trap_handle(type, val, pv, sp, ra, xpc, _p);
-
-       /* Set registers. */
-
-       _ss->eax = (uintptr_t) p;
-       _ss->ecx = (uintptr_t) xpc;            /* REG_ITMP2_XPC */
-       _ss->eip = (uintptr_t) asm_handle_exception;
+       trap_handle(type, val, pv, sp, ra, xpc, _p);
 }
 
 
@@ -229,9 +206,9 @@ void md_signal_handler_sigusr2(int sig, siginfo_t *siginfo, void *_p)
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
-       pc = (u1 *) _ss->eip;
+       pc = (u1 *) _ss->__eip;
 
        t->pc = pc;
 }
@@ -254,16 +231,15 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
        u1                  *xpc;
        int                  type;
        intptr_t             val;
-       void                *p;
 
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
        pv  = NULL;                 /* is resolved during stackframeinfo creation */
-       sp  = (u1 *) _ss->esp;
-       xpc = (u1 *) _ss->eip;
+       sp  = (u1 *) _ss->__esp;
+       xpc = (u1 *) _ss->__eip;
        ra  = xpc;                          /* return address is equal to xpc     */
 
        type = TRAP_PATCHER;
@@ -271,15 +247,7 @@ void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
 
        /* Handle the trap. */
 
-       p = trap_handle(type, val, pv, sp, ra, xpc, _p);
-
-       /* Set registers. */
-
-       if (p != NULL) {
-               _ss->eax = (uintptr_t) p;
-               _ss->ecx = (uintptr_t) xpc;            /* REG_ITMP2_XPC */
-               _ss->eip = (uintptr_t) asm_handle_exception;
-       }
+       trap_handle(type, val, pv, sp, ra, xpc, _p);
 }
 
 /* md_executionstate_read ******************************************************
@@ -297,22 +265,22 @@ void md_executionstate_read(executionstate_t *es, void *context)
 
        _uc = (ucontext_t *) context;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
        /* read special registers */
-       es->pc = (u1 *) _ss->eip;
-       es->sp = (u1 *) _ss->esp;
+       es->pc = (u1 *) _ss->__eip;
+       es->sp = (u1 *) _ss->__esp;
        es->pv = NULL;                   /* pv must be looked up via AVL tree */
 
        /* read integer registers */
        for (i = 0; i < INT_REG_CNT; i++)
-               es->intregs[i] = (i == 0) ? _ss->eax :
-                       ((i == 1) ? _ss->ecx :
-                       ((i == 2) ? _ss->edx :
-                       ((i == 3) ? _ss->ebx :
-                       ((i == 4) ? _ss->esp :
-                       ((i == 5) ? _ss->ebp :
-                       ((i == 6) ? _ss->esi : _ss->edi))))));
+               es->intregs[i] = (i == 0) ? _ss->__eax :
+                       ((i == 1) ? _ss->__ecx :
+                       ((i == 2) ? _ss->__edx :
+                       ((i == 3) ? _ss->__ebx :
+                       ((i == 4) ? _ss->__esp :
+                       ((i == 5) ? _ss->__ebp :
+                       ((i == 6) ? _ss->__esi : _ss->__edi))))));
 
        /* read float registers */
        for (i = 0; i < FLT_REG_CNT; i++)
@@ -335,50 +303,22 @@ void md_executionstate_write(executionstate_t *es, void *context)
 
        _uc = (ucontext_t *) context;
        _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
+       _ss = &_mc->__ss;
 
        /* write integer registers */
        for (i = 0; i < INT_REG_CNT; i++)
-               *((i == 0) ? &_ss->eax :
-                 ((i == 1) ? &_ss->ecx :
-                 ((i == 2) ? &_ss->edx :
-                 ((i == 3) ? &_ss->ebx :
-                 ((i == 4) ? &_ss->esp :
-                 ((i == 5) ? &_ss->ebp :
-                 ((i == 6) ? &_ss->esi : &_ss->edi))))))) = es->intregs[i];
+               *((i == 0) ? &_ss->__eax :
+                ((i == 1) ? &_ss->__ecx :
+                ((i == 2) ? &_ss->__edx :
+                ((i == 3) ? &_ss->__ebx :
+                ((i == 4) ? &_ss->__esp :
+                ((i == 5) ? &_ss->__ebp :
+                ((i == 6) ? &_ss->__esi : &_ss->__edi))))))) = es->intregs[i];
 
        /* write special registers */
-       _ss->eip = (ptrint) es->pc;
-       _ss->esp = (ptrint) es->sp;
-}
-
-
-/* md_critical_section_restart *************************************************
-
-   Search the critical sections tree for a matching section and set
-   the PC to the restart point, if necessary.
-
-*******************************************************************************/
-
-#if defined(ENABLE_THREADS)
-void thread_restartcriticalsection(ucontext_t *_uc)
-{
-       mcontext_t           _mc;
-       i386_thread_state_t *_ss;
-       u1                  *pc;
-       void                *rpc;
-
-       _mc = _uc->uc_mcontext;
-       _ss = &_mc->ss;
-
-       pc = (u1 *) _ss->eip;
-
-       rpc = critical_find_restart_point(pc);
-
-       if (rpc != NULL)
-               _ss->eip = (ptrint) rpc;
+       _ss->__eip = (ptrint) es->pc;
+       _ss->__esp = (ptrint) es->sp;
 }
-#endif
 
 
 /*
inofficial http://www.cacaojvm.org/ git mirror