Re: [patch] Fix disassemble without parameters in tailcall frame

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Thu, 13 Sep 2012 05:55:27 +0200, Yao Qi wrote:
> On 09/12/2012 11:38 PM, Jan Kratochvil wrote:
> >+# Test $pc adjustment which is now right after the function end.
> >+gdb_test "down" "\r\n#2 .*"
> >+gdb_test "disassemble" {Dump of assembler code for function b\(int, double\):.*}
> 
> Do we need to complete the test here to check 'PC doesn't fall in
> the range of function b' or ' => is not displayed'?

I was thinking about it before.  Extended the testcase.


Thanks,
Jan


gdb/
2012-09-12  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.

gdb/testsuite/
2012-09-12  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Fix disassemble without parameters in tailcall frame.
	* gdb.arch/amd64-entry-value.exp (down, disassemble): New tests.

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index d3473d5..0bdd373 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/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.