Remove OBJF_REORDERED

[binutils-gdb.git] / gdb / btrace.c

diff --git a/gdb/btrace.c b/gdb/btrace.c
index ea733fe36b902cecbf4fb8cfc8729b111ed43da4..38d3882c1540d4ba7031e02c29ddcc9485630db5 100644 (file)
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -1,6 +1,6 @@
 /* Branch trace support for GDB, the GNU debugger.
 
-   Copyright (C) 2013-2022 Free Software Foundation, Inc.
+   Copyright (C) 2013-2023 Free Software Foundation, Inc.
 
    Contributed by Intel Corp. <markus.t.metzger@intel.com>
 
@@ -62,8 +62,8 @@ static void btrace_add_pc (struct thread_info *tp);
   do                                                                   \
     {                                                                  \
       if (record_debug != 0)                                           \
-       fprintf_unfiltered (gdb_stdlog,                                 \
-                           "[btrace] " msg "\n", ##args);              \
+       gdb_printf (gdb_stdlog,                                         \
+                   "[btrace] " msg "\n", ##args);                      \
     }                                                                  \
   while (0)
 
@@ -102,7 +102,7 @@ ftrace_print_filename (const struct btrace_function *bfun)
   sym = bfun->sym;
 
   if (sym != NULL)
-    filename = symtab_to_filename_for_display (symbol_symtab (sym));
+    filename = symtab_to_filename_for_display (sym->symtab ());
   else
     filename = "<unknown>";
 
@@ -210,8 +210,8 @@ ftrace_function_switched (const struct btrace_function *bfun,
        return 1;
 
       /* Check the location of those functions, as well.  */
-      bfname = symtab_to_fullname (symbol_symtab (sym));
-      fname = symtab_to_fullname (symbol_symtab (fun));
+      bfname = symtab_to_fullname (sym->symtab ());
+      fname = symtab_to_fullname (fun->symtab ());
       if (filename_cmp (fname, bfname) != 0)
        return 1;
     }
@@ -1512,7 +1512,7 @@ btrace_compute_ftrace_pt (struct thread_info *tp,
                          const struct btrace_data_pt *btrace,
                          std::vector<unsigned int> &gaps)
 {
-  internal_error (__FILE__, __LINE__, _("Unexpected branch trace format."));
+  internal_error (_("Unexpected branch trace format."));
 }
 
 #endif /* defined (HAVE_LIBIPT)  */
@@ -1548,7 +1548,7 @@ btrace_compute_ftrace_1 (struct thread_info *tp,
       return;
     }
 
-  internal_error (__FILE__, __LINE__, _("Unknown branch trace format."));
+  internal_error (_("Unknown branch trace format."));
 }
 
 static void
@@ -1808,7 +1808,7 @@ btrace_stitch_trace (struct btrace_data *btrace, struct thread_info *tp)
       return -1;
     }
 
-  internal_error (__FILE__, __LINE__, _("Unknown branch trace format."));
+  internal_error (_("Unknown branch trace format."));
 }
 
 /* Clear the branch trace histories in BTINFO.  */
