From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22991 invoked by alias); 12 Sep 2012 15:38:54 -0000 Received: (qmail 22890 invoked by uid 22791); 12 Sep 2012 15:38:53 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 12 Sep 2012 15:38:35 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8CFcZHc013548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Sep 2012 11:38:35 -0400 Received: from host2.jankratochvil.net (ovpn-116-25.ams2.redhat.com [10.36.116.25]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8CFcV2a007817 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Wed, 12 Sep 2012 11:38:34 -0400 Date: Wed, 12 Sep 2012 15:38:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] Fix disassemble without parameters in tailcall frame Message-ID: <20120912153830.GA7317@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-09/txt/msg00209.txt.bz2 Hi, when the current frame is in tailcall function: disassemble No function contains program counter for selected frame. (gdb) FAIL: gdb.arch/amd64-entry-value.exp: disassemble -> disassemble Dump of assembler code for function b(int, double): 0x0000000000400790 <+0>: addsd 0x298(%rip),%xmm0 # 0x400a30 0x0000000000400798 <+8>: add $0x2,%edi 0x000000000040079b <+11>: jmp 0x400770 End of assembler dump. Such a simple but annoying to me issue when tailcall frames are common in practice now. The "=> " PC pointer is now not displayed anywhere which seems correct to me. No regressions on {x86_64,x86_64-m32,i686}-fedora18-linux-gnu. Thanks, Jan gdb/ 2012-09-12 Jan Kratochvil 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 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..5ff18bf 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp @@ -213,6 +213,10 @@ 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. +gdb_test "down" "\r\n#2 .*" +gdb_test "disassemble" {Dump of assembler code for function b\(int, double\):.*} + # Test partial-ambiguous virtual tail call frames chain.