hbreak.exp: Test hardware breakpoints

hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

Hello,

 This is hbreak.exp, a complement to break.exp, derived from same, which 
is meant to test hardware breakpoints as implemented by the "hbreak" and 
"thbreak" commands (which are not covered by the test suite as of now).  
As the number of hardware breakpoints is usually limited the script has 
been modified to only have a single such breakpoint set up at any given 
time.

 This script has been tested natively for i386-linux-gnu with all the 
tests passing.

2007-09-12  Maciej W. Rozycki  <macro@mips.com>

	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".

 OK to apply?

  Maciej

14591.diff
Index: binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp	2007-09-12 17:19:47.000000000 +0100
@@ -0,0 +1,905 @@
+#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2002, 2003, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# Based on break.exp by Rob Savoye. (rob@cygnus.com)
+# Only one hardware breakpoint is set at a time as targets may limit
+# the number of ones available.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+
+#
+# test running programs
+#
+set prms_id 0
+set bug_id 0
+
+set testfile "break"
+set srcfile ${testfile}.c
+set srcfile1 ${testfile}1.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if [target_info exists gdb_stub] {
+    gdb_step_for_stub;
+}
+
+#
+# Test whether the target supports hardware breakpoints at all.
+#
+send_gdb "hbreak main\n"
+gdb_expect {
+    -re "No hardware breakpoint support in the target.*$" {
+	unsupported "hardware breakpoints"
+	return
+    }
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*$" {
+	pass "hardware breakpoint support"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "hardware breakpoint support"
+    }
+    timeout {
+	fail "hardware breakpoint support (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# Test simple hardware breakpoint setting commands
+#
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file"
+delete_breakpoints
+
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+
+#
+# test break at line number
+#
+# Note that the default source file is the last one whose source text
+# was printed.  For native debugging, before we've executed the
+# program, this is the file containing main, but for remote debugging,
+# it's wherever the processor was stopped when we connected to the
+# board.  So, to be sure, we do a list command.
+#
+gdb_test "list main" \
+    ".*main \\(argc, argv, envp\\).*" \
+    "use `list' to establish default source file"
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number"
+delete_breakpoints
+
+set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
+
+#
+# test break at line number in file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file"
+delete_breakpoints
+
+set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
+set bp_location4 [gdb_get_line_number "set breakpoint 4 here"]
+
+#
+# Test putting a break at the start of a multi-line if conditional.
+# Verify the breakpoint was put at the start of the conditional.
+#
+gdb_test "hbreak multi_line_if_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location3\\." \
+    "hardware breakpoint at start of multi line if conditional"
+delete_breakpoints
+
+gdb_test "hbreak multi_line_while_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
+    "hardware breakpoint at start of multi line while conditional"
+
+set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
+set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
+
+#
+# check to see what breakpoints are set
+#
+if [target_info exists gdb_stub] {
+    set main_line $bp_location5
+} else {
+    set main_line $bp_location6
+}
+
+if {$hp_aCC_compiler} {
+    set proto "\\(int\\)"
+} else {
+    set proto ""
+}
+
+set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
+set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
+set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
+
+gdb_test "info break" \
+    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
+\[0-9\]+\[\t \]+hw breakpoint  keep y.* in multi_line_while_conditional at .*$srcfile:$bp_location4" \
+    "breakpoint info"
+delete_breakpoints
+
+# FIXME: The rest of this test doesn't work with anything that can't
+# handle arguments.
+# Huh? There doesn't *appear* to be anything that passes arguments
+# below.
+if [istarget "mips-idt-*"] then {
+    return
+}
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function (2)"
+if ![target_info exists use_gdb_stub] {
+  if [istarget "*-*-vxworks*"] then {
+    send_gdb "run vxmain \"2\"\n"
+    set timeout 120
+    verbose "Timeout is now $timeout seconds" 2
+  } else {
+	send_gdb "run\n"
+  }
+  gdb_expect {
+    -re "The program .* has been started already.*y or n. $" {
+	send_gdb "y\n"
+	exp_continue
+    }
+    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $"\
+			    { pass "run until function breakpoint" }
+    -re ".*$gdb_prompt $"       { fail "run until function breakpoint" }
+    timeout		    { fail "run until function breakpoint (timeout)" }
+  }
+} else {
+    if ![target_info exists gdb_stub] {
+	gdb_test continue ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" "stub continue"
+    }
+}
+delete_breakpoints
+
+#
+# run until the breakpoint at a line number
+#
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
+			"run until breakpoint set at a line number"
+delete_breakpoints
+
+#
+# Run until the breakpoint set in a function in a file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file (2)"
+for {set i 6} {$i >= 1} {incr i -1} {
+	gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, factorial \\(value=$i\\) at .*$srcfile:$bp_location7.*$bp_location7\[\t \]+.*if .value > 1. \{.*" \
+			"run until file:function($i) breakpoint"
+}
+delete_breakpoints
+
+#
+# Run until the breakpoint set at a quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*" \
+		"run until quoted breakpoint"
+delete_breakpoints
+#
+# run until the file:function breakpoint at a line number in a file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location2.*$bp_location2\[\t \]+argc = \\(argc == 12345\\);.*" \
+		"run until file:linenum breakpoint"
+delete_breakpoints
+
+# Test break at offset +1
+set bp_location10 [gdb_get_line_number "set breakpoint 10 here"]
+
+gdb_test "hbreak +1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location10\\." \
+    "hardware breakpoint offset +1"
+
+# Check to see if breakpoint is hit when stepped onto
+
+gdb_test "step" \
+    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10.*$bp_location10\[\t \]+return argc;.*breakpoint 10 here.*" \
+    "step onto hardware breakpoint"
+
+#
+# delete all breakpoints so we can start over, course this can be a test too
+#
+delete_breakpoints
+
+#
+# test temporary breakpoint at function
+#
+
+gdb_test "thbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+
+gdb_test "thbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function in file"
+delete_breakpoints
+
+#
+# test break at line number
+#
+send_gdb "thbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+gdb_test "thbreak $bp_location6" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location6.*" \
+    "temporary hardware breakpoint line number #2"
+delete_breakpoints
+
+#
+# test break at line number in file
+#
+send_gdb "thbreak $srcfile:$bp_location2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number in file #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number in file #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number in file #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
+gdb_test "thbreak $srcfile:$bp_location11" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location11.*" \
+    "temporary hardware breakpoint line number in file #2"
+
+#
+# check to see what breakpoints are set (temporary this time)
+#
+gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\]
+\[0-9\]+\[\t \]+hw breakpoint  del.*y.*in main at .*$srcfile:$bp_location11.*" \
+    "temporary hardware breakpoint info"
+
+
+#***********
+
+if ![runto_main] then { fail "break tests suppressed" }
+
+# Verify that GDB responds gracefully when asked to set a breakpoint
+# on a nonexistent source line.
+#
+send_gdb "hbreak 999\n"
+gdb_expect {
+    -re "No line 999 in file .*$gdb_prompt $" {
+	pass "hardware break on non-existent source line"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on non-existent source line"
+    }
+    timeout {
+	fail "(timeout) hardware break on non-existent source line"
+    }
+}
+
+# Run to the desired default location. If not positioned here, the
+# tests below don't work.
+#
+gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1"
+
+
+# Verify that GDB allows one to just say "break", which is treated
+# as the "default" breakpoint.  Note that GDB gets cute when printing
+# the informational message about other breakpoints at the same
+# location.  We'll hit that bird with this stone too.
+#
+send_gdb "hbreak\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint \[0-9\]*.*$gdb_prompt $" {
+	pass "hardware break on default location"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on default location"
+    }
+    timeout {
+	fail "(timeout) hardware break on default location, 1st time"
+    }
+}
+
+# Verify that a "silent" breakpoint can be set, and that GDB is indeed
+# "silent" about its triggering.
+#
+if ![runto_main] then { fail "break tests suppressed" }
+
+send_gdb "hbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $" {
+	pass "set to-be-silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "set to-be-silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set to-be-silent break bp_location1"
+    }
+}
+
+send_gdb "commands $expect_out(1,string)\n"
+send_gdb "silent\n"
+send_gdb "end\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "set silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set silent hardware break bp_location1"
+    }
+}
+
+send_gdb "info break $expect_out(1,string)\n"
+gdb_expect {
+    -re "\[0-9\]*\[ \t\]*hw breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $" {
+	pass "info silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "info silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) info silent hardware break bp_location1"
+    }
+}
+send_gdb "continue\n"
+gdb_expect {
+    -re "Continuing.\r\n$gdb_prompt $" {
+	pass "hit silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) hit silent hardware break bp_location1"
+    }
+}
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0  main .* at .*:$bp_location1.*$gdb_prompt $" {
+	pass "stopped for silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "stopped for silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) stopped for hardware silent break bp_location1"
+    }
+}
+
+# Verify that GDB can at least parse a breakpoint with the
+# "thread" keyword.  (We won't attempt to test here that a
+# thread-specific breakpoint really triggers appropriately.
+# The gdb.threads subdirectory contains tests for that.)
+#
+set bp_location12 [gdb_get_line_number "set breakpoint 12 here"]
+send_gdb "hbreak $bp_location12 thread 999\n"
+gdb_expect {
+    -re "Unknown thread 999.*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+}
+send_gdb "hbreak $bp_location12 thread foo\n"
+gdb_expect {
+    -re "Junk after thread keyword..*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a breakpoint command with
+# trailing garbage.
+#
+send_gdb "hbreak $bp_location12 foo\n"
+gdb_expect {
+    -re "Junk at end of arguments..*$gdb_prompt $" {
+	pass "hardware breakpoint with trailing garbage disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware breakpoint with trailing garbage disallowed"
+    }
+    timeout {
+	fail "(timeout) hardware breakpoint with trailing garbage disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a "clear" command that has
+# no matching breakpoint.  (First, get us off the current source line,
+# which we know has a breakpoint.)
+#
+send_gdb "next\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "step over hardware breakpoint"
+    }
+    timeout {
+	fail "(timeout) step over hardware breakpoint"
+    }
+}
+send_gdb "clear 81\n"
+gdb_expect {
+    -re "No breakpoint at 81..*$gdb_prompt $" {
+	pass "clear line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear line has no breakpoint disallowed"
+    }
+}
+send_gdb "clear\n"
+gdb_expect {
+    -re "No breakpoint at this line..*$gdb_prompt $" {
+	pass "clear current line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear current line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear current line has no breakpoint disallowed"
+    }
+}
+delete_breakpoints
+
+# Verify that a breakpoint can be set via a convenience variable.
+#
+send_gdb "set \$foo=$bp_location11\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to bp_location11"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to bp_location11"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location11.*$gdb_prompt $" {
+	pass "set hardware breakpoint via convenience variable"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via convenience variable"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via convenience variable"
+    }
+}
+delete_breakpoints
+
+# Verify that GDB responds gracefully to an attempt to set a
+# breakpoint via a convenience variable whose type is not integer.
+#
+send_gdb "set \$foo=81.5\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to 81.5"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to 81.5"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Convenience variables used in line specs must have integer values..*$gdb_prompt $" {
+	pass "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+}
+
+# Verify that we can set and trigger a breakpoint in a user-called function.
+#
+send_gdb "hbreak marker2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $" {
+	pass "set hardware breakpoint on to-be-called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint on to-be-called function"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint on to-be-called function"
+    }
+}
+send_gdb "print marker2(99)\n"
+gdb_expect {
+    -re "The program being debugged stopped while in a function called from GDB.\r\nWhen the function .marker2$proto. is done executing, GDB will silently\r\nstop .instead of continuing to evaluate the expression containing\r\nthe function call...*$gdb_prompt $" {
+	pass "hit hardware breakpoint on called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit hardware breakpoint on called function"
+    }
+    timeout {
+	fail "(timeout) hit hardware breakpoint on called function"
+    }
+}
+
+# As long as we're stopped (breakpointed) in a called function,
+# verify that we can successfully backtrace & such from here.
+#
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "backtrace while in called function"
+    }
+    timeout {
+	fail "(timeout) backtrace while in called function"
+    }
+}
+
+# Return from the called function.  For remote targets, it's important to do
+# this before runto_main, which otherwise may silently stop on the dummy
+# breakpoint inserted by GDB at the program's entry point.
+#
+send_gdb "finish\n"
+gdb_expect {
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "finish from called function"
+    }
+    timeout {
+	fail "(timeout) finish from called function"
+    }
+}
+
+#********
+
+
+#
+# Test "next" over recursive function call.
+#
+
+proc test_next_with_recursion {} {
+    global gdb_prompt
+    global decimal
+    global binfile
+
+    if [target_info exists use_gdb_stub] {
+	# Reload the program.
+	delete_breakpoints
+	gdb_load ${binfile};
+    } else {
+	# FIXME: should be using runto
+	gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+
+	delete_breakpoints
+    }
+
+    gdb_test "hbreak factorial" \
+	"Hardware assisted breakpoint $decimal at .*" \
+	"hardware break at factorial"
+
+    # Run until we call factorial with 6
+
+    if [istarget "*-*-vxworks*"] then {
+	send_gdb "run vxmain \"6\"\n"
+    } else {
+	gdb_run_cmd
+    }
+    gdb_expect {
+	-re "Break.* factorial .value=6. .*$gdb_prompt $" {}
+	-re ".*$gdb_prompt $" {
+	    fail "run to factorial(6)";
+	    gdb_suppress_tests;
+	}
+	timeout {
+	    fail "run to factorial(6) (timeout)";
+	    gdb_suppress_tests;
+	}
+    }
+
+    # Continue until we call factorial recursively with 5.
+
+    if [gdb_test "continue" \
+	"Continuing.*Break.* factorial .value=5. .*" \
+	"continue to factorial(5)"] then { gdb_suppress_tests }
+
+    # Do a backtrace just to confirm how many levels deep we are.
+
+    if [gdb_test "backtrace" \
+	"#0\[ \t\]+ factorial .value=5..*" \
+	"backtrace from factorial(5)"] then { gdb_suppress_tests }
+
+    # Now a "next" should position us at the recursive call, which
+    # we will be performing with 4.
+
+    if [gdb_test "next" \
+	".* factorial .value - 1.;.*" \
+	"next to recursive call"] then { gdb_suppress_tests }
+
+    # Disable the breakpoint at the entry to factorial by deleting them all.
+    # The "next" should run until we return to the next line from this
+    # recursive call to factorial with 4.
+    # Buggy versions of gdb will stop instead at the innermost frame on
+    # the line where we are trying to "next" to.
+
+    delete_breakpoints
+
+    if [istarget "mips*tx39-*"] {
+	set timeout 60
+    }
+    # We used to set timeout here for all other targets as well.  This
+    # is almost certainly wrong.  The proper timeout depends on the
+    # target system in use, and how we communicate with it, so there
+    # is no single value appropriate for all targets.  The timeout
+    # should be established by the Dejagnu config file(s) for the
+    # board, and respected by the test suite.
+    #
+    # For example, if I'm running GDB over an SSH tunnel talking to a
+    # portmaster in California talking to an ancient 68k board running
+    # a crummy ROM monitor (a situation I can only wish were
+    # hypothetical), then I need a large timeout.  But that's not the
+    # kind of knowledge that belongs in this file.
+
+    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
+	    "next over recursive call"
+
+    # OK, we should be back in the same stack frame we started from.
+    # Do a backtrace just to confirm.
+
+    set result [gdb_test "backtrace" \
+	    "#0\[ \t\]+ factorial .value=120.*\r\n#1\[ \t\]+ \[0-9a-fx\]+ in factorial .value=6..*" \
+	    "backtrace from factorial(5.1)"]
+    if { $result != 0 } { gdb_suppress_tests }
+
+    if [target_info exists gdb,noresults] { gdb_suppress_tests }
+    gdb_continue_to_end "recursive next test"
+    gdb_stop_suppressing_tests;
+}
+
+test_next_with_recursion
+
+
+#********
+
+# build a new file with optimization enabled so that we can try breakpoints
+# on targets with optimized prologues
+
+set binfileo2 ${objdir}/${subdir}/${testfile}o2
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug "additional_flags=-w -O2"}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug "additional_flags=-w -O2"}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if  { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug additional_flags=-w}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if [get_compiler_info ${binfileo2}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfileo2}
+
+if [target_info exists gdb_stub] {
+    gdb_step_for_stub;
+}
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function, optimized file"
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+if ![target_info exists use_gdb_stub] {
+    if [istarget "*-*-vxworks*"] then {
+	send_gdb "run vxmain \"2\"\n"
+	set timeout 120
+	verbose "Timeout is now $timeout seconds" 2
+    } else {
+	send_gdb "run\n"
+    }
+    gdb_expect {
+	-re "The program .* has been started already.*y or n. $" {
+	    send_gdb "y\n"
+	    exp_continue
+	}
+	-re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $" {
+	    pass "run until function breakpoint, optimized file"
+	}
+	-re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$gdb_prompt $" {
+	    pass "run until function breakpoint, optimized file (code motion)"
+	}
+	-re ".*$gdb_prompt $" {
+	    fail "run until function breakpoint, optimized file"
+	}
+	timeout {
+	    fail "run until function breakpoint, optimized file (timeout)"
+	}
+    }
+} else {
+    if ![target_info exists gdb_stub] {
+	gdb_test continue \
+	    ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" \
+	    "stub continue, optimized file"
+    }
+}
+delete_breakpoints
+
+#
+# test break at function
+#
+gdb_test "hbreak marker4" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint small function, optimized file"
+
+#
+# run until the breakpoint at a small function
+#
+
+#
+# Add a second pass pattern.  The behavior differs here between stabs
+# and dwarf for one-line functions.  Stabs preserves two line symbols
+# (one before the prologue and one after) with the same line number,
+# but dwarf regards these as duplicates and discards one of them.
+# Therefore the address after the prologue (where the breakpoint is)
+# has no exactly matching line symbol, and GDB reports the breakpoint
+# as if it were in the middle of a line rather than at the beginning.
+
+set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
+set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
+send_gdb "continue\n"
+gdb_expect {
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" {
+	# marker4() is defined at line 46 when compiled with -DPROTOTYPES
+	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
+    }
+    -re ".*$gdb_prompt " {
+	fail "run until breakpoint set at small function, optimized file"
+    }
+    timeout {
+	fail "run until breakpoint set at small function, optimized file (timeout)"
+    }
+}
+
+
+# Reset the default arguments for VxWorks
+if [istarget "*-*-vxworks*"] {
+    set timeout 10
+    verbose "Timeout is now $timeout seconds" 2
+    send_gdb "set args main\n"
+    gdb_expect -re ".*$gdb_prompt $" {}
+}

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Wed, Sep 12, 2007 at 07:09:39PM +0100, Maciej W. Rozycki wrote:
> Hello,
> 
>  This is hbreak.exp, a complement to break.exp, derived from same, which 
> is meant to test hardware breakpoints as implemented by the "hbreak" and 
> "thbreak" commands (which are not covered by the test suite as of now).  
> As the number of hardware breakpoints is usually limited the script has 
> been modified to only have a single such breakpoint set up at any given 
> time.
> 
>  This script has been tested natively for i386-linux-gnu with all the 
> tests passing.
> 
> 2007-09-12  Maciej W. Rozycki  <macro@mips.com>
> 
> 	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".
> 
>  OK to apply?

