* New, simpler stacktrace system (should be final version)

[cacao.git] / src / vm / jit / powerpc / darwin / md-os.c

diff --git a/src/vm/jit/powerpc/darwin/md-os.c b/src/vm/jit/powerpc/darwin/md-os.c
index 195f2a6cd18ef00aa3711186afa27c79ddbf862c..58b02579cb0e6b3532d275f30d420348821b020c 100644 (file)
--- a/src/vm/jit/powerpc/darwin/md-os.c
+++ b/src/vm/jit/powerpc/darwin/md-os.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: md-os.c 2962 2005-07-09 18:08:06Z twisti $
+   $Id: md-os.c 2998 2005-07-12 09:16:53Z twisti $
 
 */
 
@@ -45,71 +45,7 @@
 #include "vm/global.h"
 #include "vm/stringlocal.h"
 #include "vm/jit/asmpart.h"
-
-
-#if 0
-/* cacao_catch_Handler *********************************************************
-
-   XXX
-
-*******************************************************************************/
-
-int cacao_catch_Handler(mach_port_t thread)
-{
-#if defined(USE_THREADS)
-       unsigned int *regs;
-       unsigned int crashpc;
-       s4 instr, reg;
-/*     java_objectheader *xptr; */
-
-       /* Mach stuff */
-       thread_state_flavor_t flavor = PPC_THREAD_STATE;
-       mach_msg_type_number_t thread_state_count = PPC_THREAD_STATE_COUNT;
-       ppc_thread_state_t thread_state;
-       kern_return_t r;
-       
-       if (checknull)
-               return 0;
-
-       r = thread_get_state(thread, flavor,
-               (natural_t*)&thread_state, &thread_state_count);
-       if (r != KERN_SUCCESS) {
-               log_text("thread_get_state failed");
-               assert(0);
-       }
-
-       regs = &thread_state.r0;
-       crashpc = thread_state.srr0;
-
-       instr = *(s4*) crashpc;
-       reg = (instr >> 16) & 31;
-
-       if (!regs[reg]) {
-/*      This is now handled in asmpart because it needs to run in the throwing
- *      thread */
-/*             xptr = new_nullpointerexception(); */
-
-               regs[REG_ITMP2_XPC] = crashpc;
-/*             regs[REG_ITMP1_XPTR] = (u4) xptr; */
-               thread_state.srr0 = (u4) asm_handle_nullptr_exception;
-
-               r = thread_set_state(thread, flavor,
-                       (natural_t*)&thread_state, thread_state_count);
-               if (r != KERN_SUCCESS) {
-                       log_text("thread_set_state failed");
-                       assert(0);
-               }
-
-               return 1;
-       }
-
-       throw_cacao_exception_exit(string_java_lang_InternalError,
-                                  "Segmentation fault at %p", regs[reg]);
-#endif
-
-       return 0;
-}
-#endif
+#include "vm/jit/stacktrace.h"
 
 
 /* signal_handler_sigsegv ******************************************************
@@ -127,10 +63,10 @@ void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        u4                  instr;
        s4                  reg;
        ptrint              addr;
-       stackframeinfo     *sfi;
        u1                 *pv;
        u1                 *sp;
        functionptr         ra;
+       functionptr         xpc;
 
        _uc = (ucontext_t *) _p;
        _mc = _uc->uc_mcontext;
@@ -145,27 +81,14 @@ void signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
        addr = gregs[reg];
 
        if (addr == 0) {
-               /* allocate stackframeinfo on heap */
-
-               sfi = NEW(stackframeinfo);
-
-               /* create exception */
-
                pv = (u1 *) _ss->r13;
                sp = (u1 *) _ss->r1;
-               ra = (functionptr) _ss->srr0;
-
-               stacktrace_create_inline_stackframeinfo(sfi, pv, sp, ra);
-
-               _ss->r11 = (ptrint) new_nullpointerexception();
-
-               stacktrace_remove_stackframeinfo(sfi);
-
-               FREE(sfi, stackframeinfo);
+               ra = (functionptr) _ss->lr;              /* this is correct for leafs */
+               xpc = (functionptr) _ss->srr0;
 
-               /* set the REG_ITMP1_XPTR, REG_ITMP2_XPC and new PC */
+               _ss->r11 = (ptrint) stacktrace_hardware_nullpointerexception(pv, sp, ra, xpc);
 
-               _ss->r12 = _ss->srr0;
+               _ss->r12 = (ptrint) xpc;
                _ss->srr0 = (ptrint) asm_handle_exception;
 
        } else {