X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsymmisc.c;h=ca40a69f75a63945aeaa97aef201b0094832075b;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=4a3dc0813c515e8eb6de8d6d6de80b06abefab9e;hpb=318bf84ffe5bc5472cefe0c1a838f132f9ac4ff9;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 4a3dc0813c..ca40a69f75 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -1,111 +1,86 @@
 /* Do various things to symbol tables (other than lookup), for GDB.
-   Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 1998
+   Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 2 of the License, or
-(at your option) any later version.
+   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 2 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, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "bfd.h"
 #include "symfile.h"
+#include "objfiles.h"
 #include "breakpoint.h"
 #include "command.h"
 #include "obstack.h"
+#include "language.h"
+#include "bcache.h"
 
-#include <string.h>
+#include "gdb_string.h"
 
 #ifndef DEV_TTY
 #define DEV_TTY "/dev/tty"
 #endif
 
+/* Unfortunately for debugging, stderr is usually a macro.  This is painful
+   when calling functions that take FILE *'s from the debugger.
+   So we make a variable which has the same value and which is accessible when
+   debugging GDB with itself.  Because stdin et al need not be constants,
+   we initialize them in the _initialize_symmisc function at the bottom
+   of the file.  */
+FILE *std_in;
+FILE *std_out;
+FILE *std_err;
+
 /* Prototypes for local functions */
 
-static PTR 
-dump_symtab PARAMS ((struct objfile *, struct symtab *, PTR, PTR, PTR));
+static void dump_symtab PARAMS ((struct objfile *, struct symtab *,
+				 GDB_FILE *));
 
-static PTR 
-dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *, PTR, PTR,
-		      PTR));
+static void dump_psymtab PARAMS ((struct objfile *, struct partial_symtab *,
+				  GDB_FILE *));
 
-static PTR 
-dump_msymbols PARAMS ((struct objfile *, PTR, PTR, PTR));
+static void dump_msymbols PARAMS ((struct objfile *, GDB_FILE *));
 
-static PTR 
-dump_objfile PARAMS ((struct objfile *, PTR, PTR, PTR));
+static void dump_objfile PARAMS ((struct objfile *));
 
-static void
-printobjfiles_command PARAMS ((void));
+static int block_depth PARAMS ((struct block *));
 
-static int
-block_depth PARAMS ((struct block *));
+static void print_partial_symbols PARAMS ((struct partial_symbol **, int,
+					   char *, GDB_FILE *));
 
-static void
-print_partial_symbol PARAMS ((struct partial_symbol *, int, char *, FILE *));
+static void free_symtab_block PARAMS ((struct objfile *, struct block *));
 
-static void
-printpsyms_command PARAMS ((char *, int));
+void _initialize_symmisc PARAMS ((void));
 
-static void
-print_symbol PARAMS ((struct symbol *, int, FILE *));
+struct print_symbol_args
+  {
+    struct symbol *symbol;
+    int depth;
+    GDB_FILE *outfile;
+  };
 
-static void
-printsyms_command PARAMS ((char *, int));
+static int print_symbol PARAMS ((PTR));
 
 static void
 free_symtab_block PARAMS ((struct objfile *, struct block *));
-
-static void
-printmsyms_command PARAMS ((char *, int));
-
-static void
-dump_symtab_lines PARAMS ((struct symtab *));
-
-static void
-dump_symtabs PARAMS ((struct symtab *));
-
-static void
-dump_last_symtab PARAMS ((struct symtab *));
-
-static void
-dump_blockvector PARAMS ((struct blockvector *));
-
-static void
-dump_block PARAMS ((struct block *));
-
-static char *
-dump_addrclass PARAMS ((int));
-
-static char *
-dump_namespace PARAMS ((int));
-
-static void
-dump_symbol PARAMS ((struct symbol *));
-
-static void
-dump_type PARAMS ((struct type *));
-
-static void
-dump_linetable PARAMS ((struct linetable *));
-
-static void
-dump_strtbl PARAMS ((void));
-
 
+
 /* Free a struct block <- B and all the symbols defined in that block.  */
 
 static void
@@ -117,10 +92,10 @@ free_symtab_block (objfile, b)
   n = BLOCK_NSYMS (b);
   for (i = 0; i < n; i++)
     {
-      mfree (objfile -> md, SYMBOL_NAME (BLOCK_SYM (b, i)));
-      mfree (objfile -> md, BLOCK_SYM (b, i));
+      mfree (objfile->md, SYMBOL_NAME (BLOCK_SYM (b, i)));
+      mfree (objfile->md, (PTR) BLOCK_SYM (b, i));
     }
-  mfree (objfile -> md, b);
+  mfree (objfile->md, (PTR) b);
 }
 
 /* Free all the storage associated with the struct symtab <- S.
@@ -142,66 +117,125 @@ free_symtab (s)
     {
     case free_nothing:
       /* All the contents are part of a big block of memory (an obstack),
-	 and some other symtab is in charge of freeing that block.
-	 Therefore, do nothing.  */
+         and some other symtab is in charge of freeing that block.
+         Therefore, do nothing.  */
       break;
 
     case free_contents:
       /* Here all the contents were malloc'ed structure by structure
-	 and must be freed that way.  */
+         and must be freed that way.  */
       /* First free the blocks (and their symbols.  */
       bv = BLOCKVECTOR (s);
       n = BLOCKVECTOR_NBLOCKS (bv);
       for (i = 0; i < n; i++)
-	free_symtab_block (s -> objfile, BLOCKVECTOR_BLOCK (bv, i));
+	free_symtab_block (s->objfile, BLOCKVECTOR_BLOCK (bv, i));
       /* Free the blockvector itself.  */
-      mfree (s -> objfile -> md, bv);
+      mfree (s->objfile->md, (PTR) bv);
       /* Also free the linetable.  */
-      
+
     case free_linetable:
       /* Everything will be freed either by our `free_ptr'
-	 or by some other symtab, except for our linetable.
-	 Free that now.  */
+         or by some other symtab, except for our linetable.
+         Free that now.  */
       if (LINETABLE (s))
-	mfree (s -> objfile -> md, LINETABLE (s));
+	mfree (s->objfile->md, (PTR) LINETABLE (s));
       break;
     }
 
   /* If there is a single block of memory to free, free it.  */
-  if (s -> free_ptr != NULL)
-    mfree (s -> objfile -> md, s -> free_ptr);
+  if (s->free_ptr != NULL)
+    mfree (s->objfile->md, s->free_ptr);
 
   /* Free source-related stuff */
