* defs.h (strlen_paddr, paddr, paddr_nz): Remove.
[deliverable/binutils-gdb.git] / gdb / symmisc.c
index 85eda5eddc61d63517383919bcef9345b04fde70..eb35369f9ef8f18fb322bb410fa0b1e50d3de592 100644 (file)
@@ -1,14 +1,14 @@
 /* Do various things to symbol tables (other than lookup), for GDB.
 
-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2007, 2008, 2009
+   Free Software Foundation, Inc.
 
    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
+   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,
@@ -17,9 +17,7 @@
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -69,52 +67,27 @@ static void dump_objfile (struct objfile *);
 
 static int block_depth (struct block *);
 
-static void print_partial_symbols (struct partial_symbol **, int,
+static void print_partial_symbols (struct gdbarch *,
+                                  struct partial_symbol **, int,
                                   char *, struct ui_file *);
 
-static void free_symtab_block (struct objfile *, struct block *);
-
 void _initialize_symmisc (void);
 
 struct print_symbol_args
   {
+    struct gdbarch *gdbarch;
     struct symbol *symbol;
     int depth;
     struct ui_file *outfile;
   };
 
 static int print_symbol (void *);
-
-static void free_symtab_block (struct objfile *, struct block *);
 \f
-
-/* Free a struct block <- B and all the symbols defined in that block.  */
-
-/* FIXME: carlton/2003-04-28: I don't believe this is currently ever
-   used.  */
-
-static void
-free_symtab_block (struct objfile *objfile, struct block *b)
-{
-  struct dict_iterator iter;
-  struct symbol *sym;
-
-  ALL_BLOCK_SYMBOLS (b, iter, sym)
-    {
-      xfree (DEPRECATED_SYMBOL_NAME (sym));
-      xfree (sym);
-    }
-
-  dict_free (BLOCK_DICT (b));
-  xfree (b);
-}
-
 /* Free all the storage associated with the struct symtab <- S.
-   Note that some symtabs have contents malloc'ed structure by structure,
-   while some have contents that all live inside one big block of memory,
-   and some share the contents of another symbol table and so you should
-   not free the contents on their behalf (except sometimes the linetable,
-   which maybe per symtab even when the rest is not).
+   Note that some symtabs have contents that all live inside one big block of
+   memory, and some share the contents of another symbol table and so you
+   should not free the contents on their behalf (except sometimes the
+   linetable, which maybe per symtab even when the rest is not).
    It is s->free_code that says which alternative to use.  */
 
 void
@@ -131,18 +104,6 @@ free_symtab (struct symtab *s)
          Therefore, do nothing.  */
       break;
 
