From patchwork Thu May 26 16:49:56 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: 54419 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 CDBF138376EA for ; Thu, 26 May 2022 16:57:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CDBF138376EA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653584262; bh=JSh2y7F3Zp6SsTOAqeXdubHFFt/m2QbbcdrJ8BT0qJk=; 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=eQyN7up8yiIvBfP4LHy+BmNHmgSPGXNBXDw+UqkK9+Ed6deJOypnwqVcrG/6nEaIa N69+r5IooRzxfHeUYPORi7nM2iU6iCY+QnIoMCKfDNxF2bZc1udcUVW6TFEA1uFzc7 sTY2NqQClHsuMiOMmJzQSNFnKPyiiVKYewG6WwvI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 6770638376ED for ; Thu, 26 May 2022 16:50:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6770638376ED Received: by mail-oi1-x232.google.com with SMTP id s188so2786302oie.4 for ; Thu, 26 May 2022 09:50:23 -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=JSh2y7F3Zp6SsTOAqeXdubHFFt/m2QbbcdrJ8BT0qJk=; b=T2Xf/Nmo7j53vaBHZjTzevNX4n/FDnaWs2vdILlxrRdrpuOhOtHZNXRVtWd6hcLs7q sVkDChtrUs65WaqMwwxKnuXGrg65BGvrVT3dbfegrckK8tF+HjYc+bu/jde7xvs6YGip nIdq+ZXUxjWmwMoHowkMPB4EAU/WjtEzTplqMzZNRKuUcyj6LGdc2ZuQl/uqhTZi1Mnj R5Vm4xSzhOAzNPyhyvL5DKfCPBWEzxnnpX4VOEdMMCMmxvrBmahfqSL95FWXS7V7uqhL TABrtJXQOjezcFovrClMZqLHlpsw6dq3FEaH3BN/E472JVgI5vJz/E1PIf0kdPFZToQV GjeA== X-Gm-Message-State: AOAM532UovWfr9XvSXoQb/WxD4QyIKBXCUVDxNPwQ0s4jvC5hcCTfVel srvVIhw5RP+xUPYiKN3qkoE8wzBHIIxYSg== X-Google-Smtp-Source: ABdhPJz7WMx0IXd+ng3M5ITcqitQ/Cxh/7db7Ay1VRh2lHagmHDI57A1NBu8MOagHemaQCscaNQh3A== X-Received: by 2002:a05:6808:168f:b0:325:2974:77d6 with SMTP id bb15-20020a056808168f00b00325297477d6mr1765548oib.199.1653583822589; Thu, 26 May 2022 09:50:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 09:50:22 -0700 (PDT) To: libc-alpha@sourceware.org, Szabolcs Nagy Subject: [PATCH 10/17] mips: Remove _dl_skip_args usage Date: Thu, 26 May 2022 13:49:56 -0300 Message-Id: <20220526165003.705355-11-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/mips/dl-machine.h | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 9105b5b75c..b68066d430 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -278,20 +278,7 @@ do { \ move $16, $28\n\ # Save the user entry point address in a saved register.\n\ move $17, $2\n\ - # See if we were run as a command with the executable file\n\ - # name as an extra leading argument.\n\ - lw $2, _dl_skip_args\n\ - beq $2, $0, 1f\n\ - # Load the original argument count.\n\ - " STRINGXP(PTR_L) " $4, 0($29)\n\ - # Subtract _dl_skip_args from it.\n\ - subu $4, $2\n\ - # Adjust the stack pointer to skip _dl_skip_args words.\n\ - sll $2, " STRINGXP (PTRLOG) "\n\ - " STRINGXP(PTR_ADDU) " $29, $2\n\ - # Save back the modified argument count.\n\ - " STRINGXP(PTR_S) " $4, 0($29)\n\ -1: # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\ + # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\ " STRINGXP(PTR_L) " $4, _rtld_local\n\ " STRINGXP(PTR_L) /* or lw??? fixme */ " $5, 0($29)\n\ " STRINGXP(PTR_LA) " $6, " STRINGXP (PTRSIZE) "($29)\n\ @@ -352,21 +339,7 @@ do { \ addu $16, $4\n\ move $17, $2\n\ move $28, $16\n\ - lw $4, %got(_dl_skip_args)($16)\n\ - lw $4, 0($4)\n\ - beqz $4, 1f\n\ - # Load the original argument count.\n\ - lw $5, 0($sp)\n\ - # Subtract _dl_skip_args from it.\n\ - subu $5, $4\n\ - # Adjust the stack pointer to skip _dl_skip_args words.\n\ - sll $4, " STRINGXP (PTRLOG) "\n\ - move $6, $sp\n\ - addu $6, $4\n\ - move $sp, $6\n\ - # Save back the modified argument count.\n\ - sw $5, 0($sp)\n\ -1: # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\ + # Call _dl_init (struct link_map *main_map, int argc, char **argv, char **env) \n\ lw $4, %got(_rtld_local)($16)\n\ lw $4, 0($4)\n\ lw $5, 0($sp)\n\