From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by sourceware.org (Postfix) with ESMTPS id 0BD04396D83D for ; Thu, 2 Jun 2022 14:29:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0BD04396D83D X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="258036238" X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="258036238" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:05 -0700 X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="707585651" Received: from labpc2407.iul.intel.com (HELO localhost) ([172.28.50.61]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:04 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Subject: [PATCH v5 07/15] gdb, python: use gdbarch_iterate_over_objfiles_in_search_order Date: Thu, 2 Jun 2022 15:25:06 +0200 Message-Id: <20220602132514.957983-8-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220602132514.957983-1-markus.t.metzger@intel.com> References: <20220602132514.957983-1-markus.t.metzger@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 14:29:09 -0000 The implementation of gdb.lookup_objfile() iterates over all objfiles and compares their name or build id to the user-provided search string. This will cause problems when supporting linker namespaces as the first objfile in any namespace will be found. Instead, use gdbarch_iterate_over_objfiles_in_search_order to only consider the namespace of gdb.current_objfile() for the search, which defaults to the initial namespace when gdb.current_objfile() is None. --- gdb/python/py-objfile.c | 116 +++++++++++++++++++--------------------- gdb/python/python.c | 7 +-- gdb/python/python.h | 6 +++ 3 files changed, 64 insertions(+), 65 deletions(-) diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 3e3270e7cd3..b278cec99d8 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -24,6 +24,7 @@ #include "language.h" #include "build-id.h" #include "symtab.h" +#include "python.h" struct objfile_object { @@ -559,57 +560,6 @@ objfpy_build_id_matches (const struct bfd_build_id *build_id, return 1; } -/* Subroutine of gdbpy_lookup_objfile to simplify it. - Look up an objfile by its file name. */ - -static struct objfile * -objfpy_lookup_objfile_by_name (const char *name) -{ - for (objfile *objfile : current_program_space->objfiles ()) - { - const char *filename; - - if ((objfile->flags & OBJF_NOT_FILENAME) != 0) - continue; - /* Don't return separate debug files. */ - if (objfile->separate_debug_objfile_backlink != NULL) - continue; - - filename = objfile_filename (objfile); - if (filename != NULL && compare_filenames_for_search (filename, name)) - return objfile; - if (compare_filenames_for_search (objfile->original_name, name)) - return objfile; - } - - return NULL; -} - -/* Subroutine of gdbpy_lookup_objfile to simplify it. - Look up an objfile by its build id. */ - -static struct objfile * -objfpy_lookup_objfile_by_build_id (const char *build_id) -{ - for (objfile *objfile : current_program_space->objfiles ()) - { - const struct bfd_build_id *obfd_build_id; - - if (objfile->obfd == NULL) - continue; - /* Don't return separate debug files. */ - if (objfile->separate_debug_objfile_backlink != NULL) - continue; - obfd_build_id = build_id_bfd_get (objfile->obfd); - if (obfd_build_id == NULL) - continue; - if (objfpy_build_id_matches (obfd_build_id, build_id)) - return objfile; - } - - return NULL; -} - /* Implementation of gdb.lookup_objfile. */ PyObject * @@ -619,7 +569,6 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) const char *name; PyObject *by_build_id_obj = NULL; int by_build_id; - struct objfile *objfile; if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|O!", keywords, &name, &PyBool_Type, &by_build_id_obj)) @@ -635,17 +584,64 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw) by_build_id = cmp; } - if (by_build_id) + if (by_build_id && !objfpy_build_id_ok (name)) { - if (!objfpy_build_id_ok (name)) - { - PyErr_SetString (PyExc_TypeError, _("Not a valid build id.")); - return NULL; - } - objfile = objfpy_lookup_objfile_by_build_id (name); + PyErr_SetString (PyExc_TypeError, _("Not a valid build id.")); + return NULL; } + + struct objfile *objfile = nullptr; + if (by_build_id) + gdbarch_iterate_over_objfiles_in_search_order + (target_gdbarch (), + [&objfile, name] (struct objfile *obj) + { + /* Don't return separate debug files. */ + if (obj->separate_debug_objfile_backlink != nullptr) + return 0; + + bfd *obfd = obj->obfd; + if (obfd == nullptr) + return 0; + + const bfd_build_id *obfd_build_id = build_id_bfd_get (obfd); + if (obfd_build_id == nullptr) + return 0; + + if (!objfpy_build_id_matches (obfd_build_id, name)) + return 0; + + objfile = obj; + return 1; + }, gdbpy_current_objfile); else - objfile = objfpy_lookup_objfile_by_name (name); + gdbarch_iterate_over_objfiles_in_search_order + (target_gdbarch (), + [&objfile, name] (struct objfile *obj) + { + /* Don't return separate debug files. */ + if (obj->separate_debug_objfile_backlink != nullptr) + return 0; + + if ((obj->flags & OBJF_NOT_FILENAME) != 0) + return 0; + + const char *filename = objfile_filename (obj); + if (filename != NULL + && compare_filenames_for_search (filename, name)) + { + objfile = obj; + return 1; + } + + if (compare_filenames_for_search (obj->original_name, name)) + { + objfile = obj; + return 1; + } + + return 0; + }, gdbpy_current_objfile); if (objfile != NULL) return objfile_to_objfile_object (objfile).release (); diff --git a/gdb/python/python.c b/gdb/python/python.c index 9bef2252e88..ba6fdc455b7 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1581,11 +1581,8 @@ gdbpy_current_language (PyObject *unused1, PyObject *unused2) -/* The "current" objfile. This is set when gdb detects that a new - objfile has been loaded. It is only set for the duration of a call to - gdbpy_source_objfile_script and gdbpy_execute_objfile_script; it is NULL - at other times. */ -static struct objfile *gdbpy_current_objfile; +/* See python.h. */ +struct objfile *gdbpy_current_objfile; /* Set the current objfile to OBJFILE and then read FILE named FILENAME as Python code. This does not throw any errors. If an exception diff --git a/gdb/python/python.h b/gdb/python/python.h index 4b150c36a9e..2be83ba2da6 100644 --- a/gdb/python/python.h +++ b/gdb/python/python.h @@ -28,4 +28,10 @@ extern const struct extension_language_defn extension_language_python; /* Command element for the 'python' command. */ extern cmd_list_element *python_cmd_element; +/* The "current" objfile. This is set when gdb detects that a new + objfile has been loaded. It is only set for the duration of a call to + gdbpy_source_objfile_script and gdbpy_execute_objfile_script; it is NULL + at other times. */ +extern struct objfile *gdbpy_current_objfile; + #endif /* PYTHON_PYTHON_H */ -- 2.35.3 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