* breakpoint.c (bpstat_have_active_hw_watchpoints):

	Remove
	(bpstat_stop_status): Remove unused variable
	real_breakpoint.
	* breakpoint.h (bpstat_have_active_hw_watchpoints):
	Remove prototype.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 029292faae5d99768f66fac71d55051c376cf4e3..d1fef99fe04a923ae49aad63538760e5a3833148 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-16  Vladimir Prus  <vladimir@codesourcery.com>
+
+       * breakpoint.c (bpstat_have_active_hw_watchpoints):
+       Remove
+       (bpstat_stop_status): Remove unused variable
+       real_breakpoint.
+       * breakpoint.h (bpstat_have_active_hw_watchpoints):
+       Remove prototype.
+
 2007-12-16  Vladimir Prus  <vladimir@codesourcery.com>
 
        * target.h (target_pid_or_tid_to_str): Remove.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c28784e39807f449d9e1cd2c03e1a0ab7dacfd0a..651ee893c5ce7b0a5faf706884955be8cf79cbcd 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2610,8 +2610,6 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
 {
   struct breakpoint *b = NULL;
   const struct bp_location *bl;
-  /* True if we've hit a breakpoint (as opposed to a watchpoint).  */
-  int real_breakpoint = 0;
   /* Root of the chain of bpstat's */
   struct bpstats root_bs[1];
   /* Pointer to the last thing in the chain currently.  */
@@ -2809,8 +2807,6 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
        /* By definition, an encountered breakpoint is a triggered
           breakpoint. */
        ++(b->hit_count);
-
-       real_breakpoint = 1;
       }
 
     if (frame_id_p (b->frame_id)
@@ -3174,18 +3170,6 @@ bpstat_should_step (void)
   return 0;
 }
 
-/* Nonzero if there are enabled hardware watchpoints. */
-int
-bpstat_have_active_hw_watchpoints (void)
-{
-  const struct bp_location *bpt;
-  ALL_BP_LOCATIONS (bpt)
-    if (breakpoint_enabled (bpt->owner)
-       && bpt->inserted
-       && bpt->loc_type == bp_loc_hardware_watchpoint)
-      return 1;
-  return 0;
-}
 \f
 
 /* Given a bpstat that records zero or more triggered eventpoints, this

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 21d69d324042f6f08ddd0db3014dbb48aa57e92f..6f5fd26afcf41624b09425517289ad26dfab59fc 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -572,9 +572,6 @@ extern struct breakpoint *bpstat_find_step_resume_breakpoint (bpstat);
    just to things like whether watchpoints are set.  */
 extern int bpstat_should_step (void);
 
-/* Nonzero if there are enabled hardware watchpoints. */
-extern int bpstat_have_active_hw_watchpoints (void);
-
 /* Print a message indicating what happened.  Returns nonzero to
    say that only the source line should be printed after this (zero
    return means print the frame as well as the source line).  */