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.
92 lines
2.7 KiB
Text
92 lines
2.7 KiB
Text
# Copyright (C) 2004, 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/>.
|
|
|
|
# Test recovering from a hand function call that gets interrupted
|
|
# by a signal in another thread.
|
|
|
|
set NR_THREADS 4
|
|
|
|
if $tracelevel then {
|
|
strace $tracelevel
|
|
}
|
|
|
|
set testfile "interrupted-hand-call"
|
|
set srcfile ${testfile}.c
|
|
set binfile ${objdir}/${subdir}/${testfile}
|
|
|
|
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}" "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
|
|
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
|
|
}
|
|
|
|
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 all_threads_running" \
|
|
"Breakpoint 2 at .*: file .*${srcfile}, line .*" \
|
|
"breakpoint on all_threads_running"
|
|
|
|
# Run the program and make sure GDB reports that we stopped after
|
|
# hitting breakpoint 2 in all_threads_running().
|
|
|
|
gdb_test "continue" \
|
|
".*Breakpoint 2, all_threads_running ().*" \
|
|
"run to all_threads_running"
|
|
|
|
# NOTE: Don't turn on scheduler-locking here.
|
|
# We want the main thread (hand_call_with_signal) and
|
|
# thread 1 (sigabrt_handler) to both run.
|
|
|
|
gdb_test "call hand_call_with_signal()" \
|
|
".*in another thread.*" \
|
|
"hand-call interrupted by signal in another thread"
|
|
|
|
# Verify dummy stack frame is still present.
|
|
|
|
gdb_test "maint print dummy-frames" ".*stack=.*" "dummy stack frame present"
|
|
|
|
# Continuing now should exit the hand-call and pop the dummy frame.
|
|
|
|
gdb_test "continue" "" "finish hand-call"
|
|
|
|
gdb_test_multiple "maint print dummy-frames" "dummy frame popped" {
|
|
-re ".*stack=.*$gdb_prompt $" {
|
|
fail "dummy frame popped"
|
|
}
|
|
-re ".*$gdb_prompt $" {
|
|
pass "dummy frame popped"
|
|
}
|
|
}
|
|
|
|
# Continue one last time, the program should exit normally.
|
|
|
|
gdb_test "continue" "Program exited normally." \
|
|
"continue to program exit"
|
|
|
|
return 0
|