No, sorry.  Compare this to the current break.exp - you'll see
that it has some cruft that was cleaned out of that testcase, like
gdb_suppress_entire_file.

Also, when I try it using gdbserver it fails a lot of tests.  This
is at least partially related to the previous problem (gdb_run_cmd
was added).  I wanted to see what happened on a target that only
failed to insert hardware breakpoints at continue.

-- 
Daniel Jacobowitz
CodeSourcery

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Fri, 21 Sep 2007, Daniel Jacobowitz wrote:

> > 2007-09-12  Maciej W. Rozycki  <macro@mips.com>
> > 
> > 	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".
> > 
> >  OK to apply?
> 
> No, sorry.  Compare this to the current break.exp - you'll see
> that it has some cruft that was cleaned out of that testcase, like
> gdb_suppress_entire_file.

 That's doable -- I have missed these changes were done somehow, sorry.  
I will apply them and resubmit.

> Also, when I try it using gdbserver it fails a lot of tests.  This
> is at least partially related to the previous problem (gdb_run_cmd
> was added).  I wanted to see what happened on a target that only
> failed to insert hardware breakpoints at continue.

 I do not have such a target, so I do not have means to test.  
Conservatively, I used one breakpoint only, so it should not normally 
happen as there will be at most a single such breakpoint enabled at any 
given time.  If there is a target for which it is not enough of an 
assumption indeed, I can see what can be done, though the maintainer of 
the target is welcome to provide some support with that.

 I have a MIPS target down the queue for which I have not submitted 
support yet, using EJTAG, but with that the smallest number of hardware 
breakpoints I have encountered in a given CPU was eight (and the i386 in 
its regular mode of operation has four).  It was this target I created 
this test script in the first place and, as you may expect, it passes all 
the tests included (though changes to gdb itself were required; these are 
pending too).

  Maciej

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Mon, Sep 24, 2007 at 12:23:28PM +0100, Maciej W. Rozycki wrote:
> > Also, when I try it using gdbserver it fails a lot of tests.  This
> > is at least partially related to the previous problem (gdb_run_cmd
> > was added).  I wanted to see what happened on a target that only
> > failed to insert hardware breakpoints at continue.
> 
>  I do not have such a target, so I do not have means to test.  

Actually, I think you do.  I think this is what will happen with
gdbserver.  The remote target advertises watchpoint support, but
gdbserver does not support watchpoints, so the Z0 packet will fail.

There's an appropriate board file on the wiki, or I'm happy to test
that case for you; that's what I was trying to do.

-- 
Daniel Jacobowitz
CodeSourcery

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Mon, 24 Sep 2007, Daniel Jacobowitz wrote:

