FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename gdb exception types

Browse source 
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:
Tom Tromey 2019-04-03 15:59:07 -06:00
parent a70b814420
commit 230d2906b9
146 changed files with 606 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gdb/python/py-arch.c
View file

@ -203,7 +203,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw)
{
insn_len = gdb_print_insn (gdbarch, pc, &stb, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
return NULL;

16
gdb/python/py-breakpoint.c
View file

@ -145,7 +145,7 @@ bppy_set_enabled (PyObject *self, PyObject *newvalue, void *closure)
else
disable_breakpoint (self_bp->bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_SET_HANDLE_EXCEPTION (except);
}
@ -250,7 +250,7 @@ bppy_set_task (PyObject *self, PyObject *newvalue, void *closure)
{
valid_id = valid_task_id (id);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_SET_HANDLE_EXCEPTION (except);
}
@ -292,7 +292,7 @@ bppy_delete_breakpoint (PyObject *self, PyObject *args)
{
delete_breakpoint (self_bp->bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -333,7 +333,7 @@ bppy_set_ignore_count (PyObject *self, PyObject *newvalue, void *closure)
{
set_ignore_count (self_bp->number, (int) value, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_SET_HANDLE_EXCEPTION (except);
}
@ -469,7 +469,7 @@ bppy_set_condition (PyObject *self, PyObject *newvalue, void *closure)
{
set_breakpoint_condition (self_bp->bp, exp, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -498,7 +498,7 @@ bppy_get_commands (PyObject *self, void *closure)
{
print_command_lines (current_uiout, breakpoint_commands (bp), 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
current_uiout->redirect (NULL);
gdbpy_convert_exception (except);
@ -540,7 +540,7 @@ bppy_set_commands (PyObject *self, PyObject *newvalue, void *closure)
counted_command_line lines = read_command_lines_1 (reader, 1, nullptr);
breakpoint_set_commands (self_bp->bp, std::move (lines));
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -864,7 +864,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs)
error(_("Do not understand breakpoint type to set."));
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
bppy_pending_object = NULL;
gdbpy_convert_exception (except);

2
gdb/python/py-cmd.c
View file

@ -572,7 +572,7 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kw)
set_cmd_completer_handle_brkchars (cmd,
cmdpy_completer_handle_brkchars);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
xfree (cmd_name);
xfree (docstring);

12
gdb/python/py-finishbreakpoint.c
View file

@ -121,7 +121,7 @@ bpfinishpy_pre_stop_hook (struct gdbpy_breakpoint_object *bp_obj)
self_finishbp->return_value = Py_None;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
gdbpy_print_stack ();
@ -141,7 +141,7 @@ bpfinishpy_post_stop_hook (struct gdbpy_breakpoint_object *bp_obj)
disable_breakpoint (bp_obj->bp);
gdb_assert (bp_obj->bp->disposition == disp_del);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
gdbpy_print_stack ();
@ -208,7 +208,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs)
}
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
return -1;
@ -267,7 +267,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs)
}
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
/* Just swallow. Either the return type or the function value
remain NULL. */
@ -302,7 +302,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs)
&bkpt_breakpoint_ops,
0, 1, internal_bp, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_SET_HANDLE_EXCEPTION (except);
}
@ -364,7 +364,7 @@ bpfinishpy_detect_out_scope_cb (struct breakpoint *b, void *args)
|| frame_find_by_id (b->frame_id) == NULL))
bpfinishpy_out_of_scope (finish_bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
gdbpy_print_stack ();

36
gdb/python/py-frame.c
View file

@ -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<char> 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);
}

4
gdb/python/py-framefilter.c
View file

@ -1085,7 +1085,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
{
gdbarch = get_frame_arch (frame);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
/* Let gdb try to print the stack trace. */
return EXT_LANG_BT_NO_FILTERS;
@ -1170,7 +1170,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
success = py_print_frame (item.get (), flags, args_type, out, 0,
levels_printed.get ());
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
gdbpy_convert_exception (except);
success = EXT_LANG_BT_ERROR;

2
gdb/python/py-gdb-readline.c
View file

@ -44,7 +44,7 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
p = command_line_input (prompt, "python");
}
/* Handle errors by raising Python exceptions. */
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
/* Detect user interrupt (Ctrl-C). */
if (except.reason == RETURN_QUIT)

10
gdb/python/py-inferior.c
View file