-    case free_contents:
-      /* Here all the contents were malloc'ed structure by structure
-         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 the blockvector itself.  */
-      xfree (bv);
-      /* Also free the linetable.  */
-
     case free_linetable:
       /* Everything will be freed either by our `free_func'
          or by some other symtab, except for our linetable.
@@ -174,8 +135,9 @@ print_symbol_bcache_statistics (void)
   immediate_quit++;
   ALL_OBJFILES (objfile)
   {
-    printf_filtered ("Byte cache statistics for '%s':\n", objfile->name);
+    printf_filtered (_("Byte cache statistics for '%s':\n"), objfile->name);
     print_bcache_statistics (objfile->psymbol_cache, "partial symbol cache");
+    print_bcache_statistics (objfile->macro_cache, "preprocessor macro cache");
   }
   immediate_quit--;
 }
@@ -191,21 +153,21 @@ print_objfile_statistics (void)
   immediate_quit++;
   ALL_OBJFILES (objfile)
   {
-    printf_filtered ("Statistics for '%s':\n", objfile->name);
+    printf_filtered (_("Statistics for '%s':\n"), objfile->name);
     if (OBJSTAT (objfile, n_stabs) > 0)
-      printf_filtered ("  Number of \"stab\" symbols read: %d\n",
+      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",
+      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",
+      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",
+      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",
+      printf_filtered (_("  Number of \"types\" defined: %d\n"),
                       OBJSTAT (objfile, n_types));
     i = 0;
     ALL_OBJFILE_PSYMTABS (objfile, ps)
@@ -213,7 +175,7 @@ print_objfile_statistics (void)
         if (ps->readin == 0)
           i++;
       }
-    printf_filtered ("  Number of psym tables (not yet expanded): %d\n", i);
+    printf_filtered (_("  Number of psym tables (not yet expanded): %d\n"), i);
     i = linetables = blockvectors = 0;
     ALL_OBJFILE_SYMTABS (objfile, s)
       {
@@ -223,20 +185,20 @@ print_objfile_statistics (void)
         if (s->primary == 1)
           blockvectors++;
       }
-    printf_filtered ("  Number of symbol tables: %d\n", i);
-    printf_filtered ("  Number of symbol tables with line tables: %d\n"
+    printf_filtered (_("  Number of symbol tables: %d\n"), i);
+    printf_filtered (_("  Number of symbol tables with line tables: %d\n")
                      linetables);
-    printf_filtered ("  Number of symbol tables with blockvectors: %d\n"
+    printf_filtered (_("  Number of symbol tables with blockvectors: %d\n")
                      blockvectors);
     
     if (OBJSTAT (objfile, sz_strtab) > 0)
-      printf_filtered ("  Space used by a.out string tables: %d\n",
+      printf_filtered (_("  Space used by a.out string tables: %d\n"),
                       OBJSTAT (objfile, sz_strtab));
-    printf_filtered ("  Total memory used for objfile obstack: %d\n",
+    printf_filtered (_("  Total memory used for objfile obstack: %d\n"),
                     obstack_memory_used (&objfile->objfile_obstack));
-    printf_filtered ("  Total memory used for psymbol cache: %d\n",
+    printf_filtered (_("  Total memory used for psymbol cache: %d\n"),
                     bcache_memory_used (objfile->psymbol_cache));
-    printf_filtered ("  Total memory used for macro cache: %d\n",
+    printf_filtered (_("  Total memory used for macro cache: %d\n"),
                     bcache_memory_used (objfile->macro_cache));
   }
   immediate_quit--;
@@ -301,6 +263,7 @@ dump_objfile (struct objfile *objfile)
 static void
 dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
 {
+  struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct minimal_symbol *msymbol;
   int index;
   char ms_type;
@@ -311,10 +274,12 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
       fprintf_filtered (outfile, "No minimal symbols found.\n");
       return;
     }
-  for (index = 0, msymbol = objfile->msymbols;
-       DEPRECATED_SYMBOL_NAME (msymbol) != NULL; msymbol++, index++)
+  index = 0;
+  ALL_OBJFILE_MSYMBOLS (objfile, msymbol)
     {
-      switch (msymbol->type)
+      struct obj_section *section = SYMBOL_OBJ_SECTION (msymbol);
+
+      switch (MSYMBOL_TYPE (msymbol))
        {
        case mst_unknown:
          ms_type = 'u';
@@ -348,21 +313,21 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile)
          break;
        }
       fprintf_filtered (outfile, "[%2d] %c ", index, ms_type);
-      print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile);
-      fprintf_filtered (outfile, " %s", DEPRECATED_SYMBOL_NAME (msymbol));
-      if (SYMBOL_BFD_SECTION (msymbol))
+      fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (msymbol)),
+                     outfile);
+      fprintf_filtered (outfile, " %s", SYMBOL_LINKAGE_NAME (msymbol));
+      if (section)
        fprintf_filtered (outfile, " section %s",
                          bfd_section_name (objfile->obfd,
-                                           SYMBOL_BFD_SECTION (msymbol)));
+                                           section->the_bfd_section));
       if (SYMBOL_DEMANGLED_NAME (msymbol) != NULL)
        {
          fprintf_filtered (outfile, "  %s", SYMBOL_DEMANGLED_NAME (msymbol));
        }
-#ifdef SOFUN_ADDRESS_MAYBE_MISSING
       if (msymbol->filename)
        fprintf_filtered (outfile, "  %s", msymbol->filename);
-#endif
       fputs_filtered ("\n", outfile);
+      index++;
     }
   if (objfile->minimal_symbol_count != index)
     {
@@ -376,6 +341,7 @@ static void
 dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
              struct ui_file *outfile)
 {
+  struct gdbarch *gdbarch = get_objfile_arch (objfile);
   int i;
 
   fprintf_filtered (outfile, "\nPartial symtab for source file %s ",
@@ -404,16 +370,16 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
       if (i != 0)
        fprintf_filtered (outfile, ", ");
       wrap_here ("    ");
-      print_address_numeric (ANOFFSET (psymtab->section_offsets, i),
-                            1,
-                            outfile);
+      fputs_filtered (paddress (gdbarch,
+                               ANOFFSET (psymtab->section_offsets, i)),
+                     outfile);
     }
   fprintf_filtered (outfile, "\n");
 
   fprintf_filtered (outfile, "  Symbols cover text addresses ");
-  print_address_numeric (psymtab->textlow, 1, outfile);
+  fputs_filtered (paddress (gdbarch, psymtab->textlow), outfile);
   fprintf_filtered (outfile, "-");
-  print_address_numeric (psymtab->texthigh, 1, outfile);
+  fputs_filtered (paddress (gdbarch, psymtab->texthigh), outfile);
   fprintf_filtered (outfile, "\n");
   fprintf_filtered (outfile, "  Depends on %d other partial symtabs.\n",
                    psymtab->number_of_dependencies);
@@ -426,13 +392,15 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
     }
   if (psymtab->n_global_syms > 0)
     {
-      print_partial_symbols (objfile->global_psymbols.list
+      print_partial_symbols (gdbarch,
+                            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
+      print_partial_symbols (gdbarch,
+                            objfile->static_psymbols.list
                             + psymtab->statics_offset,
                             psymtab->n_static_syms, "Static", outfile);
     }
@@ -440,9 +408,10 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
 }
 
 static void
-dump_symtab (struct objfile *objfile, struct symtab *symtab,
-            struct ui_file *outfile)
+dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
+              struct ui_file *outfile)
 {
+  struct gdbarch *gdbarch = get_objfile_arch (objfile);
   int i;
   struct dict_iterator iter;
   int len, blen;
@@ -470,7 +439,7 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
       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);
+         fputs_filtered (paddress (gdbarch, l->item[i].pc), outfile);
          fprintf_filtered (outfile, "\n");
        }
     }
@@ -498,31 +467,31 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
             wants it.  */
          fprintf_filtered (outfile, ", %d syms/buckets in ",
                            dict_size (BLOCK_DICT (b)));
