diff options
| author | Luis Machado <luis.machado@arm.com> | 2023-09-11 12:42:00 +0100 |
|---|---|---|
| committer | Luis Machado <luis.machado@arm.com> | 2023-10-04 16:23:39 +0100 |
| commit | 6a65998a8a94abaaae7ca4ff0ab9c3f25dc2e766 (patch) | |
| tree | 0f54ed9f908f46e885e081fbfbeb6263793c2a4c /gdbserver/remote-utils.cc | |
| parent | ca65640ff724f330e90e63ae0b14a195be79b4f6 (diff) | |
| download | gdb-6a65998a8a94abaaae7ca4ff0ab9c3f25dc2e766.zip gdb-6a65998a8a94abaaae7ca4ff0ab9c3f25dc2e766.tar.gz gdb-6a65998a8a94abaaae7ca4ff0ab9c3f25dc2e766.tar.bz2 | |
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>
Diffstat (limited to 'gdbserver/remote-utils.cc')
| -rw-r--r-- | gdbserver/remote-utils.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index 722915d..fb5c38d 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 |