/* Manages interpreters for GDB, the GNU debugger.
- Copyright (C) 2000, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 2003, 2007, 2008, 2009, 2010, 2011
+ Free Software Foundation, Inc.
Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
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/>. */
+ 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
#include "interps.h"
#include "completer.h"
#include "gdb_string.h"
-#include "gdb-events.h"
#include "gdb_assert.h"
#include "top.h" /* For command_loop. */
#include "exceptions.h"
struct interp
{
- /* This is the name in "-i=" and set interpreter. */
+ /* This is the name in "-i=" and set interpreter. */
const char *name;
/* Interpreters are stored in a linked list, this is the next
object is a bit confused. */
void *data;
- /* Has the init_proc been run? */
+ /* Has the init_proc been run? */
int inited;
/* This is the ui_out used to collect results for this interpreter.
int quiet_p;
};
-/* Functions local to this file. */
+/* Functions local to this file. */
static void initialize_interps (void);
-static char **interpreter_completer (char *text, char *word);
+static char **interpreter_completer (struct cmd_list_element *cmd,
+ char *text, char *word);
-/* The magic initialization routine for this module. */
+/* The magic initialization routine for this module. */
void _initialize_interpreter (void);
static struct interp *interp_list = NULL;
static struct interp *current_interpreter = NULL;
-static struct interp *top_level_interpreter = NULL;
+static struct interp *top_level_interpreter_ptr = NULL;
static int interpreter_initialized = 0;
/* interp_new - This allocates space for a new interpreter,
fills the fields from the inputs, and returns a pointer to the
- interpreter. */
+ interpreter. */
struct interp *
interp_new (const char *name, void *data, struct ui_out *uiout,
const struct interp_procs *procs)
init proc is successful, return 1, if it fails, set the old
interpreter back in place and return 0. If we can't restore the
old interpreter, then raise an internal error, since we are in
- pretty bad shape at this point.
+ pretty bad shape at this point.
The TOP_LEVEL parameter tells if this new interpreter is
the top-level one. The top-level is what is requested
/* If we already have an interpreter, then trying to
set top level interpreter is kinda pointless. */
gdb_assert (!top_level || !current_interpreter);
- gdb_assert (!top_level || !top_level_interpreter);
+ gdb_assert (!top_level || !top_level_interpreter_ptr);
if (current_interpreter != NULL)
{
current_interpreter = interp;
if (top_level)
- top_level_interpreter = interp;
+ top_level_interpreter_ptr = 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. */
+ to make sure we have a malloc'ed copy for the set command to free. */
if (interpreter_p != NULL
&& strcmp (current_interpreter->name, interpreter_p) != 0)
{
uiout = interp->interpreter_out;
- /* Run the init proc. If it fails, try to restore the old interp. */
+ /* Run the init proc. If it fails, try to restore the old interp. */
if (!interp->inited)
{
/* Finally, put up the new prompt to show that we are indeed here.
Also, display_gdb_prompt for the console does some readline magic
- which is needed for the console interpreter, at least... */
+ which is needed for the console interpreter, at least... */
if (!first_time)
{
return NULL;
}
-/* Returns the current interpreter. */
+/* Returns the current interpreter. */
struct ui_out *
interp_ui_out (struct interp *interp)
return current_interpreter->interpreter_out;
}
-/* Returns true if the current interp is the passed in name. */
+/* Returns true if the current interp is the passed in name. */
int
current_interp_named_p (const char *interp_name)
{
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. */
+ interpreter. */
int
interp_exec_p (struct interp *interp)
{
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
deprecated_warning_hook = 0;
- deprecated_create_breakpoint_hook = 0;
- deprecated_delete_breakpoint_hook = 0;
- deprecated_modify_breakpoint_hook = 0;
deprecated_interactive_hook = 0;
deprecated_readline_begin_hook = 0;
deprecated_readline_hook = 0;
deprecated_readline_end_hook = 0;
deprecated_register_changed_hook = 0;
- deprecated_memory_changed_hook = 0;
deprecated_context_hook = 0;
deprecated_target_wait_hook = 0;
deprecated_call_command_hook = 0;
- deprecated_error_hook = 0;
deprecated_error_begin_hook = 0;
deprecated_command_loop_hook = 0;
- clear_gdb_event_hooks ();
}
/* This is a lazy init routine, called the first time the interpreter
initialize_interps (void)
{
interpreter_initialized = 1;
- /* Don't know if anything needs to be done here... */
+ /* Don't know if anything needs to be done here... */
}
static void
unsigned int i;
int old_quiet, use_quiet;
- prules = buildargv (args);
- if (prules == NULL)
- {
- error (_("unable to parse arguments"));
- }
+ if (args == NULL)
+ error_no_arg (_("interpreter-exec command"));
+
+ prules = gdb_buildargv (args);
+ make_cleanup_freeargv (prules);
nrules = 0;
- if (prules != NULL)
- {
- for (trule = prules; *trule != NULL; trule++)
- {
- nrules++;
- }
- }
+ for (trule = prules; *trule != NULL; trule++)
+ nrules++;
if (nrules < 2)
error (_("usage: interpreter-exec <interpreter> [ <command> ... ]"));
if (interp_to_use == NULL)
error (_("Could not find interpreter \"%s\"."), prules[0]);
- /* Temporarily set interpreters quiet */
+ /* Temporarily set interpreters quiet. */
old_quiet = interp_set_quiet (old_interp, 1);
use_quiet = interp_set_quiet (interp_to_use, 1);
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 (old_interp, old_quiet);
}
-/* List the possible interpreters which could complete the given text. */
+/* List the possible interpreters which could complete the given text. */
static char **
-interpreter_completer (char *text, char *word)
+interpreter_completer (struct cmd_list_element *ignore, char *text, char *word)
{
int alloced = 0;
int textlen;
/* We expect only a very limited number of interpreters, so just
allocate room for all of them plus one for the last that must be NULL
- to correctly end the list. */
+ to correctly end the list. */
for (interp = interp_list; interp != NULL; interp = interp->next)
++alloced;
matches = (char **) xcalloc (alloced + 1, sizeof (char *));
strcpy (matches[num_matches], interp->name);
else if (word > text)
{
- /* Return some portion of interp->name */
+ /* Return some portion of interp->name. */
strcpy (matches[num_matches], interp->name + (word - text));
}
else
{
- /* Return some of text plus interp->name */
+ /* Return some of text plus interp->name. */
strncpy (matches[num_matches], word, text - word);
matches[num_matches][text - word] = '\0';
strcat (matches[num_matches], interp->name);
return matches;
}
-extern void *
+struct interp *
+top_level_interpreter (void)
+{
+ return top_level_interpreter_ptr;
+}
+
+void *
top_level_interpreter_data (void)
{
- gdb_assert (top_level_interpreter);
- return top_level_interpreter->data;
+ gdb_assert (top_level_interpreter_ptr);
+ return top_level_interpreter_ptr->data;
}
/* This just adds the "interpreter-exec" command. */
projects / deliverable / binutils-gdb.git / blobdiff