From 42518ba746b5b6cb7c169a55430e73551be345f5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 27 Sep 2017 21:08:05 -0600 Subject: [PATCH] Remove cleanup from mt-tdep.c Remove a cleanup from mt-tdep.c, using gdb::byte_vector. gdb/ChangeLog 2017-09-29 Tom Tromey * mt-tdep.c (mt_push_dummy_call): Use gdb::byte_vector. --- gdb/ChangeLog | 4 ++++ gdb/mt-tdep.c | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 989c12718f5..2bbe205e7c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-09-29 Tom Tromey + + * mt-tdep.c (mt_push_dummy_call): Use gdb::byte_vector. + 2017-09-29 Tom Tromey * xstormy16-tdep.c (xstormy16_push_dummy_call): Use diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c index e3ea322bacb..7992394ca29 100644 --- a/gdb/mt-tdep.c +++ b/gdb/mt-tdep.c @@ -36,6 +36,7 @@ #include "infcall.h" #include "language.h" #include "valprint.h" +#include "common/byte-vector.h" enum mt_arch_constants { @@ -849,21 +850,17 @@ mt_push_dummy_call (struct gdbarch *gdbarch, struct value *function, /* Next, the rest of the arguments go onto the stack, in reverse order. */ for (j = nargs - 1; j >= i; j--) { - gdb_byte *val; - struct cleanup *back_to; const gdb_byte *contents = value_contents (args[j]); /* Right-justify the value in an aligned-length buffer. */ typelen = TYPE_LENGTH (value_type (args[j])); slacklen = (wordsize - (typelen % wordsize)) % wordsize; - val = (gdb_byte *) xmalloc (typelen + slacklen); - back_to = make_cleanup (xfree, val); - memcpy (val, contents, typelen); - memset (val + typelen, 0, slacklen); + gdb::byte_vector val (typelen + slacklen); + memcpy (val.data (), contents, typelen); + memset (val.data () + typelen, 0, slacklen); /* Now write this data to the stack. */ stack_dest -= typelen + slacklen; - write_memory (stack_dest, val, typelen + slacklen); - do_cleanups (back_to); + write_memory (stack_dest, val.data (), typelen + slacklen); } /* Finally, if a param needs to be split between registers and stack, -- 2.30.2