@ -393,7 +393,7 @@ infpy_threads (PyObject *self, PyObject *args)
{
update_thread_list ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -513,7 +513,7 @@ infpy_read_memory (PyObject *self, PyObject *args, PyObject *kw)
read_memory (addr, buffer.get (), length);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -574,7 +574,7 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw)
{
write_memory_with_notification (addr, buffer, length);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -728,7 +728,7 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw)
buffer, pattern_size,
&found_addr);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -787,7 +787,7 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw)
if (thread_info != NULL)
return thread_to_thread_object (thread_info).release ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

2
gdb/python/py-infthread.c
View file

@ -185,7 +185,7 @@ thpy_switch (PyObject *self, PyObject *args)
{
switch_to_thread (thread_obj->thread);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

2
gdb/python/py-lazy-string.c
View file

@ -142,7 +142,7 @@ stpy_convert_to_value (PyObject *self, PyObject *args)
break;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

2
gdb/python/py-linetable.c
View file

@ -168,7 +168,7 @@ ltpy_get_pcs_for_line (PyObject *self, PyObject *args)
{
pcs = find_pcs_for_symtab_line (symtab, py_line, &best_entry);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

4
gdb/python/py-objfile.c
View file

@ -134,7 +134,7 @@ objfpy_get_build_id (PyObject *self, void *closure)
{
build_id = build_id_bfd_get (objfile->obfd);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -426,7 +426,7 @@ objfpy_add_separate_debug_file (PyObject *self, PyObject *args, PyObject *kw)
symbol_file_add_separate (abfd.get (), file_name, 0, obj->objfile);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

2
gdb/python/py-param.c
View file

@ -733,7 +733,7 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds)
set_doc.get (), show_doc.get (),
doc.get (), set_list, show_list);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
xfree (cmd_name);
Py_DECREF (self);

4
gdb/python/py-prettyprint.c
View file

@ -212,7 +212,7 @@ pretty_print_one_value (PyObject *printer, struct value **out_value)
}
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
@ -640,7 +640,7 @@ gdbpy_get_varobj_pretty_printer (struct value *value)
{
value = value_copy (value);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

4
gdb/python/py-progspace.c
View file

@ -391,7 +391,7 @@ pspy_block_for_pc (PyObject *o, PyObject *args)
if (cust != NULL && COMPUNIT_OBJFILE (cust) != NULL)
block = block_for_pc (pc);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -436,7 +436,7 @@ pspy_find_pc_line (PyObject *o, PyObject *args)
sal = find_pc_line (pc, 0);
result = 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);
}

8
gdb/python/py-record-btrace.c
View file

