diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/infcall.c | 10 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/condbreak-call-false.c | 39 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/condbreak-call-false.exp | 33 |
5 files changed, 95 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 814be2c..acb25f8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-03-20 Tom Tromey <tromey@redhat.com> + + PR cli/15718 + * infcall.c: Include event-top.h. + (run_inferior_call): Call async_disable_stdin if needed. + 2014-03-20 Pedro Alves <palves@redhat.com> * infrun.c (prepare_to_proceed): Delete. diff --git a/gdb/infcall.c b/gdb/infcall.c index ad18ff1..9907263 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -36,6 +36,7 @@ #include "ada-lang.h" #include "gdbthread.h" #include "exceptions.h" +#include "event-top.h" /* If we can't find a function's name from its address, we print this instead. */ @@ -398,6 +399,8 @@ run_inferior_call (struct thread_info *call_thread, CORE_ADDR real_pc) TRY_CATCH (e, RETURN_MASK_ALL) { + int was_sync = sync_execution; + proceed (real_pc, GDB_SIGNAL_0, 0); /* Inferior function calls are always synchronous, even if the @@ -407,6 +410,13 @@ run_inferior_call (struct thread_info *call_thread, CORE_ADDR real_pc) { wait_for_inferior (); normal_stop (); + /* If GDB was previously in sync execution mode, then ensure + that it remains so. normal_stop calls + async_enable_stdin, so reset it again here. In other + cases, stdin will be re-enabled by + inferior_event_handler, when an exception is thrown. */ + if (was_sync) + async_disable_stdin (); } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 31e0e5d..d6fb1dc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-03-20 Tom Tromey <tromey@redhat.com> + Pedro Alves <palves@redhat.com> + + PR cli/15718 + * gdb.base/condbreak-call-false.c: New file. + * gdb.base/condbreak-call-false.exp: New file. + 2014-03-20 Pedro Alves <palves@redhat.com> * gdb.threads/signal-while-stepping-over-bp-other-thread.c (pid): diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.c b/gdb/testsuite/gdb.base/condbreak-call-false.c new file mode 100644 index 0000000..ed9a3f4 --- /dev/null +++ b/gdb/testsuite/gdb.base/condbreak-call-false.c @@ -0,0 +1,39 @@ +/* Copyright 2013-2014 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/>. */ + +int +zero (void) +{ + return 0; +} + +int +foo (void) +{ + return 23; +} + +void +bar (void) +{ +} + + +int +main (void) +{ + foo (); + bar (); +} diff --git a/gdb/testsuite/gdb.base/condbreak-call-false.exp b/gdb/testsuite/gdb.base/condbreak-call-false.exp new file mode 100644 index 0000000..d1cb2bb --- /dev/null +++ b/gdb/testsuite/gdb.base/condbreak-call-false.exp @@ -0,0 +1,33 @@ +# Copyright 2013-2014 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 that a breakpoint condition with a function call that returns +# false works as expected. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { + return -1 +} + +if ![runto_main] then { + fail "Can't run to main" + return 0 +} + +gdb_test "break foo if zero()" "Breakpoint .*" +gdb_test "break bar" "Breakpoint .*" + +gdb_test "c" "Breakpoint .* bar .*" |