diff options
author | Tom Tromey <tom@tromey.com> | 2018-04-16 23:13:18 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-05-04 15:58:06 -0600 |
commit | 12973681f5d46a2407a8dc97c3352fa6c9971716 (patch) | |
tree | 855a0883362448d04b745b1d33af5ec1578e156b /gdb/python | |
parent | e2fc72e2c594968084b936bc5dc4702a2c0694f8 (diff) | |
download | binutils-12973681f5d46a2407a8dc97c3352fa6c9971716.zip binutils-12973681f5d46a2407a8dc97c3352fa6c9971716.tar.gz binutils-12973681f5d46a2407a8dc97c3352fa6c9971716.tar.bz2 |
Use counted_command_line everywhere
Currently command lines are reference counted using shared_ptr only
when attached to breakpoints. This patch changes gdb to use
shared_ptr in commands as well. This allows for the removal of
copy_command_lines.
Note that the change to execute_user_command explicitly makes a new
reference to the command line. This will be used in a later patch.
This simplifies struct command_line based on the observation that a
given command can have at most two child bodies: an "if" can have both
"then" and "else" parts. Perhaps the names I've chosen for the
replacements here are not very good -- your input requested.
ChangeLog
2018-05-04 Tom Tromey <tom@tromey.com>
* tracepoint.c (all_tracepoint_actions): Rename from
all_tracepoint_actions_and_cleanup. Change return type.
(actions_command, encode_actions_1, encode_actions)
(trace_dump_actions, tdump_command): Update.
* remote.c (remote_download_command_source): Update.
* python/python.c (gdbpy_eval_from_control_command)
(python_command, python_interactive_command): Update.
* mi/mi-cmd-break.c (mi_cmd_break_commands): Update.
* guile/guile.c (guile_command)
(gdbscm_eval_from_control_command, guile_command): Update.
* compile/compile.c (compile_code_command)
(compile_print_command, compile_to_object): Update.
* cli/cli-script.h (struct command_lines_deleter): New.
(counted_command_line): New typedef.
(struct command_line): Add constructor, destructor.
<body_list>: Remove.
<body_list_0, body_list_1>: New members.
(command_line_up): Remove typedef.
(read_command_lines, read_command_lines_1, get_command_line):
Update.
(copy_command_lines): Don't declare.
* cli/cli-script.c (build_command_line): Use "new".
(get_command_line): Return counted_command_line.
(print_command_lines, execute_user_command)
(execute_control_command_1, while_command, if_command): Update.
(realloc_body_list): Remove.
(process_next_line, recurse_read_control_structure): Update.
(read_command_lines, read_command_lines_1): Return counted_command_line.
(free_command_lines): Use "delete".
(copy_command_lines): Remove.
(define_command, document_command, show_user_1): Update.
* cli/cli-decode.h (struct cmd_list_element) <user_commands>: Now
a counted_command_line.
* breakpoint.h (counted_command_line): Remove typedef.
(breakpoint_set_commands): Update.
* breakpoint.c (check_no_tracepoint_commands)
(validate_commands_for_breakpoint): Update.
(breakpoint_set_commands): Change commands to be a
counted_command_line.
(commands_command_1, update_dprintf_command_list)
(create_tracepoint_from_upload): Update.
Diffstat (limited to 'gdb/python')
-rw-r--r-- | gdb/python/python.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdb/python/python.c b/gdb/python/python.c index fbd6770..b486be7 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -385,12 +385,12 @@ gdbpy_eval_from_control_command (const struct extension_language_defn *extlang, { int ret; - if (cmd->body_count != 1) + if (cmd->body_list_1 != nullptr) error (_("Invalid \"python\" block structure.")); gdbpy_enter enter_py (get_current_arch (), current_language); - std::string script = compute_python_string (cmd->body_list[0]); + std::string script = compute_python_string (cmd->body_list_0.get ()); ret = PyRun_SimpleString (script.c_str ()); if (ret) error (_("Error while executing Python code.")); @@ -413,7 +413,7 @@ python_command (const char *arg, int from_tty) } else { - command_line_up l = get_command_line (python_control, ""); + counted_command_line l = get_command_line (python_control, ""); execute_control_command_untraced (l.get ()); } @@ -1583,7 +1583,7 @@ python_interactive_command (const char *arg, int from_tty) error (_("Python scripting is not supported in this copy of GDB.")); else { - command_line_up l = get_command_line (python_control, ""); + counted_command_line l = get_command_line (python_control, ""); execute_control_command_untraced (l.get ()); } |