-  if (s -> line_charpos != NULL)
-    mfree (s -> objfile -> md, s -> line_charpos);
-  if (s -> fullname != NULL)
-    mfree (s -> objfile -> md, s -> fullname);
-  mfree (s -> objfile -> md, s);
+  if (s->line_charpos != NULL)
+    mfree (s->objfile->md, (PTR) s->line_charpos);
+  if (s->fullname != NULL)
+    mfree (s->objfile->md, s->fullname);
+  if (s->debugformat != NULL)
+    mfree (s->objfile->md, s->debugformat);
+  mfree (s->objfile->md, (PTR) s);
+}
+
+void
+print_symbol_bcache_statistics ()
+{
+  struct objfile *objfile;
+
+  immediate_quit++;
+  ALL_OBJFILES (objfile)
+  {
+    printf_filtered ("Byte cache statistics for '%s':\n", objfile->name);
+    print_bcache_statistics (&objfile->psymbol_cache, "partial symbol cache");
+  }
+  immediate_quit--;
+}
+
+void
+print_objfile_statistics ()
+{
+  struct objfile *objfile;
+
+  immediate_quit++;
+  ALL_OBJFILES (objfile)
+  {
+    printf_filtered ("Statistics for '%s':\n", objfile->name);
+    if (OBJSTAT (objfile, n_stabs) > 0)
+      printf_filtered ("  Number of \"stab\" symbols read: %d\n",
+		       OBJSTAT (objfile, n_stabs));
+    if (OBJSTAT (objfile, n_minsyms) > 0)
+      printf_filtered ("  Number of \"minimal\" symbols read: %d\n",
+		       OBJSTAT (objfile, n_minsyms));
+    if (OBJSTAT (objfile, n_psyms) > 0)
+      printf_filtered ("  Number of \"partial\" symbols read: %d\n",
+		       OBJSTAT (objfile, n_psyms));
+    if (OBJSTAT (objfile, n_syms) > 0)
+      printf_filtered ("  Number of \"full\" symbols read: %d\n",
+		       OBJSTAT (objfile, n_syms));
+    if (OBJSTAT (objfile, n_types) > 0)
+      printf_filtered ("  Number of \"types\" defined: %d\n",
+		       OBJSTAT (objfile, n_types));
+    if (OBJSTAT (objfile, sz_strtab) > 0)
+      printf_filtered ("  Space used by a.out string tables: %d\n",
+		       OBJSTAT (objfile, sz_strtab));
+    printf_filtered ("  Total memory used for psymbol obstack: %d\n",
+		     obstack_memory_used (&objfile->psymbol_obstack));
+    printf_filtered ("  Total memory used for psymbol cache: %d\n",
+		     obstack_memory_used (&objfile->psymbol_cache.cache));
+    printf_filtered ("  Total memory used for symbol obstack: %d\n",
+		     obstack_memory_used (&objfile->symbol_obstack));
+    printf_filtered ("  Total memory used for type obstack: %d\n",
+		     obstack_memory_used (&objfile->type_obstack));
+  }
+  immediate_quit--;
 }
 
-static PTR 
-dump_objfile (objfile, arg1, arg2, arg3)
+static void
+dump_objfile (objfile)
      struct objfile *objfile;
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
 {
   struct symtab *symtab;
   struct partial_symtab *psymtab;
 
-  printf_filtered ("\nObject file %s:  ", objfile -> name);
-  printf_filtered ("Objfile at %x, bfd at %x, %d minsyms\n\n",
-		   objfile, objfile -> obfd, objfile->minimal_symbol_count);
+  printf_filtered ("\nObject file %s:  ", objfile->name);
+  printf_filtered ("Objfile at ");
+  gdb_print_address (objfile, gdb_stdout);
+  printf_filtered (", bfd at ");
+  gdb_print_address (objfile->obfd, gdb_stdout);
+  printf_filtered (", %d minsyms\n\n",
+		   objfile->minimal_symbol_count);
 
-  if (objfile -> psymtabs)
+  if (objfile->psymtabs)
     {
       printf_filtered ("Psymtabs:\n");
-      for (psymtab = objfile -> psymtabs;
+      for (psymtab = objfile->psymtabs;
 	   psymtab != NULL;
-	   psymtab = psymtab -> next)
+	   psymtab = psymtab->next)
 	{
-	  printf_filtered ("%s at %x, ", psymtab -> filename, psymtab);
-	  if (psymtab -> objfile != objfile)
+	  printf_filtered ("%s at ",
+			   psymtab->filename);
+	  gdb_print_address (psymtab, gdb_stdout);
+	  printf_filtered (", ");
+	  if (psymtab->objfile != objfile)
 	    {
 	      printf_filtered ("NOT ON CHAIN!  ");
 	    }
@@ -210,15 +244,17 @@ dump_objfile (objfile, arg1, arg2, arg3)
       printf_filtered ("\n\n");
     }
 
-  if (objfile -> symtabs)
+  if (objfile->symtabs)
     {
       printf_filtered ("Symtabs:\n");
-      for (symtab = objfile -> symtabs;
+      for (symtab = objfile->symtabs;
 	   symtab != NULL;
 	   symtab = symtab->next)
 	{
-	  printf_filtered ("%s at %x, ", symtab -> filename, symtab);
-	  if (symtab -> objfile != objfile)
+	  printf_filtered ("%s at ", symtab->filename);
+	  gdb_print_address (symtab, gdb_stdout);
+	  printf_filtered (", ");
+	  if (symtab->objfile != objfile)
 	    {
 	      printf_filtered ("NOT ON CHAIN!  ");
 	    }
@@ -226,124 +262,161 @@ dump_objfile (objfile, arg1, arg2, arg3)
 	}
       printf_filtered ("\n\n");
     }
-  return (NULL);
 }
 
-static PTR 
-dump_msymbols (objfile, arg1, arg2, arg3)
+/* Print minimal symbols from this objfile.  */
+
+static void
+dump_msymbols (objfile, outfile)
      struct objfile *objfile;
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
+     GDB_FILE *outfile;
 {
-  FILE *outfile = (FILE *) arg1;
-  char *symname = (char *) arg2;
   struct minimal_symbol *msymbol;
   int index;
   char ms_type;
-  
-  /* Print minimal symbols from this objfile unless a specific linkage
-     unit file was requested, in which case we only print the symbols
-     for that one. */
-  if (symname == NULL || (strcmp (symname, objfile -> name) == 0))
+
+  fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile->name);
+  if (objfile->minimal_symbol_count == 0)
+    {
+      fprintf_filtered (outfile, "No minimal symbols found.\n");
+      return;
+    }
+  for (index = 0, msymbol = objfile->msymbols;
+       SYMBOL_NAME (msymbol) != NULL; msymbol++, index++)
     {
-      fprintf_filtered (outfile, "\nObject file %s:\n\n", objfile -> name);
-      for (index = 0, msymbol = objfile -> msymbols;
-	   msymbol -> name != NULL; msymbol++, index++)
+      switch (msymbol->type)
 	{
-	  switch (msymbol -> type)
-	    {
-	      case mst_unknown:
-		ms_type = 'u';
-		break;
-	      case mst_text:
-		ms_type = 't';
-		break;
-	      case mst_data:
-		ms_type = 'd';
-		break;
-	      case mst_bss:
-		ms_type = 'b';
-		break;
-	      case mst_abs:
-		ms_type = 'a';
-		break;
-	      default:
-		ms_type = '?';
-		break;
-	    }
-	  fprintf_filtered (outfile, "[%2d] %c %#10x %s\n", index, ms_type,
-			    msymbol -> address, msymbol -> name);
+	case mst_unknown:
+	  ms_type = 'u';
+	  break;
+	case mst_text:
+	  ms_type = 'T';
+	  break;
+	case mst_solib_trampoline:
+	  ms_type = 'S';
+	  break;
+	case mst_data:
+	  ms_type = 'D';
+	  break;
+	case mst_bss:
+	  ms_type = 'B';
+	  break;
+	case mst_abs:
+	  ms_type = 'A';
+	  break;
+	case mst_file_text:
+	  ms_type = 't';
+	  break;
+	case mst_file_data:
+	  ms_type = 'd';
+	  break;
+	case mst_file_bss:
+	  ms_type = 'b';
+	  break;
+	default:
+	  ms_type = '?';
+	  break;
 	}
-      if (objfile -> minimal_symbol_count != index)
+      fprintf_filtered (outfile, "[%2d] %c ", index, ms_type);
+      print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile);
+      fprintf_filtered (outfile, " %s", SYMBOL_NAME (msymbol));
+      if (SYMBOL_BFD_SECTION (msymbol))
+	fprintf_filtered (outfile, " section %s",
+			  bfd_section_name (objfile->obfd,
+					    SYMBOL_BFD_SECTION (msymbol)));
+      if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL)
 	{
-	  warning ("internal error:  minimal symbol count %d != %d",
-		   objfile -> minimal_symbol_count, index);
+	  fprintf_filtered (outfile, "  %s", SYMBOL_DEMANGLED_NAME (msymbol));
 	}
-      fprintf_filtered (outfile, "\n");
+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+      if (msymbol->filename)
+	fprintf_filtered (outfile, "  %s", msymbol->filename);
+#endif
+      fputs_filtered ("\n", outfile);
     }
