Rename gdb exception types
This renames the gdb exception types. The old types were only needed due to the macros in common-exception.h that are now gone. The intermediate layer of gdb_exception_RETURN_MASK_ALL did not seem needed, so this patch removes it entirely. gdb/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * common/common-exceptions.h (gdb_exception_RETURN_MASK_ALL): Remove. (gdb_exception_error): Rename from gdb_exception_RETURN_MASK_ERROR. (gdb_exception_quit): Rename from gdb_exception_RETURN_MASK_QUIT. (gdb_quit_bad_alloc): Update. * aarch64-tdep.c: Update. * ada-lang.c: Update. * ada-typeprint.c: Update. * ada-valprint.c: Update. * amd64-tdep.c: Update. * arch-utils.c: Update. * break-catch-throw.c: Update. * breakpoint.c: Update. * btrace.c: Update. * c-varobj.c: Update. * cli/cli-cmds.c: Update. * cli/cli-interp.c: Update. * cli/cli-script.c: Update. * common/common-exceptions.c: Update. * common/new-op.c: Update. * common/selftest.c: Update. * compile/compile-c-symbols.c: Update. * compile/compile-cplus-symbols.c: Update. * compile/compile-object-load.c: Update. * compile/compile-object-run.c: Update. * completer.c: Update. * corelow.c: Update. * cp-abi.c: Update. * cp-support.c: Update. * cp-valprint.c: Update. * darwin-nat.c: Update. * disasm-selftests.c: Update. * dtrace-probe.c: Update. * dwarf-index-cache.c: Update. * dwarf-index-write.c: Update. * dwarf2-frame-tailcall.c: Update. * dwarf2-frame.c: Update. * dwarf2loc.c: Update. * dwarf2read.c: Update. * eval.c: Update. * event-loop.c: Update. * event-top.c: Update. * exec.c: Update. * f-valprint.c: Update. * fbsd-tdep.c: Update. * frame-unwind.c: Update. * frame.c: Update. * gdbtypes.c: Update. * gnu-v3-abi.c: Update. * guile/guile-internal.h: Update. * guile/scm-block.c: Update. * guile/scm-breakpoint.c: Update. * guile/scm-cmd.c: Update. * guile/scm-disasm.c: Update. * guile/scm-frame.c: Update. * guile/scm-lazy-string.c: Update. * guile/scm-math.c: Update. * guile/scm-param.c: Update. * guile/scm-ports.c: Update. * guile/scm-pretty-print.c: Update. * guile/scm-symbol.c: Update. * guile/scm-symtab.c: Update. * guile/scm-type.c: Update. * guile/scm-value.c: Update. * i386-linux-tdep.c: Update. * i386-tdep.c: Update. * inf-loop.c: Update. * infcall.c: Update. * infcmd.c: Update. * infrun.c: Update. * jit.c: Update. * language.c: Update. * linespec.c: Update. * linux-fork.c: Update. * linux-nat.c: Update. * linux-tdep.c: Update. * linux-thread-db.c: Update. * main.c: Update. * mi/mi-cmd-break.c: Update. * mi/mi-cmd-stack.c: Update. * mi/mi-interp.c: Update. * mi/mi-main.c: Update. * objc-lang.c: Update. * p-valprint.c: Update. * parse.c: Update. * ppc-linux-tdep.c: Update. * printcmd.c: Update. * python/py-arch.c: Update. * python/py-breakpoint.c: Update. * python/py-cmd.c: Update. * python/py-finishbreakpoint.c: Update. * python/py-frame.c: Update. * python/py-framefilter.c: Update. * python/py-gdb-readline.c: Update. * python/py-inferior.c: Update. * python/py-infthread.c: Update. * python/py-lazy-string.c: Update. * python/py-linetable.c: Update. * python/py-objfile.c: Update. * python/py-param.c: Update. * python/py-prettyprint.c: Update. * python/py-progspace.c: Update. * python/py-record-btrace.c: Update. * python/py-record.c: Update. * python/py-symbol.c: Update. * python/py-type.c: Update. * python/py-unwind.c: Update. * python/py-utils.c: Update. * python/py-value.c: Update. * python/python.c: Update. * record-btrace.c: Update. * record-full.c: Update. * remote-fileio.c: Update. * remote.c: Update. * riscv-tdep.c: Update. * rs6000-aix-tdep.c: Update. * rs6000-tdep.c: Update. * rust-exp.y: Update. * rust-lang.c: Update. * s390-tdep.c: Update. * selftest-arch.c: Update. * solib-dsbt.c: Update. * solib-frv.c: Update. * solib-spu.c: Update. * solib-svr4.c: Update. * solib.c: Update. * sparc64-linux-tdep.c: Update. * stack.c: Update. * symfile-mem.c: Update. * symmisc.c: Update. * target.c: Update. * thread.c: Update. * top.c: Update. * tracefile-tfile.c: Update. * tui/tui.c: Update. * typeprint.c: Update. * unittests/cli-utils-selftests.c: Update. * unittests/parse-connection-spec-selftests.c: Update. * valops.c: Update. * valprint.c: Update. * value.c: Update. * varobj.c: Update. * windows-nat.c: Update. * x86-linux-nat.c: Update. * xml-support.c: Update. gdb/gdbserver/ChangeLog 2019-04-08 Tom Tromey <tom@tromey.com> * gdbreplay.c: Update. * linux-low.c: Update. * server.c: Update.
This commit is contained in:
parent
a70b814420
commit
230d2906b9
146 changed files with 606 additions and 459 deletions
|
@ -224,7 +224,7 @@ valpy_dereference (PyObject *self, PyObject *args)
|
|||
res_val = value_ind (((value_object *) self)->value);
|
||||
result = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -267,7 +267,7 @@ valpy_referenced_value (PyObject *self, PyObject *args)
|
|||
|
||||
result = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -290,7 +290,7 @@ valpy_reference_value (PyObject *self, PyObject *args, enum type_code refcode)
|
|||
self_val = ((value_object *) self)->value;
|
||||
result = value_to_value_object (value_ref (self_val, refcode));
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -326,7 +326,7 @@ valpy_const_value (PyObject *self, PyObject *args)
|
|||
res_val = make_cv_value (1, 0, self_val);
|
||||
result = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -350,7 +350,7 @@ valpy_get_address (PyObject *self, void *closure)
|
|||
res_val = value_addr (val_obj->value);
|
||||
val_obj->address = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
val_obj->address = Py_None;
|
||||
Py_INCREF (Py_None);
|
||||
|
@ -428,7 +428,7 @@ valpy_get_dynamic_type (PyObject *self, void *closure)
|
|||
type = NULL;
|
||||
}
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -534,7 +534,7 @@ valpy_lazy_string (PyObject *self, PyObject *args, PyObject *kw)
|
|||
str_obj = gdbpy_create_lazy_string_object (addr, length, user_encoding,
|
||||
type);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -569,7 +569,7 @@ valpy_string (PyObject *self, PyObject *args, PyObject *kw)
|
|||
{
|
||||
LA_GET_STRING (value, &buffer, &length, &char_type, &la_encoding);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -730,7 +730,7 @@ valpy_format_string (PyObject *self, PyObject *args, PyObject *kw)
|
|||
common_val_print (((value_object *) self)->value, &stb, 0,
|
||||
&opts, python_language);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -775,7 +775,7 @@ valpy_do_cast (PyObject *self, PyObject *args, enum exp_opcode op)
|
|||
|
||||
result = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -853,7 +853,7 @@ value_has_field (struct value *v, PyObject *field)
|
|||
else
|
||||
has_field = 0;
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_SET_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1031,7 +1031,7 @@ valpy_getitem (PyObject *self, PyObject *key)
|
|||
if (res_val)
|
||||
result = value_to_value_object (res_val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &ex)
|
||||
catch (const gdb_exception &ex)
|
||||
{
|
||||
except = ex;
|
||||
}
|
||||
|
@ -1064,7 +1064,7 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords)
|
|||
{
|
||||
ftype = check_typedef (value_type (function));
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1111,7 +1111,7 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords)
|
|||
gdb::make_array_view (vargs, args_count));
|
||||
result = value_to_value_object (return_value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1136,7 +1136,7 @@ valpy_str (PyObject *self)
|
|||
common_val_print (((value_object *) self)->value, &stb, 0,
|
||||
&opts, python_language);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1155,7 +1155,7 @@ valpy_get_is_optimized_out (PyObject *self, void *closure)
|
|||
{
|
||||
opt = value_optimized_out (value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1177,7 +1177,7 @@ valpy_get_is_lazy (PyObject *self, void *closure)
|
|||
{
|
||||
opt = value_lazy (value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1199,7 +1199,7 @@ valpy_fetch_lazy (PyObject *self, PyObject *args)
|
|||
if (value_lazy (value))
|
||||
value_fetch_lazy (value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1370,7 +1370,7 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
|
|||
{
|
||||
result = valpy_binop_throw (opcode, self, other);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1438,7 +1438,7 @@ valpy_negative (PyObject *self)
|
|||
val = value_neg (((value_object *) self)->value);
|
||||
result = value_to_value_object (val);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1465,7 +1465,7 @@ valpy_absolute (PyObject *self)
|
|||
if (value_less (value, value_zero (value_type (value), not_lval)))
|
||||
isabs = 0;
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1498,7 +1498,7 @@ valpy_nonzero (PyObject *self)
|
|||
/* All other values are True. */
|
||||
nonzero = 1;
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &ex)
|
||||
catch (const gdb_exception &ex)
|
||||
{
|
||||
except = ex;
|
||||
}
|
||||
|
@ -1521,7 +1521,7 @@ valpy_invert (PyObject *self)
|
|||
{
|
||||
val = value_complement (((value_object *) self)->value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1648,7 +1648,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
|
|||
{
|
||||
result = valpy_richcompare_throw (self, other, op);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1686,7 +1686,7 @@ valpy_int (PyObject *self)
|
|||
|
||||
l = value_as_long (value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1722,7 +1722,7 @@ valpy_long (PyObject *self)
|
|||
|
||||
l = value_as_long (value);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1757,7 +1757,7 @@ valpy_float (PyObject *self)
|
|||
else
|
||||
error (_("Cannot convert value to float."));
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1900,7 +1900,7 @@ convert_value_from_python (PyObject *obj)
|
|||
PyString_AsString (PyObject_Str (obj)));
|
||||
#endif
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
gdbpy_convert_exception (except);
|
||||
return NULL;
|
||||
|
@ -1923,7 +1923,7 @@ gdbpy_history (PyObject *self, PyObject *args)
|
|||
{
|
||||
res_val = access_value_history (i);
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1952,7 +1952,7 @@ gdbpy_convenience_variable (PyObject *self, PyObject *args)
|
|||
res_val = NULL;
|
||||
}
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
@ -1998,7 +1998,7 @@ gdbpy_set_convenience_variable (PyObject *self, PyObject *args)
|
|||
set_internalvar (var, value);
|
||||
}
|
||||
}
|
||||
catch (const gdb_exception_RETURN_MASK_ALL &except)
|
||||
catch (const gdb_exception &except)
|
||||
{
|
||||
GDB_PY_HANDLE_EXCEPTION (except);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue