diff options
| -rw-r--r-- | gdb/btrace.c | 3 | ||||
| -rw-r--r-- | gdb/btrace.h | 6 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 5 | ||||
| -rw-r--r-- | gdb/record-btrace.c | 34 | ||||
| -rw-r--r-- | gdb/record.c | 5 | ||||
| -rw-r--r-- | gdb/record.h | 5 |
6 files changed, 52 insertions, 6 deletions
diff --git a/gdb/btrace.c b/gdb/btrace.c index da219da..224341b 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -664,6 +664,9 @@ ftrace_update_insns (struct btrace_function *bfun, const btrace_insn &insn) { bfun->insn.push_back (insn); + if (insn.iclass == BTRACE_INSN_AUX) + bfun->flags |= BFUN_CONTAINS_AUX; + if (record_debug > 1) ftrace_debug (bfun, "update insn"); } diff --git a/gdb/btrace.h b/gdb/btrace.h index 0086759..0f93173 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -105,7 +105,11 @@ enum btrace_function_flag /* The 'up' link points to a tail call. This obviously only makes sense if bfun_up_links_to_ret is clear. */ - BFUN_UP_LINKS_TO_TAILCALL = (1 << 1) + BFUN_UP_LINKS_TO_TAILCALL = (1 << 1), + + /* Indicates that at least one auxiliary instruction is in the current + function segment. */ + BFUN_CONTAINS_AUX = (1 << 2) }; DEF_ENUM_FLAGS_TYPE (enum btrace_function_flag, btrace_function_flags); diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 8d86823..09eef92 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -8258,8 +8258,9 @@ that function, the source lines for this instruction sequence (if the @code{/l} modifier is specified), and the instructions numbers that form the sequence (if the @code{/i} modifier is specified). The function names are indented to reflect the call stack depth if the @code{/c} modifier is -specified. The @code{/l}, @code{/i}, and @code{/c} modifiers can be given -together. +specified. Printing auxiliary information is enabled by default and can be +omitted with the @code{/a} modifier. The @code{/l}, @code{/i}, @code{/a}, +and @code{/c} modifiers can be given together. @smallexample (@value{GDBP}) @b{list 1, 10} diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 54c761d..92c01dc 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -1161,6 +1161,31 @@ btrace_get_bfun_name (const struct btrace_function *bfun) return "??"; } +static void +btrace_print_aux_insn (struct ui_out *uiout, + const struct btrace_function *bfun, + const struct btrace_thread_info *btinfo, + int level) +{ + for (const btrace_insn &insn : bfun->insn) + { + if (insn.iclass == BTRACE_INSN_AUX) + { + /* Indent to the function level. */ + uiout->text ("\t"); + /* Adjust for RECORD_PRINT_INDENT_CALLS and indent one + additional level. */ + for (int i = 0; i <= level; ++i) + uiout->text (" "); + + uiout->text ("["); + uiout->field_fmt ("aux-data", "%s", + btinfo->aux_data.at (insn.aux_data_index).c_str ()); + uiout->text ("]\n"); + } + } +} + /* Disassemble a section of the recorded function trace. */ static void @@ -1181,6 +1206,7 @@ btrace_call_history (struct ui_out *uiout, const struct btrace_function *bfun; struct minimal_symbol *msym; struct symbol *sym; + int level = 0; bfun = btrace_call_get (&it); sym = bfun->sym; @@ -1207,9 +1233,9 @@ btrace_call_history (struct ui_out *uiout, if ((flags & RECORD_PRINT_INDENT_CALLS) != 0) { - int level = bfun->level + btinfo->level, i; + level = bfun->level + btinfo->level; - for (i = 0; i < level; ++i) + for (int i = 0; i < level; ++i) uiout->text (" "); } @@ -1236,6 +1262,10 @@ btrace_call_history (struct ui_out *uiout, } uiout->text ("\n"); + + if (((flags & RECORD_DONT_PRINT_AUX) == 0) + && ((bfun->flags & BFUN_CONTAINS_AUX) != 0)) + btrace_print_aux_insn (uiout, bfun, btinfo, level); } } diff --git a/gdb/record.c b/gdb/record.c index 55e136e..d84af60 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -644,6 +644,9 @@ get_call_history_modifiers (const char **arg) case 'c': modifiers |= RECORD_PRINT_INDENT_CALLS; break; + case 'a': + modifiers |= RECORD_DONT_PRINT_AUX; + break; default: error (_("Invalid modifier: %c."), *args); } @@ -886,6 +889,8 @@ Without modifiers, it prints the function name.\n\ With a /l modifier, the source file and line number range is included.\n\ With a /i modifier, the instruction number range is included.\n\ With a /c modifier, the output is indented based on the call stack depth.\n\ +With a /a modifier, omits output of auxiliary data, which is enabled \ +by default.\n\ With no argument, prints ten more lines after the previous ten-line print.\n\ \"record function-call-history -\" prints ten lines before a previous ten-line \ print.\n\ diff --git a/gdb/record.h b/gdb/record.h index f44b395..aea6507 100644 --- a/gdb/record.h +++ b/gdb/record.h @@ -62,7 +62,10 @@ enum record_print_flag RECORD_PRINT_INSN_RANGE = (1 << 1), /* Indent based on call stack depth (if applicable). */ - RECORD_PRINT_INDENT_CALLS = (1 << 2) + RECORD_PRINT_INDENT_CALLS = (1 << 2), + + /* Deactivate printing auxiliary data (if applicable). */ + RECORD_DONT_PRINT_AUX = (1 << 3) }; DEF_ENUM_FLAGS_TYPE (enum record_print_flag, record_print_flags); |