1 files changed, 335 insertions, 141 deletions

diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 0ddea0c..4e2c28c 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,171 +1,365 @@
 #! /bin/sh -
-#	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
+#
+#	@(#)makesyscalls.sh	8.2 (Berkeley) 2/14/95
 
 set -e
 
-# name of compat option:
-compat=COMPAT_43
+case $# in
+    2)	;;
+    *)	echo "Usage: $0 config-file input-file" 1>&2
+	exit 1
+	;;
+esac
+
+# source the config file.
+. $1
 
-# output files:
-sysnames="syscalls.c"
-syshdr="../sys/syscall.h"
-syssw="init_sysent.c"
+# the config file sets the following variables:
+#	sysnames	the syscall names file
+#	sysnumhdr	the syscall numbers file
+#	syssw		the syscall switch file
+#	sysarghdr	the syscall argument struct definitions
+#	compatopts	those syscall types that are for 'compat' syscalls
+#	switchname	the name for the 'struct sysent' we define
+#	namesname	the name for the 'char *[]' we define
+#	constprefix	the prefix for the system call constants
+#
+# NOTE THAT THIS makesyscalls.sh DOES NOT SUPPORT 'LIBCOMPAT'.
 
 # tmp files:
 sysdcl="sysent.dcl"
-syscompat="sysent.compat"
+syscompat_pref="sysent."
 sysent="sysent.switch"
 
-trap "rm $sysdcl $syscompat $sysent" 0
+syscompat_files=""
+for file in $compatopts; do
+	syscompat_files="$syscompat_files $syscompat_pref$file"
+done
 
-case $# in
-    0)	echo "Usage: $0 input-file" 1>&2
-	exit 1
-	;;
-esac
+trap "rm $sysdcl $syscompat_files $sysent" 0
+
+# Awk program (must support nawk extensions)
+# Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
+awk=${AWK:-awk}
 
