mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-24 12:35:55 +08:00
5166082f5f
I noticed that "list" behaves differently in CLI vs MI. Particularly:
$ ./gdb -nx -q ./testsuite/gdb.mi/mi-cli
Reading symbols from /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli...done.
(gdb) start
Temporary breakpoint 1 at 0x40054d: file ../../../src/gdb/testsuite/gdb.mi/basics.c, line 62.
Starting program: /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli
Temporary breakpoint 1, main () at ../../../src/gdb/testsuite/gdb.mi/basics.c:62
62 callee1 (2, "A string argument.", 3.5);
(gdb) list
57 {
58 }
59
60 main ()
61 {
62 callee1 (2, "A string argument.", 3.5);
63 callee1 (2, "A string argument.", 3.5);
64
65 do_nothing (); /* Hello, World! */
66
(gdb)
Note the list started at line 57. IOW, the program stopped at line
62, and GDB centered the list on that.
compare with:
$ ./gdb -nx -q ./testsuite/gdb.mi/mi-cli -i=mi
=thread-group-added,id="i1"
~"Reading symbols from /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/mi-cli..."
~"done.\n"
(gdb)
start
&"start\n"
...
~"\nTemporary breakpoint "
~"1, main () at ../../../src/gdb/testsuite/gdb.mi/basics.c:62\n"
~"62\t callee1 (2, \"A string argument.\", 3.5);\n"
*stopped,reason="breakpoint-hit",disp="del",bkptno="1",frame={addr="0x000000000040054d",func="main",args=[],file="../../../src/gdb/testsuite/gdb.mi/basics.c",fullname="/home/pedro/gdb/mygit/src/gdb/testsuite/gdb.mi/basics.c",line="62"},thread-id="1",stopped-threads="all",core="0"
=breakpoint-deleted,id="1"
(gdb)
-interpreter-exec console list
~"62\t callee1 (2, \"A string argument.\", 3.5);\n"
~"63\t callee1 (2, \"A string argument.\", 3.5);\n"
~"64\t\n"
~"65\t do_nothing (); /* Hello, World! */\n"
~"66\t\n"
~"67\t callme (1);\n"
~"68\t callme (2);\n"
~"69\t\n"
~"70\t return 0;\n"
~"71\t}\n"
^done
(gdb)
Here the list starts at line 62, where the program was stopped.
This happens because print_stack_frame, called from both normal_stop
and mi_on_normal_stop, is the function responsible for setting the
current sal from the selected frame, overrides the PRINT_WHAT
argument, and only after that does it decide whether to center the
current sal line or not, based on the overridden value, and it will
always decide false.
(The print_stack_frame call in mi_on_normal_stop is a little different
from the call in normal_stop, in that it is an unconditional
SRC_AND_LOC call. A future patch will make those uniform.)
A previous version of this patch made MI uniform with CLI here, by
making print_stack_frame also center when MI is active. That changed
the output of a "list" command in mi-cli.exp, to expect line 57
instead of 62, as per the example above.
However, looking deeper, that list in question is the first "list"
after the program stops, and right after the stop, before the "list",
the test did "set listsize 1". Let's try the same thing with the CLI:
(gdb) start
62 callee1 (2, "A string argument.", 3.5);
(gdb) set listsize 1
(gdb) list
57 {
Huh, that's unexpected. Why the 57? It's because print_stack_frame,
called in reaction to the breakpoint stop, expecting the next "list"
to show 10 lines (the listsize at the time) around line 62, sets the
lines listed range to 57-67 (62 +/- 5). If the user changes the
listsize before "list", why would we still show that range? Looks
bogus to me.
So the fix for this whole issue should be delay trying to center the
listing to until actually listing, so that the correct listsize can be
taken into account. This makes MI and CLI uniform too, as it deletes
the center code from print_stack_frame.
A series of tests are added to list.exp to cover this. mi-cli.exp was
after all correct all along, but it now gains an additional test that
lists lines with listsize 10, to ensure the centering is consistent
with CLI's.
One related Python test changed related output -- it's a test that
prints the line number after stopping for a breakpoint, similar to the
new list.exp tests. Previously we'd print the stop line minus 5 (due
to the premature centering), now we print the stop line. I think
that's a good change.
Tested on x86_64 Fedora 20.
gdb/
2014-05-21 Pedro Alves <palves@redhat.com>
* cli/cli-cmds.c (list_command): Handle the first "list" after the
current source line having changed.
* frame.h (set_current_sal_from_frame): Remove 'center' parameter.
* infrun.c (normal_stop): Adjust call to
set_current_sal_from_frame.
* source.c (clear_lines_listed_range): New function.
(set_current_source_symtab_and_line, identify_source_line): Clear
the lines listed range.
(line_info): Handle the first "info line" after the current source
line having changed.
* stack.c (print_stack_frame): Remove center handling.
(set_current_sal_from_frame): Remove 'center' parameter. Don't
center sal.line.
gdb/testsuite/
2014-05-21 Pedro Alves <palves@redhat.com>
* gdb.base/list.exp (build_pattern, test_list): New procedures.
Use them to test variations of "list" after reaching a breakpoint.
* gdb.mi/mi-cli.exp (line_main_callme_2): New global.
Test "list" with listsize 10 after reaching a breakpoint.
* gdb.python/python.exp (decode_line current location line
number): Adjust expected line number.
225 lines
8.6 KiB
Plaintext
225 lines
8.6 KiB
Plaintext
# Copyright 2002-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/>.
|
|
|
|
# This file tests that GDB's console can be accessed via the MI.
|
|
# Specifically, we are testing the "interpreter-exec" command and that
|
|
# the commands that are executed via this command are properly executed.
|
|
# Console commands executed via MI should use MI output wrappers, MI event
|
|
# handlers, etc.
|
|
|
|
load_lib mi-support.exp
|
|
set MIFLAGS "-i=mi"
|
|
|
|
gdb_exit
|
|
if [mi_gdb_start] {
|
|
continue
|
|
}
|
|
|
|
standard_testfile basics.c
|
|
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
|
|
untested mi-cli.exp
|
|
return -1
|
|
}
|
|
|
|
mi_gdb_test "-interpreter-exec" \
|
|
{\^error,msg="-interpreter-exec: Usage: -interpreter-exec interp command"} \
|
|
"-interpreter-exec with no arguments"
|
|
|
|
mi_gdb_test "-interpreter-exec console" \
|
|
{\^error,msg="-interpreter-exec: Usage: -interpreter-exec interp command"} \
|
|
"-interpreter-exec with one argument"
|
|
|
|
mi_gdb_test "-interpreter-exec bogus command" \
|
|
{\^error,msg="-interpreter-exec: could not find interpreter \\\"bogus\\\""} \
|
|
"-interpreter-exec with bogus interpreter"
|
|
|
|
set msg {Undefined command: \\\"bogus\\\"\. Try \\\"help\\\"\.}
|
|
mi_gdb_test "-interpreter-exec console bogus" \
|
|
"&\\\"$msg\\\\n\\\".*\\^error,msg=\\\"$msg\\\".*" \
|
|
"-interpreter-exec console bogus"
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
|
|
# {(=.*)+\^done} \
|
|
# "-interpreter-exec console \"file \$binfile\""
|
|
mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
|
|
{~"Reading symbols from .*mi-cli...".*\^done} \
|
|
"-interpreter-exec console \"file \$binfile\""
|
|
|
|
mi_run_to_main
|
|
|
|
set line_main_head [gdb_get_line_number "main ("]
|
|
set line_main_body [expr $line_main_head + 2]
|
|
set line_main_hello [gdb_get_line_number "Hello, World!"]
|
|
set line_main_return [expr $line_main_hello + 2]
|
|
set line_main_callme_2 [expr $line_main_return + 1]
|
|
set line_callee4_head [gdb_get_line_number "callee4 ("]
|
|
set line_callee4_body [expr $line_callee4_head + 2]
|
|
set line_callee4_next [expr $line_callee4_body + 1]
|
|
|
|
mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
|
|
".*=cmd-param-changed,param=\"args\",value=\"foobar\".*\\^done" \
|
|
"-interpreter-exec console \"set args foobar\""
|
|
|
|
mi_gdb_test "-interpreter-exec console \"show args\"" \
|
|
{\~"Argument list to give program being debugged when it is started is \\\"foobar\\\"\.\\n".*\^done} \
|
|
"-interpreter-exec console \"show args\""
|
|
|
|
mi_gdb_test "-interpreter-exec console \"break callee4\"" \
|
|
{(&.*)*.*~"Breakpoint 2 at.*\\n".*=breakpoint-created,bkpt=\{number="2",type="breakpoint".*\}.*\n\^done} \
|
|
"-interpreter-exec console \"break callee4\""
|
|
|
|
mi_gdb_test "-interpreter-exec console \"info break\"" \
|
|
{\~"Num[ \t]*Type[ \t]*Disp[ \t]*Enb[ \t]*Address[ \t]*What\\n".*~"2[ \t]*breakpoint[ \t]*keep[ \t]*y[ \t]*0x[0-9A-Fa-f]+[ \t]*in callee4 at .*basics.c:[0-9]+\\n".*\^done} \
|
|
"-interpreter-exec console \"info break\""
|
|
|
|
mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
|
|
".*=cmd-param-changed,param=\"listsize\",value=\"1\".*\\^done" \
|
|
"-interpreter-exec console \"set listsize 1\""
|
|
|
|
# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }
|
|
mi_gdb_test "-interpreter-exec console \"list\"" \
|
|
".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
|
|
"-interpreter-exec console \"list\""
|
|
|
|
mi_execute_to "exec-continue" "breakpoint-hit" "callee4" "" ".*basics.c" $line_callee4_body \
|
|
{ "" "disp=\"keep\"" } \
|
|
"continue to callee4"
|
|
|
|
mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
|
|
{.*=breakpoint-deleted,id=\"2\".*\^done} \
|
|
"-interpreter-exec console \"delete 2\""
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "200-interpreter-exec console \"up\"" \
|
|
# {.*=selected-frame-level-changed,level="1".*\^done} \
|
|
# "-interpreter-exec console \"up\""
|
|
mi_gdb_test "200-interpreter-exec console \"up\"" \
|
|
{~"#.*".*200\^done} \
|
|
"-interpreter-exec console \"up\""
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "300-interpreter-exec console \"down\"" \
|
|
# {.*=selected-frame-level-changed,level="0".*\^done} \
|
|
# "-interpreter-exec console \"down\""
|
|
mi_gdb_test "300-interpreter-exec console \"down\"" \
|
|
{~"#.*".*300\^done} \
|
|
"-interpreter-exec console \"down\""
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "-interpreter-exec console \"frame 2\"" \
|
|
# {.*=selected-frame-level-changed,level="2".*\^done} \
|
|
# "-interpreter-exec console \"frame 2\""
|
|
mi_gdb_test "400-interpreter-exec console \"frame 2\"" \
|
|
{~"#.*".*400\^done} \
|
|
"-interpreter-exec console \"frame 2\""
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "-stack-select-frame 0" \
|
|
# {.*=selected-frame-level-changed,level="0".*\^done} \
|
|
# "-stack-select-frame 0"
|
|
mi_gdb_test "500-stack-select-frame 0" \
|
|
{500\^done} \
|
|
"-stack-select-frame 0"
|
|
|
|
# When a CLI command is entered in MI session, the respose is different in
|
|
# sync and async modes. In sync mode normal_stop is called when current
|
|
# interpreter is CLI. So:
|
|
# - print_stop_reason prints stop reason in CLI uiout, and we don't show it
|
|
# in MI
|
|
# - The stop position is printed, and appears in MI 'console' channel.
|
|
#
|
|
# In async mode the stop event is processed when we're back to MI interpreter,
|
|
# so the stop reason is printed into MI uiout an.
|
|
if {$async} {
|
|
set reason "end-stepping-range"
|
|
} else {
|
|
set reason ""
|
|
}
|
|
|
|
mi_execute_to "interpreter-exec console step" $reason "callee4" "" ".*basics.c" $line_callee4_next \
|
|
"" "check *stopped from CLI command"
|
|
|
|
mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
|
|
{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
|
|
"-break-insert -t basics.c:\$line_main_hello"
|
|
|
|
mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
|
|
$line_main_hello { "" "disp=\"del\"" } \
|
|
"-exec-continue to line \$line_main_hello"
|
|
|
|
# Test that the token is output even for CLI commands
|
|
# Also test that *stopped includes frame information.
|
|
mi_gdb_test "34 next" \
|
|
".*34\\\^running.*\\*running,thread-id=\"all\"" \
|
|
"34 next: run"
|
|
|
|
if {!$async} {
|
|
gdb_expect {
|
|
-re "~\[^\r\n\]+\r\n" {
|
|
}
|
|
}
|
|
}
|
|
|
|
# Note that the output does not include stop reason. This is fine.
|
|
# The purpose of *stopped notification for CLI command is to make
|
|
# sure that frontend knows that inferior is stopped, and knows where.
|
|
# Supplementary information is not necessary.
|
|
mi_expect_stop "$reason" "main" "" ".*basics.c" $line_main_return "" \
|
|
"34 next: stop"
|
|
|
|
mi_gdb_test "-interpreter-exec console \"list\"" \
|
|
"\~\"$line_main_return\[\\\\t ]*callme \\(1\\);\\\\n\".*\\^done" \
|
|
"-interpreter-exec console \"list\" at basics.c:\$line_main_return"
|
|
|
|
mi_gdb_test "600-break-insert -t basics.c:$line_main_callme_2" \
|
|
{600\^done,bkpt=.number="4",type="breakpoint".*\}} \
|
|
"-break-insert -t basics.c:\$line_main_callme_2"
|
|
|
|
mi_execute_to "exec-continue" "breakpoint-hit" "main" "" ".*basics.c" \
|
|
$line_main_callme_2 { "" "disp=\"del\"" } \
|
|
"-exec-continue to line \$line_main_callme_2"
|
|
|
|
# Restore the listsize back to the default.
|
|
mi_gdb_test "-interpreter-exec console \"set listsize 10\"" \
|
|
".*=cmd-param-changed,param=\"listsize\",value=\"10\".*\\^done" \
|
|
"-interpreter-exec console \"set listsize 10\""
|
|
|
|
# "list" should show 10 lines centered on where the program stopped.
|
|
set first_list_line [expr $line_main_callme_2 - 5]
|
|
mi_gdb_test "-interpreter-exec console \"list\"" \
|
|
".*\~\"$first_list_line.*\\^done" \
|
|
"-interpreter-exec console \"list\" at basics.c:\$line_main_callme_2"
|
|
|
|
mi_gdb_test "-interpreter-exec console \"help set args\"" \
|
|
{\~"Set argument list to give program being debugged when it is started\.\\nFollow this command with any number of args, to be passed to the program\.".*\^done} \
|
|
"-interpreter-exec console \"help set args\""
|
|
|
|
# NOTE: cagney/2003-02-03: Not yet.
|
|
# mi_gdb_test "-interpreter-exec console \"set \$pc=0x0\"" \
|
|
# {.*=target-changed.*\^done} \
|
|
# "-interpreter-exec console \"set \$pc=0x0\""
|
|
mi_gdb_test "888-interpreter-exec console \"set \$pc=0x0\"" \
|
|
{888\^done} \
|
|
"-interpreter-exec console \"set \$pc=0x0\""
|
|
|
|
#mi_gdb_test "-interpreter-exec console \"\"" \
|
|
{} \
|
|
"-interpreter-exec console \"\""
|
|
|
|
mi_gdb_exit
|
|
return 0
|