From: Felix Willgerodt <felix.willgerodt@intel.com>
To: gdb-patches@sourceware.org, markus.t.metzger@intel.com
Subject: [PATCH v7 02/10] btrace: Enable auxiliary instructions in record instruction-history.
Date: Fri, 21 Oct 2022 13:59:39 +0200 [thread overview]
Message-ID: <20221021115947.359223-3-felix.willgerodt@intel.com> (raw)
In-Reply-To: <20221021115947.359223-1-felix.willgerodt@intel.com>
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.
---
gdb/disasm-flags.h | 1 +
gdb/doc/gdb.texinfo | 3 +++
gdb/record-btrace.c | 14 ++++++++++++++
gdb/record.c | 5 +++++
4 files changed, 23 insertions(+)
diff --git a/gdb/disasm-flags.h b/gdb/disasm-flags.h
index 9420e7c478c..e07891794f5 100644
--- a/gdb/disasm-flags.h
+++ b/gdb/disasm-flags.h
@@ -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);
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 5df67eb6644..00a4d595490 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -7963,6 +7963,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.
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 5cf978b932c..78e6514adf0 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -821,6 +821,20 @@ 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");
+ uiout->spaces (3);
+ 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;
diff --git a/gdb/record.c b/gdb/record.c
index 2390a58f9c0..f4402b58144 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -486,6 +486,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;
@@ -856,6 +859,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 \
--
2.34.3
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
next prev parent reply other threads:[~2022-10-21 12:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 11:59 [PATCH v7 00/10] Extensions for PTWRITE Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 01/10] btrace: Introduce auxiliary instructions Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 13:19 ` Eli Zaretskii
2022-10-21 11:59 ` Felix Willgerodt [this message]
2022-10-21 11:59 ` [PATCH v7 03/10] btrace: Enable auxiliary instructions in record function-call-history Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 04/10] btrace: Handle stepping and goto for auxiliary instructions Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 05/10] python: Introduce gdb.RecordAuxiliary class Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 06/10] python: Add clear() to gdb.Record Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 07/10] btrace, gdbserver: Add ptwrite to btrace_config_pt Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 08/10] btrace, linux: Enable ptwrite packets Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-10-21 11:59 ` [PATCH v7 09/10] btrace, python: Enable ptwrite filter registration Felix Willgerodt
2022-10-21 11:59 ` Felix Willgerodt
2022-11-09 13:16 ` [PING] [PATCH v7 00/10] Extensions for PTWRITE Willgerodt, Felix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221021115947.359223-3-felix.willgerodt@intel.com \
--to=felix.willgerodt@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=markus.t.metzger@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).