- Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2007-2019 Free Software Foundation, Inc.
{
/* The library's name. The name is normally kept in the struct
so_list; it is only here during XML parsing. */
{
/* The library's name. The name is normally kept in the struct
so_list; it is only here during XML parsing. */
/* The target can either specify segment bases or section bases, not
both. */
/* The base addresses for each independently relocatable segment of
this shared library. */
/* The target can either specify segment bases or section bases, not
both. */
/* The base addresses for each independently relocatable segment of
this shared library. */
/* The base addresses for each independently allocatable,
relocatable section of this shared library. */
/* The base addresses for each independently allocatable,
relocatable section of this shared library. */
/* The cached offsets for each section of this shared library,
determined from SEGMENT_BASES, or SECTION_BASES. */
/* The cached offsets for each section of this shared library,
determined from SEGMENT_BASES, or SECTION_BASES. */
static void
library_list_start_segment (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
static void
library_list_start_segment (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- VEC(lm_info_p) **list = user_data;
- struct lm_info *last = VEC_last (lm_info_p, *list);
- ULONGEST *address_p = xml_find_attribute (attributes, "address")->value;
+ 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 ();
}
static void
library_list_start_section (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
}
static void
library_list_start_section (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- VEC(lm_info_p) **list = user_data;
- struct lm_info *last = VEC_last (lm_info_p, *list);
- ULONGEST *address_p = xml_find_attribute (attributes, "address")->value;
+ 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 ();
static void
library_list_start_library (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
static void
library_list_start_library (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- VEC(lm_info_p) **list = user_data;
- struct lm_info *item = XZALLOC (struct lm_info);
- const char *name = xml_find_attribute (attributes, "name")->value;
+ 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 ();
const struct gdb_xml_element *element,
void *user_data, const char *body_text)
{
const struct gdb_xml_element *element,
void *user_data, const char *body_text)
{
- VEC(lm_info_p) **list = user_data;
- struct lm_info *lm_info = VEC_last (lm_info_p, *list);
+ lm_info_vector *list = (lm_info_vector *) user_data;
+ lm_info_target *lm_info = list->back ().get ();
- 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"));
static void
library_list_start_list (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
static void
library_list_start_list (struct gdb_xml_parser *parser,
const struct gdb_xml_element *element,
- char *version = xml_find_attribute (attributes, "version")->value;
-
- if (strcmp (version, "1.0") != 0)
- gdb_xml_error (parser,
- _("Library list has unsupported version \"%s\""),
- version);
-}
-
-/* Discard the constructed library list. */
+ struct gdb_xml_value *version = xml_find_attribute (attributes, "version");
-static void
-solib_target_free_library_list (void *p)
-{
- VEC(lm_info_p) **result = p;
- struct lm_info *info;
- int ix;
-
- for (ix = 0; VEC_iterate (lm_info_p, *result, ix, info); ix++)
+ /* #FIXED attribute may be omitted, Expat returns NULL in such case. */
+ if (version != NULL)
- xfree (info->name);
- VEC_free (CORE_ADDR, info->segment_bases);
- VEC_free (CORE_ADDR, info->section_bases);
- xfree (info);
+ const char *string = (const char *) version->value.get ();
+
+ if (strcmp (string, "1.0") != 0)
+ gdb_xml_error (parser,
+ _("Library list has unsupported version \"%s\""),
+ string);
}
/* The allowed elements and attributes for an XML library list.
The root element is a <library-list>. */
}
/* The allowed elements and attributes for an XML library list.
The root element is a <library-list>. */
{ "address", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "address", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "address", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "address", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "segment", segment_attributes, NULL,
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
library_list_start_segment, NULL },
{ "segment", segment_attributes, NULL,
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
library_list_start_segment, NULL },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
{ "name", GDB_XML_AF_NONE, NULL, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "name", GDB_XML_AF_NONE, NULL, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "library", library_attributes, library_children,
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
library_list_start_library, library_list_end_library },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
{ "library", library_attributes, library_children,
GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
library_list_start_library, library_list_end_library },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
-const struct gdb_xml_attribute library_list_attributes[] = {
- { "version", GDB_XML_AF_NONE, NULL, NULL },
+static const struct gdb_xml_attribute library_list_attributes[] = {
+ { "version", GDB_XML_AF_OPTIONAL, NULL, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ "library-list", library_list_attributes, library_list_children,
GDB_XML_EF_NONE, library_list_start_list, NULL },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
{ "library-list", library_list_attributes, library_list_children,
GDB_XML_EF_NONE, library_list_start_list, NULL },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd",
library_list_elements, library, &result) == 0)
{
if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd",
library_list_elements, library, &result) == 0)
{
solib_target_current_sos (void)
{
struct so_list *new_solib, *start = NULL, *last = NULL;
solib_target_current_sos (void)
{
struct so_list *new_solib, *start = NULL, *last = NULL;
- 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)
- library_list = solib_target_parse_libraries (library_document);
- if (library_list == NULL)
+ lm_info_vector library_list
+ = solib_target_parse_libraries (library_document->data ());
+
+ if (library_list.empty ())
- new_solib = XZALLOC (struct so_list);
- strncpy (new_solib->so_name, info->name, SO_NAME_MAX_PATH_SIZE - 1);
+ new_solib = XCNEW (struct so_list);
+ strncpy (new_solib->so_name, info->name.c_str (),
+ SO_NAME_MAX_PATH_SIZE - 1);
- 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);
+ lm_info_target *li = (lm_info_target *) so->lm_info;
+
+ gdb_assert (li->name.empty ());
+
+ delete li;
}
static void
solib_target_relocate_section_addresses (struct so_list *so,
struct target_section *sec)
{
}
static void
solib_target_relocate_section_addresses (struct so_list *so,
struct target_section *sec)
{
/* Build the offset table only once per object file. We can not do
it any earlier, since we need to open the file first. */
/* Build the offset table only once per object file. We can not do
it any earlier, since we need to open the file first. */
int num_alloc_sections = 0;
for (i = 0, sect = so->abfd->sections;
sect != NULL;
i++, sect = sect->next)
int num_alloc_sections = 0;
for (i = 0, sect = so->abfd->sections;
sect != NULL;
i++, sect = sect->next)
- low = section_bases[i];
- high = low + bfd_section_size (so->abfd, sect) - 1;
+ low = li->section_bases[i];
+ high = low + bfd_section_size (sect) - 1;
- 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);
- if (!symfile_map_offsets_to_segments (so->abfd, data,
- so->lm_info->offsets,
- num_bases, segment_bases))
+ if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets,
+ li->segment_bases.size (),
+ li->segment_bases.data ()))
warning (_("\
Could not relocate shared library \"%s\": bad offsets"), so->so_name);
/* Find the range of addresses to report for this library in
"info sharedlibrary". Report any consecutive segments
which were relocated as a single unit. */
warning (_("\
Could not relocate shared library \"%s\": bad offsets"), so->so_name);
/* Find the range of addresses to report for this library in
"info sharedlibrary". Report any consecutive segments
which were relocated as a single unit. */
for (i = 1; i < data->num_segments; i++)
{
/* If we have run out of offsets, assume all
remaining segments have the same offset. */
for (i = 1; i < data->num_segments; i++)
{
/* If we have run out of offsets, assume all
remaining segments have the same offset. */
continue;
/* If this segment does not have the same offset, do
not include it in the library's range. */
continue;
/* If this segment does not have the same offset, do
not include it in the library's range. */
- offset = so->lm_info->offsets->offsets[sec->the_bfd_section->index];
+ offset = li->offsets->offsets[gdb_bfd_section_index
+ (sec->the_bfd_section->owner,
+ sec->the_bfd_section)];
{
/* We can't locate the main symbol file based on the target's
knowledge; the user has to specify it. */
{
/* We can't locate the main symbol file based on the target's
knowledge; the user has to specify it. */
/* We don't have a range of addresses for the dynamic linker; there
may not be one in the program's address space. So only report
PLT entries (which may be import stubs). */
/* We don't have a range of addresses for the dynamic linker; there
may not be one in the program's address space. So only report
PLT entries (which may be import stubs). */
solib_target_so_ops.clear_solib = solib_target_clear_solib;
solib_target_so_ops.solib_create_inferior_hook
= solib_target_solib_create_inferior_hook;
solib_target_so_ops.clear_solib = solib_target_clear_solib;
solib_target_so_ops.solib_create_inferior_hook
= solib_target_solib_create_inferior_hook;
solib_target_so_ops.current_sos = solib_target_current_sos;
solib_target_so_ops.open_symbol_file_object
= solib_target_open_symbol_file_object;
solib_target_so_ops.current_sos = solib_target_current_sos;
solib_target_so_ops.open_symbol_file_object
= solib_target_open_symbol_file_object;