From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2577 invoked by alias); 23 Jan 2009 15:53:50 -0000 Received: (qmail 2566 invoked by uid 22791); 23 Jan 2009 15:53:49 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 23 Jan 2009 15:53:44 +0000 Received: (qmail 13878 invoked from network); 23 Jan 2009 15:53:41 -0000 Received: from unknown (HELO orlando.local) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 23 Jan 2009 15:53:41 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [commit] Fix for PR9664. Date: Fri, 23 Jan 2009 15:53:00 -0000 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_FheeJAQ8b1F26MG" Message-Id: <200901231554.45761.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-01/txt/msg00466.txt.bz2 --Boundary-00=_FheeJAQ8b1F26MG Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 883 This fixes PR9664 , which was a regression I introduced here: http://sourceware.org/ml/gdb-patches/2008-09/msg00193.html The regression is about the fact that the hook-stop in normal_stop was now being run after frame printing, while it is documented as being run before. "(@samp{hook-stop}) makes the associated commands execute every time execution stops in your program: before breakpoint commands are run, displays are printed, or the stack frame is printed." The fix is to put the hook-stop where it was before. To re-fix the original issue described in the email pointed above, I moved the tagging threads as stopped a bit higher up as well. I've also added a new test so future changes don't miss this hook-stop-before-print-stack-frame rule. Tested on x86_64-linux, sync/async, and checked in. -- Pedro Alves --Boundary-00=_FheeJAQ8b1F26MG Content-Type: text/x-diff; charset="iso 8859-15"; name="pr9664_hook_stop.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr9664_hook_stop.diff" Content-length: 5102 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/infrun.c | 19 ++++------ gdb/testsuite/gdb.base/hook-stop-frame.c | 32 ++++++++++++++++ gdb/testsuite/gdb.base/hook-stop-frame.exp | 55 +++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 10 deletions(-) Index: src/gdb/infrun.c =================================================================== --- src.orig/gdb/infrun.c 2009-01-23 15:10:03.000000000 +0000 +++ src/gdb/infrun.c 2009-01-23 15:45:29.000000000 +0000 @@ -4269,6 +4269,15 @@ Further execution is probably impossible 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 Index: src/gdb/testsuite/gdb.base/hook-stop-frame.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.base/hook-stop-frame.c 2009-01-23 15:10:13.000000000 +0000 @@ -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; +} Index: src/gdb/testsuite/gdb.base/hook-stop-frame.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.base/hook-stop-frame.exp 2009-01-23 15:10:13.000000000 +0000 @@ -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 + } +} --Boundary-00=_FheeJAQ8b1F26MG--