Unify gdb printf functions

Now that filtered and unfiltered output can be treated identically, we
can unify the printf family of functions.  This is done under the name
"gdb_printf".  Most of this patch was written by script.

1 files changed, 91 insertions, 91 deletions

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index d5e07fc..ae3b821 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -1303,13 +1303,13 @@ show_tdesc_filename_cmd (struct ui_file *file, int from_tty,
   value = get_tdesc_info (current_inferior ())->filename.data ();
 
   if (value != NULL && *value != '\0')
-    fprintf_filtered (file,
-		      _("The target description will be read from \"%s\".\n"),
-		      value);
+    gdb_printf (file,
+		_("The target description will be read from \"%s\".\n"),
+		value);
   else
-    fprintf_filtered (file,
-		      _("The target description will be "
-			"read from the target.\n"));
+    gdb_printf (file,
+		_("The target description will be "
+		  "read from the target.\n"));
 }
 
 static void
@@ -1347,9 +1347,9 @@ public:
     *outp = '\0';
 
     /* Standard boilerplate.  */
-    printf_filtered ("/* THIS FILE IS GENERATED.  "
-		       "-*- buffer-read-only: t -*- vi"
-		       ":set ro:\n");
+    gdb_printf ("/* THIS FILE IS GENERATED.  "
+		"-*- buffer-read-only: t -*- vi"
+		":set ro:\n");
   }
 
   ~print_c_tdesc ()
@@ -1359,56 +1359,56 @@ public:
 
   void visit_pre (const target_desc *e) override
   {
-    printf_filtered ("  Original: %s */\n\n",
-		     lbasename (m_filename_after_features.c_str ()));
-
-    printf_filtered ("#include \"defs.h\"\n");
-    printf_filtered ("#include \"osabi.h\"\n");
-    printf_filtered ("#include \"target-descriptions.h\"\n");
-    printf_filtered ("\n");
-
-    printf_filtered ("struct target_desc *tdesc_%s;\n", m_function);
-    printf_filtered ("static void\n");
-    printf_filtered ("initialize_tdesc_%s (void)\n", m_function);
-    printf_filtered ("{\n");
-    printf_filtered
+    gdb_printf ("  Original: %s */\n\n",
+		lbasename (m_filename_after_features.c_str ()));
+
+    gdb_printf ("#include \"defs.h\"\n");
+    gdb_printf ("#include \"osabi.h\"\n");
+    gdb_printf ("#include \"target-descriptions.h\"\n");
+    gdb_printf ("\n");
+
+    gdb_printf ("struct target_desc *tdesc_%s;\n", m_function);
+    gdb_printf ("static void\n");
+    gdb_printf ("initialize_tdesc_%s (void)\n", m_function);
+    gdb_printf ("{\n");
+    gdb_printf
       ("  target_desc_up result = allocate_target_description ();\n");
 
     if (tdesc_architecture (e) != NULL)
       {
-	printf_filtered
+	gdb_printf
 	  ("  set_tdesc_architecture (result.get (), bfd_scan_arch (\"%s\"));\n",
 	   tdesc_architecture (e)->printable_name);
-	printf_filtered ("\n");
+	gdb_printf ("\n");
       }
     if (tdesc_osabi (e) > GDB_OSABI_UNKNOWN
 	&& tdesc_osabi (e) < GDB_OSABI_INVALID)
       {
-	printf_filtered
+	gdb_printf
 	  ("  set_tdesc_osabi (result.get (), osabi_from_tdesc_string (\"%s\"));\n",
 	   gdbarch_osabi_name (tdesc_osabi (e)));
-	printf_filtered ("\n");
+	gdb_printf ("\n");
       }
 
     for (const tdesc_compatible_info_up &compatible : e->compatible)
-      printf_filtered
+      gdb_printf
 	("  tdesc_add_compatible (result.get (), bfd_scan_arch (\"%s\"));\n",
 	 compatible->arch ()->printable_name);
 
     if (!e->compatible.empty ())
-      printf_filtered ("\n");
+      gdb_printf ("\n");
 
     for (const property &prop : e->properties)
-      printf_filtered ("  set_tdesc_property (result.get (), \"%s\", \"%s\");\n",
-		       prop.key.c_str (), prop.value.c_str ());
+      gdb_printf ("  set_tdesc_property (result.get (), \"%s\", \"%s\");\n",
+		  prop.key.c_str (), prop.value.c_str ());
 
-    printf_filtered ("  struct tdesc_feature *feature;\n");
+    gdb_printf ("  struct tdesc_feature *feature;\n");
   }
 
   void visit_pre (const tdesc_feature *e) override
   {
-    printf_filtered ("\n  feature = tdesc_create_feature (result.get (), \"%s\");\n",
-		     e->name.c_str ());
+    gdb_printf ("\n  feature = tdesc_create_feature (result.get (), \"%s\");\n",
+		e->name.c_str ());
   }
 
   void visit_post (const tdesc_feature *e) override
