/* Everything about catch/throw catchpoints, for GDB.
- Copyright (C) 1986-2015 Free Software Foundation, Inc.
+ Copyright (C) 1986-2016 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 exception_catchpoint *self
= (struct exception_catchpoint *) bs->breakpoint_at;
char *type_name = NULL;
- volatile struct gdb_exception e;
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;
type_name = canon;
}
}
- if (e.reason < 0)
- exception_print (gdb_stderr, e);
+ CATCH (e, RETURN_MASK_ERROR)
+ {
+ exception_print (gdb_stderr, e);
+ }
+ END_CATCH
if (type_name != NULL)
{
{
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);
}
- if (ex.reason < 0)
+ 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,