mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
b885aea1bb
This patch implements a simplication that I suggested here: https://sourceware.org/pipermail/gdb-patches/2022-March/186320.html Currently, the interp::exec virtual method interface is such that subclass implementations must catch exceptions and then return them via normal function return. However, higher up the in chain, for the CLI we get to interpreter_exec_cmd, which does: 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); error (_("error in command: \"%s\"."), prules[i]); } } and for MI we get to mi_cmd_interpreter_exec, which has: void mi_cmd_interpreter_exec (const char *command, char **argv, int argc) { ... for (i = 1; i < argc; i++) { struct gdb_exception e = interp_exec (interp_to_use, argv[i]); if (e.reason < 0) error ("%s", e.what ()); } } Note that if those errors are reached, we lose the original exception's error code. I can't see why we'd want that. And, I can't see why we need to have interp_exec catch the exception and return it via the normal return path. That's normally needed when we need to handle propagating exceptions across C code, like across readline or ncurses, but that's not the case here. It seems to me that we can simplify things by removing some try/catch-ing and just letting exceptions propagate normally. Note, the "error in command" error shown above, which only exists in the CLI interpreter-exec command, is only ever printed AFAICS if you run "interpreter-exec console" when the top level interpreter is already the console/tui. Like: (gdb) interpreter-exec console "foobar" Undefined command: "foobar". Try "help". error in command: "foobar". You won't see it with MI's "-interpreter-exec console" from a top level MI interpreter: (gdb) -interpreter-exec console "foobar" &"Undefined command: \"foobar\". Try \"help\".\n" ^error,msg="Undefined command: \"foobar\". Try \"help\"." (gdb) nor with MI's "-interpreter-exec mi" from a top level MI interpreter: (gdb) -interpreter-exec mi "-foobar" ^error,msg="Undefined MI command: foobar",code="undefined-command" ^done (gdb) in both these cases because MI's -interpreter-exec just does: error ("%s", e.what ()); You won't see it either when running an MI command with the CLI's "interpreter-exec mi": (gdb) interpreter-exec mi "-foobar" ^error,msg="Undefined MI command: foobar",code="undefined-command" (gdb) This last case is because MI's interp::exec implementation never returns an error: gdb_exception mi_interp::exec (const char *command) { mi_execute_command_wrapper (command); return gdb_exception (); } Thus I think that "error in command" error is pretty pointless, and since it simplifies things to not have it, the patch just removes it. The patch also ends up addressing an old FIXME. Change-Id: I5a6432a80496934ac7127594c53bf5221622e393 Approved-By: Tom Tromey <tromey@adacore.com> Approved-By: Kevin Buettner <kevinb@redhat.com>
99 lines
2.2 KiB
C
99 lines
2.2 KiB
C
/* Python DAP interpreter
|
|
|
|
Copyright (C) 2022, 2023 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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "python-internal.h"
|
|
#include "interps.h"
|
|
#include "cli-out.h"
|
|
#include "top.h"
|
|
|
|
class dap_interp final : public interp
|
|
{
|
|
public:
|
|
|
|
explicit dap_interp (const char *name)
|
|
: interp (name),
|
|
m_ui_out (new cli_ui_out (gdb_stdout))
|
|
{
|
|
}
|
|
|
|
~dap_interp () override = default;
|
|
|
|
void init (bool top_level) override;
|
|
|
|
void suspend () override
|
|
{
|
|
}
|
|
|
|
void resume () override
|
|
{
|
|
}
|
|
|
|
void exec (const char *command) override
|
|
{
|
|
/* Just ignore it. */
|
|
}
|
|
|
|
void set_logging (ui_file_up logfile, bool logging_redirect,
|
|
bool debug_redirect) override
|
|
{
|
|
/* Just ignore it. */
|
|
}
|
|
|
|
ui_out *interp_ui_out () override
|
|
{
|
|
return m_ui_out.get ();
|
|
}
|
|
|
|
private:
|
|
|
|
std::unique_ptr<ui_out> m_ui_out;
|
|
};
|
|
|
|
void
|
|
dap_interp::init (bool top_level)
|
|
{
|
|
gdbpy_enter enter_py;
|
|
|
|
gdbpy_ref<> dap_module (PyImport_ImportModule ("gdb.dap"));
|
|
if (dap_module == nullptr)
|
|
gdbpy_handle_exception ();
|
|
|
|
gdbpy_ref<> func (PyObject_GetAttrString (dap_module.get (), "run"));
|
|
if (func == nullptr)
|
|
gdbpy_handle_exception ();
|
|
|
|
gdbpy_ref<> result_obj (PyObject_CallObject (func.get (), nullptr));
|
|
if (result_obj == nullptr)
|
|
gdbpy_handle_exception ();
|
|
|
|
current_ui->input_fd = -1;
|
|
current_ui->m_input_interactive_p = false;
|
|
}
|
|
|
|
void _initialize_py_interp ();
|
|
void
|
|
_initialize_py_interp ()
|
|
{
|
|
interp_factory_register ("dap", [] (const char *name) -> interp *
|
|
{
|
|
return new dap_interp (name);
|
|
});
|
|
}
|