Fri Oct 28 23:44:33 2016 UTC ()

Fix arg64 computation for compat_netbsd32


(christos)

diff -r1.164 -r1.165 src/sys/kern/makesyscalls.sh

--- src/sys/kern/makesyscalls.sh 2016/01/26 23:46:37	1.164
+++ src/sys/kern/makesyscalls.sh 2016/10/28 23:44:32	1.165

 @@ -1,14 +1,14 @@
-#	$NetBSD: makesyscalls.sh,v 1.164 2016/01/26 23:46:37 pooka Exp $
+#	$NetBSD: makesyscalls.sh,v 1.165 2016/10/28 23:44:32 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
 @@ -460,26 +460,31 @@ $1 ~ /^#/ && intable {
 	# 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
 	printf "line is:\n"
 	print
 	exit 1
+}
 function isarg64(type) {
 	gsub("netbsd32_", "", type);
 	return type == "quad_t" || type == "off_t" \
 	    || type == "dev_t" ||  type == "time_t";
+}
 function parserr(was, wanted) {
 	printf "%s: line %d: unexpected %s (expected <%s>)\n", \
 	    infile, NR, was, wanted
 	printf "line is:\n"
 	print
 	exit 1
+}
 function fillerpsysent(syscall, flags, name, comment) {
 	return sprintf("\t{%s\n\t\t.sy_call = %s,\n\t},\t\t/* %d = filler */",\
 	    flags, name, syscall, comment);
+}
 function parseline() {
 	f=3			# toss number and type
 @@ -563,27 +568,27 @@ function parseline() {
 	# pipe is special in how to returns its values.
 	# So just generate it manually if present.
 	if (rumpable == 1 && fbase == "pipe") {
 		rumpable = 0;
 		rumphaspipe = 1;
+	}
 	if (fcompat != "") {
 		funcname=fprefix "___" fbase "" fcompat
 	} else {
 		funcname=fprefix "_" fbase
+	}
-	if (returntype == "quad_t" || returntype == "off_t") {
+	if (isarg64(returntype)) {
 		if (sycall_flags == "0")
 			sycall_flags = "SYCALL_RET_64";
 		else
 			sycall_flags = "SYCALL_RET_64 | " sycall_flags;
+	}
 	if (funcalias == "") {
 		funcalias=funcname
 		sub(/^([^_]+_)*sys_/, "", funcalias)
 		realname=fbase
 	} else {
 		realname=funcalias
+	}
 @@ -636,28 +641,27 @@ function parseline() {
 			f++
+		}
 		if (argtype[argc] == "")
 			parserr($f, "argument definition")
 		if (argtype[argc] == "off_t"  \
 		  || argtype[argc] == "dev_t" \
 		  || argtype[argc] == "time_t") {
 			if ((argalign % 2) != 0 && sysalign &&
 			    funcname != "sys_posix_fadvise") # XXX for now
 				parserr($f, "a padding argument")
 		} else {
 			argalign++;
+		}
-		if (argtype[argc] == "quad_t" || argtype[argc] == "off_t" \
+		if (isarg64(argtype[argc])) {
 		  || argtype[argc] == "dev_t" || argtype[argc] == "time_t") {
 			if (sycall_flags == "0")
 				sycall_flags = "SYCALL_ARG"argc-1"_64";
 			else
 				sycall_flags = "SYCALL_ARG"argc-1"_64 | " sycall_flags;
 			args64++;
+		}
 		if (index(argtype[argc], "*") != 0 && ptr == 0) {
 			if (sycall_flags == "0")
 				sycall_flags = "SYCALL_ARG_PTR";
 			else
 				sycall_flags = "SYCALL_ARG_PTR | " sycall_flags;
 			ptr = 1;
+		}