2011-05-31 Pedro Alves <pedro@codesourcery.com>

	gdb/gdbserver/
	* linux-x86-low.c (i386_dr_low_get_addr): Fix off by one in
	assertion.
	* win32-i386-low.c (i386_dr_low_get_addr): Ditto.

	gdb/testsuite/
	* gdb.arch/i386-dr3-watch.c: New file.
	* gdb.arch/i386-dr3-watch.exp: New file.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 9bb72d608be784d68dcaeb57f3c1344af105fdc5..cdab7da3c20861a7a59f2c5aa8ee3f04af8c89fb 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-31  Pedro Alves  <pedro@codesourcery.com>
+
+       * linux-x86-low.c (i386_dr_low_get_addr): Fix off by one in
+       assertion.
+       * win32-i386-low.c (i386_dr_low_get_addr): Ditto.
+
 2011-05-16  Adrian Cornish  <gnu@bluedreamer.com>
 
        * linux-i386-ipa.c (supply_static_tracepoint_registers): Pass

diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index 88f177d763808bf6cd812bba6d31b3c27a98d322..69c6b57134cd08811846c1e3881994d0b2d4b033 100644 (file)
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -508,7 +508,7 @@ i386_dr_low_get_addr (int regnum)
   ptid_t ptid = ptid_of (lwp);
 
   /* DR6 and DR7 are retrieved with some other way.  */
-  gdb_assert (DR_FIRSTADDR <= regnum && regnum < DR_LASTADDR);
+  gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
 
   return x86_linux_dr_get (ptid, regnum);
 }

diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 6063df855625377e4b0420db90bd96c0812d7cf0..c29b9b040ee7297e88fd015552b8381d1e446a4b 100644 (file)
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -61,7 +61,7 @@ i386_dr_low_set_addr (const struct i386_debug_reg_state *state, int regnum)
 CORE_ADDR
 i386_dr_low_get_addr (int regnum)
 {
-  gdb_assert (DR_FIRSTADDR <= regnum && regnum < DR_LASTADDR);
+  gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
 
   return debug_reg_state.dr_mirror[regnum];
 }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 89a2de6815c8c9348c6f68b7f95b38aeaed841db..aeda9a97a62b0a6c6bdee2729c50a26d6c542ede 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-31  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.arch/i386-dr3-watch.c: New file.
+       * gdb.arch/i386-dr3-watch.exp: New file.
+
 2011-05-24  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.trace/tfile.exp: Add test that opening the basic.tf trace