> Actually, I think you do.  I think this is what will happen with
> gdbserver.  The remote target advertises watchpoint support, but
> gdbserver does not support watchpoints, so the Z0 packet will fail.
> 
> There's an appropriate board file on the wiki, or I'm happy to test
> that case for you; that's what I was trying to do.

 I have tried that file (from 
http://sourceware.org/gdb/wiki/Native_gdbserver_testing), but it does not 
work for me.  The log reports:

Test Run By macro on Wed Sep 26 14:44:55 2007
Target is native-gdbserver
Host   is i386-pc-linux-gnu

                === gdb tests ===

Schedule of variations:
    unix

Running target unix
Using [...]/./dejagnu/baseboards/unix.exp as board description file for target.
Using [...]/./dejagnu/config/unix.exp as generic interface file for target.
Using [...]/gdb/testsuite/config/unix.exp as tool-and-target-specific interface file.
Running [...]/gdb/testsuite/gdb.base/hbreak.exp ...

and all the tests are run locally -- the server is not used as far as I 
can see.  They all do pass.  Please let me know how to use information 
from that page.

 I have applied all the changes from break.exp between 1.20 and 1.30 as 
you requested.  Native run for i386-linux-gnu passes.

2007-09-26  Maciej W. Rozycki  <macro@mips.com>

	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".

  Maciej

14591.diff
Index: binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp	2007-09-26 14:13:08.000000000 +0100
@@ -0,0 +1,882 @@
+#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2002, 2003, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# Based on break.exp by Rob Savoye. (rob@cygnus.com)
+# Only one hardware breakpoint is set at a time as targets may limit
+# the number of ones available.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+
+#
+# test running programs
+#
+set prms_id 0
+set bug_id 0
+
+set testfile "break"
+set srcfile ${testfile}.c
+set srcfile1 ${testfile}1.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if [target_info exists gdb_stub] {
+    gdb_step_for_stub;
+}
+
+#
+# Test whether the target supports hardware breakpoints at all.
+#
+send_gdb "hbreak main\n"
+gdb_expect {
+    -re "No hardware breakpoint support in the target.*$" {
+	unsupported "hardware breakpoints"
+	return
+    }
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*$" {
+	pass "hardware breakpoint support"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "hardware breakpoint support"
+    }
+    timeout {
+	fail "hardware breakpoint support (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# Test simple hardware breakpoint setting commands
+#
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file"
+delete_breakpoints
+
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+
+#
+# test break at line number
+#
+# Note that the default source file is the last one whose source text
+# was printed.  For native debugging, before we've executed the
+# program, this is the file containing main, but for remote debugging,
+# it's wherever the processor was stopped when we connected to the
+# board.  So, to be sure, we do a list command.
+#
+gdb_test "list main" \
+    ".*main \\(argc, argv, envp\\).*" \
+    "use `list' to establish default source file"
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number"
+delete_breakpoints
+
+set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
+
+#
+# test break at line number in file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file"
+delete_breakpoints
+
+set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
+set bp_location4 [gdb_get_line_number "set breakpoint 4 here"]
+
+#
+# Test putting a break at the start of a multi-line if conditional.
+# Verify the breakpoint was put at the start of the conditional.
+#
+gdb_test "hbreak multi_line_if_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location3\\." \
+    "hardware breakpoint at start of multi line if conditional"
+delete_breakpoints
+
+gdb_test "hbreak multi_line_while_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
+    "hardware breakpoint at start of multi line while conditional"
+
+set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
+set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
+
+#
+# check to see what breakpoints are set
+#
+if [target_info exists gdb_stub] {
+    set main_line $bp_location5
+} else {
+    set main_line $bp_location6
+}
+
+if {$hp_aCC_compiler} {
+    set proto "\\(int\\)"
+} else {
+    set proto ""
+}
+
+set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
+set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
+set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
+
+gdb_test "info break" \
+    "Num     Type\[ \]+Disp Enb  Address\[ \]+What.*
+\[0-9\]+\[\t \]+hw breakpoint  keep y.* in multi_line_while_conditional at .*$srcfile:$bp_location4" \
+    "hardware breakpoint info"
+delete_breakpoints
+
+# FIXME: The rest of this test doesn't work with anything that can't
+# handle arguments.
+# Huh? There doesn't *appear* to be anything that passes arguments
+# below.
+if [istarget "mips-idt-*"] then {
+    return
+}
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function (2)"
+gdb_run_cmd
+gdb_expect {
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $" {
+	pass "run until function breakpoint"
+    }
+    -re "$gdb_prompt $" {
+	fail "run until function breakpoint"
+    }
+    timeout {
+	fail "run until function breakpoint (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# run until the breakpoint at a line number
+#
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
+			"run until breakpoint set at a line number"
+delete_breakpoints
+
+#
+# Run until the breakpoint set in a function in a file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file (2)"
+for {set i 6} {$i >= 1} {incr i -1} {
+	gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, factorial \\(value=$i\\) at .*$srcfile:$bp_location7.*$bp_location7\[\t \]+.*if .value > 1. \{.*" \
+			"run until file:function($i) breakpoint"
+}
+delete_breakpoints
+
+#
+# Run until the breakpoint set at a quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*" \
+		"run until quoted breakpoint"
+delete_breakpoints
+#
+# run until the file:function breakpoint at a line number in a file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location2.*$bp_location2\[\t \]+argc = \\(argc == 12345\\);.*" \
+		"run until file:linenum breakpoint"
+delete_breakpoints
+
+# Test break at offset +1
+set bp_location10 [gdb_get_line_number "set breakpoint 10 here"]
+
+gdb_test "hbreak +1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location10\\." \
+    "hardware breakpoint offset +1"
+
+# Check to see if breakpoint is hit when stepped onto
+
+gdb_test "step" \
+    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10.*$bp_location10\[\t \]+return argc;.*breakpoint 10 here.*" \
+    "step onto hardware breakpoint"
+delete_breakpoints
+
+# Check to see if breakpoint can be set on ending brace of function
+set bp_location10a [gdb_get_line_number "set breakpoint 10a here"]
+
+gdb_test "hbreak $bp_location10a" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location10a\\." \
+    "setting hardware breakpoint at }"
+
+gdb_test "continue" \
+    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10a.*$bp_location10a\[\t \]+}.*breakpoint 10a here.*" \
+    "continue to hardware breakpoint at }"
+
+#
+# delete all breakpoints so we can start over, course this can be a test too
+#
+delete_breakpoints
+
+#
+# test temporary breakpoint at function
+#
+
+gdb_test "thbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+
+gdb_test "thbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function in file"
+delete_breakpoints
+
+#
+# test break at line number
+#
+send_gdb "thbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+gdb_test "thbreak $bp_location6" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location6.*" \
+    "temporary hardware breakpoint line number #2"
+delete_breakpoints
+
+#
+# test break at line number in file
+#
+send_gdb "thbreak $srcfile:$bp_location2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number in file #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number in file #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number in file #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
+gdb_test "thbreak $srcfile:$bp_location11" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location11.*" \
+    "temporary hardware breakpoint line number in file #2"
+
+#
+# check to see what breakpoints are set (temporary this time)
+#
+gdb_test "info break" "Num     Type.*Disp Enb  Address.*What.*\[\r\n\]
+\[0-9\]+\[\t \]+hw breakpoint  del.*y.*in main at .*$srcfile:$bp_location11.*" \
+    "temporary hardware breakpoint info"
+
+
+#***********
+
+if ![runto_main] then { fail "break tests suppressed" }
+
+# Verify that GDB responds gracefully when asked to set a breakpoint
+# on a nonexistent source line.
+#
+send_gdb "hbreak 999\n"
+gdb_expect {
+    -re "No line 999 in file .*$gdb_prompt $" {
+	pass "hardware break on non-existent source line"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on non-existent source line"
+    }
+    timeout {
+	fail "(timeout) hardware break on non-existent source line"
+    }
+}
+
+# Run to the desired default location. If not positioned here, the
+# tests below don't work.
+#
+gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1"
+
+
+# Verify that GDB allows one to just say "break", which is treated
+# as the "default" breakpoint.  Note that GDB gets cute when printing
+# the informational message about other breakpoints at the same
+# location.  We'll hit that bird with this stone too.
+#
+send_gdb "hbreak\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint \[0-9\]*.*$gdb_prompt $" {
+	pass "hardware break on default location"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on default location"
+    }
+    timeout {
+	fail "(timeout) hardware break on default location, 1st time"
+    }
+}
+
+# Verify that a "silent" breakpoint can be set, and that GDB is indeed
+# "silent" about its triggering.
+#
+if ![runto_main] then { fail "break tests suppressed" }
+
+send_gdb "hbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $" {
+	pass "set to-be-silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "set to-be-silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set to-be-silent break bp_location1"
+    }
+}
+
+send_gdb "commands $expect_out(1,string)\n"
+send_gdb "silent\n"
+send_gdb "end\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "set silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set silent hardware break bp_location1"
+    }
+}
+
+send_gdb "info break $expect_out(1,string)\n"
+gdb_expect {
+    -re "\[0-9\]*\[ \t\]*hw breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $" {
+	pass "info silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "info silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) info silent hardware break bp_location1"
+    }
+}
+send_gdb "continue\n"
+gdb_expect {
+    -re "Continuing.\r\n$gdb_prompt $" {
+	pass "hit silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) hit silent hardware break bp_location1"
+    }
+}
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0  main .* at .*:$bp_location1.*$gdb_prompt $" {
+	pass "stopped for silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "stopped for silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) stopped for hardware silent break bp_location1"
+    }
+}
+
+# Verify that GDB can at least parse a breakpoint with the
+# "thread" keyword.  (We won't attempt to test here that a
+# thread-specific breakpoint really triggers appropriately.
+# The gdb.threads subdirectory contains tests for that.)
+#
+set bp_location12 [gdb_get_line_number "set breakpoint 12 here"]
+send_gdb "hbreak $bp_location12 thread 999\n"
+gdb_expect {
+    -re "Unknown thread 999.*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+}
+send_gdb "hbreak $bp_location12 thread foo\n"
+gdb_expect {
+    -re "Junk after thread keyword..*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a breakpoint command with
+# trailing garbage.
+#
+send_gdb "hbreak $bp_location12 foo\n"
+gdb_expect {
+    -re "Junk at end of arguments..*$gdb_prompt $" {
+	pass "hardware breakpoint with trailing garbage disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware breakpoint with trailing garbage disallowed"
+    }
+    timeout {
+	fail "(timeout) hardware breakpoint with trailing garbage disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a "clear" command that has
+# no matching breakpoint.  (First, get us off the current source line,
+# which we know has a breakpoint.)
+#
+send_gdb "next\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "step over hardware breakpoint"
+    }
+    timeout {
+	fail "(timeout) step over hardware breakpoint"
+    }
+}
+send_gdb "clear 81\n"
+gdb_expect {
+    -re "No breakpoint at 81..*$gdb_prompt $" {
+	pass "clear line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear line has no breakpoint disallowed"
+    }
+}
+send_gdb "clear\n"
+gdb_expect {
+    -re "No breakpoint at this line..*$gdb_prompt $" {
+	pass "clear current line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear current line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear current line has no breakpoint disallowed"
+    }
+}
+delete_breakpoints
+
+# Verify that a breakpoint can be set via a convenience variable.
+#
+send_gdb "set \$foo=$bp_location11\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to bp_location11"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to bp_location11"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location11.*$gdb_prompt $" {
+	pass "set hardware breakpoint via convenience variable"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via convenience variable"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via convenience variable"
+    }
+}
+delete_breakpoints
+
+# Verify that GDB responds gracefully to an attempt to set a
+# breakpoint via a convenience variable whose type is not integer.
+#
+send_gdb "set \$foo=81.5\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to 81.5"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to 81.5"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Convenience variables used in line specs must have integer values..*$gdb_prompt $" {
+	pass "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+}
+
+# Verify that we can set and trigger a breakpoint in a user-called function.
+#
+send_gdb "hbreak marker2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $" {
+	pass "set hardware breakpoint on to-be-called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint on to-be-called function"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint on to-be-called function"
+    }
+}
+send_gdb "print marker2(99)\n"
+gdb_expect {
+    -re "The program being debugged stopped while in a function called from GDB.\r\nWhen the function .marker2$proto. is done executing, GDB will silently\r\nstop .instead of continuing to evaluate the expression containing\r\nthe function call...*$gdb_prompt $" {
+	pass "hit hardware breakpoint on called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit hardware breakpoint on called function"
+    }
+    timeout {
+	fail "(timeout) hit hardware breakpoint on called function"
+    }
+}
+
+# As long as we're stopped (breakpointed) in a called function,
+# verify that we can successfully backtrace & such from here.
+#
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "backtrace while in called function"
+    }
+    timeout {
+	fail "(timeout) backtrace while in called function"
+    }
+}
+
+# Return from the called function.  For remote targets, it's important to do
+# this before runto_main, which otherwise may silently stop on the dummy
+# breakpoint inserted by GDB at the program's entry point.
+#
+send_gdb "finish\n"
+gdb_expect {
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "finish from called function"
+    }
+    timeout {
+	fail "(timeout) finish from called function"
+    }
+}
+
+#********
+
+
+#
+# Test "next" over recursive function call.
+#
+
+proc test_next_with_recursion {} {
+    global gdb_prompt
+    global decimal
+    global binfile
+
+    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+    delete_breakpoints
+
+    gdb_test "hbreak factorial" \
+	"Hardware assisted breakpoint $decimal at .*" \
+	"hardware break at factorial"
+
+    # Run until we call factorial with 6
+
+    gdb_run_cmd
+    gdb_expect {
+	-re "Break.* factorial .value=6. .*$gdb_prompt $" {}
+	-re ".*$gdb_prompt $" {
+	    fail "run to factorial(6)";
+	    gdb_suppress_tests;
+	}
+	timeout {
+	    fail "run to factorial(6) (timeout)";
+	    gdb_suppress_tests;
+	}
+    }
+
+    # Continue until we call factorial recursively with 5.
+
+    if [gdb_test "continue" \
+	"Continuing.*Break.* factorial .value=5. .*" \
+	"continue to factorial(5)"] then { gdb_suppress_tests }
+
+    # Do a backtrace just to confirm how many levels deep we are.
+
+    if [gdb_test "backtrace" \
+	"#0\[ \t\]+ factorial .value=5..*" \
+	"backtrace from factorial(5)"] then { gdb_suppress_tests }
+
+    # Now a "next" should position us at the recursive call, which
+    # we will be performing with 4.
+
+    if [gdb_test "next" \
+	".* factorial .value - 1.;.*" \
+	"next to recursive call"] then { gdb_suppress_tests }
+
+    # Disable the breakpoint at the entry to factorial by deleting them all.
+    # The "next" should run until we return to the next line from this
+    # recursive call to factorial with 4.
+    # Buggy versions of gdb will stop instead at the innermost frame on
+    # the line where we are trying to "next" to.
+
+    delete_breakpoints
+
+    if [istarget "mips*tx39-*"] {
+	set timeout 60
+    }
+    # We used to set timeout here for all other targets as well.  This
+    # is almost certainly wrong.  The proper timeout depends on the
+    # target system in use, and how we communicate with it, so there
+    # is no single value appropriate for all targets.  The timeout
+    # should be established by the Dejagnu config file(s) for the
+    # board, and respected by the test suite.
+    #
+    # For example, if I'm running GDB over an SSH tunnel talking to a
+    # portmaster in California talking to an ancient 68k board running
+    # a crummy ROM monitor (a situation I can only wish were
+    # hypothetical), then I need a large timeout.  But that's not the
+    # kind of knowledge that belongs in this file.
+
+    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
+	    "next over recursive call"
+
+    # OK, we should be back in the same stack frame we started from.
+    # Do a backtrace just to confirm.
+
+    set result [gdb_test "backtrace" \
+	    "#0\[ \t\]+ factorial .value=120.*\r\n#1\[ \t\]+ \[0-9a-fx\]+ in factorial .value=6..*" \
+	    "backtrace from factorial(5.1)"]
+    if { $result != 0 } { gdb_suppress_tests }
+
+    if [target_info exists gdb,noresults] { gdb_suppress_tests }
+    gdb_continue_to_end "recursive next test"
+    gdb_stop_suppressing_tests;
+}
+
+test_next_with_recursion
+
+
+#********
+
+# build a new file with optimization enabled so that we can try breakpoints
+# on targets with optimized prologues
+
+set binfileo2 ${objdir}/${subdir}/${testfile}o2
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug nowarnings optimize=-O2}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug nowarnings optimize=-O2}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if [get_compiler_info ${binfileo2}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfileo2}
+
+if [target_info exists gdb_stub] {
+    gdb_step_for_stub;
+}
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*, line.*" \
+    "hardware breakpoint function, optimized file"
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+gdb_run_cmd
+gdb_expect {
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $" {
+	pass "run until function breakpoint, optimized file"
+    }
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$gdb_prompt $" {
+	pass "run until function breakpoint, optimized file (code motion)"
+    }
+    -re "$gdb_prompt $" {
+	fail "run until function breakpoint, optimized file"
+    }
+    timeout {
+	fail "run until function breakpoint, optimized file (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# test break at function
+#
+gdb_test "hbreak marker4" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint small function, optimized file"
+
+#
+# run until the breakpoint at a small function
+#
+
+#
+# Add a second pass pattern.  The behavior differs here between stabs
+# and dwarf for one-line functions.  Stabs preserves two line symbols
+# (one before the prologue and one after) with the same line number,
+# but dwarf regards these as duplicates and discards one of them.
+# Therefore the address after the prologue (where the breakpoint is)
+# has no exactly matching line symbol, and GDB reports the breakpoint
+# as if it were in the middle of a line rather than at the beginning.
+
+set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
+set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
+send_gdb "continue\n"
+gdb_expect {
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" {
+	# marker4() is defined at line 46 when compiled with -DPROTOTYPES
+	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
+    }
+    -re ".*$gdb_prompt " {
+	fail "run until breakpoint set at small function, optimized file"
+    }
+    timeout {
+	fail "run until breakpoint set at small function, optimized file (timeout)"
+    }
+}
+
+
+# Reset the default arguments for VxWorks
+if [istarget "*-*-vxworks*"] {
+    set timeout 10
+    verbose "Timeout is now $timeout seconds" 2
+    send_gdb "set args main\n"
+    gdb_expect -re ".*$gdb_prompt $" {}
+}

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Wed, Sep 26, 2007 at 03:03:32PM +0100, Maciej W. Rozycki wrote:
>  I have tried that file (from 
> http://sourceware.org/gdb/wiki/Native_gdbserver_testing), but it does not 
> work for me.  The log reports:
> 
> Test Run By macro on Wed Sep 26 14:44:55 2007
> Target is native-gdbserver
> Host   is i386-pc-linux-gnu
> 
>                 === gdb tests ===
> 
> Schedule of variations:
>     unix

That shouldn't happen.  Did you use --target instead of
--target_board?

-- 
Daniel Jacobowitz
CodeSourcery

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Wed, 26 Sep 2007, Daniel Jacobowitz wrote:

> That shouldn't happen.  Did you use --target instead of
> --target_board?

 I used "RUNTESTFLAGS=--target-board native-gdbserver gdb.base/hbreak.exp" 
exactly.

  Maciej

Re: hbreak.exp: Test hardware breakpoints

[Pedro Alves]

Maciej W. Rozycki wrote:
> On Wed, 26 Sep 2007, Daniel Jacobowitz wrote:
>
> > That shouldn't happen.  Did you use --target instead of
> > --target_board?
>
>  I used "RUNTESTFLAGS=--target-board native-gdbserver gdb.base/hbreak.exp"
> exactly.
>

--target-board != --target_board
        ^                 ^

'-' vs '_'

Cheers,
Pedro Alves

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Wed, 26 Sep 2007, Pedro Alves wrote:

> >  I used "RUNTESTFLAGS=--target-board native-gdbserver gdb.base/hbreak.exp"
> > exactly.
> >
> 
> --target-board != --target_board
>         ^                 ^
> 
> '-' vs '_'

 Good catch, thanks.  The result is:

                === gdb Summary ===

# of expected passes            43
# of unexpected failures        28

with the first failure being:

(gdb) Process [...]/build-i386/gdb/testsuite/gdb.base/break 
created; pid = 16195
Listening on port 2346
target remote localhost:2346
Remote debugging using localhost:2346
Remote debugging from host 127.0.0.1
0x40000c20 in ?? () from /lib/ld-linux.so.2
(gdb) continue
Continuing.
Couldn't write debug register: No such process.
(gdb) FAIL: gdb.base/hbreak.exp: run until function breakpoint

That message comes from i386_linux_dr_set(), so that looks like a bug 
somewhere with `gdbserver' not passing correct breakpoint data downstream.  
Which is obviously not a bug with the test script itself, but if people 
insist on keeping the bug I could make the script conditional on 
"gdb,no_hardware_watchpoints".

  Maciej

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Wed, Sep 26, 2007 at 03:42:05PM +0100, Maciej W. Rozycki wrote:
> Continuing.
> Couldn't write debug register: No such process.
> (gdb) FAIL: gdb.base/hbreak.exp: run until function breakpoint

Sorry, I forgot to warn you about this :-(  You can't use a native
i686-linux debugger to do this test, because the i686 native debugger
defines target_insert_watchpoint et cetera; that message is coming
from GDB trying to use ptrace, even though it's connected to target
remote.

I'll build a cross debugger and give it a try tonight.

-- 
Daniel Jacobowitz
CodeSourcery

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Wed, 26 Sep 2007, Daniel Jacobowitz wrote:

> > Continuing.
> > Couldn't write debug register: No such process.
> > (gdb) FAIL: gdb.base/hbreak.exp: run until function breakpoint
> 
> Sorry, I forgot to warn you about this :-(  You can't use a native
> i686-linux debugger to do this test, because the i686 native debugger
> defines target_insert_watchpoint et cetera; that message is coming
> from GDB trying to use ptrace, even though it's connected to target
> remote.

 Which is obviously a bug -- you should be able to debug a remote 
i386-linux-gnu target with an i386-linux-gnu host using an i386-linux-gnu 
native debugger if the "target remote" command is at all available, 
shouldn't you?

> I'll build a cross debugger and give it a try tonight.

 Thanks.

  Maciej

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Thu, Sep 27, 2007 at 10:58:21AM +0100, Maciej W. Rozycki wrote:
>  Which is obviously a bug -- you should be able to debug a remote 
> i386-linux-gnu target with an i386-linux-gnu host using an i386-linux-gnu 
> native debugger if the "target remote" command is at all available, 
> shouldn't you?

Yes, definitely.  It's just a bit tangled up to fix because of all the
different i386 targets.  Maybe I'll give it a try.

> > I'll build a cross debugger and give it a try tonight.
> 
>  Thanks.

I didn't have time :-(  I will take care of it as soon as I can,
though.

-- 
Daniel Jacobowitz
CodeSourcery

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Wed, Sep 26, 2007 at 03:03:32PM +0100, Maciej W. Rozycki wrote:
>  I have applied all the changes from break.exp between 1.20 and 1.30 as 
> you requested.  Native run for i386-linux-gnu passes.
> 
> 2007-09-26  Maciej W. Rozycki  <macro@mips.com>
> 
> 	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".

Well, that didn't work out as well as I'd hoped.

Maciej posted a patch to test hardware breakpoints.  It passes on
i386-linux, using current HEAD GDB.  I wanted to see what would happen
when the test was run against gdbserver, which does not support
hardware breakpoints on i386 (yet).  We encountered the long-standing
bug that nm-i386.h overrides target.h using #define; this means that
a native i386 GDB incorrectly tries to use ptrace even when connected
to a remote target.

I saw two ways to test: build a cross debugger or fix the bug.  I
fixed the bug.  Unfortunately that broke the test:

(gdb) hbreak main
No hardware breakpoint support in the target.
UNSUPPORTED: gdb.base/hbreak.exp: hardware breakpoints

This is "target exec", since we have not yet started the program.
While we were using #define to override GDB's defaults, this worked;
every target, even exec, claimed to support watchpoints.  Now that
only "target child" supports hardware watchpoints, you can't insert
hardware breakpoints before the program is running.

This is the status quo on other targets too.

How do you all feel about leaving the hbreak-before-run problem for
another day, and adjusting the test to start the program running
before trying hbreak?

I've attached the patch I used.

-- 
Daniel Jacobowitz
CodeSourcery

2007-09-29  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.in (i386-nat.o): Update.
	* amd64-linux-nat.c (_initialize_amd64_linux_nat): Call
	i386_use_watchpoints.
	* i386-linux-nat.c (_initialize_i386_linux_nat): Call
	i386_use_watchpoints.
	* i386-nat.c (i386_stopped_data_address): Take two arguments.
	(i386_stopped_by_watchpoint): Update call.
	(i386_can_use_hw_breakpoint, i386_use_watchpoints): New.
	* config/i386/nm-i386.h: Conditionalize definitions on
	! I386_WATCHPOINTS_IN_TARGET_VECTOR.
	(i386_use_watchpoints): Declare.
	(i386_stopped_data_address): Update.
	(CHILD_POST_STARTUP_INFERIOR): Remove obsolete definition.
	* config/i386/nm-linux.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.
	* config/i386/nm-linux64.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.939
diff -u -p -r1.939 Makefile.in
--- Makefile.in	27 Sep 2007 18:48:32 -0000	1.939
+++ Makefile.in	30 Sep 2007 01:14:52 -0000
@@ -2123,7 +2123,8 @@ i386-linux-tdep.o: i386-linux-tdep.c $(d
 	$(value_h) $(regcache_h) $(inferior_h) $(osabi_h) $(reggroups_h) \
 	$(dwarf2_frame_h) $(gdb_string_h) $(i386_tdep_h) \
 	$(i386_linux_tdep_h) $(glibc_tdep_h) $(solib_svr4_h) $(symtab_h)
-i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h)
+i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h) \
+	$(target_h)
 i386nbsd-nat.o: i386nbsd-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(target_h) $(i386_tdep_h) $(i386bsd_nat_h) $(nbsd_nat_h) \
 	$(bsd_kvm_h)
Index: amd64-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-nat.c,v
retrieving revision 1.17
diff -u -p -r1.17 amd64-linux-nat.c
--- amd64-linux-nat.c	23 Aug 2007 18:08:26 -0000	1.17
+++ amd64-linux-nat.c	30 Sep 2007 01:14:52 -0000
@@ -398,6 +398,8 @@ _initialize_amd64_linux_nat (void)
   /* Fill in the generic GNU/Linux methods.  */
   t = linux_target ();
 
+  i386_use_watchpoints (t);
+
   /* Override the GNU/Linux inferior startup hook.  */
   super_post_startup_inferior = t->to_post_startup_inferior;
   t->to_post_startup_inferior = amd64_linux_child_post_startup_inferior;
Index: i386-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-linux-nat.c,v
retrieving revision 1.82
diff -u -p -r1.82 i386-linux-nat.c
--- i386-linux-nat.c	23 Aug 2007 18:08:34 -0000	1.82
+++ i386-linux-nat.c	30 Sep 2007 01:14:52 -0000
@@ -805,6 +805,8 @@ _initialize_i386_linux_nat (void)
   /* Fill in the generic GNU/Linux methods.  */
   t = linux_target ();
 
+  i386_use_watchpoints (t);
+
   /* Override the default ptrace resume method.  */
   t->to_resume = i386_linux_resume;
 
Index: i386-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nat.c,v
retrieving revision 1.16
diff -u -p -r1.16 i386-nat.c
--- i386-nat.c	23 Aug 2007 18:08:34 -0000	1.16
+++ i386-nat.c	30 Sep 2007 01:14:52 -0000
@@ -21,6 +21,7 @@
 #include "breakpoint.h"
 #include "command.h"
 #include "gdbcmd.h"
+#include "target.h"
 
 /* Support for hardware watchpoints and breakpoints using the i386
    debug registers.
@@ -563,7 +564,7 @@ i386_region_ok_for_watchpoint (CORE_ADDR
    Otherwise, return zero.  */
 
 int
-i386_stopped_data_address (CORE_ADDR *addr_p)
+i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
 {
   CORE_ADDR addr = 0;
   int i;
@@ -599,7 +600,7 @@ int
 i386_stopped_by_watchpoint (void)
 {
   CORE_ADDR addr = 0;
-  return i386_stopped_data_address (&addr);
+  return i386_stopped_data_address (&current_target, &addr);
 }
 
 /* Return non-zero if the inferior has some break/watchpoint that
@@ -654,6 +655,47 @@ i386_remove_hw_breakpoint (struct bp_tar
   return retval;
 }
 
+/* Returns the number of hardware watchpoints of type TYPE that we can
+   set.  Value is positive if we can set CNT watchpoints, zero if
+   setting watchpoints of type TYPE is not supported, and negative if
+   CNT is more than the maximum number of watchpoints of type TYPE
+   that we can support.  TYPE is one of bp_hardware_watchpoint,
+   bp_read_watchpoint, bp_write_watchpoint, or bp_hardware_breakpoint.
+   CNT is the number of such watchpoints used so far (including this
+   one).  OTHERTYPE is non-zero if other types of watchpoints are
+   currently enabled.
+
+   We always return 1 here because we don't have enough information
+   about possible overlap of addresses that they want to watch.  As an
+   extreme example, consider the case where all the watchpoints watch
+   the same address and the same region length: then we can handle a
+   virtually unlimited number of watchpoints, due to debug register
+   sharing implemented via reference counts in i386-nat.c.  */
+
+static int
+i386_can_use_hw_breakpoint (int type, int cnt, int othertype)
+{
+  return 1;
+}
+
+void
+i386_use_watchpoints (struct target_ops *t)
+{
+  /* After a watchpoint trap, the PC points to the instruction after the
+     one that caused the trap.  Therefore we don't need to step over it.
+     But we do need to reset the status register to avoid another trap.  */
+  t->to_have_continuable_watchpoint = 1;
+
+  t->to_can_use_hw_breakpoint = i386_can_use_hw_breakpoint;
+  t->to_region_ok_for_hw_watchpoint = i386_region_ok_for_watchpoint;
+  t->to_stopped_by_watchpoint = i386_stopped_by_watchpoint;
+  t->to_stopped_data_address = i386_stopped_data_address;
+  t->to_insert_watchpoint = i386_insert_watchpoint;
+  t->to_remove_watchpoint = i386_remove_watchpoint;
+  t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
+  t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
+}
+
 #endif /* I386_USE_GENERIC_WATCHPOINTS */
 \f
 
Index: config/i386/nm-i386.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-i386.h,v
retrieving revision 1.10
diff -u -p -r1.10 nm-i386.h
--- config/i386/nm-i386.h	23 Aug 2007 18:08:48 -0000	1.10
+++ config/i386/nm-i386.h	30 Sep 2007 01:14:52 -0000
@@ -24,6 +24,11 @@
 /* Targets should define this to use the generic x86 watchpoint support.  */
 #ifdef I386_USE_GENERIC_WATCHPOINTS
 
+/* Add watchpoint methods to the provided target_ops.  Targets which call
+   this should also define I386_WATCHPOINTS_IN_TARGET_VECTOR.  */
+struct target_ops;
+void i386_use_watchpoints (struct target_ops *);
+
 /* Clear the reference counts and forget everything we knew about DRi.  */
 extern void i386_cleanup_dregs (void);
 
@@ -48,7 +53,7 @@ extern int i386_stopped_by_hwbp (void);
 /* If the inferior has some break/watchpoint that triggered, set
    the address associated with that break/watchpoint and return
    true.  Otherwise, return false.  */
-extern int i386_stopped_data_address (CORE_ADDR *);
+extern int i386_stopped_data_address (struct target_ops *, CORE_ADDR *);
 
 /* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
    Return 0 on success, EBUSY on failure.  */
@@ -59,6 +64,10 @@ extern int i386_insert_hw_breakpoint (st
    Return 0 on success, -1 on failure.  */
 extern int  i386_remove_hw_breakpoint (struct bp_target_info *bp_tgt);
 
+extern int i386_stopped_by_watchpoint (void);
+
+#ifndef I386_WATCHPOINTS_IN_TARGET_VECTOR
+
 /* Returns the number of hardware watchpoints of type TYPE that we can
    set.  Value is positive if we can set CNT watchpoints, zero if
    setting watchpoints of type TYPE is not supported, and negative if
@@ -90,11 +99,10 @@ extern int  i386_remove_hw_breakpoint (s
 
 #define HAVE_CONTINUABLE_WATCHPOINT 1
 
-extern int i386_stopped_by_watchpoint (void);
-
 #define STOPPED_BY_WATCHPOINT(W)       (i386_stopped_by_watchpoint () != 0)
 
-#define target_stopped_data_address(target, x)  i386_stopped_data_address(x)
+#define target_stopped_data_address(target, x) \
+  i386_stopped_data_address(target, x)
 
 /* Use these macros for watchpoint insertion/removal.  */
 
@@ -110,9 +118,7 @@ extern int i386_stopped_by_watchpoint (v
 #define target_remove_hw_breakpoint(bp_tgt) \
   i386_remove_hw_breakpoint (bp_tgt)
 
-/* child_post_startup_inferior used to
-   reset all debug registers by calling i386_cleanup_dregs ().  */ 
-#define CHILD_POST_STARTUP_INFERIOR
+#endif /* I386_WATCHPOINTS_IN_TARGET_VECTOR */
 
 #endif /* I386_USE_GENERIC_WATCHPOINTS */
 
Index: config/i386/nm-linux.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-linux.h,v
retrieving revision 1.26
diff -u -p -r1.26 nm-linux.h
--- config/i386/nm-linux.h	23 Aug 2007 18:08:48 -0000	1.26
+++ config/i386/nm-linux.h	30 Sep 2007 01:14:52 -0000
@@ -23,6 +23,7 @@
 
 /* GNU/Linux supports the i386 hardware debugging registers.  */
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 #include "config/nm-linux.h"
Index: config/i386/nm-linux64.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-linux64.h,v
retrieving revision 1.6
diff -u -p -r1.6 nm-linux64.h
--- config/i386/nm-linux64.h	23 Aug 2007 18:08:48 -0000	1.6
+++ config/i386/nm-linux64.h	30 Sep 2007 01:14:52 -0000
@@ -24,6 +24,7 @@
 
 /* GNU/Linux supports the i386 hardware debugging registers.  */
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 #include "config/nm-linux.h"

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Sat, 29 Sep 2007, Daniel Jacobowitz wrote:

> Maciej posted a patch to test hardware breakpoints.  It passes on
> i386-linux, using current HEAD GDB.  I wanted to see what would happen
> when the test was run against gdbserver, which does not support
> hardware breakpoints on i386 (yet).  We encountered the long-standing
> bug that nm-i386.h overrides target.h using #define; this means that
> a native i386 GDB incorrectly tries to use ptrace even when connected
> to a remote target.
> 
> I saw two ways to test: build a cross debugger or fix the bug.  I
> fixed the bug.  Unfortunately that broke the test:
> 
> (gdb) hbreak main
> No hardware breakpoint support in the target.
> UNSUPPORTED: gdb.base/hbreak.exp: hardware breakpoints
> 
> This is "target exec", since we have not yet started the program.
> While we were using #define to override GDB's defaults, this worked;
> every target, even exec, claimed to support watchpoints.  Now that
> only "target child" supports hardware watchpoints, you can't insert
> hardware breakpoints before the program is running.
> 
> This is the status quo on other targets too.
> 
> How do you all feel about leaving the hbreak-before-run problem for
> another day, and adjusting the test to start the program running
> before trying hbreak?

 Have we reached any conclusion on this matter?  I cannot seem to find 
any...

 I am certainly fine to adjust the test script, at least for now -- no 
problem.  The question is how problematic, if at all, the change is to 
people in actual debugging.  For example, how often is a hardware 
breakpoint used locally before a program is started:

(gdb) hbreak foo
(gdb) run

How about:

(gdb) break main
(gdb) run
[main() hit]
(gdb) hbreak foo
(gdb) continue
[foo() hit]
(gdb) run

And similarly for remote targets -- presumably having to define a 
breakpoint before a connection is opened to the target is a non-issue, but 
how about:

(gdb) target bar
(gdb) load
(gdb) hbreak foo
(gdb) run
[foo() hit]
(gdb) target bar

Not that these cases bother me terribly much, but they should be noted and 
dismissed if not important enough.

  Maciej

Re: hbreak.exp: Test hardware breakpoints

[Maciej W. Rozycki]

On Sat, 29 Sep 2007, Daniel Jacobowitz wrote:

> Well, that didn't work out as well as I'd hoped.
> 
> Maciej posted a patch to test hardware breakpoints.  It passes on
> i386-linux, using current HEAD GDB.  I wanted to see what would happen
> when the test was run against gdbserver, which does not support
> hardware breakpoints on i386 (yet).  We encountered the long-standing
> bug that nm-i386.h overrides target.h using #define; this means that
> a native i386 GDB incorrectly tries to use ptrace even when connected
> to a remote target.
> 
> I saw two ways to test: build a cross debugger or fix the bug.  I
> fixed the bug.  Unfortunately that broke the test:
> 
> (gdb) hbreak main
> No hardware breakpoint support in the target.
> UNSUPPORTED: gdb.base/hbreak.exp: hardware breakpoints
> 
> This is "target exec", since we have not yet started the program.
> While we were using #define to override GDB's defaults, this worked;
> every target, even exec, claimed to support watchpoints.  Now that
> only "target child" supports hardware watchpoints, you can't insert
> hardware breakpoints before the program is running.
> 
> This is the status quo on other targets too.
> 
> How do you all feel about leaving the hbreak-before-run problem for
> another day, and adjusting the test to start the program running
> before trying hbreak?
> 
> I've attached the patch I used.
> 
> -- 
> Daniel Jacobowitz
> CodeSourcery
> 
> 2007-09-29  Daniel Jacobowitz  <dan@codesourcery.com>
> 
> 	* Makefile.in (i386-nat.o): Update.
> 	* amd64-linux-nat.c (_initialize_amd64_linux_nat): Call
> 	i386_use_watchpoints.
> 	* i386-linux-nat.c (_initialize_i386_linux_nat): Call
> 	i386_use_watchpoints.
> 	* i386-nat.c (i386_stopped_data_address): Take two arguments.
> 	(i386_stopped_by_watchpoint): Update call.
> 	(i386_can_use_hw_breakpoint, i386_use_watchpoints): New.
> 	* config/i386/nm-i386.h: Conditionalize definitions on
> 	! I386_WATCHPOINTS_IN_TARGET_VECTOR.
> 	(i386_use_watchpoints): Declare.
> 	(i386_stopped_data_address): Update.
> 	(CHILD_POST_STARTUP_INFERIOR): Remove obsolete definition.
> 	* config/i386/nm-linux.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.
> 	* config/i386/nm-linux64.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.

 Daniel, have you got any further with this patch you proposed?  I can see 
it has not been included in the tree.

 Here is my gdb.base/hbreak.exp test case again, updated according to your 
suggestion so that hardware breakpoints are only inserted once the target 
has been placed into the execution mode.  It passes on i386-linux natively 
and with the mipsisa32-sde-elf target using the 
mips-sim-sde32/-EB/-march=mips32r2 and mips-sim-sde32/-EL/-march=mips32r2 
boards.  It reports the cases correctly as unsupported on mips-linux 
natively and with the mipsisa32-sde-elf target using the 
mips-sim-sde32/-EB/-march=mips32r2 and mips-sim-sde32/-EL/-march=mips32r2 
boards.

2008-02-27  Maciej W. Rozycki  <macro@mips.com>

	* gdb.base/hbreak.exp: New test for "hbreak" and "thbreak".

 Can you please run it on your gdbserver configuration of concern and then 
let me know if it is OK to apply?

  Maciej

14591.diff
Index: binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ binutils-quilt/src/gdb/testsuite/gdb.base/hbreak.exp	2008-02-27 14:34:27.000000000 +0000
@@ -0,0 +1,900 @@
+#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# Based on break.exp by Rob Savoye. (rob@cygnus.com)
+# Only one hardware breakpoint is set at a time as targets may limit
+# the number of ones available.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+
+#
+# test running programs
+#
+set prms_id 0
+set bug_id 0
+
+set testfile "break"
+set srcfile ${testfile}.c
+set srcfile1 ${testfile}1.c
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if ![runto_main] then {
+    fail "cannot run to main"
+    return
+}
+delete_breakpoints
+
+#
+# Test whether the target supports hardware breakpoints at all.
+#
+send_gdb "hbreak main\n"
+gdb_expect {
+    -re "No hardware breakpoint support in the target.*$" {
+	unsupported "hardware breakpoints"
+	return
+    }
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*$" {
+	pass "hardware breakpoint support"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "hardware breakpoint support"
+    }
+    timeout {
+	fail "hardware breakpoint support (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# Test simple hardware breakpoint setting commands
+#
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file"
+delete_breakpoints
+
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+
+#
+# test break at line number
+#
+# Note that the default source file is the last one whose source text
+# was printed.  For native debugging, before we've executed the
+# program, this is the file containing main, but for remote debugging,
+# it's wherever the processor was stopped when we connected to the
+# board.  So, to be sure, we do a list command.
+#
+gdb_test "list main" \
+    ".*main \\(argc, argv, envp\\).*" \
+    "use `list' to establish default source file"
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number"
+delete_breakpoints
+
+set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
+
+#
+# test break at line number in file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file"
+delete_breakpoints
+
+set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
+set bp_location4 [gdb_get_line_number "set breakpoint 4 here"]
+
+#
+# Test putting a break at the start of a multi-line if conditional.
+# Verify the breakpoint was put at the start of the conditional.
+#
+gdb_test "hbreak multi_line_if_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location3\\." \
+    "hardware breakpoint at start of multi line if conditional"
+delete_breakpoints
+
+gdb_test "hbreak multi_line_while_conditional" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
+    "hardware breakpoint at start of multi line while conditional"
+
+set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
+set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
+
+#
+# check to see what breakpoints are set
+#
+if [target_info exists gdb_stub] {
+    set main_line $bp_location5
+} else {
+    set main_line $bp_location6
+}
+
+if {$hp_aCC_compiler} {
+    set proto "\\(int\\)"
+} else {
+    set proto ""
+}
+
+set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
+set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
+set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
+
+gdb_test "info break" \
+    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
+\[0-9\]+\[\t \]+hw breakpoint  keep y.* in multi_line_while_conditional at .*$srcfile:$bp_location4" \
+    "hardware breakpoint info"
+delete_breakpoints
+
+# FIXME: The rest of this test doesn't work with anything that can't
+# handle arguments.
+# Huh? There doesn't *appear* to be anything that passes arguments
+# below.
+if [istarget "mips-idt-*"] then {
+    return
+}
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function (2)"
+gdb_run_cmd
+gdb_expect {
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $" {
+	pass "run until function breakpoint"
+    }
+    -re "$gdb_prompt $" {
+	fail "run until function breakpoint"
+    }
+    timeout {
+	fail "run until function breakpoint (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# run until the breakpoint at a line number
+#
+gdb_test "hbreak $bp_location1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "hardware breakpoint line number (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
+			"run until breakpoint set at a line number"
+delete_breakpoints
+
+#
+# Run until the breakpoint set in a function in a file
+#
+gdb_test "hbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "hardware breakpoint function in file (2)"
+for {set i 6} {$i >= 1} {incr i -1} {
+	gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, factorial \\(value=$i\\) at .*$srcfile:$bp_location7.*$bp_location7\[\t \]+.*if .value > 1. \{.*" \
+			"run until file:function($i) breakpoint"
+}
+delete_breakpoints
+
+#
+# Run until the breakpoint set at a quoted function
+#
+gdb_test "hbreak \"marker2\"" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint quoted function (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*" \
+		"run until quoted breakpoint"
+delete_breakpoints
+#
+# run until the file:function breakpoint at a line number in a file
+#
+gdb_test "hbreak $srcfile:$bp_location2" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
+    "hardware breakpoint line number in file (2)"
+gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location2.*$bp_location2\[\t \]+argc = \\(argc == 12345\\);.*" \
+		"run until file:linenum breakpoint"
+delete_breakpoints
+
+# Test break at offset +1
+set bp_location10 [gdb_get_line_number "set breakpoint 10 here"]
+
+gdb_test "hbreak +1" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location10\\." \
+    "hardware breakpoint offset +1"
+
+# Check to see if breakpoint is hit when stepped onto
+
+gdb_test "step" \
+    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10.*$bp_location10\[\t \]+return argc;.*breakpoint 10 here.*" \
+    "step onto hardware breakpoint"
+delete_breakpoints
+
+# Check to see if breakpoint can be set on ending brace of function
+set bp_location10a [gdb_get_line_number "set breakpoint 10a here"]
+
+gdb_test "hbreak $bp_location10a" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location10a\\." \
+    "setting hardware breakpoint at }"
+
+gdb_test "continue" \
+    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10a.*$bp_location10a\[\t \]+}.*breakpoint 10a here.*" \
+    "continue to hardware breakpoint at }"
+
+#
+# delete all breakpoints so we can start over, course this can be a test too
+#
+delete_breakpoints
+
+#
+# test temporary breakpoint at function
+#
+
+gdb_test "thbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function"
+delete_breakpoints
+
+#
+# test break at function in file
+#
+
+gdb_test "thbreak $srcfile:factorial" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line.*" \
+    "temporary hardware breakpoint function in file"
+delete_breakpoints
+
+#
+# test break at line number
+#
+send_gdb "thbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+gdb_test "thbreak $bp_location6" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location6.*" \
+    "temporary hardware breakpoint line number #2"
+delete_breakpoints
+
+#
+# test break at line number in file
+#
+send_gdb "thbreak $srcfile:$bp_location2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" {
+	pass "temporary hardware breakpoint line number in file #1"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "temporary hardware breakpoint line number in file #1"
+    }
+    timeout {
+	fail "temporary hardware breakpoint line number in file #1 (timeout)"
+    }
+}
+delete_breakpoints
+
+set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
+gdb_test "thbreak $srcfile:$bp_location11" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile, line $bp_location11.*" \
+    "temporary hardware breakpoint line number in file #2"
+
+#
+# check to see what breakpoints are set (temporary this time)
+#
+gdb_test "info break" "Num     Type.*Disp Enb Address.*What.*\[\r\n\]
+\[0-9\]+\[\t \]+hw breakpoint  del.*y.*in main at .*$srcfile:$bp_location11.*" \
+    "temporary hardware breakpoint info"
+
+
+#***********
+
+if ![runto_main] then {
+    fail "cannot run to main"
+    return
+}
+delete_breakpoints
+
+# Verify that GDB responds gracefully when asked to set a breakpoint
+# on a nonexistent source line.
+#
+send_gdb "hbreak 999\n"
+gdb_expect {
+    -re "No line 999 in file .*$gdb_prompt $" {
+	pass "hardware break on non-existent source line"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on non-existent source line"
+    }
+    timeout {
+	fail "(timeout) hardware break on non-existent source line"
+    }
+}
+
+# Run to the desired default location. If not positioned here, the
+# tests below don't work.
+#
+gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1"
+
+
+# Verify that GDB allows one to just say "break", which is treated
+# as the "default" breakpoint.  Note that GDB gets cute when printing
+# the informational message about other breakpoints at the same
+# location.  We'll hit that bird with this stone too.
+#
+send_gdb "hbreak\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint \[0-9\]*.*$gdb_prompt $" {
+	pass "hardware break on default location"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware break on default location"
+    }
+    timeout {
+	fail "(timeout) hardware break on default location, 1st time"
+    }
+}
+
+# Verify that a "silent" breakpoint can be set, and that GDB is indeed
+# "silent" about its triggering.
+#
+if ![runto_main] then {
+    fail "cannot run to main"
+    return
+}
+delete_breakpoints
+
+send_gdb "hbreak $bp_location1\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $" {
+	pass "set to-be-silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "set to-be-silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set to-be-silent break bp_location1"
+    }
+}
+
+send_gdb "commands $expect_out(1,string)\n"
+send_gdb "silent\n"
+send_gdb "end\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "set silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) set silent hardware break bp_location1"
+    }
+}
+
+send_gdb "info break $expect_out(1,string)\n"
+gdb_expect {
+    -re "\[0-9\]*\[ \t\]*hw breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $" {
+	pass "info silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "info silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) info silent hardware break bp_location1"
+    }
+}
+send_gdb "continue\n"
+gdb_expect {
+    -re "Continuing.\r\n$gdb_prompt $" {
+	pass "hit silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) hit silent hardware break bp_location1"
+    }
+}
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0  main .* at .*:$bp_location1.*$gdb_prompt $" {
+	pass "stopped for silent hardware break bp_location1"
+    }
+    -re "$gdb_prompt $" {
+	fail "stopped for silent hardware break bp_location1"
+    }
+    timeout {
+	fail "(timeout) stopped for hardware silent break bp_location1"
+    }
+}
+
+# Verify that GDB can at least parse a breakpoint with the
+# "thread" keyword.  (We won't attempt to test here that a
+# thread-specific breakpoint really triggers appropriately.
+# The gdb.threads subdirectory contains tests for that.)
+#
+set bp_location12 [gdb_get_line_number "set breakpoint 12 here"]
+send_gdb "hbreak $bp_location12 thread 999\n"
+gdb_expect {
+    -re "Unknown thread 999.*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on non-existent thread disallowed"
+    }
+}
+send_gdb "hbreak $bp_location12 thread foo\n"
+gdb_expect {
+    -re "Junk after thread keyword..*$gdb_prompt $" {
+	pass "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+    timeout {
+	fail "(timeout) thread-specific hardware breakpoint on bogus thread ID disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a breakpoint command with
+# trailing garbage.
+#
+send_gdb "hbreak $bp_location12 foo\n"
+gdb_expect {
+    -re "Junk at end of arguments..*$gdb_prompt $" {
+	pass "hardware breakpoint with trailing garbage disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "hardware breakpoint with trailing garbage disallowed"
+    }
+    timeout {
+	fail "(timeout) hardware breakpoint with trailing garbage disallowed"
+    }
+}
+
+# Verify that GDB responds gracefully to a "clear" command that has
+# no matching breakpoint.  (First, get us off the current source line,
+# which we know has a breakpoint.)
+#
+send_gdb "next\n"
+gdb_expect {
+    -re ".*$gdb_prompt $" {
+	pass "step over hardware breakpoint"
+    }
+    timeout {
+	fail "(timeout) step over hardware breakpoint"
+    }
+}
+send_gdb "clear 81\n"
+gdb_expect {
+    -re "No breakpoint at 81..*$gdb_prompt $" {
+	pass "clear line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear line has no breakpoint disallowed"
+    }
+}
+send_gdb "clear\n"
+gdb_expect {
+    -re "No breakpoint at this line..*$gdb_prompt $" {
+	pass "clear current line has no breakpoint disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "clear current line has no breakpoint disallowed"
+    }
+    timeout {
+	fail "(timeout) clear current line has no breakpoint disallowed"
+    }
+}
+delete_breakpoints
+
+# Verify that a breakpoint can be set via a convenience variable.
+#
+send_gdb "set \$foo=$bp_location11\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to bp_location11"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to bp_location11"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line $bp_location11.*$gdb_prompt $" {
+	pass "set hardware breakpoint via convenience variable"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via convenience variable"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via convenience variable"
+    }
+}
+delete_breakpoints
+
+# Verify that GDB responds gracefully to an attempt to set a
+# breakpoint via a convenience variable whose type is not integer.
+#
+send_gdb "set \$foo=81.5\n"
+gdb_expect {
+    -re "$gdb_prompt $" {
+	pass "set convenience variable \$foo to 81.5"
+    }
+    timeout {
+	fail "(timeout) set convenience variable \$foo to 81.5"
+    }
+}
+send_gdb "hbreak \$foo\n"
+gdb_expect {
+    -re "Convenience variables used in line specs must have integer values..*$gdb_prompt $" {
+	pass "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint via non-integer convenience variable disallowed"
+    }
+}
+
+# Verify that we can set and trigger a breakpoint in a user-called function.
+#
+send_gdb "hbreak marker2\n"
+gdb_expect {
+    -re "Hardware assisted breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $" {
+	pass "set hardware breakpoint on to-be-called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "set hardware breakpoint on to-be-called function"
+    }
+    timeout {
+	fail "(timeout) set hardware breakpoint on to-be-called function"
+    }
+}
+send_gdb "print marker2(99)\n"
+gdb_expect {
+    -re "The program being debugged stopped while in a function called from GDB.\r\nWhen the function .marker2$proto. is done executing, GDB will silently\r\nstop .instead of continuing to evaluate the expression containing\r\nthe function call...*$gdb_prompt $" {
+	pass "hit hardware breakpoint on called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "hit hardware breakpoint on called function"
+    }
+    timeout {
+	fail "(timeout) hit hardware breakpoint on called function"
+    }
+}
+
+# As long as we're stopped (breakpointed) in a called function,
+# verify that we can successfully backtrace & such from here.
+#
+send_gdb "bt\n"
+gdb_expect {
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $" {
+	pass "backtrace while in called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "backtrace while in called function"
+    }
+    timeout {
+	fail "(timeout) backtrace while in called function"
+    }
+}
+
+# Return from the called function.  For remote targets, it's important to do
+# this before runto_main, which otherwise may silently stop on the dummy
+# breakpoint inserted by GDB at the program's entry point.
+#
+send_gdb "finish\n"
+gdb_expect {
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $" {
+	pass "finish from called function"
+    }
+    -re "$gdb_prompt $" {
+	fail "finish from called function"
+    }
+    timeout {
+	fail "(timeout) finish from called function"
+    }
+}
+
+#********
+
+
+#
+# Test "next" over recursive function call.
+#
+
+proc test_next_with_recursion {} {
+    global gdb_prompt
+    global decimal
+    global binfile
+
+    gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
+    delete_breakpoints
+
+    if ![runto_main] then {
+	fail "cannot run to main"
+	return
+    }
+    delete_breakpoints
+
+    gdb_test "hbreak factorial" \
+	"Hardware assisted breakpoint $decimal at .*" \
+	"hardware break at factorial"
+
+    # Run until we call factorial with 6
+
+    gdb_run_cmd
+    gdb_expect {
+	-re "Break.* factorial .value=6. .*$gdb_prompt $" {}
+	-re ".*$gdb_prompt $" {
+	    fail "run to factorial(6)";
+	    gdb_suppress_tests;
+	}
+	timeout {
+	    fail "run to factorial(6) (timeout)";
+	    gdb_suppress_tests;
+	}
+    }
+
+    # Continue until we call factorial recursively with 5.
+
+    if [gdb_test "continue" \
+	"Continuing.*Break.* factorial .value=5. .*" \
+	"continue to factorial(5)"] then { gdb_suppress_tests }
+
+    # Do a backtrace just to confirm how many levels deep we are.
+
+    if [gdb_test "backtrace" \
+	"#0\[ \t\]+ factorial .value=5..*" \
+	"backtrace from factorial(5)"] then { gdb_suppress_tests }
+
+    # Now a "next" should position us at the recursive call, which
+    # we will be performing with 4.
+
+    if [gdb_test "next" \
+	".* factorial .value - 1.;.*" \
+	"next to recursive call"] then { gdb_suppress_tests }
+
+    # Disable the breakpoint at the entry to factorial by deleting them all.
+    # The "next" should run until we return to the next line from this
+    # recursive call to factorial with 4.
+    # Buggy versions of gdb will stop instead at the innermost frame on
+    # the line where we are trying to "next" to.
+
+    delete_breakpoints
+
+    if [istarget "mips*tx39-*"] {
+	set timeout 60
+    }
+    # We used to set timeout here for all other targets as well.  This
+    # is almost certainly wrong.  The proper timeout depends on the
+    # target system in use, and how we communicate with it, so there
+    # is no single value appropriate for all targets.  The timeout
+    # should be established by the Dejagnu config file(s) for the
+    # board, and respected by the test suite.
+    #
+    # For example, if I'm running GDB over an SSH tunnel talking to a
+    # portmaster in California talking to an ancient 68k board running
+    # a crummy ROM monitor (a situation I can only wish were
+    # hypothetical), then I need a large timeout.  But that's not the
+    # kind of knowledge that belongs in this file.
+
+    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
+	    "next over recursive call"
+
+    # OK, we should be back in the same stack frame we started from.
+    # Do a backtrace just to confirm.
+
+    set result [gdb_test "backtrace" \
+	    "#0\[ \t\]+ factorial .value=120.*\r\n#1\[ \t\]+ \[0-9a-fx\]+ in factorial .value=6..*" \
+	    "backtrace from factorial(5.1)"]
+    if { $result != 0 } { gdb_suppress_tests }
+
+    if [target_info exists gdb,noresults] { gdb_suppress_tests }
+    gdb_continue_to_end "recursive next test"
+    gdb_stop_suppressing_tests;
+}
+
+test_next_with_recursion
+
+
+#********
+
+# build a new file with optimization enabled so that we can try breakpoints
+# on targets with optimized prologues
+
+set binfileo2 ${objdir}/${subdir}/${testfile}o2
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug nowarnings optimize=-O2}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug nowarnings optimize=-O2}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if  { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug nowarnings}] != "" } {
+     untested hbreak.exp
+     return -1
+}
+
+if [get_compiler_info ${binfileo2}] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfileo2}
+
+if ![runto_main] then {
+    fail "cannot run to main"
+    return
+}
+delete_breakpoints
+
+#
+# test break at function
+#
+gdb_test "hbreak main" \
+    "Hardware assisted breakpoint.*at.* file .*, line.*" \
+    "hardware breakpoint function, optimized file"
+
+#
+# run until the breakpoint at main is hit. For non-stubs-using targets.
+#
+gdb_run_cmd
+gdb_expect {
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $" {
+	pass "run until function breakpoint, optimized file"
+    }
+    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$gdb_prompt $" {
+	pass "run until function breakpoint, optimized file (code motion)"
+    }
+    -re "$gdb_prompt $" {
+	fail "run until function breakpoint, optimized file"
+    }
+    timeout {
+	fail "run until function breakpoint, optimized file (timeout)"
+    }
+}
+delete_breakpoints
+
+#
+# test break at function
+#
+gdb_test "hbreak marker4" \
+    "Hardware assisted breakpoint.*at.* file .*$srcfile1, line.*" \
+    "hardware breakpoint small function, optimized file"
+
+#
+# run until the breakpoint at a small function
+#
+
+#
+# Add a second pass pattern.  The behavior differs here between stabs
+# and dwarf for one-line functions.  Stabs preserves two line symbols
+# (one before the prologue and one after) with the same line number,
+# but dwarf regards these as duplicates and discards one of them.
+# Therefore the address after the prologue (where the breakpoint is)
+# has no exactly matching line symbol, and GDB reports the breakpoint
+# as if it were in the middle of a line rather than at the beginning.
+
+set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
+set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
+send_gdb "continue\n"
+gdb_expect {
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
+	pass "run until breakpoint set at small function, optimized file"
+    }
+    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" {
+	# marker4() is defined at line 46 when compiled with -DPROTOTYPES
+	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
+    }
+    -re ".*$gdb_prompt " {
+	fail "run until breakpoint set at small function, optimized file"
+    }
+    timeout {
+	fail "run until breakpoint set at small function, optimized file (timeout)"
+    }
+}
+
+
+# Reset the default arguments for VxWorks
+if [istarget "*-*-vxworks*"] {
+    set timeout 10
+    verbose "Timeout is now $timeout seconds" 2
+    send_gdb "set args main\n"
+    gdb_expect -re ".*$gdb_prompt $" {}
+}

