20090-12-30 Jan Kratochvil <jan.kratochvil@redhat.com>

	     Thiago Jung Bauermann  <bauerman@br.ibm.com>

	* breakpoint.c (update_watchpoint): Change b->type to
	bp_watchpoint before calling hw_watchpoint_used_count.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 429e5e051e58514230cfbdf802163b761f0ee069..e7e1802e65ff003f83ee7c562569b5c2dba3f195 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+20090-12-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
+            Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+       * breakpoint.c (update_watchpoint): Change b->type to
+       bp_watchpoint before calling hw_watchpoint_used_count.
+
 2009-12-30  Joel Brobecker  <brobecker@adacore.com>
 
        * breakpoint.c (watchpoint_check): Expand the function description.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 1beb45c46f5cd4b323f3ba657af123d29af48a1f..94ae19bca30f5f10dde8b9b0b5940b14fff7841c 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1152,6 +1152,13 @@ update_watchpoint (struct breakpoint *b, int reparse)
          {
            int i, mem_cnt, other_type_used;
 
+           /* We need to determine how many resources are already used
+              for all other hardware watchpoints to see if we still have
+              enough resources to also fit this watchpoint in as well.
+              To avoid the hw_watchpoint_used_count call below from counting
+              this watchpoint, make sure that it is marked as a software
+              watchpoint.  */
+           b->type = bp_watchpoint;
            i = hw_watchpoint_used_count (bp_hardware_watchpoint,
                                          &other_type_used);
            mem_cnt = can_use_hardware_watchpoint (val_chain);