From: Luis Machado <luis.machado@arm.com>
To: <gdb-patches@sourceware.org>
Cc: <thiago.bauermann@linaro.org>, <simon.marchi@polymtl.ca>
Subject: [PATCH v6 06/17] [gdbserver/generic] Convert tdesc's expedite_regs to a string vector
Date: Wed, 13 Sep 2023 11:18:04 +0100 [thread overview]
Message-ID: <20230913101815.178154-7-luis.machado@arm.com> (raw)
In-Reply-To: <20230913101815.178154-1-luis.machado@arm.com>
Right now the list of expedited registers is stored as an array of char *,
with a nullptr element at the end to signal its last element.
Convert expedite_regs to a std::vector of std::string so it is easier to
manage the elements and the storage is handled automatically.
Eventually we might want to convert all the target functions so they pass a
std::vector of std::string as well. Or maybe expose an interface that target can
use to add expedited registers on-by-one depending on the target description
discovery needs, as opposed to just a static list of char *.
---
gdbserver/remote-utils.cc | 13 +++++--------
gdbserver/tdesc.cc | 23 ++++++++++++++---------
gdbserver/tdesc.h | 4 ++--
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc
index 722915d30f2..fb5c38d4522 100644
--- a/gdbserver/remote-utils.cc
+++ b/gdbserver/remote-utils.cc
@@ -1068,7 +1068,6 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status)
case TARGET_WAITKIND_SYSCALL_ENTRY:
case TARGET_WAITKIND_SYSCALL_RETURN:
{
- const char **regp;
struct regcache *regcache;
char *buf_start = buf;
@@ -1155,8 +1154,6 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status)
switch_to_thread (the_target, ptid);
- regp = current_target_desc ()->expedite_regs;
-
regcache = get_thread_regcache (current_thread, 1);
if (the_target->stopped_by_watchpoint ())
@@ -1188,11 +1185,11 @@ prepare_resume_reply (char *buf, ptid_t ptid, const target_waitstatus &status)
buf += strlen (buf);
}
- while (*regp)
- {
- buf = outreg (regcache, find_regno (regcache->tdesc, *regp), buf);
- regp ++;
- }
+ /* Handle the expedited registers. */
+ for (const std::string &expedited_reg :
+ current_target_desc ()->expedite_regs)
+ buf = outreg (regcache, find_regno (regcache->tdesc,
+ expedited_reg.c_str ()), buf);
*buf = '\0';
/* Formerly, if the debugger had not used any thread features
diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index 2c7257c458f..072b88481b2 100644
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -32,14 +32,13 @@ bool target_desc::operator== (const target_desc &other) const
if (reg_defs != other.reg_defs)
return false;
- /* Compare expedite_regs. */
- int i = 0;
- for (; expedite_regs[i] != NULL; i++)
- {
- if (strcmp (expedite_regs[i], other.expedite_regs[i]) != 0)
- return false;
- }
- if (other.expedite_regs[i] != NULL)
+ /* Compare the two vectors of expedited registers. They will only match
+ if the following conditions are met:
+
+ - Both vectors have the same number of elements.
+ - Both vectors contain the same elements.
+ - The elements of both vectors appear in the same order. */
+ if (expedite_regs != other.expedite_regs)
return false;
return true;
@@ -89,7 +88,13 @@ init_target_desc (struct target_desc *tdesc,
gdb_assert (2 * tdesc->registers_size + 32 <= PBUFSIZ);
#ifndef IN_PROCESS_AGENT
- tdesc->expedite_regs = expedite_regs;
+ /* Drop the contents of the previous vector, if any. */
+ tdesc->expedite_regs.clear ();
+
+ /* Initialize the vector with new expedite registers contents. */
+ int expedite_count = 0;
+ while (expedite_regs[expedite_count] != nullptr)
+ tdesc->expedite_regs.push_back (expedite_regs[expedite_count++]);
#endif
}
diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h
index 7fe7d0d8eb3..8a29fc6fe6d 100644
--- a/gdbserver/tdesc.h
+++ b/gdbserver/tdesc.h
@@ -40,9 +40,9 @@ struct target_desc final : tdesc_element
std::vector<tdesc_feature_up> features;
#ifndef IN_PROCESS_AGENT
- /* An array of register names. These are the "expedite" registers:
+ /* A vector of register names. These are the "expedite" registers:
registers whose values are sent along with stop replies. */
- const char **expedite_regs = NULL;
+ std::vector<std::string> expedite_regs;
/* Defines what to return when looking for the "target.xml" file in
response to qXfer:features:read. Its contents can either be
--
2.25.1
next prev parent reply other threads:[~2023-09-13 10:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 10:17 [PATCH v6 00/17] SME support for AArch64 gdb/gdbserver on Linux Luis Machado
2023-09-13 10:17 ` [PATCH v6 01/17] [gdb/aarch64] Fix register fetch/store order for native AArch64 Linux Luis Machado
2023-09-13 10:18 ` [PATCH v6 02/17] [gdb/aarch64] refactor: Rename SVE-specific files Luis Machado
2023-09-13 10:18 ` [PATCH v6 03/17] [gdb/gdbserver] refactor: Simplify SVE interface to read/write registers Luis Machado
2023-09-13 10:18 ` [PATCH v6 04/17] [gdb/aarch64] sve: Fix return command when using V registers in a SVE-enabled target Luis Machado
2023-09-13 10:18 ` [PATCH v6 05/17] [gdb/aarch64] sme: Enable SME registers and pseudo-registers Luis Machado
2023-09-13 10:18 ` Luis Machado [this message]
2023-09-13 15:28 ` [PATCH v6 06/17] [gdbserver/generic] Convert tdesc's expedite_regs to a string vector Tom Tromey
2023-09-13 10:18 ` [PATCH v6 07/17] [gdbserver/aarch64] refactor: Adjust expedited registers dynamically Luis Machado
2023-09-13 10:18 ` [PATCH v6 08/17] [gdbserver/aarch64] sme: Add support for SME Luis Machado
2023-09-13 10:18 ` [PATCH v6 09/17] [gdb/aarch64] sve: Fix signal frame z/v register restore Luis Machado
2023-09-13 10:18 ` [PATCH v6 10/17] [gdb/aarch64] sme: Signal frame support Luis Machado
2023-09-13 10:18 ` [PATCH v6 11/17] [gdb/aarch64] sme: Fixup sigframe gdbarch when vg/svg changes Luis Machado
2023-09-13 10:18 ` [PATCH v6 12/17] [gdb/aarch64] sme: Support TPIDR2 signal frame context Luis Machado
2023-09-13 10:18 ` [PATCH v6 13/17] [gdb/generic] Get rid of linux-core-thread-data Luis Machado
2023-09-13 14:10 ` Simon Marchi
2023-09-13 10:18 ` [PATCH v6 14/17] [gdb/generic] corefile/bug: Use thread-specific gdbarch when dumping register state to core files Luis Machado
2023-09-13 14:20 ` Simon Marchi
2023-09-13 15:11 ` Tom Tromey
2023-09-13 10:18 ` [PATCH v6 15/17] [gdb/aarch64] sme: Core file support for Linux Luis Machado
2023-09-13 10:18 ` [PATCH v6 16/17] [gdb/testsuite] sme: Add SVE/SME testcases Luis Machado
2023-09-13 14:34 ` Simon Marchi
2023-09-13 14:46 ` Luis Machado
2023-09-13 15:26 ` Simon Marchi
2023-09-13 10:18 ` [PATCH v6 17/17] [gdb/docs] sme: Document SME registers and features Luis Machado
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=20230913101815.178154-7-luis.machado@arm.com \
--to=luis.machado@arm.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
--cc=thiago.bauermann@linaro.org \
/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).