Re: hbreak.exp: Test hardware breakpoints

[Daniel Jacobowitz]

On Wed, Feb 27, 2008 at 03:11:38PM +0000, Maciej W. Rozycki wrote:
>  Daniel, have you got any further with this patch you proposed?  I can see 
> it has not been included in the tree.

I have checked in the updated version, which is attached.

>  Here is my gdb.base/hbreak.exp test case again, updated according to your 
> suggestion so that hardware breakpoints are only inserted once the target 
> has been placed into the execution mode.  It passes on i386-linux natively 
> and with the mipsisa32-sde-elf target using the 
> mips-sim-sde32/-EB/-march=mips32r2 and mips-sim-sde32/-EL/-march=mips32r2 
> boards.  It reports the cases correctly as unsupported on mips-linux 
> natively and with the mipsisa32-sde-elf target using the 
> mips-sim-sde32/-EB/-march=mips32r2 and mips-sim-sde32/-EL/-march=mips32r2 
> boards.

It fails using gdbserver.  The first failure looks like this:

(gdb) continue
Continuing.
Warning:
Cannot insert hardware breakpoint 10.
Could not insert hardware breakpoints:
You may have requested too many hardware breakpoints/watchpoints.

(gdb) FAIL: gdb.base/hbreak.exp: run until function breakpoint