@@ -2852,122 +2852,122 @@ pt_print_packet (const struct pt_packet *packet)
   switch (packet->type)
     {
     default:
-      printf_filtered (("[??: %x]"), packet->type);
+      gdb_printf (("[??: %x]"), packet->type);
       break;
 
     case ppt_psb:
-      printf_filtered (("psb"));
+      gdb_printf (("psb"));
       break;
 
     case ppt_psbend:
-      printf_filtered (("psbend"));
+      gdb_printf (("psbend"));
       break;
 
     case ppt_pad:
-      printf_filtered (("pad"));
+      gdb_printf (("pad"));
       break;
 
     case ppt_tip:
-      printf_filtered (("tip %u: 0x%" PRIx64 ""),
-                      packet->payload.ip.ipc,
-                      packet->payload.ip.ip);
+      gdb_printf (("tip %u: 0x%" PRIx64 ""),
+                 packet->payload.ip.ipc,
+                 packet->payload.ip.ip);
       break;
 
     case ppt_tip_pge:
-      printf_filtered (("tip.pge %u: 0x%" PRIx64 ""),
-                      packet->payload.ip.ipc,
-                      packet->payload.ip.ip);
+      gdb_printf (("tip.pge %u: 0x%" PRIx64 ""),
+                 packet->payload.ip.ipc,
+                 packet->payload.ip.ip);
       break;
 
     case ppt_tip_pgd:
-      printf_filtered (("tip.pgd %u: 0x%" PRIx64 ""),
-                      packet->payload.ip.ipc,
-                      packet->payload.ip.ip);
+      gdb_printf (("tip.pgd %u: 0x%" PRIx64 ""),
+                 packet->payload.ip.ipc,
+                 packet->payload.ip.ip);
       break;
 
     case ppt_fup:
-      printf_filtered (("fup %u: 0x%" PRIx64 ""),
-                      packet->payload.ip.ipc,
-                      packet->payload.ip.ip);
+      gdb_printf (("fup %u: 0x%" PRIx64 ""),
+                 packet->payload.ip.ipc,
+                 packet->payload.ip.ip);
       break;
 
     case ppt_tnt_8:
-      printf_filtered (("tnt-8 %u: 0x%" PRIx64 ""),
-                      packet->payload.tnt.bit_size,
-                      packet->payload.tnt.payload);
+      gdb_printf (("tnt-8 %u: 0x%" PRIx64 ""),
+                 packet->payload.tnt.bit_size,
+                 packet->payload.tnt.payload);
       break;
 
     case ppt_tnt_64:
-      printf_filtered (("tnt-64 %u: 0x%" PRIx64 ""),
-                      packet->payload.tnt.bit_size,
-                      packet->payload.tnt.payload);
+      gdb_printf (("tnt-64 %u: 0x%" PRIx64 ""),
+                 packet->payload.tnt.bit_size,
+                 packet->payload.tnt.payload);
       break;
 
     case ppt_pip:
-      printf_filtered (("pip %" PRIx64 "%s"), packet->payload.pip.cr3,
-                      packet->payload.pip.nr ? (" nr") : (""));
+      gdb_printf (("pip %" PRIx64 "%s"), packet->payload.pip.cr3,
+                 packet->payload.pip.nr ? (" nr") : (""));
       break;
 
     case ppt_tsc:
-      printf_filtered (("tsc %" PRIx64 ""), packet->payload.tsc.tsc);
+      gdb_printf (("tsc %" PRIx64 ""), packet->payload.tsc.tsc);
       break;
 
     case ppt_cbr:
-      printf_filtered (("cbr %u"), packet->payload.cbr.ratio);
+      gdb_printf (("cbr %u"), packet->payload.cbr.ratio);
       break;
 
     case ppt_mode:
       switch (packet->payload.mode.leaf)
        {
        default:
-         printf_filtered (("mode %u"), packet->payload.mode.leaf);
+         gdb_printf (("mode %u"), packet->payload.mode.leaf);
          break;
 
        case pt_mol_exec:
-         printf_filtered (("mode.exec%s%s"),
-                          packet->payload.mode.bits.exec.csl
-                          ? (" cs.l") : (""),
-                          packet->payload.mode.bits.exec.csd
-                          ? (" cs.d") : (""));
+         gdb_printf (("mode.exec%s%s"),
+                     packet->payload.mode.bits.exec.csl
+                     ? (" cs.l") : (""),
+                     packet->payload.mode.bits.exec.csd
+                     ? (" cs.d") : (""));
          break;
 
        case pt_mol_tsx:
-         printf_filtered (("mode.tsx%s%s"),
-                          packet->payload.mode.bits.tsx.intx
-                          ? (" intx") : (""),
-                          packet->payload.mode.bits.tsx.abrt
-                          ? (" abrt") : (""));
+         gdb_printf (("mode.tsx%s%s"),
+                     packet->payload.mode.bits.tsx.intx
+                     ? (" intx") : (""),
+                     packet->payload.mode.bits.tsx.abrt
+                     ? (" abrt") : (""));
          break;
        }
       break;
 
     case ppt_ovf:
-      printf_filtered (("ovf"));
+      gdb_printf (("ovf"));
       break;
 
     case ppt_stop:
-      printf_filtered (("stop"));
+      gdb_printf (("stop"));
       break;
 
     case ppt_vmcs:
-      printf_filtered (("vmcs %" PRIx64 ""), packet->payload.vmcs.base);
+      gdb_printf (("vmcs %" PRIx64 ""), packet->payload.vmcs.base);
       break;
 
     case ppt_tma:
-      printf_filtered (("tma %x %x"), packet->payload.tma.ctc,
-                      packet->payload.tma.fc);
+      gdb_printf (("tma %x %x"), packet->payload.tma.ctc,
+                 packet->payload.tma.fc);
       break;
 
     case ppt_mtc:
-      printf_filtered (("mtc %x"), packet->payload.mtc.ctc);
+      gdb_printf (("mtc %x"), packet->payload.mtc.ctc);
       break;
 
     case ppt_cyc:
-      printf_filtered (("cyc %" PRIx64 ""), packet->payload.cyc.value);
+      gdb_printf (("cyc %" PRIx64 ""), packet->payload.cyc.value);
       break;
 
     case ppt_mnt:
-      printf_filtered (("mnt %" PRIx64 ""), packet->payload.mnt.payload);
+      gdb_printf (("mnt %" PRIx64 ""), packet->payload.mnt.payload);
       break;
     }
 }
