From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21693 invoked by alias); 18 Apr 2019 15:23:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 21612 invoked by uid 89); 18 Apr 2019 15:23:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=sk:var-lis, disconnect, sk:varlis, collecting X-HELO: relay.fit.cvut.cz Received: from relay.fit.cvut.cz (HELO relay.fit.cvut.cz) (147.32.232.237) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 18 Apr 2019 15:23:54 +0000 Received: from imap.fit.cvut.cz (imap.fit.cvut.cz [147.32.232.238]) by relay.fit.cvut.cz (8.15.2/8.15.2) with ESMTPS id x3IFNnJb093686 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2019 17:23:51 +0200 (CEST) (envelope-from jan.vrany@fit.cvut.cz) Received: from localhost (02d97c6d.bb.sky.com [2.217.124.109] (may be forged)) (authenticated bits=0 as user vranyj1) by imap.fit.cvut.cz (8.15.2/8.15.2) with ESMTPSA id x3IFNmaT060283 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 18 Apr 2019 17:23:48 +0200 (CEST) (envelope-from jan.vrany@fit.cvut.cz) From: Jan Vrany To: gdb-patches@sourceware.org Cc: Didier Nadeau Subject: [RFC 1/8] Use std::map for MI commands in mi-cmds.c Date: Thu, 18 Apr 2019 15:23:00 -0000 Message-Id: <20190418152337.6376-2-jan.vrany@fit.cvut.cz> In-Reply-To: <20190418152337.6376-1-jan.vrany@fit.cvut.cz> References: <20190418152337.6376-1-jan.vrany@fit.cvut.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-04/txt/msg00329.txt.bz2 From: Didier Nadeau This changes the hashmap used in mi-cmds.c from a custom structure to std::map. This is done to be able to add new MI commands at runtime, the previous structure had a fixed size array. gdb/ChangeLog: 2017-02-02 Didier Nadeau * mi/mi-cmds.h (mi_cmd_up): New typedef. (mi_lookup): Rename to ... (mi_cmd_lookup): this. * mi/mi-cmds.c (_initialize_mi_cmds): Remove declaration. (lookup_table): Remove declaration. (build_table): Remove declaration. (mi_table): Rename to ... (mi_cmd_table): this and change to std::map. (insert_mi_cmd_entry): New function. (DEF_MI_CMD_CLI_1, DEF_MI_CMD_CLI, DEF_MI_CMD_MI, DEF_MI_CMD_MI_1): Remove macros. (mi_cmds): Remove array. (mi_lookup): Rename to ... (mi_cmd_lookup): this. (create_mi_cmd): New function. (struct mi_cmd_stats): Remove. (stats): Remove. (add_mi_cmd_cli, add_mi_cmd_mi): New functions. (lookup_table): Remove. (build_table): Remove parameter. * mi/mi-parse.c (mi_parse): Change call from mi_lookup to mi_cmd_lookup. * mi/mi-cmd-info.c (mi_cmd_info_gdb_mi_command): Change call from mi_lookup to mi_cmd_lookup. --- gdb/mi/mi-cmd-info.c | 2 +- gdb/mi/mi-cmds.c | 462 ++++++++++++++++++++----------------------- gdb/mi/mi-cmds.h | 4 +- gdb/mi/mi-parse.c | 2 +- 4 files changed, 224 insertions(+), 246 deletions(-) diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c index 39da6c489d..8645fac294 100644 --- a/gdb/mi/mi-cmd-info.c +++ b/gdb/mi/mi-cmd-info.c @@ -82,7 +82,7 @@ mi_cmd_info_gdb_mi_command (const char *command, char **argv, int argc) if (cmd_name[0] == '-') cmd_name++; - cmd = mi_lookup (cmd_name); + cmd = mi_cmd_lookup (cmd_name); ui_out_emit_tuple tuple_emitter (uiout, "command"); uiout->field_string ("exists", cmd != NULL ? "true" : "false"); diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c index fe30ac2e82..2b3cf297cf 100644 --- a/gdb/mi/mi-cmds.c +++ b/gdb/mi/mi-cmds.c @@ -22,267 +22,243 @@ #include "top.h" #include "mi-cmds.h" #include "mi-main.h" +#include +#include +#include -struct mi_cmd; -static struct mi_cmd **lookup_table (const char *command); -static void build_table (struct mi_cmd *commands); +/* MI command table (built at run time). */ -static struct mi_cmd mi_cmds[] = +static std::map mi_cmd_table; + +/* Insert a new mi-command into the command table. Return true if + insertion was successful. */ + +static bool +insert_mi_cmd_entry (mi_cmd_up command) { -/* Define a MI command of NAME, and its corresponding CLI command is - CLI_NAME. */ -#define DEF_MI_CMD_CLI_1(NAME, CLI_NAME, ARGS_P, CALLED) \ - { NAME, { CLI_NAME, ARGS_P}, NULL, CALLED } -#define DEF_MI_CMD_CLI(NAME, CLI_NAME, ARGS_P) \ - DEF_MI_CMD_CLI_1(NAME, CLI_NAME, ARGS_P, NULL) - -/* Define a MI command of NAME, and implemented by function MI_FUNC. */ -#define DEF_MI_CMD_MI_1(NAME, MI_FUNC, CALLED) \ - { NAME, {NULL, 0}, MI_FUNC, CALLED } -#define DEF_MI_CMD_MI(NAME, MI_FUNC) DEF_MI_CMD_MI_1(NAME, MI_FUNC, NULL) - - DEF_MI_CMD_MI ("ada-task-info", mi_cmd_ada_task_info), - DEF_MI_CMD_MI ("add-inferior", mi_cmd_add_inferior), - DEF_MI_CMD_CLI_1 ("break-after", "ignore", 1, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI_1 ("break-condition","cond", 1, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("break-commands", mi_cmd_break_commands, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI_1 ("break-delete", "delete breakpoint", 1, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI_1 ("break-disable", "disable breakpoint", 1, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI_1 ("break-enable", "enable breakpoint", 1, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI ("break-info", "info break", 1), - DEF_MI_CMD_MI_1 ("break-insert", mi_cmd_break_insert, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("dprintf-insert", mi_cmd_dprintf_insert, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_CLI ("break-list", "info break", 0), - DEF_MI_CMD_MI_1 ("break-passcount", mi_cmd_break_passcount, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("break-watch", mi_cmd_break_watch, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("catch-assert", mi_cmd_catch_assert, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("catch-exception", mi_cmd_catch_exception, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("catch-handlers", mi_cmd_catch_handlers, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("catch-load", mi_cmd_catch_load, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI_1 ("catch-unload", mi_cmd_catch_unload, - &mi_suppress_notification.breakpoint), - DEF_MI_CMD_MI ("data-disassemble", mi_cmd_disassemble), - DEF_MI_CMD_MI ("data-evaluate-expression", mi_cmd_data_evaluate_expression), - DEF_MI_CMD_MI ("data-list-changed-registers", - mi_cmd_data_list_changed_registers), - DEF_MI_CMD_MI ("data-list-register-names", mi_cmd_data_list_register_names), - DEF_MI_CMD_MI ("data-list-register-values", mi_cmd_data_list_register_values), - DEF_MI_CMD_MI ("data-read-memory", mi_cmd_data_read_memory), - DEF_MI_CMD_MI ("data-read-memory-bytes", mi_cmd_data_read_memory_bytes), - DEF_MI_CMD_MI_1 ("data-write-memory", mi_cmd_data_write_memory, - &mi_suppress_notification.memory), - DEF_MI_CMD_MI_1 ("data-write-memory-bytes", mi_cmd_data_write_memory_bytes, - &mi_suppress_notification.memory), - DEF_MI_CMD_MI ("data-write-register-values", - mi_cmd_data_write_register_values), - DEF_MI_CMD_MI ("enable-timings", mi_cmd_enable_timings), - DEF_MI_CMD_MI ("enable-pretty-printing", mi_cmd_enable_pretty_printing), - DEF_MI_CMD_MI ("enable-frame-filters", mi_cmd_enable_frame_filters), - DEF_MI_CMD_MI ("environment-cd", mi_cmd_env_cd), - DEF_MI_CMD_MI ("environment-directory", mi_cmd_env_dir), - DEF_MI_CMD_MI ("environment-path", mi_cmd_env_path), - DEF_MI_CMD_MI ("environment-pwd", mi_cmd_env_pwd), - DEF_MI_CMD_CLI_1 ("exec-arguments", "set args", 1, - &mi_suppress_notification.cmd_param_changed), - DEF_MI_CMD_MI ("exec-continue", mi_cmd_exec_continue), - DEF_MI_CMD_MI ("exec-finish", mi_cmd_exec_finish), - DEF_MI_CMD_MI ("exec-jump", mi_cmd_exec_jump), - DEF_MI_CMD_MI ("exec-interrupt", mi_cmd_exec_interrupt), - DEF_MI_CMD_MI ("exec-next", mi_cmd_exec_next), - DEF_MI_CMD_MI ("exec-next-instruction", mi_cmd_exec_next_instruction), - DEF_MI_CMD_MI ("exec-return", mi_cmd_exec_return), - DEF_MI_CMD_MI ("exec-run", mi_cmd_exec_run), - DEF_MI_CMD_MI ("exec-step", mi_cmd_exec_step), - DEF_MI_CMD_MI ("exec-step-instruction", mi_cmd_exec_step_instruction), - DEF_MI_CMD_CLI ("exec-until", "until", 1), - DEF_MI_CMD_CLI ("file-exec-and-symbols", "file", 1), - DEF_MI_CMD_CLI ("file-exec-file", "exec-file", 1), - DEF_MI_CMD_MI ("file-list-exec-source-file", - mi_cmd_file_list_exec_source_file), - DEF_MI_CMD_MI ("file-list-exec-source-files", - mi_cmd_file_list_exec_source_files), - DEF_MI_CMD_MI ("file-list-shared-libraries", - mi_cmd_file_list_shared_libraries), - DEF_MI_CMD_CLI ("file-symbol-file", "symbol-file", 1), - DEF_MI_CMD_MI ("fix-multi-location-breakpoint-output", - mi_cmd_fix_multi_location_breakpoint_output), - DEF_MI_CMD_MI ("gdb-exit", mi_cmd_gdb_exit), - DEF_MI_CMD_CLI_1 ("gdb-set", "set", 1, - &mi_suppress_notification.cmd_param_changed), - DEF_MI_CMD_CLI ("gdb-show", "show", 1), - DEF_MI_CMD_CLI ("gdb-version", "show version", 0), - DEF_MI_CMD_MI ("inferior-tty-set", mi_cmd_inferior_tty_set), - DEF_MI_CMD_MI ("inferior-tty-show", mi_cmd_inferior_tty_show), - DEF_MI_CMD_MI ("info-ada-exceptions", mi_cmd_info_ada_exceptions), - DEF_MI_CMD_MI ("info-gdb-mi-command", mi_cmd_info_gdb_mi_command), - DEF_MI_CMD_MI ("info-os", mi_cmd_info_os), - DEF_MI_CMD_MI ("interpreter-exec", mi_cmd_interpreter_exec), - DEF_MI_CMD_MI ("list-features", mi_cmd_list_features), - DEF_MI_CMD_MI ("list-target-features", mi_cmd_list_target_features), - DEF_MI_CMD_MI ("list-thread-groups", mi_cmd_list_thread_groups), - DEF_MI_CMD_MI ("remove-inferior", mi_cmd_remove_inferior), - DEF_MI_CMD_MI ("stack-info-depth", mi_cmd_stack_info_depth), - DEF_MI_CMD_MI ("stack-info-frame", mi_cmd_stack_info_frame), - DEF_MI_CMD_MI ("stack-list-arguments", mi_cmd_stack_list_args), - DEF_MI_CMD_MI ("stack-list-frames", mi_cmd_stack_list_frames), - DEF_MI_CMD_MI ("stack-list-locals", mi_cmd_stack_list_locals), - DEF_MI_CMD_MI ("stack-list-variables", mi_cmd_stack_list_variables), - DEF_MI_CMD_MI_1 ("stack-select-frame", mi_cmd_stack_select_frame, - &mi_suppress_notification.user_selected_context), - DEF_MI_CMD_MI ("symbol-list-lines", mi_cmd_symbol_list_lines), - DEF_MI_CMD_CLI ("target-attach", "attach", 1), - DEF_MI_CMD_MI ("target-detach", mi_cmd_target_detach), - DEF_MI_CMD_CLI ("target-disconnect", "disconnect", 0), - DEF_MI_CMD_CLI ("target-download", "load", 1), - DEF_MI_CMD_MI ("target-file-delete", mi_cmd_target_file_delete), - DEF_MI_CMD_MI ("target-file-get", mi_cmd_target_file_get), - DEF_MI_CMD_MI ("target-file-put", mi_cmd_target_file_put), - DEF_MI_CMD_MI ("target-flash-erase", mi_cmd_target_flash_erase), - DEF_MI_CMD_CLI ("target-select", "target", 1), - DEF_MI_CMD_MI ("thread-info", mi_cmd_thread_info), - DEF_MI_CMD_MI ("thread-list-ids", mi_cmd_thread_list_ids), - DEF_MI_CMD_MI_1 ("thread-select", mi_cmd_thread_select, - &mi_suppress_notification.user_selected_context), - DEF_MI_CMD_MI ("trace-define-variable", mi_cmd_trace_define_variable), - DEF_MI_CMD_MI_1 ("trace-find", mi_cmd_trace_find, - &mi_suppress_notification.traceframe), - DEF_MI_CMD_MI ("trace-frame-collected", - mi_cmd_trace_frame_collected), - DEF_MI_CMD_MI ("trace-list-variables", mi_cmd_trace_list_variables), - DEF_MI_CMD_MI ("trace-save", mi_cmd_trace_save), - DEF_MI_CMD_MI ("trace-start", mi_cmd_trace_start), - DEF_MI_CMD_MI ("trace-status", mi_cmd_trace_status), - DEF_MI_CMD_MI ("trace-stop", mi_cmd_trace_stop), - DEF_MI_CMD_MI ("var-assign", mi_cmd_var_assign), - DEF_MI_CMD_MI ("var-create", mi_cmd_var_create), - DEF_MI_CMD_MI ("var-delete", mi_cmd_var_delete), - DEF_MI_CMD_MI ("var-evaluate-expression", mi_cmd_var_evaluate_expression), - DEF_MI_CMD_MI ("var-info-path-expression", mi_cmd_var_info_path_expression), - DEF_MI_CMD_MI ("var-info-expression", mi_cmd_var_info_expression), - DEF_MI_CMD_MI ("var-info-num-children", mi_cmd_var_info_num_children), - DEF_MI_CMD_MI ("var-info-type", mi_cmd_var_info_type), - DEF_MI_CMD_MI ("var-list-children", mi_cmd_var_list_children), - DEF_MI_CMD_MI ("var-set-format", mi_cmd_var_set_format), - DEF_MI_CMD_MI ("var-set-frozen", mi_cmd_var_set_frozen), - DEF_MI_CMD_MI ("var-set-update-range", mi_cmd_var_set_update_range), - DEF_MI_CMD_MI ("var-set-visualizer", mi_cmd_var_set_visualizer), - DEF_MI_CMD_MI ("var-show-attributes", mi_cmd_var_show_attributes), - DEF_MI_CMD_MI ("var-show-format", mi_cmd_var_show_format), - DEF_MI_CMD_MI ("var-update", mi_cmd_var_update), - { NULL, } -}; - -/* Pointer to the mi command table (built at run time). */ - -static struct mi_cmd **mi_table; - -/* A prime large enough to accomodate the entire command table. */ -enum - { - MI_TABLE_SIZE = 227 - }; - -/* Exported function used to obtain info from the table. */ -struct mi_cmd * -mi_lookup (const char *command) + gdb_assert (command != NULL); + gdb_assert (command->name != NULL); + + std::string name (command->name); + + if (mi_cmd_table.find (name) != mi_cmd_table.end ()) + return false; + + mi_cmd_table[name] = std::move (command); + + return true; +} + +/* Create an mi_cmd structure with name NAME. */ + +static mi_cmd_up +create_mi_cmd (const char *name) { - return *lookup_table (command); + mi_cmd_up cmd (new mi_cmd ()); + + cmd->name = name; + + return cmd; } -/* Used for collecting hash hit/miss statistics. */ +/* Create and register a new MI command with a pure MI implementation. */ -struct mi_cmd_stats +static void +add_mi_cmd_mi (const char *name, mi_cmd_argv_ftype function, + int *suppress_notification = NULL) { - int hit; - int miss; - int rehash; -}; -struct mi_cmd_stats stats; + mi_cmd_up cmd_up = create_mi_cmd (name); -/* Look up a command. */ + cmd_up->cli.cmd = NULL; + cmd_up->cli.args_p = 0; + cmd_up->argv_func = function; + cmd_up->suppress_notification = suppress_notification; -static struct mi_cmd ** -lookup_table (const char *command) + bool success = insert_mi_cmd_entry (std::move (cmd_up)); + gdb_assert (success); +} + +/* Create and register a new MI command implemented on top of a CLI command. */ + +static void +add_mi_cmd_cli (const char *name, const char *cli_name, int args_p, + int *suppress_notification = NULL) { - const char *chp; - unsigned int index = 0; - - /* Compute our hash. */ - for (chp = command; *chp; chp++) - { - /* We use a somewhat arbitrary formula. */ - index = ((index << 6) + (unsigned int) *chp) % MI_TABLE_SIZE; - } - - while (1) - { - struct mi_cmd **entry = &mi_table[index]; - if ((*entry) == 0) - { - /* not found, return pointer to next free. */ - stats.miss++; - return entry; - } - if (strcmp (command, (*entry)->name) == 0) - { - stats.hit++; - return entry; /* found */ - } - index = (index + 1) % MI_TABLE_SIZE; - stats.rehash++; - } + mi_cmd_up cmd_up = create_mi_cmd (name); + + cmd_up->cli.cmd = cli_name; + cmd_up->cli.args_p = args_p; + cmd_up->argv_func = NULL; + cmd_up->suppress_notification = suppress_notification; + + bool success = insert_mi_cmd_entry (std::move (cmd_up)); + gdb_assert (success); } static void -build_table (struct mi_cmd *commands) +build_table () +{ + add_mi_cmd_mi ("ada-task-info", mi_cmd_ada_task_info); + add_mi_cmd_mi ("add-inferior", mi_cmd_add_inferior); + add_mi_cmd_cli ("break-after", "ignore", 1, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-condition","cond", 1, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("break-commands", mi_cmd_break_commands, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-delete", "delete breakpoint", 1, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-disable", "disable breakpoint", 1, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-enable", "enable breakpoint", 1, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-info", "info break", 1); + add_mi_cmd_mi ("break-insert", mi_cmd_break_insert, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("dprintf-insert", mi_cmd_dprintf_insert, + &mi_suppress_notification.breakpoint); + add_mi_cmd_cli ("break-list", "info break", 0); + add_mi_cmd_mi ("break-passcount", mi_cmd_break_passcount, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("break-watch", mi_cmd_break_watch, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("catch-assert", mi_cmd_catch_assert, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("catch-exception", mi_cmd_catch_exception, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("catch-handlers", mi_cmd_catch_handlers, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("catch-load", mi_cmd_catch_load, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("catch-unload", mi_cmd_catch_unload, + &mi_suppress_notification.breakpoint); + add_mi_cmd_mi ("data-disassemble", mi_cmd_disassemble); + add_mi_cmd_mi ("data-evaluate-expression", mi_cmd_data_evaluate_expression); + add_mi_cmd_mi ("data-list-changed-registers", + mi_cmd_data_list_changed_registers); + add_mi_cmd_mi ("data-list-register-names", mi_cmd_data_list_register_names); + add_mi_cmd_mi ("data-list-register-values", + mi_cmd_data_list_register_values); + add_mi_cmd_mi ("data-read-memory", mi_cmd_data_read_memory); + add_mi_cmd_mi ("data-read-memory-bytes", mi_cmd_data_read_memory_bytes); + add_mi_cmd_mi ("data-write-memory", mi_cmd_data_write_memory, + &mi_suppress_notification.memory); + add_mi_cmd_mi ("data-write-memory-bytes", mi_cmd_data_write_memory_bytes, + &mi_suppress_notification.memory); + add_mi_cmd_mi ("data-write-register-values", + mi_cmd_data_write_register_values); + add_mi_cmd_mi ("enable-timings", mi_cmd_enable_timings); + add_mi_cmd_mi ("enable-pretty-printing", mi_cmd_enable_pretty_printing); + add_mi_cmd_mi ("enable-frame-filters", mi_cmd_enable_frame_filters); + add_mi_cmd_mi ("environment-cd", mi_cmd_env_cd); + add_mi_cmd_mi ("environment-directory", mi_cmd_env_dir); + add_mi_cmd_mi ("environment-path", mi_cmd_env_path); + add_mi_cmd_mi ("environment-pwd", mi_cmd_env_pwd); + add_mi_cmd_cli ("exec-arguments", "set args", 1, + &mi_suppress_notification.cmd_param_changed); + add_mi_cmd_mi ("exec-continue", mi_cmd_exec_continue); + add_mi_cmd_mi ("exec-finish", mi_cmd_exec_finish); + add_mi_cmd_mi ("exec-jump", mi_cmd_exec_jump); + add_mi_cmd_mi ("exec-interrupt", mi_cmd_exec_interrupt); + add_mi_cmd_mi ("exec-next", mi_cmd_exec_next); + add_mi_cmd_mi ("exec-next-instruction", mi_cmd_exec_next_instruction); + add_mi_cmd_mi ("exec-return", mi_cmd_exec_return); + add_mi_cmd_mi ("exec-run", mi_cmd_exec_run); + add_mi_cmd_mi ("exec-step", mi_cmd_exec_step); + add_mi_cmd_mi ("exec-step-instruction", mi_cmd_exec_step_instruction); + add_mi_cmd_cli ("exec-until", "until", 1); + add_mi_cmd_cli ("file-exec-and-symbols", "file", 1); + add_mi_cmd_cli ("file-exec-file", "exec-file", 1); + add_mi_cmd_mi ("file-list-exec-source-file", + mi_cmd_file_list_exec_source_file); + add_mi_cmd_mi ("file-list-exec-source-files", + mi_cmd_file_list_exec_source_files); + add_mi_cmd_mi ("file-list-shared-libraries", + mi_cmd_file_list_shared_libraries), + add_mi_cmd_cli ("file-symbol-file", "symbol-file", 1); + add_mi_cmd_mi ("fix-multi-location-breakpoint-output", + mi_cmd_fix_multi_location_breakpoint_output), + add_mi_cmd_mi ("gdb-exit", mi_cmd_gdb_exit); + add_mi_cmd_cli ("gdb-set", "set", 1, + &mi_suppress_notification.cmd_param_changed); + add_mi_cmd_cli ("gdb-show", "show", 1); + add_mi_cmd_cli ("gdb-version", "show version", 0); + add_mi_cmd_mi ("inferior-tty-set", mi_cmd_inferior_tty_set); + add_mi_cmd_mi ("inferior-tty-show", mi_cmd_inferior_tty_show); + add_mi_cmd_mi ("info-ada-exceptions", mi_cmd_info_ada_exceptions); + add_mi_cmd_mi ("info-gdb-mi-command", mi_cmd_info_gdb_mi_command); + add_mi_cmd_mi ("info-os", mi_cmd_info_os); + add_mi_cmd_mi ("interpreter-exec", mi_cmd_interpreter_exec); + add_mi_cmd_mi ("list-features", mi_cmd_list_features); + add_mi_cmd_mi ("list-target-features", mi_cmd_list_target_features); + add_mi_cmd_mi ("list-thread-groups", mi_cmd_list_thread_groups); + add_mi_cmd_mi ("remove-inferior", mi_cmd_remove_inferior); + add_mi_cmd_mi ("stack-info-depth", mi_cmd_stack_info_depth); + add_mi_cmd_mi ("stack-info-frame", mi_cmd_stack_info_frame); + add_mi_cmd_mi ("stack-list-arguments", mi_cmd_stack_list_args); + add_mi_cmd_mi ("stack-list-frames", mi_cmd_stack_list_frames); + add_mi_cmd_mi ("stack-list-locals", mi_cmd_stack_list_locals); + add_mi_cmd_mi ("stack-list-variables", mi_cmd_stack_list_variables); + add_mi_cmd_mi ("stack-select-frame", mi_cmd_stack_select_frame, + &mi_suppress_notification.user_selected_context); + add_mi_cmd_mi ("symbol-list-lines", mi_cmd_symbol_list_lines); + add_mi_cmd_cli ("target-attach", "attach", 1); + add_mi_cmd_mi ("target-detach", mi_cmd_target_detach); + add_mi_cmd_cli ("target-disconnect", "disconnect", 0); + add_mi_cmd_cli ("target-download", "load", 1); + add_mi_cmd_mi ("target-file-delete", mi_cmd_target_file_delete); + add_mi_cmd_mi ("target-file-get", mi_cmd_target_file_get); + add_mi_cmd_mi ("target-file-put", mi_cmd_target_file_put); + add_mi_cmd_mi ("target-flash-erase", mi_cmd_target_flash_erase); + add_mi_cmd_cli ("target-select", "target", 1); + add_mi_cmd_mi ("thread-info", mi_cmd_thread_info); + add_mi_cmd_mi ("thread-list-ids", mi_cmd_thread_list_ids); + add_mi_cmd_mi ("thread-select", mi_cmd_thread_select, + &mi_suppress_notification.user_selected_context); + add_mi_cmd_mi ("trace-define-variable", mi_cmd_trace_define_variable); + add_mi_cmd_mi ("trace-find", mi_cmd_trace_find, + &mi_suppress_notification.traceframe); + add_mi_cmd_mi ("trace-frame-collected", mi_cmd_trace_frame_collected); + add_mi_cmd_mi ("trace-list-variables", mi_cmd_trace_list_variables); + add_mi_cmd_mi ("trace-save", mi_cmd_trace_save); + add_mi_cmd_mi ("trace-start", mi_cmd_trace_start); + add_mi_cmd_mi ("trace-status", mi_cmd_trace_status); + add_mi_cmd_mi ("trace-stop", mi_cmd_trace_stop); + add_mi_cmd_mi ("var-assign", mi_cmd_var_assign); + add_mi_cmd_mi ("var-create", mi_cmd_var_create); + add_mi_cmd_mi ("var-delete", mi_cmd_var_delete); + add_mi_cmd_mi ("var-evaluate-expression", mi_cmd_var_evaluate_expression); + add_mi_cmd_mi ("var-info-path-expression", mi_cmd_var_info_path_expression); + add_mi_cmd_mi ("var-info-expression", mi_cmd_var_info_expression); + add_mi_cmd_mi ("var-info-num-children", mi_cmd_var_info_num_children); + add_mi_cmd_mi ("var-info-type", mi_cmd_var_info_type); + add_mi_cmd_mi ("var-list-children", mi_cmd_var_list_children); + add_mi_cmd_mi ("var-set-format", mi_cmd_var_set_format); + add_mi_cmd_mi ("var-set-frozen", mi_cmd_var_set_frozen); + add_mi_cmd_mi ("var-set-update-range", mi_cmd_var_set_update_range); + add_mi_cmd_mi ("var-set-visualizer", mi_cmd_var_set_visualizer); + add_mi_cmd_mi ("var-show-attributes", mi_cmd_var_show_attributes); + add_mi_cmd_mi ("var-show-format", mi_cmd_var_show_format); + add_mi_cmd_mi ("var-update", mi_cmd_var_update); +} + +/* See mi-cmds.h. */ + +struct mi_cmd * +mi_cmd_lookup (const char *command) { - int nr_rehash = 0; - int nr_entries = 0; - struct mi_cmd *command; - - mi_table = XCNEWVEC (struct mi_cmd *, MI_TABLE_SIZE); - for (command = commands; command->name != 0; command++) - { - struct mi_cmd **entry = lookup_table (command->name); - - if (*entry) - internal_error (__FILE__, __LINE__, - _("command `%s' appears to be duplicated"), - command->name); - *entry = command; - /* FIXME lose these prints */ - if (0) - { - fprintf_unfiltered (gdb_stdlog, "%-30s %2d\n", - command->name, stats.rehash - nr_rehash); - } - nr_entries++; - nr_rehash = stats.rehash; - } - if (0) - { - fprintf_filtered (gdb_stdlog, "Average %3.1f\n", - (double) nr_rehash / (double) nr_entries); - } + gdb_assert (command != NULL); + + auto it = mi_cmd_table.find (command); + + if (it == mi_cmd_table.end ()) + return NULL; + + return it->second.get (); } void _initialize_mi_cmds (void) { - build_table (mi_cmds); - memset (&stats, 0, sizeof (stats)); + build_table (); } diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index 7b22ce7813..97e1be819f 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -153,9 +153,11 @@ struct mi_cmd int *suppress_notification; }; +typedef std::unique_ptr mi_cmd_up; + /* Lookup a command in the MI command table. */ -extern struct mi_cmd *mi_lookup (const char *command); +extern struct mi_cmd *mi_cmd_lookup (const char *command); /* Debug flag */ extern int mi_debug_p; diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index cc6a4419d0..6c8d922d66 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -272,7 +272,7 @@ mi_parse (const char *cmd, char **token) } /* Find the command in the MI table. */ - parse->cmd = mi_lookup (parse->command); + parse->cmd = mi_cmd_lookup (parse->command); if (parse->cmd == NULL) throw_error (UNDEFINED_COMMAND_ERROR, _("Undefined MI command: %s"), parse->command); -- 2.20.1