[RFA,13/13] Use std::vector in h8300-tdep.c
Commit Message
This changes h8300-tdep.c to use std::vector, allowing the removal of
a cleanup.
gdb/ChangeLog
2017-11-02 Tom Tromey <tom@tromey.com>
* h8300-tdep.c (h8300_push_dummy_call): Use std::vector.
---
gdb/ChangeLog | 4 ++++
gdb/h8300-tdep.c | 16 ++++++----------
2 files changed, 10 insertions(+), 10 deletions(-)
Comments
On 2017-11-02 18:36, Tom Tromey wrote:
> This changes h8300-tdep.c to use std::vector, allowing the removal of
> a cleanup.
>
> gdb/ChangeLog
> 2017-11-02 Tom Tromey <tom@tromey.com>
>
> * h8300-tdep.c (h8300_push_dummy_call): Use std::vector.
> ---
> gdb/ChangeLog | 4 ++++
> gdb/h8300-tdep.c | 16 ++++++----------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
> index 011afcaba4..b9936c0283 100644
> --- a/gdb/h8300-tdep.c
> +++ b/gdb/h8300-tdep.c
> @@ -662,18 +662,16 @@ h8300_push_dummy_call (struct gdbarch *gdbarch,
> struct value *function,
>
> for (argument = 0; argument < nargs; argument++)
> {
> - struct cleanup *back_to;
> struct type *type = value_type (args[argument]);
> int len = TYPE_LENGTH (type);
> char *contents = (char *) value_contents (args[argument]);
>
> /* Pad the argument appropriately. */
> int padded_len = align_up (len, wordsize);
> - gdb_byte *padded = (gdb_byte *) xmalloc (padded_len);
> - back_to = make_cleanup (xfree, padded);
> + std::vector<gdb_byte> padded (padded_len);
I would suggest adding a comment that std::vector is used (and not
gdb::byte_vector) because we want it to be zero-ed out. Otherwise
someone will feel the urge to change it to gdb::byte_vector some day :).
Simon
>>>>> "Simon" == Simon Marchi <simon.marchi@polymtl.ca> writes:
Simon> I would suggest adding a comment that std::vector is used (and not
Simon> gdb::byte_vector) because we want it to be zero-ed out. Otherwise
Simon> someone will feel the urge to change it to gdb::byte_vector some day
Simon> :).
I did this.
Tom
@@ -662,18 +662,16 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
for (argument = 0; argument < nargs; argument++)
{
- struct cleanup *back_to;
struct type *type = value_type (args[argument]);
int len = TYPE_LENGTH (type);
char *contents = (char *) value_contents (args[argument]);
/* Pad the argument appropriately. */
int padded_len = align_up (len, wordsize);
- gdb_byte *padded = (gdb_byte *) xmalloc (padded_len);
- back_to = make_cleanup (xfree, padded);
+ std::vector<gdb_byte> padded (padded_len);
- memset (padded, 0, padded_len);
- memcpy (len < wordsize ? padded + padded_len - len : padded,
+ memcpy ((len < wordsize ? padded.data () + padded_len - len
+ : padded.data ()),
contents, len);
/* Could the argument fit in the remaining registers? */
@@ -684,7 +682,7 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
if (len > wordsize && len % wordsize)
{
/* I feel so unclean. */
- write_memory (sp + stack_offset, padded, padded_len);
+ write_memory (sp + stack_offset, padded.data (), padded_len);
stack_offset += padded_len;
/* That's right --- even though we passed the argument
@@ -702,7 +700,7 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
for (offset = 0; offset < padded_len; offset += wordsize)
{
ULONGEST word
- = extract_unsigned_integer (padded + offset,
+ = extract_unsigned_integer (&padded[offset],
wordsize, byte_order);
regcache_cooked_write_unsigned (regcache, reg++, word);
}
@@ -711,15 +709,13 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
else
{
/* It doesn't fit in registers! Onto the stack it goes. */
- write_memory (sp + stack_offset, padded, padded_len);
+ write_memory (sp + stack_offset, padded.data (), padded_len);
stack_offset += padded_len;
/* Once one argument has spilled onto the stack, all
subsequent arguments go on the stack. */
reg = E_ARGLAST_REGNUM + 1;
}
-
- do_cleanups (back_to);
}
/* Store return address. */