Re: [PATCH 3/11] Add MIPS_MAX_REGISTER_SIZE (2/4)

Pedro Alves
2017-05-25T10:46:28Z

On 05/24/2017 08:45 PM, Alan Hayward wrote:

> Added copy_integer_to_size, and removed the templates.
>
> Manually tested of copy_integer_to_size to make sure the signs and
> endian parts all work.

Those manual tests would have been perfect candidates for some
unit tests. All you'd need to do is add this at the bottom
of gdb/findvar.c:

#if GDB_SELF_TEST
namespace selftests {
namespace findvar_tests {

static void
run_test ()
{
// Here, exercise the various code paths of copy_integer_to_size,
// calling SELF_CHECK.
}

} // namespace findvar_test
} // namespace selftests

#endif

void
_initialize_findvar (void)
{
#if GDB_SELF_TEST
register_self_test (selftests::findvar_tests::run_test);
#endif
}

(and include selftest.h at the top of the file).

You'd run those tests with:
$ make check TESTS="gdb.gdb/unittest.exp"

Or (my preferred when hacking):
$ gdb --batch -q -ex "maint selftest"

> Tested on a --enable-targets=all build using make check with board files
> unix and native-gdbserver.
> I do not have a MIPS machine to test on.
> Ok to commit?

On 05/24/2017 08:45 PM, Alan Hayward wrote:
>
>
> 2017-05-24 Alan Hayward <alan.hayward@arm.com>
>
> * gdb/defs.h (copy_integer_to_size): New declaration.
> * gdb/findvar.c (extract_signed_integer): Removed function.
> (extract_unsigned_integer): Likewise.
> (store_signed_integer): Removed function.
> (store_unsigned_integer): Likewise.
> * mips-fbsd-tdep.c (mips_fbsd_supply_reg): Use raw_supply_integer.
> (mips_fbsd_collect_reg): Use templated raw_collect_integer.
> * mips-linux-tdep.c (supply_32bit_reg): Use raw_supply_integer.
> (mips64_fill_gregset): Use raw_collect_integer.
> (mips64_fill_fpregset): Use raw_supply_integer.
> * gdb/regcache.c (regcache::raw_supply_integer): New function.
> (regcache::raw_collect_integer): Likewise
> * gdb/regcache.h (regcache::raw_supply): New declaration.
> (regcache::raw_collect): Likewise

There are stale entries above. Also, drop "gdb/" prefix, and add
missing periods after "Likewise".

>
>
> diff --git a/gdb/defs.h b/gdb/defs.h
> index a0b586f401eca205334e9f237081f4da97c83aa1..a1a97bb1e791d4f423788797d1f04c3e89877d90 100644
> --- a/gdb/defs.h
> +++ b/gdb/defs.h
> @@ -658,7 +658,10 @@ extern void store_unsigned_integer (gdb_byte *, int,
> extern void store_typed_address (gdb_byte *buf, struct type *type,
> CORE_ADDR addr);
>
> -
>
> +extern void copy_integer_to_size (gdb_byte *dest, int dest_size,
> + const gdb_byte *source, int source_size,
> + bool is_signed, enum bfd_endian byte_order);
> +
> /* From valops.c */
>
> extern int watchdog;
> diff --git a/gdb/findvar.c b/gdb/findvar.c
> index ed4d5c1266c9de069981b306bc8229ae5fb02350..5a82e493f9ca6d9337a22defc4377235f36acba8 100644
> --- a/gdb/findvar.c
> +++ b/gdb/findvar.c
> @@ -249,7 +249,47 @@ store_typed_address (gdb_byte *buf, struct type *type, CORE_ADDR addr)
> gdbarch_address_to_pointer (get_type_arch (type), type, buf, addr);
> }
>
> +/* Copy a value from SOURCE of size SOURCE_SIZE bytes to DEST of size DEST_SIZE
> + bytes. If SOURCE_SIZE is greater than DEST_SIZE, then truncate the most
> + significant bytes. If SOURCE_SIZE is less than DEST_SIZE then either sign
> + or zero extended according to IS_SIGNED. Values are stored in memory with
> + endianess BYTE_ORDER. */
>
> +void
> +copy_integer_to_size (gdb_byte *dest, int dest_size, const gdb_byte *source,
> + int source_size, bool is_signed,
> + enum bfd_endian byte_order)
> +{
> + signed int size_diff = dest_size - source_size;
> +
> + /* Copy across everything from SOURCE that can fit into DEST. */
> +
> + if (byte_order == BFD_ENDIAN_BIG && size_diff > 0)
> + memcpy (dest + size_diff, source, source_size);
> + else if (byte_order == BFD_ENDIAN_BIG && size_diff < 0)
> + memcpy (dest, source - size_diff, dest_size);
> + else
> + memcpy (dest, source, std::min (source_size, dest_size));
> +
> + /* Fill the remaining space in DEST by either zero extending or sign
> + extending. */
> +
> + if (size_diff > 0)
> + {
> + char extension = 0;

gdb_byte.

> + if (is_signed)
> + if ((byte_order == BFD_ENDIAN_BIG && source[0] & 0x80)
> + || (byte_order != BFD_ENDIAN_BIG
> + && source[source_size - 1] & 0x80))
> + extension = 0xff;
> +

Merge the ifs? Like, e.g.:

gdb_byte extension;

if (is_signed
&& ((byte_order == BFD_ENDIAN_BIG && source[0] & 0x80)
|| (byte_order != BFD_ENDIAN_BIG
&& source[source_size - 1] & 0x80)))
extension = 0xff;
else
extension = 0;

> + /* Extend into MSBs of SOURCE. */
> + if (byte_order == BFD_ENDIAN_BIG)
> + memset (dest, extension, size_diff);
> + else
> + memset (dest + source_size, extension, size_diff);
> + }
> +}
>
> /* Return a `value' with the contents of (virtual or cooked) register
> REGNUM as found in the specified FRAME. The register's type is
> diff --git a/gdb/mips-fbsd-tdep.c b/gdb/mips-fbsd-tdep.c
> index 00fae0ec60ddc9e645d3236efe29f2f9e9ceab5c..13cf98585f96f1acfe6decbe320530d609bee646 100644
> --- a/gdb/mips-fbsd-tdep.c
> +++ b/gdb/mips-fbsd-tdep.c
> @@ -47,57 +47,24 @@
> 34th is a dummy for padding. */
> #define MIPS_FBSD_NUM_FPREGS 34
>
> -/* Supply a single register. If the source register size matches the
> - size the regcache expects, this can use regcache_raw_supply(). If
> - they are different, this copies the source register into a buffer
> - that can be passed to regcache_raw_supply(). */
> +/* Supply a single register. The register size might not match, so use
> + regcache->raw_supply_integer (). */
>
> static void
> mips_fbsd_supply_reg (struct regcache *regcache, int regnum, const void *addr,
> size_t len)
> {
> - struct gdbarch *gdbarch = get_regcache_arch (regcache);
> -
> - if (register_size (gdbarch, regnum) == len)
> - regcache_raw_supply (regcache, regnum, addr);
> - else
> - {
> - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
> - gdb_byte buf[MAX_REGISTER_SIZE];
> - LONGEST val;
> -
> - val = extract_signed_integer ((const gdb_byte *) addr, len, byte_order);
> - store_signed_integer (buf, register_size (gdbarch, regnum), byte_order,
> - val);
> - regcache_raw_supply (regcache, regnum, buf);
> - }
> + regcache->raw_supply_integer (regnum, (const gdb_byte *) addr, len, true);
> }

