X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gdb%2Frecord-btrace.c;h=b55459e4ad1a9198f710f979e3fdc8b35bd7a938;hb=fd3619828e94a24a92cddec42cbc0ab33352eeb4;hp=ec06145585fd56436068def8f24167045359cbb4;hpb=268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc;p=thirdparty%2Fbinutils-gdb.git diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index ec06145585f..b55459e4ad1 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -41,6 +41,7 @@ #include "gdbsupport/vec.h" #include "inferior.h" #include +#include "gdbarch.h" static const target_info record_btrace_target_info = { "record-btrace", @@ -616,21 +617,13 @@ btrace_ui_out_decode_error (struct ui_out *uiout, int errcode, if (!(format == BTRACE_FORMAT_PT && errcode > 0)) { uiout->text (_("decode error (")); - uiout->field_int ("errcode", errcode); + uiout->field_signed ("errcode", errcode); uiout->text (_("): ")); } uiout->text (errstr); uiout->text (_("]\n")); } -/* Print an unsigned int. */ - -static void -ui_out_field_uint (struct ui_out *uiout, const char *fld, unsigned int val) -{ - uiout->field_fmt (fld, "%u", val); -} - /* A range of source lines. */ struct btrace_line_range @@ -785,7 +778,7 @@ btrace_insn_history (struct ui_out *uiout, gdb::optional src_and_asm_tuple; gdb::optional asm_list; - gdb_pretty_print_disassembler disasm (gdbarch); + gdb_pretty_print_disassembler disasm (gdbarch, uiout); for (btrace_insn_iterator it = *begin; btrace_insn_cmp (&it, end) != 0; btrace_insn_next (&it, 1)) @@ -848,7 +841,7 @@ btrace_insn_history (struct ui_out *uiout, if ((insn->flags & BTRACE_INSN_FLAG_SPECULATIVE) != 0) dinsn.is_speculative = 1; - disasm.pretty_print_insn (uiout, &dinsn, flags); + disasm.pretty_print_insn (&dinsn, flags); } } } @@ -1032,9 +1025,9 @@ btrace_call_history_insn_range (struct ui_out *uiout, begin = bfun->insn_offset; end = begin + size - 1; - ui_out_field_uint (uiout, "insn begin", begin); + uiout->field_unsigned ("insn begin", begin); uiout->text (","); - ui_out_field_uint (uiout, "insn end", end); + uiout->field_unsigned ("insn end", end); } /* Compute the lowest and highest source line for the instructions in BFUN @@ -1098,13 +1091,13 @@ btrace_call_history_src_line (struct ui_out *uiout, return; uiout->text (":"); - uiout->field_int ("min line", begin); + uiout->field_signed ("min line", begin); if (end == begin) return; uiout->text (","); - uiout->field_int ("max line", end); + uiout->field_signed ("max line", end); } /* Get the name of a branch trace function. */ @@ -1155,7 +1148,7 @@ btrace_call_history (struct ui_out *uiout, msym = bfun->msym; /* Print the function index. */ - ui_out_field_uint (uiout, "index", bfun->number); + uiout->field_unsigned ("index", bfun->number); uiout->text ("\t"); /* Indicate gaps in the trace. */ @@ -1442,8 +1435,7 @@ record_btrace_target::xfer_partial (enum target_object object, if (section != NULL) { /* Check if the section we found is readonly. */ - if ((bfd_get_section_flags (section->the_bfd_section->owner, - section->the_bfd_section) + if ((bfd_section_flags (section->the_bfd_section) & SEC_READONLY) != 0) { /* Truncate the request to fit into this section. */ @@ -1567,7 +1559,7 @@ record_btrace_target::store_registers (struct regcache *regcache, int regno) && record_is_replaying (regcache->ptid ())) error (_("Cannot write registers while replaying.")); - gdb_assert (may_write_registers != 0); + gdb_assert (may_write_registers); this->beneath ()->store_registers (regcache, regno); } @@ -3170,11 +3162,11 @@ This format may not be available on all processors."), add_alias_cmd ("pt", "btrace pt", class_obscure, 1, &record_cmdlist); add_prefix_cmd ("btrace", class_support, cmd_set_record_btrace, - _("Set record options"), &set_record_btrace_cmdlist, + _("Set record options."), &set_record_btrace_cmdlist, "set record btrace ", 0, &set_record_cmdlist); add_prefix_cmd ("btrace", class_support, cmd_show_record_btrace, - _("Show record options"), &show_record_btrace_cmdlist, + _("Show record options."), &show_record_btrace_cmdlist, "show record btrace ", 0, &show_record_cmdlist); add_setshow_enum_cmd ("replay-memory-access", no_class, @@ -3203,7 +3195,7 @@ When GDB does not support that cpu, this option can be used to enable\n\ workarounds for a similar cpu that GDB supports.\n\n\ When set to \"none\", errata workarounds are disabled."), &set_record_btrace_cpu_cmdlist, - _("set record btrace cpu "), 1, + "set record btrace cpu ", 1, &set_record_btrace_cmdlist); add_cmd ("auto", class_support, cmd_set_record_btrace_cpu_auto, _("\ @@ -3219,12 +3211,12 @@ Show the cpu to be used for trace decode."), &show_record_btrace_cmdlist); add_prefix_cmd ("bts", class_support, cmd_set_record_btrace_bts, - _("Set record btrace bts options"), + _("Set record btrace bts options."), &set_record_btrace_bts_cmdlist, "set record btrace bts ", 0, &set_record_btrace_cmdlist); add_prefix_cmd ("bts", class_support, cmd_show_record_btrace_bts, - _("Show record btrace bts options"), + _("Show record btrace bts options."), &show_record_btrace_bts_cmdlist, "show record btrace bts ", 0, &show_record_btrace_cmdlist); @@ -3243,12 +3235,12 @@ The trace buffer size may not be changed while recording."), NULL, &show_record_btrace_bts_cmdlist); add_prefix_cmd ("pt", class_support, cmd_set_record_btrace_pt, - _("Set record btrace pt options"), + _("Set record btrace pt options."), &set_record_btrace_pt_cmdlist, "set record btrace pt ", 0, &set_record_btrace_cmdlist); add_prefix_cmd ("pt", class_support, cmd_show_record_btrace_pt, - _("Show record btrace pt options"), + _("Show record btrace pt options."), &show_record_btrace_pt_cmdlist, "show record btrace pt ", 0, &show_record_btrace_cmdlist);