binutils-gdb/gdb/interps.c
Pedro Alves d6f9b0fbc7 C++-fy struct interp/cli_interp/tui_interp/mi_interp
- 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".
2017-02-03 16:30:04 +00:00

569 lines
15 KiB
C

/* Manages interpreters for GDB, the GNU debugger.
Copyright (C) 2000-2017 Free Software Foundation, Inc.
Written by Jim Ingham <jingham@apple.com> of Apple Computer, 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/>. */
/* This is just a first cut at separating out the "interpreter"
functions of gdb into self-contained modules. There are a couple
of open areas that need to be sorted out:
1) The interpreter explicitly contains a UI_OUT, and can insert itself
into the event loop, but it doesn't explicitly contain hooks for readline.
I did this because it seems to me many interpreters won't want to use
the readline command interface, and it is probably simpler to just let
them take over the input in their resume proc. */
#include "defs.h"
#include "gdbcmd.h"
#include "ui-out.h"
#include "event-loop.h"
#include "event-top.h"
#include "interps.h"
#include "completer.h"
#include "top.h" /* For command_loop. */
#include "continuations.h"
/* Each UI has its own independent set of interpreters. */
struct ui_interp_info
{
/* Each top level has its own independent set of interpreters. */
struct interp *interp_list;
struct interp *current_interpreter;
struct interp *top_level_interpreter;
/* The interpreter that is active while `interp_exec' is active, NULL
at all other times. */
struct interp *command_interpreter;
};
/* Get UI's ui_interp_info object. Never returns NULL. */
static struct ui_interp_info *
get_interp_info (struct ui *ui)
{
if (ui->interp_info == NULL)
ui->interp_info = XCNEW (struct ui_interp_info);
return ui->interp_info;
}
/* Get the current UI's ui_interp_info object. Never returns
NULL. */
static struct ui_interp_info *
get_current_interp_info (void)
{
return get_interp_info (current_ui);
}
/* The magic initialization routine for this module. */
void _initialize_interpreter (void);
static struct interp *interp_lookup_existing (struct ui *ui,
const char *name);
interp::interp (const char *name)
{
this->name = xstrdup (name);
this->quiet_p = false;
this->inited = false;
}
interp::~interp ()
{}
/* An interpreter factory. Maps an interpreter name to the factory
function that instantiates an interpreter by that name. */
struct interp_factory
{
/* This is the name in "-i=INTERP" and "interpreter-exec INTERP". */
const char *name;
/* The function that creates the interpreter. */
interp_factory_func func;
};
typedef struct interp_factory *interp_factory_p;
DEF_VEC_P(interp_factory_p);
/* The registered interpreter factories. */
static VEC(interp_factory_p) *interpreter_factories = NULL;
/* See interps.h. */
void
interp_factory_register (const char *name, interp_factory_func func)
{
struct interp_factory *f;
int ix;
/* Assert that no factory for NAME is already registered. */
for (ix = 0;
VEC_iterate (interp_factory_p, interpreter_factories, ix, f);
++ix)
if (strcmp (f->name, name) == 0)
{
internal_error (__FILE__, __LINE__,
_("interpreter factory already registered: \"%s\"\n"),
name);
}
f = XNEW (struct interp_factory);
f->name = name;
f->func = func;
VEC_safe_push (interp_factory_p, interpreter_factories, f);
}
/* Add interpreter INTERP to the gdb interpreter list. The
interpreter must not have previously been added. */
void
interp_add (struct ui *ui, struct interp *interp)
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
gdb_assert (interp_lookup_existing (ui, interp->name) == NULL);
interp->next = ui_interp->interp_list;
ui_interp->interp_list = interp;
}
/* This sets the current interpreter to be INTERP. If INTERP has not
been initialized, then this will also run the init method.
The TOP_LEVEL parameter tells if this new interpreter is
the top-level one. The top-level is what is requested
on the command line, and is responsible for reporting general
notification about target state changes. For example, if
MI is the top-level interpreter, then it will always report
events such as target stops and new thread creation, even if they
are caused by CLI commands. */
void
interp_set (struct interp *interp, bool top_level)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *old_interp = ui_interp->current_interpreter;
int first_time = 0;
char buffer[64];
/* If we already have an interpreter, then trying to
set top level interpreter is kinda pointless. */
gdb_assert (!top_level || !ui_interp->current_interpreter);
gdb_assert (!top_level || !ui_interp->top_level_interpreter);
if (old_interp != NULL)
{
current_uiout->flush ();
old_interp->suspend ();
}
else
{
first_time = 1;
}
ui_interp->current_interpreter = interp;
if (top_level)
ui_interp->top_level_interpreter = interp;
/* We use interpreter_p for the "set interpreter" variable, so we need
to make sure we have a malloc'ed copy for the set command to free. */
if (interpreter_p != NULL
&& strcmp (interp->name, interpreter_p) != 0)
{
xfree (interpreter_p);
interpreter_p = xstrdup (interp->name);
}
/* Run the init proc. */
if (!interp->inited)
{
interp->init (top_level);
interp->inited = true;
}
/* Do this only after the interpreter is initialized. */
current_uiout = interp->interp_ui_out ();
/* Clear out any installed interpreter hooks/event handlers. */
clear_interpreter_hooks ();
interp->resume ();
if (!first_time && !interp_quiet_p (interp))
{
xsnprintf (buffer, sizeof (buffer),
"Switching to interpreter \"%.24s\".\n", interp->name);
current_uiout->text (buffer);
}
}
/* Look up the interpreter for NAME. If no such interpreter exists,
return NULL, otherwise return a pointer to the interpreter. */
static struct interp *
interp_lookup_existing (struct ui *ui, const char *name)
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
struct interp *interp;
for (interp = ui_interp->interp_list;
interp != NULL;
interp = interp->next)
{
if (strcmp (interp->name, name) == 0)
return interp;
}
return NULL;
}
/* See interps.h. */
struct interp *
interp_lookup (struct ui *ui, const char *name)
{
struct interp_factory *factory;
struct interp *interp;
int ix;
if (name == NULL || strlen (name) == 0)
return NULL;
/* Only create each interpreter once per top level. */
interp = interp_lookup_existing (ui, name);
if (interp != NULL)
return interp;
for (ix = 0;
VEC_iterate (interp_factory_p, interpreter_factories, ix, factory);
++ix)
if (strcmp (factory->name, name) == 0)
{
interp = factory->func (name);
interp_add (ui, interp);
return interp;
}
return NULL;
}
/* See interps.h. */
void
set_top_level_interpreter (const char *name)
{
/* Find it. */
struct interp *interp = interp_lookup (current_ui, name);
if (interp == NULL)
error (_("Interpreter `%s' unrecognized"), name);
/* Install it. */
interp_set (interp, true);
}
/* Returns the current interpreter. */
struct ui_out *
interp_ui_out (struct interp *interp)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
if (interp == NULL)
interp = ui_interp->current_interpreter;
return interp->interp_ui_out ();
}
void
current_interp_set_logging (ui_file_up logfile,
bool logging_redirect)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
return interp->set_logging (std::move (logfile), logging_redirect);
}
/* Temporarily overrides the current interpreter. */
struct interp *
interp_set_temp (const char *name)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = interp_lookup (current_ui, name);
struct interp *old_interp = ui_interp->current_interpreter;
if (interp)
ui_interp->current_interpreter = interp;
return old_interp;
}
/* Returns the interpreter's name. */
const char *
interp_name (struct interp *interp)
{
return interp->name;
}
/* Returns true if the current interp is the passed in name. */
int
current_interp_named_p (const char *interp_name)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
if (interp != NULL)
return (strcmp (interp->name, interp_name) == 0);
return 0;
}
/* The interpreter that was active when a command was executed.
Normally that'd always be CURRENT_INTERPRETER, except that MI's
-interpreter-exec command doesn't actually flip the current
interpreter when running its sub-command. The
`command_interpreter' global tracks when interp_exec is called
(IOW, when -interpreter-exec is called). If that is set, it is
INTERP in '-interpreter-exec INTERP "CMD"' or in 'interpreter-exec
INTERP "CMD". Otherwise, interp_exec isn't active, and so the
interpreter running the command is the current interpreter. */
struct interp *
command_interp (void)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
if (ui_interp->command_interpreter != NULL)
return ui_interp->command_interpreter;
else
return ui_interp->current_interpreter;
}
/* See interps.h. */
void
interp_pre_command_loop (struct interp *interp)
{
gdb_assert (interp != NULL);
interp->pre_command_loop ();
}
/* See interp.h */
int
interp_supports_command_editing (struct interp *interp)
{
return interp->supports_command_editing ();
}
int
interp_quiet_p (struct interp *interp)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
if (interp != NULL)
return interp->quiet_p;
else
return ui_interp->current_interpreter->quiet_p;
}
static int
interp_set_quiet (struct interp *interp, int quiet)
{
int old_val = interp->quiet_p;
interp->quiet_p = quiet;
return old_val;
}
/* interp_exec - This executes COMMAND_STR in the current
interpreter. */
struct gdb_exception
interp_exec (struct interp *interp, const char *command_str)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct gdb_exception ex;
struct interp *save_command_interp;
/* See `command_interp' for why we do this. */
save_command_interp = ui_interp->command_interpreter;
ui_interp->command_interpreter = interp;
ex = interp->exec (command_str);
ui_interp->command_interpreter = save_command_interp;
return ex;
}
/* A convenience routine that nulls out all the common command hooks.
Use it when removing your interpreter in its suspend proc. */
void
clear_interpreter_hooks (void)
{
deprecated_print_frame_info_listing_hook = 0;
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
deprecated_warning_hook = 0;
deprecated_interactive_hook = 0;
deprecated_readline_begin_hook = 0;
deprecated_readline_hook = 0;
deprecated_readline_end_hook = 0;
deprecated_context_hook = 0;
deprecated_target_wait_hook = 0;
deprecated_call_command_hook = 0;
deprecated_error_begin_hook = 0;
}
static void
interpreter_exec_cmd (char *args, int from_tty)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *old_interp, *interp_to_use;
char **prules = NULL;
char **trule = NULL;
unsigned int nrules;
unsigned int i;
int old_quiet, use_quiet;
struct cleanup *cleanup;
if (args == NULL)
error_no_arg (_("interpreter-exec command"));
prules = gdb_buildargv (args);
cleanup = make_cleanup_freeargv (prules);
nrules = 0;
for (trule = prules; *trule != NULL; trule++)
nrules++;
if (nrules < 2)
error (_("usage: interpreter-exec <interpreter> [ <command> ... ]"));
old_interp = ui_interp->current_interpreter;
interp_to_use = interp_lookup (current_ui, prules[0]);
if (interp_to_use == NULL)
error (_("Could not find interpreter \"%s\"."), prules[0]);
/* Temporarily set interpreters quiet. */
old_quiet = interp_set_quiet (old_interp, 1);
use_quiet = interp_set_quiet (interp_to_use, 1);
interp_set (interp_to_use, false);
for (i = 1; i < nrules; i++)
{
struct gdb_exception e = interp_exec (interp_to_use, prules[i]);
if (e.reason < 0)
{
interp_set (old_interp, 0);
interp_set_quiet (interp_to_use, use_quiet);
interp_set_quiet (old_interp, old_quiet);
error (_("error in command: \"%s\"."), prules[i]);
}
}
interp_set (old_interp, 0);
interp_set_quiet (interp_to_use, use_quiet);
interp_set_quiet (old_interp, old_quiet);
do_cleanups (cleanup);
}
/* See interps.h. */
VEC (char_ptr) *
interpreter_completer (struct cmd_list_element *ignore,
const char *text, const char *word)
{
struct interp_factory *interp;
int textlen;
VEC (char_ptr) *matches = NULL;
int ix;
textlen = strlen (text);
for (ix = 0;
VEC_iterate (interp_factory_p, interpreter_factories, ix, interp);
++ix)
{
if (strncmp (interp->name, text, textlen) == 0)
{
char *match;
match = (char *) xmalloc (strlen (word) + strlen (interp->name) + 1);
if (word == text)
strcpy (match, interp->name);
else if (word > text)
{
/* Return some portion of interp->name. */
strcpy (match, interp->name + (word - text));
}
else
{
/* Return some of text plus interp->name. */
strncpy (match, word, text - word);
match[text - word] = '\0';
strcat (match, interp->name);
}
VEC_safe_push (char_ptr, matches, match);
}
}
return matches;
}
struct interp *
top_level_interpreter (void)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
return ui_interp->top_level_interpreter;
}
/* See interps.h. */
struct interp *
current_interpreter (void)
{
struct ui_interp_info *ui_interp = get_interp_info (current_ui);
return ui_interp->current_interpreter;
}
/* This just adds the "interpreter-exec" command. */
void
_initialize_interpreter (void)
{
struct cmd_list_element *c;
c = add_cmd ("interpreter-exec", class_support,
interpreter_exec_cmd, _("\
Execute a command in an interpreter. It takes two arguments:\n\
The first argument is the name of the interpreter to use.\n\
The second argument is the command to execute.\n"), &cmdlist);
set_cmd_completer (c, interpreter_completer);
}