x86/Intel: adjust representation of embedded rounding / SAE
[binutils-gdb.git] / gdb / psymtab.c
index ac5009aec37f73bc172e5b3dd3c3f2bffd85dc5c..e6c9526cc4f63306e459c1846cade86a45cf6afd 100644 (file)
@@ -76,15 +76,12 @@ psymtab_storage::install_psymtab (partial_symtab *pst)
 
 \f
 
-/* Ensure that the partial symbols for OBJFILE have been loaded.  This
-   will print a message when symbols are loaded.  This function
-   returns a range adapter suitable for iterating over the psymtabs of
-   OBJFILE.  */
+/* See psympriv.h.  */
 
 psymtab_storage::partial_symtab_range
-psymbol_functions::require_partial_symbols (struct objfile *objfile)
+psymbol_functions::partial_symbols (struct objfile *objfile)
 {
-  objfile->require_partial_symbols (true);
+  gdb_assert ((objfile->flags & OBJF_PSYMTABS_READ) != 0);
   return m_partial_symtabs->range ();
 }
 
@@ -134,7 +131,7 @@ find_pc_sect_psymtab_closer (struct objfile *objfile,
             object's symbol table.  */
          p = find_pc_sect_psymbol (objfile, tpst, pc, section);
          if (p != NULL
-             && (p->address (objfile) == BMSYMBOL_VALUE_ADDRESS (msymbol)))
+             && (p->address (objfile) == msymbol.value_address ()))
            return tpst;
 
          /* Also accept the textlow value of a psymtab as a
@@ -211,7 +208,7 @@ psymbol_functions::find_pc_sect_psymtab (struct objfile *objfile,
              p = find_pc_sect_psymbol (objfile, pst, pc, section);
              if (p == NULL
                  || (p->address (objfile)
-                     != BMSYMBOL_VALUE_ADDRESS (msymbol)))
+                     != msymbol.value_address ()))
                goto next;
            }
 
@@ -236,7 +233,7 @@ psymbol_functions::find_pc_sect_psymtab (struct objfile *objfile,
      its CUs may be missing in PSYMTABS_ADDRMAP as they may be varying
      debug info type in single OBJFILE.  */
 
