gdb ChangeLog entry:

	* i386-nat.c (i386_stopped_data_address): Also check that
	hitted watch register is not vacant.

	gdb/testsuite ChangeLog entry:
	New test for two watchpoints, with disabling of
	the first inserted.
	* testsuite/gdb.base/watchpoints.c: New file.
	* testsuite/gdb.base/watchpoints.exp: New file.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70daf208392fc67d20ba23570793d83ebdf5d075..5ff3e25d20dafcfec30a005b6fe4c1d8504f14f2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-26  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+       * i386-nat.c (i386_stopped_data_address): Also check that
+       hitted watch register is not vacant.
+
 2009-09-23  Joel Brobecker  <brobecker@adacore.com>
 
        * record.c (record_open, record_store_registers, record_xfer_partial):

diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index ab1bd8a83febc4fa5da46c27d7d351074d130519..325b4df6ca1a95294bcb449c9a8740288adedfa9 100644 (file)
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -555,7 +555,10 @@ i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
             that GDB doesn't call the target_stopped_data_address
             method except for data watchpoints.  In other words, I'm
             being paranoiac.  */
-         && I386_DR_GET_RW_LEN (i) != 0)
+         && I386_DR_GET_RW_LEN (i) != 0
+         /* This third condition makes sure DRi is not vacant, this
+            avoids false positives in windows-nat.c.  */
+         && !I386_DR_VACANT (i))
        {
          addr = dr_mirror[i];
          rc = 1;

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ea4285914f5b43bebeb5be26b2fbde4c5bcb2cae..f1c13b73fb3086f7d6210a412ec5240355fb12ec 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-26  Pierre Muller  <muller@ics.u-strasbg.fr>
+       
+       New test for two watchpoints, with disabling of
+       the first inserted.
+       * testsuite/gdb.base/watchpoints.c: New file.
+       * testsuite/gdb.base/watchpoints.exp: New file.
+
 2009-09-22  Tom Tromey  <tromey@redhat.com>
 
        * gdb.python/py-function.exp: Add regression tests.