FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style more output of "disassemble" command

Browse source 
I noticed a couple of spots where the "disassemble" could style its
output, but currently does not.  This patch adds styling to the
function name at the start of the disassembly, and any addresses
printed there.

gdb/ChangeLog
2020-10-08  Tom Tromey  <tom@tromey.com>

	* cli/cli-cmds.c (print_disassembly): Style function name and
	addresses.  Add _() wrappers.

gdb/testsuite/ChangeLog
2020-10-08  Tom Tromey  <tom@tromey.com>

	* gdb.base/style.exp: Check that "main"'s name is styled.
This commit is contained in:
Tom Tromey 2020-10-08 19:41:45 -06:00
parent b3d3944ee5
commit b270168504
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2020-10-08 Tom Tromey <tom@tromey.com>
* cli/cli-cmds.c (print_disassembly): Style function name and
addresses. Add _() wrappers.
2020-10-08 Shahab Vahedi <shahab@synopsys.com> 2020-10-08 Shahab Vahedi <shahab@synopsys.com>
* NEWS: Mention ARC support in GDBserver. * NEWS: Mention ARC support in GDBserver.

22
gdb/cli/cli-cmds.c
View file

@ -1395,14 +1395,18 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
else else
#endif #endif
{ {
printf_filtered ("Dump of assembler code "); printf_filtered (_("Dump of assembler code "));
if (name != NULL) if (name != NULL)
printf_filtered ("for function %s:\n", name); printf_filtered (_("for function %ps:\n"),
styled_string (function_name_style.style (), name));
if (block == nullptr || BLOCK_CONTIGUOUS_P (block)) if (block == nullptr || BLOCK_CONTIGUOUS_P (block))
{ {
if (name == NULL) if (name == NULL)
printf_filtered ("from %s to %s:\n", printf_filtered (_("from %ps to %ps:\n"),
paddress (gdbarch, low), paddress (gdbarch, high)); styled_string (address_style.style (),
paddress (gdbarch, low)),
styled_string (address_style.style (),
paddress (gdbarch, high)));
/* Dump the specified range. */ /* Dump the specified range. */
gdb_disassembly (gdbarch, current_uiout, flags, -1, low, high); gdb_disassembly (gdbarch, current_uiout, flags, -1, low, high);
@ -1413,14 +1417,16 @@ print_disassembly (struct gdbarch *gdbarch, const char *name,
{ {
CORE_ADDR range_low = BLOCK_RANGE_START (block, i); CORE_ADDR range_low = BLOCK_RANGE_START (block, i);
CORE_ADDR range_high = BLOCK_RANGE_END (block, i); CORE_ADDR range_high = BLOCK_RANGE_END (block, i);
printf_filtered (_("Address range %s to %s:\n"), printf_filtered (_("Address range %ps to %ps:\n"),
paddress (gdbarch, range_low), styled_string (address_style.style (),
paddress (gdbarch, range_high)); paddress (gdbarch, range_low)),
styled_string (address_style.style (),
paddress (gdbarch, range_high)));
gdb_disassembly (gdbarch, current_uiout, flags, -1, gdb_disassembly (gdbarch, current_uiout, flags, -1,
range_low, range_high); range_low, range_high);
} }
} }
printf_filtered ("End of assembler dump.\n"); printf_filtered (_("End of assembler dump.\n"));
} }
} }

4
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2020-10-08 Tom Tromey <tom@tromey.com>
* gdb.base/style.exp: Check that "main"'s name is styled.
2020-10-07 Tom Tromey <tromey@adacore.com> 2020-10-07 Tom Tromey <tromey@adacore.com>
* gdb.base/find.exp: Rename some tests. * gdb.base/find.exp: Rename some tests.

5
gdb/testsuite/gdb.base/style.exp
View file

@ -91,9 +91,12 @@ save_vars { env(TERM) } {
"Defined at $base_file_expr:$macro_line\r\n#define SOME_MACRO 23" "Defined at $base_file_expr:$macro_line\r\n#define SOME_MACRO 23"
} }
set main [style main function]
set func [style some_called_function function] set func [style some_called_function function]
# Somewhere should see the call to the function. # Somewhere should see the call to the function.
gdb_test "disassemble main" "[style $hex address].*$func.*" gdb_test "disassemble main" \
[concat "Dump of assembler code for function $main:.*" \
"[style $hex address].*$func.*"]
set ifield [style int_field variable] set ifield [style int_field variable]
set sfield [style string_field variable] set sfield [style string_field variable]