This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Regression for mi-disassemble.exp [Re: Add a new modifier /c to "disassemble" command to make it output binary code]
Hi Hui,
On Sat, 11 Jul 2009 16:15:00 +0200, Hui Zhu wrote:
> Fixed and checked-in.
this check-in
http://sourceware.org/ml/gdb-cvs/2009-07/msg00089.html
http://sourceware.org/ml/gdb-cvs/2009-07/msg00092.html
2009-07-11 Hui Zhu <teawater@gmail.com>
* cli/cli-cmds.c (disassemble_command): Add a new modifier /r
to "disassemble" command to print the raw instructions in hex as
well as in symbolic form.
(init_cli_cmds): Ditto.
(print_disassembly): Change "mixed" to "flags" to translate
the behavior of disassemble.
(disassemble_current_function): Ditto.
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Ditto.
* stack.c (gdb_disassembly_stub): Ditto.
* disasm.c (do_mixed_source_and_assembly): Ditto.
(do_mixed_source_and_assembly): Ditto.
(do_assembly_only): Ditto.
(gdb_disassembly): Ditto.
(dump_insns): print the raw instructions in hex as well as in
symbolic form if DISASSEMBLY_RAW_INSN and flags is true.
* disasm.h (DISASSEMBLY_SOURCE): Include source code with the
assembly if it and flags is true.
(DISASSEMBLY_RAW_INSN): Include the raw instructions in hex with
the assembly if it and flags is true.
(gdb_disassembly): Update extern.
* NEWS: Document disassemble/r support.
causes a regression on {x86_64,x86_64-32,i686}-fedora11-linux-gnu.
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble from pc to pc+12 assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file & line, assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble from pc to pc+12 assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file & line, assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
I hope it is reproducible for you, have not checked it much more.
Regards,
Jan
@@ -58240,17 +57869,17 @@
]+[(]gdb[)]
[ ]*)
111-data-disassemble -s $pc -e "$pc + 12" -- 0
-111^done,asm_insns=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"}]
+111^done,asm_insns=[src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]}]
(gdb)
-PASS: gdb.mi/mi-disassemble.exp: data-disassemble from pc to pc+12 assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble from pc to pc+12 assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -- 0[
]+)?(222\^done,asm_insns=\[{address="0x[0-9A-Fa-f]+",func-name="main",offset="0",inst=".*"},.*,{address="0x[0-9A-Fa-f]+",func-name="main",offset="[0-9]+",inst=".*"}\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi-disassemble.exp: data-disassemble file & line, assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file & line, assembly only
Expecting: ^(002-data-disassemble -f basics\.c -l 41 -- 1[
]+)?(002\^done,asm_insns=\[src_and_asm_line={line="41",file=".*basics.c",line_asm_insn=\[{address="0x[0-9A-Fa-f]+",func-name="callee2",offset="0",inst=".*"}.*\]}.*,src_and_asm_line={line="[0-9]+",file=".*basics.c",line_asm_insn=\[.*{address="0x[0-9A-Fa-f]+",func-name="callee2",offset="[0-9]+",inst=".*"}\]}\][
]+[(]gdb[)]
@@ -58313,25 +57942,25 @@
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 20 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -n 0 -- 0[
]+)?(222\^done,asm_insns=\[\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 0 -- 0
-222^done,asm_insns=[]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]}]
(gdb)
-PASS: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -n 50 -- 0[
]+)?(222\^done,asm_insns=\[{address="0x[0-9A-Fa-f]+",func-name="main",offset="0",inst=".*"},.*,{address="0x[0-9A-Fa-f]+",func-name="main",offset="[0-9]+",inst=".*"}\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 50 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
+FAIL: gdb.mi/mi-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
Expecting: ^(print/x \$pc[
]+)?([
]+[(]gdb[)]
@@ -68148,17 +67774,17 @@
]+[(]gdb[)]
[ ]*)
111-data-disassemble -s $pc -e "$pc + 12" -- 0
-111^done,asm_insns=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"}]
+111^done,asm_insns=[src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]}]
(gdb)
-PASS: gdb.mi/mi2-disassemble.exp: data-disassemble from pc to pc+12 assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble from pc to pc+12 assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -- 0[
]+)?(222\^done,asm_insns=\[{address="0x[0-9A-Fa-f]+",func-name="main",offset="0",inst=".*"},.*,{address="0x[0-9A-Fa-f]+",func-name="main",offset="[0-9]+",inst=".*"}\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi2-disassemble.exp: data-disassemble file & line, assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file & line, assembly only
Expecting: ^(002-data-disassemble -f basics\.c -l 41 -- 1[
]+)?(002\^done,asm_insns=\[src_and_asm_line={line="41",file=".*basics.c",line_asm_insn=\[{address="0x[0-9A-Fa-f]+",func-name="callee2",offset="0",inst=".*"}.*\]}.*,src_and_asm_line={line="[0-9]+",file=".*basics.c",line_asm_insn=\[.*{address="0x[0-9A-Fa-f]+",func-name="callee2",offset="[0-9]+",inst=".*"}\]}\][
]+[(]gdb[)]
@@ -68221,25 +67847,25 @@
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 20 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -n 0 -- 0[
]+)?(222\^done,asm_insns=\[\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 0 -- 0
-222^done,asm_insns=[]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]}]
(gdb)
-PASS: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (zero lines) assembly only
Expecting: ^(222-data-disassemble -f basics\.c -l 66 -n 50 -- 0[
]+)?(222\^done,asm_insns=\[{address="0x[0-9A-Fa-f]+",func-name="main",offset="0",inst=".*"},.*,{address="0x[0-9A-Fa-f]+",func-name="main",offset="[0-9]+",inst=".*"}\][
]+[(]gdb[)]
[ ]*)
222-data-disassemble -f basics.c -l 66 -n 50 -- 0
-222^done,asm_insns=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"},{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"},{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"},{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"},{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"},{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"},{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"},{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]
+222^done,asm_insns=[src_and_asm_line={line="65",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a0",func-name="main",offset="0",inst="push %rbp"},{address="0x00000000004005a1",func-name="main",offset="1",inst="mov %rsp,%rbp"}]},src_and_asm_line={line="66",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005a4",func-name="main",offset="4",inst="movsd 0x16c(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005ac",func-name="main",offset="12",inst="mov $0x4006ff,%esi"},{address="0x00000000004005b1",func-name="main",offset="17",inst="mov $0x2,%edi"},{address="0x00000000004005b6",func-name="main",offset="22",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="67",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005bb",func-name="main",offset="27",inst="movsd 0x155(%rip),%xmm0 # 0x400718 <__dso_handle+40>"},{address="0x00000000004005c3",func-name="main",offset="35",inst="mov $0x4006ff,%esi"},{address="0x00000000004005c8",func-name="main",offset="40",inst="mov $0x2,%edi"},{address="0x00000000004005cd",func-name="main",offset="45",inst="callq 0x400551 <callee1>"}]},src_and_asm_line={line="68",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="69",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d2",func-name="main",offset="50",inst="callq 0x40059a <do_nothing>"}]},src_and_asm_line={line="70",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="71",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005d7",func-name="main",offset="55",inst="mov $0x1,%edi"},{address="0x00000000004005dc",func-name="main",offset="60",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="72",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005e1",func-name="main",offset="65",inst="mov $0x2,%edi"},{address="0x00000000004005e6",func-name="main",offset="70",inst="callq 0x400578 <callme>"}]},src_and_asm_line={line="73",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[]},src_and_asm_line={line="74",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005eb",func-name="main",offset="75",inst="mov $0x0,%eax"}]},src_and_asm_line={line="75",file="../.././gdb/testsuite/gdb.mi/basics.c",line_asm_insn=[{address="0x00000000004005f0",func-name="main",offset="80",inst="leaveq "},{address="0x00000000004005f1",func-name="main",offset="81",inst="retq "}]}]
(gdb)
-PASS: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
+FAIL: gdb.mi/mi2-disassemble.exp: data-disassemble file, line, number (more than main lines) assembly only
Expecting: ^(print/x \$pc[
]+)?([
]+[(]gdb[)]