@@ -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.
@@ -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 $" {
@@ -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