 @@ -1,15 +1,15 @@
 #! /bin/sh -
-#	$NetBSD: makesyscalls.sh,v 1.91 2009/11/26 17:23:48 pooka Exp $
+#	$NetBSD: makesyscalls.sh,v 1.92 2009/12/13 04:47:45 matt 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
 @@ -430,26 +430,32 @@ function parseline() {
 	if (rumpable == 1 && fbase == "pipe") {
 		rumpable = 0;
 		rumphaspipe = 1;
+	}
 	funcstdname=fprefix "_" fbase
 	if (fcompat != "") {
 		funcname=fprefix "___" fbase "" fcompat
 		wantrename=1
 	} else {
 		funcname=funcstdname
 		wantrename=0
+	}
 	if (returntype == "quad_t" || returntype == "off_t") {
 		if (sycall_flags == "0")
 			sycall_flags = "SYCALL_RET_64";
 		else
 			sycall_flags = "SYCALL_RET_64 | " sycall_flags;
+	}
 	if (funcalias == "") {
 		funcalias=funcname
 		sub(/^([^_]+_)*sys_/, "", funcalias)
+	}
 	f++
 	if ($f != "(")
 		parserr($f, "(")
 	f++
 	argc=0;
 	argalign=0;
 @@ -463,26 +469,27 @@ function parseline() {
+	}
 	# some system calls (open() and fcntl()) can accept a variable
 	# number of arguments.  If syscalls accept a variable number of
 	# arguments, they must still have arguments specified for
 	# the remaining argument "positions," because of the way the
 	# kernel system call argument handling works.
+	#
 	# Indirect system calls, e.g. syscall(), are exceptions to this
 	# rule, since they are handled entirely by machine-dependent code
 	# and do not need argument structures built.
 	isvarargs = 0;
 	args64 = 0;
 	while (f <= end) {
 		if ($f == "...") {
 			f++;
 			isvarargs = 1;
 			varargc = argc;
 			continue;
+		}
 		argc++
 		argtype[argc]=""
 		oldf=""
 		while (f < end && $(f+1) != ",") {
 			if (argtype[argc] != "" && oldf != "*")
 				argtype[argc] = argtype[argc]" ";
 @@ -491,29 +498,38 @@ 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 (sycall_flags == "0")
 				sycall_flags = "SYCALL_ARG"argc-1"_64";
 			else
 				sycall_flags = "SYCALL_ARG"argc-1"_64 | " sycall_flags;
 			args64++;
+		}
 		argname[argc]=$f;
 		f += 2;			# skip name, and any comma
+	}
 	if (args64 > 0)
 		sycall_flags = "SYCALL_NARGS64_VAL("args64") | " sycall_flags;
 	# must see another argument after varargs notice.
 	if (isvarargs) {
 		if (argc == varargc)
 			parserr($f, "argument definition")
 	} else
 		varargc = argc;
+}
 function printproto(wrap) {
 	printf("/* syscall: \"%s%s\" ret: \"%s\" args:", wrap, funcalias,
 	    returntype) > sysnumhdr
 	for (i = 1; i <= varargc; i++)
 		printf(" \"%s\"", argtype[i]) > sysnumhdr

 @@ -1,14 +1,14 @@
-/*	$NetBSD: systm.h,v 1.237 2009/11/03 05:23:28 dyoung Exp $	*/
+/*	$NetBSD: systm.h,v 1.238 2009/12/13 04:47:45 matt Exp $	*/
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -118,27 +118,42 @@ extern struct sysent {		/* system call t
 	short	sy_argsize;	/* total size of arguments */
 	int	sy_flags;	/* flags. see below */
 	sy_call_t *sy_call;     /* implementing function */
 } sysent[];
 extern int nsysent;
 #if	BYTE_ORDER == BIG_ENDIAN
 #define	SCARG(p,k)	((p)->k.be.datum)	/* get arg from args pointer */
 #elif	BYTE_ORDER == LITTLE_ENDIAN
 #define	SCARG(p,k)	((p)->k.le.datum)	/* get arg from args pointer */
 #else
 #error	"what byte order is this machine?"
 #endif
-#define	SYCALL_INDIRECT	0x0002	/* indirect (ie syscall() or __syscall()) */
+#define	SYCALL_INDIRECT	0x0000002 /* indirect (ie syscall() or __syscall()) */
 #define	SYCALL_NARGS64_MASK	0x000f000 /* count of 64bit args */
 #define SYCALL_RET_64	0x0010000 /* retval is a 64bit integer value */
 #define SYCALL_ARG0_64  0x0020000
 #define SYCALL_ARG1_64  0x0040000
 #define SYCALL_ARG2_64  0x0080000
 #define SYCALL_ARG3_64  0x0100000
 #define SYCALL_ARG4_64  0x0200000
 #define SYCALL_ARG5_64  0x0400000
 #define SYCALL_ARG6_64  0x0800000
 #define SYCALL_ARG7_64  0x1000000
 #define SYCALL_RET_64_P(sy)	((sy)->sy_flags & SYCALL_RET_64)
 #define SYCALL_ARG_64_P(sy, n)	((sy)->sy_flags & (SYCALL_ARG0_64 << (n)))
 #define	SYCALL_ARG_64_MASK(sy)	(((sy)->sy_flags >> 17) & 0xff)
 #define	SYCALL_NARGS64(sy)	(((sy)->sy_flags >> 12) & 0x0f)
 #define	SYCALL_NARGS64_VAL(n)	((n) << 12)
 extern int boothowto;		/* reboot flags, from console subsystem */
 #define	bootverbose	(boothowto & AB_VERBOSE)
 #define	bootquiet	(boothowto & AB_QUIET)
 extern void (*v_putc)(int); /* Virtual console putc routine */
 /*
  * General function declarations.
  */
 void	voidop(void);
 int	nullop(void *);
 int	enodev(void);