aboutsummaryrefslogtreecommitdiff
path: root/gdb/cli
diff options
context:
space:
mode:
authorAndrew Burgess <aburgess@redhat.com>2022-02-14 14:40:52 +0000
committerAndrew Burgess <aburgess@redhat.com>2022-07-11 12:02:54 +0100
commit4cbe4ca5da5cd7e1e6331ce11f024bf3c07b9744 (patch)
tree8c0bf2715ee9bc1c477005ba81c50cc22c59990e /gdb/cli
parent81384924cdcc9eb2676dd9084b76845d7d0e0759 (diff)
downloadgdb-4cbe4ca5da5cd7e1e6331ce11f024bf3c07b9744.zip
gdb-4cbe4ca5da5cd7e1e6331ce11f024bf3c07b9744.tar.gz
gdb-4cbe4ca5da5cd7e1e6331ce11f024bf3c07b9744.tar.bz2
gdb: add support for disassembler styling using libopcodes
This commit extends GDB to make use of libopcodes styling support where available, currently this is just i386 based architectures, and RISC-V. For architectures that don't support styling using libopcodes GDB will fall back to using the Python Pygments package, when the package is available. The new libopcodes based styling has the disassembler identify parts of the disassembled instruction, e.g. registers, immediates, mnemonics, etc, and can style these components differently. Additionally, as the styling is now done in GDB we can add settings to allow the user to configure which colours are used right from the GDB CLI. There's some new maintenance commands: maintenance set libopcodes-styling enabled on|off maintenance show libopcodes-styling These can be used to manually disable use of libopcodes styling. This is a maintenance command as it's not anticipated that a user should need to do this. But, this could be useful for testing, or, in some rare cases, a user might want to override the Python hook used for disassembler styling, and then disable libopcode styling so that GDB falls back to using Python. Right now I would consider this second use case a rare situation, which is why I think a maintenance command is appropriate. When libopcodes is being used for styling then the user can make use of the following new styles: set/show style disassembler comment set/show style disassembler immediate set/show style disassembler mnemonic set/show style disassembler register The disassembler also makes use of the 'address' and 'function' styles to style some parts of the disassembler output. I have also added the following aliases though: set/show style disassembler address set/show style disassembler symbol these are aliases for: set/show style address set/show style function respectively, and exist to make it easier for users to discover disassembler related style settings. The 'address' style is used to style numeric addresses in the disassembler output, while the 'symbol' or 'function' style is used to style the names of symbols in disassembler output. As not every architecture supports libopcodes styling, the maintenance setting 'libopcodes-styling enabled' has an "auto-off" type behaviour. Consider this GDB session: (gdb) show architecture The target architecture is set to "auto" (currently "i386:x86-64"). (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "on". the setting defaults to "on" for architectures that support libopcodes based styling. (gdb) set architecture sparc The target architecture is set to "sparc". (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "off" (not supported on architecture "sparc") the setting will show as "off" if the user switches to an architecture that doesn't support libopcodes styling. The underlying setting is still "on" at this point though, if the user switches back to i386:x86-64 then the setting would go back to being "on". (gdb) maintenance set libopcodes-styling enabled off (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "off". now the setting is "off" for everyone, even if the user switches back to i386:x86-64 the setting will still show as "off". (gdb) maintenance set libopcodes-styling enabled on Use of libopcodes styling not supported on architecture "sparc". (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "off". attempting to switch the setting "on" for an unsupported architecture will give an error, and the setting will remain "off". (gdb) set architecture auto The target architecture is set to "auto" (currently "i386:x86-64"). (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "off". (gdb) maintenance set libopcodes-styling enabled on (gdb) maintenance show libopcodes-styling enabled Use of libopcodes styling support is "on". the user will need to switch back to a supported architecture before they can one again turn this setting "on".
Diffstat (limited to 'gdb/cli')
-rw-r--r--gdb/cli/cli-style.c107
-rw-r--r--gdb/cli/cli-style.h28
2 files changed, 120 insertions, 15 deletions
diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c
index 3fd85f4..abf6855 100644
--- a/gdb/cli/cli-style.c
+++ b/gdb/cli/cli-style.c
@@ -110,6 +110,23 @@ cli_style_option version_style ("version", ui_file_style::MAGENTA,
/* See cli-style.h. */
+cli_style_option disasm_mnemonic_style ("mnemonic", ui_file_style::GREEN);
+
+/* See cli-style.h. */
+
+cli_style_option disasm_register_style ("register", ui_file_style::RED);
+
+/* See cli-style.h. */
+
+cli_style_option disasm_immediate_style ("immediate", ui_file_style::BLUE);
+
+/* See cli-style.h. */
+
+cli_style_option disasm_comment_style ("comment", ui_file_style::WHITE,
+ ui_file_style::DIM);
+
+/* See cli-style.h. */
+
cli_style_option::cli_style_option (const char *name,
ui_file_style::basic_color fg,
ui_file_style::intensity intensity)
@@ -224,15 +241,16 @@ cli_style_option::do_show_intensity (struct ui_file *file, int from_tty,
/* See cli-style.h. */
-void
+set_show_commands
cli_style_option::add_setshow_commands (enum command_class theclass,
const char *prefix_doc,
struct cmd_list_element **set_list,
struct cmd_list_element **show_list,
bool skip_intensity)
{
- add_setshow_prefix_cmd (m_name, theclass, prefix_doc, prefix_doc,
- &m_set_list, &m_show_list, set_list, show_list);
+ set_show_commands prefix_cmds
+ = add_setshow_prefix_cmd (m_name, theclass, prefix_doc, prefix_doc,
+ &m_set_list, &m_show_list, set_list, show_list);
set_show_commands commands;
@@ -274,6 +292,8 @@ cli_style_option::add_setshow_commands (enum command_class theclass,
commands.set->set_context (this);
commands.show->set_context (this);
}
+
+ return prefix_cmds;
}
static cmd_list_element *style_set_list;
@@ -387,11 +407,13 @@ Configure filename colors and display intensity."),
&style_set_list, &style_show_list,
false);
- function_name_style.add_setshow_commands (no_class, _("\
+ set_show_commands function_prefix_cmds
+ = function_name_style.add_setshow_commands (no_class, _("\
Function name display styling.\n\
Configure function name colors and display intensity"),
- &style_set_list, &style_show_list,
- false);
+ &style_set_list,
+ &style_show_list,
+ false);
variable_name_style.add_setshow_commands (no_class, _("\
Variable name display styling.\n\
@@ -399,11 +421,12 @@ Configure variable name colors and display intensity"),
&style_set_list, &style_show_list,
false);
- address_style.add_setshow_commands (no_class, _("\
+ set_show_commands address_prefix_cmds
+ = address_style.add_setshow_commands (no_class, _("\
Address display styling.\n\
Configure address colors and display intensity"),
- &style_set_list, &style_show_list,
- false);
+ &style_set_list, &style_show_list,
+ false);
title_style.add_setshow_commands (no_class, _("\
Title display styling.\n\
@@ -451,4 +474,70 @@ Version string display styling.\n\
Configure colors used to display the GDB version string."),
&style_set_list, &style_show_list,
false);
+
+ disasm_mnemonic_style.add_setshow_commands (no_class, _("\
+Disassembler mnemonic display styling.\n\
+Configure the colors and display intensity for instruction mnemonics\n\
+in the disassembler output. The \"disassembler mnemonic\" style is\n\
+used to display instruction mnemonics as well as any assembler\n\
+directives, e.g. \".byte\", \".word\", etc.\n\
+\n\
+This style will only be used for targets that support libopcodes based\n\
+disassembler styling. When Python Pygments based styling is used\n\
+then this style has no effect."),
+ &style_disasm_set_list,
+ &style_disasm_show_list,
+ false);
+
+ disasm_register_style.add_setshow_commands (no_class, _("\
+Disassembler register display styling.\n\
+Configure the colors and display intensity for registers in the\n\
+disassembler output.\n\
+\n\
+This style will only be used for targets that support libopcodes based\n\
+disassembler styling. When Python Pygments based styling is used\n\
+then this style has no effect."),
+ &style_disasm_set_list,
+ &style_disasm_show_list,
+ false);
+
+ disasm_immediate_style.add_setshow_commands (no_class, _("\
+Disassembler immediate display styling.\n\
+Configure the colors and display intensity for immediates in the\n\
+disassembler output. The \"disassembler immediate\" style is used for\n\
+any number that is not an address, this includes constants in arithmetic\n\
+instructions, as well as address offsets in memory access instructions.\n\
+\n\
+This style will only be used for targets that support libopcodes based\n\
+disassembler styling. When Python Pygments based styling is used\n\
+then this style has no effect."),
+ &style_disasm_set_list,
+ &style_disasm_show_list,
+ false);
+
+ disasm_comment_style.add_setshow_commands (no_class, _("\
+Disassembler comment display styling.\n\
+Configure the colors and display intensity for comments in the\n\
+disassembler output. The \"disassembler comment\" style is used for\n\
+the comment character, and everything after the comment character up to\n\
+the end of the line. The comment style overrides any other styling,\n\
+e.g. a register name in a comment will use the comment styling.\n\
+\n\
+This style will only be used for targets that support libopcodes based\n\
+disassembler styling. When Python Pygments based styling is used\n\
+then this style has no effect."),
+ &style_disasm_set_list,
+ &style_disasm_show_list,
+ false);
+
+ /* Setup 'disassembler address' style and 'disassembler symbol' style,
+ these are aliases for 'address' and 'function' styles respectively. */
+ add_alias_cmd ("address", address_prefix_cmds.set, no_class, 0,
+ &style_disasm_set_list);
+ add_alias_cmd ("address", address_prefix_cmds.show, no_class, 0,
+ &style_disasm_show_list);
+ add_alias_cmd ("symbol", function_prefix_cmds.set, no_class, 0,
+ &style_disasm_set_list);
+ add_alias_cmd ("symbol", function_prefix_cmds.show, no_class, 0,
+ &style_disasm_show_list);
}
diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h
index f69df47..4090cf0 100644
--- a/gdb/cli/cli-style.h
+++ b/gdb/cli/cli-style.h
@@ -43,12 +43,13 @@ public:
/* Return the style name. */
const char *name () { return m_name; };
- /* Call once to register this CLI style with the CLI engine. */
- void add_setshow_commands (enum command_class theclass,
- const char *prefix_doc,
- struct cmd_list_element **set_list,
- struct cmd_list_element **show_list,
- bool skip_intensity);
+ /* Call once to register this CLI style with the CLI engine. Returns
+ the set/show prefix commands for the style. */
+ set_show_commands add_setshow_commands (enum command_class theclass,
+ const char *prefix_doc,
+ struct cmd_list_element **set_list,
+ struct cmd_list_element **show_list,
+ bool skip_intensity);
/* Return the 'set style NAME' command list, that can be used
to build a lambda DO_SET to call add_setshow_commands. */
@@ -116,6 +117,21 @@ extern cli_style_option title_style;
/* The metadata style. */
extern cli_style_option metadata_style;
+/* The disassembler style for mnemonics or assembler directives
+ (e.g. '.byte', etc). */
+extern cli_style_option disasm_mnemonic_style;
+
+/* The disassembler style for register names. */
+extern cli_style_option disasm_register_style;
+
+/* The disassembler style for numerical values that are not addresses, this
+ includes immediate operands (e.g. in, an add instruction), but also
+ address offsets (e.g. in a load instruction). */
+extern cli_style_option disasm_immediate_style;
+
+/* The disassembler style for comments. */
+extern cli_style_option disasm_comment_style;
+
/* The border style of a TUI window that does not have the focus. */
extern cli_style_option tui_border_style;