/* Definitions for targets which report shared library events.
- Copyright (C) 2007-2012 Free Software Foundation, Inc.
+ Copyright (C) 2007-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "target.h"
#include "vec.h"
#include "solib-target.h"
-
-#include "gdb_string.h"
+#include <vector>
/* Private data for each loaded library. */
-struct lm_info
+struct lm_info_target : public lm_info_base
{
/* The library's name. The name is normally kept in the struct
so_list; it is only here during XML parsing. */
- char *name;
+ std::string 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;
+ section_offsets *offsets = NULL;
};
-typedef struct lm_info *lm_info_p;
-DEF_VEC_P(lm_info_p);
+typedef lm_info_target *lm_info_target_p;
+DEF_VEC_P(lm_info_target_p);
#if !defined(HAVE_LIBEXPAT)
-static VEC(lm_info_p) *
+static VEC(lm_info_target_p) *
solib_target_parse_libraries (const char *library)
{
static int have_warned;
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- 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;
+ VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data;
+ lm_info_target *last = VEC_last (lm_info_target_p, *list);
+ ULONGEST *address_p
+ = (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
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- 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;
+ VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data;
+ lm_info_target *last = VEC_last (lm_info_target_p, *list);
+ ULONGEST *address_p
+ = (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. */
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- VEC(lm_info_p) **list = user_data;
- struct lm_info *item = XZALLOC (struct lm_info);
- const char *name = xml_find_attribute (attributes, "name")->value;
+ VEC(lm_info_target_p) **list = (VEC(lm_info_target_p) **) user_data;
+ lm_info_target *item = new lm_info_target;
+ const char *name
+ = (const char *) xml_find_attribute (attributes, "name")->value;
item->name = xstrdup (name);
- VEC_safe_push (lm_info_p, *list, item);
+ VEC_safe_push (lm_info_target_p, *list, item);
}
static void
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);
+ 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);
- 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"));
}
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- char *version = xml_find_attribute (attributes, "version")->value;
+ struct gdb_xml_value *version = xml_find_attribute (attributes, "version");
- if (strcmp (version, "1.0") != 0)
- gdb_xml_error (parser,
- _("Library list has unsupported version \"%s\""),
- version);
+ /* #FIXED attribute may be omitted, Expat returns NULL in such case. */
+ if (version != NULL)
+ {
+ const char *string = (const char *) version->value;
+
+ if (strcmp (string, "1.0") != 0)
+ gdb_xml_error (parser,
+ _("Library list has unsupported version \"%s\""),
+ string);
+ }
}
/* Discard the constructed library list. */
static void
solib_target_free_library_list (void *p)
{
- VEC(lm_info_p) **result = p;
- struct lm_info *info;
+ 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_p, *result, ix, info); ix++)
- {
- xfree (info->name);
- VEC_free (CORE_ADDR, info->segment_bases);
- VEC_free (CORE_ADDR, info->section_bases);
- xfree (info);
- }
- VEC_free (lm_info_p, *result);
+ for (ix = 0; VEC_iterate (lm_info_target_p, *result, ix, info); ix++)
+ delete info;
+
+ VEC_free (lm_info_target_p, *result);
*result = NULL;
}
};
static const struct gdb_xml_attribute library_list_attributes[] = {
- { "version", GDB_XML_AF_NONE, NULL, NULL },
+ { "version", GDB_XML_AF_OPTIONAL, NULL, NULL },
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
};
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
-static VEC(lm_info_p) *
+static VEC(lm_info_target_p) *
solib_target_parse_libraries (const char *library)
{
- VEC(lm_info_p) *result = NULL;
+ VEC(lm_info_target_p) *result = NULL;
struct cleanup *back_to = make_cleanup (solib_target_free_library_list,
&result);
solib_target_current_sos (void)
{
struct so_list *new_solib, *start = NULL, *last = NULL;
- const char *library_document;
- VEC(lm_info_p) *library_list;
- struct lm_info *info;
+ char *library_document;
+ struct cleanup *old_chain;
+ VEC(lm_info_target_p) *library_list;
+ lm_info_target *info;
int ix;
/* Fetch the list of shared libraries. */
if (library_document == NULL)
return NULL;
+ /* solib_target_parse_libraries may throw, so we use a cleanup. */
+ old_chain = make_cleanup (xfree, library_document);
+
/* Parse the list. */
library_list = solib_target_parse_libraries (library_document);
+
+ /* library_document string is not needed behind this point. */
+ do_cleanups (old_chain);
+
if (library_list == NULL)
return NULL;
/* Build a struct so_list for each entry on the list. */
- for (ix = 0; VEC_iterate (lm_info_p, library_list, ix, info); ix++)
+ for (ix = 0; VEC_iterate (lm_info_target_p, library_list, ix, info); ix++)
{
- 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);
new_solib->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
- strncpy (new_solib->so_original_name, info->name,
+ 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. */
- xfree (info->name);
- info->name = NULL;
+ info->name.clear ();
/* Add it to the list. */
if (!start)
}
/* Free the library list, but not its members. */
- VEC_free (lm_info_p, library_list);
+ VEC_free (lm_info_target_p, library_list);
return start;
}
-static void
-solib_target_special_symbol_handling (void)
-{
- /* Nothing needed. */
-}
-
static void
solib_target_solib_create_inferior_hook (int from_tty)
{
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);
+ 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)
{
- int flags = bfd_get_section_flags (sec->bfd, sec->the_bfd_section);
CORE_ADDR offset;
+ lm_info_target *li = (lm_info_target *) so->lm_info;
/* 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 (so->lm_info->offsets == NULL)
+ if (li->offsets == NULL)
{
- int num_sections = bfd_count_sections (so->abfd);
+ int num_sections = gdb_bfd_count_sections (so->abfd);
- so->lm_info->offsets = xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections));
+ li->offsets
+ = ((struct section_offsets *)
+ xzalloc (SIZEOF_N_SECTION_OFFSETS (num_sections)));
- if (so->lm_info->section_bases)
+ if (!li->section_bases.empty ())
{
int i;
asection *sect;
- int num_section_bases
- = VEC_length (CORE_ADDR, so->lm_info->section_bases);
+ int num_section_bases = li->section_bases.size ();
int num_alloc_sections = 0;
for (i = 0, sect = so->abfd->sections;
{
int bases_index = 0;
int found_range = 0;
- CORE_ADDR *section_bases;
-
- section_bases = VEC_address (CORE_ADDR,
- so->lm_info->section_bases);
so->addr_low = ~(CORE_ADDR) 0;
so->addr_high = 0;
{
CORE_ADDR low, high;
- low = section_bases[i];
+ low = li->section_bases[i];
high = low + bfd_section_size (so->abfd, sect) - 1;
if (low < so->addr_low)
gdb_assert (so->addr_low <= so->addr_high);
found_range = 1;
}
- so->lm_info->offsets->offsets[i]
- = section_bases[bases_index];
+ li->offsets->offsets[i] = li->section_bases[bases_index];
bases_index++;
}
if (!found_range)
gdb_assert (so->addr_low <= so->addr_high);
}
}
- else if (so->lm_info->segment_bases)
+ else if (!li->segment_bases.empty ())
{
struct symfile_segment_data *data;
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 = li->segment_bases.size ();
+ segment_bases = li->segment_bases.data ();
- if (!symfile_map_offsets_to_segments (so->abfd, data,
- so->lm_info->offsets,
+ if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets,
num_bases, segment_bases))
warning (_("\
Could not relocate shared library \"%s\": bad offsets"), so->so_name);
}
}
- 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)];
sec->addr += offset;
sec->endaddr += offset;
}
/* 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). */
- return in_plt_section (pc, NULL);
+ return in_plt_section (pc);
}
struct target_so_ops solib_target_so_ops;
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.special_symbol_handling
- = solib_target_special_symbol_handling;
solib_target_so_ops.current_sos = solib_target_current_sos;
solib_target_so_ops.open_symbol_file_object
= solib_target_open_symbol_file_object;
projects / deliverable / binutils-gdb.git / blobdiff