[03/10] btrace: Enable auxiliary instructions in record function-call-history.
Commit Message
From: Felix Willgerodt <felix.willgerodt@intel.com>
Print the auxiliary data when a btrace_insn of type BTRACE_INSN_AUX
is encountered in the function-call-history. Printing is
active by default, it can be silenced with the /s modifier.
This patch is in preparation for the ptwrite feature, which is based on
auxiliary instructions.
2019-05-29 Felix Willgerodt <felix.willgerodt@intel.com>
gdb/ChangeLog:
* btrace.h (btrace_function_flag): Add BFUN_AUX_DECODED.
* record-btrace.c (btrace_print_aux_insn): New function.
(btrace_call_history): Handle BTRACE_INSN_AUX.
* record.c: (get_call_history_modifiers): Add /s modifier.
* record.h (record_print_flag): New value RECORD_DONT_PRINT_AUX.
gdb/doc/ChangeLog:
* gdb.texinfo (record function-call-history): Document /s modifier.
---
gdb/btrace.h | 6 +++++-
gdb/doc/gdb.texinfo | 5 +++--
gdb/record-btrace.c | 21 +++++++++++++++++++++
gdb/record.c | 5 +++++
gdb/record.h | 5 ++++-
5 files changed, 38 insertions(+), 4 deletions(-)
Comments
> From: felix.willgerodt@intel.com
> Cc: markus.t.metzger@intel.com, Felix Willgerodt <felix.willgerodt@intel.com>
> Date: Wed, 29 May 2019 10:47:46 +0200
>
> gdb/doc/ChangeLog:
> * gdb.texinfo (record function-call-history): Document /s modifier.
This part is OK, thanks.
Hello Felix,
> Print the auxiliary data when a btrace_insn of type BTRACE_INSN_AUX
> is encountered in the function-call-history. Printing is
> active by default, it can be silenced with the /s modifier.
The /s modifier is used in 'record instruction-history' to mean 'interleave sources'. I guess
we'd want this behavior there, as well. And we'd also want the same modifier for both
commands.
> +static void
> +btrace_print_aux_insn (struct ui_out *uiout,
> + const struct btrace_function *bfun,
> + const struct btrace_thread_info *btinfo)
> +{
> + for (const auto &i : bfun->insn)
> + {
> + if (i.iclass == BTRACE_INSN_AUX)
> + {
> + uiout->text ("\t\t[");
We print the number and a single tab for gaps. I'd do the same here.
> + uiout->field_fmt ("aux-insn", "%s",
Should this be spelled "aux-data" to align with the naming of the field?
> + btinfo->aux_data[i.aux_data_index].c_str ());
> + uiout->text ("]\n");
> + }
> + }
> +}
> +
> /* Disassemble a section of the recorded function trace. */
>
> static void
> @@ -1214,6 +1231,10 @@ btrace_call_history (struct ui_out *uiout,
> }
>
> uiout->text ("\n");
> +
> + if (((flags & RECORD_DONT_PRINT_AUX) == 0)
> + && ((bfun->flags & BFUN_AUX_DECODED) != 0))
> + btrace_print_aux_insn(uiout, bfun, btinfo);
This ignores the 'record function-call-history-size' setting.
> }
> }
Thanks,
Markus.
Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Gary Kershaw
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
@@ -104,7 +104,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_AUX_DECODED = (1 << 2)
};
DEF_ENUM_FLAGS_TYPE (enum btrace_function_flag, btrace_function_flags);
@@ -7300,8 +7300,9 @@ 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{/s} modifier. The @code{/l}, @code{/i}, @code{/s} and
+@code{/c} modifiers can be given together.
@smallexample
(@value{GDBP}) @b{list 1, 10}
@@ -1139,6 +1139,23 @@ 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)
+{
+ for (const auto &i : bfun->insn)
+ {
+ if (i.iclass == BTRACE_INSN_AUX)
+ {
+ uiout->text ("\t\t[");
+ uiout->field_fmt ("aux-insn", "%s",
+ btinfo->aux_data[i.aux_data_index].c_str ());
+ uiout->text ("]\n");
+ }
+ }
+}
+
/* Disassemble a section of the recorded function trace. */
static void
@@ -1214,6 +1231,10 @@ btrace_call_history (struct ui_out *uiout,
}
uiout->text ("\n");
+
+ if (((flags & RECORD_DONT_PRINT_AUX) == 0)
+ && ((bfun->flags & BFUN_AUX_DECODED) != 0))
+ btrace_print_aux_insn(uiout, bfun, btinfo);
}
}
@@ -650,6 +650,9 @@ get_call_history_modifiers (const char **arg)
case 'c':
modifiers |= RECORD_PRINT_INDENT_CALLS;
break;
+ case 's':
+ modifiers |= RECORD_DONT_PRINT_AUX;
+ break;
default:
error (_("Invalid modifier: %c."), *args);
}
@@ -880,6 +883,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 /s 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\
@@ -61,7 +61,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);