From nobody Tue Feb 18 22:04:59 2025 X-Original-To: dev-commits-src-main@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 4YyD8r5Rbwz5pFvs; Tue, 18 Feb 2025 22:05:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyD8r3Fq1z3T1j; Tue, 18 Feb 2025 22:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739916300; 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=6qhOs7U+WvXdc0iK9wV1Ypka6TQq4iAo5X+Rf6DU9FQ=; b=Cd6/fqN5MBVrdwq1zKKxH0pKYuj/MmYsX01YuP61cJn4nClPdbqouRRAzYJ9lOVeP5AIog cOv10ClrZcQbJC5KKRjahwUgArVCsz8cACTyr3mp+lun8lT4jFFMFxQ6Qlr+mj4ln5DFHW UNaMbj+KNxC2l7Tc/Vn7zAIjj52vmamGBNgXpCT5xbVEMaESkCLr6nnVKh5VLp1zzqYSlv xKYBQEcvUJLf8/g/QqM+hog7TyPBdQbc/GdHbqMi4nl44Vop9Vmf2USF5A1fiLiD6J1o/1 DAm+F56i2MOKxAsEER5i4WVU/HeBJV/vzS4OOyM9LmCiGdpDpqnJbe1vF4wM6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739916300; a=rsa-sha256; cv=none; b=DjlyF1nrqqIllvr9R8nnwbyUtwhBZC0QYAAmjOiXf6JKz5uFcmCX8PvAFjY2FUvij/szgJ cp2GZ84aV02XtWYgingGGiEHnyujmMDbCJrTBkFTmWVzv9Jz8p6lpXLVkKhTriHbdl3HFk RqOkdkXPZu86PRPGvq+IfZS/Jj6zQkTlx+9vjbfjsGPCtG8EoIwSgRAUYU6ocFcfOuvVYv n6Pch2EvQlP6i7sIgyUPaISXoHRsgmsqYjfu+ANpfe7twcPaV52ZE52lhdaT3pE89nzF5m Uy1+NLcK4OdRjvu46VWa+wFMCI06Gqy7h81Ocjy8p6B5IeImPLZ+0ndn+3BoPw== 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=1739916300; 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=6qhOs7U+WvXdc0iK9wV1Ypka6TQq4iAo5X+Rf6DU9FQ=; b=VAwOrA0fTfh2GobWp+xLz5WyUWn5V/eoiOfjQh70KjjIzi/qso0Fl0Yyu3xqqf6KZoWFbx HeDFJb5/jGCARxbvI1AXUhRbLeTMDc0IZIqCcBrPQMItvJQHYojpjgnNTL9cY2xaU2g52t D8WUIlzgHcWsiafPdOQA5o+jNvlk+OoK4TBOq8r2JGPNiUkdxbUpbRXa1eHuBOooqdY3HT cCZVa3Cvg++eByz7thVaI91Uf/paUhZzszyaxC3skFDwyc4Fma+H14QA93va5FQw5HKbal PNZlDVydUCS+hRF6163yMbj4u0PLEIOFIaMNBy7l4cdQP5jDY/OW/kJ0KfPeug== 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 4YyD8r0H3szfRX; Tue, 18 Feb 2025 22:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IM4x29009519; Tue, 18 Feb 2025 22:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IM4xlG009516; Tue, 18 Feb 2025 22:04:59 GMT (envelope-from git) Date: Tue, 18 Feb 2025 22:04:59 GMT Message-Id: <202502182204.51IM4xlG009516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9355ad0b0bfa - main - makesyscalls: emit cpp in syscalls.map List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9355ad0b0bfaba9dc39972819185a7dc787a8950 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9355ad0b0bfaba9dc39972819185a7dc787a8950 commit 9355ad0b0bfaba9dc39972819185a7dc787a8950 Author: Brooks Davis AuthorDate: 2025-02-18 22:02:19 +0000 Commit: Brooks Davis CommitDate: 2025-02-18 22:03:33 +0000 makesyscalls: emit cpp in syscalls.map If there are per-platform differences in which syscalls are supported, we should only try to export implemented ones in libc. Fortunately, syscall maps are run though cpp. This is arguably incomplete as syscall.mk isn't (and can't practically be) supported. Reviewed by: kevans Sponsored by: DARPA, AFRL Pull Request: https://github.com/freebsd/freebsd-src/pull/1575 --- sys/tools/syscalls/examples/cpp/syscalls.conf | 1 + sys/tools/syscalls/examples/cpp/test_syscalls.map | 18 ++++++++++++++++++ sys/tools/syscalls/scripts/syscalls_map.lua | 4 +++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sys/tools/syscalls/examples/cpp/syscalls.conf b/sys/tools/syscalls/examples/cpp/syscalls.conf index 7fc15b6bb01f..ffcfa8d4c6aa 100644 --- a/sys/tools/syscalls/examples/cpp/syscalls.conf +++ b/sys/tools/syscalls/examples/cpp/syscalls.conf @@ -7,4 +7,5 @@ syscallprefix="TEST_SYS_" switchname="test_sysent" namesname="test_syscallnames" systrace="test_systrace_args.c" +libsysmap="test_syscalls.map" compat_set="" diff --git a/sys/tools/syscalls/examples/cpp/test_syscalls.map b/sys/tools/syscalls/examples/cpp/test_syscalls.map new file mode 100644 index 000000000000..137496186402 --- /dev/null +++ b/sys/tools/syscalls/examples/cpp/test_syscalls.map @@ -0,0 +1,18 @@ +/* + * FreeBSD system call symbols. + * + * DO NOT EDIT-- this file is automatically @generated. + */ + +FBSDprivate_1.0 { +#ifdef PLATFORM_FOO + _syscall1; + __sys_syscall1; +#else +#endif +#ifdef PLATFORM_FOO +#else + _syscall2; + __sys_syscall2; +#endif +}; diff --git a/sys/tools/syscalls/scripts/syscalls_map.lua b/sys/tools/syscalls/scripts/syscalls_map.lua index 023b43052921..52c3b294e338 100755 --- a/sys/tools/syscalls/scripts/syscalls_map.lua +++ b/sys/tools/syscalls/scripts/syscalls_map.lua @@ -37,7 +37,7 @@ function syscalls_map.generate(tbl, config, fh) gen:write(string.format("FBSDprivate_1.0 {\n")) for _, v in pairs(s) do - --print("num " .. v.num .. " name " .. v.name) + gen:write(v.prolog) if v:native() and not v.type.NODEF and not v.type.NOLIB then if v.name ~= "exit" and v.name ~= "vfork" then gen:write(string.format("\t_%s;\n", v.name)) @@ -45,6 +45,8 @@ function syscalls_map.generate(tbl, config, fh) gen:write(string.format("\t__sys_%s;\n", v.name)) end end + gen:write(tbl.epilog) + -- End gen:write("};\n") end