@ -212,7 +212,7 @@ recpy_bt_insn_sal (PyObject *self, void *closure)
{
result = symtab_and_line_to_sal_object (find_pc_line (insn->pc, 0));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -283,7 +283,7 @@ recpy_bt_insn_data (PyObject *self, void *closure)
buffer.resize (insn->size);
read_memory (insn->pc, buffer.data (), insn->size);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -318,7 +318,7 @@ recpy_bt_insn_decoded (PyObject *self, void *closure)
{
gdb_print_insn (target_gdbarch (), insn->pc, &strfile, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
return NULL;
@ -795,7 +795,7 @@ recpy_bt_goto (PyObject *self, PyObject *args)
else
target_goto_record (obj->number);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

4
gdb/python/py-record.c
View file

@ -607,7 +607,7 @@ gdbpy_start_recording (PyObject *self, PyObject *args)
record_start (method, format, 0);
ret = gdbpy_current_recording (self, args);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
}
@ -641,7 +641,7 @@ gdbpy_stop_recording (PyObject *self, PyObject *args)
{
record_stop (0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

10
gdb/python/py-symbol.c
View file

@ -200,7 +200,7 @@ sympy_needs_frame (PyObject *self, void *closure)
{
result = symbol_read_needs_frame (symbol);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -283,7 +283,7 @@ sympy_value (PyObject *self, PyObject *args)
can happen with nested functions). */
value = read_var_value (symbol, NULL, frame_info);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -391,7 +391,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw)
selected_frame = get_selected_frame (_("No frame selected."));
block = get_frame_block (selected_frame, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -402,7 +402,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw)
symbol = lookup_symbol (name, block, (domain_enum) domain,
&is_a_field_of_this).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -451,7 +451,7 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw)
{
symbol = lookup_global_symbol (name, NULL, (domain_enum) domain).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

36
gdb/python/py-type.c
View file

@ -316,7 +316,7 @@ typy_fields_items (PyObject *self, enum gdbpy_iter_kind kind)
{
checked_type = check_typedef (checked_type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -423,7 +423,7 @@ typy_strip_typedefs (PyObject *self, PyObject *args)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -444,7 +444,7 @@ typy_get_composite (struct type *type)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -513,7 +513,7 @@ typy_array_1 (PyObject *self, PyObject *args, int is_vector)
if (is_vector)
make_vector_type (array);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -547,7 +547,7 @@ typy_pointer (PyObject *self, PyObject *args)
{
type = lookup_pointer_type (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -615,7 +615,7 @@ typy_reference (PyObject *self, PyObject *args)
{
type = lookup_lvalue_reference_type (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -649,7 +649,7 @@ typy_const (PyObject *self, PyObject *args)
{
type = make_cv_type (1, 0, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -667,7 +667,7 @@ typy_volatile (PyObject *self, PyObject *args)
{
type = make_cv_type (0, 1, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -685,7 +685,7 @@ typy_unqualified (PyObject *self, PyObject *args)
{
type = make_cv_type (0, 0, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -703,7 +703,7 @@ typy_get_sizeof (PyObject *self, void *closure)
{
check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
@ -723,7 +723,7 @@ typy_get_alignof (PyObject *self, void *closure)
{
align = type_align (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
align = 0;
}
@ -750,7 +750,7 @@ typy_lookup_typename (const char *type_name, const struct block *block)
type = lookup_typename (python_language, python_gdbarch,
type_name, block, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -804,7 +804,7 @@ typy_lookup_type (struct demangle_component *demangled,
break;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -846,7 +846,7 @@ typy_legacy_template_argument (struct type *type, const struct block *block,
/* Note -- this is not thread-safe. */
info = cp_demangled_name_to_comp (TYPE_NAME (type), &err);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -926,7 +926,7 @@ typy_template_argument (PyObject *self, PyObject *args)
if (TYPE_IS_REFERENCE (type))
type = check_typedef (TYPE_TARGET_TYPE (type));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -958,7 +958,7 @@ typy_template_argument (PyObject *self, PyObject *args)
{
val = value_of_variable (sym, block);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -976,7 +976,7 @@ typy_str (PyObject *self)
LA_PRINT_TYPE (type_object_to_type (self), "", &thetype, -1, 0,
&type_print_raw_options);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -1010,7 +1010,7 @@ typy_richcompare (PyObject *self, PyObject *other, int op)
{
result = types_deeply_equal (type1, type2);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
/* If there is a GDB exception, a comparison is not capable
(or trusted), so exit. */

8
gdb/python/py-unwind.c
View file

@ -150,7 +150,7 @@ pyuw_value_obj_to_pointer (PyObject *pyo_value, CORE_ADDR *addr)
rc = 1;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
gdbpy_convert_exception (except);
}
@ -215,7 +215,7 @@ unwind_infopy_str (PyObject *self)
value_print (value, &stb, &opts);
stb.puts (")");
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -349,7 +349,7 @@ pending_framepy_str (PyObject *self)
sp_str = core_addr_to_string_nz (get_frame_sp (frame));
pc_str = core_addr_to_string_nz (get_frame_pc (frame));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -395,7 +395,7 @@ pending_framepy_read_register (PyObject *self, PyObject *args)
"Cannot read register %d from frame.",
regnum);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}

2
gdb/python/py-utils.c
View file

@ -258,7 +258,7 @@ get_addr_from_python (PyObject *obj, CORE_ADDR *addr)
{
*addr = value_as_address (value_object_to_value (obj));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_SET_HANDLE_EXCEPTION (except);
}

62
gdb/python/py-value.c
View file

@ -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);
}

14
gdb/python/python.c
View file

@ -501,7 +501,7 @@ gdbpy_parameter (PyObject *self, PyObject *args)
{
found = lookup_cmd_composition (newarg.c_str (), &alias, &prefix, &cmd);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
GDB_PY_HANDLE_EXCEPTION (ex);
}
@ -614,7 +614,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
/* Do any commands attached to breakpoint we stopped at. */
bpstat_do_actions ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -842,7 +842,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
sals = def_sal;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* We know this will always throw. */
gdbpy_convert_exception (ex);
@ -900,7 +900,7 @@ gdbpy_parse_and_eval (PyObject *self, PyObject *args)
gdbpy_allow_threads allow_threads;
result = parse_and_eval (expr_str);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -1150,7 +1150,7 @@ gdbpy_write (PyObject *self, PyObject *args, PyObject *kw)
fprintf_filtered (gdb_stdout, "%s", arg);
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDB_PY_HANDLE_EXCEPTION (except);
}
@ -1223,7 +1223,7 @@ gdbpy_print_stack (void)
{
begin_line ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
}
@ -1254,7 +1254,7 @@ gdbpy_print_stack (void)
fprintf_filtered (gdb_stderr, "Python Exception %s %s: \n",
type.get (), msg.get ());
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
}