[gdb/testsuite] Accept new complex print style in mixed-lang-stack.exp

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

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 4bf1f08849f211447bbae39d63ac9d5f31ce1993..bee136ed4652fe2d66b231f98097db9c59e2515c 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -279,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));
@@ -308,7 +310,7 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
     }
   /* 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);
@@ -371,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
@@ -809,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;
                      }
 
@@ -985,26 +1033,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 %s\n"),
-                      _("INDEX"), _("LINE"), _("ADDRESS"), _("IS-STMT"));
-
-      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 ", i);
+         ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+         uiout->field_signed ("index", i);
          if (item->line > 0)
-           printf_filtered ("%6d ", item->line);
+           uiout->field_signed ("line", item->line);
          else
-           printf_filtered ("%6s ", _("END"));
-         printf_filtered ("%s%s\n",
-                          core_addr_to_string (item->pc),
-                          (item->is_stmt ? " Y" : ""));
+           uiout->field_string ("line", _("END"));
+         uiout->field_core_addr ("address", get_objfile_arch (objfile),
+                                 item->pc);
+         uiout->field_string ("is-stmt", item->is_stmt ? "Y" : "");
+         uiout->text ("\n");
        }
     }