Extra error message from update_watchpoint

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

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;