 @@ -1,14 +1,14 @@
-#	$NetBSD: makesyscalls.sh,v 1.153 2015/05/09 10:57:04 pooka Exp $
+#	$NetBSD: makesyscalls.sh,v 1.154 2015/09/24 14:30:52 christos Exp $
+#
 # Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. All advertising materials mentioning features or use of this software
 @@ -72,33 +72,37 @@ rumpnoflags="\n\t\t.sy_flags = SYCALL_NO
 rumpnosys="(sy_call_t *)rumpns_enosys"
 rumpnomodule="(sy_call_t *)rumpns_sys_nomodule"
 case $1 in
 /*)	. $1;;
 *)	. ./$1;;
 esac
 # tmp files:
 sysdcl="sysent.dcl"
 sysprotos="sys.protos"
 syscompat_pref="sysent."
 sysent="sysent.switch"
-sysnamesbottom="sysnames.bottom"
+sysnamesbottom="$sysnames.bottom"
 sysnamesfriendly="$sysnames.friendly"
 rumptypes="rumphdr.types"
 rumpprotos="rumphdr.protos"
 systracetmp="systrace.$$"
 systraceret="systraceret.$$"
-trap "rm $sysdcl $sysprotos $sysent $sysnamesbottom $rumpsysent $rumptypes $rumpprotos $systracetmp $systraceret" 0
+cleanup() {
     rm $sysdcl $sysprotos $sysent $sysnamesbottom $sysnamesfriendly $rumpsysent $rumptypes $rumpprotos $systracetmp $systraceret
+}
 trap "cleanup" 0
 # Awk program (must support nawk extensions)
 # Use "awk" at Berkeley, "nawk" or "gawk" elsewhere.
 awk=${AWK:-awk}
 # Does this awk have a "toupper" function?
 have_toupper="$($awk 'BEGIN { print toupper("true"); exit; }' 2>/dev/null)"
 # If this awk does not define "toupper" then define our own.
 if [ "$have_toupper" = TRUE ] ; then
 	# Used awk (GNU awk or nawk) provides it
 	toupper=
 else
 @@ -161,27 +165,28 @@ BEGIN {
 	switchname = \"$switchname\"
 	namesname = \"$namesname\"
 	constprefix = \"$constprefix\"
 	registertype = \"$registertype\"
 	sysalign=\"$sysalign\"
 	if (!registertype) {
 	    registertype = \"register_t\"
+	}
 	nsysent = \"$nsysent\"
 	sysdcl = \"$sysdcl\"
 	syscompat_pref = \"$syscompat_pref\"
 	sysent = \"$sysent\"
-	sysnamesbottom = \"$sysnamesbottom\"
+	sysnamesbottom = \"${sysnames}.bottom\"
 	sysnamesfriendly = \"${sysnames}.friendly\"
 	rumpprotos = \"$rumpprotos\"
 	rumptypes = \"$rumptypes\"
 	sys_nosys = \"$sys_nosys\"
 	maxsysargs = \"$maxsysargs\"
 	rumpnoflags=\"$rumpnoflags\"
 	rumpnosys=\"$rumpnosys\"
 	rumpnomodule=\"$rumpnomodule\"
 	infile = \"$2\"
 	compatopts = \"$compatopts\"
 	"'
 	if (rumpcalls != "/dev/null")
 @@ -301,28 +306,32 @@ NR == 1 {
 	printf "\nvoid rumpns_sys_nomodule(void);\n" > rumpcalls
 	printf "\n#ifndef RUMP_CLIENT\n" > rumpsysent
 	printf "int rumpns_enosys(void);\n" > rumpsysent
 	printf "#define\ts(type)\tsizeof(type)\n" > rumpsysent
 	printf "#define\tn(type)\t(sizeof(type)/sizeof (%s))\n", registertype > rumpsysent
 	printf "#define\tns(type)\tn(type), s(type)\n\n", registertype > rumpsysent
 	printf "struct sysent rump_sysent[] = {\n" > rumpsysent
 	# System call names are included by userland (kdump(1)), so
 	# hide the include files from it.
 	printf "#if defined(_KERNEL_OPT)\n" > sysnames
 	printf "#else /* _KERNEL_OPT */\n" > sysnamesbottom
 	printf "#include <sys/null.h>\n" > sysnamesbottom
 	printf "#endif /* _KERNEL_OPT */\n\n" > sysnamesbottom
 	printf "const char *const %s[] = {\n",namesname > sysnamesbottom
 	printf "\n\n/* libc style syscall names */\n" > sysnamesfriendly
 	printf "const char *const alt%s[] = {\n", namesname > sysnamesfriendly
 	printf " * created from%s\n */\n\n", $0 > sysnumhdr
 	printf "#ifndef _" constprefix "SYSCALL_H_\n" > sysnumhdr
 	printf "#define	_" constprefix "SYSCALL_H_\n\n" > sysnumhdr
 	printf " * created from%s\n */\n\n", $0 > sysarghdr
 	printf "#ifndef _" constprefix "SYSCALLARGS_H_\n" > sysarghdr
 	printf "#define	_" constprefix "SYSCALLARGS_H_\n\n" > sysarghdr
 	printf " * created from%s\n */\n\n", $0 > rumpcallshdr
 	printf "#ifndef _RUMP_RUMP_SYSCALLS_H_\n" > rumpcallshdr
 	printf "#define _RUMP_RUMP_SYSCALLS_H_\n\n" > rumpcallshdr
 	printf "#ifdef _KERNEL\n" > rumpcallshdr
 @@ -432,26 +441,27 @@ $1 ~ /^#/ && intable {
 			exit 1
