/* Disassemble support for GDB.
- Copyright (C) 2000-2018 Free Software Foundation, Inc.
+ Copyright (C) 2000-2019 Free Software Foundation, Inc.
This file is part of GDB.
the future. */
uiout->text (" <");
if ((flags & DISASSEMBLY_OMIT_FNAME) == 0)
- uiout->field_string ("func-name", name.c_str ());
+ uiout->field_string ("func-name", name.c_str (),
+ ui_out_style_kind::FUNCTION);
uiout->text ("+");
uiout->field_int ("offset", offset);
uiout->text (">:\t");
"src_and_asm_line");
print_source_lines (symtab, next_line, next_line + 1,
psl_flags);
- ui_out_emit_list inner_list_emitter (uiout,
- "line_asm_insn");
+ ui_out_emit_list temp_list_emitter (uiout,
+ "line_asm_insn");
}
/* Print the last line and leave list open for
asm instructions to be added. */
l < end_preceding_line_to_display;
++l)
{
- ui_out_emit_tuple tuple_emitter (uiout, "src_and_asm_line");
+ ui_out_emit_tuple line_tuple_emitter (uiout,
+ "src_and_asm_line");
print_source_lines (sal.symtab, l, l + 1, psl_flags);
ui_out_emit_list chain_line_emitter (uiout, "line_asm_insn");
}
if (options == NULL)
options = "";
- fprintf_filtered (file, _("The current disassembler options are '%s'\n"),
+ fprintf_filtered (file, _("The current disassembler options are '%s'\n\n"),
options);
valid_options_and_args = gdbarch_valid_disassembler_options (gdbarch);
if (valid_options_and_args == NULL)
- return;
+ {
+ fputs_filtered (_("There are no disassembler options available "
+ "for this architecture.\n"),
+ file);
+ return;
+ }
valid_options = &valid_options_and_args->options;
- fprintf_filtered (file, _("\n\
+ fprintf_filtered (file, _("\
The following disassembler options are supported for use with the\n\
-'set disassembler-options <option>[,<option>...]' command:\n"));
+'set disassembler-options OPTION [,OPTION]...' command:\n"));
if (valid_options->description != NULL)
{