-  return (NULL);
+  if (objfile->minimal_symbol_count != index)
+    {
+      warning ("internal error:  minimal symbol count %d != %d",
+	       objfile->minimal_symbol_count, index);
+    }
+  fprintf_filtered (outfile, "\n");
 }
 
-static PTR 
-dump_psymtab (objfile, psymtab, arg1, arg2, arg3)
+static void
+dump_psymtab (objfile, psymtab, outfile)
      struct objfile *objfile;
      struct partial_symtab *psymtab;
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
+     GDB_FILE *outfile;
 {
-  FILE *outfile = (FILE *) arg1;
-  char *symname = (char *) arg2;
+  int i;
+
+  fprintf_filtered (outfile, "\nPartial symtab for source file %s ",
+		    psymtab->filename);
+  fprintf_filtered (outfile, "(object ");
+  gdb_print_address (psymtab, outfile);
+  fprintf_filtered (outfile, ")\n\n");
+  fprintf_unfiltered (outfile, "  Read from object file %s (",
+		      objfile->name);
+  gdb_print_address (objfile, outfile);
+  fprintf_unfiltered (outfile, ")\n");
+
+  if (psymtab->readin)
+    {
+      fprintf_filtered (outfile,
+			"  Full symtab was read (at ");
+      gdb_print_address (psymtab->symtab, outfile);
+      fprintf_filtered (outfile, " by function at ");
+      gdb_print_address ((PTR) psymtab->read_symtab, outfile);
+      fprintf_filtered (outfile, ")\n");
+    }
 
-  /* If source file name is specified, reject all but that one.  */
-  if (symname == NULL || (strcmp (symname, psymtab -> filename) == 0))
+  fprintf_filtered (outfile, "  Relocate symbols by ");
+  for (i = 0; i < psymtab->objfile->num_sections; ++i)
     {
-      fprintf_filtered (outfile, "\nPartial symtab for source file %s ",
-			psymtab -> filename);
-      fprintf_filtered (outfile, "(object 0x%x)\n\n", psymtab);
-      fprintf (outfile, "  Read from object file %s (0x%x)\n",
-	       objfile -> name, objfile);
-      
-      if (psymtab -> readin)
-	{
-	  fprintf_filtered (outfile,
-		    "  Full symtab was read (at 0x%x by function at 0x%x)\n",
-			    psymtab -> symtab, psymtab -> read_symtab);
-	}
-      fprintf_filtered (outfile, "  Relocate symbols by 0x%x\n",
-			psymtab -> addr);
-      fprintf_filtered (outfile, "  Symbols cover text addresses 0x%x-0x%x\n",
-			psymtab -> textlow, psymtab -> texthigh);
-      fprintf_filtered (outfile, "  Depends on %d other partial symtabs.\n",
-			psymtab -> number_of_dependencies);
-      if (psymtab -> n_global_syms > 0)
-	{
-	  print_partial_symbol (objfile -> global_psymbols.list
-				+ psymtab -> globals_offset,
-				psymtab -> n_global_syms, "Global", outfile);
-	}
-      if (psymtab -> n_static_syms > 0)
-	{
-	  print_partial_symbol (objfile -> static_psymbols.list
-				+ psymtab -> statics_offset,
-				psymtab -> n_static_syms, "Static", outfile);
-	}
-      fprintf_filtered (outfile, "\n");
+      if (i != 0)
+	fprintf_filtered (outfile, ", ");
+      wrap_here ("    ");
+      print_address_numeric (ANOFFSET (psymtab->section_offsets, i),
+			     1,
+			     outfile);
+    }
+  fprintf_filtered (outfile, "\n");
+
+  fprintf_filtered (outfile, "  Symbols cover text addresses ");
+  print_address_numeric (psymtab->textlow, 1, outfile);
+  fprintf_filtered (outfile, "-");
+  print_address_numeric (psymtab->texthigh, 1, outfile);
+  fprintf_filtered (outfile, "\n");
+  fprintf_filtered (outfile, "  Depends on %d other partial symtabs.\n",
+		    psymtab->number_of_dependencies);
+  for (i = 0; i < psymtab->number_of_dependencies; i++)
+    {
+      fprintf_filtered (outfile, "    %d ", i);
+      gdb_print_address (psymtab->dependencies[i], outfile);
+      fprintf_filtered (outfile, " %s\n",
+			psymtab->dependencies[i]->filename);
     }
-  return (NULL);
+  if (psymtab->n_global_syms > 0)
+    {
+      print_partial_symbols (objfile->global_psymbols.list
+			     + psymtab->globals_offset,
+			     psymtab->n_global_syms, "Global", outfile);
+    }
+  if (psymtab->n_static_syms > 0)
+    {
+      print_partial_symbols (objfile->static_psymbols.list
+			     + psymtab->statics_offset,
+			     psymtab->n_static_syms, "Static", outfile);
+    }
+  fprintf_filtered (outfile, "\n");
 }
 
-static PTR 
-dump_symtab (objfile, symtab, arg1, arg2, arg3)
+static void
+dump_symtab (objfile, symtab, outfile)
      struct objfile *objfile;
      struct symtab *symtab;
