From 7b838ca220ab177d288bca2629d73b50ebbe7abc Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann Date: Wed, 30 Dec 2009 20:11:49 +0000 Subject: [PATCH] 20090-12-30 Jan Kratochvil Thiago Jung Bauermann * breakpoint.c (update_watchpoint): Change b->type to bp_watchpoint before calling hw_watchpoint_used_count. --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 429e5e051e5..e7e1802e65f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +20090-12-30 Jan Kratochvil + Thiago Jung Bauermann + + * breakpoint.c (update_watchpoint): Change b->type to + bp_watchpoint before calling hw_watchpoint_used_count. + 2009-12-30 Joel Brobecker * breakpoint.c (watchpoint_check): Expand the function description. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1beb45c46f5..94ae19bca30 100644 --- 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); -- 2.30.2