mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-21 01:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrace: Enable auxiliary instructions in record instruction-history.

Browse Source 
Print the auxiliary data when a btrace_insn of type BTRACE_INSN_AUX
is encountered in the instruction-history.  Printing is active by default,
it can be silenced with the /a modifier.

This patch is in preparation for the new ptwrite feature, which is based on
auxiliary instructions.

Approved-By: Markus Metzger <markus.t.metzger@intel.com>
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
This commit is contained in:
Felix Willgerodt 2018-06-06 14:27:21 +02:00
parent d894edfcc4
commit 72bb34e655
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdb/disasm-flags.h
View File

@ -34,6 +34,7 @@ enum gdb_disassembly_flag : unsigned
DISASSEMBLY_SOURCE = (0x1 << 5),
DISASSEMBLY_SPECULATIVE = (0x1 << 6),
DISASSEMBLY_RAW_BYTES = (0x1 << 7),
DISASSEMBLY_OMIT_AUX_INSN = (0x1 << 8),
};
DEF_ENUM_FLAGS_TYPE (enum gdb_disassembly_flag, gdb_disassembly_flags);

3
gdb/doc/gdb.texinfo
View File

@ -8202,6 +8202,9 @@ To better align the printed instructions when the trace contains
instructions from more than one function, the function name may be
omitted by specifying the @code{/f} modifier.
Printing auxiliary information is enabled by default and can be
omitted with the @code{/a} modifier.
Speculatively executed instructions are prefixed with @samp{?}. This
feature is not available for all recording formats.

16
gdb/record-btrace.c
View File

@ -827,6 +827,22 @@ btrace_insn_history (struct ui_out *uiout,
btrace_ui_out_decode_error (uiout, btrace_insn_get_error (&it),
conf->format);
}
else if (insn->iclass == BTRACE_INSN_AUX)
{
if ((flags & DISASSEMBLY_OMIT_AUX_INSN) != 0)
continue;
uiout->field_fmt ("insn-number", "%u", btrace_insn_number (&it));
uiout->text ("\t");
/* Add 3 spaces to match the instructions and 2 to indent the aux
string to make it more visible. */
uiout->spaces (5);
uiout->text ("[");
uiout->field_fmt ("aux-data", "%s",
it.btinfo->aux_data.at
(insn->aux_data_index).c_str ());
uiout->text ("]\n");
}
else
{
struct disasm_insn dinsn;

5
gdb/record.c
View File

@ -491,6 +491,9 @@ get_insn_history_modifiers (const char **arg)
switch (*args)
{
case 'a':
modifiers |= DISASSEMBLY_OMIT_AUX_INSN;
break;
case 'm':
case 's':
modifiers |= DISASSEMBLY_SOURCE;
@ -859,6 +862,8 @@ With a /m or /s modifier, source lines are included (if available).\n\
With a /r modifier, raw instructions in hex are included.\n\
With a /f modifier, function names are omitted.\n\
With a /p modifier, current position markers are omitted.\n\
With a /a modifier, omits output of auxiliary data, which is enabled \
by default.\n\
With no argument, disassembles ten more instructions after the previous \
disassembly.\n\
\"record instruction-history -\" disassembles ten instructions before a \