From 2ca0b532fd230a6d5b2465105010e51baa51f44b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 5 Jan 2012 13:11:31 +0000 Subject: [PATCH] 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/ChangeLog | 6 ++++ gdb/infrun.c | 3 +- gdb/testsuite/ChangeLog | 7 ++++ 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 +++++++ 7 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.c create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c826b13e4f..553cb7611b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +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. + 2012-01-05 Pedro Alves * cli/cli-decode.h: Add comments. diff --git a/gdb/infrun.c b/gdb/infrun.c index a6e1af73ff..29db420bd7 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/ChangeLog b/gdb/testsuite/ChangeLog index d23458d551..c79071cdd5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +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. + 2012-01-03 Joel Brobecker * gdb.base/auxv.exp: Reformat the copyright notice. diff --git a/gdb/testsuite/gdb.mi/mi-stepn.c b/gdb/testsuite/gdb.mi/mi-stepn.c new file mode 100644 index 0000000000..b8663d9bdf --- /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 0000000000..f72387281e --- /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 00490c6951..5b9a0c5e85 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 0b5c1cfd3f..0715d3ccfa 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.*