From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id E61B5389200A for ; Tue, 1 Dec 2020 08:39:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E61B5389200A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-2Cel6nuUMWGffVa2WJR4WQ-1; Tue, 01 Dec 2020 03:39:05 -0500 X-MC-Unique: 2Cel6nuUMWGffVa2WJR4WQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF58C1084427 for ; Tue, 1 Dec 2020 08:39:04 +0000 (UTC) Received: from hostfoo.redhat.com (ovpn-112-220.ams2.redhat.com [10.36.112.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F5A018993 for ; Tue, 1 Dec 2020 08:39:04 +0000 (UTC) From: tbaeder@redhat.com To: elfutils-devel@sourceware.org Subject: [PATCH 2/3] link_map: Pull read_addrs() in file scope Date: Tue, 1 Dec 2020 09:38:53 +0100 Message-Id: <20201201083854.1870943-3-tbaeder@redhat.com> In-Reply-To: <20201201083854.1870943-1-tbaeder@redhat.com> References: <20201201083854.1870943-1-tbaeder@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-15.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2020 08:39:09 -0000 From: Timm Bäder Get rid of another nested function this way --- libdwfl/link_map.c | 114 ++++++++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 48 deletions(-) diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c index 5c39c631..64baaec4 100644 --- a/libdwfl/link_map.c +++ b/libdwfl/link_map.c @@ -237,6 +237,64 @@ release_buffer (Dwfl *dwfl, return result; } +static inline bool +read_addrs (Dwfl *dwfl, + Dwfl_Memory_Callback *memory_callback, + void *memory_callback_arg, + void **buffer, + size_t *buffer_available, + GElf_Addr vaddr, GElf_Addr *read_vaddr, + size_t n, + uint_fast8_t elfclass, + uint_fast8_t elfdata, + GElf_Addr *addrs /* [4] */) +{ + size_t nb = n * addrsize (elfclass); /* Address words -> bytes to read. */ + + /* Read a new buffer if the old one doesn't cover these words. */ + if (buffer == NULL + || vaddr < *read_vaddr + || vaddr - (*read_vaddr) + nb > *buffer_available) + { + release_buffer (dwfl, memory_callback, memory_callback_arg, + buffer, buffer_available, 0); + + *read_vaddr = vaddr; + int segndx = INTUSE(dwfl_addrsegment) (dwfl, vaddr, NULL); + if (unlikely (segndx < 0) + || unlikely (! (*memory_callback) (dwfl, segndx, + buffer, buffer_available, + vaddr, nb, memory_callback_arg))) + return true; + } + + Elf32_Addr (*a32)[n] = vaddr - (*read_vaddr) + *buffer; + Elf64_Addr (*a64)[n] = (void *) a32; + + if (elfclass == ELFCLASS32) + { + if (elfdata == ELFDATA2MSB) + for (size_t i = 0; i < n; ++i) + addrs[i] = BE32 (read_4ubyte_unaligned_noncvt (&(*a32)[i])); + else + for (size_t i = 0; i < n; ++i) + addrs[i] = LE32 (read_4ubyte_unaligned_noncvt (&(*a32)[i])); + } + else + { + if (elfdata == ELFDATA2MSB) + for (size_t i = 0; i < n; ++i) + addrs[i] = BE64 (read_8ubyte_unaligned_noncvt (&(*a64)[i])); + else + for (size_t i = 0; i < n; ++i) + addrs[i] = LE64 (read_8ubyte_unaligned_noncvt (&(*a64)[i])); + } + + return false; +} + + + /* Report a module for each struct link_map in the linked list at r_map in the struct r_debug at R_DEBUG_VADDR. For r_debug_info description see dwfl_link_map_report in libdwflP.h. If R_DEBUG_INFO is not NULL then no @@ -262,54 +320,12 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata, void *buffer = NULL; size_t buffer_available = 0; - GElf_Addr addrs[4]; - inline bool read_addrs (GElf_Addr vaddr, size_t n) - { - size_t nb = n * addrsize (elfclass); /* Address words -> bytes to read. */ - - /* Read a new buffer if the old one doesn't cover these words. */ - if (buffer == NULL - || vaddr < read_vaddr - || vaddr - read_vaddr + nb > buffer_available) - { - release_buffer (dwfl, memory_callback, memory_callback_arg, - &buffer, &buffer_available, 0); - - read_vaddr = vaddr; - int segndx = INTUSE(dwfl_addrsegment) (dwfl, vaddr, NULL); - if (unlikely (segndx < 0) - || unlikely (! (*memory_callback) (dwfl, segndx, - &buffer, &buffer_available, - vaddr, nb, memory_callback_arg))) - return true; - } - - Elf32_Addr (*a32)[n] = vaddr - read_vaddr + buffer; - Elf64_Addr (*a64)[n] = (void *) a32; - - if (elfclass == ELFCLASS32) - { - if (elfdata == ELFDATA2MSB) - for (size_t i = 0; i < n; ++i) - addrs[i] = BE32 (read_4ubyte_unaligned_noncvt (&(*a32)[i])); - else - for (size_t i = 0; i < n; ++i) - addrs[i] = LE32 (read_4ubyte_unaligned_noncvt (&(*a32)[i])); - } - else - { - if (elfdata == ELFDATA2MSB) - for (size_t i = 0; i < n; ++i) - addrs[i] = BE64 (read_8ubyte_unaligned_noncvt (&(*a64)[i])); - else - for (size_t i = 0; i < n; ++i) - addrs[i] = LE64 (read_8ubyte_unaligned_noncvt (&(*a64)[i])); - } - - return false; - } + GElf_Addr addrs[4] = { 0, 0, 0, 0 }; - if (unlikely (read_addrs (read_vaddr, 1))) + if (unlikely (read_addrs (dwfl, memory_callback, memory_callback_arg, + &buffer, &buffer_available, + read_vaddr, &read_vaddr, 1, + elfclass, elfdata, addrs))) release_buffer (dwfl, memory_callback, memory_callback_arg, &buffer, &buffer_available, -1); @@ -326,7 +342,9 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata, size_t iterations = 0; while (next != 0 && ++iterations < dwfl->lookup_elts) { - if (read_addrs (next, 4)) + if (read_addrs (dwfl, memory_callback, memory_callback_arg, + &buffer, &buffer_available, + next, &read_vaddr, 4, elfclass, elfdata, addrs)) return release_buffer (dwfl, memory_callback, memory_callback_arg, &buffer, &buffer_available, -1); -- 2.26.2