diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-18 22:07:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-08-06 11:37:51 -0600 |
| commit | 046bebe1c0a367687bd693eb4594fcdcba0b8f7e (patch) | |
| tree | 38fdfa265e21d04c7bed98491f3bb7b4a8185ad8 /gdb/utils.c | |
| parent | ddbcedf5de138bc83d5d16554a3f44163dcaef7a (diff) | |
| download | gdb-046bebe1c0a367687bd693eb4594fcdcba0b8f7e.zip gdb-046bebe1c0a367687bd693eb4594fcdcba0b8f7e.tar.gz gdb-046bebe1c0a367687bd693eb4594fcdcba0b8f7e.tar.bz2 | |
Add more styling to "disassemble"
This adds more styling to the disassemble command. In particular,
addresses and function names in the disassembly are now styled.
This required fixing a small latent bug in set_output_style. This
function always passed NULL to emit_style_escape; but when writing to
a file other than gdb_stdout, it should emit the style escape
directly. (FWIW this is another argument for better integrating the
pager with ui_file and getting rid of this entire layer.)
gdb/ChangeLog
2019-08-06 Tom Tromey <tom@tromey.com>
* utils.c (set_output_style): Sometimes pass stream to
emit_style_escape.
* ui-out.h (class ui_out) <can_emit_style_escape>: Declare.
* record-btrace.c (btrace_insn_history): Update.
* mi/mi-out.h (class mi_ui_out) <can_emit_style_escape>: New
method.
* disasm.h (gdb_pretty_print_disassembler): Add uiout parameter.
Update initializers.
<m_uiout>: New field.
<m_di>: Move lower.
* disasm.c (gdb_pretty_print_disassembler::pretty_print_insn):
Remove "uiout" parameter.
(dump_insns): Update.
* cli-out.h (class cli_ui_out) <can_emit_style_escape>: Declare.
* cli-out.c (cli_ui_out::can_emit_style_escape): New method.
gdb/testsuite/ChangeLog
2019-08-06 Tom Tromey <tom@tromey.com>
* gdb.base/style.exp: Add disassemble test.
* gdb.base/style.c (some_called_function): New function.
(main): Use it.
Diffstat (limited to 'gdb/utils.c')
| -rw-r--r-- | gdb/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdb/utils.c b/gdb/utils.c index 7584d5a..398dd30 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1442,9 +1442,11 @@ set_output_style (struct ui_file *stream, const ui_file_style &style) if (!stream->can_emit_style_escape ()) return; - /* Note that we don't pass STREAM here, because we want to emit to + /* Note that we may not pass STREAM here, when we want to emit to the wrap buffer, not directly to STREAM. */ - emit_style_escape (style); + if (stream == gdb_stdout) + stream = nullptr; + emit_style_escape (style, stream); } /* See utils.h. */ |