gdb/tui: fairer distribution of excess space during apply

[binutils-gdb.git] / gdb / arm-tdep.c

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a87affe17a8b238fa83c539852cefae3c57b48a0..4d0f3492410380b7a98d40939357f8b8ba72d469 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -4038,9 +4038,9 @@ arm_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
 
   type = (status >> 24) & 127;
   if (status & (1 << 31))
-    fprintf_filtered (file, _("Hardware FPU type %d\n"), type);
+    gdb_printf (file, _("Hardware FPU type %d\n"), type);
   else
-    fprintf_filtered (file, _("Software FPU type %d\n"), type);
+    gdb_printf (file, _("Software FPU type %d\n"), type);
   /* i18n: [floating point unit] mask */
   gdb_puts (_("mask: "), file);
   print_fpu_flags (file, status >> 16);
@@ -8551,13 +8551,13 @@ show_fp_model (struct ui_file *file, int from_tty,
 
   if (arm_fp_model == ARM_FLOAT_AUTO
       && gdbarch_bfd_arch_info (target_gdbarch ())->arch == bfd_arch_arm)
-    fprintf_filtered (file, _("\
+    gdb_printf (file, _("\
 The current ARM floating point model is \"auto\" (currently \"%s\").\n"),
-                     fp_model_strings[tdep->fp_model]);
+               fp_model_strings[tdep->fp_model]);
   else
-    fprintf_filtered (file, _("\
+    gdb_printf (file, _("\
 The current ARM floating point model is \"%s\".\n"),
-                     fp_model_strings[arm_fp_model]);
+               fp_model_strings[arm_fp_model]);
 }
 
 static void
@@ -8589,32 +8589,32 @@ arm_show_abi (struct ui_file *file, int from_tty,
 
   if (arm_abi_global == ARM_ABI_AUTO
       && gdbarch_bfd_arch_info (target_gdbarch ())->arch == bfd_arch_arm)
-    fprintf_filtered (file, _("\
+    gdb_printf (file, _("\
 The current ARM ABI is \"auto\" (currently \"%s\").\n"),
-                     arm_abi_strings[tdep->arm_abi]);
+               arm_abi_strings[tdep->arm_abi]);
   else
-    fprintf_filtered (file, _("The current ARM ABI is \"%s\".\n"),
-                     arm_abi_string);
+    gdb_printf (file, _("The current ARM ABI is \"%s\".\n"),
+               arm_abi_string);
 }
 
 static void
 arm_show_fallback_mode (struct ui_file *file, int from_tty,
                        struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file,
-                   _("The current execution mode assumed "
-                     "(when symbols are unavailable) is \"%s\".\n"),
-                   arm_fallback_mode_string);
+  gdb_printf (file,
+             _("The current execution mode assumed "
+               "(when symbols are unavailable) is \"%s\".\n"),
+             arm_fallback_mode_string);
 }
 
 static void
 arm_show_force_mode (struct ui_file *file, int from_tty,
                     struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file,
-                   _("The current execution mode assumed "
-                     "(even when symbols are available) is \"%s\".\n"),
-                   arm_force_mode_string);
+  gdb_printf (file,
+             _("The current execution mode assumed "
+               "(even when symbols are available) is \"%s\".\n"),
+             arm_force_mode_string);
 }
 
 /* If the user changes the register disassembly style used for info
@@ -8649,7 +8649,7 @@ show_disassembly_style_sfunc (struct ui_file *file, int from_tty,
        len = strcspn (style, ",");
       }
 
-  fprintf_filtered (file, "The disassembly style is \"%.*s\".\n", len, style);
+  gdb_printf (file, "The disassembly style is \"%.*s\".\n", len, style);
 }
 \f
 /* Return the ARM register name corresponding to register I.  */
@@ -9746,38 +9746,38 @@ arm_dump_tdep (struct gdbarch *gdbarch, struct ui_file *file)
   if (tdep == NULL)
     return;
 
