From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id BA1E6385482C for ; Wed, 18 Nov 2020 20:01:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BA1E6385482C Received: by mail-qv1-xf44.google.com with SMTP id u23so1688051qvf.1 for ; Wed, 18 Nov 2020 12:01:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pDJPcbPY6SrftrUZQw1sHFGBhVyZSFHffxNvEyx/VLo=; b=gDpnB8tCWqklRAxoH0z0pGrHRP6rlbULFK7VBMx87PvsrA6SeS6ovTOf5XmKwHQ0pK JryAqM8pl03l//+uaXiaV/E/uijvD4DkC8ToWUWWRk+l7iPAA6LdrnJaDibMF+LaEEUK EnokdVKoiRZ3bM1mBJvmK4ryIvFOK53HUMX9DJ8nUg1UuPZOj8gnc5R2mqxR0szS2xER WoIhMOOYy+WQCGzgilrVaG7Ifuu5ypEORs4z6rNff7KXPRUDu5WsijqJnYVIK8PqkhBd yw5f0Q8BmH+zjgRjw1iEs3ES5PhOzjLpFvpuCUofs0tEQ0kMJun4pfO/vkYUaRVbP4qL R8QA== X-Gm-Message-State: AOAM5319guaZRnPUK+8tw+mFupl0j/gRA70cmPdo0Cmb+5ILNetcAqx6 4Y9AO8Qt0OceZfIQN2+W44xXFMs6kPNQIg== X-Google-Smtp-Source: ABdhPJwp2whLeTUz+vkSZyf7tRJ7Cyxy/qPlN6E44VMBbdD129p7UK89009gmLkhfU/WpE67386Dfw== X-Received: by 2002:ad4:45e6:: with SMTP id q6mr6953022qvu.28.1605729661706; Wed, 18 Nov 2020 12:01:01 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id g19sm15306765qkl.86.2020.11.18.12.01.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Nov 2020 12:01:00 -0800 (PST) Subject: Re: [PATCH 1/4] powerpc: Replace brk.S with a C implementation To: libc-alpha@sourceware.org References: <20201118144703.75569-1-msc@linux.ibm.com> <20201118144703.75569-2-msc@linux.ibm.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <0baf4be2-7c9f-b83e-c89b-042fcae7b715@linaro.org> Date: Wed, 18 Nov 2020 17:00:58 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201118144703.75569-2-msc@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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: 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-List-Received-Date: Wed, 18 Nov 2020 20:01:04 -0000 On 18/11/2020 11:47, Matheus Castanho via Libc-alpha wrote: > From: Tulio Magno Quites Machado Filho > > There is no need to maintain a separate assembly implementation of brk for > powerpc. It basically does the same thing as the generic C-based version, so we > can reuse that instead. LGTM. You also might want to check my brk consolidation [1], it consolidate not only powerpc, but all implementations. [1] https://sourceware.org/pipermail/libc-alpha/2020-November/119770.html > --- > .../linux/powerpc/{powerpc64/brk.S => brk.c} | 41 +++++++-------- > sysdeps/unix/sysv/linux/powerpc/dl-brk.S | 1 - > .../unix/sysv/linux/powerpc/powerpc32/brk.S | 52 ------------------- > 3 files changed, 18 insertions(+), 76 deletions(-) > rename sysdeps/unix/sysv/linux/powerpc/{powerpc64/brk.S => brk.c} (58%) > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/dl-brk.S > delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S > > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S b/sysdeps/unix/sysv/linux/powerpc/brk.c > similarity index 58% > rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S > rename to sysdeps/unix/sysv/linux/powerpc/brk.c > index f206909b72..af7d1d73a2 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S > +++ b/sysdeps/unix/sysv/linux/powerpc/brk.c > @@ -1,6 +1,6 @@ > -/* brk system call for Linux. PowerPC64 version. > - Copyright (C) 1995-2020 Free Software Foundation, Inc. > +/* Copyright (C) 2020 Free Software Foundation, Inc. > This file is part of the GNU C Library. > + Contributed by Chris Metcalf , 2011. No new 'Contributed by' in newer code. > > The GNU C Library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > @@ -13,31 +13,26 @@ > Lesser General Public License for more details. > > You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > + License along with the GNU C Library. If not, see > . */ > > +#include > +#include > #include > -#define _ERRNO_H 1 > -#include > > - .comm __curbrk,8,8 > - .section ".toc","aw" > -.LC__curbrk: > - .tc __curbrk[TC],__curbrk > - .section ".text" > -ENTRY (__brk) > - CALL_MCOUNT 1 > +/* This must be initialized data because commons can't have aliases. */ > +void *__curbrk = 0; > > - std r3,-8(r1) > - DO_CALL(SYS_ify(brk)) > - ld r6,-8(r1) > - ld r5,.LC__curbrk@toc(r2) > - std r3,0(r5) > - cmpld r6,r3 > - li r3,0 > - blelr+ > - li r3,ENOMEM > - TAIL_CALL_SYSCALL_ERROR > -END (__brk) > +int > +__brk (void *addr) > +{ > + __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr); > + if (__curbrk < addr) > + { > + __set_errno (ENOMEM); > + return -1; > + } > > + return 0; > +} > weak_alias (__brk, brk) > diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S b/sysdeps/unix/sysv/linux/powerpc/dl-brk.S > deleted file mode 100644 > index eeb96544e3..0000000000 > --- a/sysdeps/unix/sysv/linux/powerpc/dl-brk.S > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S > deleted file mode 100644 > index f3b960795e..0000000000 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S > +++ /dev/null > @@ -1,52 +0,0 @@ > -/* brk system call for Linux/ppc. > - Copyright (C) 1995-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#include > -#define _ERRNO_H 1 > -#include > - > - .comm __curbrk,4,4 > - .section ".text" > -ENTRY (__brk) > - mflr r0 > - stwu r1,-16(r1) > - cfi_adjust_cfa_offset (16) > - stw r3,8(r1) > - stw r0,20(r1) > - cfi_offset (lr, 4) > - DO_CALL(SYS_ify(brk)) > - lwz r6,8(r1) > -#ifdef PIC > - SETUP_GOT_ACCESS(r5,got_label) > - addis r5,r5,__curbrk-got_label@ha > - stw r3,__curbrk-got_label@l(r5) > -#else > - lis r4,__curbrk@ha > - stw r3,__curbrk@l(r4) > -#endif > - lwz r0,20(r1) > - cmplw r6,r3 > - addi r1,r1,16 > - mtlr r0 > - li r3,0 > - blelr+ > - li r3,ENOMEM > - b __syscall_error@local > -END (__brk) > - > -weak_alias (__brk, brk) >