diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | vm_dump.c | 55 |
3 files changed, 68 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Mon Mar 18 13:29:52 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * vm_dump.c (backtrace): on darwin use custom backtrace() to trace + beyond _sigtramp. darwin's backtrace can't trace beyond signal + trampoline with sigaltstack. + + * configure.in: check execinfo.h on darwin. + Mon Mar 18 11:03:23 2013 NARUSE, Yui <naruse@ruby-lang.org> * vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by diff --git a/configure.in b/configure.in index febcbe0832..40717dd8e6 100644 --- a/configure.in +++ b/configure.in @@ -2460,6 +2460,11 @@ AC_ARG_WITH(opt-dir, ]) AS_CASE(["$target_cpu-$target_os"], +[*-darwin*], [ + AC_CHECK_HEADERS([execinfo.h]) + if test "x$ac_cv_header_execinfo_h" = xyes; then + AC_CHECK_LIB([execinfo], [backtrace]) + fi], [*-freebsd*|x86_64-netbsd*], [ AC_CHECK_HEADERS([execinfo.h]) if test "x$ac_cv_header_execinfo_h" = xyes; then @@ -428,6 +428,61 @@ rb_vmdebug_thread_dump_state(VALUE self) # if HAVE_LIBUNWIND # undef backtrace # define backtrace unw_backtrace +# elif defined(__APPLE__) && defined(__x86_64__) +# define UNW_LOCAL_ONLY +# include <libunwind.h> +# undef backtrace +int backtrace (void **trace, int size) { + unw_cursor_t cursor; unw_context_t uc; + unw_word_t ip; + int n = 0; + + unw_getcontext(&uc); + unw_init_local(&cursor, &uc); + while (unw_step(&cursor) > 0) { + unw_get_reg(&cursor, UNW_REG_IP, &ip); + trace[n++] = (void *)ip; + { + char buf[256]; + unw_get_proc_name(&cursor, buf, 256, &ip); + if (strncmp("_sigtramp", buf, sizeof("_sigtramp")) == 0) { + goto darwin_sigtramp; + } + } + } + return n; +darwin_sigtramp: + { + ucontext_t *uctx; + unw_get_reg(&cursor, UNW_X86_64_RBX, &ip); + uctx = (ucontext_t *)ip; + unw_set_reg(&cursor, UNW_X86_64_RAX, uctx->uc_mcontext->__ss.__rax); + unw_set_reg(&cursor, UNW_X86_64_RBX, uctx->uc_mcontext->__ss.__rbx); + unw_set_reg(&cursor, UNW_X86_64_RCX, uctx->uc_mcontext->__ss.__rcx); + unw_set_reg(&cursor, UNW_X86_64_RDX, uctx->uc_mcontext->__ss.__rdx); + unw_set_reg(&cursor, UNW_X86_64_RDI, uctx->uc_mcontext->__ss.__rdi); + unw_set_reg(&cursor, UNW_X86_64_RSI, uctx->uc_mcontext->__ss.__rsi); + unw_set_reg(&cursor, UNW_X86_64_RBP, uctx->uc_mcontext->__ss.__rbp); + unw_set_reg(&cursor, UNW_X86_64_RSP, 8+(uctx->uc_mcontext->__ss.__rsp)); + unw_set_reg(&cursor, UNW_X86_64_R8, uctx->uc_mcontext->__ss.__r8); + unw_set_reg(&cursor, UNW_X86_64_R9, uctx->uc_mcontext->__ss.__r9); + unw_set_reg(&cursor, UNW_X86_64_R10, uctx->uc_mcontext->__ss.__r10); + unw_set_reg(&cursor, UNW_X86_64_R11, uctx->uc_mcontext->__ss.__r11); + unw_set_reg(&cursor, UNW_X86_64_R12, uctx->uc_mcontext->__ss.__r12); + unw_set_reg(&cursor, UNW_X86_64_R13, uctx->uc_mcontext->__ss.__r13); + unw_set_reg(&cursor, UNW_X86_64_R14, uctx->uc_mcontext->__ss.__r14); + unw_set_reg(&cursor, UNW_X86_64_R15, uctx->uc_mcontext->__ss.__r15); + ip = *(unw_word_t*)uctx->uc_mcontext->__ss.__rsp; + unw_set_reg(&cursor, UNW_REG_IP, ip); + trace[n++] = (void *)(unw_word_t)uctx->uc_mcontext->__ss.__rip; + trace[n++] = (void *)ip; + } + while (unw_step(&cursor) > 0) { + unw_get_reg(&cursor, UNW_REG_IP, &ip); + trace[n++] = (void *)ip; + } + return n; +} # elif defined(BROKEN_BACKTRACE) # undef HAVE_BACKTRACE # define HAVE_BACKTRACE 0 |