From dd7e2d2bc7ef0a69396a4e9fda0a0039e919cd19 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 23 Jan 2009 15:47:03 +0000 Subject: [PATCH] 2009-01-23 Pedro Alves PR gdb/9664: * infrun.c (normal_stop): Tag threads as stopped, and run the hook-stop before printing the stack frame. 2009-01-23 Pedro Alves PR gdb/9664: * gdb.base/hook-stop-frame.c, gdb.base/hook-stop-frame.exp: New. --- gdb/ChangeLog | 6 +++ gdb/infrun.c | 19 ++++---- gdb/testsuite/ChangeLog | 5 ++ gdb/testsuite/gdb.base/hook-stop-frame.c | 32 +++++++++++++ gdb/testsuite/gdb.base/hook-stop-frame.exp | 55 ++++++++++++++++++++++ 5 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 gdb/testsuite/gdb.base/hook-stop-frame.c create mode 100644 gdb/testsuite/gdb.base/hook-stop-frame.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 06453307303..d6b611ed486 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2009-01-23 Pedro Alves + + PR gdb/9664: + * infrun.c (normal_stop): Tag threads as stopped, and run the + hook-stop before printing the stack frame. + 2009-01-22 Pedro Alves PR c++/9631: diff --git a/gdb/infrun.c b/gdb/infrun.c index 92092ab9e10..c11c71a263a 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -4269,6 +4269,15 @@ Further execution is probably impossible.\n")); if (target_has_stack && !stop_stack_dummy) set_current_sal_from_frame (get_current_frame (), 1); + /* Let the user/frontend see the threads as stopped. */ + do_cleanups (old_chain); + + /* Look up the hook_stop and run it (CLI internally handles problem + of stop_command's pre-hook not existing). */ + if (stop_command) + catch_errors (hook_stop_stub, stop_command, + "Error while running hook_stop:\n", RETURN_MASK_ALL); + if (!target_has_stack) goto done; @@ -4425,16 +4434,6 @@ done: Delete any breakpoint that is to be deleted at the next stop. */ breakpoint_auto_delete (inferior_thread ()->stop_bpstat); } - - /* Tell the frontend about the new thread states. */ - do_cleanups (old_chain); - - /* Look up the hook_stop and run it (CLI internally handles problem - of stop_command's pre-hook not existing). */ - if (stop_command) - catch_errors (hook_stop_stub, stop_command, - "Error while running hook_stop:\n", RETURN_MASK_ALL); - } static int diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5dc3dff44e4..1d1c8bc0cd7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-01-23 Pedro Alves + + PR gdb/9664: + * gdb.base/hook-stop-frame.c, gdb.base/hook-stop-frame.exp: New. + 2009-01-22 Pedro Alves PR c++/9631: diff --git a/gdb/testsuite/gdb.base/hook-stop-frame.c b/gdb/testsuite/gdb.base/hook-stop-frame.c new file mode 100644 index 00000000000..c1d6df23be6 --- /dev/null +++ b/gdb/testsuite/gdb.base/hook-stop-frame.c @@ -0,0 +1,32 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + +void +func (void) +{ + int a; + + a = 1; /* set breakpoint here */ +} + +int +main (int argc, char **argv) +{ + func (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/hook-stop-frame.exp b/gdb/testsuite/gdb.base/hook-stop-frame.exp new file mode 100644 index 00000000000..c92d7a50925 --- /dev/null +++ b/gdb/testsuite/gdb.base/hook-stop-frame.exp @@ -0,0 +1,55 @@ +# 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 . + +set testfile "hook-stop-frame" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [prepare_for_testing ${testfile}.exp "${testfile}" "${testfile}.c" {debug nowarnings}] } { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if ![runto_main] then { + perror "Couldn't run to main" +} + +set bp_location [gdb_get_line_number "set breakpoint here"] + +gdb_test "break func" \ + "Breakpoint.*at.* file .*$srcfile.*\\." \ + "breakpoint line number" + +set test "define hook-stop command" +gdb_test_multiple "define hook-stop" "$test" { + -re "Type commands for definition of \"hook-stop\".\r\nEnd with a line saying just \"end\".\r\n>$" { + gdb_test "echo \"Hello.\"\nend" "" "$test" + } +} + +set test "hook-stop runs before frame print" +gdb_test_multiple "continue" "$test" { + -re "\"Hello\\.\"\r\nBreakpo.*func.*set breakpoint here.*${gdb_prompt} $" { + pass $test + } + + -re "Breakpo.*func.*set breakpoint here.*\"Hello\\.\".*${gdb_prompt} $" { + fail $test + } +} -- 2.30.2