From patchwork Tue Jun 6 08:11:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 103663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3250203vqr; Tue, 6 Jun 2023 02:03:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ45/9QsS+qk4huR3sgwvgKxWOjRS3nKNOAfyFzxK9hMmG/9pobekNlapYOgOXSa6fw7t9yk X-Received: by 2002:a05:6a20:7f9d:b0:114:748f:f2e2 with SMTP id d29-20020a056a207f9d00b00114748ff2e2mr9180435pzj.24.1686042239747; Tue, 06 Jun 2023 02:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686042239; cv=none; d=google.com; s=arc-20160816; b=bZggJU1VeKmIUvfMfyW73VJ4ztYsaoNPom5q7iNiIN2gMt9b3AdWh3tUp9esE8s8Z2 70SC+ubnw6LgpUu4hdP5q4I3zr4X+fK6LJgtsoQkQQxdFc+6vCwnosORhF1U8bWu5xqT AAiv7eVRbR2fs86hkru80GQ76eNR2FHSHfRNmuMt+aniRLNJyeBZQLfNKrAUz9I5xYsp +iNGlEHF01ArZLNcL+/j7Q4bgdCF+cFd2Vc0wpkofxI/HFxGK8O+/vmLMJ21DgtRfjOu lt33ULa3ZGRhajnhGLwb7Cl9Krjfc8Y2waXAQv0I10VeLnQXhMcG/T67SVmstuG4XmW+ 6Gjw== 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=d3uLqzTWtHipIwzgtfYpmU2fBab05IyYYyTfKlJoEb8=; b=lwwtbfJTPT9OkMd72XEf+8SsOMeHogqcDeGCrYNsMIWFTDcvbQVwd9QTBKyFQi00DH tZGUykpLr5Zdk0NgLQ9kWyusWADHXEQUaYUp3SruvhAW5DgYYSWLHEAwGTh/L4kk/BT6 Rqt9YmJea7d6pYybMAn5QH1v4HWdjkAq88nnN2UsupD4FgvB+5MvgK9am7JmpWcvwUDr 8mR5yS3Y2THHo5EQ63Qh7AAHENQwkGdMEO0UVynP1D2d46K2VkvxZd0bzv2ZziDthHoz 9YTFpS5LGVAVcdAyT6q4qzjqWtWlB2JMLCYdDLBS55tEQqfgdGBRXEXqLHpDMBzu1BZZ Lftw== 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 m28-20020a63711c000000b00535540cc8ccsi4021026pgc.375.2023.06.06.02.03.47; Tue, 06 Jun 2023 02:03:59 -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 S234676AbjFFIPS (ORCPT + 99 others); Tue, 6 Jun 2023 04:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231826AbjFFIPR (ORCPT ); Tue, 6 Jun 2023 04:15:17 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64A94D2; Tue, 6 Jun 2023 01:15:15 -0700 (PDT) X-QQ-mid: bizesmtp90t1686039304trwmue6s Received: from linux-lab-host.localdomain ( [61.141.77.49]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 06 Jun 2023 16:15:03 +0800 (CST) X-QQ-SSF: 01200000000000D0V000000A0000000 X-QQ-FEAT: Sx1DrRIRqMdZ/MlCKruD26v8RqVr1CqYgFN5TjLwES8X+31r0YtgE6IBd5cmf DKk1dhvd4kdbyYCcvDHYlgPvIIZUN8eIxVkKKiLqrQ4UUMsnftqUrk03X/oF/6ZFzFAwjhj 77U0T4jL4pFsMjQBOVLSF3utZBeIScSOMCTU82gLNitvMSA7M6+yqVKIrOMBZcyYpTEkNUb VI5+pKYaFWHr2fNaC+pzOW98RgrorJ472+Q5MGW5Eor2qTEcQ3Y1Ib5/9I5EvC1EB41M1l1 Norl38y/vfKux6oTJBLP1e3GtPQ194vOUr95Or/8HE/F4qLGhBmgAUrUYtf/7JA/nDZfWgs CLnnL18aYxDAf+ZnzXWb6h5xBNkYESID5pJspa3wChK48GopzMjXEGvre/m3A== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 13882787233173972735 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 2/4] tools/nolibc: unistd.h: apply __sysret() helper Date: Tue, 6 Jun 2023 16:11:03 +0800 Message-Id: <52084c2083472421b13d092357819b14f405e0ea.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_MSPIKE_H3, 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?1767943427566204830?= X-GMAIL-MSGID: =?utf-8?q?1767943427566204830?= Use __sysret() to shrink the whole _syscall() to oneline code. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/unistd.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/include/nolibc/unistd.h b/tools/include/nolibc/unistd.h index c20b2fbf065e..7e3c005d28ba 100644 --- a/tools/include/nolibc/unistd.h +++ b/tools/include/nolibc/unistd.h @@ -56,16 +56,7 @@ int tcsetpgrp(int fd, pid_t pid) return ioctl(fd, TIOCSPGRP, &pid); } -#define _syscall(N, ...) \ -({ \ - long _ret = my_syscall##N(__VA_ARGS__); \ - if (_ret < 0) { \ - SET_ERRNO(-_ret); \ - _ret = -1; \ - } \ - _ret; \ -}) - +#define _syscall(N, ...) __sysret(my_syscall##N(__VA_ARGS__)) #define _sycall_narg(...) __syscall_narg(__VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) #define __syscall_narg(_0, _1, _2, _3, _4, _5, _6, N, ...) N #define _syscall_n(N, ...) _syscall(N, __VA_ARGS__)