[PATCH v2] Use std::vector in solib-target lm_info

Simon Marchi
2017-04-19T04:30:20Z

New in v2:

- lm_info pointer fields initialized in-class.
- Added lm_info destructor.

Replace the two VEC fields with std::vector.

I found only one place where these lm_infos were allocated, but two
where they are freed. It looks like solib_target_free_so missed freeing
section_bases before.

More c++ification is obviously possible, but my goal right now is to get
rid of VEC (CORE_ADDR).

gdb/ChangeLog:

* solib-target.c (struct lm_info): Add default constructor,
delete copy constructor and operator=.
<segment_bases, section_bases>: Change type to
std::vector<CORE_ADDR>.
(library_list_start_segment, library_list_start_section,
library_list_start_library, library_list_end_library,
solib_target_free_library_list, solib_target_free_so,
solib_target_relocate_section_addresses): Adjust.
---
gdb/solib-target.c | 65 +++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 1b10e4ea41..58b494bde7 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -25,28 +25,39 @@
#include "target.h"
#include "vec.h"
#include "solib-target.h"
+#include <vector>

/* Private data for each loaded library. */
struct lm_info
{
+ lm_info () = default;
+ lm_info (const lm_info &) = delete;
+ lm_info &operator= (const lm_info &) = delete;
+
+ ~lm_info ()
+ {
+ xfree (name);
+ xfree (offsets);
+ }
+
/* The library's name. The name is normally kept in the struct
so_list; it is only here during XML parsing. */
- char *name;
+ char *name {};

/* The target can either specify segment bases or section bases, not
both. */

/* The base addresses for each independently relocatable segment of
this shared library. */
- VEC(CORE_ADDR) *segment_bases;
+ std::vector<CORE_ADDR> segment_bases;

/* The base addresses for each independently allocatable,
relocatable section of this shared library. */
- VEC(CORE_ADDR) *section_bases;
+ std::vector<CORE_ADDR> section_bases;

/* The cached offsets for each section of this shared library,
determined from SEGMENT_BASES, or SECTION_BASES. */
- struct section_offsets *offsets;
+ struct section_offsets *offsets {};
};

typedef struct lm_info *lm_info_p;
@@ -86,11 +97,11 @@ library_list_start_segment (struct gdb_xml_parser *parser,
= (ULONGEST *) xml_find_attribute (attributes, "address")->value;
CORE_ADDR address = (CORE_ADDR) *address_p;

- if (last->section_bases != NULL)
+ if (!last->section_bases.empty ())
gdb_xml_error (parser,
_("Library list with both segments and sections"));

- VEC_safe_push (CORE_ADDR, last->segment_bases, address);
+ last->segment_bases.push_back (address);
}

static void
@@ -104,11 +115,11 @@ library_list_start_section (struct gdb_xml_parser *parser,
= (ULONGEST *) xml_find_attribute (attributes, "address")->value;
CORE_ADDR address = (CORE_ADDR) *address_p;

- if (last->segment_bases != NULL)
+ if (!last->segment_bases.empty ())
gdb_xml_error (parser,
_("Library list with both segments and sections"));

- VEC_safe_push (CORE_ADDR, last->section_bases, address);
+ last->section_bases.push_back (address);
}

/* Handle the start of a <library> element. */
@@ -119,7 +130,7 @@ library_list_start_library (struct gdb_xml_parser *parser,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data;
- struct lm_info *item = XCNEW (struct lm_info);
+ lm_info *item = new lm_info;
const char *name
= (const char *) xml_find_attribute (attributes, "name")->value;

@@ -135,10 +146,8 @@ library_list_end_library (struct gdb_xml_parser *parser,
VEC(lm_info_p) **list = (VEC(lm_info_p) **) user_data;
struct lm_info *lm_info = VEC_last (lm_info_p, *list);

- if (lm_info->segment_bases == NULL
- && lm_info->section_bases == NULL)
- gdb_xml_error (parser,
- _("No segment or section bases defined"));
+ if (lm_info->segment_bases.empty () && lm_info->section_bases.empty ())
+ gdb_xml_error (parser, _("No segment or section bases defined"));
}

@@ -173,12 +182,8 @@ solib_target_free_library_list (void *p)
int ix;

for (ix = 0; VEC_iterate (lm_info_p, *result, ix, info); ix++)
- {
- xfree (info->name);
- VEC_free (CORE_ADDR, info->segment_bases);
- VEC_free (CORE_ADDR, info->section_bases);
- xfree (info);
- }
+ delete info;
+
VEC_free (lm_info_p, *result);
*result = NULL;
}
@@ -325,9 +330,8 @@ static void
solib_target_free_so (struct so_list *so)
{
gdb_assert (so->lm_info->name == NULL);
- xfree (so->lm_info->offsets);
- VEC_free (CORE_ADDR, so->lm_info->segment_bases);
- xfree (so->lm_info);
+
+ delete so->lm_info;
}

static void
@@ -346,12 +350,11 @@ solib_target_relocate_section_addresses (struct so_list *so,
= ((struct section_offsets *)
xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections)));

- if (so->lm_info->section_bases)
+ if (!so->lm_info->section_bases.empty ())
{
int i;
asection *sect;
- int num_section_bases
- = VEC_length (CORE_ADDR, so->lm_info->section_bases);
+ int num_section_bases = so->lm_info->section_bases.size ();
int num_alloc_sections = 0;

for (i = 0, sect = so->abfd->sections;
@@ -368,10 +371,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
{
int bases_index = 0;
int found_range = 0;
- CORE_ADDR *section_bases;
-
- section_bases = VEC_address (CORE_ADDR,
- so->lm_info->section_bases);
+ CORE_ADDR *section_bases = so->lm_info->section_bases.data ();

so->addr_low = ~(CORE_ADDR) 0;
so->addr_high = 0;
@@ -404,7 +404,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"),
gdb_assert (so->addr_low <= so->addr_high);
}
}
- else if (so->lm_info->segment_bases)
+ else if (!so->lm_info->segment_bases.empty ())
{
struct symfile_segment_data *data;

@@ -419,9 +419,8 @@ Could not relocate shared library \"%s\": no segments"), so->so_name);
int num_bases;
CORE_ADDR *segment_bases;

- num_bases = VEC_length (CORE_ADDR, so->lm_info->segment_bases);
- segment_bases = VEC_address (CORE_ADDR,
- so->lm_info->segment_bases);
+ num_bases = so->lm_info->segment_bases.size ();
+ segment_bases = so->lm_info->segment_bases.data ();

if (!symfile_map_offsets_to_segments (so->abfd, data,
so->lm_info->offsets,
--
2.12.2