/* Definitions for targets which report shared library events.
- Copyright (C) 2007-2017 Free Software Foundation, Inc.
+ Copyright (C) 2007-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "symtab.h"
#include "symfile.h"
#include "target.h"
-#include "vec.h"
#include "solib-target.h"
#include <vector>
/* 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<std::unique_ptr<lm_info_target>> 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;
"at compile time"));
}
- return NULL;
+ return lm_info_vector ();
}
#else /* HAVE_LIBEXPAT */
static void
library_list_start_segment (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &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;
+ = (ULONGEST *) xml_find_attribute (attributes, "address")->value.get ();
CORE_ADDR address = (CORE_ADDR) *address_p;
if (!last->section_bases.empty ())
static void
library_list_start_section (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &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;
+ = (ULONGEST *) xml_find_attribute (attributes, "address")->value.get ();
CORE_ADDR address = (CORE_ADDR) *address_p;
if (!last->segment_bases.empty ())
static void
library_list_start_library (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &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;
- const char *name
- = (const char *) xml_find_attribute (attributes, "name")->value;
+ item->name
+ = (const char *) xml_find_attribute (attributes, "name")->value.get ();
- item->name = xstrdup (name);
- VEC_safe_push (lm_info_target_p, *list, item);
+ list->emplace_back (item);
}
static void
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"));
static void
library_list_start_list (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- void *user_data, VEC(gdb_xml_value_s) *attributes)
+ void *user_data,
+ std::vector<gdb_xml_value> &attributes)
{
struct gdb_xml_value *version = xml_find_attribute (attributes, "version");
/* #FIXED attribute may be omitted, Expat returns NULL in such case. */
if (version != NULL)
{
- const char *string = (const char *) version->value;
+ const char *string = (const char *) version->value.get ();
if (strcmp (string, "1.0") != 0)
gdb_xml_error (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 <library-list>. */
{ 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
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::unique_xmalloc_ptr<char> library_document
- = target_read_stralloc (¤t_target, TARGET_OBJECT_LIBRARIES, NULL);
- if (library_document == NULL)
+ gdb::optional<gdb::char_vector> library_document
+ = target_read_stralloc (current_top_target (), TARGET_OBJECT_LIBRARIES,
+ NULL);
+ if (!library_document)
return NULL;
/* Parse the list. */
- library_list = solib_target_parse_libraries (library_document.get ());
+ 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 (),
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;
}
}
- /* Free the library list, but not its members. */
- VEC_free (lm_info_target_p, library_list);
-
return start;
}
/* 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 ())
{
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 ())
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;
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)
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 (_("\
}
}
- 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;
}
projects / deliverable / binutils-gdb.git / blobdiff