From patchwork Mon May 8 04:35:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 90934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1908518vqo; Sun, 7 May 2023 21:35:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4SL/4UMp2iUdJ4XIu6MZEr5/BjgA2dmGOiQpH6QBW+Oc8D7kO93Pt2vl98XniuDsFYkgkY X-Received: by 2002:a17:906:9b95:b0:961:272d:bdb8 with SMTP id dd21-20020a1709069b9500b00961272dbdb8mr8584297ejc.73.1683520558628; Sun, 07 May 2023 21:35:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683520558; cv=none; d=google.com; s=arc-20160816; b=OqEpQUT8m7k9LQXZUtmBUQl45d9tFJjF0y7KCiwPFIrdEoR2zj6SZzqSpxsahc6WR3 2vLvAN1w3m/B5QC5Ln4mX6WtP5hQeRtnQSpKNHF3yFyz1fA8vMeC1e3eUzOhgF2CwUcv eLDR7HSrzAvrpgIEUYHw3SrwBgn7SYjE4D4fW29+Zt9go2+0GN0RNP/WcAjZ0BXWoX9l l8hcEp2RZQUl6NP5QiNkaPPmwQ7ksQbXQFZ4s/v3OUAZPHGeGhG3C4s5xLksXKo3j60F fPikTOPXbSAbdZlAF8A72fwEg0aB/sUjGh2LABZCjR4ly5Kkv2ERiOKHEaJ/pIji1ppi kpmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=PLJQZ7KBx/LIBAOrycRBfFB58BNj9BxlwpdvGNaSL4Y=; b=F/kRTD+NOOgn0h+kfbEs0MQjV6fQxG0HMtS4/LJmqS6w3VR7f4cSiHZSvMgrP3nkD5 CZKzqihmlP8jzOHhi6gSPNx6AHRGDHF/xa0pPBx91+6Ghg8mQXx4IVuZeN1DOE8s62o8 ry+g+tJ7dUVDcMFdHXqY9k97vqpau5ns5RSiI15UugNviY2x5aKRdYyB63TRyhvg+/nB yBSUpqbT4dK/kE9Hl7T97sebJfs5byscdjnPOD6xeQI+eHqKqTNojQ+E/VvMG6Us5C8o mIt2eWVU337OlXr76iRrCAZn2nlDhNV/xFCvg2/zhDb4zfA0VZatKZeNurrw10x2cMEI rMKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=I80+PKL0; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o13-20020aa7c50d000000b0050bc8b15758si7901467edq.491.2023.05.07.21.35.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 21:35:58 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=I80+PKL0; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B4925385770B for ; Mon, 8 May 2023 04:35:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4925385770B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683520552; bh=PLJQZ7KBx/LIBAOrycRBfFB58BNj9BxlwpdvGNaSL4Y=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=I80+PKL0B+op/AciEI13bZrMzOzAfPMAegBEchasYWJxMPFgXQTi2wVcZAzyCyR4F aC4sWAoRQj9cIqeSD9AGeuBA+0EwdN6kSJRAqZlSHDmeH6UiDwaopNJqP9fsbeehLR RqWgm2LBPPV6IJGIeCiqVmyzSeD8zxGIUjjt/z/M= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id A382B3858D32 for ; Mon, 8 May 2023 04:35:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A382B3858D32 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1aaec9ad820so38096545ad.0 for ; Sun, 07 May 2023 21:35:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683520517; x=1686112517; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PLJQZ7KBx/LIBAOrycRBfFB58BNj9BxlwpdvGNaSL4Y=; b=bPbHsiBwaQilomS0iH4vEmNN4bbq/86PYA2V/S7NzGT2Uj5lZSrpNLt/RTdPQ5PODA +vcw6cKEqDNG5XfJvrqjbQFlE0EM0rXMvkInB5xbbkprBNpbQ5E2sA9zugUkIc/8y5XA YZH9m1Vp5/XPySJH81ukv/9m1owV8+orcMzOjVqZztmmlNg+cTW0d3zHQlm1doyJ9R3E STvseHiUfJRJ5oAvMXBqi1s3j0POCudvlHHJEHpkt0hpT1dOH1XgBQyWU1SJtSmXbJ4O tmKIzpZcMY2N2z1P6EWhL2uzzyrheJhG2cc7ST+6Gl2a1rlS5WauYw8i8qa8XYMpHVeG O3Sg== X-Gm-Message-State: AC+VfDyPfWkoIKOiOxyUODzwhjnyHrl3Ur5PGa/WE1CpWjKQ4SIsxPd+ Iu8TiQx4RkiUHQqVoNXbfKw7HmsrQcg= X-Received: by 2002:a17:902:da88:b0:1a6:d9de:1887 with SMTP id j8-20020a170902da8800b001a6d9de1887mr11925007plx.53.1683520516952; Sun, 07 May 2023 21:35:16 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id w5-20020a170902d3c500b001a6e9d170b8sm6005464plb.265.2023.05.07.21.35.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 21:35:16 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id D7AFC1142DAA; Mon, 8 May 2023 14:05:13 +0930 (ACST) Date: Mon, 8 May 2023 14:05:13 +0930 To: binutils@sourceware.org Subject: pe.em and pep.em make_import_fixup Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3034.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-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765299253732117643?= X-GMAIL-MSGID: =?utf-8?q?1765299253732117643?= This is a little cleanup that I made when looking at pr30343 that makes it more obvious that make_import_fixup in both files are identical (and in fact the new pep.em read_addend could be used in both files). * emultempl/pep.em (read_addend): Extract from.. (make_import_fixup): ..here. * emultempl/pe.em (read_addend): Similarly. (make_import_fixup): Similarly. Add debug code from pep.em. diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 4fe0cf203fb..38cb61138bd 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -1236,23 +1236,42 @@ pe_fixup_stdcalls (void) } } +static bfd_vma +read_addend (arelent *rel, asection *s) +{ + char buf[4]; + bfd_vma addend = 0; + + if (!bfd_get_section_contents (s->owner, s, buf, rel->address, sizeof (buf))) + einfo (_("%P: %C: cannot get section contents - auto-import exception\n"), + s->owner, s, rel->address); + else + addend = bfd_get_32 (s->owner, buf); + return addend; +} + static void make_import_fixup (arelent *rel, asection *s, char *name, const char *symname) { struct bfd_symbol *sym = *rel->sym_ptr_ptr; - char addend[4]; - bfd_vma _addend; + bfd_vma addend; if (pe_dll_extra_pe_debug) printf ("arelent: %s@%#lx: add=%li\n", sym->name, (unsigned long) rel->address, (long) rel->addend); - if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend))) - einfo (_("%P: %C: cannot get section contents - auto-import exception\n"), - s->owner, s, rel->address); + addend = read_addend (rel, s); + + if (pe_dll_extra_pe_debug) + { + printf ("import of 0x%lx(0x%lx) sec_addr=0x%lx", + (long) addend, (long) rel->addend, (long) rel->address); + if (rel->howto->pc_relative) + printf (" pcrel"); + printf (" %d bit rel.\n", (int) rel->howto->bitsize); + } - _addend = bfd_get_32 (s->owner, addend); - pe_create_import_fixup (rel, s, _addend, name, symname); + pe_create_import_fixup (rel, s, addend, name, symname); } static void diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 5770df8ed0a..32883b27706 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1197,63 +1197,80 @@ pep_fixup_stdcalls (void) } } -static void -make_import_fixup (arelent *rel, asection *s, char *name, const char *symname) +static bfd_vma +read_addend (arelent *rel, asection *s) { - struct bfd_symbol *sym = *rel->sym_ptr_ptr; - char addend[8]; - bfd_vma _addend = 0; - int suc = 0; + char buf[8]; + bfd_vma addend = 0; + bool ok = false; - if (pep_dll_extra_pe_debug) - printf ("arelent: %s@%#lx: add=%li\n", sym->name, - (unsigned long) rel->address, (long) rel->addend); - - memset (addend, 0, sizeof (addend)); - switch ((rel->howto->bitsize)) + switch (rel->howto->bitsize) { case 8: - suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 1); - if (suc && rel->howto->pc_relative) - _addend = bfd_get_signed_8 (s->owner, addend); - else if (suc) - _addend = bfd_get_8 (s->owner, addend); + ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 1); + if (ok) + { + if (rel->howto->pc_relative) + addend = bfd_get_signed_8 (s->owner, buf); + else + addend = bfd_get_8 (s->owner, buf); + } break; case 16: - suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 2); - if (suc && rel->howto->pc_relative) - _addend = bfd_get_signed_16 (s->owner, addend); - else if (suc) - _addend = bfd_get_16 (s->owner, addend); + ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 2); + if (ok) + { + if (rel->howto->pc_relative) + addend = bfd_get_signed_16 (s->owner, buf); + else + addend = bfd_get_16 (s->owner, buf); + } break; case 26: case 32: - suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 4); - if (suc && rel->howto->pc_relative) - _addend = bfd_get_signed_32 (s->owner, addend); - else if (suc) - _addend = bfd_get_32 (s->owner, addend); + ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 4); + if (ok) + { + if (rel->howto->pc_relative) + addend = bfd_get_signed_32 (s->owner, buf); + else + addend = bfd_get_32 (s->owner, buf); + } break; case 64: - suc = bfd_get_section_contents (s->owner, s, addend, rel->address, 8); - if (suc) - _addend = bfd_get_64 (s->owner, addend); + ok = bfd_get_section_contents (s->owner, s, buf, rel->address, 8); + if (ok) + addend = bfd_get_64 (s->owner, buf); break; } - if (! suc) + if (!ok) einfo (_("%P: %C: cannot get section contents - auto-import exception\n"), s->owner, s, rel->address); + return addend; +} + +static void +make_import_fixup (arelent *rel, asection *s, char *name, const char *symname) +{ + struct bfd_symbol *sym = *rel->sym_ptr_ptr; + bfd_vma addend; + + if (pep_dll_extra_pe_debug) + printf ("arelent: %s@%#lx: add=%li\n", sym->name, + (unsigned long) rel->address, (long) rel->addend); + + addend = read_addend (rel, s); if (pep_dll_extra_pe_debug) { printf ("import of 0x%lx(0x%lx) sec_addr=0x%lx", - (long) _addend, (long) rel->addend, (long) rel->address); + (long) addend, (long) rel->addend, (long) rel->address); if (rel->howto->pc_relative) printf (" pcrel"); printf (" %d bit rel.\n", (int) rel->howto->bitsize); } - pep_create_import_fixup (rel, s, _addend, name, symname); + pep_create_import_fixup (rel, s, addend, name, symname); } static void