diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/interps.c | 13 | ||||
| -rw-r--r-- | gdb/interps.h | 1 | ||||
| -rw-r--r-- | gdb/mi/mi-interp.c | 5 |
4 files changed, 10 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 47680bf..ed302dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2013-12-10 Doug Evans <dje@google.com> + + * interps.h (interp_exec_p): Delete. + * interps.c (interp_exec_p): Delete. + (interp_exec): Update. Assert interp->procs->exec_proc != NULL. + * mi/mi-interp.c (mi_cmd_interpreter_exec): Update. + 2013-12-10 Yao Qi <yao@codesourcery.com> * amd64-tdep.c (amd64_analyze_stack_align): Call diff --git a/gdb/interps.c b/gdb/interps.c index 5a0fde3..cae3659 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -347,20 +347,13 @@ interp_set_quiet (struct interp *interp, int quiet) /* interp_exec - This executes COMMAND_STR in the current interpreter. */ -int -interp_exec_p (struct interp *interp) -{ - return interp->procs->exec_proc != NULL; -} struct gdb_exception interp_exec (struct interp *interp, const char *command_str) { - if (interp->procs->exec_proc != NULL) - { - return interp->procs->exec_proc (interp->data, command_str); - } - return exception_none; + gdb_assert (interp->procs->exec_proc != NULL); + + return interp->procs->exec_proc (interp->data, command_str); } /* A convenience routine that nulls out all the common command hooks. diff --git a/gdb/interps.h b/gdb/interps.h index 58ac6b2..2e6ed4d 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -30,7 +30,6 @@ struct interp; extern int interp_resume (struct interp *interp); extern int interp_suspend (struct interp *interp); extern int interp_prompt_p (struct interp *interp); -extern int interp_exec_p (struct interp *interp); extern struct gdb_exception interp_exec (struct interp *interp, const char *command); extern int interp_quiet_p (struct interp *interp); diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index b0073c3..2ed1726 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -231,11 +231,6 @@ mi_cmd_interpreter_exec (char *command, char **argv, int argc) error (_("-interpreter-exec: could not find interpreter \"%s\""), argv[0]); - if (!interp_exec_p (interp_to_use)) - error (_("-interpreter-exec: interpreter \"%s\" " - "does not support command execution"), - argv[0]); - /* Insert the MI out hooks, making sure to also call the interpreter's hooks if it has any. */ /* KRS: We shouldn't need this... Events should be installed and |