Re: [PATCH 1/5] regcache: Add collect/supply_regset variants that accept a register base.

John Baldwin
2022-11-22T22:33:28Z

On 11/22/22 11:56 AM, Simon Marchi wrote:
> On 7/7/22 20:58, John Baldwin wrote:
>> ---
>> gdb/regcache.c | 28 +++++++++++++++++++++++++---
>> gdb/regcache.h | 24 ++++++++++++++++++++++--
>> 2 files changed, 47 insertions(+), 5 deletions(-)
>>
>> diff --git a/gdb/regcache.c b/gdb/regcache.c
>> index 037659ef8fa..1db3d972ef8 100644
>> --- a/gdb/regcache.c
>> +++ b/gdb/regcache.c
>> @@ -1242,7 +1245,18 @@ void
>> regcache::supply_regset (const struct regset *regset,
>> int regnum, const void *buf, size_t size)
>> {
>> - transfer_regset (regset, this, regnum, (const gdb_byte *) buf, nullptr, size);
>> + transfer_regset (regset, 0, this, regnum, (const gdb_byte *) buf, nullptr,
>> + size);
>> +}
>
> Can the old regcache::{supply,collect}_regset (without regbase) become
> trivial wrappers around the new ones (with regbase)? I would put the
> implementation directly in the .h if doing that.

Yes, that will work and I will make that change.

>> diff --git a/gdb/regcache.h b/gdb/regcache.h
>> index 1dbba5ce9af..f01127b20fb 100644
>> --- a/gdb/regcache.h
>> +++ b/gdb/regcache.h
>> @@ -150,6 +150,14 @@ extern void regcache_collect_regset (const struct regset *regset,
>> int regnum, void *buf, size_t size);
>>
>>
>> +extern void regcache_supply_regset (const struct regset *regset, int regbase,
>> + struct regcache *regcache,
>> + int regnum, const void *buf,
>> + size_t size);
>> +extern void regcache_collect_regset (const struct regset *regset, int regbase,
>> + const struct regcache *regcache,
>> + int regnum, void *buf, size_t size);
>
> These don't have a definition, I guess they are not needed.

Oops, yes. I think I was originally going to add them for completeness,
but I think it's better to not add them so will axe the prototypes.

> (Could we make a patch that removes regcache_supply_regset and
> regcache_collect_regset, since they just forward to the regcache
> methods?)
>
>> + belonging to the regset, otherwise just the register numbered
>> + REGNUM. The REGSET's 'regmap' field must point to an array of
>> + 'struct regcache_map_entry'. The valid register numbers in each
>> + entry in 'struct regcache_map_entry' are offset by REGBASE. */
>> +
>> + void supply_regset (const struct regset *regset, int regbase,
>> + int regnum, const void *buf, size_t size);
>> +
>> + void collect_regset (const struct regset *regset, int regbase, int regnum,
>> + void *buf, size_t size) const;
>> +
>> void supply_regset (const struct regset *regset,
>> int regnum, const void *buf, size_t size);
>>
>> -
>> void collect_regset (const struct regset *regset, int regnum,
>> void *buf, size_t size) const;
>
> Can you document the last two, just by saying something like "Same as
> the above, but with REGBASE == 0"?

Will do.

--
John Baldwin