From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mPtkJcFdBWbUdhkAWB0awg (envelope-from ) for ; Thu, 28 Mar 2024 08:08:33 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=kmMBa8FG; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 915531E0C0; Thu, 28 Mar 2024 08:08:33 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 762BF1E030 for ; Thu, 28 Mar 2024 08:08:31 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 501413858403 for ; Thu, 28 Mar 2024 12:08:30 +0000 (GMT) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by sourceware.org (Postfix) with ESMTPS id 0E9913858407 for ; Thu, 28 Mar 2024 12:06:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0E9913858407 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0E9913858407 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711627616; cv=none; b=UmRG6Cee9a46POX+ovJzbH/cZ8rTi0gMQiJaXK8gdtLYcwzwh9zUNTCNnWog85iXHgT/qeEgjsi2Ol3g22NUfs1BkyjwPo3NFEyll8hNrsLgTrHinP43WP0oFXAI4e/QWvPP9gX8mQWTCup9Trkj0c8/zCnJx6aRfG6pFhxG0Is= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711627616; c=relaxed/simple; bh=Dw7/VV+RSjxu21xvhjDINrNVnd6jO/63NuQqrNRaMnQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=o4Jvl1wp9B0+Afxtr5RDF+hGVoyknHp7xoOpG8yyLd6vDQXagNwdRwhAfK459V0yzwSv6gmZnRvpACw/bHhooj56aE/nyuM5hOlrVzfnDAeK6s4e8j6g2DMYIvM0+G+24z4IhVrb01d0DC2BUzvIBEScWFf/9gEX2SyB4bPHJnE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711627606; x=1743163606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dw7/VV+RSjxu21xvhjDINrNVnd6jO/63NuQqrNRaMnQ=; b=kmMBa8FGRANwLGSWHGTjNfpNBYKVGVlG2864xKrynETEg5aSjsYJqYoH Ma0gcVZHztkK9usbUDgNoeyfhPPUaSyyrr8GnMIp98tVeZjAMV1CpmoZD lR3cFyqd/+r9K1W67ZNe2TY8b5YeNDmfcyuzukSt5j3uTlqDnUOlTIXJO nu33iyrAILKfelrHwEwCwNkTv1jxcTJYgobHkb+QBr8yzE6A0M55Qv6u5 7j4gSf8Rz1Sdi6vRUIjHOYG2AalImeJZJi7fBTewVAsgaZ8qer5SbLLaL PiOiyD2WTEmLK5d5ooFBR5BXBYaVRc6/GTcIR2Gbe7iFStR45l15OEhmd A==; X-CSE-ConnectionGUID: wZWtlvrWRySx7i2hHM7vpg== X-CSE-MsgGUID: /RQpr/kIScCC1RRxI8yCSQ== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="18158660" X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="18158660" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 05:06:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="47816222" Received: from abijaz-mobl2.ger.corp.intel.com (HELO localhost) ([10.246.42.1]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 05:06:43 -0700 From: Abdul Basit Ijaz To: gdb-patches@sourceware.org Cc: abdul.b.ijaz@intel.com, JiniSusan.George@amd.com, tom@tromey.com, eliz@gnu.org Subject: [PATCH v6 07/10] gdb: Skip trampoline functions for the return command. Date: Thu, 28 Mar 2024 13:05:25 +0100 Message-Id: <20240328120528.30382-8-abdul.b.ijaz@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240328120528.30382-1-abdul.b.ijaz@intel.com> References: <20240328120528.30382-1-abdul.b.ijaz@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org From: "Ijaz, Abdul B" This change skips trampoline functions for the return command when the option 'skip-trampoline-functions' is set to 'on'. Before this change, GDB processes trampoline functions indicated by the compiler with DIE "DW_AT_trampoline" for the return command and stops at the trampoline functions. For better user experience, all such frames can be skipped and hidden from the user. In this example the IFX compiler emits "DW_AT_trampoline" tag for the 'first' and 'second' trampoline functions like following: function second (x, y) result(z) integer, intent(in) :: x, y integer :: z z = x * y ! breakpt-return end function second function first (num1, num2) result(total) integer, intent(in) :: num1, num2 integer :: total total = second (num1 + 4, num2 * 3) ! first-breakpt total = total + 30 end function first Related Dwarf: 0x0000013f: DW_TAG_subprogram DW_AT_low_pc (0x0000000000404350) DW_AT_high_pc (0x000000000040435f) DW_AT_frame_base (DW_OP_reg6 RBP) DW_AT_linkage_name ("second_.t74p.t75p") DW_AT_name ("second_.t74p.t75p") DW_AT_trampoline ("second_") 0x0000015a: DW_TAG_subprogram DW_AT_low_pc (0x00000000004044a0) DW_AT_high_pc (0x00000000004044af) DW_AT_frame_base (DW_OP_reg6 RBP) DW_AT_linkage_name ("first_.t104p.t105p") DW_AT_name ("first_.t104p.t105p") DW_AT_trampoline ("first_") Before this change, the return command output looks like: ''' (gdb) return Make second return now? (y or n) y \#0 0x0000000000405209 in second_.t74p.t75p () at test.f90:12 12 end function first ''' After this change: ''' (gdb) return Make second return now? (y or n) y \#0 0x00000000004051e3 in first (num1=16, num2=3) at test.f90:10 10 total = second (num1 + 4, num2 * 3) ! first-breakpt ''' The test gdb.fortran/func-trampoline.exp is updated for testing this change. 2024-03-28 Ijaz, Abdul B --- gdb/doc/gdb.texinfo | 6 +++--- gdb/stack.c | 11 +++++++++++ gdb/testsuite/gdb.fortran/func-trampoline.exp | 10 +++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 222faba5da3..a6f74373dfe 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -6475,9 +6475,9 @@ DWARF trampolines marked via DW_AT_trampoline are supported by this. When issuing a @code{backtrace}, if @code{skip-trampoline-functions} is set, @value{GDBN} will skip trampoline frames while printing the stack. -When issuing a @code{finish}, @code{reverse-finish} or @code{up}, if -@code{skip-trampoline-functions} is set, @value{GDBN} will skip trampoline -frames while returning from the target function. +When issuing a @code{finish}, @code{reverse-finish}, @code{up} or +@code{return}, if @code{skip-trampoline-functions} is set, @value{GDBN} will +skip trampoline frames while returning from the target function. Currently, only DWARF trampolines marked via DW_AT_trampoline are supported by this. diff --git a/gdb/stack.c b/gdb/stack.c index 2071d98ffe6..85deedce682 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2836,6 +2836,17 @@ return_command (const char *retval_exp, int from_tty) if (get_frame_type (get_current_frame ()) == DUMMY_FRAME) frame_pop (get_current_frame ()); + if (skip_trampoline_functions) + { + frame_info_ptr ret_frame = get_current_frame (); + for (int i = 0; (SAFE_TRAMPOLINE_CHAIN (i, ret_frame) + && in_trampoline_frame (ret_frame)); ++i) + { + frame_pop (ret_frame); + ret_frame = get_current_frame (); + } + } + select_frame (get_current_frame ()); /* If interactive, print the frame that is now current. */ if (from_tty) diff --git a/gdb/testsuite/gdb.fortran/func-trampoline.exp b/gdb/testsuite/gdb.fortran/func-trampoline.exp index e7e4c8ae7b0..dd26e5ab035 100644 --- a/gdb/testsuite/gdb.fortran/func-trampoline.exp +++ b/gdb/testsuite/gdb.fortran/func-trampoline.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test "backtrace", "backtrace -n", "finish" and "up" commands for +# Test "backtrace", "backtrace -n", "finish", "up" and "return" commands for # functions with trampoline calls. require allow_fortran_tests @@ -92,3 +92,11 @@ with_test_prefix "up" { "#$decimal.* $middle_desc" \ "${fill}first = second \\(num1 \\+ 4, num2 \\* 3\\).*${fill}"] } + +with_test_prefix "return" { + init_test + + gdb_test "return" \ + ".*first = second \\(num1 \\+ 4, num2 \\* 3\\) \\! first-breakpt" \ + "" "Make second return now.*y or n. $" "y" +} -- 2.34.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928