forked from Imagelibrary/binutils-gdb
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
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user