Rewrite TRY/CATCH
This rewrites gdb's TRY/CATCH to plain C++ try/catch. The patch was largely written by script, though one change (to a comment in common-exceptions.h) was reverted by hand. gdb/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * xml-support.c: Use C++ exception handling. * x86-linux-nat.c: Use C++ exception handling. * windows-nat.c: Use C++ exception handling. * varobj.c: Use C++ exception handling. * value.c: Use C++ exception handling. * valprint.c: Use C++ exception handling. * valops.c: Use C++ exception handling. * unittests/parse-connection-spec-selftests.c: Use C++ exception handling. * unittests/cli-utils-selftests.c: Use C++ exception handling. * typeprint.c: Use C++ exception handling. * tui/tui.c: Use C++ exception handling. * tracefile-tfile.c: Use C++ exception handling. * top.c: Use C++ exception handling. * thread.c: Use C++ exception handling. * target.c: Use C++ exception handling. * symmisc.c: Use C++ exception handling. * symfile-mem.c: Use C++ exception handling. * stack.c: Use C++ exception handling. * sparc64-linux-tdep.c: Use C++ exception handling. * solib.c: Use C++ exception handling. * solib-svr4.c: Use C++ exception handling. * solib-spu.c: Use C++ exception handling. * solib-frv.c: Use C++ exception handling. * solib-dsbt.c: Use C++ exception handling. * selftest-arch.c: Use C++ exception handling. * s390-tdep.c: Use C++ exception handling. * rust-lang.c: Use C++ exception handling. * rust-exp.y: Use C++ exception handling. * rs6000-tdep.c: Use C++ exception handling. * rs6000-aix-tdep.c: Use C++ exception handling. * riscv-tdep.c: Use C++ exception handling. * remote.c: Use C++ exception handling. * remote-fileio.c: Use C++ exception handling. * record-full.c: Use C++ exception handling. * record-btrace.c: Use C++ exception handling. * python/python.c: Use C++ exception handling. * python/py-value.c: Use C++ exception handling. * python/py-utils.c: Use C++ exception handling. * python/py-unwind.c: Use C++ exception handling. * python/py-type.c: Use C++ exception handling. * python/py-symbol.c: Use C++ exception handling. * python/py-record.c: Use C++ exception handling. * python/py-record-btrace.c: Use C++ exception handling. * python/py-progspace.c: Use C++ exception handling. * python/py-prettyprint.c: Use C++ exception handling. * python/py-param.c: Use C++ exception handling. * python/py-objfile.c: Use C++ exception handling. * python/py-linetable.c: Use C++ exception handling. * python/py-lazy-string.c: Use C++ exception handling. * python/py-infthread.c: Use C++ exception handling. * python/py-inferior.c: Use C++ exception handling. * python/py-gdb-readline.c: Use C++ exception handling. * python/py-framefilter.c: Use C++ exception handling. * python/py-frame.c: Use C++ exception handling. * python/py-finishbreakpoint.c: Use C++ exception handling. * python/py-cmd.c: Use C++ exception handling. * python/py-breakpoint.c: Use C++ exception handling. * python/py-arch.c: Use C++ exception handling. * printcmd.c: Use C++ exception handling. * ppc-linux-tdep.c: Use C++ exception handling. * parse.c: Use C++ exception handling. * p-valprint.c: Use C++ exception handling. * objc-lang.c: Use C++ exception handling. * mi/mi-main.c: Use C++ exception handling. * mi/mi-interp.c: Use C++ exception handling. * mi/mi-cmd-stack.c: Use C++ exception handling. * mi/mi-cmd-break.c: Use C++ exception handling. * main.c: Use C++ exception handling. * linux-thread-db.c: Use C++ exception handling. * linux-tdep.c: Use C++ exception handling. * linux-nat.c: Use C++ exception handling. * linux-fork.c: Use C++ exception handling. * linespec.c: Use C++ exception handling. * language.c: Use C++ exception handling. * jit.c: Use C++ exception handling. * infrun.c: Use C++ exception handling. * infcmd.c: Use C++ exception handling. * infcall.c: Use C++ exception handling. * inf-loop.c: Use C++ exception handling. * i386-tdep.c: Use C++ exception handling. * i386-linux-tdep.c: Use C++ exception handling. * guile/scm-value.c: Use C++ exception handling. * guile/scm-type.c: Use C++ exception handling. * guile/scm-symtab.c: Use C++ exception handling. * guile/scm-symbol.c: Use C++ exception handling. * guile/scm-pretty-print.c: Use C++ exception handling. * guile/scm-ports.c: Use C++ exception handling. * guile/scm-param.c: Use C++ exception handling. * guile/scm-math.c: Use C++ exception handling. * guile/scm-lazy-string.c: Use C++ exception handling. * guile/scm-frame.c: Use C++ exception handling. * guile/scm-disasm.c: Use C++ exception handling. * guile/scm-cmd.c: Use C++ exception handling. * guile/scm-breakpoint.c: Use C++ exception handling. * guile/scm-block.c: Use C++ exception handling. * guile/guile-internal.h: Use C++ exception handling. * gnu-v3-abi.c: Use C++ exception handling. * gdbtypes.c: Use C++ exception handling. * frame.c: Use C++ exception handling. * frame-unwind.c: Use C++ exception handling. * fbsd-tdep.c: Use C++ exception handling. * f-valprint.c: Use C++ exception handling. * exec.c: Use C++ exception handling. * event-top.c: Use C++ exception handling. * event-loop.c: Use C++ exception handling. * eval.c: Use C++ exception handling. * dwarf2read.c: Use C++ exception handling. * dwarf2loc.c: Use C++ exception handling. * dwarf2-frame.c: Use C++ exception handling. * dwarf2-frame-tailcall.c: Use C++ exception handling. * dwarf-index-write.c: Use C++ exception handling. * dwarf-index-cache.c: Use C++ exception handling. * dtrace-probe.c: Use C++ exception handling. * disasm-selftests.c: Use C++ exception handling. * darwin-nat.c: Use C++ exception handling. * cp-valprint.c: Use C++ exception handling. * cp-support.c: Use C++ exception handling. * cp-abi.c: Use C++ exception handling. * corelow.c: Use C++ exception handling. * completer.c: Use C++ exception handling. * compile/compile-object-run.c: Use C++ exception handling. * compile/compile-object-load.c: Use C++ exception handling. * compile/compile-cplus-symbols.c: Use C++ exception handling. * compile/compile-c-symbols.c: Use C++ exception handling. * common/selftest.c: Use C++ exception handling. * common/new-op.c: Use C++ exception handling. * cli/cli-script.c: Use C++ exception handling. * cli/cli-interp.c: Use C++ exception handling. * cli/cli-cmds.c: Use C++ exception handling. * c-varobj.c: Use C++ exception handling. * btrace.c: Use C++ exception handling. * breakpoint.c: Use C++ exception handling. * break-catch-throw.c: Use C++ exception handling. * arch-utils.c: Use C++ exception handling. * amd64-tdep.c: Use C++ exception handling. * ada-valprint.c: Use C++ exception handling. * ada-typeprint.c: Use C++ exception handling. * ada-lang.c: Use C++ exception handling. * aarch64-tdep.c: Use C++ exception handling. gdb/gdbserver/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * server.c: Use C++ exception handling. * linux-low.c: Use C++ exception handling. * gdbreplay.c: Use C++ exception handling.
This commit is contained in:
Tom Tromey
parent
3d6e9d2336
commit
a70b814420
144 changed files with 1033 additions and 1326 deletions
|
|
@ -497,15 +497,14 @@ gdbpy_parameter (PyObject *self, PyObject *args)
|
|||
|
||||
std::string newarg = std::string ("show ") + arg;
|
||||
|
||||
TRY
|
||||
try
|
||||
{
|
||||
found = lookup_cmd_composition (newarg.c_str (), &alias, &prefix, &cmd);
|
||||
}
|
||||
CATCH (ex, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &ex)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (ex);
|
||||
}
|
||||
END_CATCH
|
||||
|
||||
if (!found)
|
||||
return PyErr_Format (PyExc_RuntimeError,
|
||||
|
|
@ -574,7 +573,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
|
|||
|
||||
scoped_restore preventer = prevent_dont_repeat ();
|
||||
|
||||
TRY
|
||||
try
|
||||
{
|
||||
gdbpy_allow_threads allow_threads;
|
||||
|
||||
|
|
@ -615,11 +614,10 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
|
|||
/* Do any commands attached to breakpoint we stopped at. */
|
||||
bpstat_do_actions ();
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
END_CATCH
|
||||
|
||||
if (to_string)
|
||||
return PyString_FromString (to_string_res.c_str ());
|
||||
|
|
@ -830,7 +828,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
|
|||
std::vector<symtab_and_line> decoded_sals;
|
||||
symtab_and_line def_sal;
|
||||
gdb::array_view<symtab_and_line> sals;
|
||||
TRY
|
||||
try
|
||||
{
|
||||
if (location != NULL)
|
||||
{
|
||||
|
|
@ -844,13 +842,12 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
|
|||
sals = def_sal;
|
||||
}
|
||||
}
|
||||
CATCH (ex, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &ex)
|
||||
{
|
||||
/* We know this will always throw. */
|
||||
gdbpy_convert_exception (ex);
|
||||
return NULL;
|
||||
}
|
||||
END_CATCH
|
||||
|
||||
if (!sals.empty ())
|
||||
{
|
||||
|
|
@ -898,16 +895,15 @@ gdbpy_parse_and_eval (PyObject *self, PyObject *args)
|
|||
if (!PyArg_ParseTuple (args, "s", &expr_str))
|
||||
return NULL;
|
||||
|
||||
TRY
|
||||
try
|
||||
{
|
||||
gdbpy_allow_threads allow_threads;
|
||||
result = parse_and_eval (expr_str);
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
END_CATCH
|
||||
|
||||
return value_to_value_object (result);
|
||||
}
|
||||
|
|
@ -1136,7 +1132,7 @@ gdbpy_write (PyObject *self, PyObject *args, PyObject *kw)
|
|||
&stream_type))
|
||||
return NULL;
|
||||
|
||||
TRY
|
||||
try
|
||||
{
|
||||
switch (stream_type)
|
||||
{
|
||||
|
|
@ -1154,11 +1150,10 @@ gdbpy_write (PyObject *self, PyObject *args, PyObject *kw)
|
|||
fprintf_filtered (gdb_stdout, "%s", arg);
|
||||
}
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
END_CATCH
|
||||
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
|
@ -1224,14 +1219,13 @@ gdbpy_print_stack (void)
|
|||
/* PyErr_Print doesn't necessarily end output with a newline.
|
||||
This works because Python's stdout/stderr is fed through
|
||||
printf_filtered. */
|
||||
TRY
|
||||
try
|
||||
{
|
||||
begin_line ();
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
{
|
||||
}
|
||||
END_CATCH
|
||||
}
|
||||
/* Print "message", just error print message. */
|
||||
else
|
||||
|
|
@ -1245,7 +1239,7 @@ gdbpy_print_stack (void)
|
|||
if (msg != NULL)
|
||||
type = fetched_error.type_to_string ();
|
||||
|
||||
TRY
|
||||
try
|
||||
{
|
||||
if (msg == NULL || type == NULL)
|
||||
{
|
||||
|
|
@ -1260,10 +1254,9 @@ gdbpy_print_stack (void)
|
|||
fprintf_filtered (gdb_stderr, "Python Exception %s %s: \n",
|
||||
type.get (), msg.get ());
|
||||
}
|
||||
CATCH (except, RETURN_MASK_ALL)
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
{
|
||||
}
|
||||
END_CATCH
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue