[RFA, doc RFA] Add "set debug symfile on".

[RFA, doc RFA] Add "set debug symfile on".

[Doug Evans]

Hi.

This patch adds a new debugging option: set debug symfile on

For now it logs all calls through the symfile functions.

Regression tested on amd64-linux.

Ok to check in?

2013-09-24  Doug Evans  <dje@google.com>

	New option "set debug symfile on".
	* NEWS: Mention "set debug symfile".
	* Makefile.in (SFILES): Add symfile-debug.c.
	(COMMON_OBS): Add sumfile-debug.o.
	* elfread.c (elf_symfile_read): Use objfile_set_sym_fns to set the
	objfile's symbol functions.
	* objfiles.h (objfile_set_sym_fns): Declare.
        * dwarf2read.c (dw2_map_matching_symbols): Update signature.
	* psymtab.c (map_matching_symbols_psymtab): Update signature.
	* symfile-debug.c: New file.
	* symfile.c (sym_fns_ptr): Delete.  Replace with ...
	(registered_sym_fns): ... this.
	(symtab_fns): Update.
	(syms_from_objfile_1): Use objfile_set_sym_fns to set the objfile's
	symbol functions.
	(reread_symbols): Ditto.
	(add_symtab_fns): New arg "flavour".  All callers updated.
	(find_sym_fns): Rewrite to use new sym_fns registry.
	* symfile.h (struct quick_symbol_functions): Reorg arg list of
	map_matching_symbols so objfile is first.
	(struct sym_fns): Delete member "sym_flavour".  All uses updated.
	Add "objfile" argument to sym_read_linetable.  All uses updated.
	(add_symtab_fns): Update prototype.
	* symtab.c (domain_name, search_domain_name): New functions.
	* symtab.h (domain_name, search_domain_name): Declare.

	doc/
	* gdb.texinfo (Debugging Output): Document set/show debug symfile.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.1268
diff -u -p -r1.1268 Makefile.in
--- Makefile.in	6 Sep 2013 10:50:10 -0000	1.1268
+++ Makefile.in	25 Sep 2013 00:03:11 -0000
@@ -756,7 +756,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
 	serial.c ser-base.c ser-unix.c skip.c \
 	solib.c solib-target.c source.c \
 	stabsread.c stack.c probe.c stap-probe.c std-regs.c \
-	symfile.c symfile-mem.c symmisc.c symtab.c \
+	symfile.c symfile-debug.c symfile-mem.c symmisc.c symtab.c \
 	target.c target-descriptions.c target-memory.c \
 	thread.c top.c tracepoint.c \
 	trad-frame.c \
@@ -894,7 +894,8 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $
 	findvar.o regcache.o cleanups.o \
 	charset.o continuations.o corelow.o disasm.o dummy-frame.o dfp.o \
 	source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o \
-	block.o symtab.o psymtab.o symfile.o symmisc.o linespec.o dictionary.o \
+	block.o symtab.o psymtab.o symfile.o symfile-debug.o symmisc.o \
+	linespec.o dictionary.o \
 	infcall.o \
 	infcmd.o infrun.o \
 	expprint.o environ.o stack.o thread.o \
Index: NEWS
===================================================================
RCS file: /cvs/src/src/gdb/NEWS,v
retrieving revision 1.614
diff -u -p -r1.614 NEWS
--- NEWS	16 Sep 2013 17:47:29 -0000	1.614
+++ NEWS	25 Sep 2013 00:03:11 -0000
@@ -46,6 +46,10 @@ maint set|show per-command symtab
 
 * New options
 
+set debug symfile off|on
+show debug symfile
+  Control display of debugging info for symfile functions.
+
 set print raw frame-arguments
 show print raw frame-arguments
   Set/show whether to print frame arguments in raw mode,
