admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

add new function mrb_get_backtrace_at() to get backtrace at ci and pc

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-02-27 03:45:52 +09:00
parent 630a152093
commit 38e9ce21f8
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/error.h
+3
View File
@@ -13,5 +13,8 @@ mrb_value mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv);
mrb_value mrb_format(mrb_state *mrb, const char *format, ...); mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
void mrb_exc_print(mrb_state *mrb, struct RObject *exc); void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
void mrb_longjmp(mrb_state *mrb); void mrb_longjmp(mrb_state *mrb);
void mrb_print_backtrace(mrb_state *mrb);
mrb_value mrb_get_backtrace(mrb_state *mrb, mrb_value exc);
void mrb_get_backtrace_at(mrb_state *mrb, mrb_callinfo *ci, mrb_code *pc0);
#endif /* MRUBY_ERROR_H */ #endif /* MRUBY_ERROR_H */
src/backtrace.c
+24 -6
View File
@@ -57,14 +57,12 @@ get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...
} }
static void static void
mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func func, void *stream) output_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, output_stream_func func, void *stream)
{ {
mrb_callinfo *ci; mrb_callinfo *ci;
mrb_int ciidx;
const char *filename, *method, *sep; const char *filename, *method, *sep;
int i, lineno, tracehead = 1; int i, lineno, tracehead = 1;
ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx")));
if (ciidx >= mrb->c->ciend - mrb->c->cibase) if (ciidx >= mrb->c->ciend - mrb->c->cibase)
ciidx = 10; /* ciidx is broken... */ ciidx = 10; /* ciidx is broken... */
@@ -87,7 +85,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
pc = mrb->c->cibase[i+1].pc - 1; pc = mrb->c->cibase[i+1].pc - 1;
} }
else { else {
pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "lastpc"))); pc = pc0;
} }
filename = mrb_debug_get_filename(irep, pc - irep->iseq); filename = mrb_debug_get_filename(irep, pc - irep->iseq);
lineno = mrb_debug_get_line(irep, pc - irep->iseq); lineno = mrb_debug_get_line(irep, pc - irep->iseq);
@@ -129,6 +127,14 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
} }
} }
static void
exc_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func func, void *stream)
{
output_backtrace(mrb, mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "ciidx"))),
(mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern_lit(mrb, "lastpc"))),
func, stream);
}
/* mrb_print_backtrace/mrb_get_backtrace: /* mrb_print_backtrace/mrb_get_backtrace:
function to retrieve backtrace information from the exception. function to retrieve backtrace information from the exception.
@@ -140,7 +146,7 @@ void
mrb_print_backtrace(mrb_state *mrb) mrb_print_backtrace(mrb_state *mrb)
{ {
#ifdef ENABLE_STDIO #ifdef ENABLE_STDIO
mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, (void*)stderr); exc_output_backtrace(mrb, mrb->exc, print_backtrace_i, (void*)stderr);
#endif #endif
} }
@@ -150,7 +156,19 @@ mrb_get_backtrace(mrb_state *mrb, mrb_value self)
mrb_value ary; mrb_value ary;
ary = mrb_ary_new(mrb); ary = mrb_ary_new(mrb);
mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, (void*)mrb_ary_ptr(ary)); exc_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, (void*)mrb_ary_ptr(ary));
return ary;
}
mrb_value
mrb_get_backtrace_at(mrb_state *mrb, mrb_callinfo *ci, mrb_code *pc)
{
mrb_value ary;
mrb_int ciidx = ci - mrb->c->cibase;
ary = mrb_ary_new(mrb);
output_backtrace(mrb, ciidx, pc, get_backtrace_i, (void*)mrb_ary_ptr(ary));
return ary; return ary;
} }