-         print_address_numeric (BLOCK_START (b), 1, outfile);
+         fputs_filtered (paddress (gdbarch, BLOCK_START (b)), outfile);
          fprintf_filtered (outfile, "..");
-         print_address_numeric (BLOCK_END (b), 1, outfile);
+         fputs_filtered (paddress (gdbarch, BLOCK_END (b)), outfile);
          if (BLOCK_FUNCTION (b))
            {
-             fprintf_filtered (outfile, ", function %s", DEPRECATED_SYMBOL_NAME (BLOCK_FUNCTION (b)));
+             fprintf_filtered (outfile, ", function %s",
+                               SYMBOL_LINKAGE_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 (in no particular order, if
             we're using a hashtable).  */
          ALL_BLOCK_SYMBOLS (b, iter, sym)
            {
              struct print_symbol_args s;
+             s.gdbarch = gdbarch;
              s.symbol = sym;
              s.depth = depth + 1;
              s.outfile = outfile;
              catch_errors (print_symbol, &s, "Error printing symbol:\n",
-                           RETURN_MASK_ALL);
+                           RETURN_MASK_ERROR);
            }
        }
       fprintf_filtered (outfile, "\n");
@@ -533,6 +502,29 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
     }
 }
 
+static void
+dump_symtab (struct objfile *objfile, struct symtab *symtab,
+            struct ui_file *outfile)
+{
+  /* Set the current language to the language of the symtab we're dumping
+     because certain routines used during dump_symtab() use the current
+     language to print an image of the symbol.  We'll restore it later.
+     But use only real languages, not placeholders.  */
+  if (symtab->language != language_unknown
+      && symtab->language != language_auto)
+    {
+      enum language saved_lang;
+
+      saved_lang = set_language (symtab->language);
+
+      dump_symtab_1 (objfile, symtab, outfile);
+
+      set_language (saved_lang);
+    }
+  else
+    dump_symtab_1 (objfile, symtab, outfile);
+}
+
 void
 maintenance_print_symbols (char *args, int from_tty)
 {
@@ -551,10 +543,7 @@ maintenance_print_symbols (char *args, int from_tty)
       error (_("\
 Arguments missing: an output file name and an optional symbol file name"));
     }
