diff options
| author |   Simon Marchi <simon.marchi@polymtl.ca> | 2018-09-17 08:26:24 -0400 |
|---|---|---|
| committer |   Simon Marchi <simon.marchi@ericsson.com> | 2018-09-17 08:26:24 -0400 |
| commit | 8588b356927dabd582d1d67f87a161027cb2aed1 (patch) | |
| tree | 2a2f8d2519cb33f2efd5c40fa9d72a40187b584e /gdb/tracepoint.c | |
| parent | Ensure that binutils test names are unique. (diff) | |
| download | binutils-gdb-8588b356927dabd582d1d67f87a161027cb2aed1.tar.gz binutils-gdb-8588b356927dabd582d1d67f87a161027cb2aed1.tar.bz2 binutils-gdb-8588b356927dabd582d1d67f87a161027cb2aed1.zip | |
python: Make gdb.execute("show commands") work (PR 23669)
Since commit
56bcdbea2bed ("Let gdb.execute handle multi-line commands")
trying to use a command like gdb.execute("show commands") in Python
fails. GDB ends up trying to run the "commands" command.
The reason is that GDB gets confused with the special "commands"
command. In process_next_line, the lookup_cmd_1 function returns the
cmd_list_element representing the "commands" sub-command of "show".
Lower, we check the cmd_list_element to see if it matches various
control commands by name, including the "commands" command. This is
where we wrongfully conclude that the executed command must be
"commands", when in reality it was "show commands".
The fix proposed in this patch removes the comparisons by name, instead
comparing the cmd_list_element object by pointer with the objects
created at initialization time.
Tested on the buildbot, though on a single builder (Fedora-x86_64-m64).
gdb/ChangeLog:
PR python/23669
* breakpoint.c (commands_cmd_element): New.
(_initialize_breakpoint): Assign commands_cmd_element.
* breakpoint.h (commands_cmd_element): New.
* cli/cli-script.c (while_cmd_element, if_command,
define_cmd_element): New.
(command_name_equals): Remove.
(process_next_line): Compare commands by pointer, not by name.
(_initialize_cli_script): Assign the various cmd_list_element
variables.
* compile/compile.c (compile_cmd_element): New.
(_initialize_compile): Assign compile_cmd_element.
* compile/compile.h (compile_cmd_element): New.
* guile/guile.c (guile_cmd_element): New.
(install_gdb_commands): Assign guile_cmd_element.
* guile/guile.h (guile_cmd_element): New.
* python/python.c (python_cmd_element): New.
(_initialize_python): Assign python_cmd_element.
* python/python.h (python_cmd_element): New.
* tracepoint.c (while_stepping_cmd_element): New.
(_initialize_tracepoint): Assign while_stepping_cmd_element.
* tracepoint.h (while_stepping_cmd_element): New.
gdb/testsuite/ChangeLog:
PR python/23669
* gdb.python/python.exp: Test gdb.execute("show commands").
Diffstat (limited to 'gdb/tracepoint.c')
| -rw-r--r-- | gdb/tracepoint.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index bb5a8507739..6d964c154bf 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3977,6 +3977,9 @@ static const struct internalvar_funcs sdata_funcs = NULL }; +/* See tracepoint.h. */ +cmd_list_element *while_stepping_cmd_element = nullptr; + /* module initialization */ void _initialize_tracepoint (void) @@ -4088,7 +4091,8 @@ Entering \"end\" on a line by itself is the normal way to terminate\n\ such a list.\n\n\ Note: the \"end\" command cannot be used at the gdb prompt.")); - add_com ("while-stepping", class_trace, while_stepping_pseudocommand, _("\ + while_stepping_cmd_element = add_com ("while-stepping", class_trace, + while_stepping_pseudocommand, _("\ Specify single-stepping behavior at a tracepoint.\n\ Argument is number of instructions to trace in single-step mode\n\ following the tracepoint. This command is normally followed by\n\ |