diff options
| author | Markus Metzger <markus.t.metzger@intel.com> | 2013-04-18 10:58:05 +0200 |
|---|---|---|
| committer | Markus Metzger <markus.t.metzger@intel.com> | 2014-01-16 13:03:41 +0100 |
| commit | 8710b7097e6564969c5e417007a438d8f4ab710e (patch) | |
| tree | 00b37f15730004fbe24fd7df0159c4f87ccc214c /gdb/record-btrace.c | |
| parent | d0fa75352b7ffd586499d28983bff5d714e5211a (diff) | |
| download | binutils-8710b7097e6564969c5e417007a438d8f4ab710e.zip binutils-8710b7097e6564969c5e417007a438d8f4ab710e.tar.gz binutils-8710b7097e6564969c5e417007a438d8f4ab710e.tar.bz2 | |
record-btrace: optionally indent function call history
Add a new modifier /c to the "record function-call-history" command to
indent the function name based on its depth in the call stack.
Also reorder the optional fields to have the indentation at the very beginning.
Prefix the insn range (/i modifier) with "inst ".
Prefix the source line (/l modifier) with "at ".
Change the range syntax from "begin-end" to "begin,end" to allow copy&paste to
the "record instruction-history" and "list" commands.
Adjust the respective tests and add new tests for the /c modifier.
2014-01-16 Markus Metzger <markus.t.metzger@intel.com>
* record.h (enum record_print_flag)
<record_print_indent_calls>: New.
* record.c (get_call_history_modifiers): Recognize /c modifier.
(_initialize_record): Document /c modifier.
* record-btrace.c (btrace_call_history): Add btinfo parameter.
Reorder fields. Optionally indent the function name. Update
all users.
* NEWS: Announce changes.
testsuite/
* gdb.btrace/function_call_history.exp: Fix expected field
order for "record function-call-history".
Add new tests for "record function-call-history /c".
* gdb.btrace/exception.cc: New.
* gdb.btrace/exception.exp: New.
* gdb.btrace/tailcall.exp: New.
* gdb.btrace/x86-tailcall.S: New.
* gdb.btrace/x86-tailcall.c: New.
* gdb.btrace/unknown_functions.c: New.
* gdb.btrace/unknown_functions.exp: New.
* gdb.btrace/Makefile.in (EXECUTABLES): Add new.
doc/
* gdb.texinfo (Process Record and Replay): Document new /c
modifier accepted by "record function-call-history".
Add /i modifier to "record function-call-history" example.
Diffstat (limited to 'gdb/record-btrace.c')
| -rw-r--r-- | gdb/record-btrace.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 97d38fc..c53acec 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -433,7 +433,7 @@ btrace_call_history_insn_range (struct ui_out *uiout, end = begin + size - 1; ui_out_field_uint (uiout, "insn begin", begin); - ui_out_text (uiout, "-"); + ui_out_text (uiout, ","); ui_out_field_uint (uiout, "insn end", end); } @@ -465,7 +465,7 @@ btrace_call_history_src_line (struct ui_out *uiout, if (end == begin) return; - ui_out_text (uiout, "-"); + ui_out_text (uiout, ","); ui_out_field_int (uiout, "max line", end); } @@ -473,6 +473,7 @@ btrace_call_history_src_line (struct ui_out *uiout, static void btrace_call_history (struct ui_out *uiout, + const struct btrace_thread_info *btinfo, const struct btrace_call_iterator *begin, const struct btrace_call_iterator *end, enum record_print_flag flags) @@ -496,23 +497,33 @@ btrace_call_history (struct ui_out *uiout, ui_out_field_uint (uiout, "index", bfun->number); ui_out_text (uiout, "\t"); + if ((flags & RECORD_PRINT_INDENT_CALLS) != 0) + { + int level = bfun->level + btinfo->level, i; + + for (i = 0; i < level; ++i) + ui_out_text (uiout, " "); + } + + if (sym != NULL) + ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (sym)); + else if (msym != NULL) + ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (msym)); + else if (!ui_out_is_mi_like_p (uiout)) + ui_out_field_string (uiout, "function", "??"); + if ((flags & RECORD_PRINT_INSN_RANGE) != 0) { + ui_out_text (uiout, _("\tinst ")); btrace_call_history_insn_range (uiout, bfun); - ui_out_text (uiout, "\t"); } if ((flags & RECORD_PRINT_SRC_LINE) != 0) { + ui_out_text (uiout, _("\tat ")); btrace_call_history_src_line (uiout, bfun); - ui_out_text (uiout, "\t"); } - if (sym != NULL) - ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (sym)); - else if (msym != NULL) - ui_out_field_string (uiout, "function", SYMBOL_PRINT_NAME (msym)); - ui_out_text (uiout, "\n"); } } @@ -569,7 +580,7 @@ record_btrace_call_history (int size, int flags) } if (covered > 0) - btrace_call_history (uiout, &begin, &end, flags); + btrace_call_history (uiout, btinfo, &begin, &end, flags); else { if (size < 0) @@ -621,7 +632,7 @@ record_btrace_call_history_range (ULONGEST from, ULONGEST to, int flags) if (found == 0) btrace_call_end (&end, btinfo); - btrace_call_history (uiout, &begin, &end, flags); + btrace_call_history (uiout, btinfo, &begin, &end, flags); btrace_set_call_history (btinfo, &begin, &end); do_cleanups (uiout_cleanup); |