* src/gdb/target.h: Remove all tests for already defined

[deliverable/binutils-gdb.git] / gdb / breakpoint.c

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 330a53a66b7cc87a1c8807ea97a0925fcc0df46d..35db0f375d141ed51b046160179d4288c471b7b3 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2712,9 +2712,15 @@ watchpoint_check (void *p)
         that the watchpoint frame couldn't be found by frame_find_by_id()
         because the current PC is currently in an epilogue.  Calling
         gdbarch_in_function_epilogue_p() also when fr == NULL fixes that. */
-      if ((!within_current_scope || fr == get_current_frame ())
-          && gdbarch_in_function_epilogue_p (current_gdbarch, read_pc ()))
-       return WP_VALUE_NOT_CHANGED;
+      if (!within_current_scope || fr == get_current_frame ())
+       {
+         struct frame_info *frame = get_current_frame ();
+         struct gdbarch *frame_arch = get_frame_arch (frame);
+         CORE_ADDR frame_pc = get_frame_pc (frame);
+
+         if (gdbarch_in_function_epilogue_p (frame_arch, frame_pc))
+           return WP_VALUE_NOT_CHANGED;
+       }
       if (fr && within_current_scope)
        /* If we end up stopping, the current frame will get selected
           in normal_stop.  So this call to select_frame won't affect
@@ -6631,7 +6637,7 @@ print_exception_catchpoint (struct breakpoint *b)
     breakpoint_adjustment_warning (b->loc->requested_address,
                                   b->loc->address,
                                   b->number, 1);
-  bp_temp = b->loc->owner->disposition == disp_del;
+  bp_temp = b->disposition == disp_del;
   ui_out_text (uiout, 
               bp_temp ? "Temporary catchpoint "
                       : "Catchpoint ");
@@ -6678,7 +6684,7 @@ print_mention_exception_catchpoint (struct breakpoint *b)
   int bp_temp;
   int bp_throw;
 
-  bp_temp = b->loc->owner->disposition == disp_del;
+  bp_temp = b->disposition == disp_del;
   bp_throw = strstr (b->addr_string, "throw") != NULL;
   ui_out_text (uiout, bp_temp ? _("Temporary catchpoint ")
                              : _("Catchpoint "));