/* Everything about catch/throw catchpoints, for GDB.
- Copyright (C) 1986-2015 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "cp-abi.h"
#include "gdb_regex.h"
#include "cp-support.h"
+#include "location.h"
/* Enums for exception-handling support. */
enum exception_event_kind
struct frame_info *frame = get_selected_frame (_("No frame selected"));
CORE_ADDR pc = get_frame_pc (frame);
struct bound_probe pc_probe;
- const struct sym_probe_fns *pc_probe_fns;
unsigned n_args;
pc_probe = find_probe_by_pc (pc);
{
struct exception_catchpoint *self
= (struct exception_catchpoint *) bs->breakpoint_at;
- char *type_name = NULL;
- volatile struct gdb_exception e;
+ std::string type_name;
bkpt_breakpoint_ops.check_status (bs);
if (bs->stop == 0)
if (self->pattern == NULL)
return;
- TRY_CATCH (e, RETURN_MASK_ERROR)
+ TRY
{
struct value *typeinfo_arg;
- char *canon;
+ std::string canon;
fetch_probe_arguments (NULL, &typeinfo_arg);
type_name = cplus_typename_from_type_info (typeinfo_arg);
- canon = cp_canonicalize_string (type_name);
- if (canon != NULL)
- {
- xfree (type_name);
- type_name = canon;
- }
+ canon = cp_canonicalize_string (type_name.c_str ());
+ if (!canon.empty ())
+ std::swap (type_name, canon);
}
+ CATCH (e, RETURN_MASK_ERROR)
+ {
+ exception_print (gdb_stderr, e);
+ }
+ END_CATCH
- if (e.reason < 0)
- exception_print (gdb_stderr, e);
- else if (regexec (self->pattern, type_name, 0, NULL, 0) != 0)
- bs->stop = 0;
-
- xfree (type_name);
+ if (!type_name.empty ())
+ {
+ if (regexec (self->pattern, type_name.c_str (), 0, NULL, 0) != 0)
+ bs->stop = 0;
+ }
}
/* Implement the 're_set' method. */
{
struct symtabs_and_lines sals = {0};
struct symtabs_and_lines sals_end = {0};
- volatile struct gdb_exception e;
struct cleanup *cleanup;
enum exception_event_kind kind = classify_exception_breakpoint (self);
+ struct event_location *location;
+ struct program_space *filter_pspace = current_program_space;
/* We first try to use the probe interface. */
- TRY_CATCH (e, RETURN_MASK_ERROR)
+ TRY
{
- char *spec = ASTRDUP (exception_functions[kind].probe);
-
- sals = parse_probes (&spec, NULL);
+ location
+ = new_probe_location (exception_functions[kind].probe);
+ cleanup = make_cleanup_delete_event_location (location);
+ sals = parse_probes (location, filter_pspace, NULL);
+ do_cleanups (cleanup);
}
-
- if (e.reason < 0)
+ CATCH (e, RETURN_MASK_ERROR)
{
- volatile struct gdb_exception ex;
-
/* Using the probe interface failed. Let's fallback to the normal
catchpoint mode. */
- TRY_CATCH (ex, RETURN_MASK_ERROR)
+ TRY
{
- char *spec = ASTRDUP (exception_functions[kind].function);
-
- self->ops->decode_linespec (self, &spec, &sals);
+ struct explicit_location explicit_loc;
+
+ initialize_explicit_location (&explicit_loc);
+ explicit_loc.function_name
+ = ASTRDUP (exception_functions[kind].function);
+ location = new_explicit_location (&explicit_loc);
+ cleanup = make_cleanup_delete_event_location (location);
+ self->ops->decode_location (self, location, filter_pspace, &sals);
+ do_cleanups (cleanup);
}
-
- /* NOT_FOUND_ERROR just means the breakpoint will be pending, so
- let it through. */
- if (ex.reason < 0 && ex.error != NOT_FOUND_ERROR)
- throw_exception (ex);
+ CATCH (ex, RETURN_MASK_ERROR)
+ {
+ /* NOT_FOUND_ERROR just means the breakpoint will be
+ pending, so let it through. */
+ if (ex.error != NOT_FOUND_ERROR)
+ throw_exception (ex);
+ }
+ END_CATCH
}
+ END_CATCH
cleanup = make_cleanup (xfree, sals.sals);
- update_breakpoint_locations (self, sals, sals_end);
+ update_breakpoint_locations (self, filter_pspace, sals, sals_end);
do_cleanups (cleanup);
}
enum exception_event_kind kind = classify_exception_breakpoint (b);
annotate_catchpoint (b->number);
+ maybe_print_thread_hit_breakpoint (uiout);
bp_temp = b->disposition == disp_del;
- ui_out_text (uiout,
- bp_temp ? "Temporary catchpoint "
+ uiout->text (bp_temp ? "Temporary catchpoint "
: "Catchpoint ");
- if (!ui_out_is_mi_like_p (uiout))
- ui_out_field_int (uiout, "bkptno", b->number);
- ui_out_text (uiout,
- (kind == EX_EVENT_THROW ? " (exception thrown), "
+ if (!uiout->is_mi_like_p ())
+ uiout->field_int ("bkptno", b->number);
+ uiout->text ((kind == EX_EVENT_THROW ? " (exception thrown), "
: (kind == EX_EVENT_CATCH ? " (exception caught), "
: " (exception rethrown), ")));
- if (ui_out_is_mi_like_p (uiout))
+ if (uiout->is_mi_like_p ())
{
- ui_out_field_string (uiout, "reason",
+ uiout->field_string ("reason",
async_reason_lookup (EXEC_ASYNC_BREAKPOINT_HIT));
- ui_out_field_string (uiout, "disp", bpdisp_text (b->disposition));
- ui_out_field_int (uiout, "bkptno", b->number);
+ uiout->field_string ("disp", bpdisp_text (b->disposition));
+ uiout->field_int ("bkptno", b->number);
}
return PRINT_SRC_AND_LOC;
}
{
annotate_field (4);
if (b->loc == NULL || b->loc->shlib_disabled)
- ui
_out_field_string (uiout, "addr", "<PENDING>");
+ ui
out->field_string ("addr", "<PENDING>");
else
- ui_out_field_core_addr (uiout, "addr",
+ uiout->field_core_addr ("addr",
b->loc->gdbarch, b->loc->address);
}
annotate_field (5);
switch (kind)
{
case EX_EVENT_THROW:
- ui_out_field_string (uiout, "what", "exception throw");
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string (uiout, "catch-type", "throw");
+ uiout->field_string ("what", "exception throw");
+ if (uiout->is_mi_like_p ())
+ uiout->field_string ("catch-type", "throw");
break;
case EX_EVENT_RETHROW:
- ui_out_field_string (uiout, "what", "exception rethrow");
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string (uiout, "catch-type", "rethrow");
+ uiout->field_string ("what", "exception rethrow");
+ if (uiout->is_mi_like_p ())
+ uiout->field_string ("catch-type", "rethrow");
break;
case EX_EVENT_CATCH:
- ui_out_field_string (uiout, "what", "exception catch");
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string (uiout, "catch-type", "catch");
+ uiout->field_string ("what", "exception catch");
+ if (uiout->is_mi_like_p ())
+ uiout->field_string ("catch-type", "catch");
break;
}
}
if (cp->exception_rx != NULL)
{
- ui_out_text (uiout, _("\tmatching: "));
- ui_out_field_string (uiout, "regexp", cp->exception_rx);
- ui_out_text (uiout, "\n");
+ uiout->text (_("\tmatching: "));
+ uiout->field_string ("regexp", cp->exception_rx);
+ uiout->text ("\n");
}
}
enum exception_event_kind kind = classify_exception_breakpoint (b);
bp_temp = b->disposition == disp_del;
- ui_out_text (uiout, bp_temp ? _("Temporary catchpoint ")
+ uiout->text (bp_temp ? _("Temporary catchpoint ")
: _("Catchpoint "));
- ui_out_field_int (uiout, "bkptno", b->number);
- ui_out_text (uiout, (kind == EX_EVENT_THROW ? _(" (throw)")
+ uiout->field_int ("bkptno", b->number);
+ uiout->text ((kind == EX_EVENT_THROW ? _(" (throw)")
: (kind == EX_EVENT_CATCH ? _(" (catch)")
: _(" (rethrow)"))));
}
handle_gnu_v3_exceptions (int tempflag, char *except_rx, char *cond_string,
enum exception_event_kind ex_event, int from_tty)
{
- struct exception_catchpoint *cp;
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
regex_t *pattern = NULL;
if (except_rx != NULL)
_("invalid type-matching regexp"));
}
- cp = XCNEW (struct exception_catchpoint);
- make_cleanup (xfree, cp);
+ std::unique_ptr<exception_catchpoint> cp (new exception_catchpoint ());
init_catchpoint (&cp->base, get_current_arch (), tempflag, cond_string,
&gnu_v3_exception_catchpoint_ops);
re_set_exception_catchpoint (&cp->base);
install_breakpoint (0, &cp->base, 1);
- discard_cleanups (cleanup);
+ cp.release ();
}
/* Look for an "if" token in *STRING. The "if" token must be preceded
projects / deliverable / binutils-gdb.git / blobdiff