From patchwork Thu May 26 16:49:57 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: 54420 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 0AD55383820F for ; Thu, 26 May 2022 16:58:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AD55383820F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653584305; bh=lMadIYMEAZEWRFzWkeknmU/QGuNGuePQFktfwJOai+I=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=gija9a6zHpImJCx2xiLJASa48NA9pPjMgxWNvRBBohMoDrTZnIaqEF7ibwLWQ4zDg TYTdm+M1wsxxILTCKaI8GBtvfpIGnB9eWyw/maeB8I7KgRnf68BUZ5aBzLN/z3ywZI zwu45HllWbdh+hIDj0OOLq2fxW1m9xug0zJEJ1Yo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 6943F385737E for ; Thu, 26 May 2022 16:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6943F385737E Received: by mail-oi1-x22d.google.com with SMTP id r68so2737929oie.12 for ; Thu, 26 May 2022 09:50:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lMadIYMEAZEWRFzWkeknmU/QGuNGuePQFktfwJOai+I=; b=2LgZaVcuOv1WJR6iDITsnSwOVVZjobhtnBKsh1Iv2AmuAdvsKbQh+pXxRSvlREdCOH Ok/UHsmcW//hv1+FSh8HMpGEEg/CBqy2xZBCvlrCOiUE8AkdCL+ZS49qivieawV/uyuR AwoJvOpmullgLBVDtCZtcuqct8Y/r79n81MEPjhsV2kKEMkxssaFq7vffTFlGSuthfwn 0a2bfDxEr3yRHO36/xFciFOjL4Vs6YfENht03sfIyFbYs0BOwH9k7+2cQlJsVmLZVI+y nhuqc3B7EgCV9t3FJlk695/uIapSgJf82USmgxrJePWANZvcI+E/Civaa/AxHV1hHtcB uC4Q== X-Gm-Message-State: AOAM533J4xnfyfoPdRg8VlQe63E4MSsRDPsuVgGxRshAh0U6WPwFMmFp 6lJRc34edlPOTbAtxSDCSdj9wVZtpyU+Uw== X-Google-Smtp-Source: ABdhPJylxwoJHiB98gZ+Bd3/F17DFxz2ejwB6MyUovCVqLq9ONbCBX4MaaZCOBiZ9WWxXkcpDQA0uw== X-Received: by 2002:a05:6808:210f:b0:32b:a8f:5bec with SMTP id r15-20020a056808210f00b0032b0a8f5becmr1606595oiw.245.1653583824403; Thu, 26 May 2022 09:50:24 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:9f85:b1e1:5370:63bd:a2ac]) by smtp.gmail.com with ESMTPSA id y26-20020a9d461a000000b0060603221255sm802521ote.37.2022.05.26.09.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:50:23 -0700 (PDT) To: libc-alpha@sourceware.org, Szabolcs Nagy Subject: [PATCH 11/17] nios2: Remove _dl_skip_args usage (BZ# 29187) Date: Thu, 26 May 2022 13:49:57 -0300 Message-Id: <20220526165003.705355-12-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220526165003.705355-1-adhemerval.zanella@linaro.org> References: <20220526165003.705355-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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: 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" Since ad43cac44a the generic code already shuffles the argv/envp/auxv on the stack to remove the ld.so own arguments and thus _dl_skip_args is always 0. So there is no need to adjust the argc or argv. Checked with qemu-user that arguments are correctly passed on both constructors and main program. --- sysdeps/nios2/dl-machine.h | 50 ++++++++------------------------------ 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h index 80de6fd041..9a35cf4160 100644 --- a/sysdeps/nios2/dl-machine.h +++ b/sysdeps/nios2/dl-machine.h @@ -128,53 +128,23 @@ _start:\n\ ldw r8, %call(_dl_nios2_get_gp_value)(r22)\n\ callr r8\n\ mov gp, r2\n\ -\n\ - /* Find the number of arguments to skip. */\n\ - ldw r8, %got(_dl_skip_args)(r22)\n\ - ldw r8, 0(r8)\n\ \n\ /* Find the main_map from the GOT. */\n\ ldw r4, %got(_rtld_local)(r22)\n\ ldw r4, 0(r4)\n\ \n\ - /* Find argc. */\n\ - ldw r5, 0(sp)\n\ - sub r5, r5, r8\n\ - stw r5, 0(sp)\n\ -\n\ - /* Find the first unskipped argument. */\n\ - slli r8, r8, 2\n\ - addi r6, sp, 4\n\ - add r9, r6, r8\n\ - mov r10, r6\n\ -\n\ - /* Shuffle argv down. */\n\ -3: ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 4\n\ - addi r10, r10, 4\n\ - bne r11, zero, 3b\n\ + /* Load adjusted argc. */\n\ + ldw r2, %got(_dl_argc)(r22)\n\ + ldw r5, 0(r2)\n\ \n\ - /* Shuffle envp down. */\n\ - mov r7, r10\n\ -4: ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 4\n\ - addi r10, r10, 4\n\ - bne r11, zero, 4b\n\ -\n\ - /* Shuffle auxv down. */\n\ -5: ldw r11, 4(r9)\n\ - stw r11, 4(r10)\n\ - ldw r11, 0(r9)\n\ - stw r11, 0(r10)\n\ - addi r9, r9, 8\n\ - addi r10, r10, 8\n\ - bne r11, zero, 5b\n\ -\n\ - /* Update _dl_argv. */\n\ + /* Load adjsuted argv. */\n\ ldw r2, %got(_dl_argv)(r22)\n\ - stw r6, 0(r2)\n\ + ldw r6, 0(r2)\n\ +\n\ + /* envp = argv + argc + 1 */\n\ + addi r7, r5, 1\n\ + slli r7, r7, 2\n\ + add r7, r7, r6\n\ \n\ /* Call _dl_init through the PLT. */\n\ ldw r8, %call(_dl_init)(r22)\n\