From nobody Wed Dec 06 16:04:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Slhzq72J3z53cpR; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slhzq6Wxqz4RbW; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=qjHH+21t3oElPPzxEp8zTyE6hD9oJGnWg52PAsCuQ2DyNi6YHmI0qmXmH2JDp1CKtujnaX MBFWEUnArtAr1fYsdWohakbndrzWFdz3EmQ0ayZ/57C1ZxElaKfovK2JHZmPoMuGl340QJ +zab5qFh2ZgX0KUP+fs9jDce3bzifVh4QRTpudLoZBMV8+16u6SFVE3zAoaVl2xaQ9rnuo xVjAE7WcYtdGa/tq/9h6yOCIRPE5gtTfkgvyBWEvYjTUon3XIe9XL7KbTUf5fz3EflzJjG zTNEk5/rhOM0ja9PDyA+cDvCVYHdgHQs258OaAtP8ppZaeARjt5l14yMO6gjow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701878663; a=rsa-sha256; cv=none; b=jOZZeleIOaCESuUUuV9Fv2Blxlzy9a1K7ePa55ozgQUMJ/BJ+EvR2SIttPBBXpLs2exPoP NTfRV4OKATdpM4pGHX2SjsXyADwEyoenS0ucTGdminqOvt4y5dQtLmEJLLBz2IP4galh7W IIeT4HYUi2tjsh8VJATgqkTGNfmVLceHrEs0XlqG1rfM3NpKB047782AeWuTiEuHwx0wCQ pBbvy61aRHojdZptln92N8bUTT3ZlgA5OhmUf4bd4jrGJe9lVOmG/fFn7EgEQI/Z9LPS17 B4VB5WRSezYSZWwGl/+WraXXOkm3ubQEr9+AI6pJAFkiq04xNFGvx2i3NFRzlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701878663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTvRPdHwLB9f7zCrbxdPKlQAMQIKhDEUT9FeunEA4g0=; b=X2aUzR2Edmun/9wI7WH+6MBpxUjyBlZNR4Ul5Rb1KNdQOt276Hrxkn6+8qkOb9+f9kU328 FUiiybdBJLANce8sNYlzauxQfHvriZ93z9q35xq3FDLI0aO0NBOSnA+W8HoFhl9Rl46d6W eyVH/UrYM0ya5z5Bik+RwKZ505Kx61ceuzssI2eurUv5G9rWlIGdAJTJhbnlWZqBAvwypT HFTuz6X3w5ZoZvGkEQs0nnUt51/zKNRAFzIXReoQVXeFYfo1Abeq6N3OUTOL9veQGTl5gG 2HGLLIFcSnQx+uCU4UGZUS4NJamRtL9iY2o4akCOKeYkRblnlTpDEiKQQZm1mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Slhzq5Zc4z10dT; Wed, 6 Dec 2023 16:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6G4NYT086144; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6G4Nrt086141; Wed, 6 Dec 2023 16:04:23 GMT (envelope-from git) Date: Wed, 6 Dec 2023 16:04:23 GMT Message-Id: <202312061604.3B6G4Nrt086141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e64d827d3a58 - stable/14 - makesyscall: Simplify a bit emitting syscall declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e64d827d3a582af994288fcdbc5a701828fc66d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e64d827d3a582af994288fcdbc5a701828fc66d6 commit e64d827d3a582af994288fcdbc5a701828fc66d6 Author: Olivier Certner AuthorDate: 2023-10-12 13:47:03 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 16:04:05 +0000 makesyscall: Simplify a bit emitting syscall declarations Reviewed by: kevans, imp MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42168 (cherry picked from commit 2f68ae6150aa51d724e22c7e6748adfe2bc932d7) --- sys/tools/makesyscalls.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index f2d8f1a609b6..a800de26a282 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -865,18 +865,15 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, local protoflags = get_mask({"NOPROTO", "NODEF"}) if flags & protoflags == 0 then + local sys_prefix = "sys_" if funcname == "nosys" or funcname == "lkmnosys" or funcname == "sysarch" or funcname:find("^freebsd") or funcname:find("^linux") then - write_line("sysdcl", string.format( - "%s\t%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) - else - write_line("sysdcl", string.format( - "%s\tsys_%s(struct thread *, struct %s *)", - rettype, funcname, argalias)) + sys_prefix = "" end - write_line("sysdcl", ";\n") + write_line("sysdcl", string.format( + "%s\t%s%s(struct thread *, struct %s *);\n", + rettype, sys_prefix, funcname, argalias)) write_line("sysaue", string.format("#define\t%sAUE_%s\t%s\n", config.syscallprefix, funcalias, auditev)) end