-awk < $1 "
-	BEGIN {
-		sysdcl = \"$sysdcl\"
-		syscompat = \"$syscompat\"
-		sysent = \"$sysent\"
-		sysnames = \"$sysnames\"
-		syshdr = \"$syshdr\"
-		compat = \"$compat\"
-		infile = \"$1\"
-		"'
+# Does this awk have a "toupper" function? (i.e. is it GNU awk)
+isgawk=`$awk 'BEGIN { print toupper("true"); exit; }' 2>/dev/null`
 
-		printf "/*\n * System call switch table.\n *\n" > sysdcl
-		printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysdcl
+# If this awk does not define "toupper" then define our own.
+if [ "$isgawk" = TRUE ] ; then
+	# GNU awk provides it.
+	toupper=
+else
+	# Provide our own toupper()
+	toupper='
+function toupper(str) {
+	_toupper_cmd = "echo "str" |tr a-z A-Z"
+	_toupper_cmd | getline _toupper_str;
+	close(_toupper_cmd);
+	return _toupper_str;
+}'
+fi
 
-		printf "\n#ifdef %s\n", compat > syscompat
-		printf "#define compat(n, name) n, __CONCAT(o,name)\n\n" > syscompat
+# before handing it off to awk, make a few adjustments:
+#	(1) insert spaces around {, }, (, ), *, and commas.
+#	(2) get rid of any and all dollar signs (so that rcs id use safe)
+#
+# The awk script will deal with blank lines and lines that
+# start with the comment character (';').
 
-		printf "/*\n * System call names.\n *\n" > sysnames
-		printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames
+sed -e '
+s/\$//g
+:join
+	/\\$/{a\
 
-		printf "/*\n * System call numbers.\n *\n" > syshdr
-		printf " * DO NOT EDIT-- this file is automatically generated.\n" > syshdr
+	N
+	s/\\\n//
+	b join
 	}
-	NR == 1 {
-		printf " * created from%s\n */\n\n", $0 > sysdcl
-		printf "#include <sys/param.h>\n" > sysdcl
-		printf "#include <sys/systm.h>\n\n" > sysdcl
-		printf "int\tnosys();\n\n" > sysdcl
+2,${
+	/^#/!s/\([{}()*,]\)/ \1 /g
+}
+' < $2 | $awk "
+$toupper
+BEGIN {
+	sysnames = \"$sysnames\"
+	sysnumhdr = \"$sysnumhdr\"
+	sysarghdr = \"$sysarghdr\"
+	switchname = \"$switchname\"
+	namesname = \"$namesname\"
+	constprefix = \"$constprefix\"
 
-		printf "struct sysent sysent[] = {\n" > sysent
+	sysdcl = \"$sysdcl\"
+	syscompat_pref = \"$syscompat_pref\"
+	sysent = \"$sysent\"
+	infile = \"$2\"
 
-		printf " * created from%s\n */\n\n", $0 > sysnames
-		printf "char *syscallnames[] = {\n" > sysnames
+	compatopts = \"$compatopts\"
+	"'
 
-		printf " * created from%s\n */\n\n", $0 > syshdr
-		next
-	}
-	NF == 0 || $1 ~ /^;/ {
-		next
-	}
-	$1 ~ /^#[ 	]*if/ {
-		print > sysent
-		print > sysdcl
-		print > syscompat
-		print > sysnames
-		savesyscall = syscall
-		next
-	}
-	$1 ~ /^#[ 	]*else/ {
-		print > sysent
-		print > sysdcl
-		print > syscompat
-		print > sysnames
-		syscall = savesyscall
-		next
-	}
-	$1 ~ /^#/ {
-		print > sysent
-		print > sysdcl
-		print > syscompat
-		print > sysnames
-		next
-	}
-	syscall != $1 {
-		printf "%s: line %d: syscall number out of sync at %d\n", \
-		   infile, NR, syscall
-		printf "line is:\n"
-		print
-		exit 1
-	}
-	{	comment = $4
-		for (i = 5; i <= NF; i++)
-			comment = comment " " $i
-		if (NF < 5)
-			$5 = $4
-	}
-	$2 == "STD" {
-		printf("int\t%s();\n", $4) > sysdcl
-		printf("\t{ %d, %s },\t\t\t/* %d = %s */\n", \
-		    $3, $4, syscall, $5) > sysent
-		printf("\t\"%s\",\t\t\t/* %d = %s */\n", \
-		    $5, syscall, $5) > sysnames
-		printf("#define\tSYS_%s\t%d\n", \
-		    $5, syscall) > syshdr
-		syscall++
-		next
+	printf "/*\n * System call switch table.\n *\n" > sysdcl
+	printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysdcl
+
+	ncompat = split(compatopts,compat)
+	for (i = 1; i <= ncompat; i++) {
+		compat_upper[i] = toupper(compat[i])
+		compat_file[i] = sprintf("%s%s", syscompat_pref, compat[i])
+
+		printf "\n#ifdef %s\n", compat_upper[i] > compat_file[i]
+		printf "#define %s(func) __CONCAT(%s_,func)\n\n", \
+		    compat[i], compat[i] > compat_file[i]
 	}
-	$2 == "COMPAT" {
-		printf("int\to%s();\n", $4) > syscompat
-		printf("\t{ compat(%d,%s) },\t\t/* %d = old %s */\n", \
-		    $3, $4, syscall, $5) > sysent
-		printf("\t\"old.%s\",\t\t/* %d = old %s */\n", \
-		    $5, syscall, $5) > sysnames
-		printf("\t\t\t\t/* %d is old %s */\n", \
-		    syscall, comment) > syshdr
-		syscall++
-		next
+
+	printf "/*\n * System call names.\n *\n" > sysnames
+	printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames
+
+	printf "/*\n * System call numbers.\n *\n" > sysnumhdr
+	printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnumhdr
+
+	printf "/*\n * System call argument lists.\n *\n" > sysarghdr
+	printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysarghdr
+}
+NR == 1 {
+	printf " * created from%s\n */\n\n", $0 > sysdcl
+
+	printf "#define\ts(type)\tsizeof(type)\n\n" > sysent
+	printf "struct sysent %s[] = {\n",switchname > sysent
+
+	printf " * created from%s\n */\n\n", $0 > sysnames
+	printf "char *%s[] = {\n",namesname > sysnames
+
+	printf " * created from%s\n */\n\n", $0 > sysnumhdr
+
+	printf " * created from%s\n */\n\n", $0 > sysarghdr
+	printf "#define\tsyscallarg(x)\tunion { x datum; register_t pad; }\n" \
+		> sysarghdr
+	next
+}
+NF == 0 || $1 ~ /^;/ {
+	next
+}
+$1 ~ /^#[ 	]*include/ {
+	print > sysdcl
+	next
+}
+$1 ~ /^#[ 	]*if/ {
+	print > sysent
+	print > sysdcl
+	for (i = 1; i <= ncompat; i++)
+		print > compat_file[i]
+	print > sysnames
+	savesyscall = syscall
+	next
+}
+$1 ~ /^#[ 	]*else/ {
+	print > sysent
+	print > sysdcl
+	for (i = 1; i <= ncompat; i++)
+		print > compat_file[i]
+	print > sysnames
+	syscall = savesyscall
+	next
+}
+$1 ~ /^#/ {
+	print > sysent
+	print > sysdcl
+	for (i = 1; i <= ncompat; i++)
+		print > compat_file[i]
+	print > sysnames
+	next
+}
+syscall != $1 {
+	printf "%s: line %d: syscall number out of sync at %d\n", \
+	   infile, NR, syscall
+	printf "line is:\n"
+	print
+	exit 1
+}
+function parserr(was, wanted) {
+	printf "%s: line %d: unexpected %s (expected %s)\n", \
+	    infile, NR, was, wanted
+	exit 1
+}
+function parseline() {
+	f=3			# toss number and type
+	if ($NF != "}") {
+		funcalias=$NF
+		end=NF-1
+	} else {
+		funcalias=""
+		end=NF
 	}
-	$2 == "LIBCOMPAT" {
-		printf("int\to%s();\n", $4) > syscompat
-		printf("\t{ compat(%d,%s) },\t\t/* %d = old %s */\n", \
-		    $3, $4, syscall, $5) > sysent
-		printf("\t\"old.%s\",\t\t/* %d = old %s */\n", \
-		    $5, syscall, $5) > sysnames
-		printf("#define\tSYS_%s\t%d\t/* compatibility; still used by libc */\n", \
-		    $5, syscall) > syshdr
-		syscall++
-		next
+	if ($f != "{")
+		parserr($f, "{")
+	f++
+	if ($end != "}")
+		parserr($end, "}")
+	end--
+	if ($end != ";")
+		parserr($end, ";")
+	end--
+	if ($end != ")")
+		parserr($end, ")")
+	end--
+
+	f++			# toss return type
+
+	funcname=$f
+	if (funcalias == "")
+		funcalias=funcname
+	f++
+
+	if ($f != "(")
+		parserr($f, ")")
+	f++
+
+	argc= 0;
+	if (f == end) {
+		if ($f != "void")
+			parserr($f, "argument definition")
+		return
 	}
-	$2 == "OBSOL" {
-		printf("\t{ 0, nosys },\t\t\t/* %d = obsolete %s */\n", \
-		    syscall, comment) > sysent
-		printf("\t\"obs_%s\",\t\t\t/* %d = obsolete %s */\n", \
-		    $4, syscall, comment) > sysnames
-		printf("\t\t\t\t/* %d is obsolete %s */\n", \
-		    syscall, comment) > syshdr
-		syscall++
-		next
+
+	while (f <= end) {
+		argc++
+		argtype[argc]=""
+		oldf=""
+		while (f < end && $(f+1) != ",") {
+			if (argtype[argc] != "" && oldf != "*")
+				argtype[argc] = argtype[argc]" ";
+			argtype[argc] = argtype[argc]$f;
+			oldf = $f;
+			f++
+		}
+		if (argtype[argc] == "")
+			parserr($f, "argument definition")
+		argname[argc]=$f;
+		f += 2;			# skip name, and any comma
 	}
-	$2 == "UNIMPL" {
-		printf("\t{ 0, nosys },\t\t\t/* %d = %s */\n", \
-		    syscall, comment) > sysent
-		printf("\t\"#%d\",\t\t\t/* %d = %s */\n", \
-		    syscall, syscall, comment) > sysnames
-		syscall++
-		next
+}
+function putent(nodefs, declfile, compatwrap) {
+	# output syscall declaration for switch table
+	if (compatwrap == "")
+		printf("int\t%s();\n", funcname) > declfile
+	else
+		printf("int\t%s(%s)();\n", compatwrap, funcname) > declfile
+
+	# output syscall switch entry
+#	printf("\t{ { %d", argc) > sysent
+#	for (i = 1; i <= argc; i++) {
+#		if (i == 5) 		# wrap the line
+#			printf(",\n\t    ") > sysent
+#		else
+#			printf(", ") > sysent
+#		printf("s(%s)", argtypenospc[i]) > sysent
+#	}
+	printf("\t{ %d, ", argc) > sysent
+	if (argc == 0)
+		printf("0") > sysent
+	else if (compatwrap == "")
+		printf("s(struct %s_args)", funcname) > sysent
+	else
+		printf("s(struct %s_%s_args)", compatwrap, funcname) > sysent
+	if (compatwrap == "")
+		wfn = sprintf("%s", funcname);
+	else
+		wfn = sprintf("%s(%s)", compatwrap, funcname);
+	printf(",\n\t    %s },", wfn) > sysent
+	for (i = 0; i < (33 - length(wfn)) / 8; i++)
+		printf("\t") > sysent
+	if (compatwrap == "")
+		printf("/* %d = %s */\n", syscall, funcalias) > sysent
+	else
+		printf("/* %d = %s %s */\n", syscall, compatwrap,
+		    funcalias) > sysent
+
+	# output syscall name for names table
+	if (compatwrap == "")
+		printf("\t\"%s\",\t\t\t/* %d = %s */\n", funcalias, syscall,
+		    funcalias) > sysnames
+	else
+		printf("\t\"%s_%s\",\t/* %d = %s %s */\n", compatwrap,
+		    funcalias, syscall, compatwrap, funcalias) > sysnames
+
+	# output syscall number of header, if appropriate
+	if (nodefs == "" || nodefs == "NOARGS")
+		printf("#define\t%s%s\t%d\n", constprefix, funcalias,
+		    syscall) > sysnumhdr
+	else if (nodefs != "NODEF")
+		printf("\t\t\t\t/* %d is %s %s */\n", syscall,
+		    compatwrap, funcalias) > sysnumhdr
+
+	# output syscall argument structure, if it has arguments
+	if (argc != 0 && nodefs != "NOARGS") {
+		if (compatwrap == "")
+			printf("\nstruct %s_args {\n", funcname) > sysarghdr
+		else
+			printf("\nstruct %s_%s_args {\n", compatwrap,
+			    funcname) > sysarghdr
+		for (i = 1; i <= argc; i++)
+			printf("\tsyscallarg(%s) %s;\n", argtype[i],
+			    argname[i]) > sysarghdr
+		printf("};\n") > sysarghdr
 	}
-	{
-		printf "%s: line %d: unrecognized keyword %s\n", infile, NR, $2
-		exit 1
+}
+$2 == "STD" {
+	parseline()
+	putent("", sysdcl, "")
+	syscall++
+	next
+}
+$2 == "NODEF" || $2 == "NOARGS" {
+	parseline()
+	putent($2, sysdcl, "")
+	syscall++
+	next
+}
+$2 == "OBSOL" || $2 == "UNIMPL" {
+	if ($2 == "OBSOL")
+		comment="obsolete"
+	else
+		comment="unimplemented"
+	for (i = 3; i <= NF; i++)
+		comment=comment " " $i
+
+	printf("\t{ 0, 0,\n\t    nosys },\t\t\t\t/* %d = %s */\n", \
+	    syscall, comment) > sysent
+	printf("\t\"#%d (%s)\",\t\t/* %d = %s */\n", \
+	    syscall, comment, syscall, comment) > sysnames
+	if ($2 != "UNIMPL")
+		printf("\t\t\t\t/* %d is %s */\n", syscall, comment) > sysnumhdr
+	syscall++
+	next
+}
+{
+	for (i = 1; i <= ncompat; i++) {
+		if ($2 == compat_upper[i]) {
+			parseline();
+			putent("COMMENT", compat_file[i], compat[i])
+			syscall++
+			next
+		}
 	}
-	END {
-		printf("\n#else /* %s */\n", compat) > syscompat
-		printf("#define compat(n, name) 0, nosys\n") > syscompat
-		printf("#endif /* %s */\n\n", compat) > syscompat
+	printf "%s: line %d: unrecognized keyword %s\n", infile, NR, $2
+	exit 1
+}
+END {
+	printf "\n#undef\tsyscallarg\n" > sysarghdr
+
+        for (i = 1; i <= ncompat; i++) {
+		printf("\n#else /* %s */\n", compat_upper[i]) > compat_file[i]
+		printf("#define %s(func) nosys\n", compat[i]) > \
+		    compat_file[i]
+		printf("#endif /* %s */\n\n", compat_upper[i]) > compat_file[i]
+        }
 
-		printf("};\n\n") > sysent
-		printf("int\tnsysent = sizeof(sysent) / sizeof(sysent[0]);\n") > sysent
+	printf("};\n\n") > sysent
+	printf("int\tn%s= sizeof(%s) / sizeof(%s[0]);\n", switchname,
+	    switchname, switchname) > sysent
 
-		printf("};\n") > sysnames
-	} '
+	printf("};\n") > sysnames
+} '
 
-cat $sysdcl $syscompat $sysent >$syssw
+cat $sysdcl $syscompat_files $sysent > $syssw
 
-chmod 444 $sysnames $syshdr $syssw
+#chmod 444 $sysnames $syshdr $syssw