/* Everything about catch/throw catchpoints, for GDB.
- Copyright (C) 1986-2017 Free Software Foundation, Inc.
+ Copyright (C) 1986-2019 Free Software Foundation, Inc.
This file is part of GDB.
unsigned n_args;
pc_probe = find_probe_by_pc (pc);
- if (pc_probe.probe == NULL
- || strcmp (pc_probe.probe->provider, "libstdcxx") != 0
- || (strcmp (pc_probe.probe->name, "catch") != 0
- && strcmp (pc_probe.probe->name, "throw") != 0
- && strcmp (pc_probe.probe->name, "rethrow") != 0))
+ if (pc_probe.prob == NULL
+ || pc_probe.prob->get_provider () != "libstdcxx"
+ || (pc_probe.prob->get_name () != "catch"
+ && pc_probe.prob->get_name () != "throw"
+ && pc_probe.prob->get_name () != "rethrow"))
error (_("not stopped at a C++ exception catchpoint"));
- n_args = get_probe_argument_count (pc_probe.probe, frame);
+ n_args = pc_probe.prob->get_argument_count (frame);
if (n_args < 2)
error (_("C++ exception catchpoint has too few arguments"));
if (arg0 != NULL)
- *arg0 = evaluate_probe_argument (pc_probe.probe, 0, frame);
- *arg1 = evaluate_probe_argument (pc_probe.probe, 1, frame);
+ *arg0 = pc_probe.prob->evaluate_argument (0, frame);
+ *arg1 = pc_probe.prob->evaluate_argument (1, frame);
if ((arg0 != NULL && *arg0 == NULL) || *arg1 == NULL)
error (_("error computing probe argument at c++ exception catchpoint"));
if (self->pattern == NULL)
return;
- TRY
+ try
{
struct value *typeinfo_arg;
std::string canon;
if (!canon.empty ())
std::swap (type_name, canon);
}
- CATCH (e, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &e)
{
exception_print (gdb_stderr, e);
}
- END_CATCH
if (!type_name.empty ())
{
struct program_space *filter_pspace = current_program_space;
/* We first try to use the probe interface. */
- TRY
+ try
{
event_location_up location
= new_probe_location (exception_functions[kind].probe);
sals = parse_probes (location.get (), filter_pspace, NULL);
}
- CATCH (e, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &e)
{
/* Using the probe interface failed. Let's fallback to the normal
catchpoint mode. */
- TRY
+ try
{
struct explicit_location explicit_loc;
sals = self->ops->decode_location (self, location.get (),
filter_pspace);
}
- CATCH (ex, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &ex)
{
/* NOT_FOUND_ERROR just means the breakpoint will be
pending, so let it through. */
if (ex.error != NOT_FOUND_ERROR)
- throw_exception (ex);
+ throw;
}
- END_CATCH
}
- END_CATCH
update_breakpoint_locations (self, filter_pspace, sals, {});
}
bp_temp = b->disposition == disp_del;
uiout->text (bp_temp ? "Temporary catchpoint "
: "Catchpoint ");
- if (!uiout->is_mi_like_p ())
- uiout->field_int ("bkptno", b->number);
+ uiout->field_int ("bkptno", b->number);
uiout->text ((kind == EX_EVENT_THROW ? " (exception thrown), "
: (kind == EX_EVENT_CATCH ? " (exception caught), "
: " (exception rethrown), ")));
uiout->field_string ("reason",
async_reason_lookup (EXEC_ASYNC_BREAKPOINT_HIT));
uiout->field_string ("disp", bpdisp_text (b->disposition));
- uiout->field_int ("bkptno", b->number);
}
return PRINT_SRC_AND_LOC;
}
const char *start;
const char *last, *last_space;
- start = skip_spaces_const (*string);
+ start = skip_spaces (*string);
last = start;
last_space = start;
/* No "if" token here. Skip to the next word start. */
last_space = skip_to_space (last);
- last = skip_spaces_const (last_space);
+ last = skip_spaces (last_space);
}
*string = last;
static void
catch_exception_command_1 (enum exception_event_kind ex_event,
- char *arg_entry,
+ const char *arg,
int tempflag, int from_tty)
{
const char *cond_string = NULL;
- const char *arg = arg_entry;
if (!arg)
arg = "";
- arg = skip_spaces_const (arg);
+ arg = skip_spaces (arg);
std::string except_rx = extract_exception_regexp (&arg);
/* Implementation of "catch catch" command. */
static void
-catch_catch_command (char *arg, int from_tty, struct cmd_list_element *command)
+catch_catch_command (const char *arg, int from_tty,
+ struct cmd_list_element *command)
{
int tempflag = get_cmd_context (command) == CATCH_TEMPORARY;
/* Implementation of "catch throw" command. */
static void
-catch_throw_command (char *arg, int from_tty, struct cmd_list_element *command)
+catch_throw_command (const char *arg, int from_tty,
+ struct cmd_list_element *command)
{
int tempflag = get_cmd_context (command) == CATCH_TEMPORARY;
/* Implementation of "catch rethrow" command. */
static void
-catch_rethrow_command (char *arg, int from_tty,
+catch_rethrow_command (const char *arg, int from_tty,
struct cmd_list_element *command)
{
int tempflag = get_cmd_context (command) == CATCH_TEMPORARY;
ops->check_status = check_status_exception_catchpoint;
}
-initialize_file_ftype _initialize_break_catch_throw;
-
void
_initialize_break_catch_throw (void)
{