From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 06576385480D for ; Mon, 8 Feb 2021 22:58:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 06576385480D 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-x434.google.com with SMTP id l12so19208169wry.2 for ; Mon, 08 Feb 2021 14:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4HdtmEdJh49vL/OtKf9rVwZVCzNYr2xiOrPjfvZ0No=; b=hlxJ8IjvtkXiNZ4YtvIfVlnHlP44iOyPa/HXoWOrjR20uceDV/EVFT+aichgZrLKL4 25u8e4BKvkSruufgWLzWw4Sk6SQ0QyhrmHjRyPLseFCxmp4Cy42Xa+440cW9EmXtPP/C X86wxEnE31JIExSkb1jj9Zf9H+/CxwExwZ6mnX4tEDkyBCTrxZLwPYdiZF+8J+/99pG3 lt0IGbL44tlrQYME4is4vnU7RNPis6jy7FXa28msLgBCdnAy3bcROd7iDBPrs340Hnd7 8HqCy1pAH3zC7FlsikI+Zx01e8nHfRuMTEBn1ugq+3Socm2HxOlGDTFuNoX8NBxqj/KT CkYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4HdtmEdJh49vL/OtKf9rVwZVCzNYr2xiOrPjfvZ0No=; b=MUn8Z5iQFfGg9dNQiRzwzAxdE61N3YAWF8bHlJFUP8GL4NdEdgCPUqc6pndWshHPTT PJvW/A2jeq/sVPRcnFwi2UIgm7b3YXNareeZbQKEygS0cksPZrHA58JYTNeDC8tmbPHj H5b0wf1fCyTZYmir6CfIpAGnV0ZCVVZK1ty12bw7Mh/o4XlKGhhJRYh4ass+RdR8D0Ir bRdDZPmcnHmh/TXFsV3yD5h8vVJK4+qjUsaeHhhw5Xf5A0Kd64CQ6G7Rv0KDKoEgVQaY CYRRd9Bdpj0WNCt4DCvM1I/nM/W3AHKkUZxhNbDjehuyjS2uTjAtWO3qYnXi/DgUznYq pDAQ== X-Gm-Message-State: AOAM532bb2RXETsI+Dlambmpo9WTEMq+clB2/qWkgsOoHVQa3sYE14Nm FF53guIpdZrwiboW40V2Jxgci3kDKy8p3w== X-Google-Smtp-Source: ABdhPJw2vnlTVp04IVD+IE45uLoLl2uw5p/sNQVujqlt4aZ5wIFpMf8zWhtftfk+tOpPlEk/13eM7A== X-Received: by 2002:a5d:5092:: with SMTP id a18mr22751628wrt.380.1612825115719; Mon, 08 Feb 2021 14:58:35 -0800 (PST) Received: from localhost (host109-151-46-64.range109-151.btcentralplus.com. [109.151.46.64]) by smtp.gmail.com with ESMTPSA id e12sm33856310wrs.67.2021.02.08.14.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 14:58:35 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH] gdb: fix field names of GDB's type main_type structure Date: Mon, 8 Feb 2021 22:58:33 +0000 Message-Id: <20210208225833.98235-1-andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 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: Mon, 08 Feb 2021 22:58:39 -0000 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 made an attempt at writing a test to do some basic testing of the gdb-gdb.py helper script. The new test checks that the pretty printers for GDB's type structures all work. We can extend this test later as needed. 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. --- gdb/ChangeLog | 6 ++ gdb/gdb-gdb.py.in | 6 +- gdb/testsuite/ChangeLog | 4 + gdb/testsuite/gdb.gdb/python-helper.exp | 138 ++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 gdb/testsuite/gdb.gdb/python-helper.exp 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..5753666a9e7 --- /dev/null +++ b/gdb/testsuite/gdb.gdb/python-helper.exp @@ -0,0 +1,138 @@ +# 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 + + # 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. + send_inferior "set prompt (xgdb) \n" + set msg "Set xgdb_prompt" + gdb_test_multiple "" $msg { + -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" { + pass $msg + } + } + + # Send a command to the outer gdb to continue the inner gdb. + gdb_test_multiple "continue" "start inner gdb" { + -re "\r\n$gdb_prompt $" { + pass $gdb_test_name + } + } + + # Send a command to the inner GDB, this should result in the outer + # GDB stopping at the breakpoint we just created. + gdb_test_multiple "print 1" "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 -- 2.25.4