Convert tdesc's expedite_regs to a string vector

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 *.

Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Luis Machado
2023-09-11 12:42:00 +01:00
parent ca65640ff7
commit 6a65998a8a
3 changed files with 21 additions and 19 deletions

View File

@@ -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