1 files changed, 32 insertions, 32 deletions

diff --git a/gdb/frame.c b/gdb/frame.c
index cee6b08a49a..ae45e22d613 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -24,7 +24,7 @@
 #include "inferior.h"	/* for inferior_ptid */
 #include "regcache.h"
 #include "user-regs.h"
-#include "gdb_obstack.h"
+#include "gdbsupport/gdb_obstack.h"
 #include "dummy-frame.h"
 #include "sentinel-frame.h"
 #include "gdbcore.h"
@@ -339,7 +339,7 @@ static void
 show_frame_debug (struct ui_file *file, int from_tty,
 		  struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file, _("Frame debugging is %s.\n"), value);
+  gdb_printf (file, _("Frame debugging is %s.\n"), value);
 }
 
 /* Implementation of "show backtrace past-main".  */
@@ -348,10 +348,10 @@ static void
 show_backtrace_past_main (struct ui_file *file, int from_tty,
 			  struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file,
-		    _("Whether backtraces should "
-		      "continue past \"main\" is %s.\n"),
-		    value);
+  gdb_printf (file,
+	      _("Whether backtraces should "
+		"continue past \"main\" is %s.\n"),
+	      value);
 }
 
 /* Implementation of "show backtrace past-entry".  */
@@ -360,9 +360,9 @@ static void
 show_backtrace_past_entry (struct ui_file *file, int from_tty,
 			   struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file, _("Whether backtraces should continue past the "
-			    "entry point of a program is %s.\n"),
-		    value);
+  gdb_printf (file, _("Whether backtraces should continue past the "
+		      "entry point of a program is %s.\n"),
+	      value);
 }
 
 /* Implementation of "show backtrace limit".  */
@@ -371,10 +371,10 @@ static void
 show_backtrace_limit (struct ui_file *file, int from_tty,
 		      struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file,
-		    _("An upper bound on the number "
-		      "of backtrace levels is %s.\n"),
-		    value);
+  gdb_printf (file,
+	      _("An upper bound on the number "
+		"of backtrace levels is %s.\n"),
+	      value);
 }
 
 /* See frame.h.  */
@@ -1238,36 +1238,36 @@ frame_unwind_register_value (frame_info *next_frame, int regnum)
     {
       string_file debug_file;
 
-      fprintf_unfiltered (&debug_file, "  ->");
+      gdb_printf (&debug_file, "  ->");
       if (value_optimized_out (value))
 	{
-	  fprintf_unfiltered (&debug_file, " ");
+	  gdb_printf (&debug_file, " ");
 	  val_print_not_saved (&debug_file);
 	}
       else
 	{
 	  if (VALUE_LVAL (value) == lval_register)
-	    fprintf_unfiltered (&debug_file, " register=%d",
-				VALUE_REGNUM (value));
+	    gdb_printf (&debug_file, " register=%d",
+			VALUE_REGNUM (value));
 	  else if (VALUE_LVAL (value) == lval_memory)
-	    fprintf_unfiltered (&debug_file, " address=%s",
-				paddress (gdbarch,
-					  value_address (value)));
+	    gdb_printf (&debug_file, " address=%s",
+			paddress (gdbarch,
+				  value_address (value)));
 	  else
-	    fprintf_unfiltered (&debug_file, " computed");
+	    gdb_printf (&debug_file, " computed");
 
 	  if (value_lazy (value))
-	    fprintf_unfiltered (&debug_file, " lazy");
+	    gdb_printf (&debug_file, " lazy");
 	  else
 	    {
 	      int i;
 	      gdb::array_view<const gdb_byte> buf = value_contents (value);
 
-	      fprintf_unfiltered (&debug_file, " bytes=");
-	      fprintf_unfiltered (&debug_file, "[");
+	      gdb_printf (&debug_file, " bytes=");
+	      gdb_printf (&debug_file, "[");
 	      for (i = 0; i < register_size (gdbarch, regnum); i++)
-		fprintf_unfiltered (&debug_file, "%02x", buf[i]);
-	      fprintf_unfiltered (&debug_file, "]");
+		gdb_printf (&debug_file, "%02x", buf[i]);
+	      gdb_printf (&debug_file, "]");
 	    }
 	}
 
@@ -2430,12 +2430,12 @@ inside_main_func (frame_info *this_frame)
       if (bs.symbol == nullptr)
 	return false;
 
-      const struct block *block = SYMBOL_BLOCK_VALUE (bs.symbol);
+      const struct block *block = bs.symbol->value_block ();
       gdb_assert (block != nullptr);
-      sym_addr = BLOCK_START (block);
+      sym_addr = block->start ();
     }
   else
-    sym_addr = BMSYMBOL_VALUE_ADDRESS (msymbol);
+    sym_addr = msymbol.value_address ();
 
   /* Convert any function descriptor addresses into the actual function
      code address.  */
@@ -2699,10 +2699,10 @@ find_frame_sal (frame_info *frame)
       gdb_assert (sym);
 
       symtab_and_line sal;
-      if (SYMBOL_LINE (sym) != 0)
+      if (sym->line () != 0)
 	{
-	  sal.symtab = symbol_symtab (sym);
-	  sal.line = SYMBOL_LINE (sym);
+	  sal.symtab = sym->symtab ();
+	  sal.line = sym->line ();
 	}
       else
 	/* If the symbol does not have a location, we don't know where