diff options
author | Marcin KoĆcielnicki <koriakin@0x04.net> | 2016-02-19 20:29:23 +0100 |
---|---|---|
committer | Marcin KoĆcielnicki <koriakin@0x04.net> | 2016-02-25 16:11:29 +0100 |
commit | 7337a6f2297cdd91bb852b479b284e5796d62cc9 (patch) | |
tree | 4b7c9e48a8e1b12035a0694d86e5b96f4992638b /gdb/testsuite/gdb.trace | |
parent | 1eb7c2d886c0faac42d2b68862b0e6b0d3182d98 (diff) | |
download | fsf-binutils-gdb-7337a6f2297cdd91bb852b479b284e5796d62cc9.zip fsf-binutils-gdb-7337a6f2297cdd91bb852b479b284e5796d62cc9.tar.gz fsf-binutils-gdb-7337a6f2297cdd91bb852b479b284e5796d62cc9.tar.bz2 |
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'.
Diffstat (limited to 'gdb/testsuite/gdb.trace')
-rw-r--r-- | gdb/testsuite/gdb.trace/entry-values.exp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index 825928d..81b0263 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -57,6 +57,8 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { # returns. The only exception is JALRC, in which case execution # resumes from `insn1' instead. set call_insn {jalrc|[jb]al[sxr]*[ \t][^\r\n]+\r\n} +} elseif [is_amd64_regs_target] { + set call_insn "callq" } else { set call_insn "call" } @@ -64,7 +66,7 @@ if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { # 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 $" { |