/* Partial symbol tables.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2016 Free Software Foundation, Inc.
This file is part of GDB.
if (objfile->psymtabs_addrmap != NULL)
{
- pst = addrmap_find (objfile->psymtabs_addrmap, pc);
+ pst = ((struct partial_symtab *)
+ addrmap_find (objfile->psymtabs_addrmap, pc));
if (pst != NULL)
{
/* FIXME: addrmaps currently do not handle overlayed sections,
{
center = bottom + (top - bottom) / 2;
gdb_assert (center < top);
- if (!do_linear_search
- && (SYMBOL_LANGUAGE (*center) == language_java))
- do_linear_search = 1;
if (ordered_compare (SYMBOL_SEARCH_NAME (*center), name) >= 0)
top = center;
else
switch (current_language->la_language)
{
case language_cplus:
- case language_java:
{
if (strchr (name, '('))
{
if (!(center < top))
internal_error (__FILE__, __LINE__,
_("failed internal consistency check"));
- if (!do_linear_search
- && SYMBOL_LANGUAGE (*center) == language_java)
- {
- do_linear_search = 1;
- }
if (strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*center),
search_name) >= 0)
{
if (ps->dirname == NULL || IS_ABSOLUTE_PATH (ps->filename))
fullname = xstrdup (ps->filename);
else
- fullname = concat (ps->dirname, SLASH_STRING, ps->filename, NULL);
+ fullname = concat (ps->dirname, SLASH_STRING,
+ ps->filename, (char *) NULL);
back_to = make_cleanup (xfree, fullname);
ps->fullname = rewrite_source_path (fullname);
static int
compare_psymbols (const void *s1p, const void *s2p)
{
- struct partial_symbol *const *s1 = s1p;
- struct partial_symbol *const *s2 = s2p;
+ struct partial_symbol *const *s1 = (struct partial_symbol * const*) s1p;
+ struct partial_symbol *const *s2 = (struct partial_symbol * const*) s2p;
return strcmp_iw_ordered (SYMBOL_SEARCH_NAME (*s1),
SYMBOL_SEARCH_NAME (*s2));
struct partial_symbol *sym1 = (struct partial_symbol *) addr1;
struct partial_symbol *sym2 = (struct partial_symbol *) addr2;
- return (memcmp (&sym1->ginfo.value, &sym1->ginfo.value,
+ return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value,
sizeof (sym1->ginfo.value)) == 0
&& sym1->ginfo.language == sym2->ginfo.language
&& PSYMBOL_DOMAIN (sym1) == PSYMBOL_DOMAIN (sym2)
struct psymbol_bcache *bcache,
int *added)
{
- return bcache_full (sym,
- sizeof (struct partial_symbol),
- bcache->bcache,
- added);
+ return ((const struct partial_symbol *)
+ bcache_full (sym, sizeof (struct partial_symbol), bcache->bcache,
+ added));
}
/* Helper function, initialises partial symbol structure and stashes
sizeof (struct partial_symtab));
memset (psymtab, 0, sizeof (struct partial_symtab));
- psymtab->filename = bcache (filename, strlen (filename) + 1,
- objfile->per_bfd->filename_cache);
+ psymtab->filename
+ = (const char *) bcache (filename, strlen (filename) + 1,
+ objfile->per_bfd->filename_cache);
psymtab->compunit_symtab = NULL;
/* Prepend it to the psymtab list for the objfile it belongs to.
static void
discard_psymtabs_upto (void *arg)
{
- struct psymtab_state *state = arg;
+ struct psymtab_state *state = (struct psymtab_state *) arg;
while (state->objfile->psymtabs != state->save)
discard_psymtab (state->objfile, state->objfile->psymtabs);
\f
+/* We need to pass a couple of items to the addrmap_foreach function,
+ so use a struct. */
+
+struct dump_psymtab_addrmap_data
+{
+ struct objfile *objfile;
+ struct partial_symtab *psymtab;
+ struct ui_file *outfile;
+
+ /* Non-zero if the previously printed addrmap entry was for PSYMTAB.
+ If so, we want to print the next one as well (since the next addrmap
+ entry defines the end of the range). */
+ int previous_matched;
+};
+
+/* Helper function for dump_psymtab_addrmap to print an addrmap entry. */
+
+static int
+dump_psymtab_addrmap_1 (void *datap, CORE_ADDR start_addr, void *obj)
+{
+ struct dump_psymtab_addrmap_data *data
+ = (struct dump_psymtab_addrmap_data *) datap;
+ struct gdbarch *gdbarch = get_objfile_arch (data->objfile);
+ struct partial_symtab *addrmap_psymtab = (struct partial_symtab *) obj;
+ const char *psymtab_address_or_end = NULL;
+
+ QUIT;
+
+ if (data->psymtab == NULL
+ || data->psymtab == addrmap_psymtab)
+ psymtab_address_or_end = host_address_to_string (addrmap_psymtab);
+ else if (data->previous_matched)
+ psymtab_address_or_end = "<ends here>";
+
+ if (data->psymtab == NULL
+ || data->psymtab == addrmap_psymtab
+ || data->previous_matched)
+ {
+ fprintf_filtered (data->outfile, " %s%s %s\n",
+ data->psymtab != NULL ? " " : "",
+ paddress (gdbarch, start_addr),
+ psymtab_address_or_end);
+ }
+
+ data->previous_matched = (data->psymtab == NULL
+ || data->psymtab == addrmap_psymtab);
+
+ return 0;
+}
+
+/* Helper function for maintenance_print_psymbols to print the addrmap
+ of PSYMTAB. If PSYMTAB is NULL print the entire addrmap. */
+
+static void
+dump_psymtab_addrmap (struct objfile *objfile, struct partial_symtab *psymtab,
+ struct ui_file *outfile)
+{
+ struct dump_psymtab_addrmap_data addrmap_dump_data;
+
+ if (psymtab == NULL
+ || psymtab->psymtabs_addrmap_supported)
+ {
+ addrmap_dump_data.objfile = objfile;
+ addrmap_dump_data.psymtab = psymtab;
+ addrmap_dump_data.outfile = outfile;
+ addrmap_dump_data.previous_matched = 0;
+ fprintf_filtered (outfile, "%sddress map:\n",
+ psymtab == NULL ? "Entire a" : " A");
+ addrmap_foreach (objfile->psymtabs_addrmap, dump_psymtab_addrmap_1,
+ &addrmap_dump_data);
+ }
+}
+
static void
maintenance_print_psymbols (char *args, int from_tty)
{
perror_with_name (filename);
make_cleanup_ui_file_delete (outfile);
- ALL_PSYMTABS (objfile, ps)
+ ALL_OBJFILES (objfile)
+ {
+ fprintf_filtered (outfile, "\nPartial symtabs for objfile %s\n",
+ objfile_name (objfile));
+
+ ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
{
QUIT;
if (symname == NULL || filename_cmp (symname, ps->filename) == 0)
- dump_psymtab (objfile, ps, outfile);
+ {
+ dump_psymtab (objfile, ps, outfile);
+ dump_psymtab_addrmap (objfile, ps, outfile);
+ }
}
+
+ /* If we're printing all symbols dump the full addrmap. */
+
+ if (symname == NULL)
+ {
+ fprintf_filtered (outfile, "\n");
+ dump_psymtab_addrmap (objfile, NULL, outfile);
+ }
+ }
+
do_cleanups (cleanups);
}
projects / deliverable / binutils-gdb.git / blobdiff