"target remote" has hardware breakpoint support, but this particular
remote target does not.  Unfortunately we do not detect the error
and I am not sure how to make it do so.  There is a
gdb,no_hardware_watchpoints setting in the testsuite already; maybe we
can just skip this test if it is set?

The problem with autodetection is that we don't have any way to probe
for those packets at the moment.  We don't get an error until we go to
insert one.  We could try inserting one early, when it is requested,
maybe?

-- 
Daniel Jacobowitz
CodeSourcery

2007-02-29  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.in (i386-nat.o): Update.
	* amd64-linux-nat.c (_initialize_amd64_linux_nat): Call
	i386_use_watchpoints.
	* i386-linux-nat.c (_initialize_i386_linux_nat): Call
	i386_use_watchpoints.
	* i386-nat.c (i386_stopped_data_address): Take two arguments.
	(i386_stopped_by_watchpoint): Update call.
	(i386_can_use_hw_breakpoint, i386_use_watchpoints): New.
	* config/i386/nm-i386.h: Conditionalize definitions on
	! I386_WATCHPOINTS_IN_TARGET_VECTOR.
	(i386_use_watchpoints): Declare.
	(i386_stopped_data_address): Update.
	* config/i386/nm-linux.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.
	* config/i386/nm-linux64.h (I386_WATCHPOINTS_IN_TARGET_VECTOR): Define.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.985