-  else if ((argv = buildargv (args)) == NULL)
-    {
-      nomem (0);
-    }
+  argv = gdb_buildargv (args);
   cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
@@ -591,19 +580,22 @@ Arguments missing: an output file name and an optional symbol file name"));
 static int
 print_symbol (void *args)
 {
+  struct gdbarch *gdbarch = ((struct print_symbol_args *) args)->gdbarch;
   struct symbol *symbol = ((struct print_symbol_args *) args)->symbol;
   int depth = ((struct print_symbol_args *) args)->depth;
   struct ui_file *outfile = ((struct print_symbol_args *) args)->outfile;
+  struct obj_section *section = SYMBOL_OBJ_SECTION (symbol);
 
   print_spaces (depth, outfile);
   if (SYMBOL_DOMAIN (symbol) == LABEL_DOMAIN)
     {
       fprintf_filtered (outfile, "label %s at ", SYMBOL_PRINT_NAME (symbol));
-      print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
-      if (SYMBOL_BFD_SECTION (symbol))
+      fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+                     outfile);
+      if (section)
        fprintf_filtered (outfile, " section %s\n",
-                      bfd_section_name (SYMBOL_BFD_SECTION (symbol)->owner,
-                                        SYMBOL_BFD_SECTION (symbol)));
+                         bfd_section_name (section->the_bfd_section->owner,
+                                           section->the_bfd_section));
       else
        fprintf_filtered (outfile, "\n");
       return 1;
@@ -621,7 +613,7 @@ print_symbol (void *args)
                          ? "enum"
                     : (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
                        ? "struct" : "union")),
-                           DEPRECATED_SYMBOL_NAME (symbol));
+                           SYMBOL_LINKAGE_NAME (symbol));
          LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
        }
       fprintf_filtered (outfile, ";\n");
@@ -664,22 +656,20 @@ print_symbol (void *args)
 
        case LOC_STATIC:
          fprintf_filtered (outfile, "static at ");
-         print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
-         if (SYMBOL_BFD_SECTION (symbol))
+         fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+                         outfile);
+         if (section)
            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, "),");
+                             bfd_section_name (section->the_bfd_section->owner,
+                                               section->the_bfd_section));
          break;
 
        case LOC_REGISTER:
-         fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol));
+         if (SYMBOL_IS_ARGUMENT (symbol))
+           fprintf_filtered (outfile, "parameter register %ld",
+                             SYMBOL_VALUE (symbol));
+         else
+           fprintf_filtered (outfile, "register %ld", SYMBOL_VALUE (symbol));
          break;
 
        case LOC_ARG:
@@ -687,19 +677,10 @@ print_symbol (void *args)
                            SYMBOL_VALUE (symbol));
          break;
 
-       case LOC_LOCAL_ARG:
-         fprintf_filtered (outfile, "arg at offset 0x%lx from fp",
-                           SYMBOL_VALUE (symbol));
-         break;
-
        case LOC_REF_ARG:
          fprintf_filtered (outfile, "reference arg at 0x%lx", SYMBOL_VALUE (symbol));
          break;
 
