Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 12:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdbserver: refactor the definition and uses of supply_regblock

Browse Source 
The supply_regblock function takes a pointer to a buffer as an
argument and implements two different behavior based on the pointer
being null.  There are two cases where we pass nullptr, all in
tracepoint.cc, where we are essentially doing a reset on the regcache.

In fast_tracepoint_ctx::regcache, register_status array does not
even exist.  Hence, that use simply boils down to zeroing of register
data.  Do this at the time of creating the buffer and remove the call
to supply_regblock.

In fetch_traceframe_registers, inline the use with a call to `reset`.

Hence, there are no more cases left, where a nullptr would be passed
to supply_regblock.  Assert that the buffer argument is non-null and
simplify the implementation.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Tankut Baris Aktemur
2025-01-29 10:50:31 +01:00
parent fe1b4d6dd9
commit 84da4a1ea0
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdbserver/regcache.cc
View File

@@ -360,18 +360,14 @@ supply_register_by_name_zeroed (struct regcache *regcache,
void void
supply_regblock (struct regcache *regcache, const void *buf) supply_regblock (struct regcache *regcache, const void *buf)
{ {
if (buf) gdb_assert (buf != nullptr);
{ const struct target_desc *tdesc = regcache->tdesc;
const struct target_desc *tdesc = regcache->tdesc;
memcpy (regcache->registers, buf, tdesc->registers_size); memcpy (regcache->registers, buf, tdesc->registers_size);
#ifndef IN_PROCESS_AGENT #ifndef IN_PROCESS_AGENT
for (int i = 0; i < tdesc->reg_defs.size (); i++) for (int i = 0; i < tdesc->reg_defs.size (); i++)
regcache->set_register_status (i, REG_VALID); regcache->set_register_status (i, REG_VALID);
#endif #endif
}
else
regcache->reset (REG_UNAVAILABLE);
} }
#ifndef IN_PROCESS_AGENT #ifndef IN_PROCESS_AGENT

5
gdbserver/tracepoint.cc
View File

@@ -1198,7 +1198,6 @@ struct fast_tracepoint_ctx : public tracepoint_hit_ctx
if (!this->m_regcache.has_value ()) if (!this->m_regcache.has_value ())
{ {
this->m_regcache.emplace (ipa_tdesc, this->regspace); this->m_regcache.emplace (ipa_tdesc, this->regspace);
supply_regblock (&this->m_regcache.value (), nullptr);
supply_fast_tracepoint_registers (&this->m_regcache.value (), supply_fast_tracepoint_registers (&this->m_regcache.value (),
this->regs); this->regs);
} }
@@ -4815,7 +4814,7 @@ fetch_traceframe_registers (int tfnum, struct regcache *regcache, int regnum)
if (dataptr == NULL) if (dataptr == NULL)
{ {
/* Mark registers unavailable. */ /* Mark registers unavailable. */
supply_regblock (regcache, NULL); regcache->reset (REG_UNAVAILABLE);
/* We can generally guess at a PC, although this will be /* We can generally guess at a PC, although this will be
misleading for while-stepping frames and multi-location misleading for while-stepping frames and multi-location
@@ -5370,6 +5369,8 @@ gdb_collect (struct tracepoint *tpoint, unsigned char *regs)
return; return;
} }
memset (ctx.regspace, 0, ipa_tdesc->registers_size);
for (ctx.tpoint = tpoint; for (ctx.tpoint = tpoint;
ctx.tpoint != NULL && ctx.tpoint->address == tpoint->address; ctx.tpoint != NULL && ctx.tpoint->address == tpoint->address;
ctx.tpoint = ctx.tpoint->next) ctx.tpoint = ctx.tpoint->next)