diff -u -p -r1.985 Makefile.in
--- Makefile.in	27 Feb 2008 01:06:20 -0000	1.985
+++ Makefile.in	1 Mar 2008 03:58:33 -0000
@@ -2229,7 +2229,8 @@ i386-linux-tdep.o: i386-linux-tdep.c $(d
 	$(value_h) $(regcache_h) $(inferior_h) $(osabi_h) $(reggroups_h) \
 	$(dwarf2_frame_h) $(gdb_string_h) $(i386_tdep_h) \
 	$(i386_linux_tdep_h) $(glibc_tdep_h) $(solib_svr4_h) $(symtab_h)
-i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h)
+i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h) \
+	$(target_h)
 i386nbsd-nat.o: i386nbsd-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(target_h) $(i386_tdep_h) $(i386bsd_nat_h) $(nbsd_nat_h) \
 	$(bsd_kvm_h)
Index: amd64-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-nat.c,v
retrieving revision 1.20
diff -u -p -r1.20 amd64-linux-nat.c
--- amd64-linux-nat.c	16 Jan 2008 04:52:52 -0000	1.20
+++ amd64-linux-nat.c	1 Mar 2008 03:58:33 -0000
@@ -421,6 +421,8 @@ _initialize_amd64_linux_nat (void)
   /* Fill in the generic GNU/Linux methods.  */
   t = linux_target ();
 