-     PTR arg1;
-     PTR arg2;
-     PTR arg3;
+     GDB_FILE *outfile;
 {
-  FILE *outfile = (FILE *) arg1;
-  char *symname = (char *) arg2;
   register int i, j;
   int len, blen;
   register struct linetable *l;
@@ -351,23 +424,33 @@ dump_symtab (objfile, symtab, arg1, arg2, arg3)
   register struct block *b;
   int depth;
 
-  if (symname == NULL || (strcmp (symname, symtab -> filename) == 0))
+  fprintf_filtered (outfile, "\nSymtab for file %s\n", symtab->filename);
+  if (symtab->dirname)
+    fprintf_filtered (outfile, "Compilation directory is %s\n",
+		      symtab->dirname);
+  fprintf_filtered (outfile, "Read from object file %s (", objfile->name);
+  gdb_print_address (objfile, outfile);
+  fprintf_filtered (outfile, ")\n");
+  fprintf_filtered (outfile, "Language: %s\n", language_str (symtab->language));
+
+  /* First print the line table.  */
+  l = LINETABLE (symtab);
+  if (l)
     {
-      fprintf (outfile, "\nSymtab for file %s\n", symtab->filename);
-      fprintf (outfile, "Read from object file %s (%x)\n", objfile->name,
-	       objfile);
-      
-      /* First print the line table.  */
-      l = LINETABLE (symtab);
-      if (l) {
-	fprintf (outfile, "\nLine table:\n\n");
-	len = l->nitems;
-	for (i = 0; i < len; i++)
-	  fprintf (outfile, " line %d at %x\n", l->item[i].line,
-		   l->item[i].pc);
-      }
-      /* Now print the block info.  */
-      fprintf (outfile, "\nBlockvector:\n\n");
+      fprintf_filtered (outfile, "\nLine table:\n\n");
+      len = l->nitems;
+      for (i = 0; i < len; i++)
+	{
+	  fprintf_filtered (outfile, " line %d at ", l->item[i].line);
+	  print_address_numeric (l->item[i].pc, 1, outfile);
+	  fprintf_filtered (outfile, "\n");
+	}
+    }
+  /* Now print the block info, but only for primary symtabs since we will
+     print lots of duplicate info otherwise. */
+  if (symtab->primary)
+    {
+      fprintf_filtered (outfile, "\nBlockvector:\n\n");
       bv = BLOCKVECTOR (symtab);
       len = BLOCKVECTOR_NBLOCKS (bv);
       for (i = 0; i < len; i++)
@@ -375,46 +458,74 @@ dump_symtab (objfile, symtab, arg1, arg2, arg3)
 	  b = BLOCKVECTOR_BLOCK (bv, i);
 	  depth = block_depth (b) * 2;
 	  print_spaces (depth, outfile);
-	  fprintf (outfile, "block #%03d (object 0x%x) ", i, b);
-	  fprintf (outfile, "[0x%x..0x%x]", BLOCK_START (b), BLOCK_END (b));
+	  fprintf_filtered (outfile, "block #%03d, object at ", i);
+	  gdb_print_address (b, outfile);
 	  if (BLOCK_SUPERBLOCK (b))
-	    fprintf (outfile, " (under 0x%x)", BLOCK_SUPERBLOCK (b));
-	  if (BLOCK_FUNCTION (b))
-	    fprintf (outfile, " %s", SYMBOL_NAME (BLOCK_FUNCTION (b)));
-	  fputc ('\n', outfile);
+	    {
+	      fprintf_filtered (outfile, " under ");
+	      gdb_print_address (BLOCK_SUPERBLOCK (b), outfile);
+	    }
 	  blen = BLOCK_NSYMS (b);
+	  fprintf_filtered (outfile, ", %d syms in ", blen);
+	  print_address_numeric (BLOCK_START (b), 1, outfile);
+	  fprintf_filtered (outfile, "..");
+	  print_address_numeric (BLOCK_END (b), 1, outfile);
+	  if (BLOCK_FUNCTION (b))
+	    {
+	      fprintf_filtered (outfile, ", function %s", SYMBOL_NAME (BLOCK_FUNCTION (b)));
+	      if (SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)) != NULL)
+		{
+		  fprintf_filtered (outfile, ", %s",
+				SYMBOL_DEMANGLED_NAME (BLOCK_FUNCTION (b)));
+		}
+	    }
+	  if (BLOCK_GCC_COMPILED (b))
+	    fprintf_filtered (outfile, ", compiled with gcc%d", BLOCK_GCC_COMPILED (b));
+	  fprintf_filtered (outfile, "\n");
+	  /* Now print each symbol in this block */
 	  for (j = 0; j < blen; j++)
 	    {
-	      print_symbol (BLOCK_SYM (b, j), depth + 1, outfile);
+	      struct print_symbol_args s;
+	      s.symbol = BLOCK_SYM (b, j);
+	      s.depth = depth + 1;
+	      s.outfile = outfile;
+	      catch_errors (print_symbol, &s, "Error printing symbol:\n",
+			    RETURN_MASK_ALL);
 	    }
 	}
-      fprintf (outfile, "\n");
+      fprintf_filtered (outfile, "\n");
+    }
+  else
+    {
+      fprintf_filtered (outfile, "\nBlockvector same as previous symtab\n\n");
     }
-  return (NULL);
 }
 
