diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp | 27 |
2 files changed, 33 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0d5d07f..f28a08f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-04-10 Yao Qi <yao.qi@linaro.org> + + * gdb.base/watchpoint-reuse-slot.exp (valid_addr_p): Return + false for some offset and width combinations which aren't + supported by linux kernel. + 2015-04-10 Pedro Alves <palves@redhat.com> * gdb.threads/step-over-lands-on-breakpoint.exp (do_test): New diff --git a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp index 6d2c867..abe81d6 100644 --- a/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp +++ b/gdb/testsuite/gdb.base/watchpoint-reuse-slot.exp @@ -150,6 +150,33 @@ proc valid_addr_p {cmd offset width} { return 0 } } + } elseif { [istarget "arm*-*-linux*"] } { + if { $cmd == "hbreak" } { + # Breakpoints must be of length 2 (thumb) or 4 (ARM) bytes. + if { $width != 2 && $width != 4 } { + return 0 + } + } else { + # Watchpoints can be of length 1, 2, 4 or 8 bytes. + if { [expr $width % 2] != 0 } { + return 0 + } + } + + if { [expr ($offset) % 8] == 0 && $width == 8 } { + # If WIDTH is 8 byte, the address should be 8-byte aligned. + return 1 + } elseif { [expr ($offset) % 4] == 0 } { + return 1 + } elseif { [expr ($offset) % 4] == 2 && $width == 2 } { + # Halfword watchpoints and breakpoints. + return 1 + } elseif { [expr ($offset) % 4] == 1 && $width == 1 && $cmd != "hbreak" } { + # Single byte watchpoints. + return 1 + } else { + return 0 + } } return 1 |