+  i386_use_watchpoints (t);
+
   /* Override the GNU/Linux inferior startup hook.  */
   super_post_startup_inferior = t->to_post_startup_inferior;
   t->to_post_startup_inferior = amd64_linux_child_post_startup_inferior;
Index: i386-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-linux-nat.c,v
retrieving revision 1.85
diff -u -p -r1.85 i386-linux-nat.c
--- i386-linux-nat.c	1 Jan 2008 22:53:10 -0000	1.85
+++ i386-linux-nat.c	1 Mar 2008 03:58:33 -0000
@@ -820,6 +820,8 @@ _initialize_i386_linux_nat (void)
   /* Fill in the generic GNU/Linux methods.  */
   t = linux_target ();
 
+  i386_use_watchpoints (t);
+
   /* Override the default ptrace resume method.  */
   t->to_resume = i386_linux_resume;
 
Index: i386-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nat.c,v
retrieving revision 1.17
diff -u -p -r1.17 i386-nat.c
--- i386-nat.c	1 Jan 2008 22:53:11 -0000	1.17
+++ i386-nat.c	1 Mar 2008 03:58:33 -0000
@@ -21,6 +21,7 @@
 #include "breakpoint.h"
 #include "command.h"
 #include "gdbcmd.h"
+#include "target.h"
 
 /* Support for hardware watchpoints and breakpoints using the i386
    debug registers.
@@ -563,7 +564,7 @@ i386_region_ok_for_watchpoint (CORE_ADDR
    Otherwise, return zero.  */
 
 int
