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/guile | |
| parent | a0a8a9340dc79116297627a0884c6a01543e4b34 (diff) | |
| download | gdb-8588b356927dabd582d1d67f87a161027cb2aed1.zip gdb-8588b356927dabd582d1d67f87a161027cb2aed1.tar.gz gdb-8588b356927dabd582d1d67f87a161027cb2aed1.tar.bz2 | |
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/guile')
| -rw-r--r-- | gdb/guile/guile.c | 5 | ||||
| -rw-r--r-- | gdb/guile/guile.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index 95b36fe..9384e84 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -700,6 +700,9 @@ gdbscm_set_backtrace (int enable) #endif /* HAVE_GUILE */ +/* See guile.h. */ +cmd_list_element *guile_cmd_element = nullptr; + /* Install the various gdb commands used by Guile. */ static void @@ -725,7 +728,7 @@ This command is only a placeholder.") /* Since "help guile" is easy to type, and intuitive, we add general help in using GDB+Guile to this command. */ - add_com ("guile", class_obscure, guile_command, + guile_cmd_element = add_com ("guile", class_obscure, guile_command, #ifdef HAVE_GUILE _("\ Evaluate one or more Guile expressions.\n\ diff --git a/gdb/guile/guile.h b/gdb/guile/guile.h index aaa0058..2faa23d 100644 --- a/gdb/guile/guile.h +++ b/gdb/guile/guile.h @@ -25,4 +25,7 @@ /* This is all that guile exports to gdb. */ extern const struct extension_language_defn extension_language_guile; +/* Command element for the 'guile' command. */ +extern cmd_list_element *guile_cmd_element; + #endif /* GDB_GUILE_H */ |