Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Oct 2024 21:08:59 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 913bfd86c1b2 - main - Update mentions of makesyscalls.lua
Message-ID:  <202410302108.49UL8xlH053793@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=913bfd86c1b2a161c21fccaef63c1e1702560366

commit 913bfd86c1b2a161c21fccaef63c1e1702560366
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-10-22 17:38:11 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-10-30 21:04:31 +0000

    Update mentions of makesyscalls.lua
    
    It is obsolete and will be removed in a followup commit.
---
 sys/cddl/dev/systrace/systrace.c   | 4 ++--
 sys/compat/freebsd32/syscalls.conf | 8 ++++----
 sys/conf/sysent.mk                 | 5 ++---
 sys/kern/syscalls.master           | 6 +++---
 sys/tools/syscalls/README.md       | 2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/sys/cddl/dev/systrace/systrace.c b/sys/cddl/dev/systrace/systrace.c
index 4969343ed06e..c14a663d1995 100644
--- a/sys/cddl/dev/systrace/systrace.c
+++ b/sys/cddl/dev/systrace/systrace.c
@@ -92,7 +92,7 @@ extern struct sysent linux32_sysent[];
 #elif defined(FREEBSD32_SYSTRACE)
 /*
  * The syscall arguments are processed into a DTrace argument array
- * using a generated function. See sys/tools/makesyscalls.lua.
+ * using a generated function. See sys/tools/syscalls/README.md.
  */
 #include <compat/freebsd32/freebsd32_proto.h>
 #include <compat/freebsd32/freebsd32_util.h>
@@ -106,7 +106,7 @@ extern const char *freebsd32_syscallnames[];
 #else
 /*
  * The syscall arguments are processed into a DTrace argument array
- * using a generated function. See sys/tools/makesyscalls.lua.
+ * using a generated function. See sys/tools/syscalls/README.md.
  */
 #include <sys/syscall.h>
 #include <kern/systrace_args.c>
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index a6e47cf470f1..72006631c89e 100644
--- a/sys/compat/freebsd32/syscalls.conf
+++ b/sys/compat/freebsd32/syscalls.conf
@@ -18,10 +18,10 @@ abi_ptr_array_t="uint32_t"
 abi_headers="#include <compat/freebsd32/freebsd32_proto.h>"
 
 #
-# Variables below this line are exceptions to the ABI changes programmatically
-# detected by makesyscalls.lua.  New system calls should not require an entry
-# here in nearly virtually all cases.  New entries are almost certainly
-# representative of badly designed interfaces.
+# Variables below this line are exceptions to the ABI changes
+# programmatically detected by sys/tools/syscalls.  New system calls
+# should not require an entry here in virtually all cases.  New entries
+# are almost certainly representative of badly designed interfaces.
 #
 
 # System calls that require freebsd32-specific handling:
diff --git a/sys/conf/sysent.mk b/sys/conf/sysent.mk
index 54531a52e151..66897d3b6b0a 100644
--- a/sys/conf/sysent.mk
+++ b/sys/conf/sysent.mk
@@ -33,9 +33,8 @@ all:
 .ORDER: ${GENERATED}
 sysent: ${GENERATED}
 
-# We slap a .PHONY on makesyscalls.lua so that we regenerate every single time,
-# for now, which can be less painful across rebases or other things that may
-# have odd effects on mtimes.
+# We slap a .PHONY on MAKESYSCALLS_SCRIPT so that we regenerate every
+# single time rather than tracking all internal dependencies for now.
 ${MAKESYSCALLS_SCRIPT}: .PHONY
 
 ${GENERATED}: ${MAKESYSCALLS_SCRIPT} ${SRCS}
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 849e5ee2f13b..7a7530697e59 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -58,10 +58,10 @@
 ;  - Use u_int and u_long rather than "unsigned (int|long)".
 ;  - size_t is allowed.
 ;  - typedefs are allowed, but new signed types that vary between 32- and
-;    64-bit ABIs must be added to makesyscalls.lua so it knows they require
-;    handling.
+;    64-bit ABIs must be added to config.known_abi_flags in
+;    sys/tools/syscalls/config.lua so it knows they require handling.
 ;  - Always-64-bit types other than dev_t, id_t, and off_t must be added to
-;    makesyscalls.lua.
+;    util.is64bitType in sys/tools/syscalls/tools/util.lua.
 ; For pointers:
 ;  - Prefer structs to typedefs so an ABI-specific suffix (e.g., "32") can
 ;    be prepended (e.g., ucontext_t -> struct ucontext -> struct ucontext32).
diff --git a/sys/tools/syscalls/README.md b/sys/tools/syscalls/README.md
index 7ae6519360ba..1797411f1aa0 100644
--- a/sys/tools/syscalls/README.md
+++ b/sys/tools/syscalls/README.md
@@ -1,6 +1,6 @@
 # System call creation library
 Parses `syscalls.master` and packages information into objects with methods.
-Modules reproduce the previous file auto-generation of `makesyscalls.lua`.
+Modules reproduce the previously monolithic file auto-generation.
 
 We generally assume that this script will be run by flua, however we've
 carefully crafted modules for it that mimic interfaces provided by modules



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410302108.49UL8xlH053793>