From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1666 invoked by alias); 5 Jan 2012 13:13:40 -0000 Received: (qmail 1654 invoked by uid 22791); 5 Jan 2012 13:13:38 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-ww0-f43.google.com (HELO mail-ww0-f43.google.com) (74.125.82.43) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 05 Jan 2012 13:13:23 +0000 Received: by wgbds11 with SMTP id ds11so397523wgb.12 for ; Thu, 05 Jan 2012 05:13:22 -0800 (PST) Received: by 10.227.206.10 with SMTP id fs10mr1767706wbb.13.1325769202481; Thu, 05 Jan 2012 05:13:22 -0800 (PST) Received: from [192.168.0.103] ([2.82.184.26]) by mx.google.com with ESMTPS id fo18sm64343441wbb.12.2012.01.05.05.13.20 (version=SSLv3 cipher=OTHER); Thu, 05 Jan 2012 05:13:21 -0800 (PST) Message-ID: <4F05A1EF.1040807@gmail.com> Date: Thu, 05 Jan 2012 13:13:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: Tom Tromey CC: GDB Patches Subject: Re: PR13473 - step N/next N does not trigger gdb.events.stop References: <4F047180.5040004@gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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: 2012-01/txt/msg00181.txt.bz2 On 01/04/2012 04:17 PM, Tom Tromey wrote: > FWIW, this bug also affects MI. I've now added an MI test. > Pedro> Comments on the test? > > Looks good to me. Great, thanks. Below's what I checked in. gdb/ 2012-01-05 Khoo Yit Phang * infrun.c (normal_stop): Don't skip calling the normal_stop observers if the thread was doing a multi-step, but stopped for some reason other than stepping. gdb/testsuite/ 2012-01-05 Pedro Alves * gdb.mi/mi-stepn.c, gdb.mi/mi-stepn.exp: New files. * gdb.python/py-events.c (first): Add bits for new "step N" test. * gdb.python/py-events.exp: Test that "step N" tripping on a breakpoint emits a breakpoint event. --- gdb/infrun.c | 3 +- gdb/testsuite/gdb.mi/mi-stepn.c | 32 ++++++++++++++++++++++ gdb/testsuite/gdb.mi/mi-stepn.exp | 46 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.python/py-events.c | 5 +++ gdb/testsuite/gdb.python/py-events.exp | 12 ++++++++ 5 files changed, 97 insertions(+), 1 deletions(-) create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.c create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.exp diff --git a/gdb/infrun.c b/gdb/infrun.c index a6e1af7..29db420 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6068,7 +6068,8 @@ done: || last.kind == TARGET_WAITKIND_SIGNALLED || last.kind == TARGET_WAITKIND_EXITED || last.kind == TARGET_WAITKIND_NO_RESUMED - || (!inferior_thread ()->step_multi + || (!(inferior_thread ()->step_multi + && inferior_thread ()->control.stop_step) && !(inferior_thread ()->control.stop_bpstat && inferior_thread ()->control.proceed_to_finish) && !inferior_thread ()->control.in_infcall)) diff --git a/gdb/testsuite/gdb.mi/mi-stepn.c b/gdb/testsuite/gdb.mi/mi-stepn.c new file mode 100644 index 0000000..b8663d9 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-stepn.c @@ -0,0 +1,32 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2012 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 +do_nothing (void) +{ +} + +int +main () +{ + int i; + + for (i = 0; i < 2; i++) + do_nothing (); + return 0; +} diff --git a/gdb/testsuite/gdb.mi/mi-stepn.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp new file mode 100644 index 0000000..f723872 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-stepn.exp @@ -0,0 +1,46 @@ +# Copyright 2011-2012 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 . + +# Verify that when "-exec-step N" trips on a breakpoint, we get a +# *stop event with reason breakpoint-hit. + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +set testfile "mi-stepn" +set srcfile ${testfile}.c +set executable ${testfile} +set binfile ${objdir}/${subdir}/${executable} + +set opts {debug} +if [build_executable ${testfile}.exp ${executable} ${srcfile} $opts] { + return -1 +} + +if {[mi_run_to_main] < 0} { + return -1 +} + +mi_create_breakpoint do_nothing 2 keep do_nothing .* .* .* \ + "breakpoint at do_nothing" + +mi_send_resuming_command "exec-step 3" "" +mi_expect_stop "breakpoint-hit" "do_nothing" "\[^\n\]*" "$srcfile" \ + "\[0-9\]*" {"" "disp=\"keep\""} "breakpoint-hit reported" diff --git a/gdb/testsuite/gdb.python/py-events.c b/gdb/testsuite/gdb.python/py-events.c index 00490c6..5b9a0c5 100644 --- a/gdb/testsuite/gdb.python/py-events.c +++ b/gdb/testsuite/gdb.python/py-events.c @@ -24,6 +24,11 @@ int second(){ } int first(){ + int i; + + for (i = 0; i < 2; i++) + do_nothing (); + return second(); } diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp index 0b5c1cf..0715d3c 100644 --- a/gdb/testsuite/gdb.python/py-events.exp +++ b/gdb/testsuite/gdb.python/py-events.exp @@ -73,6 +73,18 @@ gdb_test "continue" ".*event type: continue.* .*breakpoint number: 3.* all threads stopped" +# Test that when "step N" trips on a breakpoint, we get a stop event +# with breakpoint stop reason. +gdb_breakpoint "do_nothing" +gdb_test "step 3" ".*event type: continue.* +.*event type: stop.* +.*stop reason: breakpoint.* +.*first breakpoint number: 4.* +.*breakpoint number: 4.* +all threads stopped" + +delete_breakpoints + #test exited event. gdb_test "continue" ".*event type: continue.* .*event type: exit.*