@@ -1416,8 +1416,8 @@ public:
 
   void visit_post (const target_desc *e) override
   {
-    printf_filtered ("\n  tdesc_%s = result.release ();\n", m_function);
-    printf_filtered ("}\n");
+    gdb_printf ("\n  tdesc_%s = result.release ();\n", m_function);
+    gdb_printf ("}\n");
   }
 
   void visit (const tdesc_type_builtin *type) override
@@ -1429,25 +1429,25 @@ public:
   {
     if (!m_printed_element_type)
       {
-	printf_filtered ("  tdesc_type *element_type;\n");
+	gdb_printf ("  tdesc_type *element_type;\n");
 	m_printed_element_type = true;
       }
 
-    printf_filtered
+    gdb_printf
       ("  element_type = tdesc_named_type (feature, \"%s\");\n",
        type->element_type->name.c_str ());
-    printf_filtered
+    gdb_printf
       ("  tdesc_create_vector (feature, \"%s\", element_type, %d);\n",
        type->name.c_str (), type->count);
 
-    printf_filtered ("\n");
+    gdb_printf ("\n");
   }
 
   void visit (const tdesc_type_with_fields *type) override
   {
     if (!m_printed_type_with_fields)
       {
-	printf_filtered ("  tdesc_type_with_fields *type_with_fields;\n");
+	gdb_printf ("  tdesc_type_with_fields *type_with_fields;\n");
 	m_printed_type_with_fields = true;
       }
 
@@ -1457,16 +1457,16 @@ public:
       case TDESC_TYPE_FLAGS:
 	if (type->kind == TDESC_TYPE_STRUCT)
 	  {
-	    printf_filtered
+	    gdb_printf
 	      ("  type_with_fields = tdesc_create_struct (feature, \"%s\");\n",
 	       type->name.c_str ());
 	    if (type->size != 0)
-	      printf_filtered
+	      gdb_printf
 		("  tdesc_set_struct_size (type_with_fields, %d);\n", type->size);
 	  }
 	else
 	  {
-	    printf_filtered
+	    gdb_printf
 	      ("  type_with_fields = tdesc_create_flags (feature, \"%s\", %d);\n",
 	       type->name.c_str (), type->size);
 	  }
@@ -1485,7 +1485,7 @@ public:
 		if (f.type->kind == TDESC_TYPE_BOOL)
 		  {
 		    gdb_assert (f.start == f.end);
-		    printf_filtered
+		    gdb_printf
 		      ("  tdesc_add_flag (type_with_fields, %d, \"%s\");\n",
 		       f.start, f.name.c_str ());
 		  }
@@ -1493,7 +1493,7 @@ public:
 			 || (type->size == 8
 			     && f.type->kind == TDESC_TYPE_UINT64))
 		  {
-		    printf_filtered
+		    gdb_printf
 		      ("  tdesc_add_bitfield (type_with_fields, \"%s\", %d, %d);\n",
 		       f.name.c_str (), f.start, f.end);
 		  }
@@ -1502,7 +1502,7 @@ public:
 		    printf_field_type_assignment
 		      ("tdesc_named_type (feature, \"%s\");\n",
 		       type_name);
-		    printf_filtered
+		    gdb_printf
 		      ("  tdesc_add_typed_bitfield (type_with_fields, \"%s\","
 		       " %d, %d, field_type);\n",
 		       f.name.c_str (), f.start, f.end);
