X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsolib-target.c;h=625f0990d109e44c8081115970022ad040c086bf;hb=6a053cb1ff643cec3349d7f2f47ae5573f82d613;hp=972d9ef17b30359c4df3887b37f46657351c8fe9;hpb=2f667667e24357ff54701f3e046820cf08d649cf;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/solib-target.c b/gdb/solib-target.c index 972d9ef17b..625f0990d1 100644 --- a/gdb/solib-target.c +++ b/gdb/solib-target.c @@ -1,6 +1,6 @@ /* Definitions for targets which report shared library events. - Copyright (C) 2007-2019 Free Software Foundation, Inc. + Copyright (C) 2007-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -23,7 +23,6 @@ #include "symtab.h" #include "symfile.h" #include "target.h" -#include "vec.h" #include "solib-target.h" #include @@ -47,15 +46,14 @@ struct lm_info_target : public lm_info_base /* The cached offsets for each section of this shared library, determined from SEGMENT_BASES, or SECTION_BASES. */ - section_offsets *offsets = NULL; + section_offsets offsets; }; -typedef lm_info_target *lm_info_target_p; -DEF_VEC_P(lm_info_target_p); +typedef std::vector> lm_info_vector; #if !defined(HAVE_LIBEXPAT) -static VEC(lm_info_target_p) * +static lm_info_vector solib_target_parse_libraries (const char *library) { static int have_warned; @@ -67,7 +65,7 @@ solib_target_parse_libraries (const char *library) "at compile time")); } - return NULL; + return lm_info_vector (); } #else /* HAVE_LIBEXPAT */ @@ -82,8 +80,8 @@ library_list_start_segment (struct gdb_xml_parser *parser, void *user_data, std::vector &attributes) { - VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data; - lm_info_target *last = VEC_last (lm_info_target_p, *list); + lm_info_vector *list = (lm_info_vector *) user_data; + lm_info_target *last = list->back ().get (); ULONGEST *address_p = (ULONGEST *) xml_find_attribute (attributes, "address")->value.get (); CORE_ADDR address = (CORE_ADDR) *address_p; @@ -101,8 +99,8 @@ library_list_start_section (struct gdb_xml_parser *parser, void *user_data, std::vector &attributes) { - VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data; - lm_info_target *last = VEC_last (lm_info_target_p, *list); + lm_info_vector *list = (lm_info_vector *) user_data; + lm_info_target *last = list->back ().get (); ULONGEST *address_p = (ULONGEST *) xml_find_attribute (attributes, "address")->value.get (); CORE_ADDR address = (CORE_ADDR) *address_p; @@ -122,12 +120,12 @@ library_list_start_library (struct gdb_xml_parser *parser, void *user_data, std::vector &attributes) { - VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data; + lm_info_vector *list = (lm_info_vector *) user_data; lm_info_target *item = new lm_info_target; item->name = (const char *) xml_find_attribute (attributes, "name")->value.get (); - VEC_safe_push (lm_info_target_p, *list, item); + list->emplace_back (item); } static void @@ -135,8 +133,8 @@ library_list_end_library (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, void *user_data, const char *body_text) { - VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data; - lm_info_target *lm_info = VEC_last (lm_info_target_p, *list); + lm_info_vector *list = (lm_info_vector *) user_data; + lm_info_target *lm_info = list->back ().get (); if (lm_info->segment_bases.empty () && lm_info->section_bases.empty ()) gdb_xml_error (parser, _("No segment or section bases defined")); @@ -165,22 +163,6 @@ library_list_start_list (struct gdb_xml_parser *parser, } } -/* Discard the constructed library list. */ - -static void -solib_target_free_library_list (void *p) -{ - VEC(lm_info_target_p) **result = (VEC(lm_info_target_p) **) p; - lm_info_target *info; - int ix; - - for (ix = 0; VEC_iterate (lm_info_target_p, *result, ix, info); ix++) - delete info; - - VEC_free (lm_info_target_p, *result); - *result = NULL; -} - /* The allowed elements and attributes for an XML library list. The root element is a . */ @@ -227,23 +209,20 @@ static const struct gdb_xml_element library_list_elements[] = { { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -static VEC(lm_info_target_p) * +static lm_info_vector solib_target_parse_libraries (const char *library) { - VEC(lm_info_target_p) *result = NULL; - struct cleanup *back_to = make_cleanup (solib_target_free_library_list, - &result); + lm_info_vector result; if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd", library_list_elements, library, &result) == 0) { - /* Parsed successfully, keep the result. */ - discard_cleanups (back_to); + /* Parsed successfully. */ return result; } - do_cleanups (back_to); - return NULL; + result.clear (); + return result; } #endif @@ -251,9 +230,6 @@ static struct so_list * solib_target_current_sos (void) { struct so_list *new_solib, *start = NULL, *last = NULL; - VEC(lm_info_target_p) *library_list; - lm_info_target *info; - int ix; /* Fetch the list of shared libraries. */ gdb::optional library_document @@ -263,13 +239,14 @@ solib_target_current_sos (void) return NULL; /* Parse the list. */ - library_list = solib_target_parse_libraries (library_document->data ()); + lm_info_vector library_list + = solib_target_parse_libraries (library_document->data ()); - if (library_list == NULL) + if (library_list.empty ()) return NULL; /* Build a struct so_list for each entry on the list. */ - for (ix = 0; VEC_iterate (lm_info_target_p, library_list, ix, info); ix++) + for (auto &&info : library_list) { new_solib = XCNEW (struct so_list); strncpy (new_solib->so_name, info->name.c_str (), @@ -278,11 +255,12 @@ solib_target_current_sos (void) strncpy (new_solib->so_original_name, info->name.c_str (), SO_NAME_MAX_PATH_SIZE - 1); new_solib->so_original_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; - new_solib->lm_info = info; /* We no longer need this copy of the name. */ info->name.clear (); + new_solib->lm_info = info.release (); + /* Add it to the list. */ if (!start) last = start = new_solib; @@ -293,9 +271,6 @@ solib_target_current_sos (void) } } - /* Free the library list, but not its members. */ - VEC_free (lm_info_target_p, library_list); - return start; } @@ -330,13 +305,11 @@ solib_target_relocate_section_addresses (struct so_list *so, /* Build the offset table only once per object file. We can not do it any earlier, since we need to open the file first. */ - if (li->offsets == NULL) + if (li->offsets.empty ()) { int num_sections = gdb_bfd_count_sections (so->abfd); - li->offsets - = ((struct section_offsets *) - xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections))); + li->offsets.assign (num_sections, 0); if (!li->section_bases.empty ()) { @@ -347,7 +320,7 @@ solib_target_relocate_section_addresses (struct so_list *so, for (i = 0, sect = so->abfd->sections; sect != NULL; i++, sect = sect->next) - if ((bfd_get_section_flags (so->abfd, sect) & SEC_ALLOC)) + if ((bfd_section_flags (sect) & SEC_ALLOC)) num_alloc_sections++; if (num_alloc_sections != li->section_bases.size ()) @@ -365,14 +338,14 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"), sect != NULL; i++, sect = sect->next) { - if (!(bfd_get_section_flags (so->abfd, sect) & SEC_ALLOC)) + if (!(bfd_section_flags (sect) & SEC_ALLOC)) continue; - if (bfd_section_size (so->abfd, sect) > 0) + if (bfd_section_size (sect) > 0) { CORE_ADDR low, high; low = li->section_bases[i]; - high = low + bfd_section_size (so->abfd, sect) - 1; + high = low + bfd_section_size (sect) - 1; if (low < so->addr_low) so->addr_low = low; @@ -381,7 +354,7 @@ Could not relocate shared library \"%s\": wrong number of ALLOC sections"), gdb_assert (so->addr_low <= so->addr_high); found_range = 1; } - li->offsets->offsets[i] = li->section_bases[bases_index]; + li->offsets[i] = li->section_bases[bases_index]; bases_index++; } if (!found_range) @@ -402,7 +375,8 @@ Could not relocate shared library \"%s\": no segments"), so->so_name); ULONGEST orig_delta; int i; - if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets, + if (!symfile_map_offsets_to_segments (so->abfd, data, + li->offsets, li->segment_bases.size (), li->segment_bases.data ())) warning (_("\ @@ -439,9 +413,8 @@ Could not relocate shared library \"%s\": bad offsets"), so->so_name); } } - offset = li->offsets->offsets[gdb_bfd_section_index - (sec->the_bfd_section->owner, - sec->the_bfd_section)]; + offset = li->offsets[gdb_bfd_section_index (sec->the_bfd_section->owner, + sec->the_bfd_section)]; sec->addr += offset; sec->endaddr += offset; }