+		}
 		if (auto_skip == savedepth) {
 			print > sysautoload
+		}
 		auto_skip = skip_auto[savedepth];
 		savedepth--
+	}
 	print > sysent
 	print > sysarghdr
 	print > sysnumhdr
 	print > sysprotos
 	print > sysnamesbottom
 	print > sysnamesfriendly
 	print > systrace
 	print > systracetmp
 	print > systraceret
 	# XXX: technically we do not want to have conditionals in rump,
 	# but it is easier to just let the cpp handle them than try to
 	# figure out what we want here in this script
 	print > rumpsysent
 	next
+}
 syscall != $1 {
 	printf "%s: line %d: syscall number out of sync at %d\n", \
 	   infile, NR, syscall
 @@ -842,26 +852,32 @@ function putent(type, compatwrap) {
 	else
 		wfn = compatwrap "(" funcname ")";
 	wfn_cast="(sy_call_t *)" wfn
 	if (sycall_flags != "0")
 		flags = "\n\t\t.sy_flags = " sycall_flags ","
 	else
 		flags = ""
 	printf("%s\n\t\t.sy_call = %s\n\t},", flags, wfn_cast) > sysent
 	printf("\t\t/* %d = %s%s */\n", syscall, compatwrap_, funcalias) > sysent
 	# output syscall name for names table
 	printf("\t/* %3d */\t\"%s%s\",\n", syscall, compatwrap_, funcalias) \
 	    > sysnamesbottom
 	if (compatwrap_ != "" || fbase == funcalias)
 		printf("\t/* %3d */\tNULL, /* %s%s */\n", syscall, \
 		    compatwrap_, funcalias) > sysnamesfriendly
 	else
 		printf("\t/* %3d */\t\"%s%s\",\n", syscall, compatwrap_, \
 		    fbase) > sysnamesfriendly
 	# output syscall number of header, if appropriate
 	if (type == "STD" || type == "NOARGS" || type == "INDIR" || \
 	    type == "NOERR") {
 		# output a prototype, to be used to generate lint stubs in
 		# libc.
 		printproto("")
 	} else if (type == "COMPAT" || type == "EXTERN") {
 		# Just define the syscall number with a comment.  These
 		# may be used by compatibility stubs in libc.
 		printproto(compatwrap_)
+	}
 @@ -1031,26 +1047,28 @@ $2 == "OBSOL" || $2 == "UNIMPL" || $2 ==
 		comment="unimplemented"
 	for (i = 3; i <= NF; i++)
 		comment=comment " " $i
 	if ($2 == "IGNORED")
 		sys_stub = "(sy_call_t *)nullop";
 	else
 		sys_stub = sys_nosys;
 	print fillerpsysent(syscall, "", sys_stub, comment) > sysent
 	print fillerpsysent(syscall, rumpnoflags, rumpnosys, comment) > rumpsysent
 	printf("\t/* %3d */\t\"#%d (%s)\",\n", syscall, syscall, comment) \
 	    > sysnamesbottom
 	printf("\t/* %3d */\tNULL, /* %s */\n", syscall, comment) \
 	    > sysnamesfriendly
 	if ($2 != "UNIMPL")
 		printf("\t\t\t\t/* %d is %s */\n", syscall, comment) > sysnumhdr
 	syscall++
 	next
+}
 $2 == "EXTERN" {
 	parseline()
 	putent("EXTERN", "")
 	syscall++
 	next
+}
+{
 	for (i = 1; i <= ncompat; i++) {
 @@ -1096,52 +1114,56 @@ END {
+	}
 	maxsyscall = syscall
 	if (nsysent) {
 		if (syscall > nsysent) {
 			printf("%s: line %d: too many syscalls [%d > %d]\n", infile, NR, syscall, nsysent)
 			exit 1
+		}
 		while (syscall < nsysent) {
 			print fillerpsysent(syscall, "", sys_nosys, "filler") > sysent
 			print fillerpsysent(syscall, rumpnoflags, rumpnosys, "filler") > rumpsysent
 			printf("\t/* %3d */\t\"# filler\",\n", syscall) \
 			    > sysnamesbottom
 			printf("\t/* %3d */\tNULL, /* filler */\n", syscall) \
 			    > sysnamesfriendly
 			syscall++
+		}
+	}
 	printf("};\n") > sysent
 	printf("};\n") > rumpsysent
 	printf("CTASSERT(__arraycount(rump_sysent) == SYS_NSYSENT);\n") > rumpsysent
 	printf("__strong_alias(rumpns_sysent,rump_sysent);\n") > rumpsysent
 	printf("#endif /* RUMP_CLIENT */\n") > rumpsysent
 	if (haverumpcalls)
 		printf("#endif /* !RUMP_CLIENT */\n") > sysprotos
 	printf("};\n") > sysnamesbottom
 	printf("};\n") > sysnamesfriendly
 	printf("#define\t%sMAXSYSCALL\t%d\n", constprefix, maxsyscall) > sysnumhdr
 	if (nsysent)
 		printf("#define\t%sNSYSENT\t%d\n", constprefix, nsysent) > sysnumhdr
 	printf "\tdefault:\n\t\t*n_args = 0;\n\t\tbreak;\n\t};\n}\n" > systrace
 	printf "\tdefault:\n\t\tbreak;\n\t};\n\tif (p != NULL)\n\t\tstrlcpy(desc, p, descsz);\n}\n" > systracetmp
 	printf "\tdefault:\n\t\tbreak;\n\t};\n\tif (p != NULL)\n\t\tstrlcpy(desc, p, descsz);\n}\n" > systraceret
 } '
 cat $sysprotos >> $sysarghdr
 echo "#endif /* _${constprefix}SYSCALL_H_ */" >> $sysnumhdr
 echo "#endif /* _${constprefix}SYSCALLARGS_H_ */" >> $sysarghdr
 echo "};" >> $sysautoload
 printf "\n#endif /* _RUMP_RUMP_SYSCALLS_H_ */\n" >> $rumpprotos
 cat $sysdcl $sysent > $syssw
 cat $sysnamesbottom >> $sysnames
 cat $sysnamesfriendly >> $sysnames
 cat $rumpsysent >> $rumpcalls
 touch $rumptypes
 cat $rumptypes >> $rumpcallshdr
 echo >> $rumpcallshdr
 cat $rumpprotos >> $rumpcallshdr
 #chmod 444 $sysnames $sysnumhdr $syssw
 cat $systracetmp >> $systrace
 cat $systraceret >> $systrace
 echo Generated following files: