From d74c3fec7aa13bd3b061a5eccaaa506d9b8a876f Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sat, 26 Sep 2009 12:10:57 +0000 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/i386-nat.c | 5 ++++- gdb/testsuite/ChangeLog | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 70daf208392..5ff3e25d20d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-09-26 Pierre Muller + + * i386-nat.c (i386_stopped_data_address): Also check that + hitted watch register is not vacant. + 2009-09-23 Joel Brobecker * record.c (record_open, record_store_registers, record_xfer_partial): diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c index ab1bd8a83fe..325b4df6ca1 100644 --- 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 ea4285914f5..f1c13b73fb3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-09-26 Pierre Muller + + 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 * gdb.python/py-function.exp: Add regression tests. -- 2.47.2