-  for (partial_symtab *pst : require_partial_symbols (objfile))
+  for (partial_symtab *pst : partial_symbols (objfile))
     if (!pst->psymtabs_addrmap_supported
        && pc >= pst->text_low (objfile) && pc < pst->text_high (objfile))
       {
@@ -358,7 +355,7 @@ psymbol_functions::lookup_global_symbol_language (struct objfile *objfile,
 
   lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
 
-  for (partial_symtab *ps : require_partial_symbols (objfile))
+  for (partial_symtab *ps : partial_symbols (objfile))
     {
       struct partial_symbol *psym;
       if (ps->readin_p (objfile))
@@ -588,8 +585,8 @@ psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
 
       if (info_verbose)
        {
-         printf_filtered (_("Reading in symbols for %s...\n"),
-                          pst->filename);
+         gdb_printf (_("Reading in symbols for %s...\n"),
+                     pst->filename);
          gdb_flush (gdb_stdout);
        }
 
@@ -607,7 +604,7 @@ psymbol_functions::find_last_source_symtab (struct objfile *ofp)
 {
   struct partial_symtab *cs_pst = NULL;
 
-  for (partial_symtab *ps : require_partial_symbols (ofp))
+  for (partial_symtab *ps : partial_symbols (ofp))
     {
       const char *name = ps->filename;
       int len = strlen (name);
@@ -643,7 +640,7 @@ psymbol_functions::find_last_source_symtab (struct objfile *ofp)
 void
 psymbol_functions::forget_cached_source_info (struct objfile *objfile)
 {
-  for (partial_symtab *pst : require_partial_symbols (objfile))
+  for (partial_symtab *pst : partial_symbols (objfile))
     {
       if (pst->fullname != NULL)
        {
@@ -658,95 +655,95 @@ print_partial_symbols (struct gdbarch *gdbarch, struct objfile *objfile,
                       const std::vector<partial_symbol *> &symbols,
                       const char *what, struct ui_file *outfile)
 {
-  fprintf_filtered (outfile, "  %s partial symbols:\n", what);
+  gdb_printf (outfile, "  %s partial symbols:\n", what);
   for (partial_symbol *p : symbols)
     {
       QUIT;
-      fprintf_filtered (outfile, "    `%s'", p->ginfo.linkage_name ());
+      gdb_printf (outfile, "    `%s'", p->ginfo.linkage_name ());
       if (p->ginfo.demangled_name () != NULL)
        {
-         fprintf_filtered (outfile, "  `%s'",
-                           p->ginfo.demangled_name ());
+         gdb_printf (outfile, "  `%s'",
+                     p->ginfo.demangled_name ());
        }
-      fputs_filtered (", ", outfile);
+      gdb_puts (", ", outfile);
       switch (p->domain)
        {
        case UNDEF_DOMAIN:
-         fputs_filtered ("undefined domain, ", outfile);
+         gdb_puts ("undefined domain, ", outfile);
          break;
        case VAR_DOMAIN:
          /* This is the usual thing -- don't print it.  */
          break;
        case STRUCT_DOMAIN:
-         fputs_filtered ("struct domain, ", outfile);
+         gdb_puts ("struct domain, ", outfile);
          break;
        case MODULE_DOMAIN:
-         fputs_filtered ("module domain, ", outfile);
+         gdb_puts ("module domain, ", outfile);
          break;
        case LABEL_DOMAIN:
-         fputs_filtered ("label domain, ", outfile);
+         gdb_puts ("label domain, ", outfile);
          break;
        case COMMON_BLOCK_DOMAIN:
-         fputs_filtered ("common block domain, ", outfile);
+         gdb_puts ("common block domain, ", outfile);
          break;
        default:
-         fputs_filtered ("<invalid domain>, ", outfile);
+         gdb_puts ("<invalid domain>, ", outfile);
          break;
        }
       switch (p->aclass)
        {
        case LOC_UNDEF:
-         fputs_filtered ("undefined", outfile);
+         gdb_puts ("undefined", outfile);
          break;
        case LOC_CONST:
-         fputs_filtered ("constant int", outfile);
+         gdb_puts ("constant int", outfile);
          break;
        case LOC_STATIC:
-         fputs_filtered ("static", outfile);
+         gdb_puts ("static", outfile);
          break;
        case LOC_REGISTER:
-         fputs_filtered ("register", outfile);
+         gdb_puts ("register", outfile);
          break;
        case LOC_ARG:
-         fputs_filtered ("pass by value", outfile);
+         gdb_puts ("pass by value", outfile);
          break;
        case LOC_REF_ARG:
-         fputs_filtered ("pass by reference", outfile);
+         gdb_puts ("pass by reference", outfile);
          break;
        case LOC_REGPARM_ADDR:
-         fputs_filtered ("register address parameter", outfile);
+         gdb_puts ("register address parameter", outfile);
          break;
        case LOC_LOCAL:
-         fputs_filtered ("stack parameter", outfile);
+         gdb_puts ("stack parameter", outfile);
          break;
        case LOC_TYPEDEF:
-         fputs_filtered ("type", outfile);
+         gdb_puts ("type", outfile);
          break;
        case LOC_LABEL:
-         fputs_filtered ("label", outfile);
+         gdb_puts ("label", outfile);
          break;
        case LOC_BLOCK:
-         fputs_filtered ("function", outfile);
+         gdb_puts ("function", outfile);
          break;
        case LOC_CONST_BYTES:
-         fputs_filtered ("constant bytes", outfile);
+         gdb_puts ("constant bytes", outfile);
          break;
        case LOC_UNRESOLVED:
-         fputs_filtered ("unresolved", outfile);
+         gdb_puts ("unresolved", outfile);
          break;
        case LOC_OPTIMIZED_OUT:
-         fputs_filtered ("optimized out", outfile);
+         gdb_puts ("optimized out", outfile);
          break;
        case LOC_COMPUTED:
-         fputs_filtered ("computed at runtime", outfile);
+         gdb_puts ("computed at runtime", outfile);
          break;
        default:
-         fputs_filtered ("<invalid location>", outfile);
+         gdb_puts ("<invalid location>", outfile);
          break;
        }
-      fputs_filtered (", ", outfile);
-      fputs_filtered (paddress (gdbarch, p->unrelocated_address ()), outfile);
-      fprintf_filtered (outfile, "\n");
+      gdb_puts (", ", outfile);
+      gdb_puts (paddress (gdbarch, p->unrelocated_address ()), outfile);
+      gdb_printf (outfile, "\n");
     }
 }
 
@@ -759,41 +756,41 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
 
   if (psymtab->anonymous)
     {
-      fprintf_filtered (outfile, "\nAnonymous partial symtab (%s) ",
-                       psymtab->filename);
+      gdb_printf (outfile, "\nAnonymous partial symtab (%s) ",
+                 psymtab->filename);
     }
   else
     {
-      fprintf_filtered (outfile, "\nPartial symtab for source file %s ",
-                       psymtab->filename);
+      gdb_printf (outfile, "\nPartial symtab for source file %s ",
+                 psymtab->filename);
     }
-  fprintf_filtered (outfile, "(object %s)\n\n",
-                   host_address_to_string (psymtab));
-  fprintf_filtered (outfile, "  Read from object file %s (%s)\n",
-                   objfile_name (objfile),
-                   host_address_to_string (objfile));
+  gdb_printf (outfile, "(object %s)\n\n",
+             host_address_to_string (psymtab));
+  gdb_printf (outfile, "  Read from object file %s (%s)\n",
+             objfile_name (objfile),
+             host_address_to_string (objfile));
 
   if (psymtab->readin_p (objfile))
-    fprintf_filtered
+    gdb_printf
       (outfile,
        "  Full symtab was read (at %s)\n",
        host_address_to_string (psymtab->get_compunit_symtab (objfile)));
 
-  fprintf_filtered (outfile, "  Symbols cover text addresses ");
-  fputs_filtered (paddress (gdbarch, psymtab->text_low (objfile)), outfile);
-  fprintf_filtered (outfile, "-");
-  fputs_filtered (paddress (gdbarch, psymtab->text_high (objfile)), outfile);
-  fprintf_filtered (outfile, "\n");
-  fprintf_filtered (outfile, "  Address map supported - %s.\n",
-                   psymtab->psymtabs_addrmap_supported ? "yes" : "no");
-  fprintf_filtered (outfile, "  Depends on %d other partial symtabs.\n",
-                   psymtab->number_of_dependencies);
+  gdb_printf (outfile, "  Symbols cover text addresses ");
+  gdb_puts (paddress (gdbarch, psymtab->text_low (objfile)), outfile);
+  gdb_printf (outfile, "-");
+  gdb_puts (paddress (gdbarch, psymtab->text_high (objfile)), outfile);
+  gdb_printf (outfile, "\n");
+  gdb_printf (outfile, "  Address map supported - %s.\n",
+             psymtab->psymtabs_addrmap_supported ? "yes" : "no");
+  gdb_printf (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 %s\n", i,
-                     host_address_to_string (psymtab->dependencies[i]));
+    gdb_printf (outfile, "    %d %s\n", i,
+               host_address_to_string (psymtab->dependencies[i]));
   if (psymtab->user != NULL)
-    fprintf_filtered (outfile, "  Shared partial symtab with user %s\n",
-                     host_address_to_string (psymtab->user));
+    gdb_printf (outfile, "  Shared partial symtab with user %s\n",
+               host_address_to_string (psymtab->user));
   if (!psymtab->global_psymbols.empty ())
     {
       print_partial_symbols
@@ -806,7 +803,7 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
        (gdbarch, objfile, psymtab->static_psymbols,
         "Static", outfile);
     }
-  fprintf_filtered (outfile, "\n");
+  gdb_printf (outfile, "\n");
 }
 
 /* Count the number of partial symbols in OBJFILE.  */
@@ -835,23 +832,23 @@ psymbol_functions::print_stats (struct objfile *objfile, bool print_bcache)
     {
       int n_psyms = count_psyms ();
       if (n_psyms > 0)
-       printf_filtered (_("  Number of \"partial\" symbols read: %d\n"),
-                        n_psyms);
+       gdb_printf (_("  Number of \"partial\" symbols read: %d\n"),
+                   n_psyms);
 
       i = 0;
-      for (partial_symtab *ps : require_partial_symbols (objfile))
+      for (partial_symtab *ps : partial_symbols (objfile))
        {
          if (!ps->readin_p (objfile))
            i++;
        }
-      printf_filtered (_("  Number of psym tables (not yet expanded): %d\n"),
-                      i);
-      printf_filtered (_("  Total memory used for psymbol cache: %d\n"),
-                      m_partial_symtabs->psymbol_cache.memory_used ());
+      gdb_printf (_("  Number of psym tables (not yet expanded): %d\n"),
+                 i);
+      gdb_printf (_("  Total memory used for psymbol cache: %d\n"),
+                 m_partial_symtabs->psymbol_cache.memory_used ());
     }
   else
     {
-      printf_filtered (_("Psymbol byte cache statistics:\n"));
+      gdb_printf (_("Psymbol byte cache statistics:\n"));
       m_partial_symtabs->psymbol_cache.print_statistics
        ("partial symbol cache");
     }
@@ -867,14 +864,14 @@ psymbol_functions::dump (struct objfile *objfile)
 
   if (m_partial_symtabs->psymtabs)
     {
-      printf_filtered ("Psymtabs:\n");
+      gdb_printf ("Psymtabs:\n");
       for (psymtab = m_partial_symtabs->psymtabs;
           psymtab != NULL;
           psymtab = psymtab->next)
-       printf_filtered ("%s at %s\n",
-                        psymtab->filename,
-                        host_address_to_string (psymtab));
-      printf_filtered ("\n\n");
+       gdb_printf ("%s at %s\n",
+                   psymtab->filename,
+                   host_address_to_string (psymtab));
+      gdb_printf ("\n\n");
     }
 }
 
@@ -884,7 +881,7 @@ psymbol_functions::dump (struct objfile *objfile)
 void
 psymbol_functions::expand_all_symtabs (struct objfile *objfile)
 {
-  for (partial_symtab *psymtab : require_partial_symbols (objfile))
+  for (partial_symtab *psymtab : partial_symbols (objfile))
     psymtab_to_symtab (objfile, psymtab);
 }
 
@@ -897,7 +894,7 @@ psymbol_functions::map_symbol_filenames
       gdb::function_view<symbol_filename_ftype> fun,
       bool need_fullname)
 {
-  for (partial_symtab *ps : require_partial_symbols (objfile))
+  for (partial_symtab *ps : partial_symbols (objfile))
     {
       const char *fullname;
 
@@ -958,7 +955,7 @@ psymbol_functions::expand_matching_symbols
    int global,
    symbol_compare_ftype *ordered_compare)
 {
-  for (partial_symtab *ps : require_partial_symbols (objfile))
+  for (partial_symtab *ps : partial_symbols (objfile))
     {
       QUIT;
       if (!ps->readin_p (objfile)
@@ -1093,7 +1090,7 @@ psymbol_functions::expand_symtabs_matching
    enum search_domain search)
 {
   /* Clear the search flags.  */
-  for (partial_symtab *ps : require_partial_symbols (objfile))
+  for (partial_symtab *ps : partial_symbols (objfile))
     ps->searched_flag = PST_NOT_SEARCHED;
 
   gdb::optional<lookup_name_info> psym_lookup_name;
@@ -1136,13 +1133,10 @@ psymbol_functions::expand_symtabs_matching
                                          *psym_lookup_name,
                                          symbol_matcher))
        {
-         struct compunit_symtab *symtab =
-           psymtab_to_symtab (objfile, ps);
-
-         gdb_assert (symtab != nullptr);
+         compunit_symtab *cust = psymtab_to_symtab (objfile, ps);
 
-         if (expansion_notify != NULL)
-           if (!expansion_notify (symtab))
+         if (cust != nullptr && expansion_notify != nullptr)
+           if (!expansion_notify (cust))
              return false;
        }
     }
@@ -1164,7 +1158,7 @@ psymbol_functions::has_symbols (struct objfile *objfile)
 bool
 psymbol_functions::has_unexpanded_symtabs (struct objfile *objfile)
 {
-  for (partial_symtab *psymtab : require_partial_symbols (objfile))
+  for (partial_symtab *psymtab : partial_symbols (objfile))
     {
       /* Is this already expanded?  */
       if (psymtab->readin_p (objfile))
@@ -1212,7 +1206,7 @@ psymbol_functions::find_compunit_symtab_by_address (struct objfile *objfile,
     {
       std::set<CORE_ADDR> seen_addrs;
 
-      for (partial_symtab *pst : require_partial_symbols (objfile))
+      for (partial_symtab *pst : partial_symbols (objfile))
        {
          fill_psymbol_map (objfile, pst,
                            &seen_addrs,
@@ -1290,7 +1284,7 @@ psymbol_bcache::hash (const void *addr, int length)
   unsigned int domain = psymbol->domain;
   unsigned int theclass = psymbol->aclass;
 
-  h = fast_hash (&psymbol->ginfo.value, sizeof (psymbol->ginfo.value), h);
+  h = fast_hash (&psymbol->ginfo.m_value, sizeof (psymbol->ginfo.m_value), h);
   h = fast_hash (&lang, sizeof (unsigned int), h);
   h = fast_hash (&domain, sizeof (unsigned int), h);
   h = fast_hash (&theclass, sizeof (unsigned int), h);
@@ -1309,8 +1303,8 @@ psymbol_bcache::compare (const void *addr1, const void *addr2, int length)
   struct partial_symbol *sym1 = (struct partial_symbol *) addr1;
   struct partial_symbol *sym2 = (struct partial_symbol *) addr2;
 
-  return (memcmp (&sym1->ginfo.value, &sym2->ginfo.value,
-                 sizeof (sym1->ginfo.value)) == 0
+  return (memcmp (&sym1->ginfo.m_value, &sym2->ginfo.m_value,
+                 sizeof (sym1->ginfo.m_value)) == 0
          && sym1->ginfo.language () == sym2->ginfo.language ()
          && sym1->domain == sym2->domain
          && sym1->aclass == sym2->aclass
@@ -1398,13 +1392,13 @@ partial_symtab::partial_symtab (const char *filename_,
       if (last_bfd_name.empty () || last_bfd_name != this_bfd_name)
        {
          last_bfd_name = this_bfd_name;
-         fprintf_filtered (gdb_stdlog,
-                           "Creating one or more psymtabs for %s ...\n",
-                           this_bfd_name);
+         gdb_printf (gdb_stdlog,
+                     "Creating one or more psymtabs for %s ...\n",
+                     this_bfd_name);
        }
-      fprintf_filtered (gdb_stdlog,
-                       "Created psymtab %s for module %s.\n",
-                       host_address_to_string (this), filename);
+      gdb_printf (gdb_stdlog,
+                 "Created psymtab %s for module %s.\n",
+                 host_address_to_string (this), filename);
     }
 }
 
@@ -1421,12 +1415,11 @@ partial_symtab::expand_dependencies (struct objfile *objfile)
          /* Inform about additional files to be read in.  */
          if (info_verbose)
            {
-             puts_filtered (" ");
+             gdb_puts (" ");
              gdb_stdout->wrap_here (0);
-             puts_filtered ("and ");
+             gdb_puts ("and ");
              gdb_stdout->wrap_here (0);
-             printf_filtered ("%s...", dependencies[i]->filename);
-             gdb_stdout->wrap_here (0);        /* Flush output */
+             gdb_printf ("%s...", dependencies[i]->filename);
              gdb_flush (gdb_stdout);
            }
          dependencies[i]->expand_psymtab (objfile);
@@ -1472,9 +1465,9 @@ dump_psymtab_addrmap (struct objfile *objfile,
       && partial_symtabs->psymtabs_addrmap != NULL)
     {
       if (psymtab == nullptr)
-       fprintf_filtered (outfile, _("Entire address map:\n"));
+       gdb_printf (outfile, _("Entire address map:\n"));
       else
-       fprintf_filtered (outfile, _("Address map:\n"));
+       gdb_printf (outfile, _("Address map:\n"));
       addrmap_dump (partial_symtabs->psymtabs_addrmap, outfile, psymtab);
     }
 }
@@ -1577,7 +1570,7 @@ maintenance_print_psymbols (const char *args, int from_tty)
 
          if (address_arg != NULL)
            {
-             struct bound_minimal_symbol msymbol = { NULL, NULL };
+             struct bound_minimal_symbol msymbol;
 
              /* We don't assume each pc has a unique objfile (this is for
                 debugging).  */
@@ -1598,7 +1591,7 @@ maintenance_print_psymbols (const char *args, int from_tty)
            }
          else
            {
-             for (partial_symtab *ps : psf->require_partial_symbols (objfile))
+             for (partial_symtab *ps : psf->partial_symbols (objfile))
                {
                  int print_for_source = 0;
 
@@ -1669,7 +1662,7 @@ maintenance_info_psymtabs (const char *regexp, int from_tty)
              = dynamic_cast<psymbol_functions *> (iter.get ());
            if (psf == nullptr)
              continue;
-           for (partial_symtab *psymtab : psf->require_partial_symbols (objfile))
+           for (partial_symtab *psymtab : psf->partial_symbols (objfile))
              {
                QUIT;
 
@@ -1678,82 +1671,82 @@ maintenance_info_psymtabs (const char *regexp, int from_tty)
                  {
                    if (! printed_objfile_start)
                      {
-                       printf_filtered ("{ objfile %s ", objfile_name (objfile));
+                       gdb_printf ("{ objfile %s ", objfile_name (objfile));
                        gdb_stdout->wrap_here (2);
-                       printf_filtered ("((struct objfile *) %s)\n",
-                                        host_address_to_string (objfile));
+                       gdb_printf ("((struct objfile *) %s)\n",
+                                   host_address_to_string (objfile));
                        printed_objfile_start = 1;
                      }
 
-                   printf_filtered ("  { psymtab %s ", psymtab->filename);
+                   gdb_printf ("  { psymtab %s ", psymtab->filename);
                    gdb_stdout->wrap_here (4);
-                   printf_filtered ("((struct partial_symtab *) %s)\n",
-                                    host_address_to_string (psymtab));
-
-                   printf_filtered ("    readin %s\n",
-                                    psymtab->readin_p (objfile) ? "yes" : "no");
-                   printf_filtered ("    fullname %s\n",
-                                    psymtab->fullname
-                                    ? psymtab->fullname : "(null)");
-                   printf_filtered ("    text addresses ");
-                   puts_filtered (paddress (gdbarch,
-                                            psymtab->text_low (objfile)));
-                   printf_filtered (" -- ");
-                   puts_filtered (paddress (gdbarch,
-                                            psymtab->text_high (objfile)));
-                   printf_filtered ("\n");
-                   printf_filtered ("    psymtabs_addrmap_supported %s\n",
-                                    (psymtab->psymtabs_addrmap_supported
-                                     ? "yes" : "no"));
-                   printf_filtered ("    globals ");
+                   gdb_printf ("((struct partial_symtab *) %s)\n",
+                               host_address_to_string (psymtab));
+
+                   gdb_printf ("    readin %s\n",
+                               psymtab->readin_p (objfile) ? "yes" : "no");
+                   gdb_printf ("    fullname %s\n",
+                               psymtab->fullname
+                               ? psymtab->fullname : "(null)");
+                   gdb_printf ("    text addresses ");
+                   gdb_puts (paddress (gdbarch,
+                                       psymtab->text_low (objfile)));
+                   gdb_printf (" -- ");
+                   gdb_puts (paddress (gdbarch,
+                                       psymtab->text_high (objfile)));
+                   gdb_printf ("\n");
+                   gdb_printf ("    psymtabs_addrmap_supported %s\n",
+                               (psymtab->psymtabs_addrmap_supported
+                                ? "yes" : "no"));
+                   gdb_printf ("    globals ");
                    if (!psymtab->global_psymbols.empty ())
-                     printf_filtered
+                     gdb_printf
                        ("(* (struct partial_symbol **) %s @ %d)\n",
                         host_address_to_string (psymtab->global_psymbols.data ()),
                         (int) psymtab->global_psymbols.size ());
                    else
-                     printf_filtered ("(none)\n");
-                   printf_filtered ("    statics ");
+                     gdb_printf ("(none)\n");
+                   gdb_printf ("    statics ");
                    if (!psymtab->static_psymbols.empty ())
-                     printf_filtered
+                     gdb_printf
                        ("(* (struct partial_symbol **) %s @ %d)\n",
                         host_address_to_string (psymtab->static_psymbols.data ()),
                         (int) psymtab->static_psymbols.size ());
                    else
-                     printf_filtered ("(none)\n");
+                     gdb_printf ("(none)\n");
                    if (psymtab->user)
-                     printf_filtered ("    user %s "
-                                      "((struct partial_symtab *) %s)\n",
-                                      psymtab->user->filename,
-                                      host_address_to_string (psymtab->user));
-                   printf_filtered ("    dependencies ");
+                     gdb_printf ("    user %s "
+                                 "((struct partial_symtab *) %s)\n",
+                                 psymtab->user->filename,
+                                 host_address_to_string (psymtab->user));
+                   gdb_printf ("    dependencies ");
                    if (psymtab->number_of_dependencies)
                      {
                        int i;
 
-                       printf_filtered ("{\n");
+                       gdb_printf ("{\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));
+                           gdb_printf ("      psymtab %s "
+                                       "((struct partial_symtab *) %s)\n",
+                                       dep->filename,
+                                       host_address_to_string (dep));
                          }
-                       printf_filtered ("    }\n");
+                       gdb_printf ("    }\n");
                      }
                    else
-                     printf_filtered ("(none)\n");
-                   printf_filtered ("  }\n");
+                     gdb_printf ("(none)\n");
+                   gdb_printf ("  }\n");
                  }
              }
          }
 
        if (printed_objfile_start)
-         printf_filtered ("}\n");
+         gdb_printf ("}\n");
       }
 }
 
@@ -1776,7 +1769,7 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
          if (psf == nullptr)
            continue;
 
-         for (partial_symtab *ps : psf->require_partial_symbols (objfile))
+         for (partial_symtab *ps : psf->partial_symbols (objfile))
            {
              struct gdbarch *gdbarch = objfile->arch ();
 
@@ -1788,13 +1781,13 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
              /* First do some checks that don't require the associated symtab.  */
              if (ps->text_high (objfile) < ps->text_low (objfile))
                {
-                 printf_filtered ("Psymtab ");
-                 puts_filtered (ps->filename);
-                 printf_filtered (" covers bad range ");
-                 puts_filtered (paddress (gdbarch, ps->text_low (objfile)));
-                 printf_filtered (" - ");
-                 puts_filtered (paddress (gdbarch, ps->text_high (objfile)));
-                 printf_filtered ("\n");
+                 gdb_printf ("Psymtab ");
+                 gdb_puts (ps->filename);
+                 gdb_printf (" covers bad range ");
+                 gdb_puts (paddress (gdbarch, ps->text_low (objfile)));
+                 gdb_printf (" - ");
+                 gdb_puts (paddress (gdbarch, ps->text_high (objfile)));
+                 gdb_printf ("\n");
                  continue;
                }
 
@@ -1802,13 +1795,13 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
              if (cust == NULL)
                continue;
              bv = cust->blockvector ();
-             b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+             b = bv->static_block ();
              for (partial_symbol *psym : ps->static_psymbols)
                {
                  /* Skip symbols for inlined functions without address.  These may
                     or may not have a match in the full symtab.  */
                  if (psym->aclass == LOC_BLOCK
-                     && psym->ginfo.value.address == 0)
+                     && psym->ginfo.value_address () == 0)
                    continue;
 
                  sym = block_lookup_symbol (b, psym->ginfo.search_name (),
@@ -1816,14 +1809,14 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
                                             psym->domain);
                  if (!sym)
                    {
-                     printf_filtered ("Static symbol `");
-                     puts_filtered (psym->ginfo.linkage_name ());
-                     printf_filtered ("' only found in ");
-                     puts_filtered (ps->filename);
-                     printf_filtered (" psymtab\n");
+                     gdb_printf ("Static symbol `");
+                     gdb_puts (psym->ginfo.linkage_name ());
+                     gdb_printf ("' only found in ");
+                     gdb_puts (ps->filename);
+                     gdb_printf (" psymtab\n");
                    }
                }
-             b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+             b = bv->global_block ();
              for (partial_symbol *psym : ps->global_psymbols)
                {
                  sym = block_lookup_symbol (b, psym->ginfo.search_name (),
@@ -1831,28 +1824,28 @@ maintenance_check_psymtabs (const char *ignore, int from_tty)
                                             psym->domain);
                  if (!sym)
                    {
-                     printf_filtered ("Global symbol `");
-                     puts_filtered (psym->ginfo.linkage_name ());
-                     printf_filtered ("' only found in ");
-                     puts_filtered (ps->filename);
-                     printf_filtered (" psymtab\n");
+                     gdb_printf ("Global symbol `");
+                     gdb_puts (psym->ginfo.linkage_name ());
+                     gdb_printf ("' only found in ");
+                     gdb_puts (ps->filename);
+                     gdb_printf (" psymtab\n");
                    }
                }
              if (ps->raw_text_high () != 0
-                 && (ps->text_low (objfile) < BLOCK_START (b)
-                     || ps->text_high (objfile) > BLOCK_END (b)))
+                 && (ps->text_low (objfile) < b->start ()
+                     || ps->text_high (objfile) > b->end ()))
                {
-                 printf_filtered ("Psymtab ");
-                 puts_filtered (ps->filename);
-                 printf_filtered (" covers ");
-                 puts_filtered (paddress (gdbarch, ps->text_low (objfile)));
-                 printf_filtered (" - ");
-                 puts_filtered (paddress (gdbarch, ps->text_high (objfile)));
-                 printf_filtered (" but symtab covers only ");
-                 puts_filtered (paddress (gdbarch, BLOCK_START (b)));
-                 printf_filtered (" - ");
-                 puts_filtered (paddress (gdbarch, BLOCK_END (b)));
-                 printf_filtered ("\n");
+                 gdb_printf ("Psymtab ");
+                 gdb_puts (ps->filename);
+                 gdb_printf (" covers ");
+                 gdb_puts (paddress (gdbarch, ps->text_low (objfile)));
+                 gdb_printf (" - ");
+                 gdb_puts (paddress (gdbarch, ps->text_high (objfile)));
+                 gdb_printf (" but symtab covers only ");
+                 gdb_puts (paddress (gdbarch, b->start ()));
+                 gdb_printf (" - ");
+                 gdb_puts (paddress (gdbarch, b->end ()));
+                 gdb_printf ("\n");
                }
            }
        }