mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 02:53:48 +08:00
b89667ebd4
caller_state. (dummy_frame_push): Replace caller_regcache arg with caller_state. All callers updated. (remove_dummy_frame,pop_dummy_frame,lookup_dummy_frame): New fns. (dummy_frame_pop): Rewrite. Verify requested frame is in the dummy frame stack. Restore program state. (cleanup_dummy_frames): Rewrite. (dummy_frame_sniffer): Update. Make static. * dummy-frame.h (regcache,frame_info): Delete forward decls. (inferior_thread_state): New forward decl. (dummy_frame_push): Update prototype. * frame.c (frame_pop): dummy_frame_pop now does all the work for DUMMY_FRAMEs. * infcall.c (breakpoint_auto_delete_contents): Delete. (get_function_name,run_inferior_call): New fns. (call_function_by_hand): Simplify by moving some code to get_function_name, run_inferior_call. Inferior function call wrapped in TRY_CATCH so there's less need for cleanups and all exits from proceed are handled similarily. Detect program exit. Detect program stopping in a different thread. Make error messages more consistent. * inferior.h (inferior_thread_state): Declare (opaque type). (save_inferior_thread_state,restore_inferior_thread_state, make_cleanup_restore_inferior_thread_state, discard_inferior_thread_state, get_inferior_thread_state_regcache): Declare. (save_inferior_status): Update prototype. * infrun.c: (normal_stop): When stopped for the completion of an inferior function call, verify the expected stack frame kind. (inferior_thread_state): New struct. (save_inferior_thread_state,restore_inferior_thread_state, do_restore_inferior_thread_state_cleanup, make_cleanup_restore_inferior_thread_state, discard_inferior_thread_state, get_inferior_thread_state_regcache): New functions. (inferior_status): Move stop_signal, stop_pc, registers to inferior_thread_state. Remove restore_stack_info. (save_inferior_status): Remove arg restore_stack_info. All callers updated. Remove saving of state now saved by save_inferior_thread_state. (restore_inferior_status): Remove restoration of state now done by restore_inferior_thread_state. (discard_inferior_status): Remove freeing of registers, now done by discard_inferior_thread_state. * gdb.base/break.exp: Update expected gdb output. * gdb.base/sepdebug.exp: Ditto. * gdb.mi/mi-syn-frame.exp: Ditto. * gdb.mi/mi2-syn-frame.exp: Ditto. * gdb.base/call-signal-resume.exp: New file. * gdb.base/call-signals.c: New file. * gdb.base/unwindonsignal.exp: New file. * gdb.base/unwindonsignal.c: New file. * gdb.threads/interrupted-hand-call.exp: New file. * gdb.threads/interrupted-hand-call.c: New file. * gdb.threads/thread-unwindonsignal.exp: New file.
160 lines
4.3 KiB
Plaintext
160 lines
4.3 KiB
Plaintext
# Copyright 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/>.
|
|
|
|
# Test inferior resumption after discarding a hand-called function.
|
|
# There are two things to test.
|
|
# 1) Inferior stops normally. Upon resumption it should continue normally,
|
|
# regardless of whatever signal the hand-called function got.
|
|
# 2) Inferior is stopped at a signal. Upon resumption it should continue
|
|
# with that signal, regardless of whatever the hand-called function did.
|
|
|
|
if $tracelevel then {
|
|
strace $tracelevel
|
|
}
|
|
|
|
if [target_info exists gdb,noinferiorio] {
|
|
verbose "Skipping call-signal-resume.exp because of no fileio capabilities."
|
|
continue
|
|
}
|
|
|
|
set prms_id 0
|
|
set bug_id 0
|
|
|
|
set testfile "call-signals"
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/${testfile}
|
|
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
|
|
untested call-signal-resume.exp
|
|
return -1
|
|
}
|
|
|
|
# Some targets can't do function calls, so don't even bother with this
|
|
# test.
|
|
if [target_info exists gdb,cannot_call_functions] {
|
|
setup_xfail "*-*-*" 2416
|
|
fail "This target can not call functions"
|
|
continue
|
|
}
|
|
|
|
proc get_dummy_frame_number { } {
|
|
global gdb_prompt
|
|
|
|
send_gdb "bt\n"
|
|
gdb_expect {
|
|
-re "#(\[0-9\]*) *<function called from gdb>.*$gdb_prompt $"
|
|
{
|
|
return $expect_out(1,string)
|
|
}
|
|
-re "$gdb_prompt $"
|
|
{
|
|
return ""
|
|
}
|
|
timeout
|
|
{
|
|
return ""
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
# Start with a fresh gdb.
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_load ${binfile}
|
|
|
|
if { ![runto_main] } {
|
|
fail "Can't run to main"
|
|
return 0
|
|
}
|
|
|
|
gdb_test "break stop_one" "Breakpoint \[0-9\]* at .*"
|
|
gdb_test "continue" "Continuing.*Breakpoint \[0-9\]*, stop_one.*" \
|
|
"continue to breakpoint at stop_one"
|
|
|
|
# Call function (causing the program to get a signal), and see if gdb handles
|
|
# it properly.
|
|
gdb_test_multiple "call gen_signal ()" \
|
|
"inferior function call signaled" {
|
|
-re "\[\r\n\]*no signal\[\r\n\]+$gdb_prompt $" {
|
|
unsupported "inferior function call signaled"
|
|
return 0
|
|
}
|
|
-re "\[\r\n\]*The program being debugged was signaled.*\[\r\n\]+$gdb_prompt $" {
|
|
pass "inferior function call signaled"
|
|
}
|
|
}
|
|
|
|
set frame_number [get_dummy_frame_number]
|
|
if { "$frame_number" == "" } {
|
|
fail "dummy stack frame number"
|
|
setup_xfail "*-*-*"
|
|
} else {
|
|
pass "dummy stack frame number"
|
|
}
|
|
|
|
# Pop the dummy frame.
|
|
gdb_test "frame $frame_number" ""
|
|
gdb_test "set confirm off" ""
|
|
gdb_test "return" ""
|
|
|
|
# Resume execution, the program should continue without any signal.
|
|
|
|
gdb_test "break stop_two" "Breakpoint \[0-9\]* at .*"
|
|
gdb_test "continue" "Breakpoint \[0-9\]*, stop_two.*" \
|
|
"continue to breakpoint at stop_two"
|
|
|
|
# Continue again, we should get a signal.
|
|
|
|
gdb_test "continue" "Program received signal .*" \
|
|
"continue to receipt of signal"
|
|
|
|
# Hand call another function that prematurely stops,
|
|
# then manually pop the dummy stack frame.
|
|
|
|
gdb_test "break null_hand_call" "Breakpoint \[0-9\]* at .*"
|
|
gdb_test "call null_hand_call ()" "Breakpoint \[0-9\]*, null_hand_call.*" \
|
|
"null_hand_call"
|
|
|
|
set frame_number [get_dummy_frame_number]
|
|
if { "$frame_number" == "" } {
|
|
fail "dummy stack frame number"
|
|
setup_xfail "*-*-*"
|
|
# Need something.
|
|
set frame_number 0
|
|
} else {
|
|
pass "dummy stack frame number"
|
|
}
|
|
|
|
# Pop the dummy frame.
|
|
gdb_test "frame $frame_number" ""
|
|
gdb_test "set confirm off" ""
|
|
gdb_test "return" ""
|
|
|
|
# Continue again, this time we should get to the signal handler.
|
|
|
|
gdb_test "break handle_signal" "Breakpoint \[0-9\]* at .*"
|
|
gdb_test "continue" "Breakpoint \[0-9\]*, handle_signal.*" \
|
|
"continue to breakpoint at handle_signal"
|
|
|
|
# Continue one last time, the program should exit normally.
|
|
|
|
gdb_test "continue" "Program exited normally." \
|
|
"continue to program exit"
|
|
|
|
return 0
|