Fix the disassmbly of SH instructions which have an unsigned 8-bit immediate operand.

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

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 393a0343b90bde2d9be73f5f9f962415fe372e83..f45364a8832f4251b37df9483cf9ac8cce47d995 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -71,9 +71,7 @@ print_symbol_bcache_statistics (void)
                         objfile_name (objfile));
        objfile->partial_symtabs->psymbol_cache.print_statistics
          ("partial symbol cache");
-       objfile->per_bfd->macro_cache.print_statistics
-         ("preprocessor macro cache");
-       objfile->per_bfd->filename_cache.print_statistics ("file name cache");
+       objfile->per_bfd->string_cache.print_statistics ("string cache");
       }
 }
 
@@ -135,10 +133,8 @@ print_objfile_statistics (void)
       printf_filtered
        (_("  Total memory used for psymbol cache: %d\n"),
         objfile->partial_symtabs->psymbol_cache.memory_used ());
-      printf_filtered (_("  Total memory used for macro cache: %d\n"),
-                      objfile->per_bfd->macro_cache.memory_used ());
-      printf_filtered (_("  Total memory used for file name cache: %d\n"),
-                      objfile->per_bfd->filename_cache.memory_used ());
+      printf_filtered (_("  Total memory used for string cache: %d\n"),
+                      objfile->per_bfd->string_cache.memory_used ());
     }
 }
 
@@ -183,7 +179,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 gdbarch *gdbarch = objfile->arch ();
   int index;
   char ms_type;
 
@@ -273,7 +269,7 @@ static void
 dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
 {
   struct objfile *objfile = SYMTAB_OBJFILE (symtab);
-  struct gdbarch *gdbarch = get_objfile_arch (objfile);
+  struct gdbarch *gdbarch = objfile->arch ();
   int i;
   struct mdict_iterator miter;
   int len;
@@ -283,8 +279,10 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
   const struct block *b;
   int depth;
 
-  fprintf_filtered (outfile, "\nSymtab for file %s\n",
-                   symtab_to_filename_for_display (symtab));
+  fprintf_filtered (outfile, "\nSymtab for file %s at %s\n",
+                   symtab_to_filename_for_display (symtab),
+                   host_address_to_string (symtab));
+
   if (SYMTAB_DIRNAME (symtab) != NULL)
     fprintf_filtered (outfile, "Compilation directory is %s\n",
                      SYMTAB_DIRNAME (symtab));
@@ -305,12 +303,14 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
        {
          fprintf_filtered (outfile, " line %d at ", l->item[i].line);
          fputs_filtered (paddress (gdbarch, l->item[i].pc), outfile);
+         if (l->item[i].is_stmt)
+           fprintf_filtered (outfile, "\t(stmt)");
          fprintf_filtered (outfile, "\n");
        }
     }
   /* Now print the block info, but only for compunit symtabs since we will
      print lots of duplicate info otherwise.  */
-  if (symtab == COMPUNIT_FILETABS (SYMTAB_COMPUNIT (symtab)))
+  if (is_main_symtab_of_compunit_symtab (symtab))
     {
       fprintf_filtered (outfile, "\nBlockvector:\n\n");
       bv = SYMTAB_BLOCKVECTOR (symtab);
@@ -373,6 +373,30 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
                        "\nBlockvector same as owning compunit: %s\n\n",
                        compunit_filename);
     }
+
+  /* Print info about the user of this compunit_symtab, and the
+     compunit_symtabs included by this one. */
+  if (is_main_symtab_of_compunit_symtab (symtab))
+    {
+      struct compunit_symtab *cust = SYMTAB_COMPUNIT (symtab);
+
+      if (cust->user != nullptr)
+       {
+         const char *addr
+           = host_address_to_string (COMPUNIT_FILETABS (cust->user));
+         fprintf_filtered (outfile, "Compunit user: %s\n", addr);
+       }
+      if (cust->includes != nullptr)
+       for (i = 0; ; ++i)
+         {
+           struct compunit_symtab *include = cust->includes[i];
+           if (include == nullptr)
+             break;
+           const char *addr
+             = host_address_to_string (COMPUNIT_FILETABS (include));
+           fprintf_filtered (outfile, "Compunit include: %s\n", addr);
+         }
+    }
 }
 
 static void
@@ -811,6 +835,28 @@ maintenance_info_symtabs (const char *regexp, int from_tty)
                                         " ((struct blockvector *) %s)\n",
                                         host_address_to_string
                                         (COMPUNIT_BLOCKVECTOR (cust)));
+                       printf_filtered ("    user"
+                                        " ((struct compunit_symtab *) %s)\n",
+                                        cust->user != nullptr
+                                        ? host_address_to_string (cust->user)
+                                        : "(null)");
+                       if (cust->includes != nullptr)
+                         {
+                           printf_filtered ("    ( includes\n");
+                           for (int i = 0; ; ++i)
+                             {
+                               struct compunit_symtab *include
+                                 = cust->includes[i];
+                               if (include == nullptr)
+                                 break;
+                               const char *addr
+                                 = host_address_to_string (include);
+                               printf_filtered ("      (%s %s)\n",
+                                                "(struct compunit_symtab *)",
+                                                addr);
+                             }
+                           printf_filtered ("    )\n");
+                         }
                        printed_compunit_symtab_start = 1;
                      }
 
@@ -931,12 +977,8 @@ maintenance_expand_symtabs (const char *args, int from_tty)
                 return (!basenames
                         && (regexp == NULL || re_exec (filename)));
               },
-              lookup_name_info::match_any (),
-              [] (const char *symname)
-              {
-                /* Since we're not searching on symbols, just return true.  */
-                return true;
-              },
+              NULL,
+              NULL,
               NULL,
               ALL_DOMAIN);
          }
@@ -987,20 +1029,31 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data)
     printf_filtered (_("Line table has no lines.\n"));
   else
     {
-      int i;
-
       /* Leave space for 6 digits of index and line number.  After that the
         tables will just not format as well.  */
-      printf_filtered (_("%-6s %6s %s\n"),
-                      _("INDEX"), _("LINE"), _("ADDRESS"));
-
-      for (i = 0; i < linetable->nitems; ++i)
+      struct ui_out *uiout = current_uiout;
+      ui_out_emit_table table_emitter (uiout, 4, -1, "line-table");
+      uiout->table_header (6, ui_left, "index", _("INDEX"));
+      uiout->table_header (6, ui_left, "line", _("LINE"));
+      uiout->table_header (18, ui_left, "address", _("ADDRESS"));
+      uiout->table_header (1, ui_left, "is-stmt", _("IS-STMT"));
+      uiout->table_body ();
+
+      for (int i = 0; i < linetable->nitems; ++i)
        {
          struct linetable_entry *item;
 
          item = &linetable->item [i];
-         printf_filtered (_("%-6d %6d %s\n"), i, item->line,
-                          core_addr_to_string (item->pc));
+         ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+         uiout->field_signed ("index", i);
+         if (item->line > 0)
+           uiout->field_signed ("line", item->line);
+         else
+           uiout->field_string ("line", _("END"));
+         uiout->field_core_addr ("address", objfile->arch (),
+                                 item->pc);
+         uiout->field_string ("is-stmt", item->is_stmt ? "Y" : "");
+         uiout->text ("\n");
        }
     }