From: Felix Willgerodt <felix.willgerodt@intel.com>
To: gdb-patches@sourceware.org, markus.t.metzger@intel.com
Cc: Felix Willgerodt <felix.willgerodt@intel.com>
Subject: [PATCH v7 03/10] btrace: Enable auxiliary instructions in record function-call-history.
Date: Fri, 21 Oct 2022 13:59:40 +0200 [thread overview]
Message-ID: <20221021115947.359223-4-felix.willgerodt@intel.com> (raw)
Message-ID: <20221021115940.hXZkbpHxLxOnHt7NHf7n-4pmKNWnWIgTx7a6j8817Sw@z> (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 function-call-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/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(-)
diff --git a/gdb/btrace.h b/gdb/btrace.h
index be4ce424ed5..36870d9b2ec 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 00a4d595490..1daecaf643a 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -8019,8 +8019,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 78e6514adf0..cbdb8224ba3 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1153,6 +1153,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 btrace_insn &insn : bfun->insn)
+ {
+ if (insn.iclass == BTRACE_INSN_AUX)
+ {
+ uiout->text ("\t\t[");
+ 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
@@ -1228,6 +1245,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);
}
}
diff --git a/gdb/record.c b/gdb/record.c
index f4402b58144..fa99b97ed26 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -639,6 +639,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);
}
@@ -883,6 +886,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 0fbca9d44ce..d882f313c1d 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);
--
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 ` [PATCH v7 02/10] btrace: Enable auxiliary instructions in record instruction-history Felix Willgerodt
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 ` [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-4-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).