@@ -1514,31 +1514,31 @@ public:
 		gdb_assert (type->kind == TDESC_TYPE_STRUCT);
 		printf_field_type_assignment
 		  ("tdesc_named_type (feature, \"%s\");\n", type_name);
-		printf_filtered
+		gdb_printf
 		  ("  tdesc_add_field (type_with_fields, \"%s\", field_type);\n",
 		   f.name.c_str ());
 	      }
 	  }
 	break;
       case TDESC_TYPE_UNION:
-	printf_filtered
+	gdb_printf
 	  ("  type_with_fields = tdesc_create_union (feature, \"%s\");\n",
 	   type->name.c_str ());
 	for (const tdesc_type_field &f : type->fields)
 	  {
 	    printf_field_type_assignment
 	      ("tdesc_named_type (feature, \"%s\");\n", f.type->name.c_str ());
-	    printf_filtered
+	    gdb_printf
 	      ("  tdesc_add_field (type_with_fields, \"%s\", field_type);\n",
 	       f.name.c_str ());
 	  }
 	break;
       case TDESC_TYPE_ENUM:
-	printf_filtered
+	gdb_printf
 	  ("  type_with_fields = tdesc_create_enum (feature, \"%s\", %d);\n",
 	   type->name.c_str (), type->size);
 	for (const tdesc_type_field &f : type->fields)
-	  printf_filtered
+	  gdb_printf
 	    ("  tdesc_add_enum_value (type_with_fields, %d, \"%s\");\n",
 	     f.start, f.name.c_str ());
 	break;
@@ -1546,19 +1546,19 @@ public:
 	error (_("C output is not supported type \"%s\"."), type->name.c_str ());
       }
 
-    printf_filtered ("\n");
+    gdb_printf ("\n");
   }
 
   void visit (const tdesc_reg *reg) override
   {
-    printf_filtered ("  tdesc_create_reg (feature, \"%s\", %ld, %d, ",
-		     reg->name.c_str (), reg->target_regnum,
-		     reg->save_restore);
+    gdb_printf ("  tdesc_create_reg (feature, \"%s\", %ld, %d, ",
+		reg->name.c_str (), reg->target_regnum,
+		reg->save_restore);
     if (!reg->group.empty ())
-      printf_filtered ("\"%s\", ", reg->group.c_str ());
+      gdb_printf ("\"%s\", ", reg->group.c_str ());
     else
-      printf_filtered ("NULL, ");
-    printf_filtered ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
+      gdb_printf ("NULL, ");
+    gdb_printf ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
   }
 
 protected:
@@ -1573,11 +1573,11 @@ private:
   {
     if (!m_printed_field_type)
       {
-	printf_filtered ("  tdesc_type *field_type;\n");
+	gdb_printf ("  tdesc_type *field_type;\n");
 	m_printed_field_type = true;
       }
 
-    printf_filtered ("  field_type = ");
+    gdb_printf ("  field_type = ");
 
     va_list args;
     va_start (args, fmt);
@@ -1613,11 +1613,11 @@ public:
 
   void visit_pre (const target_desc *e) override
   {
-    printf_filtered ("  Original: %s */\n\n",
-		     lbasename (m_filename_after_features.c_str ()));
+    gdb_printf ("  Original: %s */\n\n",
+		lbasename (m_filename_after_features.c_str ()));
 
-    printf_filtered ("#include \"gdbsupport/tdesc.h\"\n");
-    printf_filtered ("\n");
+    gdb_printf ("#include \"gdbsupport/tdesc.h\"\n");
+    gdb_printf ("\n");
   }
 
   void visit_post (const target_desc *e) override
@@ -1633,22 +1633,22 @@ public:
     std::replace (name.begin (), name.end (), '/', '_');
     std::replace (name.begin (), name.end (), '-', '_');
 
-    printf_filtered ("static int\n");
-    printf_filtered ("create_feature_%s ", name.c_str ());
-    printf_filtered ("(struct target_desc *result, long regnum)\n");
+    gdb_printf ("static int\n");
+    gdb_printf ("create_feature_%s ", name.c_str ());
+    gdb_printf ("(struct target_desc *result, long regnum)\n");
 
-    printf_filtered ("{\n");
-    printf_filtered ("  struct tdesc_feature *feature;\n");
+    gdb_printf ("{\n");
+    gdb_printf ("  struct tdesc_feature *feature;\n");
 
-    printf_filtered
+    gdb_printf
       ("\n  feature = tdesc_create_feature (result, \"%s\");\n",
        e->name.c_str ());
   }
 
   void visit_post (const tdesc_feature *e) override
   {
-    printf_filtered ("  return regnum;\n");
-    printf_filtered ("}\n");
+    gdb_printf ("  return regnum;\n");
+    gdb_printf ("}\n");
   }
 
   void visit (const tdesc_reg *reg) override
