From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.195]) by sourceware.org (Postfix) with ESMTPS id 34B983948A8D for ; Fri, 28 Aug 2020 16:23:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 34B983948A8D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id C9E794F38A for ; Fri, 28 Aug 2020 11:23:54 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id BhAQkSoWsdbRzBhAQkHz8U; Fri, 28 Aug 2020 11:23:54 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NWzxh1y/jW0PWQOc8e9IYJDq8G91wUEy1bmsx6vLCjI=; b=cmfTVN1FKMgQE5H6ydhIb+fibA knTflp5o5Z1REaUhYObXwZNXaD3ndxG22ENg8xyl5c+gLuIb8dmsODZZedC70PzQiUPR+lM7lFZmF R1fKlFEpfZVWulfFMsKkB8JzB; Received: from 71-218-12-75.hlrn.qwest.net ([71.218.12.75]:33904 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kBhAQ-002WJo-Hd; Fri, 28 Aug 2020 10:23:54 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 08/13] Use gdb_bfd_sections in ELF osabi tag sniffing Date: Fri, 28 Aug 2020 10:23:44 -0600 Message-Id: <20200828162349.987-9-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200828162349.987-1-tom@tromey.com> References: <20200828162349.987-1-tom@tromey.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.218.12.75 X-Source-L: No X-Exim-ID: 1kBhAQ-002WJo-Hd X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-218-12-75.hlrn.qwest.net (bapiya.Home) [71.218.12.75]:33904 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3035.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, 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: Fri, 28 Aug 2020 16:23:56 -0000 This changes some ELF osabi tag-sniffing functions to avoid bfd_map_over_sections, in favor of iteration. I could only readily test the generic one. gdb/ChangeLog 2020-08-28 Tom Tromey * osabi.h (generic_elf_osabi_sniff_abi_tag_sections): Update. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Change parameters. (generic_elf_osabi_sniffer): Use foreach. * mips-sde-tdep.c (mips_sde_elf_osabi_sniffer): Use foreach. * arm-tdep.c (arm_elf_osabi_sniffer): Use foreach. --- gdb/ChangeLog | 9 +++++++++ gdb/arm-tdep.c | 7 ++++--- gdb/mips-sde-tdep.c | 5 ++--- gdb/osabi.c | 10 +++++----- gdb/osabi.h | 6 +++--- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 074eedb4800..962ad1a40bc 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -8754,9 +8754,10 @@ arm_elf_osabi_sniffer (bfd *abfd) if (elfosabi == ELFOSABI_ARM) /* GNU tools use this value. Check note sections in this case, as well. */ - bfd_map_over_sections (abfd, - generic_elf_osabi_sniff_abi_tag_sections, - &osabi); + { + for (asection *sect : gdb_bfd_sections (abfd)) + generic_elf_osabi_sniff_abi_tag_sections (abfd, sect, &osabi); + } /* Anything else will be handled by the generic ELF sniffer. */ return osabi; diff --git a/gdb/mips-sde-tdep.c b/gdb/mips-sde-tdep.c index 685c3c7263c..1d282c219e5 100644 --- a/gdb/mips-sde-tdep.c +++ b/gdb/mips-sde-tdep.c @@ -226,9 +226,8 @@ mips_sde_elf_osabi_sniffer (bfd *abfd) /* If the generic sniffer gets a hit, return and let other sniffers get a crack at it. */ - bfd_map_over_sections (abfd, - generic_elf_osabi_sniff_abi_tag_sections, - &osabi); + for (asection *sect : gdb_bfd_sections (abfd)) + generic_elf_osabi_sniff_abi_tag_sections (abfd, sect, &osabi); if (osabi != GDB_OSABI_UNKNOWN) return GDB_OSABI_UNKNOWN; diff --git a/gdb/osabi.c b/gdb/osabi.c index 627b9d98151..e8a813b62f2 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -23,6 +23,7 @@ #include "arch-utils.h" #include "gdbcmd.h" #include "command.h" +#include "gdb_bfd.h" #include "elf-bfd.h" @@ -439,9 +440,9 @@ check_note (bfd *abfd, asection *sect, char *note, unsigned int *sectsize, /* Generic sniffer for ELF flavoured files. */ void -generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj) +generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, + enum gdb_osabi *osabi) { - enum gdb_osabi *osabi = (enum gdb_osabi *) obj; const char *name; unsigned int sectsize; char *note; @@ -561,9 +562,8 @@ generic_elf_osabi_sniffer (bfd *abfd) /* And likewise ELFOSABI_HPUX. For some reason the default value for the EI_OSABI field is ELFOSABI_HPUX for all PA-RISC targets (with the exception of GNU/Linux). */ - bfd_map_over_sections (abfd, - generic_elf_osabi_sniff_abi_tag_sections, - &osabi); + for (asection *sect : gdb_bfd_sections (abfd)) + generic_elf_osabi_sniff_abi_tag_sections (abfd, sect, &osabi); break; case ELFOSABI_FREEBSD: diff --git a/gdb/osabi.h b/gdb/osabi.h index a7e6a10d019..9b7ab1818c0 100644 --- a/gdb/osabi.h +++ b/gdb/osabi.h @@ -86,8 +86,8 @@ const char *gdbarch_osabi_name (enum gdb_osabi); const char *osabi_triplet_regexp (enum gdb_osabi osabi); /* Helper routine for ELF file sniffers. This looks at ABI tag note - sections to determine the OS ABI from the note. It should be called - via bfd_map_over_sections. */ -void generic_elf_osabi_sniff_abi_tag_sections (bfd *, asection *, void *); + sections to determine the OS ABI from the note. */ +void generic_elf_osabi_sniff_abi_tag_sections (bfd *, asection *, + enum gdb_osabi *); #endif /* OSABI_H */ -- 2.17.2