@@ -3149,9 +3149,9 @@ btrace_maint_print_packets (struct btrace_thread_info *btinfo,
          {
            const btrace_block &block = blocks.at (blk);
 
-           printf_filtered ("%u\tbegin: %s, end: %s\n", blk,
-                            core_addr_to_string_nz (block.begin),
-                            core_addr_to_string_nz (block.end));
+           gdb_printf ("%u\tbegin: %s, end: %s\n", blk,
+                       core_addr_to_string_nz (block.begin),
+                       core_addr_to_string_nz (block.end));
          }
 
        btinfo->maint.variant.bts.packet_history.begin = begin;
@@ -3170,15 +3170,15 @@ btrace_maint_print_packets (struct btrace_thread_info *btinfo,
          {
            const struct btrace_pt_packet &packet = packets.at (pkt);
 
-           printf_filtered ("%u\t", pkt);
-           printf_filtered ("0x%" PRIx64 "\t", packet.offset);
+           gdb_printf ("%u\t", pkt);
+           gdb_printf ("0x%" PRIx64 "\t", packet.offset);
 
            if (packet.errcode == pte_ok)
              pt_print_packet (&packet.packet);
            else
-             printf_filtered ("[error: %s]", pt_errstr (packet.errcode));
+             gdb_printf ("[error: %s]", pt_errstr (packet.errcode));
 
-           printf_filtered ("\n");
+           gdb_printf ("\n");
          }
 
        btinfo->maint.variant.pt.packet_history.begin = begin;
@@ -3256,7 +3256,7 @@ maint_btrace_packet_history_cmd (const char *arg, int from_tty)
   btrace_maint_update_packets (btinfo, &begin, &end, &from, &to);
   if (begin == end)
     {
-      printf_filtered (_("No trace.\n"));
+      gdb_printf (_("No trace.\n"));
       return;
     }
 
@@ -3398,8 +3398,8 @@ maint_info_btrace_cmd (const char *args, int from_tty)
   if (conf == NULL)
     error (_("No btrace configuration."));
 
-  printf_filtered (_("Format: %s.\n"),
-                  btrace_format_string (conf->format));
+  gdb_printf (_("Format: %s.\n"),
+             btrace_format_string (conf->format));
 
   switch (conf->format)
     {
@@ -3407,8 +3407,8 @@ maint_info_btrace_cmd (const char *args, int from_tty)
       break;
 
     case BTRACE_FORMAT_BTS:
-      printf_filtered (_("Number of packets: %zu.\n"),
-                      btinfo->data.variant.bts.blocks->size ());
+      gdb_printf (_("Number of packets: %zu.\n"),
+                 btinfo->data.variant.bts.blocks->size ());
       break;
 
 #if defined (HAVE_LIBIPT)
@@ -3417,14 +3417,14 @@ maint_info_btrace_cmd (const char *args, int from_tty)
        struct pt_version version;
 
        version = pt_library_version ();
-       printf_filtered (_("Version: %u.%u.%u%s.\n"), version.major,
-                        version.minor, version.build,
-                        version.ext != NULL ? version.ext : "");
+       gdb_printf (_("Version: %u.%u.%u%s.\n"), version.major,
+                   version.minor, version.build,
+                   version.ext != NULL ? version.ext : "");
 
        btrace_maint_update_pt_packets (btinfo);
-       printf_filtered (_("Number of packets: %zu.\n"),
-                        ((btinfo->maint.variant.pt.packets == nullptr)
-                         ? 0 : btinfo->maint.variant.pt.packets->size ()));
+       gdb_printf (_("Number of packets: %zu.\n"),
+                   ((btinfo->maint.variant.pt.packets == nullptr)
+                    ? 0 : btinfo->maint.variant.pt.packets->size ()));
       }
       break;
 #endif /* defined (HAVE_LIBIPT)  */
@@ -3438,7 +3438,7 @@ show_maint_btrace_pt_skip_pad  (struct ui_file *file, int from_tty,
                                  struct cmd_list_element *c,
                                  const char *value)
 {
-  fprintf_filtered (file, _("Skip PAD packets is %s.\n"), value);
+  gdb_printf (file, _("Skip PAD packets is %s.\n"), value);
 }