2005-09-27 Bob Rossi <bob@brasko.net>

[deliverable/binutils-gdb.git] / gdb / symmisc.c

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 2097e46cb3c5879e49e56503e93f5f50cb760e7c..f4408999ee52b566b6466a55f7f5bedbe9a6da2f 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -348,7 +348,7 @@ 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);
+      deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (msymbol), 1, outfile);
       fprintf_filtered (outfile, " %s", DEPRECATED_SYMBOL_NAME (msymbol));
       if (SYMBOL_BFD_SECTION (msymbol))
        fprintf_filtered (outfile, " section %s",
@@ -404,16 +404,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),
+      deprecated_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);
+  deprecated_print_address_numeric (psymtab->textlow, 1, outfile);
   fprintf_filtered (outfile, "-");
-  print_address_numeric (psymtab->texthigh, 1, outfile);
+  deprecated_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);
@@ -440,8 +440,8 @@ 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)
 {
   int i;
   struct dict_iterator iter;
@@ -470,7 +470,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);
+         deprecated_print_address_numeric (l->item[i].pc, 1, outfile);
          fprintf_filtered (outfile, "\n");
        }
     }
@@ -498,9 +498,9 @@ 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);
+         deprecated_print_address_numeric (BLOCK_START (b), 1, outfile);
          fprintf_filtered (outfile, "..");
-         print_address_numeric (BLOCK_END (b), 1, outfile);
+         deprecated_print_address_numeric (BLOCK_END (b), 1, outfile);
          if (BLOCK_FUNCTION (b))
            {
              fprintf_filtered (outfile, ", function %s", DEPRECATED_SYMBOL_NAME (BLOCK_FUNCTION (b)));
@@ -533,6 +533,22 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab,
     }
 }
 
+static void
+dump_symtab (struct objfile *objfile, struct symtab *symtab,
+            struct ui_file *outfile)
+{
+  enum language saved_lang;
+
+  /* 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.  */
+  saved_lang = set_language (symtab->language);
+
+  dump_symtab_1 (objfile, symtab, outfile);
+
+  set_language (saved_lang);
+}
+
 void
 maintenance_print_symbols (char *args, int from_tty)
 {
@@ -599,7 +615,7 @@ print_symbol (void *args)
   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);
+      deprecated_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,
@@ -664,7 +680,7 @@ print_symbol (void *args)
 
        case LOC_STATIC:
          fprintf_filtered (outfile, "static at ");
-         print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+         deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
          if (SYMBOL_BFD_SECTION (symbol))
            fprintf_filtered (outfile, " section %s",
                              bfd_section_name
@@ -674,7 +690,7 @@ print_symbol (void *args)
 
        case LOC_INDIRECT:
          fprintf_filtered (outfile, "extern global at *(");
-         print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+         deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
          fprintf_filtered (outfile, "),");
          break;
 
@@ -724,7 +740,7 @@ print_symbol (void *args)
 
        case LOC_LABEL:
          fprintf_filtered (outfile, "label at ");
-         print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
+         deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (symbol), 1, outfile);
          if (SYMBOL_BFD_SECTION (symbol))
            fprintf_filtered (outfile, " section %s",
                              bfd_section_name
@@ -736,11 +752,11 @@ print_symbol (void *args)
          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)),
+         deprecated_print_address_numeric (BLOCK_START (SYMBOL_BLOCK_VALUE (symbol)),
                                 1,
                                 outfile);
          fprintf_filtered (outfile, "..");
-         print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)),
+         deprecated_print_address_numeric (BLOCK_END (SYMBOL_BLOCK_VALUE (symbol)),
                                 1,
                                 outfile);
          if (SYMBOL_BFD_SECTION (symbol))
@@ -915,7 +931,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);
+      deprecated_print_address_numeric (SYMBOL_VALUE_ADDRESS (*p), 1, outfile);
       fprintf_filtered (outfile, "\n");
       p++;
     }
@@ -1076,9 +1092,9 @@ maintenance_info_psymtabs (char *regexp, int from_tty)
             printf_filtered ("    fullname %s\n",
                              psymtab->fullname ? psymtab->fullname : "(null)");
             printf_filtered ("    text addresses ");
-            print_address_numeric (psymtab->textlow, 1, gdb_stdout);
+            deprecated_print_address_numeric (psymtab->textlow, 1, gdb_stdout);
             printf_filtered (" -- ");
-            print_address_numeric (psymtab->texthigh, 1, gdb_stdout);
+            deprecated_print_address_numeric (psymtab->texthigh, 1, gdb_stdout);
             printf_filtered ("\n");
             printf_filtered ("    globals ");
             if (psymtab->n_global_syms)
@@ -1187,9 +1203,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);
+       deprecated_print_address_numeric (ps->textlow, 1, gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (ps->texthigh, 1, gdb_stdout);
+       deprecated_print_address_numeric (ps->texthigh, 1, gdb_stdout);
        printf_filtered ("\n");
        continue;
       }
@@ -1200,13 +1216,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);
+       deprecated_print_address_numeric (ps->textlow, 1, gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (ps->texthigh, 1, gdb_stdout);
+       deprecated_print_address_numeric (ps->texthigh, 1, gdb_stdout);
        printf_filtered (" but symtab covers only ");
-       print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
+       deprecated_print_address_numeric (BLOCK_START (b), 1, gdb_stdout);
        printf_filtered (" - ");
-       print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
+       deprecated_print_address_numeric (BLOCK_END (b), 1, gdb_stdout);
        printf_filtered ("\n");
       }
   }