diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/infcmd.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/until-nodebug.exp | 37 |
4 files changed, 50 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0e47fbc..ae8a101 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Yao Qi <yao@codesourcery.com> + + PR gdb/17206 + * infcmd.c (until_next_command): Set step_range_end to PC + 1. + 2014-07-28 Doug Evans <xdje42@gmail.com> PR guile/17203 diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 5eb092b8..d84c591 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1359,7 +1359,9 @@ until_next_command (int from_tty) error (_("Execution is not within a known function.")); tp->control.step_range_start = BMSYMBOL_VALUE_ADDRESS (msymbol); - tp->control.step_range_end = pc; + /* The upper-bound of step_range is exclusive. In order to make PC + within the range, set the step_range_end with PC + 1. */ + tp->control.step_range_end = pc + 1; } else { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e65e76a..a90ee8b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Yao Qi <yao@codesourcery.com> + + PR gdb/17206 + * gdb.base/until-nodebug.exp: New. + 2014-07-28 Doug Evans <xdje42@gmail.com> PR guile/17203 diff --git a/gdb/testsuite/gdb.base/until-nodebug.exp b/gdb/testsuite/gdb.base/until-nodebug.exp new file mode 100644 index 0000000..a7e75e2 --- /dev/null +++ b/gdb/testsuite/gdb.base/until-nodebug.exp @@ -0,0 +1,37 @@ +# Copyright 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 the address range for stepping is correctly set in command +# until when there is no debug information. + +standard_testfile advance.c + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile nodebug]} { + return -1 +} + +if ![runto_main] { + fail "Can't run to main" + return 0 +} + +# Without debug information, the program stops at the next +# instruction, which is still in main. +gdb_test "until" "in main .*" "until 1" + +# If the stepping range is correctly set, the program stops at the next +# instruction. Otherwise, an internal error will be triggered. See +# PR gdb/17206. +gdb_test "until" "in main .*" "until 2" |