[PATCH 2/3] gdb.trace: Surround $call_insn with \y in entry-values.exp

[Marcin KoÅcielnicki <koriakin at 0x04 dot net>]

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'.
	* lib/trace-support.exp: Change x86_64 call_insn to 'callq'.
---
 gdb/testsuite/ChangeLog                  | 5 +++++
 gdb/testsuite/gdb.trace/entry-values.exp | 2 +-
 gdb/testsuite/lib/trace-support.exp      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ec2773b..4546cc7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2016-02-19  Marcin KoÅcielnicki  <koriakin@0x04.net>
 
+	* gdb.trace/entry-values.exp: Surround $call_insn with '\y'.
+	* lib/trace-support.exp: Change x86_64 call_insn to 'callq'.
+
+2016-02-19  Marcin KoÅcielnicki  <koriakin@0x04.net>
+
 	* gdb.trace/entry-values.exp: Move call_insn setting to
 	trace-support.exp.
 	* gdb.trace/ftrace.exp: Move arg0exp setting to trace-support.exp.
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index 75c788a..2890112 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -42,7 +42,7 @@ set returned_from_foo ""
 # Calculate the offset of the instruction in bar returned from foo.
 set test "disassemble bar"
 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)
     }
     -re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/lib/trace-support.exp b/gdb/testsuite/lib/trace-support.exp
index 0565030..96f2c35 100644
--- a/gdb/testsuite/lib/trace-support.exp
+++ b/gdb/testsuite/lib/trace-support.exp
@@ -35,7 +35,7 @@ if [is_amd64_regs_target] {
     # register usage in tracepoint conditions.
     set arg0exp "\$rdi"
     # The mnemonic of the usual, unconditional call instruction.
-    set call_insn "call"
+    set call_insn "callq"
     # Number of the PC register.
     set pcnum 16
     # Number of any GPR (it's supposed to be some register that's not
-- 
2.7.1