aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2012-09-21 18:53:15 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2012-09-21 18:53:15 +0000
commit9bf4bce9847504467f8af7e3c7886cce1794dbad (patch)
tree227cf89014e1c03342a78ed31b6b300a96c691ce /gdb
parent1c5b7826c52fb624d1d03762fafc005f8fac62a7 (diff)
downloadgdb-9bf4bce9847504467f8af7e3c7886cce1794dbad.zip
gdb-9bf4bce9847504467f8af7e3c7886cce1794dbad.tar.gz
gdb-9bf4bce9847504467f8af7e3c7886cce1794dbad.tar.bz2
gdb/
Fix disassemble without parameters in tailcall frame. * cli/cli-cmds.c (disassemble_current_function): Use get_frame_address_in_block. gdb/testsuite/ Fix disassemble without parameters in tailcall frame. * gdb.arch/amd64-entry-value.exp (down, disassemble): New tests.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/cli/cli-cmds.c2
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.arch/amd64-entry-value.exp19
4 files changed, 31 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7aba5e8..31454ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-21 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix disassemble without parameters in tailcall frame.
+ * cli/cli-cmds.c (disassemble_current_function): Use
+ get_frame_address_in_block.
+
2012-09-21 Tom Tromey <tromey@redhat.com>
* c-typeprint.c (c_type_print_base) <TYPE_CODE_STRUCT,
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 2e98804..dcf5369 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1091,7 +1091,7 @@ disassemble_current_function (int flags)
frame = get_selected_frame (_("No frame selected."));
gdbarch = get_frame_arch (frame);
- pc = get_frame_pc (frame);
+ pc = get_frame_address_in_block (frame);
if (find_pc_partial_function (pc, &name, &low, &high) == 0)
error (_("No function contains program counter for selected frame."));
#if defined(TUI)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 36f1c72..5139cc7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-21 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix disassemble without parameters in tailcall frame.
+ * gdb.arch/amd64-entry-value.exp (down, disassemble): New tests.
+
2012-09-21 Andrew Burgess <aburgess@broadcom.com>
* gdb.dwarf2/dw2-op-out-param.S: New file.
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value.exp b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
index dd22d42..455b7a7 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
@@ -213,6 +213,25 @@ gdb_test {p $sp0 == $sp} " = true"
gdb_test "frame 3" "\r\n#3 .*"
gdb_test {p $sp0 + sizeof (void *) == $sp} " = true"
+# Test $pc adjustment which is now right after the function end.
+# Also verify the current PC indicator "=> " is not displayed anywhere.
+gdb_test "down" "\r\n#2 .*"
+set test "disassemble"
+gdb_test_multiple $test $test {
+ -re "^$test\r\n" {
+ exp_continue
+ }
+ -re "^Dump of assembler code for function b\\(int, double\\):\r\n" {
+ exp_continue
+ }
+ -re "^ 0x\[^\r\n\]*\r\n" {
+ exp_continue
+ }
+ -re "^End of assembler dump\\.\r\n$gdb_prompt $" {
+ pass $test
+ }
+}
+
# Test partial-ambiguous virtual tail call frames chain.