-       case LOC_REGPARM:
-         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;
@@ -709,49 +690,37 @@ print_symbol (void *args)
                            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_filtered (outfile, "label at ");
-         print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
-         if (SYMBOL_BFD_SECTION (symbol))
+         fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (symbol)),
+                         outfile);
+         if (section)
            fprintf_filtered (outfile, " section %s",
-                             bfd_section_name
-                             (SYMBOL_BFD_SECTION (symbol)->owner,
-                              SYMBOL_BFD_SECTION (symbol)));
+                             bfd_section_name (section->the_bfd_section->owner,
+                                               section->the_bfd_section));
          break;
 
        case LOC_BLOCK:
          fprintf_filtered (outfile, "block object ");
          gdb_print_host_address (SYMBOL_BLOCK_VALUE (symbol), outfile);
          fprintf_filtered (outfile, ", ");
-         print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)),
-                                1,
-                                outfile);
+         fputs_filtered (paddress (gdbarch,
+                                   BLOCK_START (SYMBOL_BLOCK_VALUE (symbol))),
+                         outfile);
          fprintf_filtered (outfile, "..");
-         print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)),
-                                1,
-                                outfile);
-         if (SYMBOL_BFD_SECTION (symbol))
+         fputs_filtered (paddress (gdbarch,
+                                   BLOCK_END (SYMBOL_BLOCK_VALUE (symbol))),
+                         outfile);
+         if (section)
            fprintf_filtered (outfile, " section %s",
-                             bfd_section_name
-                             (SYMBOL_BFD_SECTION (symbol)->owner,
-                              SYMBOL_BFD_SECTION (symbol)));
+                             bfd_section_name (section->the_bfd_section->owner,
+                                               section->the_bfd_section));
          break;
 
        case LOC_COMPUTED:
-       case LOC_COMPUTED_ARG:
          fprintf_filtered (outfile, "computed at runtime");
          break;
 
@@ -790,10 +759,7 @@ maintenance_print_psymbols (char *args, int from_tty)
     {
       error (_("print-psymbols takes an output file name and optional symbol file name"));
     }
-  else if ((argv = buildargv (args)) == NULL)
-    {
-      nomem (0);
-    }
+  argv = gdb_buildargv (args);
   cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
@@ -823,13 +789,14 @@ maintenance_print_psymbols (char *args, int from_tty)
 }
 
 static void
