From 4fa847d78edd4a3901414655bd4b31234b91ba2a Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Thu, 22 Jun 2017 14:09:52 +0100 Subject: [PATCH] Remove MAX_REGISTER_SIZE from py-unwind.c gdb/ * remote.c (cached_reg): Move from here... * regcache.h (cached_reg): ...to here. * python/py-unwind.c (struct reg_info): Remove. (cached_frame_info): Use cached_reg_t. (pyuw_prev_register): Likewise. (pyuw_sniffer): Use cached_reg_t and allocate registers. (pyuw_dealloc_cache): Free all registers. --- gdb/ChangeLog | 10 ++++++++++ gdb/python/py-unwind.c | 30 ++++++++++++------------------ gdb/regcache.h | 8 ++++++++ gdb/remote.c | 6 ------ 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b9fe3a4bca..c6d0a003c96 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2017-06-22 Alan Hayward + + * remote.c (cached_reg): Move from here... + * regcache.h (cached_reg): ...to here. + * python/py-unwind.c (struct reg_info): Remove. + (cached_frame_info): Use cached_reg_t. + (pyuw_prev_register): Likewise. + (pyuw_sniffer): Use cached_reg_t and allocate registers. + (pyuw_dealloc_cache): Free all registers. + 2017-06-22 Pedro Alves Simon Marchi diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index a5c28736979..da1703ecf2b 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -73,15 +73,6 @@ typedef struct /* The data we keep for a frame we can unwind: frame ID and an array of (register_number, register_value) pairs. */ -struct reg_info -{ - /* Register number. */ - int number; - - /* Register data bytes pointer. */ - gdb_byte data[MAX_REGISTER_SIZE]; -}; - typedef struct { /* Frame ID. */ @@ -93,7 +84,7 @@ typedef struct /* Length of the `reg' array below. */ int reg_count; - struct reg_info reg[]; + cached_reg_t reg[]; } cached_frame_info; extern PyTypeObject pending_frame_object_type @@ -483,14 +474,14 @@ pyuw_prev_register (struct frame_info *this_frame, void **cache_ptr, int regnum) { cached_frame_info *cached_frame = (cached_frame_info *) *cache_ptr; - struct reg_info *reg_info = cached_frame->reg; - struct reg_info *reg_info_end = reg_info + cached_frame->reg_count; + cached_reg_t *reg_info = cached_frame->reg; + cached_reg_t *reg_info_end = reg_info + cached_frame->reg_count; TRACE_PY_UNWIND (1, "%s (frame=%p,...,reg=%d)\n", __FUNCTION__, this_frame, regnum); for (; reg_info < reg_info_end; ++reg_info) { - if (regnum == reg_info->number) + if (regnum == reg_info->num) return frame_unwind_got_bytes (this_frame, regnum, reg_info->data); } @@ -566,10 +557,7 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame, saved_reg *reg; int i; - cached_frame - = ((cached_frame_info *) - xmalloc (sizeof (*cached_frame) - + reg_count * sizeof (cached_frame->reg[0]))); + cached_frame = XNEW (cached_frame_info); cached_frame->gdbarch = gdbarch; cached_frame->frame_id = unwind_info->frame_id; cached_frame->reg_count = reg_count; @@ -580,13 +568,14 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame, struct value *value = value_object_to_value (reg->value); size_t data_size = register_size (gdbarch, reg->number); - cached_frame->reg[i].number = reg->number; + cached_frame->reg[i].num = reg->number; /* `value' validation was done before, just assert. */ gdb_assert (value != NULL); gdb_assert (data_size == TYPE_LENGTH (value_type (value))); gdb_assert (data_size <= MAX_REGISTER_SIZE); + cached_frame->reg[i].data = (gdb_byte *) xmalloc (data_size); memcpy (cached_frame->reg[i].data, value_contents (value), data_size); } } @@ -601,6 +590,11 @@ static void pyuw_dealloc_cache (struct frame_info *this_frame, void *cache) { TRACE_PY_UNWIND (3, "%s: enter", __FUNCTION__); + cached_frame_info *cached_frame = (cached_frame_info *) cache; + + for (int i = 0; cached_frame->reg_count; i++) + xfree (cached_frame->reg[i].data); + xfree (cache); } diff --git a/gdb/regcache.h b/gdb/regcache.h index 3f3f823ad7b..b416d5e8b82 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -232,6 +232,14 @@ enum regcache_dump_what regcache_dump_remote }; +/* A (register_number, register_value) pair. */ + +typedef struct cached_reg +{ + int num; + gdb_byte *data; +} cached_reg_t; + /* The register cache for storing raw register values. */ class regcache diff --git a/gdb/remote.c b/gdb/remote.c index b66ecee7f6d..8e8ee6f8705 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6311,12 +6311,6 @@ remote_console_output (char *msg) gdb_flush (gdb_stdtarg); } -typedef struct cached_reg -{ - int num; - gdb_byte *data; -} cached_reg_t; - DEF_VEC_O(cached_reg_t); typedef struct stop_reply -- 2.30.2