From patchwork Wed Aug 10 20:14:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 56671 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D53273858005 for ; Wed, 10 Aug 2022 20:15:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D53273858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1660162501; bh=sP3I9l1YTLI2qMjjsEhiIJKfdCerod5FLGmOOuRzjg0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=YdYWZ+eJ2hWLRkse9M6A0nG/lCP20D98fETTc01S2JhoA4ySIawN0d5rqaWUsJJ3H 1Maj4egSXZW0CglGCPbSnJxe1HnG5ONGHsWNLmLPw2kU+p/MmMoor/r9XraVBzCjlk 7joVYcWsYusF5ufr4bM5ef4pcXs7z/HTr4WgvTag= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x92f.google.com (mail-ua1-x92f.google.com [IPv6:2607:f8b0:4864:20::92f]) by sourceware.org (Postfix) with ESMTPS id DBDDA38582B3 for ; Wed, 10 Aug 2022 20:14:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DBDDA38582B3 Received: by mail-ua1-x92f.google.com with SMTP id r12so6211158uaf.7 for ; Wed, 10 Aug 2022 13:14:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=sP3I9l1YTLI2qMjjsEhiIJKfdCerod5FLGmOOuRzjg0=; b=bwCpLXA5B8awbTGCUCMo3g+mz0tQXCr1uYpNsBMMT5vFJbKsIwV0EjmrgCggLZ3Aib zOFkyHKwLKtTDArX5C1qPVGuL2Sg+iLJMxZ9W/Uq5rTzThDyRDXVxD+VQa0XQ1Lfusjb V+017Z3IlAVwkXNuin8JKyeJENEI5+KFxPNGoX7g1uG590UJuFEvvcR/SO8Foi7woub+ 8cQT9ffbNovkDJdujLv0gaFFuNsGZ6+l2IzIc1QZwhBAiaXWfHwN8WhNWW7NXLhogZT8 5JXayqqGNfmll19myA0puT4korPDQCeNT3DCimDfD8t5PVXUQ8v0T99l9znrlfLulQRr fTxg== X-Gm-Message-State: ACgBeo2aNOOkQEJStwhzHOJdBUccBvApPSRHIC1CBlbrtLBCI9+DVuQf gUl7eE2Cz3ol9unm4R5NJiS1lrmBrfKEmw== X-Google-Smtp-Source: AA6agR5LMYiKxQASU2kT7j/IjS/xh9HqREigZqfw5gOYW/tQOVx/j/Esc/G+5UaC3t4vsM5d6+frjw== X-Received: by 2002:ab0:3bc6:0:b0:381:c4db:ef5 with SMTP id q6-20020ab03bc6000000b00381c4db0ef5mr13656069uaw.81.1660162477961; Wed, 10 Aug 2022 13:14:37 -0700 (PDT) Received: from mandiga.. ([2804:431:c7ca:930b:405a:6d95:e89e:4020]) by smtp.gmail.com with ESMTPSA id y66-20020a1fc845000000b0037728210d2esm533523vkf.38.2022.08.10.13.14.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 13:14:37 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] arm: Remove nested functionf rom relocate_pc24 Date: Wed, 10 Aug 2022 17:14:34 -0300 Message-Id: <20220810201434.2841487-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Checked on arm-linux-gnueabihf. --- sysdeps/arm/dl-machine.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 4e78d8fb0e..b0521c1549 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -227,6 +227,16 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, #define ARCH_LA_PLTEXIT arm_gnu_pltexit #ifdef RESOLVE_MAP +/* Set NEW_VALUE based on V, and return true iff it overflows 24 bits. */ +static inline bool set_new_value (Elf32_Addr *new_value, Elf32_Addr v, + Elf32_Addr *const reloc_addr, + Elf32_Sword addend) +{ + *new_value = v + addend - (Elf32_Addr) reloc_addr; + Elf32_Addr topbits = *new_value & 0xfe000000; + return topbits != 0xfe000000 && topbits != 0x00000000; +} + /* Handle a PC24 reloc, including the out-of-range case. */ static void relocate_pc24 (struct link_map *map, Elf32_Addr value, @@ -234,15 +244,7 @@ relocate_pc24 (struct link_map *map, Elf32_Addr value, { Elf32_Addr new_value; - /* Set NEW_VALUE based on V, and return true iff it overflows 24 bits. */ - inline bool set_new_value (Elf32_Addr v) - { - new_value = v + addend - (Elf32_Addr) reloc_addr; - Elf32_Addr topbits = new_value & 0xfe000000; - return topbits != 0xfe000000 && topbits != 0x00000000; - } - - if (set_new_value (value)) + if (set_new_value (&new_value, value, reloc_addr, addend)) { /* The PC-relative address doesn't fit in 24 bits! */ @@ -271,7 +273,8 @@ relocate_pc24 (struct link_map *map, Elf32_Addr value, fix_offset = 0; } - if (set_new_value ((Elf32_Addr) fix_address)) + if (set_new_value (&new_value, (Elf32_Addr) fix_address, reloc_addr, + addend)) _dl_signal_error (0, map->l_name, NULL, "R_ARM_PC24 relocation out of range"); }