/* Debug logging for the symbol file functions for the GNU debugger, GDB.
- Copyright (C) 2013 Free Software Foundation, Inc.
+ Copyright (C) 2013-2015 Free Software Foundation, Inc.
Contributed by Cygnus Support, using pieces from other GDB modules.
&& objfile_data (objfile, symfile_debug_objfile_data_key) != NULL);
}
-/* Utility to return the name to print for OBJFILE. */
-
-static const char *
-debug_objfile_name (const struct objfile *objfile)
-{
- return lbasename (objfile->original_name);
-}
-
/* Utility return the name to print for SYMTAB. */
static const char *
retval = debug_data->real_sf->qf->has_symbols (objfile);
fprintf_filtered (gdb_stdlog, "qf->has_symbols (%s) = %d\n",
- debug_objfile_name (objfile), retval);
+ objfile_debug_name (objfile), retval);
return retval;
}
struct symtab *retval;
fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
retval = debug_data->real_sf->qf->find_last_source_symtab (objfile);
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "qf->forget_cached_source_info (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->qf->forget_cached_source_info (objfile);
}
fprintf_filtered (gdb_stdlog,
"qf->map_symtabs_matching_filename (%s, \"%s\", \"%s\", %s, %s)\n",
- debug_objfile_name (objfile), name,
+ objfile_debug_name (objfile), name,
real_path ? real_path : NULL,
host_address_to_string (callback),
host_address_to_string (data));
return retval;
}
-static struct symtab *
+static struct compunit_symtab *
debug_qf_lookup_symbol (struct objfile *objfile, int kind, const char *name,
domain_enum domain)
{
const struct debug_sym_fns_data *debug_data =
objfile_data (objfile, symfile_debug_objfile_data_key);
- struct symtab *retval;
+ struct compunit_symtab *retval;
fprintf_filtered (gdb_stdlog,
"qf->lookup_symbol (%s, %d, \"%s\", %s)\n",
- debug_objfile_name (objfile), kind, name,
+ objfile_debug_name (objfile), kind, name,
domain_name (domain));
retval = debug_data->real_sf->qf->lookup_symbol (objfile, kind, name,
domain);
fprintf_filtered (gdb_stdlog, "qf->lookup_symbol (...) = %s\n",
- retval ? debug_symtab_name (retval) : "NULL");
+ retval
+ ? debug_symtab_name (compunit_primary_filetab (retval))
+ : "NULL");
return retval;
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "qf->print_stats (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->qf->print_stats (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "qf->dump (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->qf->dump (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "qf->relocate (%s, %s, %s)\n",
- debug_objfile_name (objfile),
+ objfile_debug_name (objfile),
host_address_to_string (new_offsets),
host_address_to_string (delta));
fprintf_filtered (gdb_stdlog,
"qf->expand_symtabs_for_function (%s, \"%s\")\n",
- debug_objfile_name (objfile), func_name);
+ objfile_debug_name (objfile), func_name);
debug_data->real_sf->qf->expand_symtabs_for_function (objfile, func_name);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "qf->expand_all_symtabs (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->qf->expand_all_symtabs (objfile);
}
fprintf_filtered (gdb_stdlog,
"qf->expand_symtabs_with_fullname (%s, \"%s\")\n",
- debug_objfile_name (objfile), fullname);
+ objfile_debug_name (objfile), fullname);
debug_data->real_sf->qf->expand_symtabs_with_fullname (objfile, fullname);
}
static void
debug_qf_map_matching_symbols (struct objfile *objfile,
- const char *name, domain_enum namespace,
+ const char *name, domain_enum domain,
int global,
int (*callback) (struct block *,
struct symbol *, void *),
fprintf_filtered (gdb_stdlog,
"qf->map_matching_symbols (%s, \"%s\", %s, %d, %s, %s, %s, %s)\n",
- debug_objfile_name (objfile), name,
- domain_name (namespace), global,
+ objfile_debug_name (objfile), name,
+ domain_name (domain), global,
host_address_to_string (callback),
host_address_to_string (data),
host_address_to_string (match),
host_address_to_string (ordered_compare));
debug_data->real_sf->qf->map_matching_symbols (objfile, name,
- namespace, global,
+ domain, global,
callback, data,
match,
ordered_compare);
}
static void
-debug_qf_expand_symtabs_matching (struct objfile *objfile,
- int (*file_matcher) (const char *, void *,
- int basenames),
- int (*name_matcher) (const char *, void *),
- enum search_domain kind,
- void *data)
+debug_qf_expand_symtabs_matching
+ (struct objfile *objfile,
+ expand_symtabs_file_matcher_ftype *file_matcher,
+ expand_symtabs_symbol_matcher_ftype *symbol_matcher,
+ expand_symtabs_exp_notify_ftype *expansion_notify,
+ enum search_domain kind, void *data)
{
const struct debug_sym_fns_data *debug_data =
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog,
- "qf->expand_symtabs_matching (%s, %s, %s, %s, %s)\n",
- debug_objfile_name (objfile),
+ "qf->expand_symtabs_matching (%s, %s, %s, %s, %s, %s)\n",
+ objfile_debug_name (objfile),
host_address_to_string (file_matcher),
- host_address_to_string (name_matcher),
+ host_address_to_string (symbol_matcher),
+ host_address_to_string (expansion_notify),
search_domain_name (kind),
host_address_to_string (data));
debug_data->real_sf->qf->expand_symtabs_matching (objfile,
file_matcher,
- name_matcher,
+ symbol_matcher,
+ expansion_notify,
kind, data);
}
-static struct symtab *
-debug_qf_find_pc_sect_symtab (struct objfile *objfile,
- struct minimal_symbol *msymbol,
- CORE_ADDR pc,
- struct obj_section *section,
- int warn_if_readin)
+static struct compunit_symtab *
+debug_qf_find_pc_sect_compunit_symtab (struct objfile *objfile,
+ struct bound_minimal_symbol msymbol,
+ CORE_ADDR pc,
+ struct obj_section *section,
+ int warn_if_readin)
{
const struct debug_sym_fns_data *debug_data =
objfile_data (objfile, symfile_debug_objfile_data_key);
- struct symtab *retval;
+ struct compunit_symtab *retval;
fprintf_filtered (gdb_stdlog,
- "qf->find_pc_sect_symtab (%s, %s, %s, %s, %d)\n",
- debug_objfile_name (objfile),
- host_address_to_string (msymbol),
+ "qf->find_pc_sect_compunit_symtab (%s, %s, %s, %s, %d)\n",
+ objfile_debug_name (objfile),
+ host_address_to_string (msymbol.minsym),
hex_string (pc),
host_address_to_string (section),
warn_if_readin);
- retval = debug_data->real_sf->qf->find_pc_sect_symtab (objfile, msymbol,
- pc, section,
- warn_if_readin);
+ retval
+ = debug_data->real_sf->qf->find_pc_sect_compunit_symtab (objfile, msymbol,
+ pc, section,
+ warn_if_readin);
- fprintf_filtered (gdb_stdlog, "qf->find_pc_sect_symtab (...) = %s\n",
- retval ? debug_symtab_name (retval) : "NULL");
+ fprintf_filtered (gdb_stdlog,
+ "qf->find_pc_sect_compunit_symtab (...) = %s\n",
+ retval
+ ? debug_symtab_name (compunit_primary_filetab (retval))
+ : "NULL");
return retval;
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog,
"qf->map_symbol_filenames (%s, %s, %s, %d)\n",
- debug_objfile_name (objfile),
+ objfile_debug_name (objfile),
host_address_to_string (fun),
host_address_to_string (data),
need_fullname);
debug_qf_expand_symtabs_with_fullname,
debug_qf_map_matching_symbols,
debug_qf_expand_symtabs_matching,
- debug_qf_find_pc_sect_symtab,
+ debug_qf_find_pc_sect_compunit_symtab,
debug_qf_map_symbol_filenames
};
\f
fprintf_filtered (gdb_stdlog,
"probes->sym_get_probes (%s) = %s\n",
- debug_objfile_name (objfile),
+ objfile_debug_name (objfile),
host_address_to_string (retval));
return retval;
}
-static unsigned
-debug_sym_get_probe_argument_count (struct probe *probe)
-{
- struct objfile *objfile = probe->objfile;
- const struct debug_sym_fns_data *debug_data =
- objfile_data (objfile, symfile_debug_objfile_data_key);
- unsigned retval;
-
- retval = debug_data->real_sf->sym_probe_fns->sym_get_probe_argument_count
- (probe);
-
- fprintf_filtered (gdb_stdlog,
- "probes->sym_get_probe_argument_count (%s) = %u\n",
- host_address_to_string (probe), retval);
-
- return retval;
-}
-
-static int
-debug_can_evaluate_probe_arguments (struct probe *probe)
-{
- struct objfile *objfile = probe->objfile;
- const struct debug_sym_fns_data *debug_data =
- objfile_data (objfile, symfile_debug_objfile_data_key);
- int retval;
-
- retval = debug_data->real_sf->sym_probe_fns->can_evaluate_probe_arguments
- (probe);
-
- fprintf_filtered (gdb_stdlog,
- "probes->can_evaluate_probe_arguments (%s) = %d\n",
- host_address_to_string (probe), retval);
-
- return retval;
-}
-
-static struct value *
-debug_sym_evaluate_probe_argument (struct probe *probe, unsigned n)
-{
- struct objfile *objfile = probe->objfile;
- const struct debug_sym_fns_data *debug_data =
- objfile_data (objfile, symfile_debug_objfile_data_key);
- struct value *retval;
-
- fprintf_filtered (gdb_stdlog,
- "probes->sym_evaluate_probe_argument (%s, %u)\n",
- host_address_to_string (probe), n);
-
- retval = debug_data->real_sf->sym_probe_fns->sym_evaluate_probe_argument
- (probe, n);
-
- fprintf_filtered (gdb_stdlog,
- "probes->sym_evaluate_probe_argument (...) = %s\n",
- host_address_to_string (retval));
-
- return retval;
-}
-
-static void
-debug_sym_compile_to_ax (struct probe *probe, struct agent_expr *expr,
- struct axs_value *value, unsigned n)
-{
- struct objfile *objfile = probe->objfile;
- const struct debug_sym_fns_data *debug_data =
- objfile_data (objfile, symfile_debug_objfile_data_key);
-
- fprintf_filtered (gdb_stdlog,
- "probes->sym_compile_to_ax (%s, %s, %s, %u)\n",
- host_address_to_string (probe),
- host_address_to_string (expr),
- host_address_to_string (value), n);
-
- debug_data->real_sf->sym_probe_fns->sym_compile_to_ax
- (probe, expr, value, n);
-}
-
-static void
-debug_sym_relocate_probe (struct objfile *objfile,
- const struct section_offsets *new_offsets,
- const struct section_offsets *delta)
-{
- const struct debug_sym_fns_data *debug_data =
- objfile_data (objfile, symfile_debug_objfile_data_key);
-
- fprintf_filtered (gdb_stdlog,
- "probes->sym_relocate_probe (%s, %s, %s)\n",
- debug_objfile_name (objfile),
- host_address_to_string (new_offsets),
- host_address_to_string (delta));
-
- debug_data->real_sf->sym_probe_fns->sym_relocate_probe
- (objfile, new_offsets, delta);
-}
-
static const struct sym_probe_fns debug_sym_probe_fns =
{
debug_sym_get_probes,
- debug_sym_get_probe_argument_count,
- debug_can_evaluate_probe_arguments,
- debug_sym_evaluate_probe_argument,
- debug_sym_compile_to_ax,
- debug_sym_relocate_probe
};
\f
/* Debugging version of struct sym_fns. */
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_new_init (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->sym_new_init (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_init (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->sym_init (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_read (%s, 0x%x)\n",
- debug_objfile_name (objfile), symfile_flags);
+ objfile_debug_name (objfile), symfile_flags);
debug_data->real_sf->sym_read (objfile, symfile_flags);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_read_psymbols (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->sym_read_psymbols (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_finish (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->sym_finish (objfile);
}
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_offsets (%s, %s)\n",
- debug_objfile_name (objfile),
+ objfile_debug_name (objfile),
host_address_to_string (info));
debug_data->real_sf->sym_offsets (objfile, info);
objfile_data (objfile, symfile_debug_objfile_data_key);
fprintf_filtered (gdb_stdlog, "sf->sym_read_linetable (%s)\n",
- debug_objfile_name (objfile));
+ objfile_debug_name (objfile));
debug_data->real_sf->sym_read_linetable (objfile);
}
fprintf_filtered (gdb_stdlog,
"sf->sym_relocate (%s, %s, %s) = %s\n",
- debug_objfile_name (objfile),
+ objfile_debug_name (objfile),
host_address_to_string (sectp),
host_address_to_string (buf),
host_address_to_string (retval));
real_sf = objfile->sf;
/* Alas we have to preserve NULL entries in REAL_SF. */
- debug_data = XZALLOC (struct debug_sym_fns_data);
+ debug_data = XCNEW (struct debug_sym_fns_data);
#define COPY_SF_PTR(from, to, name, func) \
do { \
projects / deliverable / binutils-gdb.git / blobdiff