From 6d52907e226ade45d5f5196eaed8386affda5156 Mon Sep 17 00:00:00 2001 From: Jan Vrany Date: Wed, 22 Aug 2018 10:42:38 +0100 Subject: [PATCH] MI: Print frame architecture when printing frames on an MI channel When printing frames on an MI channel also print the frame architecture like in: (gdb) -stack-list-frames 3 3 ^done,stack= [frame={level="3",addr="0x000107a4",func="foo", file="recursive2.c",fullname="/home/foo/bar/recursive2.c", line="14",arch="i386:x86_64"}] (gdb) This is useful for MI clients that need to know the architecture in order to perform further analysis, for example to use their own disassembler to analyze machine code. gdb/Changelog: 2018-08-22 Jan Vrany * stack.c (print_frame): Print frame architecture when printing on an MI output. * NEWS: Mention new "arch" attribute in frame output. gdb/testsuite/Changelog 2018-08-22 Jan Vrany * lib/mi-support.exp (mi_expect_stop): Update regexp to accommodate new "arch" field in frame output. * gdb.mi/mi-return.exp: Likewise. * gdb.mi/mi-stack.exp: Likewise. * gdb.mi/mi-syn-frame.exp: Likewise. * gdb.mi/user-selected-context-sync.exp: Likewise. gdb/doc/Changelog 2018-08-22 Jan Vrany * gdb.texinfo (The -stack-list-frames Command): Update description to mention "arch". Update MI examples throughout the document to contain "arch" in frame output. --- gdb/ChangeLog | 6 + gdb/NEWS | 3 + gdb/doc/ChangeLog | 7 + gdb/doc/gdb.texinfo | 121 +++++++++++------- gdb/stack.c | 3 + gdb/testsuite/ChangeLog | 9 ++ gdb/testsuite/gdb.mi/mi-return.exp | 2 +- gdb/testsuite/gdb.mi/mi-stack.exp | 6 +- gdb/testsuite/gdb.mi/mi-syn-frame.exp | 11 +- .../gdb.mi/user-selected-context-sync.exp | 6 +- gdb/testsuite/lib/mi-support.exp | 6 +- 11 files changed, 122 insertions(+), 58 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 070547fd55..2cb128c06e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-08-22 Jan Vrany + + * stack.c (print_frame): Print frame architecture when printing on + an MI output. + * NEWS: Mention new "arch" attribute in frame output. + 2018-08-21 Alan Hayward * arch/aarch64.h (aarch64_regnum): Update comment. diff --git a/gdb/NEWS b/gdb/NEWS index bd03d72e9a..a7a3674375 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -49,6 +49,9 @@ thread apply [all | COUNT | -COUNT] [FLAG]... COMMAND verified by using the "-list-features" command, which should contain "data-disassemble-a-option". + ** Command responses and notifications that include a frame now include + the frame's architecture in a new "arch" attribute. + * New native configurations GNU/Linux/RISC-V riscv*-*-linux* diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index b14e35f79d..c637d392b2 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,10 @@ +2018-08-22 Jan Vrany + + * gdb.texinfo (The -stack-list-frames Command): Update description + to mention "arch". + Update MI examples throughout the document to contain "arch" in + frame output. + 2018-08-21 Alan Hayward * gdb.texinfo (AArch64 SVE): New subsubsection. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index eb898f9b1f..5068c0ac81 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -28017,7 +28017,8 @@ reason that execution stopped. <- *stopped,reason="breakpoint-hit",disp="keep",bkptno="1",thread-id="0", frame=@{addr="0x08048564",func="main", args=[@{name="argc",value="1"@},@{name="argv",value="0xbfc4d4d4"@}], - file="myprog.c",fullname="/home/nickrob/myprog.c",line="68"@} + file="myprog.c",fullname="/home/nickrob/myprog.c",line="68", + arch="i386:x86_64"@} <- (gdb) -> -exec-continue <- ^running @@ -28680,7 +28681,7 @@ Setting a watchpoint on a variable in the @code{main} function: *stopped,reason="watchpoint-trigger",wpt=@{number="2",exp="x"@}, value=@{old="-268439212",new="55"@}, frame=@{func="main",args=[],file="recursive2.c", -fullname="/home/foo/bar/recursive2.c",line="5"@} +fullname="/home/foo/bar/recursive2.c",line="5",arch="i386:x86_64"@} (gdb) @end smallexample @@ -28700,7 +28701,8 @@ for the watchpoint going out of scope. wpt=@{number="5",exp="C"@},value=@{old="-276895068",new="3"@}, frame=@{func="callee4",args=[], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="13"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="13", +arch="i386:x86_64"@} (gdb) -exec-continue ^running @@ -28709,7 +28711,8 @@ fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="13"@} frame=@{func="callee3",args=[@{name="strarg", value="0x11940 \"A string argument.\""@}], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18", +arch="i386:x86_64"@} (gdb) @end smallexample @@ -28745,7 +28748,8 @@ enabled="y",addr="",what="C",thread-groups=["i1"],times="0"@}]@} value=@{old="-276895068",new="3"@}, frame=@{func="callee4",args=[], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="13"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="13", +arch="i386:x86_64"@} (gdb) -break-list ^done,BreakpointTable=@{nr_rows="2",nr_cols="6", @@ -28769,7 +28773,8 @@ enabled="y",addr="",what="C",thread-groups=["i1"],times="-5"@}]@} frame=@{func="callee3",args=[@{name="strarg", value="0x11940 \"A string argument.\""@}], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18", +arch="i386:x86_64"@} (gdb) -break-list ^done,BreakpointTable=@{nr_rows="1",nr_cols="6", @@ -29248,7 +29253,7 @@ the command. @{id="1",target-id="Thread 0xb7e156b0 (LWP 21254)", frame=@{level="0",addr="0x0804891f",func="foo", args=[@{name="i",value="10"@}], - file="/tmp/a.c",fullname="/tmp/a.c",line="158"@}, + file="/tmp/a.c",fullname="/tmp/a.c",line="158",arch="i386:x86_64"@}, state="running"@}], current-thread-id="1" (gdb) @@ -29324,7 +29329,7 @@ number-of-threads="3" ^done,new-thread-id="3", frame=@{level="0",func="vprintf", args=[@{name="format",value="0x8048e9c \"%*s%c %d %c\\n\""@}, -@{name="arg",value="0x2"@}],file="vprintf.c",line="31"@} +@{name="arg",value="0x2"@}],file="vprintf.c",line="31",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29458,7 +29463,7 @@ The corresponding @value{GDBN} corresponding is @samp{continue}. @@Hello world *stopped,reason="breakpoint-hit",disp="keep",bkptno="2",frame=@{ func="foo",args=[],file="hello.c",fullname="/home/foo/bar/hello.c", -line="13"@} +line="13",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29492,7 +29497,7 @@ Function returning @code{void}. (gdb) @@hello from foo *stopped,reason="function-finished",frame=@{func="main",args=[], -file="hello.c",fullname="/home/foo/bar/hello.c",line="7"@} +file="hello.c",fullname="/home/foo/bar/hello.c",line="7",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29506,7 +29511,8 @@ value itself. (gdb) *stopped,reason="function-finished",frame=@{addr="0x000107b0",func="foo", args=[@{name="a",value="1"],@{name="b",value="9"@}@}, -file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, +file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", +arch="i386:x86_64"@}, gdb-result-var="$1",return-value="0" (gdb) @end smallexample @@ -29554,7 +29560,7 @@ The corresponding @value{GDBN} command is @samp{interrupt}. (gdb) 111*stopped,signal-name="SIGINT",signal-meaning="Interrupt", frame=@{addr="0x00010140",func="foo",args=[],file="try.c", -fullname="/home/foo/bar/try.c",line="13"@} +fullname="/home/foo/bar/try.c",line="13",arch="i386:x86_64"@} (gdb) (gdb) @@ -29691,7 +29697,8 @@ file="../../../devo/gdb/testsuite/gdb.mi/basics.c",line="8"@} 000*stopped,reason="breakpoint-hit",disp="keep",bkptno="1", frame=@{func="callee4",args=[], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8", +arch="i386:x86_64"@} (gdb) 205-break-delete 205^done @@ -29701,7 +29708,8 @@ fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8"@} args=[@{name="strarg", value="0x11940 \"A string argument.\""@}], file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="18", +arch="i386:x86_64"@} (gdb) @end smallexample @@ -29747,7 +29755,7 @@ The corresponding @value{GDBN} command is @samp{run}. (gdb) *stopped,reason="breakpoint-hit",disp="keep",bkptno="1", frame=@{func="main",args=[],file="recursive2.c", -fullname="/home/foo/bar/recursive2.c",line="4"@} +fullname="/home/foo/bar/recursive2.c",line="4",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29821,7 +29829,7 @@ Stepping into a function: *stopped,reason="end-stepping-range", frame=@{func="foo",args=[@{name="a",value="10"@}, @{name="b",value="0"@}],file="recursive2.c", -fullname="/home/foo/bar/recursive2.c",line="11"@} +fullname="/home/foo/bar/recursive2.c",line="11",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29867,7 +29875,7 @@ The corresponding @value{GDBN} command is @samp{stepi}. (gdb) *stopped,reason="end-stepping-range", frame=@{func="foo",args=[],file="try.c", -fullname="/home/foo/bar/try.c",line="10"@} +fullname="/home/foo/bar/try.c",line="10",arch="i386:x86_64"@} (gdb) -exec-step-instruction ^running @@ -29875,7 +29883,7 @@ fullname="/home/foo/bar/try.c",line="10"@} (gdb) *stopped,reason="end-stepping-range", frame=@{addr="0x000100f4",func="foo",args=[],file="try.c", -fullname="/home/foo/bar/try.c",line="10"@} +fullname="/home/foo/bar/try.c",line="10",arch="i386:x86_64"@} (gdb) @end smallexample @@ -29907,7 +29915,8 @@ The corresponding @value{GDBN} command is @samp{until}. (gdb) x = 55 *stopped,reason="location-reached",frame=@{func="main",args=[], -file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="6"@} +file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="6", +arch="i386:x86_64"@} (gdb) @end smallexample @@ -29960,7 +29969,8 @@ The corresponding @value{GDBN} command is @samp{info frame} or @samp{frame} -stack-info-frame ^done,frame=@{level="1",addr="0x0001076c",func="callee3", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="17"@} +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="17", +arch="i386:x86_64"@} (gdb) @end smallexample @@ -30052,19 +30062,24 @@ functionality of @samp{-stack-list-arguments}. stack=[ frame=@{level="0",addr="0x00010734",func="callee4", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8"@}, +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8", +arch="i386:x86_64"@}, frame=@{level="1",addr="0x0001076c",func="callee3", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="17"@}, +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="17", +arch="i386:x86_64"@}, frame=@{level="2",addr="0x0001078c",func="callee2", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="22"@}, +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="22", +arch="i386:x86_64"@}, frame=@{level="3",addr="0x000107b4",func="callee1", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="27"@}, +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="27", +arch="i386:x86_64"@}, frame=@{level="4",addr="0x000107e0",func="main", file="../../../devo/gdb/testsuite/gdb.mi/basics.c", -fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="32"@}] +fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="32", +arch="i386:x86_64"@}] (gdb) -stack-list-arguments 0 ^done, @@ -30132,6 +30147,8 @@ Line number corresponding to the @code{$pc}. @item @var{from} The shared library where this function is defined. This is only given if the frame's function is not known. +@item @var{arch} +Frame's architecture. @end table If invoked without arguments, this command prints a backtrace for the @@ -30157,29 +30174,41 @@ Full stack backtrace: -stack-list-frames ^done,stack= [frame=@{level="0",addr="0x0001076c",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="11"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="11", + arch="i386:x86_64"@}, frame=@{level="1",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="2",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="3",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="4",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="5",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="6",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="7",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="8",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="9",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="10",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="11",addr="0x00010738",func="main", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="4"@}] + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="4", + arch="i386:x86_64"@}] (gdb) @end smallexample @@ -30190,11 +30219,14 @@ Show frames between @var{low_frame} and @var{high_frame}: -stack-list-frames 3 5 ^done,stack= [frame=@{level="3",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="4",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}, + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}, frame=@{level="5",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}] + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}] (gdb) @end smallexample @@ -30205,7 +30237,8 @@ Show a single frame: -stack-list-frames 3 3 ^done,stack= [frame=@{level="3",addr="0x000107a4",func="foo", - file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14"@}] + file="recursive2.c",fullname="/home/foo/bar/recursive2.c",line="14", + arch="i386:x86_64"@}] (gdb) @end smallexample @@ -31485,7 +31518,7 @@ On a PPC MBX board: (gdb) *stopped,reason="breakpoint-hit",disp="keep",bkptno="1",frame=@{ func="main",args=[],file="try.c",fullname="/home/foo/bar/try.c", -line="5"@} +line="5",arch="powerpc"@} (gdb) -data-list-changed-registers ^done,changed-registers=["0","1","2","4","5","6","7","8","9", @@ -33663,7 +33696,7 @@ and only if there is a corresponding executable file. frame=@{level="0",addr="0xffffe410",func="__kernel_vsyscall",args=[]@},state="running"@}, @{id="1",target-id="Thread 0xb7e156b0 (LWP 21254)", frame=@{level="0",addr="0x0804891f",func="foo",args=[@{name="i",value="10"@}], - file="/tmp/a.c",fullname="/tmp/a.c",line="158"@},state="running"@}]] + file="/tmp/a.c",fullname="/tmp/a.c",line="158",arch="i386:x86_64"@},state="running"@}]] -list-thread-groups --available ^done,groups=[@{id="17",type="process",pid="yyy",num_children="2",cores=[1,2]@}] -list-thread-groups --available --recurse 1 @@ -33895,7 +33928,7 @@ time=@{wallclock="0.05185",user="0.00800",system="0.00000"@} *stopped,reason="breakpoint-hit",disp="keep",bkptno="1",thread-id="0", frame=@{addr="0x080484ed",func="main",args=[@{name="argc",value="1"@}, @{name="argv",value="0xbfb60364"@}],file="myprog.c", -fullname="/home/nickrob/myprog.c",line="73"@} +fullname="/home/nickrob/myprog.c",line="73",arch="i386:x86_64"@} (gdb) @end smallexample diff --git a/gdb/stack.c b/gdb/stack.c index 3da46dd955..366687e7df 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1249,6 +1249,9 @@ print_frame (struct frame_info *frame, int print_level, uiout->field_string ("from", lib); } } + if (uiout->is_mi_like_p ()) + uiout->field_string ("arch", + (gdbarch_bfd_arch_info (gdbarch))->printable_name); } uiout->text ("\n"); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bdef4be4bb..1ea6180b3a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2018-08-22 Jan Vrany + + * lib/mi-support.exp (mi_expect_stop): Update regexp to + accommodate new "arch" field in frame output. + * gdb.mi/mi-return.exp: Likewise. + * gdb.mi/mi-stack.exp: Likewise. + * gdb.mi/mi-syn-frame.exp: Likewise. + * gdb.mi/user-selected-context-sync.exp: Likewise. + 2018-08-19 Michael Spang PR gdb/11786 diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp index 8db0c57b33..5b21e18db6 100644 --- a/gdb/testsuite/gdb.mi/mi-return.exp +++ b/gdb/testsuite/gdb.mi/mi-return.exp @@ -50,7 +50,7 @@ proc test_return_simple {} { set line_callee3_call [expr $line_callee3_head + 2] set line_callee3_close_brace [expr $line_callee3_head + 3] - mi_gdb_test "111-exec-return" "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"($line_callee3_call|$line_callee3_close_brace)\"\}" "return from callee4 now" + mi_gdb_test "111-exec-return" "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"($line_callee3_call|$line_callee3_close_brace)\",arch=\"\[^\"\]+\"\}" "return from callee4 now" } mi_runto callee4 diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp index fcb74e2610..366d0c52c3 100644 --- a/gdb/testsuite/gdb.mi/mi-stack.exp +++ b/gdb/testsuite/gdb.mi/mi-stack.exp @@ -46,6 +46,8 @@ proc test_stack_frame_listing {} { global mi_gdb_prompt global hex fullname_syntax srcfile + set any "\[^\"\]+" + set callee4_begin [gdb_get_line_number "callee4 begin"] mi_continue_to_line $callee4_begin "continue to callee4 begin" @@ -56,7 +58,7 @@ proc test_stack_frame_listing {} { # -stack-list-frames 1 3 # -stack-info-frame mi_gdb_test "231-stack-list-frames" \ - "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$callee4_begin\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \ + "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$callee4_begin\",arch=\"$any\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \ "stack frame listing" mi_gdb_test "232-stack-list-frames 1 1" \ "232\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\}\\\]" \ @@ -70,7 +72,7 @@ proc test_stack_frame_listing {} { "stack frame listing wrong" mi_gdb_test "235-stack-info-frame" \ - "235\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$callee4_begin\"\}" \ + "235\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$callee4_begin\",arch=\"$any\"\}" \ "selected frame listing" mi_gdb_test "236-stack-list-frames 1 300" \ diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp index 44196324be..33ba73128c 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -23,6 +23,7 @@ if [target_info exists gdb,nosignals] { load_lib mi-support.exp set MIFLAGS "-i=mi" +set any "\[^\"\]+" standard_testfile @@ -47,7 +48,7 @@ mi_gdb_test "401-data-evaluate-expression foo()" ".*401\\^error,msg=\"The progra "call inferior's function with a breakpoint set in it" -mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame" +mi_gdb_test "402-stack-list-frames" "402\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\",arch=\"$any\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\",arch=\"$any\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame" # # Continue back to main() @@ -57,7 +58,7 @@ mi_send_resuming_command "exec-continue" "testing exec continue" mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue" mi_gdb_test "404-stack-list-frames 0 0" \ - "404\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]" \ + "404\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\}.*\\\]" \ "list stack frames" @@ -77,7 +78,7 @@ mi_gdb_test "406-data-evaluate-expression have_a_very_merry_interrupt()" \ # in this next output. mi_gdb_test "407-stack-list-frames" \ - "407\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"handler\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"\"\},.*frame=\{level=\"$decimal\",addr=\"$hex\",func=\"have_a_very_merry_interrupt\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]" \ + "407\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"handler\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"\"\},.*frame=\{level=\"$decimal\",addr=\"$hex\",func=\"have_a_very_merry_interrupt\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\}.*\\\]" \ "list stack frames" @@ -86,7 +87,7 @@ mi_send_resuming_command "exec-continue" "testing exec continue" mi_expect_stop "really-no-reason" "" "" "" "" "" "finished exec continue" mi_gdb_test "409-stack-list-frames 0 0" \ - "409\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]" \ + "409\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"\}.*\\\]" \ "list stack frames" # @@ -97,7 +98,7 @@ mi_gdb_test "410-data-evaluate-expression bar()" \ ".*410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\".\\\\nEvaluation of the expression containing the function\\\\n\\(bar\\) will be abandoned.\\\\nWhen the function is done executing, GDB will silently stop.\"" \ "call inferior function which raises exception" -mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception" +mi_gdb_test "411-stack-list-frames" "411\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"},frame=\{level=\"1\",addr=\"$hex\",func=\"\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\",arch=\"$any\"}.*\\\]" "backtrace from inferior function at exception" mi_gdb_exit diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 05624deb0a..eabce97acc 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -156,11 +156,11 @@ proc make_mi_re { mode thread frame type } { set thread_event_re "=thread-selected,id=\"$thread\"" set thread_answer_re "\\^done,new-thread-id=\"$thread\"" - set frame_re(0) ",frame=\{level=\"0\",addr=\"$hex\",func=\"child_sub_function\",args=\\\[\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"$thread_loop_line\"\}" - set frame_re(1) ",frame=\{level=\"1\",addr=\"$hex\",func=\"child_function\",args=\\\[\{name=\"args\",value=\"0x0\"\}\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"$thread_caller_line\"\}" + set frame_re(0) ",frame=\{level=\"0\",addr=\"$hex\",func=\"child_sub_function\",args=\\\[\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"$thread_loop_line\",arch=\"$any\"\}" + set frame_re(1) ",frame=\{level=\"1\",addr=\"$hex\",func=\"child_function\",args=\\\[\{name=\"args\",value=\"0x0\"\}\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"$thread_caller_line\",arch=\"$any\"\}" # Special frame for main thread. - set frame_re(2) ",frame=\{level=\"0\",addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"${main_break_line}\"\}" + set frame_re(2) ",frame=\{level=\"0\",addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\"${any}${srcfile}\",fullname=\"${any}${srcfile}\",line=\"${main_break_line}\",arch=\"$any\"\}" if { $thread != -1 } { if { $type == "event" } { diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 851e490f4d..bf9f613985 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -1240,9 +1240,9 @@ proc mi_expect_stop { reason func args file line extra test } { set a $after_reason - verbose -log "mi_expect_stop: expecting: \\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$func\",args=$args,(?:file=\"$any$file\",fullname=\"${fullname_syntax}$file\",line=\"$line\"|from=\"$file\")\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" + verbose -log "mi_expect_stop: expecting: \\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$func\",args=$args,(?:file=\"$any$file\",fullname=\"${fullname_syntax}$file\",line=\"$line\",arch=\"$any\"|from=\"$file\")\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" gdb_expect { - -re "\\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$func\",args=$args,(?:file=\"$any$file\",fullname=\"${fullname_syntax}$file\",line=\"($line)\"|from=\"$file\")\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" { + -re "\\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$func\",args=$args,(?:file=\"$any$file\",fullname=\"${fullname_syntax}$file\",line=\"($line)\",arch=\"$any\"|from=\"$file\")\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" { pass "$test" if {[array names expect_out "2,string"] != ""} { return $expect_out(2,string) @@ -1250,7 +1250,7 @@ proc mi_expect_stop { reason func args file line extra test } { # No debug info available but $file does match. return 0 } - -re "\\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$any\",args=\[\\\[\{\]$any\[\\\]\}\],file=\"$any\",fullname=\"${fullname_syntax}$any\",line=\"\[0-9\]*\"\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" { + -re "\\*stopped,${r}${a}${bn}frame=\{addr=\"$hex\",func=\"$any\",args=\[\\\[\{\]$any\[\\\]\}\],file=\"$any\",fullname=\"${fullname_syntax}$any\",line=\"\[0-9\]*\",arch=\"$any\"\}$after_stopped,thread-id=\"$decimal\",stopped-threads=$any\r\n($thread_selected_re|$breakpoint_re)*$prompt_re" { verbose -log "got $expect_out(buffer)" fail "$test (stopped at wrong place)" return -1 -- 2.34.1