-static void
-printsyms_command (args, from_tty)
+void
+maintenance_print_symbols (args, from_tty)
      char *args;
      int from_tty;
 {
   char **argv;
-  FILE *outfile;
+  GDB_FILE *outfile;
   struct cleanup *cleanups;
   char *symname = NULL;
   char *filename = DEV_TTY;
+  struct objfile *objfile;
+  struct symtab *s;
 
   dont_repeat ();
 
   if (args == NULL)
     {
-      error ("printsyms takes an output file name and optional symbol file name");
+      error ("\
+Arguments missing: an output file name and an optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
       nomem (0);
     }
-  cleanups = make_cleanup (freeargv, (char *) argv);
+  cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
     {
@@ -428,152 +539,230 @@ printsyms_command (args, from_tty)
 
   filename = tilde_expand (filename);
   make_cleanup (free, filename);
-  
-  outfile = fopen (filename, "w");
+
+  outfile = gdb_fopen (filename, FOPEN_WT);
   if (outfile == 0)
     perror_with_name (filename);
-  make_cleanup (fclose, (char *) outfile);
+  make_cleanup ((make_cleanup_func) gdb_fclose, (char *) &outfile);
 
   immediate_quit++;
-  iterate_over_symtabs (dump_symtab, (PTR) outfile, (PTR) symname, (PTR) NULL);
+  ALL_SYMTABS (objfile, s)
+    if (symname == NULL || (STREQ (symname, s->filename)))
+    dump_symtab (objfile, s, outfile);
   immediate_quit--;
   do_cleanups (cleanups);
 }
 
-static void
-print_symbol (symbol, depth, outfile)
-     struct symbol *symbol;
-     int depth;
-     FILE *outfile;
+/* Print symbol ARGS->SYMBOL on ARGS->OUTFILE.  ARGS->DEPTH says how
+   far to indent.  ARGS is really a struct print_symbol_args *, but is
+   declared as char * to get it past catch_errors.  Returns 0 for error,
+   1 for success.  */
+
+static int
+print_symbol (args)
+     PTR args;
 {
+  struct symbol *symbol = ((struct print_symbol_args *) args)->symbol;
+  int depth = ((struct print_symbol_args *) args)->depth;
+  GDB_FILE *outfile = ((struct print_symbol_args *) args)->outfile;
+
   print_spaces (depth, outfile);
   if (SYMBOL_NAMESPACE (symbol) == LABEL_NAMESPACE)
     {
-      fprintf (outfile, "label %s at 0x%x\n", SYMBOL_NAME (symbol),
-	       SYMBOL_VALUE_ADDRESS (symbol));
-      return;
+      fprintf_filtered (outfile, "label %s at ", SYMBOL_SOURCE_NAME (symbol));
+      print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+      if (SYMBOL_BFD_SECTION (symbol))
+	fprintf_filtered (outfile, " section %s\n",
+		       bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner,
+					 SYMBOL_BFD_SECTION (symbol)));
+      else
+	fprintf_filtered (outfile, "\n");
+      return 1;
     }
   if (SYMBOL_NAMESPACE (symbol) == STRUCT_NAMESPACE)
     {
-      if (TYPE_NAME (SYMBOL_TYPE (symbol)))
+      if (TYPE_TAG_NAME (SYMBOL_TYPE (symbol)))
 	{
-	  type_print_1 (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
 	}
       else
 	{
-	  fprintf (outfile, "%s %s = ",
-	       (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM
-		? "enum"
-		: (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
-		   ? "struct" : "union")),
-	       SYMBOL_NAME (symbol));
-	  type_print_1 (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+	  fprintf_filtered (outfile, "%s %s = ",
+			 (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_ENUM
+			  ? "enum"
+		     : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
+			? "struct" : "union")),
+			    SYMBOL_NAME (symbol));
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
 	}
-      fprintf (outfile, ";\n");
+      fprintf_filtered (outfile, ";\n");
     }
   else
     {
       if (SYMBOL_CLASS (symbol) == LOC_TYPEDEF)
-	fprintf (outfile, "typedef ");
+	fprintf_filtered (outfile, "typedef ");
       if (SYMBOL_TYPE (symbol))
 	{
-	  type_print_1 (SYMBOL_TYPE (symbol), SYMBOL_NAME (symbol),
-			outfile, 1, depth);
-	  fprintf (outfile, "; ");
+	  /* Print details of types, except for enums where it's clutter.  */
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), SYMBOL_SOURCE_NAME (symbol),
+			 outfile,
+			 TYPE_CODE (SYMBOL_TYPE (symbol)) != TYPE_CODE_ENUM,
+			 depth);
+	  fprintf_filtered (outfile, "; ");
 	}
       else
-	fprintf (outfile, "%s ", SYMBOL_NAME (symbol));
+	fprintf_filtered (outfile, "%s ", SYMBOL_SOURCE_NAME (symbol));
 
       switch (SYMBOL_CLASS (symbol))
 	{
 	case LOC_CONST:
-	  fprintf (outfile, "const %ld (0x%lx),",
-		   SYMBOL_VALUE (symbol), SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "const %ld (0x%lx)",
+			    SYMBOL_VALUE (symbol),
+			    SYMBOL_VALUE (symbol));
 	  break;
 
 	case LOC_CONST_BYTES:
-	  fprintf (outfile, "const %u hex bytes:",
-		   TYPE_LENGTH (SYMBOL_TYPE (symbol)));
 	  {
 	    unsigned i;
-	    for (i = 0; i < TYPE_LENGTH (SYMBOL_TYPE (symbol)); i++)
-	      fprintf (outfile, " %2x",
-			 (unsigned)SYMBOL_VALUE_BYTES (symbol) [i]);
-	    fprintf (outfile, ",");
+	    struct type *type = check_typedef (SYMBOL_TYPE (symbol));
+	    fprintf_filtered (outfile, "const %u hex bytes:",
+			      TYPE_LENGTH (type));
+	    for (i = 0; i < TYPE_LENGTH (type); i++)
+	      fprintf_filtered (outfile, " %02x",
+				(unsigned) SYMBOL_VALUE_BYTES (symbol)[i]);
 	  }
 	  break;
 
 	case LOC_STATIC:
-	  fprintf (outfile, "static at 0x%x,", SYMBOL_VALUE_ADDRESS (symbol));
+	  fprintf_filtered (outfile, "static at ");
+	  print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+	  if (SYMBOL_BFD_SECTION (symbol))
+	    fprintf_filtered (outfile, " section %s",
+			      bfd_section_name
+			      (SYMBOL_BFD_SECTION (symbol)->owner,
+			       SYMBOL_BFD_SECTION (symbol)));
+	  break;
+
+	case LOC_INDIRECT:
+	  fprintf_filtered (outfile, "extern global at *(");
+	  print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+	  fprintf_filtered (outfile, "),");
 	  break;
 
 	case LOC_REGISTER:
-	  fprintf (outfile, "register %ld,", SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol));
 	  break;
 
 	case LOC_ARG:
-	  fprintf (outfile, "arg at 0x%lx,", SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "arg at offset 0x%lx",
+			    SYMBOL_VALUE (symbol));
 	  break;
 
 	case LOC_LOCAL_ARG:
-	  fprintf (outfile, "arg at offset 0x%x from fp,",
-		   SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "arg at offset 0x%lx from fp",
+			    SYMBOL_VALUE (symbol));
+	  break;
 
 	case LOC_REF_ARG:
-	  fprintf (outfile, "reference arg at 0x%lx,", SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "reference arg at 0x%lx", SYMBOL_VALUE (symbol));
 	  break;
 
 	case LOC_REGPARM:
-	  fprintf (outfile, "parameter register %ld,", SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "parameter register %ld", SYMBOL_VALUE (symbol));
+	  break;
+
+	case LOC_REGPARM_ADDR:
+	  fprintf_filtered (outfile, "address parameter register %ld", SYMBOL_VALUE (symbol));
 	  break;
 
 	case LOC_LOCAL:
-	  fprintf (outfile, "local at 0x%lx,", SYMBOL_VALUE (symbol));
+	  fprintf_filtered (outfile, "local at offset 0x%lx",
+			    SYMBOL_VALUE (symbol));
+	  break;
+
+	case LOC_BASEREG:
+	  fprintf_filtered (outfile, "local at 0x%lx from register %d",
+			    SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol));
+	  break;
+
+	case LOC_BASEREG_ARG:
+	  fprintf_filtered (outfile, "arg at 0x%lx from register %d",
+			    SYMBOL_VALUE (symbol), SYMBOL_BASEREG (symbol));
 	  break;
 
 	case LOC_TYPEDEF:
 	  break;
 
 	case LOC_LABEL:
-	  fprintf (outfile, "label at 0x%lx", SYMBOL_VALUE_ADDRESS (symbol));
+	  fprintf_filtered (outfile, "label at ");
+	  print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+	  if (SYMBOL_BFD_SECTION (symbol))
+	    fprintf_filtered (outfile, " section %s",
+			      bfd_section_name
+			      (SYMBOL_BFD_SECTION (symbol)->owner,
+			       SYMBOL_BFD_SECTION (symbol)));
 	  break;
 
 	case LOC_BLOCK:
-	  fprintf (outfile, "block (object 0x%x) starting at 0x%x,",
-		   SYMBOL_BLOCK_VALUE (symbol),
-		   BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)));
+	  fprintf_filtered (outfile, "block object ");
+	  gdb_print_address (SYMBOL_BLOCK_VALUE (symbol), outfile);
+	  fprintf_filtered (outfile, ", ");
+	  print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)),
+				 1,
+				 outfile);
+	  fprintf_filtered (outfile, "..");
+	  print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)),
+				 1,
+				 outfile);
+	  if (SYMBOL_BFD_SECTION (symbol))
+	    fprintf_filtered (outfile, " section %s",
+			      bfd_section_name
+			      (SYMBOL_BFD_SECTION (symbol)->owner,
+			       SYMBOL_BFD_SECTION (symbol)));
 	  break;
 
