From 3dab3ca56ce8c04e415037fe463421c48dbb3a48 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 31 May 2011 21:23:41 +0000 Subject: [PATCH] 2011-05-31 Pedro Alves 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. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-x86-low.c | 2 +- gdb/gdbserver/win32-i386-low.c | 2 +- gdb/testsuite/ChangeLog | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 9bb72d608be..cdab7da3c20 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2011-05-31 Pedro Alves + + * 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 * 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 88f177d7638..69c6b57134c 100644 --- 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 6063df85562..c29b9b040ee 100644 --- 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 89a2de6815c..aeda9a97a62 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-31 Pedro Alves + + * gdb.arch/i386-dr3-watch.c: New file. + * gdb.arch/i386-dr3-watch.exp: New file. + 2011-05-24 Pedro Alves * gdb.trace/tfile.exp: Add test that opening the basic.tf trace -- 2.47.2