import gdb-1999-06-28 snapshot

1 files changed, 243 insertions, 46 deletions

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 53f2e8b..7dced3b 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -30,20 +30,12 @@ set testfile "watchpoint"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
+set wp_set 1
 
 if [get_compiler_info ${binfile}] {
     return -1
 }
 
-# if we are on HPUX and we are not compiled with gcc, then skip these tests.
-
-if [istarget hppa*-*-hpux*] {
-    if {!$gcc_compiled} {
-	continue 
-    }
-}
-
-
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
@@ -69,6 +61,7 @@ proc initialize {} {
     global hex
     global decimal
     global srcfile
+    global wp_set
 
     if [gdb_test "break marker1" "Breakpoint 1 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker1" ] { 
       return 0; 
@@ -85,11 +78,27 @@ proc initialize {} {
     }
 
 
-    if [gdb_test "watch ival3" ".*\[Ww\]atchpoint 3: ival3" "set watchpoint on ival3" ] { 
-      return 0; 
+    # ??rehrauer: To fix DTS #CHFts23014, in which setting a watchpoint
+    # before running can cause the inferior to croak on HP-UX 10.30 and
+    # 11.0 for reasons as yet unknown, we've disabled the ability to set
+    # watches without a running inferior.  Verify the restriction.
+    #
+    send_gdb "watch ival3\n"
+    gdb_expect {
+        -re ".*\[Ww\]atchpoint 3: ival3.*$gdb_prompt $" {
+            pass "set watchpoint on ival3"
+        }
+        -re "warning: can't do that without a running program; try \"break main\", \"run\" first.*$gdb_prompt $" {
+            pass "set watchpoint on ival3"
+            set wp_set 0
+            return 1
+        }
+        timeout {
+            fail "(timeout) set watchpoint on ival3"
+            return 0
+        }
     }
 
-
     # "info watch" is the same as "info break"
 
     if [gdb_test "info watch" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3" "watchpoint found in watchpoint/breakpoint table" ] { 
@@ -117,11 +126,14 @@ proc test_simple_watchpoint {} {
     global gdb_prompt
     global hex
     global decimal
+    global wp_set
 
     # Ensure that the watchpoint is disabled when we startup.
 
-    if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_simple_watchpoint" ] { 
-      return 0; 
+    if { $wp_set } {
+        if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_simple_watchpoint" ] { 
+	    return 0; 
+	}
     }
 
 
@@ -143,6 +155,51 @@ proc test_simple_watchpoint {} {
 	}
     }
 
+    if { !$wp_set } {
+	# ??rehrauer: To fix DTS #CHFts23014, in which setting a watchpoint
+	# before running can cause the inferior to croak on HP-UX 10.30 and
+	# 11.0 for reasons as yet unknown, we've disabled the ability to set
+	# watches without a running inferior.  The following testpoints used
+	# to be in [initialize].
+	#
+	send_gdb "watch ival3\n"
+	gdb_expect {
+	    -re ".*\[Ww\]atchpoint 3: ival3\r\n$gdb_prompt $" { 
+	        pass "set watchpoint on ival3"
+	    }
+	    -re ".*$gdb_prompt $" { fail "set watchpoint on ival3"  }
+	    timeout { fail "set watchpoint on ival3 (timeout)"  }
+	}
+
+        set wp_set 1
+
+	# "info watch" is the same as "info break"
+
+	send_gdb "info watch\n"
+	gdb_expect {
+	    -re "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3\r\n$gdb_prompt $" {
+	        pass "watchpoint found in watchpoint/breakpoint table"
+	    }
+	    -re ".*$gdb_prompt $" {
+	        fail "watchpoint found in watchpoint/breakpoint table"
+	    }
+	    timeout {
+	       fail "watchpoint found in watchpoint/breakpoint table"
+	    }
+	}
+
+	# After installing the watchpoint, we disable it until we are ready
+	# to use it.  This allows the test program to run at full speed until
+	# we get to the first marker function.
+
+	send_gdb "disable 3\n"
+	gdb_expect {
+	    -re "disable 3\[\r\n\]+$gdb_prompt $" { pass "disable watchpoint" }
+	    -re ".*$gdb_prompt $" { fail "disable watchpoint"  }
+	    timeout { fail "disable watchpoint (timeout)"  }
+	}
+    }
+
     # After reaching the marker function, enable the watchpoint.
 
     if [gdb_test "enable 3" "^enable 3\[\r\n\]+" "enable watchpoint" ] { 
@@ -221,6 +278,9 @@ proc test_disabling_watchpoints {} {
     global decimal
     global hex
 
+    # "info watch" is the same as "info break"
+    gdb_test "info watch" "\[0-9\]+\[ \]*breakpoint.*marker1.*\r\n\[0-9\]+\[ \]*breakpoint.*marker2.*\r\n\[0-9]+\[ \]*.*watchpoint.*ival3\r\n\.*\[0-9\]+ times.*" "watchpoints found in watchpoint/breakpoint table"
+
     # Ensure that the watchpoint is disabled when we startup.
 
     if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_disabling_watchpoints" ] { 
@@ -270,7 +330,7 @@ proc test_disabling_watchpoints {} {
 
     # Check watchpoint list, looking for the entry that confirms the
     # watchpoint is disabled.
-    gdb_test "info watchpoints" "3\[ \]*.*watchpoint\[ \]*keep\[ \]*n\[ \]*ival3\r\n.*" "watchpoint disabled in table"
+    gdb_test "info watchpoints" "\[0-9]+\[ \]*.*watchpoint\[ \]*keep\[ \]*n\[ \]*ival3\r\n.*" "watchpoint disabled in table"
 
     # Continue until we hit the finishing marker function.
     # Make sure we hit no more watchpoints.
@@ -293,35 +353,30 @@ proc test_stepping {} {
 	gdb_test "break func2 if 0" "Breakpoint.*at.*"
 	gdb_test "p \$func2_breakpoint_number = \$bpnum" " = .*"
 
-	# The HPPA has a problem here if it's not using hardware watchpoints
-	if {[ istarget "hppa*-*-*" ] && ![ istarget "hppa*-*-*bsd*" ]} then {
-	    # Don't actually try doing the call, if we do we can't continue.
-	    setup_xfail "*-*-*"
-	    fail "calling function with watchpoint enabled"
-	} else {
-	    # The problem is that GDB confuses stepping through the call
-	    # dummy with hitting the breakpoint at the end of the call dummy.
-	    # Will be fixed once all architectures define 
-	    # CALL_DUMMY_BREAKPOINT_OFFSET.
-	    setup_xfail "*-*-*"
-	    # This doesn't occur if the call dummy starts with a call,
-	    # because we are out of the dummy by the first time the inferior
-	    # stops.
-	    clear_xfail "d10v*-*-*"
-	    clear_xfail "m68*-*-*"
-	    clear_xfail "i*86*-*-*"
-	    clear_xfail "vax-*-*"
-	    # The following architectures define CALL_DUMMY_BREAKPOINT_OFFSET.
-	    clear_xfail "alpha-*-*"
-	    clear_xfail "mips*-*-*"
-	    clear_xfail "sparc-*-*"
-	    clear_xfail "hppa*-*-*bsd*"
-	    # It works with the generic inferior function calling code too.
-	    clear_xfail "mn10200*-*-*"
-	    clear_xfail "mn10300*-*-*"
-	    gdb_test "p func1 ()" "= 73" \
-		"calling function with watchpoint enabled"
-	}
+	# The problem is that GDB confuses stepping through the call
+	# dummy with hitting the breakpoint at the end of the call dummy.
+	# Will be fixed once all architectures define 
+	# CALL_DUMMY_BREAKPOINT_OFFSET.
+	setup_xfail "*-*-*"
+	# This doesn't occur if the call dummy starts with a call,
+	# because we are out of the dummy by the first time the inferior
+	# stops.
+	clear_xfail "d10v*-*-*"
+	clear_xfail "m68*-*-*"
+	clear_xfail "i*86*-*-*"
+	clear_xfail "vax-*-*"
+	# The following architectures define CALL_DUMMY_BREAKPOINT_OFFSET.
+	clear_xfail "alpha-*-*"
+	clear_xfail "mips*-*-*"
+	clear_xfail "sparc-*-*"
+	clear_xfail "hppa*-*-*bsd*"
+	# It works with the generic inferior function calling code too.
+	clear_xfail "mn10200*-*-*"
+	clear_xfail "mn10300*-*-*"
+	# The following architectures define CALL_DUMMY_HAS_COMPLETED.
+	clear_xfail "hppa*-*-*hpux*"
+	gdb_test "p func1 ()" "= 73" \
+	"calling function with watchpoint enabled"
 
 	# 
 	# "finish" brings us back to main.
@@ -495,18 +550,82 @@ proc test_complex_watchpoint {} {
 	gdb_test "cont" "Continuing.*Breakpoint.*marker5 \\(\\).*" \
 	    "did not trigger wrong watchpoint"
 
+        # Test watches of things declared locally in a function.
+        # In particular, test that a watch of stack-based things
+        # is deleted when the stack-based things go out of scope.
+        #
+	gdb_test "disable" "" "disable in test_complex_watchpoint"
+        gdb_test "break marker6" ".*Breakpoint.*"
+        gdb_test "cont" "Continuing.*Breakpoint.*marker6 \\(\\).*" \
+            "continue to marker6"
+        gdb_test "break func2" ".*Breakpoint.*"
+        gdb_test "cont" "Continuing.*func2.*"
+
+        # Test a watch of a single stack-based variable, whose scope
+        # is the function we're now in.  This should auto-delete when
+        # execution exits the scope of the watchpoint.
+        #
+        gdb_test "watch local_a" ".*\[Ww\]atchpoint \[0-9\]*: local_a" "set local watch"
+        gdb_test "cont" "\[Ww\]atchpoint.*local_a.*" "trigger local watch"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" "self-delete local watch"
+
+        gdb_test "cont" "Continuing.*func2.*"
+        # We should be in "func2" again now.  Test a watch of an
+        # expression which includes both a stack-based local and
+        # something whose scope is larger than this invocation
+        # of "func2".  This should also auto-delete.
+        #
+        gdb_test "watch local_a + ival5" ".*\[Ww\]atchpoint \[0-9\]*: local_a . ival5" \
+                 "set partially local watch"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_a . ival5.*" \
+                 "trigger1 partially local watch"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_a . ival5.*" \
+                 "trigger2 partially local watch"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \
+                 "self-delete partially local watch"
+
+        # We should be in "func2" again now.  Test a watch of a
+        # static (non-stack-based) local.  Since this has scope
+        # across any invocations of "func2", it should not auto-
+        # delete.
+        #
+        gdb_test "cont" "Continuing.*func2.*"
+        gdb_test "watch static_b" ".*\[Ww\]atchpoint \[0-9\]*: static_b" \
+                 "set static local watch"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: static_b.*" \
+                 "trigger static local watch"
+        gdb_test "cont" "Continuing.*marker6 \\(\\).*" \
+                 "continue after trigger static local watch"
+        gdb_test "info break" ".*watchpoint.*static_b.*" \
+                 "static local watch did not self-delete"
+
+        # We should be in "recurser" now.  Test a watch of a stack-
+        # based local.  Symbols mentioned in a watchpoint are bound
+        # at watchpoint-creation.  Thus, a watch of a stack-based
+        # local to a recursing function should be bound only to that
+        # one invocation, and should not trigger for other invocations.
+        #
+        gdb_test "tbreak recurser" ".*Breakpoint.*"
+        gdb_test "cont" "Continuing.*recurser.*"
+        gdb_test "watch local_x" ".*\[Ww\]atchpoint \[0-9\]*: local_x" \
+                 "set local watch in recursive call"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_x.*New value = 2.*" \
+                 "trigger local watch in recursive call"
+        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \
+                 "self-delete local watch in recursive call"
+
 	# Disable everything so we can finish the program at full speed
 	gdb_test "disable" "" "disable in test_complex_watchpoint"
 
 	if [target_info exists gdb,noresults] { return }
 
-
-        gdb_continue_to_end "continue to exit in test_complex_watchpoint"
+	gdb_continue_to_end "continue to exit in test_complex_watchpoint"
     }
 }
 
 # Start with a fresh gdb.
 
+gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
@@ -576,4 +695,82 @@ if [initialize] then {
 	    [istarget "m32r-*-*"]} then {
 	test_complex_watchpoint
     }
+
+    # Verify that a user can force GDB to use "slow" watchpoints.
+    # (This proves rather little on kernels that don't support
+    # fast watchpoints, but still...)
+    #
+    if ![runto_main] then { fail "watch tests suppressed" }
+
+    send_gdb "set can-use-hw-watchpoints 0\n"
+    gdb_expect {
+      -re "$gdb_prompt $"\
+              {pass "disable fast watches"}
+      timeout {fail "(timeout) disable fast watches"}
+    }
+    send_gdb "show can-use-hw-watchpoints\n"
+    gdb_expect {
+      -re "Debugger's willingness to use watchpoint hardware is 0.*$gdb_prompt $"\
+              {pass "show disable fast watches"}
+      -re "$gdb_prompt $"\
+              {fail "show disable fast watches"}
+      timeout {fail "(timeout) show disable fast watches"}
+    }
+    send_gdb "watch ival3 if  count > 1\n"
+    gdb_expect {
+      -re "Watchpoint \[0-9\]*: ival3.*$gdb_prompt $"\
+              {pass "set slow conditional watch"}
+      -re "$gdb_prompt $"\
+              {fail "set slow conditional watch"}
+      timeout {fail "(timeout) set slow conditional watch"}
+    }
+    send_gdb "continue\n"
+    gdb_expect {
+      -re "Watchpoint \[0-9\]*: ival3.*Old value = 1.*New value = 2.*$gdb_prompt $"\
+              {pass "trigger slow conditional watch"}
+      -re "$gdb_prompt $"\
+              {fail "trigger slow conditional watch"}
+      timeout {fail "(timeout) trigger slow conditional watch"}
+    }
+
+    # We've explicitly disabled hardware watches.  Verify that GDB
+    # 
+    #
+    send_gdb "rwatch ival3\n"
+    gdb_expect {
+      -re "Expression cannot be implemented with read/access watchpoint..*$gdb_prompt $"\
+              {pass "rwatch disallowed when can-set-hw-watchpoints cleared"}
+      -re "$gdb_prompt $"\
+              {fail "rwatch disallowed when can-set-hw-watchpoints cleared"}
+      timeout {fail "(timeout) rwatch disallowed when can-use-hw-watchpoints cleared"}
+    }
+
+    # Read- and access watchpoints are unsupported on HP-UX.  Verify
+    # that GDB gracefully responds to requests to create them.
+    #
+    if [istarget "hppa*-*-hpux*"] then {
+      send_gdb "set can-use-hw-watchpoints 1\n"
+      gdb_expect {
+        -re "$gdb_prompt $"\
+                {pass "enable fast watches"}
+        timeout {fail "(timeout) enable fast watches"}
+      }
+      send_gdb "rwatch ival3\n"
+      gdb_expect {
+        -re "Target does not have this type of hardware watchpoint support.*$gdb_prompt $"\
+                {pass "read watches disallowed"}
+        -re "$gdb_prompt $"\
+                {fail "read watches disallowed"}
+        timeout {fail "(timeout) read watches disallowed"}
+      }
+
+      send_gdb "awatch ival3\n"
+      gdb_expect {
+        -re "Target does not have this type of hardware watchpoint support.*$gdb_prompt $"\
+                {pass "access watches disallowed"}
+        -re "$gdb_prompt $"\
+                {fail "access watches disallowed"}
+        timeout {fail "(timeout) access watches disallowed"}
+      }
+    }
 }