OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Tom Tromey 2019-04-03 15:59:07 -06:00
parent a70b814420
commit 230d2906b9
146 changed files with 606 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
gdb/ChangeLog
View File

@ -1,3 +1,152 @@
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.
2019-04-08 Tom Tromey <tom@tromey.com>
* xml-support.c: Use C++ exception handling.

4
gdb/aarch64-tdep.c
View File

@ -878,7 +878,7 @@ aarch64_make_prologue_cache (struct frame_info *this_frame, void **this_cache)
{
aarch64_make_prologue_cache_1 (this_frame, cache);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -1012,7 +1012,7 @@ aarch64_make_stub_cache (struct frame_info *this_frame, void **this_cache)
cache->prev_pc = get_frame_pc (this_frame);
cache->available_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);

14
gdb/ada-lang.c
View File

@ -6728,7 +6728,7 @@ ada_tag_value_at_base_address (struct value *obj)
offset_to_top = value_as_long (value_ind (value_ptradd (val, -2)));
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
return obj;
}
@ -6875,7 +6875,7 @@ ada_tag_name (struct value *tag)
if (tsd != NULL)
name = ada_tag_name_from_tsd (tsd);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
}
@ -9056,7 +9056,7 @@ ada_to_fixed_type_1 (struct type *type, const gdb_byte *valaddr,
{
xvz_found = get_int_var_value (xvz_name, size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
/* We found the variable, but somehow failed to read
its value. Rethrow the same error, but with a little
@ -12347,7 +12347,7 @@ ada_exception_message (void)
{
e_msg = ada_exception_message_1 ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
e_msg.reset (nullptr);
}
@ -12371,7 +12371,7 @@ ada_exception_name_addr (enum ada_exception_catchpoint_kind ex,
result = ada_exception_name_addr_1 (ex, b);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
warning (_("failed to get exception name: %s"), e.what ());
return 0;
@ -12462,7 +12462,7 @@ create_excep_cond_exprs (struct ada_catchpoint *c,
block_for_pc (bl->address),
0);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
warning (_("failed to reevaluate internal exception condition "
"for catchpoint %d: %s"),
@ -12533,7 +12533,7 @@ should_stop_exception (const struct bp_location *bl)
stop = value_true (evaluate_expression (ada_loc->excep_cond_expr.get ()));
value_free_to_mark (mark);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
_("Error in testing exception condition:\n"));

2
gdb/ada-typeprint.c
View File

@ -168,7 +168,7 @@ print_range (struct type *type, struct ui_file *stream,
lo = ada_discrete_type_low_bound (type);
hi = ada_discrete_type_high_bound (type);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
/* This can happen when the range is dynamic. Sometimes,
resolving dynamic property values requires us to have

2
gdb/ada-valprint.c
View File

@ -1209,7 +1209,7 @@ ada_val_print (struct type *type,
stream, recurse, val, options,
current_language);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
fprintf_filtered (stream, _("<error reading variable: %s>"),
except.what ());

6
gdb/amd64-tdep.c
View File

@ -2585,7 +2585,7 @@ amd64_frame_cache (struct frame_info *this_frame, void **this_cache)
{
amd64_frame_cache_1 (this_frame, cache);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -2712,7 +2712,7 @@ amd64_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache)
cache->base_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -2892,7 +2892,7 @@ amd64_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache)
cache->base_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);

2
gdb/arch-utils.c
View File

@ -973,7 +973,7 @@ gdbarch_skip_prologue_noexcept (gdbarch *gdbarch, CORE_ADDR pc) noexcept
{
new_pc = gdbarch_skip_prologue (gdbarch, pc);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{}
return new_pc;

6
gdb/break-catch-throw.c
View File

@ -166,7 +166,7 @@ check_status_exception_catchpoint (struct bpstats *bs)
if (!canon.empty ())
std::swap (type_name, canon);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
}
@ -194,7 +194,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
= new_probe_location (exception_functions[kind].probe);
sals = parse_probes (location.get (), filter_pspace, NULL);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
/* Using the probe interface failed. Let's fallback to the normal
catchpoint mode. */
@ -209,7 +209,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
sals = self->ops->decode_location (self, location.get (),
filter_pspace);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
/* NOT_FOUND_ERROR just means the breakpoint will be
pending, so let it through. */

28
gdb/breakpoint.c
View File

@ -2102,7 +2102,7 @@ parse_cond_to_aexpr (CORE_ADDR scope, struct expression *cond)
aexpr = gen_eval_for_expr (scope, cond);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
/* If we got here, it means the condition could not be parsed to a valid
bytecode expression and thus can't be evaluated on the target's side.
@ -2277,7 +2277,7 @@ parse_cmd_to_aexpr (CORE_ADDR scope, char *cmd)
format_start, format_end - format_start,
argvec.size (), argvec.data ());
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
/* If we got here, it means the command could not be parsed to a valid
bytecode expression and thus can't be evaluated on the target's side.
@ -2545,7 +2545,7 @@ insert_bp_location (struct bp_location *bl,
if (val)
bp_excpt = gdb_exception {RETURN_ERROR, GENERIC_ERROR};
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
bp_excpt = e;
}
@ -2584,7 +2584,7 @@ insert_bp_location (struct bp_location *bl,
bp_excpt
= gdb_exception {RETURN_ERROR, GENERIC_ERROR};
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
bp_excpt = e;
}
@ -2608,7 +2608,7 @@ insert_bp_location (struct bp_location *bl,
if (val)
bp_excpt = gdb_exception {RETURN_ERROR, GENERIC_ERROR};
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
bp_excpt = e;
}
@ -5016,7 +5016,7 @@ bpstat_check_watchpoint (bpstat bs)
{
e = watchpoint_check (bs);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error evaluating expression "
@ -5253,7 +5253,7 @@ bpstat_check_breakpoint_conditions (bpstat bs, thread_info *thread)
{
condition_result = breakpoint_cond_eval (cond);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error in testing breakpoint condition:\n");
@ -9243,7 +9243,7 @@ create_breakpoint (struct gdbarch *gdbarch,
{
ops->create_sals_from_location (location, &canonical, type_wanted);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
/* If caller is interested in rc value from parse, set
value. */
@ -12056,7 +12056,7 @@ update_global_location_list_nothrow (enum ugll_insert_mode insert_mode)
{
update_global_location_list (insert_mode);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
}
}
@ -13526,7 +13526,7 @@ update_breakpoint_locations (struct breakpoint *b,
block_for_pc (sal.pc),
0);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
warning (_("failed to reevaluate condition "
"for breakpoint %d: %s"),
@ -13603,7 +13603,7 @@ location_to_sals (struct breakpoint *b, struct event_location *location,
{
sals = b->ops->decode_location (b, location, search_pspace);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
int not_found_and_ok = 0;
@ -13813,7 +13813,7 @@ breakpoint_re_set (void)
{
breakpoint_re_set_one (b);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error in re-setting breakpoint %d: ",
@ -14293,7 +14293,7 @@ enable_breakpoint_disp (struct breakpoint *bpt, enum bpdisp disposition,
bpt->enable_state = bp_enabled;
update_watchpoint (w, 1 /* reparse */);
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
bpt->enable_state = orig_enable_state;
exception_fprintf (gdb_stderr, e, _("Cannot enable watchpoint %d: "),
@ -15031,7 +15031,7 @@ save_breakpoints (const char *filename, int from_tty,
{
print_command_lines (current_uiout, tp->commands.get (), 2);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
current_uiout->redirect (NULL);
throw_exception (ex);

14
gdb/btrace.c
View File

@ -687,7 +687,7 @@ ftrace_classify_insn (struct gdbarch *gdbarch, CORE_ADDR pc)
else if (gdbarch_insn_is_jump (gdbarch, pc))
iclass = BTRACE_INSN_JUMP;
}
catch (const gdb_exception_RETURN_MASK_ERROR &error)
catch (const gdb_exception_error &error)
{
}
@ -1106,7 +1106,7 @@ btrace_compute_ftrace_bts (struct thread_info *tp,
{
size = gdb_insn_length (gdbarch, pc);
}
catch (const gdb_exception_RETURN_MASK_ERROR &error)
catch (const gdb_exception_error &error)
{
}
@ -1374,7 +1374,7 @@ btrace_pt_readmem_callback (gdb_byte *buffer, size_t size,
if (errcode != 0)
result = -pte_nomap;
}
catch (const gdb_exception_RETURN_MASK_ERROR &error)
catch (const gdb_exception_error &error)
{
result = -pte_nomap;
}
@ -1476,7 +1476,7 @@ btrace_compute_ftrace_pt (struct thread_info *tp,
ftrace_add_pt (btinfo, decoder, &level, gaps);
}
catch (const gdb_exception_RETURN_MASK_ALL &error)
catch (const gdb_exception &error)
{
/* Indicate a gap in the trace if we quit trace processing. */
if (error.reason == RETURN_QUIT && !btinfo->functions.empty ())
@ -1556,7 +1556,7 @@ btrace_compute_ftrace (struct thread_info *tp, struct btrace_data *btrace,
{
btrace_compute_ftrace_1 (tp, btrace, cpu, gaps);
}
catch (const gdb_exception_RETURN_MASK_ALL &error)
catch (const gdb_exception &error)
{
btrace_finalize_ftrace (tp, gaps);
@ -1627,7 +1627,7 @@ btrace_enable (struct thread_info *tp, const struct btrace_config *conf)
&& can_access_registers_thread (tp))
btrace_add_pc (tp);
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
btrace_disable (tp);
@ -3060,7 +3060,7 @@ btrace_maint_update_pt_packets (struct btrace_thread_info *btinfo)
{
btrace_maint_decode_pt (&btinfo->maint, decoder);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
pt_pkt_free_decoder (decoder);

8
gdb/c-varobj.c
View File

@ -97,7 +97,7 @@ adjust_value_for_child_access (struct value **value,
*value = value_ind (*value);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
*value = NULL;
}
@ -259,7 +259,7 @@ value_struct_element_index (struct value *value, int type_index)
else
result = value_primitive_field (value, 0, type_index, type);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
return NULL;
}
@ -318,7 +318,7 @@ c_describe_child (const struct varobj *parent, int index,
{
*cvalue = value_subscript (value, real_index);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
}
}
@ -395,7 +395,7 @@ c_describe_child (const struct varobj *parent, int index,
*cvalue = value_ind (value);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
*cvalue = NULL;
}

2
gdb/cli/cli-cmds.c
View File

@ -267,7 +267,7 @@ complete_command (const char *arg, int from_tty)
tracker = &tracker_handle_completions;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
return;
}

2
gdb/cli/cli-interp.c
View File

@ -367,7 +367,7 @@ safe_execute_command (struct ui_out *command_uiout, const char *command,
{
execute_command (command, from_tty);
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
e = exception;
}

4
gdb/cli/cli-script.c
View File

@ -1054,7 +1054,7 @@ process_next_line (const char *p, struct command_line **command,
{
validator ((*command)->line);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
free_command_lines (command);
throw_exception (ex);
@ -1543,7 +1543,7 @@ script_from_file (FILE *stream, const char *file)
{
read_command_file (stream);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
/* Re-throw the error, but with the file name information
prepended. */

4
gdb/common/common-exceptions.c
View File

@ -195,12 +195,12 @@ throw_exception_cxx (struct gdb_exception exception)
{
if (exception.reason == RETURN_QUIT)
{
gdb_exception_RETURN_MASK_QUIT ex (exception);
gdb_exception_quit ex (exception);
throw ex;
}
else if (exception.reason == RETURN_ERROR)
{
gdb_exception_RETURN_MASK_ERROR ex (exception);
gdb_exception_error ex (exception);
throw ex;
}
else

22
gdb/common/common-exceptions.h
View File

@ -253,26 +253,18 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN;
around gdb_exception that add nothing but type info. Which is used
is selected depending on the MASK argument passed to CATCH. */
struct gdb_exception_RETURN_MASK_ALL : public gdb_exception
struct gdb_exception_error : public gdb_exception
{
explicit gdb_exception_RETURN_MASK_ALL (const gdb_exception &ex) noexcept
explicit gdb_exception_error (const gdb_exception &ex) noexcept
: gdb_exception (ex)
{
}
};
struct gdb_exception_RETURN_MASK_ERROR : public gdb_exception_RETURN_MASK_ALL
struct gdb_exception_quit : public gdb_exception
{
explicit gdb_exception_RETURN_MASK_ERROR (const gdb_exception &ex) noexcept
: gdb_exception_RETURN_MASK_ALL (ex)
{
}
};
struct gdb_exception_RETURN_MASK_QUIT : public gdb_exception_RETURN_MASK_ALL
{
explicit gdb_exception_RETURN_MASK_QUIT (const gdb_exception &ex) noexcept
: gdb_exception_RETURN_MASK_ALL (ex)
explicit gdb_exception_quit (const gdb_exception &ex) noexcept
: gdb_exception (ex)
{
}
};
@ -284,11 +276,11 @@ struct gdb_exception_RETURN_MASK_QUIT : public gdb_exception_RETURN_MASK_ALL
spread around the codebase. */
struct gdb_quit_bad_alloc
: public gdb_exception_RETURN_MASK_QUIT,
: public gdb_exception_quit,
public std::bad_alloc
{
explicit gdb_quit_bad_alloc (const gdb_exception &ex) noexcept
: gdb_exception_RETURN_MASK_QUIT (ex),
: gdb_exception_quit (ex),
std::bad_alloc ()
{
}

2
gdb/common/new-op.c
View File

@ -64,7 +64,7 @@ operator new (std::size_t sz)
{
malloc_failure (sz);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
throw gdb_quit_bad_alloc (ex);
}

2
gdb/common/selftest.c
View File

@ -87,7 +87,7 @@ run_tests (const char *filter)
++ran;
(*test) ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
++failed;
debug_printf ("Self test failed: %s\n", ex.what ());

6
gdb/compile/compile-c-symbols.c
View File

@ -367,7 +367,7 @@ gcc_convert_symbol (void *datum,
}
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
context->plugin ().error (e.what ());
}
@ -429,7 +429,7 @@ gcc_symbol_address (void *datum, struct gcc_c_context *gcc_context,
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
context->plugin ().error (e.what ());
}
@ -598,7 +598,7 @@ generate_c_for_for_one_variable (compile_instance *compiler,
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
compiler->insert_symbol_error (sym, e.what ());
}

4
gdb/compile/compile-cplus-symbols.c
View File

@ -388,7 +388,7 @@ gcc_cplus_convert_symbol (void *datum,
}
}
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
/* We can't allow exceptions to escape out of this callback. Safest
is to simply emit a gcc error. */
@ -466,7 +466,7 @@ gcc_cplus_symbol_address (void *datum, struct gcc_cp_context *gcc_context,
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
instance->plugin ().error (e.what ());
}

2
gdb/compile/compile-object-load.c
View File

@ -54,7 +54,7 @@ munmap_list::~munmap_list ()
{
gdbarch_infcall_munmap (target_gdbarch (), item.addr, item.size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
/* There's not much the user can do, so just ignore
this. */

2
gdb/compile/compile-object-run.c
View File

@ -173,7 +173,7 @@ compile_object_run (struct compile_module *module)
call_function_by_hand_dummy (func_val, NULL, args,
do_module_cleanup, data);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
/* In the case of DTOR_FOUND or in the case of EXECUTED nothing
needs to be done. */

8
gdb/completer.c
View File

@ -1025,7 +1025,7 @@ complete_expression (completion_tracker &tracker,
{
type = parse_expression_for_completion (text, &fieldname, &code);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
return;
}
@ -1448,7 +1448,7 @@ complete_line_internal (completion_tracker &tracker,
{
complete_line_internal_1 (tracker, text, line_buffer, point, reason);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (except.error != MAX_COMPLETIONS_REACHED_ERROR)
throw_exception (except);
@ -1861,7 +1861,7 @@ gdb_completion_word_break_characters ()
{
return gdb_completion_word_break_characters_throw ();
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* Set this to that gdb_rl_attempted_completion_function knows
to abort early. */
@ -2208,7 +2208,7 @@ gdb_rl_attempted_completion_function (const char *text, int start, int end)
{
return gdb_rl_attempted_completion_function_throw (text, start, end);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
}

4
gdb/corelow.c
View File

@ -466,7 +466,7 @@ core_target_open (const char *arg, int from_tty)
target_update_thread_list ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
exception_print (gdb_stderr, except);
}
@ -520,7 +520,7 @@ core_target_open (const char *arg, int from_tty)
{
thread_command (NULL, from_tty);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
exception_print (gdb_stderr, except);
}

4
gdb/cp-abi.c
View File

@ -79,7 +79,7 @@ baseclass_offset (struct type *type, int index, const gdb_byte *valaddr,
embedded_offset,
address, val);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -115,7 +115,7 @@ value_rtti_type (struct value *v, int *full,
{
ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
return NULL;
}

6
gdb/cp-support.c
View File

@ -155,7 +155,7 @@ inspect_type (struct demangle_parse_info *info,
{
sym = lookup_symbol (name, 0, VAR_DOMAIN, 0).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
return 0;
}
@ -228,7 +228,7 @@ inspect_type (struct demangle_parse_info *info,
}
/* If type_print threw an exception, there is little point
in continuing, so just bow out gracefully. */
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
return 0;
}
@ -427,7 +427,7 @@ replace_typedefs (struct demangle_parse_info *info,
sym = lookup_symbol (local_name.get (), 0,
VAR_DOMAIN, 0).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}

4
gdb/cp-valprint.c
View File

@ -325,7 +325,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
v = value_static_field (type, i);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
fprintf_filtered (stream,
_("<error reading variable: %s>"),
@ -512,7 +512,7 @@ cp_print_value (struct type *type, struct type *real_type,
{
boffset = baseclass_offset (type, i, valaddr, offset, address, val);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
skip = -1;

4
gdb/darwin-nat.c
View File

@ -1688,7 +1688,7 @@ darwin_attach_pid (struct inferior *inf)
darwin_setup_exceptions (inf);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exit_inferior (inf);
inferior_ptid = null_ptid;
@ -1952,7 +1952,7 @@ The error was: %s"),
{
copy_shell_to_cache (shell, new_name);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
warning (_("This version of macOS has System Integrity Protection.\n\
Because `startup-with-shell' is enabled, gdb tried to work around SIP by\n\

2
gdb/disasm-selftests.c
View File

@ -196,7 +196,7 @@ memory_error_test (struct gdbarch *gdbarch)
{
di.print_insn (0);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == MEMORY_ERROR)
saw_memory_error = true;

2
gdb/dtrace-probe.c
View File

@ -489,7 +489,7 @@ dtrace_process_dof_probe (struct objfile *objfile,
expr = parse_expression_with_language (type_str.c_str (),
language_c);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
}

4
gdb/dwarf-index-cache.c
View File

@ -129,7 +129,7 @@ index_cache::store (struct dwarf2_per_objfile *dwarf2_per_objfile)
write_psymtabs_to_index (dwarf2_per_objfile, m_dir.c_str (),
build_id_str.c_str (), dw_index_kind::GDB_INDEX);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (debug_index_cache)
printf_unfiltered ("index cache: couldn't store index cache for objfile "
@ -188,7 +188,7 @@ index_cache::lookup_gdb_index (const bfd_build_id *build_id,
((const gdb_byte *) mmap_resource->mapping.get (),
mmap_resource->mapping.size ());
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (debug_index_cache)
printf_unfiltered ("index cache: couldn't read %s: %s\n",

2
gdb/dwarf-index-write.c
View File

@ -1681,7 +1681,7 @@ save_gdb_index_command (const char *arg, int from_tty)
write_psymtabs_to_index (dwarf2_per_objfile, arg, basename,
index_kind);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
exception_fprintf (gdb_stderr, except,
_("Error while writing index for `%s': "),

2
gdb/dwarf2-frame-tailcall.c
View File

@ -399,7 +399,7 @@ dwarf2_tailcall_sniffer_first (struct frame_info *this_frame,
}
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (entry_values_debug)
exception_print (gdb_stdout, except);

6
gdb/dwarf2-frame.c
View File

@ -1068,7 +1068,7 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache)
internal_error (__FILE__, __LINE__, _("Unknown CFA rule."));
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
{
@ -2253,7 +2253,7 @@ dwarf2_build_frame_info (struct objfile *objfile)
EH_CIE_OR_FDE_TYPE_ID);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
warning (_("skipping .eh_frame info of %s: %s"),
objfile_name (objfile), e.what ());
@ -2293,7 +2293,7 @@ dwarf2_build_frame_info (struct objfile *objfile)
&cie_table, &fde_table,
EH_CIE_OR_FDE_TYPE_ID);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
warning (_("skipping .debug_frame info of %s: %s"),
objfile_name (objfile), e.what ());

6
gdb/dwarf2loc.c
View File

@ -1199,7 +1199,7 @@ call_site_find_chain (struct gdbarch *gdbarch, CORE_ADDR caller_pc,
{
retval = call_site_find_chain_1 (gdbarch, caller_pc, callee_pc);
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
if (e.error == NO_ENTRY_VALUE_ERROR)
{
@ -2167,7 +2167,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
{
ctx.eval (data, size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
{
@ -2384,7 +2384,7 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton,
{
ctx.eval (dlbaton->data, dlbaton->size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
{

2
gdb/dwarf2read.c
View File

@ -6344,7 +6344,7 @@ dwarf2_build_psymtabs (struct objfile *objfile)
/* (maybe) store an index in the cache. */
global_index_cache.store (dwarf2_per_objfile);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
exception_print (gdb_stderr, except);
}

10
gdb/eval.c
View File

@ -205,7 +205,7 @@ fetch_subexp_value (struct expression *exp, int *pc, struct value **valp,
{
result = evaluate_subexp (NULL_TYPE, exp, pc, EVAL_NORMAL);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* Ignore memory errors if we want watchpoints pointing at
inaccessible memory to still be created; otherwise, throw the
@ -242,7 +242,7 @@ fetch_subexp_value (struct expression *exp, int *pc, struct value **valp,
value_fetch_lazy (result);
*valp = result;
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
}
}
@ -719,7 +719,7 @@ evaluate_var_value (enum noside noside, const block *blk, symbol *var)
ret = value_of_variable (var, blk);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (noside != EVAL_AVOID_SIDE_EFFECTS)
throw_exception (except);
@ -959,7 +959,7 @@ evaluate_funcall (type *expect_type, expression *exp, int *pos,
value = value_x_unop (arg2, op, noside);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (except.error == NOT_FOUND_ERROR)
break;
@ -2048,7 +2048,7 @@ evaluate_subexp_standard (struct type *expect_type,
value = value_x_unop (arg1, op, noside);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (except.error == NOT_FOUND_ERROR)
break;

2
gdb/event-loop.c
View File

@ -370,7 +370,7 @@ start_event_loop (void)
{
result = gdb_do_one_event ();
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);

6
gdb/event-top.c
View File

@ -212,7 +212,7 @@ gdb_rl_callback_handler (char *rl) noexcept
{
ui->input_handler (gdb::unique_xmalloc_ptr<char> (rl));
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
gdb_rl_expt = ex;
}
@ -1086,7 +1086,7 @@ async_disconnect (gdb_client_data arg)
quit_cover ();
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
fputs_filtered ("Could not kill the program being debugged",
gdb_stderr);
@ -1097,7 +1097,7 @@ async_disconnect (gdb_client_data arg)
{
pop_all_targets ();
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
}

4
gdb/exec.c
View File

@ -167,7 +167,7 @@ try_open_exec_file (const char *exec_file_host, struct inferior *inf,
exec_file_attach will clear state. */
exec_file_attach (exec_file_host, add_flags & SYMFILE_VERBOSE);
}
catch (const gdb_exception_RETURN_MASK_ERROR &err)
catch (const gdb_exception_error &err)
{
if (err.message != NULL)
warning ("%s", err.what ());
@ -181,7 +181,7 @@ try_open_exec_file (const char *exec_file_host, struct inferior *inf,
{
symbol_file_add_main (exec_file_host, add_flags);
}
catch (const gdb_exception_RETURN_MASK_ERROR &err)
catch (const gdb_exception_error &err)
{
if (!exception_print_same (prev_err, err))
warning ("%s", err.what ());

2
gdb/f-valprint.c
View File

@ -413,7 +413,7 @@ info_common_command_for_block (const struct block *block, const char *comname,
value_print (val, gdb_stdout, &opts);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
printf_filtered ("<error reading variable: %s>",
except.what ());

6
gdb/fbsd-tdep.c
View File

@ -750,7 +750,7 @@ fbsd_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
{
update_thread_list ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
}
@ -1999,7 +1999,7 @@ fbsd_fetch_rtld_offsets (struct gdbarch *gdbarch, struct fbsd_pspace_data *data)
data->rtld_offsets_valid = true;
return;
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
data->off_linkmap = -1;
}
@ -2016,7 +2016,7 @@ fbsd_fetch_rtld_offsets (struct gdbarch *gdbarch, struct fbsd_pspace_data *data)
data->rtld_offsets_valid = true;
return;
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
data->off_linkmap = -1;
}

2
gdb/frame-unwind.c
View File

@ -105,7 +105,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
{
res = unwinder->sniffer (unwinder, this_frame, this_cache);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* Catch all exceptions, caused by either interrupt or error.
Reset *THIS_CACHE. */

12
gdb/frame.c
View File

@ -899,7 +899,7 @@ frame_unwind_pc (struct frame_info *this_frame)
pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
pc_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
{
@ -1913,7 +1913,7 @@ get_prev_frame_if_no_cycle (struct frame_info *this_frame)
prev_frame = NULL;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
prev_frame->next = NULL;
this_frame->prev = NULL;
@ -2094,7 +2094,7 @@ get_prev_frame_always (struct frame_info *this_frame)
{
prev_frame = get_prev_frame_always_1 (this_frame);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == MEMORY_ERROR)
{
@ -2380,7 +2380,7 @@ get_frame_pc_if_available (struct frame_info *frame, CORE_ADDR *pc)
{
*pc = frame_unwind_pc (frame->next);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
return 0;
@ -2462,7 +2462,7 @@ get_frame_address_in_block_if_available (struct frame_info *this_frame,
{
*pc = get_frame_address_in_block (this_frame);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
return 0;
@ -2747,7 +2747,7 @@ get_frame_language (struct frame_info *frame)
pc = get_frame_address_in_block (frame);
pc_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);

6
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,9 @@
2019-04-08 Tom Tromey <tom@tromey.com>
* gdbreplay.c: Update.
* linux-low.c: Update.
* server.c: Update.
2019-04-08 Tom Tromey <tom@tromey.com>
* server.c: Use C++ exception handling.

2
gdb/gdbserver/gdbreplay.c
View File

@ -532,7 +532,7 @@ main (int argc, char *argv[])
{
captured_main (argc, argv);
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
if (exception.reason == RETURN_ERROR)
{

4
gdb/gdbserver/linux-low.c
View File

@ -1540,7 +1540,7 @@ linux_detach_one_lwp (struct lwp_info *lwp)
if (the_low_target.prepare_to_resume != NULL)
the_low_target.prepare_to_resume (lwp);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (!check_ptrace_stopped_lwp_gone (lwp))
throw_exception (ex);
@ -4511,7 +4511,7 @@ linux_resume_one_lwp (struct lwp_info *lwp,
{
linux_resume_one_lwp_throw (lwp, step, signal, info);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (!check_ptrace_stopped_lwp_gone (lwp))
throw_exception (ex);

12
gdb/gdbserver/server.c
View File

@ -472,7 +472,7 @@ handle_btrace_general_set (char *own_buf)
write_ok (own_buf);
}
catch (const gdb_exception_RETURN_MASK_ERROR &exception)
catch (const gdb_exception_error &exception)
{
sprintf (own_buf, "E.%s", exception.what ());
}
@ -1881,7 +1881,7 @@ handle_qxfer_btrace (const char *annex,
if (result != 0)
memcpy (cs.own_buf, cache.buffer, cache.used_size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &exception)
catch (const gdb_exception_error &exception)
{
sprintf (cs.own_buf, "E.%s", exception.what ());
result = -1;
@ -1952,7 +1952,7 @@ handle_qxfer_btrace_conf (const char *annex,
if (result != 0)
memcpy (cs.own_buf, cache.buffer, cache.used_size);
}
catch (const gdb_exception_RETURN_MASK_ERROR &exception)
catch (const gdb_exception_error &exception)
{
sprintf (cs.own_buf, "E.%s", exception.what ());
result = -1;
@ -3553,7 +3553,7 @@ detach_or_kill_for_exit_cleanup ()
{
detach_or_kill_for_exit ();
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
fflush (stdout);
fprintf (stderr, "Detach or kill failed: %s\n",
@ -3927,7 +3927,7 @@ captured_main (int argc, char *argv[])
}
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &exception)
catch (const gdb_exception_error &exception)
{
fflush (stdout);
fprintf (stderr, "gdbserver: %s\n", exception.what ());
@ -3954,7 +3954,7 @@ main (int argc, char *argv[])
{
captured_main (argc, argv);
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
if (exception.reason == RETURN_ERROR)
{

2
gdb/gdbtypes.c
View File

@ -2575,7 +2575,7 @@ safe_parse_type (struct gdbarch *gdbarch, char *p, int length)
{
type = parse_and_eval_type (p, length);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
type = builtin_type (gdbarch)->builtin_void;
}

2
gdb/gnu-v3-abi.c
View File

@ -910,7 +910,7 @@ print_one_vtable (struct gdbarch *gdbarch, struct value *value,
{
addr = value_as_address (vfn);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
printf_filtered (_("<error: %s>"), ex.what ());
got_error = 1;

2
gdb/guile/guile-internal.h
View File

@ -681,7 +681,7 @@ gdbscm_wrap (Function &&func, Args &&... args)
{
result = func (std::forward<Args> (args)...);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

2
gdb/guile/scm-block.c
View File

@ -687,7 +687,7 @@ gdbscm_lookup_block (SCM pc_scm)
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)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

16
gdb/guile/scm-breakpoint.c
View File

@ -465,7 +465,7 @@ gdbscm_register_breakpoint_x (SCM self)
gdb_assert_not_reached ("invalid breakpoint type");
}
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -493,7 +493,7 @@ gdbscm_delete_breakpoint_x (SCM self)
{
delete_breakpoint (bp_smob->bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -593,7 +593,7 @@ gdbscm_set_breakpoint_enabled_x (SCM self, SCM newvalue)
else
disable_breakpoint (bp_smob->bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -627,7 +627,7 @@ gdbscm_set_breakpoint_silent_x (SCM self, SCM newvalue)
{
breakpoint_set_silent (bp_smob->bp, gdbscm_is_true (newvalue));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -667,7 +667,7 @@ gdbscm_set_breakpoint_ignore_count_x (SCM self, SCM newvalue)
{
set_ignore_count (bp_smob->number, (int) value, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -787,7 +787,7 @@ gdbscm_set_breakpoint_task_x (SCM self, SCM newvalue)
{
valid_id = valid_task_id (id);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -807,7 +807,7 @@ gdbscm_set_breakpoint_task_x (SCM self, SCM newvalue)
{
breakpoint_set_task (bp_smob->bp, id);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -972,7 +972,7 @@ gdbscm_breakpoint_commands (SCM self)
{
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);
gdbscm_throw_gdb_exception (except);

2
gdb/guile/scm-cmd.c
View File

@ -776,7 +776,7 @@ gdbscm_register_command_x (SCM self)
c_smob->doc, cmd_list);
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

2
gdb/guile/scm-disasm.c
View File

@ -257,7 +257,7 @@ gdbscm_arch_disassemble (SCM self, SCM start_scm, SCM rest)
else
insn_len = gdb_print_insn (gdbarch, pc, &buf, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

38
gdb/guile/scm-frame.c
View File

@ -248,7 +248,7 @@ frscm_scm_from_frame (struct frame_info *frame, struct inferior *inferior)
}
gdbarch = get_frame_arch (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
return gdbscm_scm_from_gdb_exception (except);
}
@ -400,7 +400,7 @@ gdbscm_frame_valid_p (SCM self)
{
frame = frscm_frame_smob_to_frame (f_smob);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -429,7 +429,7 @@ gdbscm_frame_name (SCM self)
if (frame != NULL)
name = find_frame_funname (frame, &lang, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -466,7 +466,7 @@ gdbscm_frame_type (SCM self)
if (frame != NULL)
type = get_frame_type (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -495,7 +495,7 @@ gdbscm_frame_arch (SCM self)
{
frame = frscm_frame_smob_to_frame (f_smob);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -525,7 +525,7 @@ gdbscm_frame_unwind_stop_reason (SCM self)
{
frame = frscm_frame_smob_to_frame (f_smob);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -559,7 +559,7 @@ gdbscm_frame_pc (SCM self)
if (frame != NULL)
pc = get_frame_pc (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -591,7 +591,7 @@ gdbscm_frame_block (SCM self)
if (frame != NULL)
block = get_frame_block (frame, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -641,7 +641,7 @@ gdbscm_frame_function (SCM self)
if (frame != NULL)
sym = find_pc_function (get_frame_address_in_block (frame));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -677,7 +677,7 @@ gdbscm_frame_older (SCM self)
if (frame != NULL)
prev = get_prev_frame (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -713,7 +713,7 @@ gdbscm_frame_newer (SCM self)
if (frame != NULL)
next = get_next_frame (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -748,7 +748,7 @@ gdbscm_frame_sal (SCM self)
if (frame != NULL)
sal = find_frame_sal (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -793,7 +793,7 @@ gdbscm_frame_read_register (SCM self, SCM register_scm)
value = value_of_register (regnum, frame);
}
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -842,7 +842,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest)
{
frame = frscm_frame_smob_to_frame (f_smob);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -894,7 +894,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest)
var = lookup_sym.symbol;
block = lookup_sym.block;
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -917,7 +917,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest)
{
value = read_var_value (var, block, frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -942,7 +942,7 @@ gdbscm_frame_select (SCM self)
if (frame != NULL)
select_frame (frame);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -968,7 +968,7 @@ gdbscm_newest_frame (void)
{
frame = get_current_frame ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -988,7 +988,7 @@ gdbscm_selected_frame (void)
{
frame = get_selected_frame (_("No frame is currently selected"));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

2
gdb/guile/scm-lazy-string.c
View File

@ -336,7 +336,7 @@ lsscm_safe_lazy_string_to_value (SCM string, int arg_pos,
break;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
*except_scmp = gdbscm_scm_from_gdb_exception (except);
return NULL;

2
gdb/guile/scm-math.c
View File

@ -824,7 +824,7 @@ vlscm_convert_typed_value_from_scheme (const char *func_name,
value = NULL;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
except_scm = gdbscm_scm_from_gdb_exception (except);
}

4
gdb/guile/scm-param.c
View File

@ -1018,7 +1018,7 @@ gdbscm_register_parameter_x (SCM self)
set_list, show_list,
&p_smob->set_command, &p_smob->show_command);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -1067,7 +1067,7 @@ gdbscm_parameter_value (SCM self)
{
found = lookup_cmd_composition (newarg, &alias, &prefix, &cmd);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}

2
gdb/guile/scm-ports.c
View File

@ -279,7 +279,7 @@ ioscm_write (SCM port, const void *data, size_t size)
else
fputsn_filtered ((const char *) data, size, gdb_stdout);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

2
gdb/guile/scm-pretty-print.c
View File

@ -558,7 +558,7 @@ ppscm_pretty_print_one_value (SCM printer, struct value **out_value,
(_("invalid result from pretty-printer to-string"), result);
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}

10
gdb/guile/scm-symbol.c
View File

@ -490,7 +490,7 @@ gdbscm_symbol_needs_frame_p (SCM self)
{
result = symbol_read_needs_frame (symbol);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -556,7 +556,7 @@ gdbscm_symbol_value (SCM self, SCM rest)
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)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -607,7 +607,7 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest)
selected_frame = get_selected_frame (_("no frame selected"));
block = get_frame_block (selected_frame, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
xfree (name);
GDBSCM_HANDLE_GDB_EXCEPTION (ex);
@ -620,7 +620,7 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest)
symbol = lookup_symbol (name, block, (domain_enum) domain,
&is_a_field_of_this).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -656,7 +656,7 @@ gdbscm_lookup_global_symbol (SCM name_scm, SCM rest)
{
symbol = lookup_global_symbol (name, NULL, (domain_enum) domain).symbol;
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}

2
gdb/guile/scm-symtab.c
View File

@ -597,7 +597,7 @@ gdbscm_find_pc_line (SCM pc_scm)
sal = find_pc_line (pc, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

24
gdb/guile/scm-type.c
View File

@ -112,7 +112,7 @@ tyscm_type_name (struct type *type)
LA_PRINT_TYPE (type, "", &stb, -1, 0, &type_print_raw_options);
return std::move (stb.string ());
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
SCM excp = gdbscm_scm_from_gdb_exception (except);
gdbscm_throw (excp);
@ -238,7 +238,7 @@ tyscm_equal_p_type_smob (SCM type1_scm, SCM type2_scm)
{
result = types_deeply_equal (type1, type2);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -631,7 +631,7 @@ gdbscm_type_sizeof (SCM self)
{
check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
@ -654,7 +654,7 @@ gdbscm_type_strip_typedefs (SCM self)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -675,7 +675,7 @@ tyscm_get_composite (struct type *type)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -731,7 +731,7 @@ tyscm_array_1 (SCM self, SCM n1_scm, SCM n2_scm, int is_vector,
if (is_vector)
make_vector_type (array);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -785,7 +785,7 @@ gdbscm_type_pointer (SCM self)
{
type = lookup_pointer_type (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -846,7 +846,7 @@ gdbscm_type_reference (SCM self)
{
type = lookup_lvalue_reference_type (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -883,7 +883,7 @@ gdbscm_type_const (SCM self)
{
type = make_cv_type (1, 0, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -905,7 +905,7 @@ gdbscm_type_volatile (SCM self)
{
type = make_cv_type (0, 1, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -927,7 +927,7 @@ gdbscm_type_unqualified (SCM self)
{
type = make_cv_type (0, 0, type, NULL);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -1231,7 +1231,7 @@ tyscm_lookup_typename (const char *type_name, const struct block *block)
type = lookup_typename (current_language, get_current_arch (),
type_name, block, 0);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
return NULL;
}

30
gdb/guile/scm-value.c
View File

@ -163,7 +163,7 @@ vlscm_print_value_smob (SCM self, SCM port, scm_print_state *pstate)
common_val_print (v_smob->value, &stb, 0, &opts, current_language);
scm_puts (stb.c_str (), port);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -190,7 +190,7 @@ vlscm_equal_p_value_smob (SCM v1, SCM v2)
{
result = value_equal (v1_smob->value, v2_smob->value);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -394,7 +394,7 @@ gdbscm_value_address (SCM self)
{
address = vlscm_scm_from_value (value_addr (value));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
}
@ -529,7 +529,7 @@ gdbscm_value_dynamic_type (SCM self)
type = NULL;
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -684,7 +684,7 @@ gdbscm_value_call (SCM self, SCM args)
{
ftype = check_typedef (value_type (function));
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -752,7 +752,7 @@ gdbscm_value_to_bytevector (SCM self)
length = TYPE_LENGTH (type);
contents = value_contents (value);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -793,7 +793,7 @@ gdbscm_value_to_bool (SCM self)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -808,7 +808,7 @@ gdbscm_value_to_bool (SCM self)
else
l = value_as_long (value);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -834,7 +834,7 @@ gdbscm_value_to_integer (SCM self)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -849,7 +849,7 @@ gdbscm_value_to_integer (SCM self)
else
l = value_as_long (value);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -879,7 +879,7 @@ gdbscm_value_to_real (SCM self)
{
type = check_typedef (type);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -905,7 +905,7 @@ gdbscm_value_to_real (SCM self)
check = value_from_longest (type, (LONGEST) d);
}
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}
@ -998,7 +998,7 @@ gdbscm_value_to_string (SCM self, SCM rest)
LA_GET_STRING (value, &buffer, &length, &char_type, &la_encoding);
buffer_contents = buffer.release ();
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
xfree (encoding);
GDBSCM_HANDLE_GDB_EXCEPTION (except);
@ -1119,7 +1119,7 @@ gdbscm_value_to_lazy_string (SCM self, SCM rest)
result = lsscm_make_lazy_string (addr, length, encoding, type);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
except = ex;
}
@ -1181,7 +1181,7 @@ gdbscm_value_print (SCM self)
{
common_val_print (value, &stb, 0, &opts, current_language);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
GDBSCM_HANDLE_GDB_EXCEPTION (except);
}

2
gdb/i386-linux-tdep.c
View File

@ -414,7 +414,7 @@ i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch,
access
= parse_and_eval_long ("$_siginfo._sifields._sigfault.si_addr");
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
return;
}

6
gdb/i386-tdep.c
View File

@ -2086,7 +2086,7 @@ i386_frame_cache (struct frame_info *this_frame, void **this_cache)
{
i386_frame_cache_1 (this_frame, cache);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -2265,7 +2265,7 @@ i386_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache)
cache->base_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -2460,7 +2460,7 @@ i386_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache)
cache->base_p = 1;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);

2
gdb/inf-loop.c
View File

@ -71,7 +71,7 @@ inferior_event_handler (enum inferior_event_type event_type,
{
bpstat_do_actions ();
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
/* If the user was running a foreground execution
command, then propagate the error so that the prompt

2
gdb/infcall.c
View File

@ -605,7 +605,7 @@ run_inferior_call (struct call_thread_fsm *sm,
target supports asynchronous execution. */
wait_sync_command_done ();
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
caught_error = e;
}

4
gdb/infcmd.c
View File

@ -451,7 +451,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
{
thr->suspend.stop_pc = regcache_read_pc (get_current_regcache ());
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error != NOT_AVAILABLE_ERROR)
throw_exception (ex);
@ -1652,7 +1652,7 @@ print_return_value (struct ui_out *uiout, struct return_value_info *rv)
delete the breakpoint. */
print_return_value_1 (uiout, rv);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stdout, ex);
}

14
gdb/infrun.c
View File

@ -1780,7 +1780,7 @@ displaced_step_prepare (thread_info *thread)
{
prepared = displaced_step_prepare_throw (thread);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
struct displaced_step_inferior_state *displaced_state;
@ -2615,7 +2615,7 @@ resume (gdb_signal sig)
{
resume_1 (sig);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* If resuming is being aborted for any reason, delete any
single-step breakpoint resume_1 may have created, to avoid
@ -7299,7 +7299,7 @@ insert_exception_resume_breakpoint (struct thread_info *tp,
inferior_thread ()->control.exception_resume_breakpoint = bp;
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
/* We want to ignore errors here. */
}
@ -7398,7 +7398,7 @@ check_exception_resume (struct execution_control_state *ecs,
}
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
}
}
@ -7531,7 +7531,7 @@ keep_going_pass_signal (struct execution_control_state *ecs)
{
insert_breakpoints ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
stop_waiting (ecs);
@ -8063,7 +8063,7 @@ normal_stop (void)
{
execute_cmd_pre_hook (stop_command);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Error while running hook_stop:\n");
@ -8768,7 +8768,7 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
{
restore_selected_frame (inf_status->selected_frame_id);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
exception_fprintf (gdb_stderr, ex,
"Unable to restore previously selected frame:\n");

2
gdb/jit.c
View File

@ -855,7 +855,7 @@ jit_reader_try_read_symtab (struct jit_code_entry *code_entry,
code_entry->symfile_size))
status = 0;
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
status = 0;
}

2
gdb/language.c
View File

@ -179,7 +179,7 @@ set_language_command (const char *ignore,
frame = get_selected_frame (NULL);
flang = get_frame_language (frame);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
flang = language_unknown;
}

12
gdb/linespec.c
View File

@ -2388,7 +2388,7 @@ convert_explicit_location_to_linespec (struct linespec_state *self,
*result->file_symtabs
= symtabs_from_filename (source_filename, self->search_pspace);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
source_file_not_found_error (source_filename);
}
@ -2613,7 +2613,7 @@ parse_linespec (linespec_parser *parser, const char *arg,
= symtabs_from_filename (user_filename.get (),
PARSER_STATE (parser)->search_pspace);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
file_exception = ex;
}
@ -2930,7 +2930,7 @@ linespec_complete_label (completion_tracker &tracker,
func_name_match_type,
NULL, unknown_offset);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
return;
}
@ -2960,7 +2960,7 @@ linespec_complete (completion_tracker &tracker, const char *text,
{
parse_linespec (&parser, text, match_type);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
}
@ -3150,7 +3150,7 @@ event_location_to_sals (linespec_parser *parser,
result = parse_linespec (parser,
ls->spec_string, ls->match_type);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
throw_exception (except);
}
@ -3963,7 +3963,7 @@ find_linespec_symbols (struct linespec_state *state,
/* If successful, we're done. If NOT_FOUND_ERROR
was not thrown, rethrow the exception that we did get. */
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (except.error != NOT_FOUND_ERROR)
throw_exception (except);

2
gdb/linux-fork.c
View File

@ -433,7 +433,7 @@ public:
fork_load_infrun_state (m_oldfp);
insert_breakpoints ();
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
warning (_("Couldn't restore checkpoint state in %s: %s"),
target_pid_to_str (m_oldfp->ptid).c_str (),

8
gdb/linux-nat.c
View File

@ -1192,7 +1192,7 @@ linux_nat_target::attach (const char *args, int from_tty)
{
inf_ptrace_target::attach (args, from_tty);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
pid_t pid = parse_pid_to_attach (args);
std::string reason = linux_ptrace_attach_fail_reason (pid);
@ -1405,7 +1405,7 @@ detach_one_lwp (struct lwp_info *lp, int *signo_p)
{
linux_target->low_prepare_to_resume (lp);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (!check_ptrace_stopped_lwp_gone (lp))
throw_exception (ex);
@ -1587,7 +1587,7 @@ linux_resume_one_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
{
linux_resume_one_lwp_throw (lp, step, signo);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (!check_ptrace_stopped_lwp_gone (lp))
throw_exception (ex);
@ -3549,7 +3549,7 @@ resume_stopped_resumed_lwps (struct lwp_info *lp, const ptid_t wait_ptid)
linux_resume_one_lwp_throw (lp, lp->step, GDB_SIGNAL_0);
}
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (!check_ptrace_stopped_lwp_gone (lp))
throw_exception (ex);

2
gdb/linux-tdep.c
View File

@ -1930,7 +1930,7 @@ linux_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
{
update_thread_list ();
}
catch (const gdb_exception_RETURN_MASK_ERROR &e)
catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
}

6
gdb/linux-thread-db.c
View File

@ -502,7 +502,7 @@ thread_db_find_new_threads_silently (thread_info *stopped)
thread_db_find_new_threads_2 (stopped, true);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (libthread_db_debug)
exception_fprintf (gdb_stdlog, except,
@ -772,7 +772,7 @@ check_thread_db (struct thread_db_info *info, bool log_progress)
if (!tdb_testinfo->threads_seen)
error (_("no threads seen"));
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (warning_pre_print)
fputs_unfiltered (warning_pre_print, gdb_stderr);
@ -1518,7 +1518,7 @@ find_new_threads_once (struct thread_db_info *info, int iteration,
TD_SIGNO_MASK,
TD_THR_ANY_USER_FLAGS);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
if (libthread_db_debug)
{

6
gdb/main.c
View File

@ -373,7 +373,7 @@ catch_command_errors (catch_command_errors_const_ftype command,
maybe_wait_sync_command_done (was_sync);
}
catch (const gdb_exception_RETURN_MASK_ALL &e)
catch (const gdb_exception &e)
{
return handle_command_errors (e);
}
@ -1172,7 +1172,7 @@ captured_main (void *data)
{
captured_command_loop ();
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);
}
@ -1187,7 +1187,7 @@ gdb_main (struct captured_main_args *args)
{
captured_main (args);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);
}

2
gdb/mi/mi-cmd-break.c
View File

@ -58,7 +58,7 @@ breakpoint_notify (struct breakpoint *b)
{
print_breakpoint (b);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);
}

2
gdb/mi/mi-cmd-stack.c
View File

@ -540,7 +540,7 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what,
common_val_print (arg->val, &stb, 0, &opts,
language_def (SYMBOL_LANGUAGE (arg->sym)));
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
stb.printf (_("<error reading variable: %s>"),
except.what ());

2
gdb/mi/mi-interp.c
View File

@ -830,7 +830,7 @@ mi_print_breakpoint_for_event (struct mi_interp *mi, breakpoint *bp)
print_breakpoint (bp);
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_print (gdb_stderr, ex);
}

4
gdb/mi/mi-main.c
View File

@ -1942,7 +1942,7 @@ mi_execute_command (const char *cmd, int from_tty)
{
command = mi_parse (cmd, &token);
}
catch (const gdb_exception_RETURN_MASK_ALL &exception)
catch (const gdb_exception &exception)
{
mi_print_exception (token, exception);
xfree (token);
@ -1969,7 +1969,7 @@ mi_execute_command (const char *cmd, int from_tty)
{
captured_mi_execute_command (current_uiout, command.get ());
}
catch (const gdb_exception_RETURN_MASK_ALL &result)
catch (const gdb_exception &result)
{
/* Like in start_event_loop, enable input and force display
of the prompt. Otherwise, any command that calls

2
gdb/objc-lang.c
View File

@ -1302,7 +1302,7 @@ find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *),
if (f (pc, new_pc) == 0)
return 1;
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
exception_fprintf (gdb_stderr, ex,
"Unable to determine target of "

2
gdb/p-valprint.c
View File

@ -755,7 +755,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
{
boffset = baseclass_offset (type, i, valaddr, offset, address, val);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
if (ex.error == NOT_AVAILABLE_ERROR)
skip = -1;

4
gdb/parse.c
View File

@ -1141,7 +1141,7 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
{
lang->la_parser (&ps);
}
catch (const gdb_exception_RETURN_MASK_ALL &except)
catch (const gdb_exception &except)
{
/* If parsing for completion, allow this to succeed; but if no
expression elements have been written, then there's nothing
@ -1228,7 +1228,7 @@ parse_expression_for_completion (const char *string,
exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp,
nullptr, &cstate);
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
/* Nothing, EXP remains NULL. */
}

2
gdb/ppc-linux-tdep.c
View File

@ -1842,7 +1842,7 @@ ppc_linux_spe_context (int wordsize, enum bfd_endian byte_order,
spe_context_cache_ptid = inferior_ptid;
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
return 0;
}

8
gdb/printcmd.c
View File

@ -1887,7 +1887,7 @@ do_one_display (struct display *d)
d->exp = parse_expression (d->exp_string, &tracker);
d->block = tracker.block ();
}
catch (const gdb_exception_RETURN_MASK_ALL &ex)
catch (const gdb_exception &ex)
{
/* Can't re-parse the expression. Disable this display item. */
d->enabled_p = 0;
@ -1952,7 +1952,7 @@ do_one_display (struct display *d)
addr = gdbarch_addr_bits_remove (d->exp->gdbarch, addr);
do_examine (d->format, d->exp->gdbarch, addr);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
fprintf_filtered (gdb_stdout, _("<error: %s>\n"),
ex.what ());
@ -1986,7 +1986,7 @@ do_one_display (struct display *d)
val = evaluate_expression (d->exp.get ());
print_formatted (val, d->format.size, &opts, gdb_stdout);
}
catch (const gdb_exception_RETURN_MASK_ERROR &ex)
catch (const gdb_exception_error &ex)
{
fprintf_filtered (gdb_stdout, _("<error: %s>"), ex.what ());
}
@ -2189,7 +2189,7 @@ print_variable_and_value (const char *name, struct symbol *var,
function. */
frame = NULL;
}
catch (const gdb_exception_RETURN_MASK_ERROR &except)
catch (const gdb_exception_error &except)
{
fprintf_filtered (stream, "<error reading variable %s (%s)>", name,
except.what ());

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

Some files were not shown because too many files have changed in this diff Show More