mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 12:03:41 +08:00
d6f9b0fbc7
- The interp->data field disappears, since we can put data in the interpreter directly now. The "init" method remains in place, but it now returns void. - A few places check if the interpreter method is NULL before calling it, and also check whether the method returns true/false. For some of those methods, all current implementations always return true. In those cases, this commit makes the C++-fied method return void instead and cleans up the callers. Tested on x86_64 Fedora 23. gdb/ChangeLog: 2017-02-03 Pedro Alves <palves@redhat.com> * cli/cli-interp.c (cli_interp_base::cli_interp_base) (cli_interp_base::~cli_interp_base): New. (cli_interp): New struct. (as_cli_interp): Cast the interp itself to cli_interp. (cli_interpreter_pre_command_loop): Rename to ... (cli_interp_base::pre_command_loop): ... this. Remove 'self' parameter. (cli_interpreter_init): Rename to ... (cli_interp::init): ... this. Remove 'self' parameter. Use boolean. Make extern. (cli_interpreter_resume): Rename to ... (cli_interp::resume): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_suspend): Rename to ... (cli_interp::suspend): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_exec): Rename to ... (cli_interp::exec): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_supports_command_editing): Rename to ... (cli_interp_base::supports_command_editing): ... this. Remove 'interp' parameter. Make extern. (cli_ui_out): Rename to ... (cli_interp::interp_ui_out): ... this. Remove 'interp' parameter. Make extern. (cli_set_logging): Rename to ... (cli_interp_base::set_logging): ... this. Remove 'interp' parameter. Make extern. (cli_interp_procs): Delete. (cli_interp_factory): Adjust to use "new". * cli/cli-interp.h: Include "interps.h". (struct cli_interp_base): New struct. * interps.c (struct interp): Delete. Fields moved to interps.h. (interp_new): Delete. (interp::interp, interp::~interp): New. (interp_set): Use bool, and return void. Assume the interpreter has suspend, init and resume methods, and that the all return void. (set_top_level_interpreter): interp_set returns void. (interp_ui_out): Adapt. (current_interp_set_logging): Adapt. (interp_data): Delete. (interp_pre_command_loop, interp_supports_command_editing): Adapt. (interp_exec): Adapt. (top_level_interpreter_data): Delete. * interps.h (interp_init_ftype, interp_resume_ftype) (interp_suspend_ftype, interp_exec_ftype) (interp_pre_command_loop_ftype, interp_ui_out_ftype): Delete. (class interp): New. (interp_new): Delete. (interp_set): Now returns void. Use bool. (interp_data, top_level_interpreter_data): Delete. * mi/mi-common.h: Include interps.h. (class mi_interp): Inherit from interp. Define a ctor. Declare init, resume, suspect, exec, interp_ui_out, set_logging and pre_command_loop methods. * mi/mi-interp.c (as_mi_interp): Cast the interp itself. (mi_interpreter_init): Rename to ... (mi_interp::init): ... this. Remove the 'interp' parameter, use bool, return void and make extern. Adjust. (mi_interpreter_resume): ... Rename to ... (mi_interp::resume): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (mi_interpreter_suspend): ... Rename to ... (mi_interp::suspend): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (mi_interpreter_exec): ... Rename to ... (mi_interp::exec): ... this. Remove the 'data' parameter and make extern. Adjust. (mi_interpreter_pre_command_loop): ... Rename to ... (mi_interp::pre_command_loop): ... this. Remove the 'self' parameter and make extern. (mi_on_normal_stop_1): Adjust. (mi_ui_out): Rename to ... (mi_interp::interp_ui_out): ... this. Remove the 'interp' parameter and make extern. Adjust. (mi_set_logging): Rename to ... (mi_interp::set_logging): ... this. Remove the 'interp' parameter and make extern. Adjust. (mi_interp_procs): Delete. (mi_interp_factory): Adjust to use 'new'. * mi/mi-main.c (mi_cmd_gdb_exit, captured_mi_execute_command) (mi_print_exception, mi_execute_command, mi_load_progress): Adjust. * tui/tui-interp.c (tui_interp): New class. (as_tui_interp): Return a tui_interp pointer. (tui_on_normal_stop, tui_on_signal_received) (tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited) (tui_on_no_history, tui_on_user_selected_context_changed): Adjust to use interp::interp_ui_out. (tui_init): Rename to ... (tui_interp::init): ... this. Remove the 'self' parameter, use bool, return void and make extern. Adjust. (tui_resume): Rename to ... (tui_interp::resume): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (tui_suspend): Rename to ... (tui_interp::suspend): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (tui_ui_out): Rename to ... (tui_interp::interp_ui_out): ... this. Remove the 'self' parameter, and make extern. Adjust. (tui_exec): Rename to ... (tui_interp::exec): ... this. Remove the 'data' parameter and make extern. (tui_interp_procs): Delete. (tui_interp_factory): Use "new".
94 lines
2.6 KiB
C++
94 lines
2.6 KiB
C++
/* Interface for common GDB/MI data
|
|
Copyright (C) 2005-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef MI_COMMON_H
|
|
#define MI_COMMON_H
|
|
|
|
#include "interps.h"
|
|
|
|
struct mi_console_file;
|
|
|
|
/* Represents the reason why GDB is sending an asynchronous command to
|
|
the front end. NOTE: When modifing this, don't forget to update
|
|
gdb.texinfo! */
|
|
enum async_reply_reason
|
|
{
|
|
EXEC_ASYNC_BREAKPOINT_HIT = 0,
|
|
EXEC_ASYNC_WATCHPOINT_TRIGGER,
|
|
EXEC_ASYNC_READ_WATCHPOINT_TRIGGER,
|
|
EXEC_ASYNC_ACCESS_WATCHPOINT_TRIGGER,
|
|
EXEC_ASYNC_FUNCTION_FINISHED,
|
|
EXEC_ASYNC_LOCATION_REACHED,
|
|
EXEC_ASYNC_WATCHPOINT_SCOPE,
|
|
EXEC_ASYNC_END_STEPPING_RANGE,
|
|
EXEC_ASYNC_EXITED_SIGNALLED,
|
|
EXEC_ASYNC_EXITED,
|
|
EXEC_ASYNC_EXITED_NORMALLY,
|
|
EXEC_ASYNC_SIGNAL_RECEIVED,
|
|
EXEC_ASYNC_SOLIB_EVENT,
|
|
EXEC_ASYNC_FORK,
|
|
EXEC_ASYNC_VFORK,
|
|
EXEC_ASYNC_SYSCALL_ENTRY,
|
|
EXEC_ASYNC_SYSCALL_RETURN,
|
|
EXEC_ASYNC_EXEC,
|
|
/* This is here only to represent the number of enums. */
|
|
EXEC_ASYNC_LAST
|
|
};
|
|
|
|
const char *async_reason_lookup (enum async_reply_reason reason);
|
|
|
|
/* An MI interpreter. */
|
|
|
|
class mi_interp final : public interp
|
|
{
|
|
public:
|
|
mi_interp (const char *name)
|
|
: interp (name)
|
|
{}
|
|
|
|
void init (bool top_level) override;
|
|
void resume () override;
|
|
void suspend () override;
|
|
gdb_exception exec (const char *command_str) override;
|
|
ui_out *interp_ui_out () override;
|
|
void set_logging (ui_file_up logfile, bool logging_redirect) override;
|
|
void pre_command_loop () override;
|
|
|
|
/* MI's output channels */
|
|
mi_console_file *out;
|
|
mi_console_file *err;
|
|
mi_console_file *log;
|
|
mi_console_file *targ;
|
|
mi_console_file *event_channel;
|
|
|
|
/* Raw console output. */
|
|
struct ui_file *raw_stdout;
|
|
|
|
/* Save the original value of raw_stdout here when logging, so we
|
|
can restore correctly when done. */
|
|
struct ui_file *saved_raw_stdout;
|
|
|
|
/* MI's builder. */
|
|
struct ui_out *mi_uiout;
|
|
|
|
/* MI's CLI builder (wraps OUT). */
|
|
struct ui_out *cli_uiout;
|
|
};
|
|
|
|
#endif
|