-print_partial_symbols (struct partial_symbol **p, int count, char *what,
+print_partial_symbols (struct gdbarch *gdbarch,
+                      struct partial_symbol **p, int count, char *what,
                       struct ui_file *outfile)
 {
   fprintf_filtered (outfile, "  %s partial symbols:\n", what);
   while (count-- > 0)
     {
-      fprintf_filtered (outfile, "    `%s'", DEPRECATED_SYMBOL_NAME (*p));
+      fprintf_filtered (outfile, "    `%s'", SYMBOL_LINKAGE_NAME (*p));
       if (SYMBOL_DEMANGLED_NAME (*p) != NULL)
        {
          fprintf_filtered (outfile, "  `%s'", SYMBOL_DEMANGLED_NAME (*p));
@@ -864,9 +831,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
        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;
@@ -876,9 +840,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
        case LOC_REF_ARG:
          fputs_filtered ("pass by reference", outfile);
          break;
-       case LOC_REGPARM:
-         fputs_filtered ("register parameter", outfile);
-         break;
        case LOC_REGPARM_ADDR:
          fputs_filtered ("register address parameter", outfile);
          break;
@@ -897,9 +858,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
        case LOC_CONST_BYTES:
          fputs_filtered ("constant bytes", outfile);
          break;
-       case LOC_LOCAL_ARG:
-         fputs_filtered ("shuffled arg", outfile);
-         break;
        case LOC_UNRESOLVED:
          fputs_filtered ("unresolved", outfile);
          break;
@@ -907,7 +865,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
          fputs_filtered ("optimized out", outfile);
          break;
        case LOC_COMPUTED:
-       case LOC_COMPUTED_ARG:
          fputs_filtered ("computed at runtime", outfile);
          break;
        default:
@@ -915,7 +872,7 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
          break;
        }
       fputs_filtered (", ", outfile);
-      print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile);
+      fputs_filtered (paddress (gdbarch, SYMBOL_VALUE_ADDRESS (*p)), outfile);
       fprintf_filtered (outfile, "\n");
       p++;
     }
@@ -939,10 +896,7 @@ maintenance_print_msymbols (char *args, int from_tty)
     {
       error (_("print-msymbols takes an output file name and optional symbol file name"));
     }
-  else if ((argv = buildargv (args)) == NULL)
-    {
-      nomem (0);
-    }
+  argv = gdb_buildargv (args);
   cleanups = make_cleanup_freeargv (argv);
 
   if (argv[0] != NULL)
@@ -1008,30 +962,38 @@ maintenance_info_symtabs (char *regexp, int from_tty)
       int printed_objfile_start = 0;
 
       ALL_OBJFILE_SYMTABS (objfile, symtab)
-        if (! regexp
-            || re_exec (symtab->filename))
-          {
-            if (! printed_objfile_start)
-              {
-                printf_filtered ("{ objfile %s ", objfile->name);
-                wrap_here ("  ");
-                printf_filtered ("((struct objfile *) %p)\n", objfile);
-                printed_objfile_start = 1;
-              }
-
-            printf_filtered ("  { symtab %s ", symtab->filename);
-            wrap_here ("    ");
-            printf_filtered ("((struct symtab *) %p)\n", symtab);
-            printf_filtered ("    dirname %s\n",
-                             symtab->dirname ? symtab->dirname : "(null)");
-            printf_filtered ("    fullname %s\n",
-                             symtab->fullname ? symtab->fullname : "(null)");
-            printf_filtered ("    blockvector ((struct blockvector *) %p)%s\n",
-                             symtab->blockvector,
-                             symtab->primary ? " (primary)" : "");
-            printf_filtered ("    debugformat %s\n", symtab->debugformat);
-            printf_filtered ("  }\n");
-          }
+       {
+         QUIT;
+
+         if (! regexp
+             || re_exec (symtab->filename))
+           {
+             if (! printed_objfile_start)
+               {
+                 printf_filtered ("{ objfile %s ", objfile->name);
+                 wrap_here ("  ");
+                 printf_filtered ("((struct objfile *) %s)\n", 
+                                  host_address_to_string (objfile));
+                 printed_objfile_start = 1;
+               }
+
+             printf_filtered ("        { symtab %s ", symtab->filename);
+             wrap_here ("    ");
+             printf_filtered ("((struct symtab *) %s)\n", 
+                              host_address_to_string (symtab));
+             printf_filtered ("          dirname %s\n",
+                              symtab->dirname ? symtab->dirname : "(null)");
+             printf_filtered ("          fullname %s\n",
+                              symtab->fullname ? symtab->fullname : "(null)");
+             printf_filtered ("          blockvector ((struct blockvector *) %s)%s\n",
+                              host_address_to_string (symtab->blockvector),
+                              symtab->primary ? " (primary)" : "");
+             printf_filtered ("          linetable ((struct linetable *) %s)\n",
+                              host_address_to_string (symtab->linetable));
+             printf_filtered ("          debugformat %s\n", symtab->debugformat);
+             printf_filtered ("        }\n");
+           }
+       }
 
       if (printed_objfile_start)
         printf_filtered ("}\n");
@@ -1050,6 +1012,7 @@ maintenance_info_psymtabs (char *regexp, int from_tty)
 
   ALL_OBJFILES (objfile)
     {
+      struct gdbarch *gdbarch = get_objfile_arch (objfile);
       struct partial_symtab *psymtab;
 
       /* We don't want to print anything for this objfile until we
@@ -1057,70 +1020,80 @@ maintenance_info_psymtabs (char *regexp, int from_tty)
       int printed_objfile_start = 0;
 
       ALL_OBJFILE_PSYMTABS (objfile, psymtab)
-        if (! regexp
-            || re_exec (psymtab->filename))
-          {
-            if (! printed_objfile_start)
-              {
-                printf_filtered ("{ objfile %s ", objfile->name);
-                wrap_here ("  ");
-                printf_filtered ("((struct objfile *) %p)\n", objfile);
-                printed_objfile_start = 1;
-              }
-
-            printf_filtered ("  { psymtab %s ", psymtab->filename);
-            wrap_here ("    ");
-            printf_filtered ("((struct partial_symtab *) %p)\n", psymtab);
-            printf_filtered ("    readin %s\n",
-                             psymtab->readin ? "yes" : "no");
-            printf_filtered ("    fullname %s\n",
-                             psymtab->fullname ? psymtab->fullname : "(null)");
-            printf_filtered ("    text addresses ");
-            print_address_numeric (psymtab->textlow, 1, gdb_stdout);
-            printf_filtered (" -- ");
-            print_address_numeric (psymtab->texthigh, 1, gdb_stdout);
-            printf_filtered ("\n");
-            printf_filtered ("    globals ");
-            if (psymtab->n_global_syms)
-              {
-                printf_filtered ("(* (struct partial_symbol **) %p @ %d)\n",
-                                 (psymtab->objfile->global_psymbols.list
-                                  + psymtab->globals_offset),
-                                 psymtab->n_global_syms);
-              }
-            else
-              printf_filtered ("(none)\n");
-            printf_filtered ("    statics ");
-            if (psymtab->n_static_syms)
-              {
-                printf_filtered ("(* (struct partial_symbol **) %p @ %d)\n",
-                                 (psymtab->objfile->static_psymbols.list
-                                  + psymtab->statics_offset),
-                                 psymtab->n_static_syms);
-              }
-            else
-              printf_filtered ("(none)\n");
-            printf_filtered ("    dependencies ");
-            if (psymtab->number_of_dependencies)
-              {
-                int i;
-
-                printf_filtered ("{\n");
-                for (i = 0; i < psymtab->number_of_dependencies; i++)
-                  {
-                    struct partial_symtab *dep = psymtab->dependencies[i];
-
-                    /* Note the string concatenation there --- no comma.  */
-                    printf_filtered ("      psymtab %s "
-                                     "((struct partial_symtab *) %p)\n",
-                                     dep->filename, dep);
-                  }
-                printf_filtered ("    }\n");
-              }
-            else
-              printf_filtered ("(none)\n");
-            printf_filtered ("  }\n");
-          }
+       {
+         QUIT;
+
+         if (! regexp
+             || re_exec (psymtab->filename))
+           {
+             if (! printed_objfile_start)
+               {
+                 printf_filtered ("{ objfile %s ", objfile->name);
+                 wrap_here ("  ");
+                 printf_filtered ("((struct objfile *) %s)\n", 
+                                  host_address_to_string (objfile));
+                 printed_objfile_start = 1;
+               }
+
+             printf_filtered ("  { psymtab %s ", psymtab->filename);
+             wrap_here ("    ");
+             printf_filtered ("((struct partial_symtab *) %s)\n", 
+                              host_address_to_string (psymtab));
+
+             printf_filtered ("    readin %s\n",
+                              psymtab->readin ? "yes" : "no");
+             printf_filtered ("    fullname %s\n",
+                              psymtab->fullname ? psymtab->fullname : "(null)");
+             printf_filtered ("    text addresses ");
+             fputs_filtered (paddress (gdbarch, psymtab->textlow),
+                             gdb_stdout);
+             printf_filtered (" -- ");
+             fputs_filtered (paddress (gdbarch, psymtab->texthigh),
+                             gdb_stdout);
+             printf_filtered ("\n");
+             printf_filtered ("    globals ");
+             if (psymtab->n_global_syms)
+               {
+                 printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n",
+                                  host_address_to_string (psymtab->objfile->global_psymbols.list
+                                   + psymtab->globals_offset),
+                                  psymtab->n_global_syms);
+               }
+             else
+               printf_filtered ("(none)\n");
+             printf_filtered ("    statics ");
+             if (psymtab->n_static_syms)
+               {
+                 printf_filtered ("(* (struct partial_symbol **) %s @ %d)\n",
+                                  host_address_to_string (psymtab->objfile->static_psymbols.list
+                                   + psymtab->statics_offset),
+                                  psymtab->n_static_syms);
+               }
+             else
+               printf_filtered ("(none)\n");
+             printf_filtered ("    dependencies ");
+             if (psymtab->number_of_dependencies)
+               {
+                 int i;
+
+                 printf_filtered ("{\n");
+                 for (i = 0; i < psymtab->number_of_dependencies; i++)
+                   {
+                     struct partial_symtab *dep = psymtab->dependencies[i];
+
+                     /* Note the string concatenation there --- no comma.  */
+                     printf_filtered ("      psymtab %s "
+                                      "((struct partial_symtab *) %s)\n",
+                                      dep->filename, 
+                                      host_address_to_string (dep));
+                   }
+                 printf_filtered ("    }\n");
+               }
+             else
+               printf_filtered ("(none)\n");
+             printf_filtered ("  }\n");
+           }
+       }
 
       if (printed_objfile_start)
         printf_filtered ("}\n");
