From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id CC76F3858C55; Sat, 20 Aug 2022 22:32:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CC76F3858C55 Received: by mail-pf1-x42f.google.com with SMTP id 83so1501673pfw.6; Sat, 20 Aug 2022 15:32:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc; bh=IGs3EukBOWi98JD41xHdgPhMtboMu6gmCI1enXuzzn8=; b=VI7dviC0CW9rSBcg5cAh/cfkszeEJ4krUG6cj+J/OuIsTdoBrSlSK778D+BVWPKLBK AWapNk9DpEjVfTiHgH7iE4DL51XLiHBBwGl8Gh5VV8S0MEVRaW23SpYeCiJrydZ/7/WK 5wL7e706Ty/48Hc58dslRbyMzzUdoeiAte34tJvV58doAlhWRqnbkjvz+LNMOERikUhH 3O/BfrjZ8t3t/DkYJUdRm7tljhVexMTeNPaoju9UtPBWd8h4lE2XpFkDuAUeX8nOBv9q zgtddrH9lMC61/doSAiaKxOzK022wkL344g95gpxNkndax0979zH/uOchOMs6YydENeT fxLQ== X-Gm-Message-State: ACgBeo1OT/n4VrSyHtHK3aTf6rFcYcikB8p8W0Gsx8s3olpLeRube+Ia twRbgLbThTZuFo1tnD4R4DAPDTl8PKU= X-Google-Smtp-Source: AA6agR6fWlzJlYJjogDANXV3NOxSrf2Tlq/sCPWtOI16lzMHTlmpqdti+choyAZZrJMzFKDFFvt8Ew== X-Received: by 2002:a63:521a:0:b0:42a:560b:8767 with SMTP id g26-20020a63521a000000b0042a560b8767mr6131520pgb.158.1661034749644; Sat, 20 Aug 2022 15:32:29 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:6b69:9289:9237:9161]) by smtp.gmail.com with ESMTPSA id j15-20020a170903024f00b0015e8d4eb1d7sm5482316plh.33.2022.08.20.15.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 15:32:29 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 8A3CE1140CF5; Sun, 21 Aug 2022 08:02:26 +0930 (ACST) Date: Sun, 21 Aug 2022 08:02:26 +0930 From: Alan Modra To: binutils@sourceware.org Cc: gdb-patches@sourceware.org Subject: symbols for bfd_simple_get_relocated_section_contents Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3035.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2022 22:32:33 -0000 If symbols are provided by the caller of this function they are passed on to bfd_get_relocated_section_contents. No surprises there. It gets a little weird if they are not provided. In that case they are read from the bfd by _bfd_generic_link_add_symbols, and global symbols are added to the generic linker hash table. Global symbols are not added to the linker hash table if symbols *are* provided. Now the linker hash table symbols are not used by the generic bfd_get_relocated_section_conents, and also not by most target versions when called from bfd_simple_get_relocated_section_contents except for symbols like "_gp". So it mostly doesn't matter whether symbols are in the linker hash table, but it's odd that there is a difference. We could always add them, but I'm inclined to think that is unnecessary work so this patch always leaves them out. cc'ing the gdb list since the uses in gdb/symfile.c and gdb/machoread.c are possibly affected. Also, symbols are canonicalized and written into a malloc'd buffer. The buffer isn't freed, see commit 8e16317ca5eb. I don't know whether that matters any more, but in any case I can't see why we need another copy of the symbols when _bfd_generic_link_read_symbols has already cached symbols. * simple.c (bfd_simple_get_relocated_section_contents): If not provided, read symbols via bfd_generic_link_read_symbols. Do not create another copy of symbols. Tidy failure exits. Minor tidy of bfd_get_relocated_section_contents and bfd_get_full_section_contents arguments. diff --git a/bfd/simple.c b/bfd/simple.c index 6ccafd2259d..67e326d4625 100644 --- a/bfd/simple.c +++ b/bfd/simple.c @@ -23,6 +23,7 @@ #include "bfd.h" #include "libbfd.h" #include "bfdlink.h" +#include "genlink.h" static void simple_dummy_add_to_set (struct bfd_link_info * info ATTRIBUTE_UNUSED, @@ -209,7 +210,6 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, struct bfd_link_order link_order; struct bfd_link_callbacks callbacks; bfd_byte *contents, *data; - int storage_needed; struct saved_offsets saved_offsets; bfd *link_next; @@ -218,10 +218,9 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, if ((abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC)) != HAS_RELOC || ! (sec->flags & SEC_RELOC)) { - contents = outbuf; - if (!bfd_get_full_section_contents (abfd, sec, &contents)) + if (!bfd_get_full_section_contents (abfd, sec, &outbuf)) return NULL; - return contents; + return outbuf; } /* In order to use bfd_get_relocated_section_contents, we need @@ -259,16 +258,13 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, link_order.u.indirect.section = sec; data = NULL; + contents = NULL; if (outbuf == NULL) { bfd_size_type amt = sec->rawsize > sec->size ? sec->rawsize : sec->size; data = (bfd_byte *) bfd_malloc (amt); if (data == NULL) - { - _bfd_generic_link_hash_table_free (abfd); - abfd->link.next = link_next; - return NULL; - } + goto out1; outbuf = data; } @@ -276,37 +272,29 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, saved_offsets.sections = malloc (sizeof (*saved_offsets.sections) * saved_offsets.section_count); if (saved_offsets.sections == NULL) - { - free (data); - _bfd_generic_link_hash_table_free (abfd); - abfd->link.next = link_next; - return NULL; - } + goto out2; bfd_map_over_sections (abfd, simple_save_output_info, &saved_offsets); if (symbol_table == NULL) { - _bfd_generic_link_add_symbols (abfd, &link_info); - - storage_needed = bfd_get_symtab_upper_bound (abfd); - symbol_table = (asymbol **) bfd_malloc (storage_needed); - bfd_canonicalize_symtab (abfd, symbol_table); + if (!bfd_generic_link_read_symbols (abfd)) + goto out3; + symbol_table = _bfd_generic_link_get_symbols (abfd); } - else - storage_needed = 0; contents = bfd_get_relocated_section_contents (abfd, &link_info, &link_order, outbuf, - 0, + false, symbol_table); - if (contents == NULL) - free (data); - + out3: bfd_map_over_sections (abfd, simple_restore_output_info, &saved_offsets); free (saved_offsets.sections); - + out2: + if (contents == NULL) + free (data); + out1: _bfd_generic_link_hash_table_free (abfd); abfd->link.next = link_next; return contents; -- Alan Modra Australia Development Lab, IBM