Index: ada-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/ada-lang.c,v
retrieving revision 1.406
diff -u -p -r1.406 ada-lang.c
--- ada-lang.c	5 Aug 2013 15:51:02 -0000	1.406
+++ ada-lang.c	25 Sep 2013 00:03:11 -0000
@@ -5040,11 +5040,11 @@ add_nonlocal_symbols (struct obstack *ob
       data.objfile = objfile;
 
       if (is_wild_match)
-	objfile->sf->qf->map_matching_symbols (name, domain, objfile, global,
+	objfile->sf->qf->map_matching_symbols (objfile, name, domain, global,
 					       aux_add_nonlocal_symbols, &data,
 					       wild_match, NULL);
       else
-	objfile->sf->qf->map_matching_symbols (name, domain, objfile, global,
+	objfile->sf->qf->map_matching_symbols (objfile, name, domain, global,
 					       aux_add_nonlocal_symbols, &data,
 					       full_match, compare_names);
     }
@@ -5057,8 +5057,8 @@ add_nonlocal_symbols (struct obstack *ob
 	  strcpy (name1, "_ada_");
 	  strcpy (name1 + sizeof ("_ada_") - 1, name);
 	  data.objfile = objfile;
-	  objfile->sf->qf->map_matching_symbols (name1, domain,
-						 objfile, global,
+	  objfile->sf->qf->map_matching_symbols (objfile, name1, domain,
+						 global,
 						 aux_add_nonlocal_symbols,
 						 &data,
 						 full_match, compare_names);
Index: buildsym.c
===================================================================
RCS file: /cvs/src/src/gdb/buildsym.c,v
retrieving revision 1.109
diff -u -p -r1.109 buildsym.c
--- buildsym.c	20 Aug 2013 18:57:00 -0000	1.109
+++ buildsym.c	25 Sep 2013 00:03:11 -0000
@@ -1144,9 +1144,10 @@ end_symtab_from_static_block (struct blo
       blockvector = make_blockvector (objfile);
     }
 
-  /* Read the line table if it has to be read separately.  */
+  /* Read the line table if it has to be read separately.
+     This is only used by xcoffread.c.  */
   if (objfile->sf->sym_read_linetable != NULL)
-    objfile->sf->sym_read_linetable ();
+    objfile->sf->sym_read_linetable (objfile);
 
   /* Handle the case where the debug info specifies a different path
      for the main source file.  It can cause us to lose track of its
Index: coffread.c
===================================================================
RCS file: /cvs/src/src/gdb/coffread.c,v
retrieving revision 1.147
diff -u -p -r1.147 coffread.c
--- coffread.c	20 Aug 2013 18:57:00 -0000	1.147
+++ coffread.c	25 Sep 2013 00:03:11 -0000
@@ -2249,7 +2249,6 @@ coff_read_enum_type (int index, int leng
 
 static const struct sym_fns coff_sym_fns =
 {
-  bfd_target_coff_flavour,
   coff_new_init,		/* sym_new_init: init anything gbl to
 				   entire symtab */
   coff_symfile_init,		/* sym_init: read initial info, setup
@@ -2282,7 +2281,7 @@ coff_free_info (struct objfile *objfile,
 void
 _initialize_coffread (void)
 {
-  add_symtab_fns (&coff_sym_fns);
+  add_symtab_fns (bfd_target_coff_flavour, &coff_sym_fns);
 
   coff_objfile_data_key = register_objfile_data_with_cleanup (NULL,
 							      coff_free_info);
Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.149
diff -u -p -r1.149 dbxread.c
--- dbxread.c	20 Aug 2013 18:57:00 -0000	1.149
+++ dbxread.c	25 Sep 2013 00:03:11 -0000
@@ -3564,7 +3564,6 @@ stabsect_build_psymtabs (struct objfile 
 \f
 static const struct sym_fns aout_sym_fns =
 {
-  bfd_target_aout_flavour,
   dbx_new_init,			/* init anything gbl to entire symtab */
   dbx_symfile_init,		/* read initial info, setup for sym_read() */
   dbx_symfile_read,		/* read a symbol file into symtab */
@@ -3581,7 +3580,7 @@ static const struct sym_fns aout_sym_fns
 void
 _initialize_dbxread (void)
 {
-  add_symtab_fns (&aout_sym_fns);
+  add_symtab_fns (bfd_target_aout_flavour, &aout_sym_fns);
 
   dbx_objfile_data_key
     = register_objfile_data_with_cleanup (NULL, dbx_free_symfile_info);
Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.833
diff -u -p -r1.833 dwarf2read.c
--- dwarf2read.c	17 Sep 2013 22:12:55 -0000	1.833
+++ dwarf2read.c	25 Sep 2013 00:03:11 -0000
@@ -3477,8 +3477,9 @@ dw2_expand_symtabs_with_fullname (struct
 }
 
 static void
-dw2_map_matching_symbols (const char * name, domain_enum namespace,
-			  struct objfile *objfile, int global,
+dw2_map_matching_symbols (struct objfile *objfile,
+			  const char * name, domain_enum namespace,
+			  int global,
 			  int (*callback) (struct block *,
 					   struct symbol *, void *),
 			  void *data, symbol_compare_ftype *match,
Index: elfread.c
===================================================================
RCS file: /cvs/src/src/gdb/elfread.c,v
retrieving revision 1.158
diff -u -p -r1.158 elfread.c
--- elfread.c	24 Aug 2013 00:12:25 -0000	1.158
+++ elfread.c	25 Sep 2013 00:03:11 -0000
@@ -1419,14 +1419,14 @@ elf_symfile_read (struct objfile *objfil
 
       if (!objfile_has_partial_symbols (objfile)
 	  && dwarf2_initialize_objfile (objfile))
-	objfile->sf = &elf_sym_fns_gdb_index;
+	objfile_set_sym_fns (objfile, &elf_sym_fns_gdb_index);
       else
 	{
 	  /* It is ok to do this even if the stabs reader made some
 	     partial symbols, because OBJF_PSYMTABS_READ has not been
 	     set, and so our lazy reader function will still be called
 	     when needed.  */
-	  objfile->sf = &elf_sym_fns_lazy_psyms;
+	  objfile_set_sym_fns (objfile, &elf_sym_fns_lazy_psyms);
 	}
     }
   /* If the file has its own symbol tables it has no separate debug
@@ -1721,7 +1721,6 @@ static const struct sym_probe_fns elf_pr
 
 static const struct sym_fns elf_sym_fns =
 {
-  bfd_target_elf_flavour,
   elf_new_init,			/* init anything gbl to entire symtab */
   elf_symfile_init,		/* read initial info, setup for sym_read() */
   elf_symfile_read,		/* read a symbol file into symtab */
@@ -1740,7 +1739,6 @@ static const struct sym_fns elf_sym_fns 
 
 static const struct sym_fns elf_sym_fns_lazy_psyms =
 {
-  bfd_target_elf_flavour,
   elf_new_init,			/* init anything gbl to entire symtab */
   elf_symfile_init,		/* read initial info, setup for sym_read() */
   elf_symfile_read,		/* read a symbol file into symtab */
@@ -1758,7 +1756,6 @@ static const struct sym_fns elf_sym_fns_
    DWARF-specific GNU index rather than psymtab.  */
 static const struct sym_fns elf_sym_fns_gdb_index =
 {
-  bfd_target_elf_flavour,
   elf_new_init,			/* init anything gbl to entire symab */
   elf_symfile_init,		/* read initial info, setup for sym_red() */
   elf_symfile_read,		/* read a symbol file into symtab */
@@ -1786,7 +1783,7 @@ void
 _initialize_elfread (void)
 {
   probe_key = register_objfile_data_with_cleanup (NULL, probe_key_free);
-  add_symtab_fns (&elf_sym_fns);
+  add_symtab_fns (bfd_target_elf_flavour, &elf_sym_fns);
 
   elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
   gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
Index: machoread.c
===================================================================
RCS file: /cvs/src/src/gdb/machoread.c,v
retrieving revision 1.56
diff -u -p -r1.56 machoread.c
--- machoread.c	1 Jul 2013 19:52:32 -0000	1.56
+++ machoread.c	25 Sep 2013 00:03:11 -0000
@@ -1018,8 +1018,6 @@ macho_symfile_offsets (struct objfile *o
 }
 
 static const struct sym_fns macho_sym_fns = {
-  bfd_target_mach_o_flavour,
-
   macho_new_init,               /* init anything gbl to entire symtab */
   macho_symfile_init,           /* read initial info, setup for sym_read() */
   macho_symfile_read,           /* read a symbol file into symtab */
@@ -1039,7 +1037,7 @@ extern initialize_file_ftype _initialize
 void
 _initialize_machoread (void)
 {
-  add_symtab_fns (&macho_sym_fns);
+  add_symtab_fns (bfd_target_mach_o_flavour, &macho_sym_fns);
 
   add_setshow_zuinteger_cmd ("mach-o", class_obscure,
 			     &mach_o_debug_level,
Index: mipsread.c
===================================================================
RCS file: /cvs/src/src/gdb/mipsread.c,v
retrieving revision 1.42
diff -u -p -r1.42 mipsread.c
--- mipsread.c	30 May 2013 17:21:51 -0000	1.42
+++ mipsread.c	25 Sep 2013 00:03:11 -0000
@@ -405,7 +405,6 @@ read_alphacoff_dynamic_symtab (struct se
 
 static const struct sym_fns ecoff_sym_fns =
 {
-  bfd_target_ecoff_flavour,
   mipscoff_new_init,		/* init anything gbl to entire symtab */
   mipscoff_symfile_init,	/* read initial info, setup for sym_read() */
   mipscoff_symfile_read,	/* read a symbol file into symtab */
@@ -425,5 +424,5 @@ void _initialize_mipsread (void);
 void
 _initialize_mipsread (void)
 {
-  add_symtab_fns (&ecoff_sym_fns);
+  add_symtab_fns (bfd_target_ecoff_flavour, &ecoff_sym_fns);
 }
Index: objfiles.h
===================================================================
RCS file: /cvs/src/src/gdb/objfiles.h,v
retrieving revision 1.109
diff -u -p -r1.109 objfiles.h
--- objfiles.h	20 Aug 2013 15:04:51 -0000	1.109
+++ objfiles.h	25 Sep 2013 00:03:11 -0000
@@ -480,6 +480,9 @@ extern int have_partial_symbols (void);
 
 extern int have_full_symbols (void);
 
+extern void objfile_set_sym_fns (struct objfile *objfile,
+				 const struct sym_fns *sf);
+
 extern void objfiles_changed (void);
 
 /* This operation deletes all objfile entries that represent solibs that
Index: psymtab.c
===================================================================
RCS file: /cvs/src/src/gdb/psymtab.c,v
retrieving revision 1.77
diff -u -p -r1.77 psymtab.c
--- psymtab.c	7 Aug 2013 20:06:37 -0000	1.77
+++ psymtab.c	25 Sep 2013 00:03:11 -0000
@@ -1238,8 +1238,9 @@ map_block (const char *name, domain_enum
     the definition of quick_symbol_functions in symfile.h.  */
 
 static void
-map_matching_symbols_psymtab (const char *name, domain_enum namespace,
-			      struct objfile *objfile, int global,
+map_matching_symbols_psymtab (struct objfile *objfile,
+			      const char *name, domain_enum namespace,
+			      int global,
 			      int (*callback) (struct block *,
 					       struct symbol *, void *),
 			      void *data,
Index: somread.c
===================================================================
RCS file: /cvs/src/src/gdb/somread.c,v
retrieving revision 1.63
diff -u -p -r1.63 somread.c
--- somread.c	30 May 2013 16:28:29 -0000	1.63
+++ somread.c	25 Sep 2013 00:03:11 -0000
@@ -534,7 +534,6 @@ som_symfile_offsets (struct objfile *obj
 
 static const struct sym_fns som_sym_fns =
 {
-  bfd_target_som_flavour,
   som_new_init,			/* init anything gbl to entire symtab */
   som_symfile_init,		/* read initial info, setup for sym_read() */
   som_symfile_read,		/* read a symbol file into symtab */
@@ -553,5 +552,5 @@ initialize_file_ftype _initialize_somrea
 void
 _initialize_somread (void)
 {
-  add_symtab_fns (&som_sym_fns);
+  add_symtab_fns (bfd_target_som_flavour, &som_sym_fns);
 }
Index: symfile-debug.c
===================================================================
RCS file: symfile-debug.c
diff -N symfile-debug.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ symfile-debug.c	25 Sep 2013 00:03:11 -0000
@@ -0,0 +1,773 @@
+/* Debug logging for the symbol file functions for the GNU debugger, GDB.
+
+   Copyright (C) 2013 Free Software Foundation, Inc.
+
+   Contributed by Cygnus Support, using pieces from other GDB modules.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Note: Be careful with functions that can throw errors.
+   We want to see a logging message regardless of whether an error was thrown.
+   This typically means printing a message before calling the real function
+   and then if the function returns a result printing a message after it
+   returns.  */
+
+#include "defs.h"
+#include "gdbcmd.h"
+#include "objfiles.h"
+#include "observer.h"
+#include "source.h"
+#include "symtab.h"
+#include "symfile.h"
+
+/* We need to save a pointer to the real symbol functions.
+   Plus, the debug versions are malloc'd because we have to NULL out the
+   ones that are NULL in the real copy.  */
+
+struct debug_sym_fns_data
+{
+  const struct sym_fns *real_sf;
+  struct sym_fns debug_sf;
+};
+
+/* We need to record a pointer to the real set of functions for each
+   objfile.  */
+static const struct objfile_data *symfile_debug_objfile_data_key;
+
+/* If non-zero all calls to the symfile functions are logged.  */
+static int debug_symfile = 0;
+
+/* Return non-zero if symfile debug logging is installed.  */
+
+static int
+symfile_debug_installed (struct objfile *objfile)
+{
+  return (objfile->sf != NULL
+	  && 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->name);
+}
+
+/* Utility return the name to print for SYMTAB.  */
+
+static const char *
+debug_symtab_name (struct symtab *symtab)
+{
+  return symtab_to_filename_for_display (symtab);
+}
+\f
+/* Debugging version of struct quick_symbol_functions.  */
+
+static int
+debug_qf_has_symbols (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  int retval;
+
+  retval = debug_data->real_sf->qf->has_symbols (objfile);
+
+  fprintf_filtered (gdb_stdlog, "qf->has_symbols (%s) = %d\n",
+		    debug_objfile_name (objfile), retval);
+
+  return retval;
+}
+
+static struct symtab *
+debug_qf_find_last_source_symtab (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  struct symtab *retval;
+
+  fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (%s)\n",
+		    debug_objfile_name (objfile));
+
+  retval = debug_data->real_sf->qf->find_last_source_symtab (objfile);
+
+  fprintf_filtered (gdb_stdlog, "qf->find_last_source_symtab (...) = %s\n",
+		    retval ? debug_symtab_name (retval) : "NULL");
+
+  return retval;
+}
+
+static void
+debug_qf_forget_cached_source_info (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "qf->forget_cached_source_info (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->qf->forget_cached_source_info (objfile);
+}
+
+static int
+debug_qf_map_symtabs_matching_filename (struct objfile *objfile,
+					const char *name,
+					const char *real_path,
+					int (*callback) (struct symtab *,
+							 void *),
+					void *data)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  int retval;
+
+  fprintf_filtered (gdb_stdlog,
+		    "qf->map_symtabs_matching_filename (%s, \"%s\", \"%s\", %s, %s)\n",
+		    debug_objfile_name (objfile), name,
+		    real_path ? real_path : NULL,
+		    host_address_to_string (callback),
+		    host_address_to_string (data));
+
+  retval = debug_data->real_sf->qf->map_symtabs_matching_filename
+    (objfile, name, real_path, callback, data);
+
+  fprintf_filtered (gdb_stdlog,
+		    "qf->map_symtabs_matching_filename (...) = %d\n",
+		    retval);
+
+  return retval;
+}
+
+static struct 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;
+
+  fprintf_filtered (gdb_stdlog,
+		    "qf->lookup_symbol (%s, %d, \"%s\", %s)\n",
+		    debug_objfile_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");
+
+  return retval;
+}
+
+static void
+debug_qf_print_stats (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "qf->print_stats (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->qf->print_stats (objfile);
+}
+
+static void
+debug_qf_dump (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "qf->dump (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->qf->dump (objfile);
+}
+
+static void
+debug_qf_relocate (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, "qf->relocate (%s, %s, %s)\n",
+		    debug_objfile_name (objfile),
+		    host_address_to_string (new_offsets),
+		    host_address_to_string (delta));
+
+  debug_data->real_sf->qf->relocate (objfile, new_offsets, delta);
+}
+
+static void
+debug_qf_expand_symtabs_for_function (struct objfile *objfile,
+				      const char *func_name)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog,
+		    "qf->expand_symtabs_for_function (%s, \"%s\")\n",
+		    debug_objfile_name (objfile), func_name);
+
+  debug_data->real_sf->qf->expand_symtabs_for_function (objfile, func_name);
+}
+
+static void
+debug_qf_expand_all_symtabs (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "qf->expand_all_symtabs (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->qf->expand_all_symtabs (objfile);
+}
+
+static void
+debug_qf_expand_symtabs_with_fullname (struct objfile *objfile,
+				       const char *fullname)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog,
+		    "qf->expand_symtabs_with_fullname (%s, \"%s\")\n",
+		    debug_objfile_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,
+			       int global,
+			       int (*callback) (struct block *,
+						struct symbol *, void *),
+			       void *data,
+			       symbol_compare_ftype *match,
+			       symbol_compare_ftype *ordered_compare)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  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,
+		    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,
+						 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)
+{
+  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),
+		    host_address_to_string (file_matcher),
+		    host_address_to_string (name_matcher),
+		    search_domain_name (kind),
+		    host_address_to_string (data));
+
+  debug_data->real_sf->qf->expand_symtabs_matching (objfile,
+						    file_matcher,
+						    name_matcher,
+						    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)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  struct 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),
+		    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);
+
+  fprintf_filtered (gdb_stdlog, "qf->find_pc_sect_symtab (...) = %s\n",
+		    retval ? debug_symtab_name (retval) : "NULL");
+
+  return retval;
+}
+
+static void
+debug_qf_map_symbol_filenames (struct objfile *objfile,
+			       symbol_filename_ftype *fun, void *data,
+			       int need_fullname)
+{
+  const struct debug_sym_fns_data *debug_data =
+    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),
+		    host_address_to_string (fun),
+		    host_address_to_string (data),
+		    need_fullname);
+
+  debug_data->real_sf->qf->map_symbol_filenames (objfile, fun, data,
+						 need_fullname);
+}
+
+static const struct quick_symbol_functions debug_sym_quick_functions =
+{
+  debug_qf_has_symbols,
+  debug_qf_find_last_source_symtab,
+  debug_qf_forget_cached_source_info,
+  debug_qf_map_symtabs_matching_filename,
+  debug_qf_lookup_symbol,
+  debug_qf_print_stats,
+  debug_qf_dump,
+  debug_qf_relocate,
+  debug_qf_expand_symtabs_for_function,
+  debug_qf_expand_all_symtabs,
+  debug_qf_expand_symtabs_with_fullname,
+  debug_qf_map_matching_symbols,
+  debug_qf_expand_symtabs_matching,
+  debug_qf_find_pc_sect_symtab,
+  debug_qf_map_symbol_filenames
+};
+\f
+/* Debugging version of struct sym_probe_fns.  */
+
+static VEC (probe_p) *
+debug_sym_get_probes (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  VEC (probe_p) *retval;
+
+  retval = debug_data->real_sf->sym_probe_fns->sym_get_probes (objfile);
+
+  fprintf_filtered (gdb_stdlog,
+		    "probes->sym_get_probes (%s) = %s\n",
+		    debug_objfile_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.  */
+
+static void
+debug_sym_new_init (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_new_init (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->sym_new_init (objfile);
+}
+
+static void
+debug_sym_init (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_init (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->sym_init (objfile);
+}
+
+static void
+debug_sym_read (struct objfile *objfile, int symfile_flags)
+{
+  const struct debug_sym_fns_data *debug_data =
+    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);
+
+  debug_data->real_sf->sym_read (objfile, symfile_flags);
+}
+
+static void
+debug_sym_read_psymbols (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_read_psymbols (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->sym_read_psymbols (objfile);
+}
+
+static void
+debug_sym_finish (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_finish (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->sym_finish (objfile);
+}
+
+static void
+debug_sym_offsets (struct objfile *objfile,
+		   const struct section_addr_info *info)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_offsets (%s, %s)\n",
+		    debug_objfile_name (objfile),
+		    host_address_to_string (info));
+
+  debug_data->real_sf->sym_offsets (objfile, info);
+}
+
+static struct symfile_segment_data *
+debug_sym_segments (bfd *abfd)
+{
+  /* This API function is annoying, it doesn't take a "this" pointer.
+     Fortunately it is only used in one place where we (re-)lookup the
+     sym_fns table to use.  Thus we will never be called.  */
+  gdb_assert_not_reached ("debug_sym_segments called");
+}
+
+static void
+debug_sym_read_linetable (struct objfile *objfile)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  fprintf_filtered (gdb_stdlog, "sf->sym_read_linetable (%s)\n",
+		    debug_objfile_name (objfile));
+
+  debug_data->real_sf->sym_read_linetable (objfile);
+}
+
+static bfd_byte *
+debug_sym_relocate (struct objfile *objfile, asection *sectp, bfd_byte *buf)
+{
+  const struct debug_sym_fns_data *debug_data =
+    objfile_data (objfile, symfile_debug_objfile_data_key);
+  bfd_byte *retval;
+
+  retval = debug_data->real_sf->sym_relocate (objfile, sectp, buf);
+
+  fprintf_filtered (gdb_stdlog,
+		    "sf->sym_relocate (%s, %s, %s) = %s\n",
+		    debug_objfile_name (objfile),
+		    host_address_to_string (sectp),
+		    host_address_to_string (buf),
+		    host_address_to_string (retval));
+
+  return retval;
+}
+
+/* Template of debugging version of struct sym_fns.
+   A copy is made, with sym_flavour updated, and a pointer to the real table
+   installed in real_sf, and then a pointer to the copy is installed in the
+   objfile.  */
+
+static const struct sym_fns debug_sym_fns =
+{
+  debug_sym_new_init,
+  debug_sym_init,
+  debug_sym_read,
+  debug_sym_read_psymbols,
+  debug_sym_finish,
+  debug_sym_offsets,
+  debug_sym_segments,
+  debug_sym_read_linetable,
+  debug_sym_relocate,
+  &debug_sym_probe_fns,
+  &debug_sym_quick_functions
+};
+\f
+/* Free the copy of sym_fns recorded in the registry.  */
+
+static void
+symfile_debug_free_objfile (struct objfile *objfile, void *datum)
+{
+  xfree (datum);
+}
+
+/* Install the debugging versions of the symfile functions for OBJFILE.
+   Do not call this if the debug versions are already installed.  */
+
+static void
+install_symfile_debug_logging (struct objfile *objfile)
+{
+  const struct sym_fns *real_sf;
+  struct debug_sym_fns_data *debug_data;
+
+  /* The debug versions should not already be installed.  */
+  gdb_assert (!symfile_debug_installed (objfile));
+
+  real_sf = objfile->sf;
+
+  /* Alas we have to preserve NULL entries in REAL_SF.  */
+  debug_data = XZALLOC (struct debug_sym_fns_data);
+
+#define COPY_SF_PTR(from, to, name, func)	\
+  do {						\
+    if ((from)->name)				\
+      (to)->debug_sf.name = func;		\
+  } while (0)
+
+  COPY_SF_PTR (real_sf, debug_data, sym_new_init, debug_sym_new_init);
+  COPY_SF_PTR (real_sf, debug_data, sym_init, debug_sym_init);
+  COPY_SF_PTR (real_sf, debug_data, sym_read, debug_sym_read);
+  COPY_SF_PTR (real_sf, debug_data, sym_read_psymbols,
+	       debug_sym_read_psymbols);
+  COPY_SF_PTR (real_sf, debug_data, sym_finish, debug_sym_finish);
+  COPY_SF_PTR (real_sf, debug_data, sym_offsets, debug_sym_offsets);
+  COPY_SF_PTR (real_sf, debug_data, sym_segments, debug_sym_segments);
+  COPY_SF_PTR (real_sf, debug_data, sym_read_linetable,
+	       debug_sym_read_linetable);
+  COPY_SF_PTR (real_sf, debug_data, sym_relocate, debug_sym_relocate);
+  if (real_sf->sym_probe_fns)
+    debug_data->debug_sf.sym_probe_fns = &debug_sym_probe_fns;
+  debug_data->debug_sf.qf = &debug_sym_quick_functions;
+
+#undef COPY_SF_PTR
+
+  debug_data->real_sf = real_sf;
+  set_objfile_data (objfile, symfile_debug_objfile_data_key, debug_data);
+  objfile->sf = &debug_data->debug_sf;
+}
+
+/* Uninstall the debugging versions of the symfile functions for OBJFILE.
+   Do not call this if the debug versions are not installed.  */
+
+static void
+uninstall_symfile_debug_logging (struct objfile *objfile)
+{
+  struct debug_sym_fns_data *debug_data;
+
+  /* The debug versions should be currently installed.  */
+  gdb_assert (symfile_debug_installed (objfile));
+
+  debug_data = objfile_data (objfile, symfile_debug_objfile_data_key);
+
+  objfile->sf = debug_data->real_sf;
+  xfree (debug_data);
+  set_objfile_data (objfile, symfile_debug_objfile_data_key, NULL);
+}
+
+/* Call this function to set OBJFILE->SF.
+   Do not set OBJFILE->SF directly.  */
+
+void
+objfile_set_sym_fns (struct objfile *objfile, const struct sym_fns *sf)
+{
+  if (symfile_debug_installed (objfile))
+    {
+      gdb_assert (debug_symfile);
+      /* Remove the current one, and reinstall a new one later.  */
+      uninstall_symfile_debug_logging (objfile);
+    }
+
+  /* Assume debug logging is disabled.  */
+  objfile->sf = sf;
+
+  /* Turn debug logging on if enabled.  */
+  if (debug_symfile)
+    install_symfile_debug_logging (objfile);
+}
+
+static void
+set_debug_symfile (char *args, int from_tty, struct cmd_list_element *c)
+{
+  struct program_space *pspace;
+  struct objfile *objfile;
+
+  ALL_PSPACES (pspace)
+    ALL_PSPACE_OBJFILES (pspace, objfile)
+    {
+      if (debug_symfile)
+	{
+	  if (!symfile_debug_installed (objfile))
+	    install_symfile_debug_logging (objfile);
+	}
+      else
+	{
+	  if (symfile_debug_installed (objfile))
+	    uninstall_symfile_debug_logging (objfile);
+	}
+    }
+}
+
+static void
+show_debug_symfile (struct ui_file *file, int from_tty,
+			struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Symfile debugging is %s.\n"), value);
+}
+
+initialize_file_ftype _initialize_symfile_debug;
+
+void
+_initialize_symfile_debug (void)
+{
+  symfile_debug_objfile_data_key
+    = register_objfile_data_with_cleanup (NULL, symfile_debug_free_objfile);
+
+  add_setshow_boolean_cmd ("symfile", no_class, &debug_symfile, _("\
+Set debugging of the symfile functions."), _("\
+Show debugging of the symfile functions."), _("\
+When enabled, all calls to the symfile functions are logged."),
+			   set_debug_symfile, show_debug_symfile,
+			   &setdebuglist, &showdebuglist);
+
+  /* Note: We don't need a new-objfile observer because debug logging
+     will be installed when objfile init'n calls objfile_set_sym_fns.  */
+}
Index: symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.390
diff -u -p -r1.390 symfile.c
--- symfile.c	19 Sep 2013 12:44:46 -0000	1.390
+++ symfile.c	25 Sep 2013 00:03:11 -0000
@@ -130,10 +130,18 @@ void _initialize_symfile (void);
    calls add_symtab_fns() to register information on each format it is
    prepared to read.  */
 
-typedef const struct sym_fns *sym_fns_ptr;
-DEF_VEC_P (sym_fns_ptr);
+typedef struct
+{
+  /* BFD flavour that we handle.  */
+  enum bfd_flavour sym_flavour;
+
+  /* The "vtable" of symbol functions.  */
+  const struct sym_fns *sym_fns;
+} registered_sym_fns;
 
-static VEC (sym_fns_ptr) *symtab_fns = NULL;
+DEF_VEC_O (registered_sym_fns);
+
+static VEC (registered_sym_fns) *symtab_fns = NULL;
 
 /* If non-zero, shared library symbols will be added automatically
    when the inferior is created, new libraries are loaded, or when
@@ -925,7 +933,7 @@ syms_from_objfile_1 (struct objfile *obj
   struct cleanup *old_chain;
   const int mainline = add_flags & SYMFILE_MAINLINE;
 
-  objfile->sf = find_sym_fns (objfile->obfd);
+  objfile_set_sym_fns (objfile, find_sym_fns (objfile->obfd));
 
   if (objfile->sf == NULL)
     {
@@ -1733,14 +1741,18 @@ get_section_index (struct objfile *objfi
     return -1;
 }
 
-/* Link SF into the global symtab_fns list.  Called on startup by the
-   _initialize routine in each object file format reader, to register
-   information about each format the reader is prepared to handle.  */
+/* Link SF into the global symtab_fns list.
+   FLAVOUR is the file format that SF handles.
+   Called on startup by the _initialize routine in each object file format
+   reader, to register information about each format the reader is prepared
+   to handle.  */
 
 void
-add_symtab_fns (const struct sym_fns *sf)
+add_symtab_fns (enum bfd_flavour flavour, const struct sym_fns *sf)
 {
-  VEC_safe_push (sym_fns_ptr, symtab_fns, sf);
+  registered_sym_fns fns = { flavour, sf };
+
+  VEC_safe_push (registered_sym_fns, symtab_fns, &fns);
 }
 
 /* Initialize OBJFILE to read symbols from its associated BFD.  It
@@ -1751,7 +1763,7 @@ add_symtab_fns (const struct sym_fns *sf
 static const struct sym_fns *
 find_sym_fns (bfd *abfd)
 {
-  const struct sym_fns *sf;
+  registered_sym_fns *rsf;
   enum bfd_flavour our_flavour = bfd_get_flavour (abfd);
   int i;
 
@@ -1760,9 +1772,9 @@ find_sym_fns (bfd *abfd)
       || our_flavour == bfd_target_tekhex_flavour)
     return NULL;	/* No symbols.  */
 
-  for (i = 0; VEC_iterate (sym_fns_ptr, symtab_fns, i, sf); ++i)
-    if (our_flavour == sf->sym_flavour)
-      return sf;
+  for (i = 0; VEC_iterate (registered_sym_fns, symtab_fns, i, rsf); ++i)
+    if (our_flavour == rsf->sym_flavour)
+      return rsf->sym_fns;
 
   error (_("I'm sorry, Dave, I can't do that.  Symbol format `%s' unknown."),
 	 bfd_get_target (abfd));
@@ -2499,7 +2511,7 @@ reread_symbols (void)
 	  /* Reset the sym_fns pointer.  The ELF reader can change it
 	     based on whether .gdb_index is present, and we need it to
 	     start over.  PR symtab/15885  */
-	  objfile->sf = find_sym_fns (objfile->obfd);
+	  objfile_set_sym_fns (objfile, find_sym_fns (objfile->obfd));
 
 	  build_objfile_section_table (objfile);
 	  terminate_minimal_symbol_table (objfile);
Index: symfile.h
===================================================================
RCS file: /cvs/src/src/gdb/symfile.h,v
retrieving revision 1.130
diff -u -p -r1.130 symfile.h
--- symfile.h	19 Sep 2013 12:44:46 -0000	1.130
+++ symfile.h	25 Sep 2013 00:03:11 -0000
@@ -237,8 +237,9 @@ struct quick_symbol_functions
      CALLBACK returns 0 to indicate that the scan should continue, or
      non-zero to indicate that the scan should be terminated.  */
 
-  void (*map_matching_symbols) (const char *name, domain_enum namespace,
-				struct objfile *, int global,
+  void (*map_matching_symbols) (struct objfile *,
+				const char *name, domain_enum namespace,
+				int global,
 				int (*callback) (struct block *,
 						 struct symbol *, void *),
 				void *data,
@@ -349,12 +350,6 @@ struct sym_probe_fns
 
 struct sym_fns
 {
-
-  /* BFD flavour that we handle, or (as a special kludge, see
-     xcoffread.c, (enum bfd_flavour)-1 for xcoff).  */
-
-  enum bfd_flavour sym_flavour;
-
   /* Initializes anything that is global to the entire symbol table.
      It is called during symbol_file_add, when we begin debugging an
      entirely new program.  */
@@ -406,7 +401,7 @@ struct sym_fns
      the line table cannot be read while processing the debugging
      information.  */
 
-  void (*sym_read_linetable) (void);
+  void (*sym_read_linetable) (struct objfile *);
 
   /* Relocate the contents of a debug section SECTP.  The
      contents are stored in BUF if it is non-NULL, or returned in a
@@ -453,7 +448,7 @@ extern bfd_byte *default_symfile_relocat
 extern struct symtab *allocate_symtab (const char *, struct objfile *)
   ATTRIBUTE_NONNULL (1);
 
-extern void add_symtab_fns (const struct sym_fns *);
+extern void add_symtab_fns (enum bfd_flavour flavour, const struct sym_fns *);
 
 /* This enum encodes bit-flags passed as ADD_FLAGS parameter to
    symbol_file_add, etc.  */
Index: symtab.c
===================================================================
RCS file: /cvs/src/src/gdb/symtab.c,v
retrieving revision 1.367
diff -u -p -r1.367 symtab.c
--- symtab.c	7 Aug 2013 20:03:52 -0000	1.367
+++ symtab.c	25 Sep 2013 00:03:11 -0000
@@ -143,6 +143,37 @@ multiple_symbols_select_mode (void)
 
 const struct block *block_found;
 
+/* Return the name of a domain_enum.  */
+
+const char *
+domain_name (domain_enum e)
+{
+  switch (e)
+    {
+    case UNDEF_DOMAIN: return "UNDEF_DOMAIN";
+    case VAR_DOMAIN: return "VAR_DOMAIN";
+    case STRUCT_DOMAIN: return "STRUCT_DOMAIN";
+    case LABEL_DOMAIN: return "LABEL_DOMAIN";
+    case COMMON_BLOCK_DOMAIN: return "COMMON_BLOCK_DOMAIN";
+    default: gdb_assert_not_reached ("bad domain_enum");
+    }
+}
+
+/* Return the name of a search_domain .  */
+
+const char *
+search_domain_name (enum search_domain e)
+{
+  switch (e)
+    {
+    case VARIABLES_DOMAIN: return "VARIABLES_DOMAIN";
+    case FUNCTIONS_DOMAIN: return "FUNCTIONS_DOMAIN";
+    case TYPES_DOMAIN: return "TYPES_DOMAIN";
+    case ALL_DOMAIN: return "ALL_DOMAIN";
+    default: gdb_assert_not_reached ("bad search_domain");
+    }
+}
+
 /* See whether FILENAME matches SEARCH_NAME using the rule that we
    advertise to the user.  (The manual's description of linespecs
    describes what we advertise).  Returns true if they match, false
Index: symtab.h
===================================================================
RCS file: /cvs/src/src/gdb/symtab.h,v
retrieving revision 1.239
diff -u -p -r1.239 symtab.h
--- symtab.h	7 Aug 2013 20:03:52 -0000	1.239
+++ symtab.h	25 Sep 2013 00:03:11 -0000
@@ -427,6 +427,8 @@ typedef enum domain_enum_tag
   COMMON_BLOCK_DOMAIN
 } domain_enum;
 
+extern const char *domain_name (domain_enum);
+
 /* Searching domains, used for `search_symbols'.  Element numbers are
    hardcoded in GDB, check all enum uses before changing it.  */
 
@@ -446,6 +448,8 @@ enum search_domain
   ALL_DOMAIN = 3
 };
 
+extern const char *search_domain_name (enum search_domain);
+
 /* An address-class says where to find the value of a symbol.  */
 
 enum address_class
Index: xcoffread.c
===================================================================
RCS file: /cvs/src/src/gdb/xcoffread.c,v
retrieving revision 1.117
diff -u -p -r1.117 xcoffread.c
--- xcoffread.c	18 Sep 2013 17:47:56 -0000	1.117
+++ xcoffread.c	25 Sep 2013 00:03:11 -0000
@@ -817,7 +817,7 @@ return_after_cleanup:
 }
 
 static void
-aix_process_linenos (void)
+aix_process_linenos (struct objfile *objfile)
 {
   /* There is no linenos to read if there are only dwarf info.  */
   if (this_symtab_psymtab == NULL)
@@ -3094,7 +3094,6 @@ xcoff_symfile_offsets (struct objfile *o
 
 static const struct sym_fns xcoff_sym_fns =
 {
-
   /* It is possible that coff and xcoff should be merged as
      they do have fundamental similarities (for example, the extra storage
      classes used for stabs could presumably be recognized in any COFF file).
@@ -3104,8 +3103,6 @@ static const struct sym_fns xcoff_sym_fn
      xcoffread.c reads all the symbols and does in fact randomly access them
      (in C_BSTAT and line number processing).  */
 
-  bfd_target_xcoff_flavour,
-
   xcoff_new_init,		/* init anything gbl to entire symtab */
   xcoff_symfile_init,		/* read initial info, setup for sym_read() */
   xcoff_initial_scan,		/* read a symbol file into symtab */
@@ -3194,7 +3191,7 @@ extern initialize_file_ftype _initialize
 void
 _initialize_xcoffread (void)
 {
-  add_symtab_fns (&xcoff_sym_fns);
+  add_symtab_fns (bfd_target_xcoff_flavour, &xcoff_sym_fns);
 
   xcoff_objfile_data_key = register_objfile_data_with_cleanup (NULL,
 							       xcoff_free_info);
Index: doc/gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.1112
diff -u -p -r1.1112 gdb.texinfo
--- doc/gdb.texinfo	16 Sep 2013 18:00:34 -0000	1.1112
+++ doc/gdb.texinfo	25 Sep 2013 00:03:12 -0000
@@ -22573,6 +22573,12 @@ Turns on or off debugging messages for F
 @item show debug solib-frv
 Display the current state of FR-V shared-library code debugging
 messages.
+@item set debug symfile
+@cindex symbol file functions
+Turns on or off display of debugging messages related to symbol file functions.
+The default is off.
+@item show debug symfile
+Show the current state of symbol file debugging.
 @item set debug symtab-create
 @cindex symbol table creation
 Turns on or off display of debugging messages related to symbol table creation.

Re: [RFA, doc RFA] Add "set debug symfile on".

[Doug Evans]

On Tue, Sep 24, 2013 at 5:25 PM, Doug Evans <dje@google.com> wrote:
> Hi.
>
> This patch adds a new debugging option: set debug symfile on
>
> For now it logs all calls through the symfile functions.
>
> Regression tested on amd64-linux.
>
> Ok to check in?
>
> 2013-09-24  Doug Evans  <dje@google.com>
>
>         New option "set debug symfile on".
>         * NEWS: Mention "set debug symfile".
>         * Makefile.in (SFILES): Add symfile-debug.c.
>         (COMMON_OBS): Add sumfile-debug.o.
>         * elfread.c (elf_symfile_read): Use objfile_set_sym_fns to set the
>         objfile's symbol functions.
>         * objfiles.h (objfile_set_sym_fns): Declare.
>         * dwarf2read.c (dw2_map_matching_symbols): Update signature.
>         * psymtab.c (map_matching_symbols_psymtab): Update signature.
>         * symfile-debug.c: New file.
>         * symfile.c (sym_fns_ptr): Delete.  Replace with ...
>         (registered_sym_fns): ... this.
>         (symtab_fns): Update.
>         (syms_from_objfile_1): Use objfile_set_sym_fns to set the objfile's
>         symbol functions.
>         (reread_symbols): Ditto.
>         (add_symtab_fns): New arg "flavour".  All callers updated.
>         (find_sym_fns): Rewrite to use new sym_fns registry.
>         * symfile.h (struct quick_symbol_functions): Reorg arg list of
>         map_matching_symbols so objfile is first.
>         (struct sym_fns): Delete member "sym_flavour".  All uses updated.
>         Add "objfile" argument to sym_read_linetable.  All uses updated.
>         (add_symtab_fns): Update prototype.
>         * symtab.c (domain_name, search_domain_name): New functions.
>         * symtab.h (domain_name, search_domain_name): Declare.
>
>         doc/
>         * gdb.texinfo (Debugging Output): Document set/show debug symfile.

Oh.  Also tested with --enable-targets=all

Re: [RFA, doc RFA] Add "set debug symfile on".

[Eli Zaretskii]

> From: Doug Evans <dje@google.com>
> Date: Tue, 24 Sep 2013 17:25:12 -0700
> 
> Hi.
> 
> This patch adds a new debugging option: set debug symfile on
> 
> For now it logs all calls through the symfile functions.
> 
> Regression tested on amd64-linux.
> 
> Ok to check in?

Thanks.

> --- NEWS	16 Sep 2013 17:47:29 -0000	1.614
> +++ NEWS	25 Sep 2013 00:03:11 -0000
> @@ -46,6 +46,10 @@ maint set|show per-command symtab
>  
>  * New options
>  
> +set debug symfile off|on
> +show debug symfile
> +  Control display of debugging info for symfile functions.

I'm not sure everybody knows what a "symfile" is.  How about this
instead:

  Control display of debugging info regarding reading symbol files and
  symbol tables within those files.

> --- doc/gdb.texinfo	16 Sep 2013 18:00:34 -0000	1.1112
> +++ doc/gdb.texinfo	25 Sep 2013 00:03:12 -0000
> @@ -22573,6 +22573,12 @@ Turns on or off debugging messages for F
>  @item show debug solib-frv
>  Display the current state of FR-V shared-library code debugging
>  messages.
> +@item set debug symfile
> +@cindex symbol file functions
> +Turns on or off display of debugging messages related to symbol file functions.

This could use a cross-reference to where symbol files are described
(the "Files" node).

> +The default is off.
> +@item show debug symfile
> +Show the current state of symbol file debugging.

  "Show the current state of symbol file debugging messages."

OK with those changes.

Re: [RFA, doc RFA] Add "set debug symfile on".

[Tom Tromey]

>>>>> "Doug" == Doug Evans <dje@google.com> writes:

Doug> This patch adds a new debugging option: set debug symfile on

Doug> For now it logs all calls through the symfile functions.

Doug> Regression tested on amd64-linux.

Doug> Ok to check in?

It seems ok to me.

This patch combines a few different things into one.  For example,
reordering the arguments to map_matching_symbols has no relation to the
rest of the patch.  We normally make other contributors split such
patches.  I think it is best if maintainers do this as well.

Tom

Re: [RFA, doc RFA] Add "set debug symfile on".

[Doug Evans]

On Wed, Sep 25, 2013 at 12:57 PM, Tom Tromey <tromey@redhat.com> wrote:
>>>>>> "Doug" == Doug Evans <dje@google.com> writes:
>
> Doug> This patch adds a new debugging option: set debug symfile on
>
> Doug> For now it logs all calls through the symfile functions.
>
> Doug> Regression tested on amd64-linux.
>
> Doug> Ok to check in?
>
> It seems ok to me.
>
> This patch combines a few different things into one.  For example,
> reordering the arguments to map_matching_symbols has no relation to the
> rest of the patch.  We normally make other contributors split such
> patches.  I think it is best if maintainers do this as well.

I realize that. [And I figured you'd bring it up. :-)]

My argument is that for a small patch of this approx size I don't want
to impose on contributors *always* having to follow this rule.
One can reasonably counter with how can one know what the threshold
is, and that it would be more consistent to just always follow this
rule.
I guess this is one case where I'm a bit more wishy washy - it's a
time saver (and that's important!).
[As for time spent by the reviewer: for small enough patches any
incremental time is negligible IMO.]
To be clear, for larger patches I would indeed follow this rule (when
I remember to ... 1/2 :-)).

But no matter.  I'll put in the time to split it up and check it in that way.