@@ -1144,6 +1117,7 @@ maintenance_check_symtabs (char *ignore, int from_tty)
 
   ALL_PSYMTABS (objfile, ps)
   {
+    struct gdbarch *gdbarch = get_objfile_arch (objfile);
     s = PSYMTAB_TO_SYMTAB (ps);
     if (s == NULL)
       continue;
@@ -1153,12 +1127,12 @@ maintenance_check_symtabs (char *ignore, int from_tty)
     length = ps->n_static_syms;
     while (length--)
       {
-       sym = lookup_block_symbol (b, DEPRECATED_SYMBOL_NAME (*psym),
+       sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
                                   NULL, SYMBOL_DOMAIN (*psym));
        if (!sym)
          {
            printf_filtered ("Static symbol `");
-           puts_filtered (DEPRECATED_SYMBOL_NAME (*psym));
+           puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
            printf_filtered ("' only found in ");
            puts_filtered (ps->filename);
            printf_filtered (" psymtab\n");
@@ -1170,12 +1144,12 @@ maintenance_check_symtabs (char *ignore, int from_tty)
     length = ps->n_global_syms;
     while (length--)
       {
-       sym = lookup_block_symbol (b, DEPRECATED_SYMBOL_NAME (*psym),
+       sym = lookup_block_symbol (b, SYMBOL_LINKAGE_NAME (*psym),
                                   NULL, SYMBOL_DOMAIN (*psym));
        if (!sym)
          {
            printf_filtered ("Global symbol `");
-           puts_filtered (DEPRECATED_SYMBOL_NAME (*psym));
+           puts_filtered (SYMBOL_LINKAGE_NAME (*psym));
            printf_filtered ("' only found in ");
            puts_filtered (ps->filename);
            printf_filtered (" psymtab\n");
@@ -1187,9 +1161,9 @@ maintenance_check_symtabs (char *ignore, int from_tty)
        printf_filtered ("Psymtab ");
        puts_filtered (ps->filename);
        printf_filtered (" covers bad range ");
-       print_address_numeric (ps->textlow, 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (ps->texthigh, 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout);
        printf_filtered ("\n");
        continue;
       }
@@ -1200,13 +1174,13 @@ maintenance_check_symtabs (char *ignore, int from_tty)
        printf_filtered ("Psymtab ");
        puts_filtered (ps->filename);
        printf_filtered (" covers ");
-       print_address_numeric (ps->textlow, 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, ps->textlow), gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (ps->texthigh, 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, ps->texthigh), gdb_stdout);
        printf_filtered (" but symtab covers only ");
-       print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, BLOCK_START (b)), gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
+       fputs_filtered (paddress (gdbarch, BLOCK_END (b)), gdb_stdout);
        printf_filtered ("\n");
       }
   }
This page took 0.038317 seconds and 4 git commands to generate.