From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id I4iiCMnY+2K3EigAWB0awg (envelope-from ) for ; Tue, 16 Aug 2022 13:50:01 -0400 Received: by simark.ca (Postfix, from userid 112) id 16B121E5EA; Tue, 16 Aug 2022 13:50:01 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=tPgp3XQp; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7A4B41E21F for ; Tue, 16 Aug 2022 13:50:00 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 30E2C3858403 for ; Tue, 16 Aug 2022 17:18:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 30E2C3858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1660670328; bh=Qo4Sdgam2CfIq0ja0BRVm9PgXio5bVBjDH5h/CbX5RM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=tPgp3XQpm0Wg9tpgvKoGEURHyUwQgTVy3eZz10M1CDmz6jt7PgHSL9xmXkwYR5Qai nWk3cu18xxxWNM6+fqGZzOdmjDWDWnDqy+uFh09jJEvv0Xv5FHyW7PgzW5Wdr2rIsU O/nMXpfcCGgvDOYLDG+IOvaklyMTNqKTe4UlqJFA= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D6B183858C2F for ; Tue, 16 Aug 2022 17:18:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6B183858C2F Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-453-luJBCDJxM4OPIdI-elgi3A-1; Tue, 16 Aug 2022 13:18:26 -0400 X-MC-Unique: luJBCDJxM4OPIdI-elgi3A-1 Received: by mail-wm1-f69.google.com with SMTP id x16-20020a1c7c10000000b003a5cefa5578so2156776wmc.7 for ; Tue, 16 Aug 2022 10:18:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=Qo4Sdgam2CfIq0ja0BRVm9PgXio5bVBjDH5h/CbX5RM=; b=VJICtH0GA8gDvpIY/jB1gNXjc8HXhH43W0TJQ3p9WnmV5p/xAwuO7sEjqUJ0J1FVzT ReIIlXsK7fBHp2r962UE1pHDJ5g0xGZSR/q4G6qexD5EJxe8+ruDLOxM7q0Ut1GKMweJ GZBfKBB1afye2N8zh52Dp7YLJYFm850Rji57Iv48MjxfXV4RObilaatbCN1iHzBHsfbl dbrHkL7YFF03PCSlKEnkoaAHt+lZmyYV3fYVN27GqvKRh06qi+SwVLkz7nRSQrMjAIHJ vOaDQIDAAGsJROwA2A+esV14/4y/Z9TKL5aoUz6UJliDQoy3dMTys7BmuGZFt2YAFsOt FDFQ== X-Gm-Message-State: ACgBeo3h3UjvjmgdEd5VyC2ttbTShRUZ47yryZNKC051rVuI7d2N+Wbx 8Gc0fvrXwPs2rlEsXkbmHIkTLqPJf5SCiMzsMuuVci1zXhsJo2HAquJMyRtdKkbvNIv9pkuK5Gl M7REjhBOzfinyYamI+UXMRQFEYulIx6HDQKRzHVlw+Sks1cj7/ti5/4oce/HZkOjlx0U/s6Ar4w == X-Received: by 2002:a05:6000:1681:b0:21f:16a6:626f with SMTP id y1-20020a056000168100b0021f16a6626fmr12216135wrd.717.1660670304942; Tue, 16 Aug 2022 10:18:24 -0700 (PDT) X-Google-Smtp-Source: AA6agR6x5tu92Ni0qanTjxaLkDAhHAnA5SiOnC3q+KtOA94obEI64L64y6yqq/PtGV2uYAe/roghHA== X-Received: by 2002:a05:6000:1681:b0:21f:16a6:626f with SMTP id y1-20020a056000168100b0021f16a6626fmr12216112wrd.717.1660670304543; Tue, 16 Aug 2022 10:18:24 -0700 (PDT) Received: from localhost ([31.111.84.229]) by smtp.gmail.com with ESMTPSA id p14-20020a5d4e0e000000b0020fff0ea0a3sm10649945wrt.116.2022.08.16.10.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 10:18:24 -0700 (PDT) To: gdb-patches@sourceware.org Subject: [PATCH] gdb: new 'maint print frame-id' command Date: Tue, 16 Aug 2022 18:18:22 +0100 Message-Id: <20220816171822.3315660-1-aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Cc: Andrew Burgess Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" When debugging a certain class of GDB bug, I often end up wanting to know what GDB thinks the frame-id is in a particular frame. It's not too hard to pull this from some debug output, but I thought it might be nice if there was a maintenance command that could tell us. This commit adds 'maint print frame-id' which prints the frame-id of the currently selected frame. You can also pass a frame level number to find the frame-id for a specific frame. There's a new test too. --- gdb/NEWS | 4 ++ gdb/doc/gdb.texinfo | 17 +++++ gdb/frame.c | 28 ++++++++ gdb/testsuite/gdb.base/maint-print-frame-id.c | 40 +++++++++++ .../gdb.base/maint-print-frame-id.exp | 68 +++++++++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 gdb/testsuite/gdb.base/maint-print-frame-id.c create mode 100644 gdb/testsuite/gdb.base/maint-print-frame-id.exp diff --git a/gdb/NEWS b/gdb/NEWS index f2040e26c0c..49ac714efda 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -91,6 +91,10 @@ show style disassembler symbol The 'disassembler address' and 'disassembler symbol' styles are aliases for the 'address' and 'function' styles respectively. +maintenance print frame-id [ LEVEL ] + Print GDB's internal frame-id for the frame at LEVEL. If LEVEL is + not given, then print the frame-id for the currently selected frame. + * Changed commands maintenance info line-table diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 82cb1c8d668..ca958173b57 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -40142,6 +40142,23 @@ Takes an optional file parameter. +@kindex maint print frame-id +@item maint print frame-id +@itemx maint print frame-id @var{level} +Print @value{GDBN}'s internal frame-id for the frame at relative +@var{level}, or for the currently selected frame when @var{level} is +not given. + +If used, @var{level} should be an integer, as displayed in the +@command{backtrace} output. + +@smallexample +(@value{GDBP}) maint print frame-id +frame-id for frame #0: {stack=0x7fffffffac70,code=0x0000000000401106,!special} +(@value{GDBP}) maint print frame-id 2 +frame-id for frame #2: {stack=0x7fffffffac90,code=0x000000000040111c,!special} +@end smallexample + @kindex maint print registers @kindex maint print raw-registers @kindex maint print cooked-registers diff --git a/gdb/frame.c b/gdb/frame.c index ae45e22d613..e6bebf575ca 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -3116,6 +3116,30 @@ the rest of the stack trace."), }, }; +/* Implement the 'maintenance print frame-id' command. */ + +static void +maintenance_print_frame_id (const char *args, int from_tty) +{ + struct frame_info *frame; + + /* Use the currently selected frame, or select a frame based on the level + number passed by the user. */ + if (args == nullptr) + frame = get_selected_frame ("No frame selected"); + else + { + int level = value_as_long (parse_and_eval (args)); + frame = find_relative_frame (get_current_frame (), &level); + } + + /* Print the frame-id. */ + gdb_assert (frame != nullptr); + gdb_printf ("frame-id for frame #%d: %s\n", + frame_relative_level (frame), + get_frame_id (frame).to_string ().c_str ()); +} + void _initialize_frame (); void _initialize_frame () @@ -3160,4 +3184,8 @@ When non-zero, frame specific internal debugging is enabled."), NULL, show_frame_debug, &setdebuglist, &showdebuglist); + + add_cmd ("frame-id", class_maintenance, maintenance_print_frame_id, + _("Print the current frame-id."), + &maintenanceprintlist); } diff --git a/gdb/testsuite/gdb.base/maint-print-frame-id.c b/gdb/testsuite/gdb.base/maint-print-frame-id.c new file mode 100644 index 00000000000..bc9eb3000e7 --- /dev/null +++ b/gdb/testsuite/gdb.base/maint-print-frame-id.c @@ -0,0 +1,40 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2022 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +foo (void) +{ + return 0; +} + +int +bar (void) +{ + return foo (); +} + +int +baz (void) +{ + return bar (); +} + +int +main (void) +{ + return baz (); +} diff --git a/gdb/testsuite/gdb.base/maint-print-frame-id.exp b/gdb/testsuite/gdb.base/maint-print-frame-id.exp new file mode 100644 index 00000000000..395927a22c4 --- /dev/null +++ b/gdb/testsuite/gdb.base/maint-print-frame-id.exp @@ -0,0 +1,68 @@ +# Copyright 2022 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test the 'maint print frame-id' command. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile \ + $srcfile {debug}]} { + return -1 +} + +if ![runto_main] then { + return -1 +} + +gdb_breakpoint foo +gdb_continue_to_breakpoint "run to foo" + +proc get_frame_id { level } { + set id "**unknown**" + + gdb_test_multiple "maint print frame-id ${level}" "" { + -re "^maint print frame-id\[^\r\n\]+\r\n" { + exp_continue + } + + -wrap -re "^frame-id for frame #\[0-9\]+: (\[^\r\n\]+)" { + set id $expect_out(1,string) + pass $gdb_test_name + } + } + + return $id +} + +# Get the frame-id for each frame using the frame level. +array set ids {} +with_test_prefix "get id by level" { + for { set i 0 } { $i < 4 } { incr i } { + set ids($i) [get_frame_id $i] + } +} + +# Now get the frame-id of the currently selected frame, and check it +# matches the frame-id we got earlier. Then move up the stack, +# selecting a new frame. +for { set i 0 } { $i < 4 } { incr i } { + with_test_prefix "frame $i is current" { + set id [get_frame_id ""] + gdb_assert { [string equal $id $ids($i)] } \ + "check frame-id matches" + } + gdb_test "up" ".*" \ + "move up from frame $i" +} -- 2.25.4