From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id A7C82386F02C for ; Tue, 9 Mar 2021 11:09:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A7C82386F02C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x435.google.com with SMTP id h98so14705339wrh.11 for ; Tue, 09 Mar 2021 03:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=1VX8jx73fOVgpUgPcs72zxv4nTqPtXBmUpr+NbueJwk=; b=eHbUaGAecaZbsoESXCs5SyUhbJRdS0yeDLgqpDl8b7mxkTaEg28qhrbKwveB3M4cQC tUXTokg7jlCErVz24VZgduBId09iC8KVY+1dhCZCFJWXxWTy6kusBY8K3w22gJ+18FbZ pyuomF2iHp3GPvknQdXfE17q7TBMG6rfzlCbR6/Y1QV/dNf+zLV3lxGiYn04aEKW8Ye5 ikOZ19aCLV1TEdfJTiokP7IhF1qWXa6YaMr1wNqIfA8de+UCxQjUbgJvi9+BXpSag/id SgfnzuOiZn8IeUtolSszP9cpaR/r4bWTsXnX06585EgF8AZm2N2RxuuhZ2ACVjimFJ+R n8Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1VX8jx73fOVgpUgPcs72zxv4nTqPtXBmUpr+NbueJwk=; b=QztWtATd9WGroK6DCuMGDMPw5aLzLHtQmJGya+U6Jcnc4zdXHw8gPK1tMVnb5kdDwE qj5Y33RMkuabvxCtps4q/UUsjZfFOhvX0tceOC5NYu4Aye+Y3qEV/eF6gF3h2vLryvyu MkTnh57QGH+kERxIw4cmaLlihyHDD6Gk7TCkB8oBjcsCgn/IIrTetSyM2JyqFltAnN2z curnSUeNO7ttK9nhcFmPggmiZ0Z0Zo3shSxYXwJu52KC8pV6gUwUlFlYkeS2EYkSJhgj 4FSZ4B2AjrAn4MnKhTbJ3NXT9THsHt5gzrwdDioZ5Nvh6YYLsnVE4ApWV0udqCNuWcOG Tw+A== X-Gm-Message-State: AOAM532Eah+Lypilkav9ZV9gMGsHCw/dShE9qBgOE4XQp/d/XfJiKKR8 NveCl0g9MQpvmThy9PpIfK6l6PMSufNokQ== X-Google-Smtp-Source: ABdhPJwP86kPZNaeIMEwVFxueSAn50o06HaFDDM3GRyde6PpWyOzwRa1LzCXQHtuH8Z9tSLId1Tfhw== X-Received: by 2002:a5d:4743:: with SMTP id o3mr28421885wrs.108.1615288151510; Tue, 09 Mar 2021 03:09:11 -0800 (PST) Received: from localhost (host86-134-238-232.range86-134.btcentralplus.com. [86.134.238.232]) by smtp.gmail.com with ESMTPSA id 3sm26390453wry.72.2021.03.09.03.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 03:09:10 -0800 (PST) Date: Tue, 9 Mar 2021 11:09:09 +0000 From: Andrew Burgess To: gdb-patches@sourceware.org Subject: Re: [PATCH] gdb: fix field names of GDB's type main_type structure Message-ID: <20210309110909.GQ1720904@embecosm.com> References: <20210208225833.98235-1-andrew.burgess@embecosm.com> <20210224174234.GJ265215@embecosm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux/5.8.13-100.fc31.x86_64 (x86_64) X-Uptime: 11:06:22 up 90 days, 15:50, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Tue, 09 Mar 2021 11:09:15 -0000 * Simon Marchi [2021-03-05 13:04:59 -0500]: > On 2021-02-24 12:42 p.m., Andrew Burgess wrote:> Ping! > > > > The changes in gdb-gdb.py are straight forward. I wonder if anyone > > wants to comment on the abomination of a test? > > > > Thanks, > > Andrew > > I saw this before but then forgot about it. First, thanks for fixing > the pretty printer, I always forget to update it. > > I think the test is fine (certainly better than no test). It is > adequately documented / commented, so I would be comfortable debugging > it, if I ever need to (no need to guess "why is it doing that!?"). Thanks for the feedback. Below is the version that I actually pushed. This has a few minor tweaks to the test, but nothing huge. The main change is that the test now works with native-extended-gdbserver, I'd failed to spot that this test previously failed on this target. Thanks, Andrew --- commit fbb1aacebac7d1fd556cf9c46e9af89aaaa62398 Author: Andrew Burgess Date: Mon Feb 8 21:24:52 2021 +0000 gdb: fix field names of GDB's type main_type structure In commit: commit 5b7d941b90d1a232dc144dc14850dd2fb63c35da Date: Fri Jan 22 12:21:09 2021 -0500 gdb: add owner-related methods to struct type two fields of struct maint_type were renamed. 'flag_objfile_owned' became 'm_flag_objfile_owned' and 'owner' became 'm_owner'. Update our python helper script to take this into account. I've added a basic test that uses the self-test framework to load the pretty printers, and print a type. The test relies on stopping in GDB's `value_print` function. gdb/ChangeLog: * gdb-gdb.py.in (StructMainTypePrettyPrinter) : Updated fields names flag_objfile_owned to m_flag_objfile_owned, and owner to m_owner. gdb/testsuite/ChangeLog: * gdb.gdb/python-helper.exp: New file. diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index 2b1c7ded4b6..f58b3073d5c 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -142,10 +142,10 @@ class StructMainTypePrettyPrinter: def owner_to_string(self): """Return an image of component "owner". """ - if self.val['flag_objfile_owned'] != 0: - return "%s (objfile)" % self.val['owner']['objfile'] + if self.val['m_flag_objfile_owned'] != 0: + return "%s (objfile)" % self.val['m_owner']['objfile'] else: - return "%s (gdbarch)" % self.val['owner']['gdbarch'] + return "%s (gdbarch)" % self.val['m_owner']['gdbarch'] def struct_field_location_img(self, field_val): """Return an image of the loc component inside the given field diff --git a/gdb/testsuite/gdb.gdb/python-helper.exp b/gdb/testsuite/gdb.gdb/python-helper.exp new file mode 100644 index 00000000000..54c256eb2e0 --- /dev/null +++ b/gdb/testsuite/gdb.gdb/python-helper.exp @@ -0,0 +1,142 @@ +# Copyright 2021 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 . + +# This test exercises the gdb-gdb.py helper script that is generated +# into the GDB build directory. This script is intended for use by +# developers to make debugging GDB easier. + +load_lib selftest-support.exp + +if [target_info exists gdb,noinferiorio] { + verbose "Skipping because of no inferiorio capabilities." + return +} + +# Find the helper script in the GDB build directory. +set py_helper_script [file dirname $GDB]/gdb-gdb.py +if { ![file readable $py_helper_script] \ + || [file type $py_helper_script] != "file" } { + untested "failed to find gdb-gdb.py helper script" + return +} + +# Start GDB and check that we have python support. +gdb_start +if { [skip_python_tests] } { + untested "skipped gdb-gdb.py tests due to lack of python support" + return +} +gdb_exit + +# The main test. This is called by the self-test framework once GDB +# has been started on a copy of itself. +proc test_python_helper {} { + global py_helper_script decimal hex gdb_prompt + global inferior_spawn_id + + # Source the python helper script. This script registers the + # pretty printer for the object file called 'gdb', however, in our + # selftests we rename 'gdb' to 'xgdb', so the pretty printer + # doesn't get registered by default. + # + # So, after sourcing the script we do our own objfile scan and + # register the pretty printer for the objfile called 'xgdb'. + gdb_test_no_output "source $py_helper_script" \ + "source gdb-gdb.py helper script" + gdb_test [multi_line_input \ + "python" \ + "for objfile in gdb.objfiles():" \ + " if os.path.basename(objfile.filename) == \"xgdb\":" \ + " objfile.pretty_printers.append(type_lookup_function)" \ + "end"] ".*" \ + "register the type pretty printer" + + # Now place a breakpoint somewhere useful. This can be any function that: + # (a) is easy to reach by issuing a simple gdb command, and + # (b) is unlikely to be modified very often within gdb, and + # (c) has a parameter that is either a 'struct type *' or a 'struct value *'. + gdb_breakpoint value_print + + # Adjust the prompt on the outer gdb, this just makes things a + # little clearer when trying to unpick which GDB is active. + gdb_test_multiple "set prompt (xgdb) " "set xgdb prompt" { + -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" { + pass $gdb_test_name + } + } + + # Send a command to the outer GDB to continue the inner GDB. The + # stop is being detected from the inner GDB, hence the use of -i + # here. + gdb_test_multiple "continue" "start inner gdb" { + -i "$inferior_spawn_id" + -re "\r\n$gdb_prompt $" { + pass $gdb_test_name + } + } + + # Send a command to the inner GDB (hence send_inferior), this + # should result in the outer GDB stopping at the breakpoint we + # just created. + send_inferior "print 1\n" + gdb_test_multiple "" "hit breakpoint in inner gdb" { + -re "hit Breakpoint $decimal, value_print.*\\(xgdb\\) $" { + pass $gdb_test_name + } + } + + # Now inspect the type of parameter VAL, this should trigger the + # pretty printers. + set answer [multi_line \ + "${decimal} = " \ + "{pointer_type = 0x0," \ + " reference_type = 0x0," \ + " chain = 0x0," \ + " instance_flags = 0," \ + " length = $decimal," \ + " main_type = $hex}" \ + "\\(xgdb\\) $"] + gdb_test_multiple "print *val->type" "pretty print type" { + -re "$answer" { + pass $gdb_test_name + } + -re "There is no member named.*\r\n\\(xgdb\\) $" { + fail $gdb_test_name + } + } + + set answer [multi_line \ + "$decimal = " \ + "{name = $hex \"int\"," \ + " code = TYPE_CODE_INT," \ + " flags = \[^\r\n\]+," \ + " owner = $hex \\(gdbarch\\)," \ + " target_type = 0x0," \ + " type_specific_field = TYPE_SPECIFIC_NONE}" \ + "\\(xgdb\\) $"] + gdb_test_multiple "print *val->type->main_type" "pretty print type->main_type" { + -re "$answer" { + pass $gdb_test_name + } + -re "There is no member named.*\r\n\\(xgdb\\) $" { + fail $gdb_test_name + } + } + + return 0 +} + +# Use the self-test framework to run the test. +do_self_tests captured_main test_python_helper