From 230d2906b9d1d009b22fd526181bf43e1084ed59 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 3 Apr 2019 15:59:07 -0600 Subject: 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 * 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 * gdbreplay.c: Update. * linux-low.c: Update. * server.c: Update. --- gdb/python/py-frame.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'gdb/python/py-frame.c') diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 9066f60..0327321 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -99,7 +99,7 @@ frapy_is_valid (PyObject *self, PyObject *args) { frame = frame_object_to_frame_info (self); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -127,7 +127,7 @@ frapy_name (PyObject *self, PyObject *args) name = find_frame_funname (frame, &lang, NULL); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -161,7 +161,7 @@ frapy_type (PyObject *self, PyObject *args) type = get_frame_type (frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -182,7 +182,7 @@ frapy_arch (PyObject *self, PyObject *args) { FRAPY_REQUIRE_VALID (self, frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -203,7 +203,7 @@ frapy_unwind_stop_reason (PyObject *self, PyObject *args) { FRAPY_REQUIRE_VALID (self, frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -228,7 +228,7 @@ frapy_pc (PyObject *self, PyObject *args) pc = get_frame_pc (frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -264,7 +264,7 @@ frapy_read_register (PyObject *self, PyObject *args) if (val == NULL) PyErr_SetString (PyExc_ValueError, _("Unknown register.")); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -286,7 +286,7 @@ frapy_block (PyObject *self, PyObject *args) FRAPY_REQUIRE_VALID (self, frame); block = get_frame_block (frame, NULL); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -331,7 +331,7 @@ frapy_function (PyObject *self, PyObject *args) gdb::unique_xmalloc_ptr funname = find_frame_funname (frame, &funlang, &sym); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -373,7 +373,7 @@ frame_info_to_frame_object (struct frame_info *frame) } frame_obj->gdbarch = get_frame_arch (frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { gdbpy_convert_exception (except); return NULL; @@ -398,7 +398,7 @@ frapy_older (PyObject *self, PyObject *args) prev = get_prev_frame (frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -430,7 +430,7 @@ frapy_newer (PyObject *self, PyObject *args) next = get_next_frame (frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -462,7 +462,7 @@ frapy_find_sal (PyObject *self, PyObject *args) symtab_and_line sal = find_frame_sal (frame); sal_obj = symtab_and_line_to_sal_object (sal); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -521,7 +521,7 @@ frapy_read_var (PyObject *self, PyObject *args) var = lookup_sym.symbol; block = lookup_sym.block; } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { gdbpy_convert_exception (except); return NULL; @@ -548,7 +548,7 @@ frapy_read_var (PyObject *self, PyObject *args) val = read_var_value (var, block, frame); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -569,7 +569,7 @@ frapy_select (PyObject *self, PyObject *args) select_frame (fi); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -589,7 +589,7 @@ gdbpy_newest_frame (PyObject *self, PyObject *args) { frame = get_current_frame (); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } @@ -609,7 +609,7 @@ gdbpy_selected_frame (PyObject *self, PyObject *args) { frame = get_selected_frame ("No frame is currently selected."); } - catch (const gdb_exception_RETURN_MASK_ALL &except) + catch (const gdb_exception &except) { GDB_PY_HANDLE_EXCEPTION (except); } -- cgit v1.1