FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make cached_reg_t own its data

Browse source 
struct cached_reg_t owns its data buffer, but currently that is
managed manually.  Convert it to use a unique_xmalloc_ptr.

Approved-By: Tom Tromey <tom@tromey.com>
Change-Id: I05a107098b717299e76de76aaba00d7fbaeac77b
This commit is contained in:
Pedro Alves 2023-11-09 20:44:12 +00:00
parent 5ac2d81b64
commit d5cebea18e
3 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gdb/python/py-unwind.c
View file

@ -785,7 +785,7 @@ pyuw_prev_register (frame_info_ptr this_frame, void **cache_ptr,
for (; reg_info < reg_info_end; ++reg_info)
{
if (regnum == reg_info->num)
return frame_unwind_got_bytes (this_frame, regnum, reg_info->data);
return frame_unwind_got_bytes (this_frame, regnum, reg_info->data.get ());
}
return frame_unwind_got_optimized (this_frame, regnum);
@ -903,15 +903,14 @@ pyuw_sniffer (const struct frame_unwind *self, frame_info_ptr this_frame,
struct value *value = value_object_to_value (reg->value.get ());
size_t data_size = register_size (gdbarch, reg->number);
cached_frame->reg[i].num = reg->number;
/* `value' validation was done before, just assert. */
gdb_assert (value != NULL);
gdb_assert (data_size == value->type ()->length ());
cached_frame->reg[i].data = (gdb_byte *) xmalloc (data_size);
memcpy (cached_frame->reg[i].data,
value->contents ().data (), data_size);
cached_reg_t *cached = new (&cached_frame->reg[i]) cached_reg_t ();
cached->num = reg->number;
cached->data.reset ((gdb_byte *) xmalloc (data_size));
memcpy (cached->data.get (), value->contents ().data (), data_size);
}
}
@ -928,7 +927,7 @@ pyuw_dealloc_cache (frame_info *this_frame, void *cache)
cached_frame_info *cached_frame = (cached_frame_info *) cache;
for (int i = 0; i < cached_frame->reg_count; i++)
xfree (cached_frame->reg[i].data);
cached_frame->reg[i].~cached_reg_t ();
xfree (cache);
}

5
gdb/regcache.h
View file

@ -176,7 +176,10 @@ using register_read_ftype
struct cached_reg_t
{
int num;
gdb_byte *data;
gdb::unique_xmalloc_ptr<gdb_byte> data;
cached_reg_t () = default;
cached_reg_t (cached_reg_t &&rhs) = default;
};
/* Buffer of registers. */

24
gdb/remote.c
View file

@ -1353,8 +1353,6 @@ public:
struct stop_reply : public notif_event
{
~stop_reply ();
/* The identifier of the thread about this event */
ptid_t ptid;
@ -7604,12 +7602,6 @@ remote_notif_stop_can_get_pending_events (remote_target *remote,
return 0;
}
stop_reply::~stop_reply ()
{
for (cached_reg_t &reg : regcache)
xfree (reg.data);
}
static notif_event_up
remote_notif_stop_alloc_reply ()
{
@ -8094,17 +8086,18 @@ Packet: '%s'\n"),
hex_string (pnum), p, buf);
cached_reg.num = reg->regnum;
cached_reg.data = (gdb_byte *)
xmalloc (register_size (event->arch, reg->regnum));
cached_reg.data.reset ((gdb_byte *)
xmalloc (register_size (event->arch,
reg->regnum)));
p = p1 + 1;
fieldsize = hex2bin (p, cached_reg.data,
fieldsize = hex2bin (p, cached_reg.data.get (),
register_size (event->arch, reg->regnum));
p += 2 * fieldsize;
if (fieldsize < register_size (event->arch, reg->regnum))
warning (_("Remote reply is too short: %s"), buf);
event->regcache.push_back (cached_reg);
event->regcache.push_back (std::move (cached_reg));
}
else
{
@ -8436,12 +8429,7 @@ remote_target::process_stop_reply (struct stop_reply *stop_reply,
stop_reply->arch);
for (cached_reg_t &reg : stop_reply->regcache)
{
regcache->raw_supply (reg.num, reg.data);
xfree (reg.data);
}
stop_reply->regcache.clear ();
regcache->raw_supply (reg.num, reg.data.get ());
}
remote_thread_info *remote_thr = get_remote_thread_info (this, ptid);