From: Felix Willgerodt <felix.willgerodt@intel.com>
To: markus.t.metzger@intel.com, gdb-patches@sourceware.org
Subject: [PATCH v4 04/10] btrace: Handle stepping and goto for auxiliary instructions.
Date: Fri, 6 May 2022 13:40:04 +0200 [thread overview]
Message-ID: <20220506114010.134106-4-felix.willgerodt@intel.com> (raw)
In-Reply-To: <20220506114010.134106-1-felix.willgerodt@intel.com>
Print the auxiliary data when stepping. Don't allow to goto an auxiliary
instruction.
This patch is in preparation for the new ptwrite feature, which is based on
auxiliary instructions.
---
gdb/record-btrace.c | 68 ++++++++++++++++++++++++++++++++++++---------
1 file changed, 55 insertions(+), 13 deletions(-)
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 970b55c18f7..1bfb9c1d876 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -2375,9 +2375,13 @@ record_btrace_single_step_forward (struct thread_info *tp)
return btrace_step_stopped ();
/* Skip gaps during replay. If we end up at a gap (at the end of the trace),
- jump back to the instruction at which we started. */
+ jump back to the instruction at which we started. If we're stepping a
+ BTRACE_INSN_AUX instruction, print the auxiliary data and skip the
+ instruction. */
+
start = *replay;
- do
+
+ for (;;)
{
unsigned int steps;
@@ -2385,12 +2389,27 @@ record_btrace_single_step_forward (struct thread_info *tp)
of the execution history. */
steps = btrace_insn_next (replay, 1);
if (steps == 0)
+ {
+ *replay = start;
+ return btrace_step_no_history ();
+ }
+
+ const struct btrace_insn *insn = btrace_insn_get (replay);
+ if (insn == nullptr)
+ continue;
+
+ /* If we're stepping a BTRACE_INSN_AUX instruction, print the auxiliary
+ data and skip the instruction. */
+ if (insn->iclass == BTRACE_INSN_AUX)
{
- *replay = start;
- return btrace_step_no_history ();
+ gdb_printf ("[%s]\n",
+ btinfo->aux_data.at (insn->aux_data_index).c_str ());
+ continue;
}
+
+ /* We have an instruction, we are done. */
+ break;
}
- while (btrace_insn_get (replay) == NULL);
/* Determine the end of the instruction trace. */
btrace_insn_end (&end, btinfo);
@@ -2421,9 +2440,12 @@ record_btrace_single_step_backward (struct thread_info *tp)
/* If we can't step any further, we reached the end of the history.
Skip gaps during replay. If we end up at a gap (at the beginning of
- the trace), jump back to the instruction at which we started. */
+ the trace), jump back to the instruction at which we started.
+ If we're stepping a BTRACE_INSN_AUX instruction, print the auxiliary
+ data and skip the instruction. */
start = *replay;
- do
+
+ for (;;)
{
unsigned int steps;
@@ -2433,8 +2455,22 @@ record_btrace_single_step_backward (struct thread_info *tp)
*replay = start;
return btrace_step_no_history ();
}
+
+ const struct btrace_insn *insn = btrace_insn_get (replay);
+ if (insn == nullptr)
+ continue;
+
+ /* Check if we're stepping a BTRACE_INSN_AUX instruction and skip it. */
+ if (insn->iclass == BTRACE_INSN_AUX)
+ {
+ gdb_printf ("[%s]\n",
+ btinfo->aux_data.at (insn->aux_data_index).c_str ());
+ continue;
+ }
+
+ /* We have an instruction, we are done. */
+ break;
}
- while (btrace_insn_get (replay) == NULL);
/* Check if we're stepping a breakpoint.
@@ -2856,25 +2892,31 @@ record_btrace_target::goto_record_end ()
/* The goto_record method of target record-btrace. */
void
-record_btrace_target::goto_record (ULONGEST insn)
+record_btrace_target::goto_record (ULONGEST insn_number)
{
struct thread_info *tp;
struct btrace_insn_iterator it;
unsigned int number;
int found;
- number = insn;
+ number = insn_number;
/* Check for wrap-arounds. */
- if (number != insn)
+ if (number != insn_number)
error (_("Instruction number out of range."));
tp = require_btrace_thread ();
found = btrace_find_insn_by_number (&it, &tp->btrace, number);
- /* Check if the instruction could not be found or is a gap. */
- if (found == 0 || btrace_insn_get (&it) == NULL)
+ /* Check if the instruction could not be found or is a gap or an
+ auxilliary instruction. */
+ if (found == 0)
+ error (_("No such instruction."));
+
+ const struct btrace_insn *insn = btrace_insn_get (&it);
+
+ if ((insn == NULL) || (insn->iclass == BTRACE_INSN_AUX))
error (_("No such instruction."));
record_btrace_set_replay (tp, &it);
--
2.34.1
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-05-06 11:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 11:40 [PATCH v4 01/10] btrace: Introduce " Felix Willgerodt
2022-05-06 11:40 ` [PATCH v4 02/10] btrace: Enable auxiliary instructions in record instruction-history Felix Willgerodt
2022-05-06 11:46 ` Eli Zaretskii
2022-05-06 11:40 ` [PATCH v4 03/10] btrace: Enable auxiliary instructions in record function-call-history Felix Willgerodt
2022-05-06 11:48 ` Eli Zaretskii
2022-05-06 11:40 ` Felix Willgerodt [this message]
2022-05-06 11:40 ` [PATCH v4 05/10] python: Introduce gdb.RecordAuxiliary class Felix Willgerodt
2022-05-06 11:49 ` Eli Zaretskii
2022-05-06 11:40 ` [PATCH v4 06/10] python: Add clear() to gdb.Record Felix Willgerodt
2022-05-06 11:50 ` Eli Zaretskii
2022-05-10 13:42 ` Willgerodt, Felix
2022-05-10 14:04 ` Eli Zaretskii
2022-05-11 8:22 ` Willgerodt, Felix
2022-05-11 11:43 ` Eli Zaretskii
2022-05-06 11:40 ` [PATCH v4 07/10] btrace, gdbserver: Add ptwrite to btrace_config_pt Felix Willgerodt
2022-05-06 11:53 ` Eli Zaretskii
2022-05-10 13:42 ` Willgerodt, Felix
2022-05-06 11:40 ` [PATCH v4 08/10] btrace, linux: Enable ptwrite packets Felix Willgerodt
2022-05-06 11:40 ` [PATCH v4 09/10] btrace, python: Enable ptwrite listener registration Felix Willgerodt
2022-05-06 11:40 ` [PATCH v4 10/10] btrace: Extend ptwrite event decoding Felix Willgerodt
2022-05-06 12:04 ` Eli Zaretskii
2022-05-10 13:43 ` Willgerodt, Felix
2022-05-10 14:11 ` Eli Zaretskii
2022-05-11 8:19 ` Willgerodt, Felix
2022-05-06 11:47 ` [PATCH v4 01/10] btrace: Introduce auxiliary instructions Eli Zaretskii
2022-05-10 13:42 ` 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=20220506114010.134106-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).