arm-tdep.c: Remove unused arm_displaced_step_copy_insn

[deliverable/binutils-gdb.git] / gdb / break-catch-throw.c

diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index 9449aa5f38131e50b99f3586aee10317dd2174d6..1fbdcc5c7c1a5a7ff56de67cd1d8e46ca0948e90 100644 (file)
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -1,6 +1,6 @@
 /* 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.
 
@@ -212,29 +212,31 @@ re_set_exception_catchpoint (struct breakpoint *self)
   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
     {
-      char *spec = ASTRDUP (exception_functions[kind].probe);
-
-      location = new_linespec_location (&spec);
+      location
+       = new_probe_location (exception_functions[kind].probe);
       cleanup = make_cleanup_delete_event_location (location);
-      sals = parse_probes (location, NULL);
+      sals = parse_probes (location, filter_pspace, NULL);
       do_cleanups (cleanup);
     }
-
   CATCH (e, RETURN_MASK_ERROR)
     {
       /* Using the probe interface failed.  Let's fallback to the normal
         catchpoint mode.  */
       TRY
        {
-         char *spec = ASTRDUP (exception_functions[kind].function);
+         struct explicit_location explicit_loc;
 
-         location = new_linespec_location (&spec);
+         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, &sals);
+         self->ops->decode_location (self, location, filter_pspace, &sals);
          do_cleanups (cleanup);
        }
       CATCH (ex, RETURN_MASK_ERROR)
@@ -249,7 +251,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
   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);
 }
 
@@ -262,6 +264,7 @@ print_it_exception_catchpoint (bpstat bs)
   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,