@@ -1681,27 +1681,27 @@ public:
 	  and also print the message so that it can be saved in the
 	  generated c file.  */
 
-	printf_filtered ("ERROR: \"regnum\" attribute %ld ",
-			 reg->target_regnum);
-	printf_filtered ("is not the largest number (%d).\n",
-			 m_next_regnum);
+	gdb_printf ("ERROR: \"regnum\" attribute %ld ",
+		    reg->target_regnum);
+	gdb_printf ("is not the largest number (%d).\n",
+		    m_next_regnum);
 	error (_("\"regnum\" attribute %ld is not the largest number (%d)."),
 	       reg->target_regnum, m_next_regnum);
       }
 
     if (reg->target_regnum > m_next_regnum)
       {
-	printf_filtered ("  regnum = %ld;\n", reg->target_regnum);
+	gdb_printf ("  regnum = %ld;\n", reg->target_regnum);
 	m_next_regnum = reg->target_regnum;
       }
 
-    printf_filtered ("  tdesc_create_reg (feature, \"%s\", regnum++, %d, ",
-		     reg->name.c_str (), reg->save_restore);
+    gdb_printf ("  tdesc_create_reg (feature, \"%s\", regnum++, %d, ",
+		reg->name.c_str (), reg->save_restore);
     if (!reg->group.empty ())
-      printf_filtered ("\"%s\", ", reg->group.c_str ());
+      gdb_printf ("\"%s\", ", reg->group.c_str ());
     else
-      printf_filtered ("NULL, ");
-    printf_filtered ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
+      gdb_printf ("NULL, ");
+    gdb_printf ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
 
     m_next_regnum++;
   }
@@ -1900,8 +1900,8 @@ maintenance_check_tdesc_xml_convert (const target_desc *tdesc, const char *name)
 
   if (xml == nullptr || *xml != '@')
     {
-      printf_filtered (_("Could not convert description for %s to xml.\n"),
-		       name);
+      gdb_printf (_("Could not convert description for %s to xml.\n"),
+		  name);
       return false;
     }
 
@@ -1909,14 +1909,14 @@ maintenance_check_tdesc_xml_convert (const target_desc *tdesc, const char *name)
 
   if (tdesc_trans == nullptr)
     {
-      printf_filtered (_("Could not convert description for %s from xml.\n"),
-		       name);
+      gdb_printf (_("Could not convert description for %s from xml.\n"),
+		  name);
       return false;
     }
   else if (*tdesc != *tdesc_trans)
     {
-      printf_filtered (_("Converted description for %s does not match.\n"),
-		       name);
+      gdb_printf (_("Converted description for %s does not match.\n"),
+		  name);
       return false;
     }
   return true;
@@ -1945,15 +1945,15 @@ maintenance_check_xml_descriptions (const char *dir, int from_tty)
 
       if (tdesc == NULL || *tdesc != *e.tdesc)
 	{
-	  printf_filtered ( _("Descriptions for %s do not match.\n"), e.name);
+	  gdb_printf ( _("Descriptions for %s do not match.\n"), e.name);
 	  failed++;
 	}
       else if (!maintenance_check_tdesc_xml_convert (tdesc, e.name)
 	       || !maintenance_check_tdesc_xml_convert (e.tdesc.get (), e.name))
 	failed++;
     }
-  printf_filtered (_("Tested %lu XML files, %d failed\n"),
-		   (long) selftests::xml_tdesc.size (), failed);
+  gdb_printf (_("Tested %lu XML files, %d failed\n"),
+	      (long) selftests::xml_tdesc.size (), failed);
 }
 
 void _initialize_target_descriptions ();