From patchwork Tue Jun 6 08:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 103644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3240891vqr; Tue, 6 Jun 2023 01:43:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ43ztxiVWmh4vCbhQvuk71385V8AoOksb/wbBbuHmU6ihBzoqW5hLC6hEPClpjqDxsHsjn2 X-Received: by 2002:a37:a952:0:b0:75e:badf:fded with SMTP id s79-20020a37a952000000b0075ebadffdedmr1124887qke.46.1686040992564; Tue, 06 Jun 2023 01:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686040992; cv=none; d=google.com; s=arc-20160816; b=BTMGnNv6QZuK6tbhH7DUwU9H+OYfGeisv3o8Rxz9rd8FshRespDh6GzJN+rY9XjIbx i7bM0Xg8iXiGhhwet6paeCoDVPK/ggQvyw70wg1j+7raG5FP9n+xUmv1aCn7+OluFa9a ydry8Cve0zFDdeymQDfALuxkG84KocmHgWHu/LkC8kprjtAEhyvZVzOX5Cw7qnWxv7df LEArF8cmLvCnE8uWemA71WD1+VkTsJrXNZ/55Z7LEA7i0cI5JRU133gkteWEDuuYN/wv 4Q9VTDbbIRTBL0bt9AFlOIWq85gMNAH1fls9VU6X107U6Eoe9bgstHZBGsQq6gavQZ5M +JLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=+pSo5AsKF96mPTJpNjhzwdx9F5QAYgx9ooCjdDR/kew=; b=AolIGkba0f2JMty2RzfUf9J+PKzsLLkuBI2tV4d4GqtGjKT2npFSwfVl5NMyUB+Y+y qewSD9Z4QSuUBaHMq8OZ1I1ffkNP/4EmUoIqOYX8tom3KvPZVP1fF0glIPp8Qb3hlvrt nlGl+LecakLs1n/PRr9frhEJbxkwZXp4fzFhgUc5/poFCfhlQwU2KuvHkzuhfSzWuRSg B5ZxxHaaevdas5XH45vLNUNkQ22O6H4jE79tjVPaOHVljz+/kfUg4erSp04ahuBWsV0K 7GkW+N8JfC/MbbjchQCM5kGwXTftdeNhIQZILWm2UkySRVQGv9dphRTNVupfRudBJz8a 10Yg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b24-20020a05620a127800b00759323fda59si5405989qkl.518.2023.06.06.01.42.57; Tue, 06 Jun 2023 01:43:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235656AbjFFIQo (ORCPT + 99 others); Tue, 6 Jun 2023 04:16:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231826AbjFFIQm (ORCPT ); Tue, 6 Jun 2023 04:16:42 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E4B6C7; Tue, 6 Jun 2023 01:16:40 -0700 (PDT) X-QQ-mid: bizesmtp79t1686039390t3zfjj1g Received: from linux-lab-host.localdomain ( [61.141.77.49]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 06 Jun 2023 16:16:29 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: fs34Pe/+C2RtSKmKHJC+wIdHChvPdDuUHsW0Y/Oc0Nqkrgol9/YGblT2gCBGq cvnFZ34Cj87k/IclwMobyHylf5h+9fQkW9ILGGrAdoTKg0xnOYEGdZTtIiQcKOkVrx0jmAW JY4DnauTC17PygPFGcUxAME9czb9I8yE/6Wi/RpF+fIioznqAMNklXe4n/XNMPvwtBZKLsK HzdqGH1uJ98z7dPX4MSq8KVirLCEXk/O6EymZycq6APbFhLTe8UpChE8PlruhQIr6z4joi7 6L5DhdOHvTng5Ie0eOs6uxPs3durFfFDDHs9nZ7BbNDrXrjSylG6VdHuvnnaAv8JLU6EW8j Jdv+XKibESyIOVUM2iaxHOmMGHW7CDYGQu68zuWQxmkQJlFiWVlD0YaJJQT2w== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 14987419174521382926 From: Zhangjin Wu To: thomas@t-8ch.de, w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH v2 3/4] tools/nolibc: sys.h: apply __sysret() helper Date: Tue, 6 Jun 2023 16:16:12 +0800 Message-Id: <20039f63dbbb54889c310196e909469ace5e503e.1686036862.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767942119995789350?= X-GMAIL-MSGID: =?utf-8?q?1767942119995789350?= Use __sysret() to shrink both brk() and getpagesize() to oneline code. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/sys.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index c12c14db056e..f6e3168b3e50 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -78,13 +78,7 @@ void *sys_brk(void *addr) static __attribute__((unused)) int brk(void *addr) { - void *ret = sys_brk(addr); - - if (!ret) { - SET_ERRNO(ENOMEM); - return -1; - } - return 0; + return __sysret(sys_brk(addr) ? 0 : -ENOMEM); } static __attribute__((unused)) @@ -547,15 +541,7 @@ static unsigned long getauxval(unsigned long key); static __attribute__((unused)) long getpagesize(void) { - long ret; - - ret = getauxval(AT_PAGESZ); - if (!ret) { - SET_ERRNO(ENOENT); - return -1; - } - - return ret; + return __sysret(getauxval(AT_PAGESZ) ?: -ENOENT); }