-        default:
-	  fprintf (outfile, "botched symbol class %x", SYMBOL_CLASS (symbol));
+	case LOC_UNRESOLVED:
+	  fprintf_filtered (outfile, "unresolved");
+	  break;
+
+	case LOC_OPTIMIZED_OUT:
+	  fprintf_filtered (outfile, "optimized out");
+	  break;
+
+	default:
+	  fprintf_filtered (outfile, "botched symbol class %x",
+			    SYMBOL_CLASS (symbol));
 	  break;
 	}
     }
-  fprintf (outfile, "\n");
+  fprintf_filtered (outfile, "\n");
+  return 1;
 }
 
-static void
-printpsyms_command (args, from_tty)
+void
+maintenance_print_psymbols (args, from_tty)
      char *args;
      int from_tty;
 {
   char **argv;
-  FILE *outfile;
+  GDB_FILE *outfile;
   struct cleanup *cleanups;
   char *symname = NULL;
   char *filename = DEV_TTY;
+  struct objfile *objfile;
+  struct partial_symtab *ps;
 
   dont_repeat ();
 
   if (args == NULL)
     {
-      error ("printpsyms takes an output file name and optional symbol file name");
+      error ("print-psymbols takes an output file name and optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
       nomem (0);
     }
-  cleanups = make_cleanup (freeargv, (char *) argv);
+  cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
     {
@@ -587,32 +776,37 @@ printpsyms_command (args, from_tty)
 
   filename = tilde_expand (filename);
   make_cleanup (free, filename);
-  
-  outfile = fopen (filename, "w");
+
+  outfile = gdb_fopen (filename, FOPEN_WT);
   if (outfile == 0)
     perror_with_name (filename);
-  make_cleanup (fclose, outfile);
+  make_cleanup ((make_cleanup_func) gdb_fclose, &outfile);
 
   immediate_quit++;
-  iterate_over_psymtabs (dump_psymtab, (PTR) outfile, (PTR) symname,
-			 (PTR) NULL);
+  ALL_PSYMTABS (objfile, ps)
+    if (symname == NULL || (STREQ (symname, ps->filename)))
+    dump_psymtab (objfile, ps, outfile);
   immediate_quit--;
   do_cleanups (cleanups);
 }
 
 static void
-print_partial_symbol (p, count, what, outfile)
-     struct partial_symbol *p;
+print_partial_symbols (p, count, what, outfile)
+     struct partial_symbol **p;
      int count;
      char *what;
-     FILE *outfile;
+     GDB_FILE *outfile;
 {
-
   fprintf_filtered (outfile, "  %s partial symbols:\n", what);
   while (count-- > 0)
     {
-      fprintf_filtered (outfile, "    `%s', ", SYMBOL_NAME(p));
-      switch (SYMBOL_NAMESPACE (p))
+      fprintf_filtered (outfile, "    `%s'", SYMBOL_NAME (*p));
+      if (SYMBOL_DEMANGLED_NAME (*p) != NULL)
+	{
+	  fprintf_filtered (outfile, "  `%s'", SYMBOL_DEMANGLED_NAME (*p));
+	}
+      fputs_filtered (", ", outfile);
+      switch (SYMBOL_NAMESPACE (*p))
 	{
 	case UNDEF_NAMESPACE:
 	  fputs_filtered ("undefined namespace, ", outfile);
@@ -630,7 +824,7 @@ print_partial_symbol (p, count, what, outfile)
 	  fputs_filtered ("<invalid namespace>, ", outfile);
 	  break;
 	}
-      switch (SYMBOL_CLASS (p))
+      switch (SYMBOL_CLASS (*p))
 	{
 	case LOC_UNDEF:
 	  fputs_filtered ("undefined", outfile);
@@ -641,6 +835,9 @@ print_partial_symbol (p, count, what, outfile)
 	case LOC_STATIC:
 	  fputs_filtered ("static", outfile);
 	  break;
+	case LOC_INDIRECT:
+	  fputs_filtered ("extern global", outfile);
+	  break;
 	case LOC_REGISTER:
 	  fputs_filtered ("register", outfile);
 	  break;
@@ -653,6 +850,9 @@ print_partial_symbol (p, count, what, outfile)
 	case LOC_REGPARM:
 	  fputs_filtered ("register parameter", outfile);
 	  break;
+	case LOC_REGPARM_ADDR:
+	  fputs_filtered ("register address parameter", outfile);
+	  break;
 	case LOC_LOCAL:
 	  fputs_filtered ("stack parameter", outfile);
 	  break;
@@ -671,38 +871,46 @@ print_partial_symbol (p, count, what, outfile)
 	case LOC_LOCAL_ARG:
 	  fputs_filtered ("shuffled arg", outfile);
 	  break;
+	case LOC_UNRESOLVED:
+	  fputs_filtered ("unresolved", outfile);
+	  break;
+	case LOC_OPTIMIZED_OUT:
+	  fputs_filtered ("optimized out", outfile);
+	  break;
 	default:
 	  fputs_filtered ("<invalid location>", outfile);
 	  break;
 	}
       fputs_filtered (", ", outfile);
-      fprintf_filtered (outfile, "0x%x\n", SYMBOL_VALUE (p));
+      print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile);
+      fprintf_filtered (outfile, "\n");
       p++;
     }
 }
 
-static void
-printmsyms_command (args, from_tty)
+void
+maintenance_print_msymbols (args, from_tty)
      char *args;
      int from_tty;
 {
   char **argv;
-  FILE *outfile;
+  GDB_FILE *outfile;
   struct cleanup *cleanups;
   char *filename = DEV_TTY;
   char *symname = NULL;
+  struct objfile *objfile;
 
   dont_repeat ();
 
   if (args == NULL)
     {
-      error ("printmsyms takes an output file name and optional symbol file name");
+      error ("print-msymbols takes an output file name and optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
       nomem (0);
     }
-  cleanups = make_cleanup (freeargv, argv);
+  cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
     {
@@ -716,187 +924,123 @@ printmsyms_command (args, from_tty)
 
   filename = tilde_expand (filename);
   make_cleanup (free, filename);
-  
-  outfile = fopen (filename, "w");
+
+  outfile = gdb_fopen (filename, FOPEN_WT);
   if (outfile == 0)
     perror_with_name (filename);
-  make_cleanup (fclose, outfile);
+  make_cleanup ((make_cleanup_func) gdb_fclose, &outfile);
 
   immediate_quit++;
-  iterate_over_objfiles (dump_msymbols, (PTR) outfile, (PTR) symname,
-			 (PTR) NULL);
+  ALL_OBJFILES (objfile)
+    if (symname == NULL || (STREQ (symname, objfile->name)))
+    dump_msymbols (objfile, outfile);
   immediate_quit--;
   fprintf_filtered (outfile, "\n\n");
   do_cleanups (cleanups);
 }
 
-static void
-printobjfiles_command ()
+void
+maintenance_print_objfiles (ignore, from_tty)
+     char *ignore;
+     int from_tty;
 {
+  struct objfile *objfile;
+
   dont_repeat ();
 
   immediate_quit++;
-  iterate_over_objfiles (dump_objfile, (PTR) NULL, (PTR) NULL, (PTR) NULL);
+  ALL_OBJFILES (objfile)
+    dump_objfile (objfile);
   immediate_quit--;
 }
 
-
-/* Debugging functions from xcoffread.c originally.   Some are redundant
-   and should probably disappear.  */
-
-static void
-dump_strtbl ()
-{
-#if 0		/* We don't know its length FIXME */
-  int ii;
-  printf ("===STRING TABLE DUMP...\n\n");
-  for ( ii=0; ii < strtbl_len; ++ii )
-    printf ("%c", isprint (*(strtbl+ii)) ? *(strtbl+ii) : ' ');
-  printf ("\n");
-#endif
-}
-
-static void
-dump_linetable (ltb)
-     struct linetable *ltb;
-{
-  int ii;
-  for (ii=0; ii < ltb->nitems; ++ii)
-    printf ("line: %d, addr: 0x%x\n", ltb->item[ii].line, ltb->item[ii].pc);
-}
-
-static void
-dump_type (typeP)
-     struct type *typeP;
-{
-  printf ("0x%x: name: %s\n", typeP, typeP->name ? typeP->name : "(nil)");
-}
-
-static void
-dump_symbol (pp)
-     struct symbol *pp;
-{
-  printf (" sym: %s\t%s,\t%s\ttype: 0x%x, val: 0x%x end: 0x%x\n", 
-      pp->name, dump_namespace (pp->namespace),
-      dump_addrclass (pp->class), pp->type,
-      SYMBOL_CLASS(pp) == LOC_BLOCK ? BLOCK_START(SYMBOL_BLOCK_VALUE(pp))
-      : pp->value.value,
-      SYMBOL_CLASS(pp) == LOC_BLOCK ? BLOCK_END(SYMBOL_BLOCK_VALUE(pp)) : 0);
-}
-
-static char *
-dump_namespace (ns)
-int ns;
-{
-  static char *ns_name [] = { 
-    "UNDEF_NS", "VAR_NS", "STRUCT_NS", "LABEL_NS"};
-
-  switch (ns) {
-  case UNDEF_NAMESPACE:
-  case VAR_NAMESPACE:
-  case STRUCT_NAMESPACE:
-  case LABEL_NAMESPACE:
-    return ns_name[ns];
-  }
- 
-  return "***ERROR***";
-}
+/* Check consistency of psymtabs and symtabs.  */
 
-static char *
-dump_addrclass (ac)
-int ac;						/* address class */
-{
-  static char *ac_name [] = {
-    "LOC_UNDEF",
-    "LOC_CONST",
-    "LOC_STATIC",
-    "LOC_REGISTER",
-    "LOC_ARG",
-    "LOC_REF_ARG",
-    "LOC_REGPARM",
-    "LOC_LOCAL",
-    "LOC_TYPEDEF",
-    "LOC_LABEL",
-    "LOC_BLOCK",
-    "LOC_CONST_BYTES",
-    "LOC_LOCAL_ARG",
-  };
-  switch (ac) {
-  case LOC_UNDEF:
-  case LOC_CONST:
-  case LOC_STATIC:
-  case LOC_REGISTER:
-  case LOC_ARG:
-  case LOC_REF_ARG:
-  case LOC_REGPARM:
-  case LOC_LOCAL:
-  case LOC_TYPEDEF:
-  case LOC_LABEL:
-  case LOC_BLOCK:
-  case LOC_CONST_BYTES:
-  case LOC_LOCAL_ARG:
-    return ac_name [ac];
-  }
-  return "***ERROR***";
-}
-
-static void
-dump_block (pp)
-     struct block *pp;
-{
-  int ii;
-  printf ("BLOCK..: start: 0x%x, end: 0x%x\n", pp->startaddr, pp->endaddr);
-  for (ii=0; ii < pp->nsyms; ++ii)
-    dump_symbol (pp->sym[ii]);
-}
-
-static void
-dump_blockvector (pp)
-     struct blockvector *pp;
-{
-  int ii;
-  for (ii=0; ii < pp->nblocks; ++ii)
-    dump_block (pp->block [ii]);
-}
-
-static void
-dump_last_symtab (pp)
-     struct symtab *pp;
-{
-  for ( ; pp; pp = pp->next) {
-    if ( pp->next == 0 ) {
-      printf ("SYMTAB NAME: %s\n", pp->filename);
-      dump_blockvector (pp->blockvector);
-    }
-  }
-}
-
-static void
-dump_symtabs (pp)
-     struct symtab *pp;
-{
-  for ( ; pp; pp = pp->next) {
-    printf ("SYMTAB NAME: %s\n", pp->filename ? pp->filename : "(nil)");
-/*    if (pp->linetable)
-      dump_linetable (pp->linetable); */
-    dump_blockvector (pp->blockvector);
-  }
-}
-
-static void
-dump_symtab_lines (pp)
-     struct symtab *pp;
+void
+maintenance_check_symtabs (ignore, from_tty)
+     char *ignore;
+     int from_tty;
 {
-  for ( ; pp; pp = pp->next) {
-    printf ("SYMTAB NAME: %s\n", pp->filename ? pp->filename : "(nil)");
-    if (pp->linetable)
-      dump_linetable (pp->linetable);
-    /* dump_blockvector (pp->blockvector); */
+  register struct symbol *sym;
+  register struct partial_symbol **psym;
+  register struct symtab *s = NULL;
+  register struct partial_symtab *ps;
+  struct blockvector *bv;
+  register struct objfile *objfile;
+  register struct block *b;
+  int length;
+
+  ALL_PSYMTABS (objfile, ps)
+  {
+    s = PSYMTAB_TO_SYMTAB (ps);
+    if (s == NULL)
+      continue;
+    bv = BLOCKVECTOR (s);
+    b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+    psym = ps->objfile->static_psymbols.list + ps->statics_offset;
+    length = ps->n_static_syms;
+    while (length--)
+      {
+	sym = lookup_block_symbol (b, SYMBOL_NAME (*psym),
+				   SYMBOL_NAMESPACE (*psym));
+	if (!sym)
+	  {
+	    printf_filtered ("Static symbol `");
+	    puts_filtered (SYMBOL_NAME (*psym));
+	    printf_filtered ("' only found in ");
+	    puts_filtered (ps->filename);
+	    printf_filtered (" psymtab\n");
+	  }
+	psym++;
+      }
+    b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+    psym = ps->objfile->global_psymbols.list + ps->globals_offset;
+    length = ps->n_global_syms;
+    while (length--)
+      {
+	sym = lookup_block_symbol (b, SYMBOL_NAME (*psym),
+				   SYMBOL_NAMESPACE (*psym));
+	if (!sym)
+	  {
+	    printf_filtered ("Global symbol `");
+	    puts_filtered (SYMBOL_NAME (*psym));
+	    printf_filtered ("' only found in ");
+	    puts_filtered (ps->filename);
+	    printf_filtered (" psymtab\n");
+	  }
+	psym++;
+      }
+    if (ps->texthigh < ps->textlow)
+      {
+	printf_filtered ("Psymtab ");
+	puts_filtered (ps->filename);
+	printf_filtered (" covers bad range ");
+	print_address_numeric (ps->textlow, 1, gdb_stdout);
+	printf_filtered (" - ");
+	print_address_numeric (ps->texthigh, 1, gdb_stdout);
+	printf_filtered ("\n");
+	continue;
+      }
+    if (ps->texthigh == 0)
+      continue;
+    if (ps->textlow < BLOCK_START (b) || ps->texthigh > BLOCK_END (b))
+      {
+	printf_filtered ("Psymtab ");
+	puts_filtered (ps->filename);
+	printf_filtered (" covers ");
+	print_address_numeric (ps->textlow, 1, gdb_stdout);
+	printf_filtered (" - ");
+	print_address_numeric (ps->texthigh, 1, gdb_stdout);
+	printf_filtered (" but symtab covers only ");
+	print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
+	printf_filtered (" - ");
+	print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
+	printf_filtered ("\n");
+      }
   }
 }
-
-
 
+
 /* Return the nexting depth of a block within other blocks in its symtab.  */
 
 static int
@@ -904,12 +1048,17 @@ block_depth (block)
      struct block *block;
 {
   register int i = 0;
-  while (block = BLOCK_SUPERBLOCK (block)) i++;
+  while ((block = BLOCK_SUPERBLOCK (block)) != NULL)
+    {
+      i++;
+    }
   return i;
 }
-
 
-/* Increase the space allocated for LISTP. */
+
+/* Increase the space allocated for LISTP, which is probably
+   global_psymbols or static_psymbols. This space will eventually
+   be freed in free_objfile().  */
 
 void
 extend_psymbol_list (listp, objfile)
@@ -920,15 +1069,15 @@ extend_psymbol_list (listp, objfile)
   if (listp->size == 0)
     {
       new_size = 255;
-      listp->list = (struct partial_symbol *)
-	xmmalloc (objfile -> md, new_size * sizeof (struct partial_symbol));
+      listp->list = (struct partial_symbol **)
+	xmmalloc (objfile->md, new_size * sizeof (struct partial_symbol *));
     }
   else
     {
       new_size = listp->size * 2;
-      listp->list = (struct partial_symbol *)
-	xmrealloc (objfile -> md, (char *) listp->list,
-		   new_size * sizeof (struct partial_symbol));
+      listp->list = (struct partial_symbol **)
+	xmrealloc (objfile->md, (char *) listp->list,
+		   new_size * sizeof (struct partial_symbol *));
     }
   /* Next assumes we only went one over.  Should be good if
      program works correctly */
@@ -936,77 +1085,12 @@ extend_psymbol_list (listp, objfile)
   listp->size = new_size;
 }
 
-#ifdef DEBUG
-
-/* The work performed by this function is normally done by the macro
-   ADD_PSYMBOL_TO_LIST defined in symfile.h.  When debugging gdb, this
-   function makes things easier. */
-
-void
-add_psymbol_to_list (name, namelength, namespace, class, listp, psymval)
-     char *name;
-     int namelength;
-     enum namespace namespace;
-     enum address_class class;
-     struct psymbol_allocation_list *listp;
-     unsigned long psymval;
-{
-  register struct partial_symbol *psym;
-
-  if (listp -> next >= listp -> list + listp -> size)
-    extend_psymbol_list (listp, objfile);
-  psym = listp -> next++;
-  SYMBOL_NAME (psym) = (char *) obstack_alloc (&objfile->psymbol_obstack,
-					       namelength + 1);
-  memcpy (SYMBOL_NAME (psym), name, namelength);
-  SYMBOL_NAME (psym)[namelength] = '\0';
-  SYMBOL_NAMESPACE (psym) = namespace;
-  SYMBOL_CLASS (psym) = class;
-  SYMBOL_VALUE (psym) = psymval;
-}
-
-/* The work performed by this function is normally done by the macro
-   ADD_PSYMBOL_ADDR_TO_LIST defined in symfile.h.  When debugging gdb, this
-   function makes things easier. */
-
-void
-add_psymbol_addr_to_list (name, namelength, namespace, class, listp, psymval)
-     char *name;
-     int namelength;
-     enum namespace namespace;
-     enum address_class class;
-     struct psymbol_allocation_list *listp;
-     CORE_ADDR psymval;
-{
-  register struct partial_symbol *psym;
-
-  if (listp -> next >= listp -> list + listp -> size)
-    extend_psymbol_list (listp, objfile);
-  psym = listp -> next++;
-  SYMBOL_NAME (psym) = (char *) obstack_alloc (&objfile->psymbol_obstack,
-					       namelength + 1);
-  memcpy (SYMBOL_NAME (psym), name, namelength);
-  SYMBOL_NAME (psym)[namelength] = '\0';
-  SYMBOL_NAMESPACE (psym) = namespace;
-  SYMBOL_CLASS (psym) = class;
-  SYMBOL_VALUE_ADDRESS (psym) = psymval;
-}
-
-#endif /* DEBUG */
 
+/* Do early runtime initializations. */
 void
 _initialize_symmisc ()
 {
-  add_com ("printmsyms", class_obscure, printmsyms_command,
-	   "Print dump of current minimal symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's symbols.");
-  add_com ("printpsyms", class_obscure, printpsyms_command,
-	  "Print dump of current partial symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's partial symbols.");
-  add_com ("printsyms", class_obscure, printsyms_command,
-	   "Print dump of current symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's symbols.");
-  add_com ("printobjfiles", class_obscure, printobjfiles_command,
-	   "Print dump of current object file definitions.");
+  std_in = stdin;
+  std_out = stdout;
+  std_err = stderr;
 }
-