Nice!

> --- a/gdb/mips-linux-tdep.c
> +++ b/gdb/mips-linux-tdep.c
> @@ -116,13 +116,7 @@ mips_linux_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc)
> static void
> supply_32bit_reg (struct regcache *regcache, int regnum, const void *addr)
> {
> - struct gdbarch *gdbarch = get_regcache_arch (regcache);
> - enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
> - gdb_byte buf[MAX_REGISTER_SIZE];
> - store_signed_integer (buf, register_size (gdbarch, regnum), byte_order,
> - extract_signed_integer ((const gdb_byte *) addr, 4,
> - byte_order));
> - regcache_raw_supply (regcache, regnum, buf);
> + regcache->raw_supply_integer (regnum, (const gdb_byte *) addr, 4, true);
> }

Nice. :-)
[snip several "nice"s]

> diff --git a/gdb/regcache.h b/gdb/regcache.h
> index 4dcfccbac70f0f962bf5e5596d035fda42322795..409482d17c0542c7a53620d88d33fa9706fa72c5 100644
> --- a/gdb/regcache.h
> +++ b/gdb/regcache.h
> @@ -294,8 +294,14 @@ public:
>
> void raw_collect (int regnum, void *buf) const;
>
> + void raw_collect_integer (int regnum, gdb_byte *addr, int addr_len,
> + bool is_signed) const;
> +
> void raw_supply (int regnum, const void *buf);
>
> + void raw_supply_integer (int regnum, const gdb_byte *addr, int addr_len,
> + bool is_signed);
> +
> void raw_supply_zeroed (int regnum);
>
> void raw_copy (int regnum, struct regcache *src_regcache);
> diff --git a/gdb/regcache.c b/gdb/regcache.c
> index 660558f7ff10f9d8346b6e08422e16c38c3c4d7d..ec6446b897922a8f9f44bbf94b7f1d198b0a6d4b 100644
> --- a/gdb/regcache.c
> +++ b/gdb/regcache.c
> @@ -1189,6 +1189,28 @@ regcache::raw_supply (int regnum, const void *buf)
> }
> }
>
> +/* Supply register REGNUM with an integer, whose contents are stored in ADDR,
> + with length ADDR_LEN and sign IS_SIGNED, to REGCACHE. */

It'd be good to say something about extending/truncating here, as
well as mention that the ADDR contents are assumed to be in
target byte order.

> +
> +void
> +regcache::raw_supply_integer (int regnum, const gdb_byte *addr, int addr_len,
> + bool is_signed)
> +{

> +/* Collect register REGNUM from regcache to an integer, whose contents are
> + stored in ADDR, with length ADDR_LEN and sign IS_SIGNED. */

Ditto.

> +
> +void
> +regcache::raw_collect_integer (int regnum, gdb_byte *addr, int addr_len,
> + bool is_signed) const
> +{

Otherwise this looks good to me. It'd look great with unit tests. :-)

Yao, what do you think?

Thanks,
Pedro Alves