-  fprintf_filtered (file, _("arm_dump_tdep: fp_model = %i\n"),
-                   (int) tdep->fp_model);
-  fprintf_filtered (file, _("arm_dump_tdep: have_fpa_registers = %i\n"),
-                   (int) tdep->have_fpa_registers);
-  fprintf_filtered (file, _("arm_dump_tdep: have_wmmx_registers = %i\n"),
-                   (int) tdep->have_wmmx_registers);
-  fprintf_filtered (file, _("arm_dump_tdep: vfp_register_count = %i\n"),
-                   (int) tdep->vfp_register_count);
-  fprintf_filtered (file, _("arm_dump_tdep: have_s_pseudos = %s\n"),
-                   tdep->have_s_pseudos? "true" : "false");
-  fprintf_filtered (file, _("arm_dump_tdep: s_pseudo_base = %i\n"),
-                   (int) tdep->s_pseudo_base);
-  fprintf_filtered (file, _("arm_dump_tdep: s_pseudo_count = %i\n"),
-                   (int) tdep->s_pseudo_count);
-  fprintf_filtered (file, _("arm_dump_tdep: have_q_pseudos = %s\n"),
-                   tdep->have_q_pseudos? "true" : "false");
-  fprintf_filtered (file, _("arm_dump_tdep: q_pseudo_base = %i\n"),
-                   (int) tdep->q_pseudo_base);
-  fprintf_filtered (file, _("arm_dump_tdep: q_pseudo_count = %i\n"),
-                   (int) tdep->q_pseudo_count);
-  fprintf_filtered (file, _("arm_dump_tdep: have_neon = %i\n"),
-                   (int) tdep->have_neon);
-  fprintf_filtered (file, _("arm_dump_tdep: have_mve = %s\n"),
-                   tdep->have_mve? "yes" : "no");
-  fprintf_filtered (file, _("arm_dump_tdep: mve_vpr_regnum = %i\n"),
-                   tdep->mve_vpr_regnum);
-  fprintf_filtered (file, _("arm_dump_tdep: mve_pseudo_base = %i\n"),
-                   tdep->mve_pseudo_base);
-  fprintf_filtered (file, _("arm_dump_tdep: mve_pseudo_count = %i\n"),
-                   tdep->mve_pseudo_count);
-  fprintf_filtered (file, _("arm_dump_tdep: Lowest pc = 0x%lx\n"),
-                   (unsigned long) tdep->lowest_pc);
+  gdb_printf (file, _("arm_dump_tdep: fp_model = %i\n"),
+             (int) tdep->fp_model);
+  gdb_printf (file, _("arm_dump_tdep: have_fpa_registers = %i\n"),
+             (int) tdep->have_fpa_registers);
+  gdb_printf (file, _("arm_dump_tdep: have_wmmx_registers = %i\n"),
+             (int) tdep->have_wmmx_registers);
+  gdb_printf (file, _("arm_dump_tdep: vfp_register_count = %i\n"),
+             (int) tdep->vfp_register_count);
+  gdb_printf (file, _("arm_dump_tdep: have_s_pseudos = %s\n"),
+             tdep->have_s_pseudos? "true" : "false");
+  gdb_printf (file, _("arm_dump_tdep: s_pseudo_base = %i\n"),
+             (int) tdep->s_pseudo_base);
+  gdb_printf (file, _("arm_dump_tdep: s_pseudo_count = %i\n"),
+             (int) tdep->s_pseudo_count);
+  gdb_printf (file, _("arm_dump_tdep: have_q_pseudos = %s\n"),
+             tdep->have_q_pseudos? "true" : "false");
+  gdb_printf (file, _("arm_dump_tdep: q_pseudo_base = %i\n"),
+             (int) tdep->q_pseudo_base);
+  gdb_printf (file, _("arm_dump_tdep: q_pseudo_count = %i\n"),
+             (int) tdep->q_pseudo_count);
+  gdb_printf (file, _("arm_dump_tdep: have_neon = %i\n"),
+             (int) tdep->have_neon);
+  gdb_printf (file, _("arm_dump_tdep: have_mve = %s\n"),
+             tdep->have_mve? "yes" : "no");
+  gdb_printf (file, _("arm_dump_tdep: mve_vpr_regnum = %i\n"),
+             tdep->mve_vpr_regnum);
+  gdb_printf (file, _("arm_dump_tdep: mve_pseudo_base = %i\n"),
+             tdep->mve_pseudo_base);
+  gdb_printf (file, _("arm_dump_tdep: mve_pseudo_count = %i\n"),
+             tdep->mve_pseudo_count);
+  gdb_printf (file, _("arm_dump_tdep: Lowest pc = 0x%lx\n"),
+             (unsigned long) tdep->lowest_pc);
 }
 
 #if GDB_SELF_TEST