-i386_stopped_data_address (CORE_ADDR *addr_p)
+i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
 {
   CORE_ADDR addr = 0;
   int i;
@@ -599,7 +600,7 @@ int
 i386_stopped_by_watchpoint (void)
 {
   CORE_ADDR addr = 0;
-  return i386_stopped_data_address (&addr);
+  return i386_stopped_data_address (&current_target, &addr);
 }
 
 /* Return non-zero if the inferior has some break/watchpoint that
@@ -654,6 +655,47 @@ i386_remove_hw_breakpoint (struct bp_tar
   return retval;
 }
 
+/* Returns the number of hardware watchpoints of type TYPE that we can
+   set.  Value is positive if we can set CNT watchpoints, zero if
+   setting watchpoints of type TYPE is not supported, and negative if
+   CNT is more than the maximum number of watchpoints of type TYPE
+   that we can support.  TYPE is one of bp_hardware_watchpoint,
+   bp_read_watchpoint, bp_write_watchpoint, or bp_hardware_breakpoint.
+   CNT is the number of such watchpoints used so far (including this
+   one).  OTHERTYPE is non-zero if other types of watchpoints are
+   currently enabled.
+
+   We always return 1 here because we don't have enough information
+   about possible overlap of addresses that they want to watch.  As an
+   extreme example, consider the case where all the watchpoints watch
+   the same address and the same region length: then we can handle a
+   virtually unlimited number of watchpoints, due to debug register
+   sharing implemented via reference counts in i386-nat.c.  */
+
+static int
+i386_can_use_hw_breakpoint (int type, int cnt, int othertype)
+{
+  return 1;
+}
+
+void
+i386_use_watchpoints (struct target_ops *t)
+{
+  /* After a watchpoint trap, the PC points to the instruction after the
+     one that caused the trap.  Therefore we don't need to step over it.
+     But we do need to reset the status register to avoid another trap.  */
+  t->to_have_continuable_watchpoint = 1;
+
+  t->to_can_use_hw_breakpoint = i386_can_use_hw_breakpoint;
+  t->to_region_ok_for_hw_watchpoint = i386_region_ok_for_watchpoint;
+  t->to_stopped_by_watchpoint = i386_stopped_by_watchpoint;
+  t->to_stopped_data_address = i386_stopped_data_address;
+  t->to_insert_watchpoint = i386_insert_watchpoint;
+  t->to_remove_watchpoint = i386_remove_watchpoint;
+  t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
+  t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
+}
+
 #endif /* I386_USE_GENERIC_WATCHPOINTS */
 \f
 
Index: config/i386/nm-i386.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-i386.h,v
retrieving revision 1.12
diff -u -p -r1.12 nm-i386.h
--- config/i386/nm-i386.h	1 Jan 2008 22:53:14 -0000	1.12
+++ config/i386/nm-i386.h	1 Mar 2008 03:58:33 -0000
@@ -24,6 +24,11 @@
 /* Targets should define this to use the generic x86 watchpoint support.  */
 #ifdef I386_USE_GENERIC_WATCHPOINTS
 
+/* Add watchpoint methods to the provided target_ops.  Targets which call
+   this should also define I386_WATCHPOINTS_IN_TARGET_VECTOR.  */
+struct target_ops;
+void i386_use_watchpoints (struct target_ops *);
+
 /* Clear the reference counts and forget everything we knew about DRi.  */
 extern void i386_cleanup_dregs (void);
 
@@ -48,7 +53,7 @@ extern int i386_stopped_by_hwbp (void);
 /* If the inferior has some break/watchpoint that triggered, set
    the address associated with that break/watchpoint and return
    true.  Otherwise, return false.  */
-extern int i386_stopped_data_address (CORE_ADDR *);
+extern int i386_stopped_data_address (struct target_ops *, CORE_ADDR *);
 
 /* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
    Return 0 on success, EBUSY on failure.  */
@@ -59,6 +64,10 @@ extern int i386_insert_hw_breakpoint (st
    Return 0 on success, -1 on failure.  */
 extern int  i386_remove_hw_breakpoint (struct bp_target_info *bp_tgt);
 
+extern int i386_stopped_by_watchpoint (void);
+
+#ifndef I386_WATCHPOINTS_IN_TARGET_VECTOR
+
 /* Returns the number of hardware watchpoints of type TYPE that we can
    set.  Value is positive if we can set CNT watchpoints, zero if
    setting watchpoints of type TYPE is not supported, and negative if
@@ -90,11 +99,10 @@ extern int  i386_remove_hw_breakpoint (s
 
 #define HAVE_CONTINUABLE_WATCHPOINT 1
 
-extern int i386_stopped_by_watchpoint (void);
-
 #define STOPPED_BY_WATCHPOINT(W)       (i386_stopped_by_watchpoint () != 0)
 
-#define target_stopped_data_address(target, x)  i386_stopped_data_address(x)
+#define target_stopped_data_address(target, x) \
+  i386_stopped_data_address(target, x)
 
 /* Use these macros for watchpoint insertion/removal.  */
 
@@ -110,6 +118,8 @@ extern int i386_stopped_by_watchpoint (v
 #define target_remove_hw_breakpoint(bp_tgt) \
   i386_remove_hw_breakpoint (bp_tgt)
 
+#endif /* I386_WATCHPOINTS_IN_TARGET_VECTOR */
+
 #endif /* I386_USE_GENERIC_WATCHPOINTS */
 
 #endif /* NM_I386_H */
Index: config/i386/nm-linux.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-linux.h,v
retrieving revision 1.27
diff -u -p -r1.27 nm-linux.h
--- config/i386/nm-linux.h	1 Jan 2008 22:53:14 -0000	1.27
+++ config/i386/nm-linux.h	1 Mar 2008 03:58:33 -0000
@@ -23,6 +23,7 @@
 
 /* GNU/Linux supports the i386 hardware debugging registers.  */
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 #include "config/nm-linux.h"
Index: config/i386/nm-linux64.h
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nm-linux64.h,v
retrieving revision 1.7
diff -u -p -r1.7 nm-linux64.h
--- config/i386/nm-linux64.h	1 Jan 2008 22:53:14 -0000	1.7
+++ config/i386/nm-linux64.h	1 Mar 2008 03:58:33 -0000
@@ -25,6 +25,7 @@
 
 /* GNU/Linux supports the i386 hardware debugging registers.  */
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 #include "config/nm-linux.h"