OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extra error message from update_watchpoint

Browse Source 
https://sourceware.org/ml/gdb-patches/2013-10/msg00551.html

gdb/ChangeLog

	* breakpoint.c (update_watchpoint): Update error message and add
	an additional error message.

gdb/testsuite/ChangeLog

	* gdb.base/watchpoint.exp (test_no_hw_watchpoints): Add additional
	tests and update expected error message.
	(test_watch_register_location): New tests.
	(do_tests): Call test_watch_register_location.
	* gdb.base/watchpoints.exp: Update expected error message.
This commit is contained in:
Andrew Burgess 2013-10-29 16:33:42 +00:00
parent dd0845d708
commit 638aa5a1ba
5 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-31 Andrew Burgess <aburgess@broadcom.com>
* breakpoint.c (update_watchpoint): Update error message and add
an additional error message.
2013-10-30 Andreas Arnez <arnez@linux.vnet.ibm.com>
* s390-tdep.h: Rename to...

13
gdb/breakpoint.c
View File

@ -1805,7 +1805,8 @@ update_watchpoint (struct watchpoint *b, int reparse)
if (b->base.ops->works_in_software_mode (&b->base))
b->base.type = bp_watchpoint;
else
error (_("Software read/access watchpoints not supported."));
error (_("Can't set read/access watchpoint when "
"hardware watchpoints are disabled."));
}
}
else if (within_current_scope && b->exp)
@ -1946,8 +1947,14 @@ update_watchpoint (struct watchpoint *b, int reparse)
}
}
else if (!b->base.ops->works_in_software_mode (&b->base))
error (_("Expression cannot be implemented with "
"read/access watchpoint."));
{
if (!can_use_hw_watchpoints)
error (_("Can't set read/access watchpoint when "
"hardware watchpoints are disabled."));
else
error (_("Expression cannot be implemented with "
"read/access watchpoint."));
}
else
b->base.type = bp_watchpoint;

8
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2013-10-31 Andrew Burgess <aburgess@broadcom.com>
* gdb.base/watchpoint.exp (test_no_hw_watchpoints): Add additional
tests and update expected error message.
(test_watch_register_location): New tests.
(do_tests): Call test_watch_register_location.
* gdb.base/watchpoints.exp: Update expected error message.
2013-10-30 Andreas Arnez <arnez@linux.vnet.ibm.com>
* gdb.arch/s390-multiarch.exp (test_linux_v2): Add $gdb_prompt to

24
gdb/testsuite/gdb.base/watchpoint.exp
View File

@ -825,8 +825,12 @@ proc test_no_hw_watchpoints {} {
# refrains from using them.
#
gdb_test "rwatch ival3" \
"Expression cannot be implemented with read/access watchpoint..*" \
"Can't set read/access watchpoint when hardware watchpoints are disabled." \
"rwatch disallowed when can-set-hw-watchpoints cleared"
gdb_test "awatch ival3" \
"Can't set read/access watchpoint when hardware watchpoints are disabled." \
"awatch disallowed when can-set-hw-watchpoints cleared"
# Re-enable hardware watchpoints if necessary.
if ![target_info exists gdb,no_hardware_watchpoints] {
@ -879,6 +883,22 @@ proc test_watchpoint_in_big_blob {} {
gdb_test_no_output "delete \$bpnum" "delete watch buf"
}
proc test_watch_register_location {} {
global no_hw
if {!$no_hw && ![target_info exists gdb,no_hardware_watchpoints]} {
# Non-memory read/access watchpoints are not supported, they would
# require software read/access watchpoint support (which is not
# currently available).
gdb_test "rwatch \$pc" \
"Expression cannot be implemented with read/access watchpoint..*" \
"rwatch disallowed for register based expression"
gdb_test "awatch \$pc" \
"Expression cannot be implemented with read/access watchpoint..*" \
"awatch disallowed for register based expression"
}
}
# Start with a fresh gdb.
set prev_timeout $timeout
@ -940,6 +960,8 @@ proc do_tests {} {
test_wide_location_1
test_wide_location_2
test_watch_register_location
}
# On targets that can do hardware watchpoints, run the tests twice:

4
gdb/testsuite/gdb.base/watchpoints.exp
View File

@ -41,10 +41,10 @@ with_test_prefix "before inferior start" {
# and read watchpoints require hardware watchpoint support, with this
# turned off these can't be created.
gdb_test "awatch ival1" \
"Software read/access watchpoints not supported." \
"Can't set read/access watchpoint when hardware watchpoints are disabled." \
"create access watchpoint"
gdb_test "rwatch ival1" \
"Software read/access watchpoints not supported." \
"Can't set read/access watchpoint when hardware watchpoints are disabled." \
"create read watchpoint"
}