@@ -11359,10 +11359,10 @@ arm_record_b_bl (insn_decode_record *arm_insn_r)
 static int
 arm_record_unsupported_insn (insn_decode_record *arm_insn_r)
 {
-  fprintf_unfiltered (gdb_stderr,
-                     _("Process record does not support instruction "
-                       "0x%0x at address %s.\n"),arm_insn_r->arm_insn,
-                     paddress (arm_insn_r->gdbarch, arm_insn_r->this_addr));
+  gdb_printf (gdb_stderr,
+             _("Process record does not support instruction "
+               "0x%0x at address %s.\n"),arm_insn_r->arm_insn,
+             paddress (arm_insn_r->gdbarch, arm_insn_r->this_addr));
 
   return -1;
 }
@@ -11948,7 +11948,7 @@ arm_record_coproc_data_proc (insn_decode_record *arm_insn_r)
        }
       else
        {
-         fprintf_unfiltered (gdb_stderr, _("no syscall record support\n"));
+         gdb_printf (gdb_stderr, _("no syscall record support\n"));
          return -1;
        }
     }
@@ -12380,12 +12380,12 @@ thumb_record_misc (insn_decode_record *thumb_insn_r)
          record_buf[1] = ARM_LR_REGNUM;
          thumb_insn_r->reg_rec_count = 2;
          /* We need to save SPSR value, which is not yet done.  */
-         fprintf_unfiltered (gdb_stderr,
-                             _("Process record does not support instruction "
-                               "0x%0x at address %s.\n"),
-                             thumb_insn_r->arm_insn,
-                             paddress (thumb_insn_r->gdbarch,
-                                       thumb_insn_r->this_addr));
+         gdb_printf (gdb_stderr,
+                     _("Process record does not support instruction "
+                       "0x%0x at address %s.\n"),
+                     thumb_insn_r->arm_insn,
+                     paddress (thumb_insn_r->gdbarch,
+                               thumb_insn_r->this_addr));
          return -1;
 
        case 0xf:
@@ -12473,7 +12473,7 @@ thumb_record_ldm_stm_swi (insn_decode_record *thumb_insn_r)
          }
        else
          {
-           fprintf_unfiltered (gdb_stderr, _("no syscall record support\n"));
+           gdb_printf (gdb_stderr, _("no syscall record support\n"));
            return -1;
          }
     }
@@ -13384,11 +13384,11 @@ decode_insn (abstract_memory_reader &reader, insn_decode_record *arm_record,
     {
       if (record_debug)
        {
-         fprintf_unfiltered (gdb_stdlog,
-                             _("Process record: error reading memory at "
-                               "addr %s len = %d.\n"),
-                             paddress (arm_record->gdbarch,
-                                       arm_record->this_addr), insn_size);
+         gdb_printf (gdb_stdlog,
+                     _("Process record: error reading memory at "
+                       "addr %s len = %d.\n"),
+                     paddress (arm_record->gdbarch,
+                               arm_record->this_addr), insn_size);
        }
       return -1;
     }
@@ -13643,9 +13643,9 @@ arm_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
 
   if (record_debug > 1)
     {
-      fprintf_unfiltered (gdb_stdlog, "Process record: arm_process_record "
-                         "addr = %s\n",
-      paddress (gdbarch, arm_record.this_addr));
+      gdb_printf (gdb_stdlog, "Process record: arm_process_record "
+                 "addr = %s\n",
+                 paddress (gdbarch, arm_record.this_addr));
     }
 
   instruction_reader reader;
@@ -13653,11 +13653,11 @@ arm_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
     {
       if (record_debug)
        {
-         fprintf_unfiltered (gdb_stdlog,
-                             _("Process record: error reading memory at "
-                               "addr %s len = %d.\n"),
-                             paddress (arm_record.gdbarch,
-                                       arm_record.this_addr), 2);
+         gdb_printf (gdb_stdlog,
+                     _("Process record: error reading memory at "
+                       "addr %s len = %d.\n"),
+                     paddress (arm_record.gdbarch,
+                               arm_record.this_addr), 2);
        }
       return -1;
     }