ChangeLog:

2009-12-03  Paul Pluzhnikov  <ppluzhnikov@google.com>

	PR gdb/11022

	* breakpoint.c (invalidate_bp_value_on_memory_change):
	New function.
	(_initialize_breakpoint): Add it as memory change observer.

testsuite/ChangeLog:

2009-12-03  Paul Pluzhnikov  <ppluzhnikov@google.com>

       PR gdb/11022

       * gdb.base/pr11022.exp: New test.
       * gdb.base/pr11022.c: New test.

5 files changed, 135 insertions, 0 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2175f8c..f969a9e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-03  Paul Pluzhnikov  <ppluzhnikov@google.com>
+	
+	PR gdb/11022
+
+	* breakpoint.c (invalidate_bp_value_on_memory_change):
+	New function.
+	(_initialize_breakpoint): Add it as memory change observer.
+
 2009-12-03  Tristan Gingold  <gingold@adacore.com>
 
 	* machoread.c (macho_sym_fns): Set sym_segment routine.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4340c5d..5394ae4 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9490,6 +9490,35 @@ show_breakpoint_cmd (char *args, int from_tty)
 {
 }
 
+/* Invalidate last known value of any hardware watchpoint if
+   the memory which that value represents has been written to by
+   GDB itself.  */
+
+static void
+invalidate_bp_value_on_memory_change (CORE_ADDR addr, int len,
+				      const bfd_byte *data)
+{
+  struct breakpoint *bp;
+
+  ALL_BREAKPOINTS (bp)
+    if (bp->enable_state == bp_enabled
+	&& bp->type == bp_hardware_watchpoint
+	&& bp->val_valid && bp->val)
+      {
+	struct bp_location *loc;
+
+	for (loc = bp->loc; loc != NULL; loc = loc->next)
+	  if (loc->loc_type == bp_loc_hardware_watchpoint
+	      && loc->address + loc->length > addr
+	      && addr + len > loc->address)
+	    {
+	      value_free (bp->val);
+	      bp->val = NULL;
+	      bp->val_valid = 0;
+	    }
+      }
+}
+
 /* Use default_breakpoint_'s, or nothing if they aren't valid.  */
 
 struct symtabs_and_lines
@@ -10077,6 +10106,7 @@ _initialize_breakpoint (void)
 
   observer_attach_solib_unloaded (disable_breakpoints_in_unloaded_shlib);
   observer_attach_inferior_exit (clear_syscall_counts);
+  observer_attach_memory_changed (invalidate_bp_value_on_memory_change);
 
   breakpoint_chain = 0;
   /* Don't bother to call set_breakpoint_count.  $bpnum isn't useful
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e397142..9c95f3f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-03  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       PR gdb/11022
+
+       * gdb.base/pr11022.exp: New test.
+       * gdb.base/pr11022.c: New test.	
+	
 2009-12-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix spurious false FAILs.
diff --git a/gdb/testsuite/gdb.base/pr11022.c b/gdb/testsuite/gdb.base/pr11022.c
new file mode 100644
index 0000000..132ef65
--- /dev/null
+++ b/gdb/testsuite/gdb.base/pr11022.c
@@ -0,0 +1,32 @@
+/* This test is part of GDB, the GNU debugger.
+
+   Copyright 2009 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+int x;
+
+int
+main ()
+{
+  int i, j;
+
+  for (i = 0; i < 500; ++i) {
+    j = 0;  /* break here */
+    x = 42;
+    j = i;  /* expect HW watchpoint stop */
+  }
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
new file mode 100644
index 0000000..3f508ee
--- /dev/null
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -0,0 +1,58 @@
+# Copyright 2009
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+if [target_info exists gdb,no_hardware_watchpoints] {
+    # This test requires HW watchpoints
+    untested pr11022.exp
+    return -1
+}
+
+set testfile "pr11022"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+     untested pr11022.exp
+     return -1
+}
+
+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if ![runto_main] then {
+    fail "Can't run to main"
+    return 0
+}
+
+gdb_test "break [gdb_get_line_number "break here"]" \
+	".*Breakpoint.* at .*" \
+	"set breakpoint"
+
+gdb_test "watch x" ".*Hardware watchpoint.*" "set watchpoint"
+gdb_test "continue" ".*break here.*" "breakpoint hit"
+gdb_test "continue" ".*Hardware watchpoint.*Old value = 0.*New value = 42.*" \
+    "watchpoint hit"
+gdb_test "continue" ".*break here.*" "breakpoint hit 2"
+gdb_test "set var x = 1"
+gdb_test "continue" ".*Hardware watchpoint.*Old value = 1.*New value = 42.*" \
+    "watchpoint hit 2"