Skip to content
Snippets Groups Projects
Commit 7337a6f2 authored by Marcin Kościelnicki's avatar Marcin Kościelnicki
Browse files

gdb.trace: Surround $call_insn with \y in entry-values.exp

The PPC64 tracepoint patch added \y at the end of the call_insn pattern -
without that, it embarassed itself and matched the 'bl' in "Dump of
assem*bl*er code for function" as the powerpc call opcode.  Since that
sounds like a generally good idea, I've added \y before and after
call_insn for every target.  As a result, I had to change x86_64's mnemonic
to 'callq'.

gdb/testsuite/ChangeLog:

	* gdb.trace/entry-values.exp: Surround $call_insn with '\y',
	change x86_64 call_insn to 'callq'.
parent 1eb7c2d8
No related branches found
No related tags found
No related merge requests found
2016-02-25 Marcin Kościelnicki <koriakin@0x04.net>
* gdb.trace/entry-values.exp: Surround $call_insn with '\y',
change x86_64 call_insn to 'callq'.
2016-02-24 Antoine Tremblay <antoine.tremblay@ericsson.com> 2016-02-24 Antoine Tremblay <antoine.tremblay@ericsson.com>
* gdb.trace/tfile-avx.c: Move to... * gdb.trace/tfile-avx.c: Move to...
......
...@@ -57,6 +57,8 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { ...@@ -57,6 +57,8 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } {
# returns. The only exception is JALRC, in which case execution # returns. The only exception is JALRC, in which case execution
# resumes from `insn1' instead. # resumes from `insn1' instead.
set call_insn {jalrc|[jb]al[sxr]*[ \t][^\r\n]+\r\n} set call_insn {jalrc|[jb]al[sxr]*[ \t][^\r\n]+\r\n}
} elseif [is_amd64_regs_target] {
set call_insn "callq"
} else { } else {
set call_insn "call" set call_insn "call"
} }
...@@ -64,7 +66,7 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { ...@@ -64,7 +66,7 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } {
# Calculate the offset of the instruction in bar returned from foo. # Calculate the offset of the instruction in bar returned from foo.
set test "disassemble bar" set test "disassemble bar"
gdb_test_multiple $test $test { gdb_test_multiple $test $test {
-re ".*$hex <\\+$decimal>:\[ \t\]+$call_insn\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:.*$gdb_prompt $" { -re ".*$hex <\\+$decimal>:\[ \t\]+\\y$call_insn\\y\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:.*$gdb_prompt $" {
set returned_from_foo $expect_out(1,string) set returned_from_foo $expect_out(1,string)
} }
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment