 @@ -1,14 +1,14 @@
-/*	$NetBSD: defs.h,v 1.104 2018/08/27 16:04:45 riastradh Exp $	*/
+/*	$NetBSD: defs.h,v 1.104.2.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -100,63 +100,69 @@
 extern const char *progname;
 #define	setprogname(s)	((void)(progname = (s)))
 #define	getprogname()	(progname)
 #define ARRCHR '#'
 /*
  * The next two lines define the current version of the config(1) binary,
  * and the minimum version of the configuration files it supports.
  */
 #define CONFIG_VERSION		20180827
 #define CONFIG_MINVERSION	0
 struct where {
 	const char *w_srcfile;		/* file name where we are defined */
 	u_short	w_srcline;		/* line number where we are defined */
 };
 /*
  * Name/value lists.  Values can be strings or pointers and/or can carry
  * integers.  The names can be NULL, resulting in simple value lists.
  */
 struct nvlist {
 	struct nvlist	*nv_next;
 	const char	*nv_name;
 	const char	*nv_str;
 	void		*nv_ptr;
 	long long	nv_num;
 	int		nv_ifunit;		/* XXX XXX XXX */
 	int		nv_flags;
 #define	NV_DEPENDED	1
 	struct where	nv_where;
 };
 /*
  * Kernel configurations.
  */
 struct config {
 	TAILQ_ENTRY(config) cf_next;
 	const char *cf_name;		/* "netbsd" */
 	int	cf_lineno;		/* source line */
 	const char *cf_fstype;		/* file system type */
 	struct	nvlist *cf_root;	/* "root on ra0a" */
 	struct	nvlist *cf_dump;	/* "dumps on ra0b" */
 	struct where	cf_where;
 };
 /*
  * Option definition list
  */
 struct defoptlist {
 	struct defoptlist *dl_next;
 	const char *dl_name;
 	const char *dl_value;
 	const char *dl_lintvalue;
 	int dl_obsolete;
 	struct nvlist *dl_depends;
 	struct where	dl_where;
 };
 struct files;
 TAILQ_HEAD(filelist, files);
 struct module {
 	const char		*m_name;
 #if 1
 	struct attrlist		*m_deps;
 #else
 	struct attrlist		*m_attrs;
 	struct modulelist	*m_deps;
 #endif
 @@ -189,26 +195,27 @@ struct attr {
 #define	a_files		a_m.m_files
 #define	a_weight	a_m.m_weight
 	/* "interface attribute" */
 	uint8_t	a_iattr;		/* true => allows children */
 	uint8_t a_deselected;		/* deselected */
 	struct	loclist *a_locs;	/* locators required */
 	int	a_loclen;		/* length of above list */
 	struct	nvlist *a_devs;		/* children */
 	struct	nvlist *a_refs;		/* parents */
 	/* "device class" */
 	const char *a_devclass;		/* device class described */
 	struct where a_where;
 };
 /*
  * List of attributes.
  */
 struct attrlist {
 	struct attrlist *al_next;
 	struct attr *al_this;
 };
 /*
  * List of locators. (Either definitions or uses...)
+ *
 @@ -267,97 +274,92 @@ struct devbase {
 	TAILQ_ENTRY(devbase) d_next;
 	int 	d_level;
 	struct devbase *d_levelparent;
 	int	d_isdef;		/* set once properly defined */
 	int	d_ispseudo;		/* is a pseudo-device */
 	devmajor_t d_major;		/* used for "root on sd0", e.g. */
 	struct	attrlist *d_attrs;	/* attributes, if any */
 	int	d_umax;			/* highest unit number + 1 */
 	struct	devi *d_ihead;		/* first instance, if any */
 	struct	devi **d_ipp;		/* used for tacking on more instances */
 	struct	deva *d_ahead;		/* first attachment, if any */
 	struct	deva **d_app;		/* used for tacking on attachments */
 	struct	attr *d_classattr;	/* device class attribute (if any) */
-	const char *d_srcfile;		/* file name where we are defined */
+	struct	where d_where;
 	u_short	d_srcline;		/* line number where we are defined */
 };
 struct deva {
 	const char *d_name;		/* name of attachment, e.g. "com_isa" */
 	TAILQ_ENTRY(deva) d_next;	/* list of all instances */
 	struct	deva *d_bsame;		/* list on same base */
 	int	d_isdef;		/* set once properly defined */
 	struct	devbase *d_devbase;	/* the base device */
 	struct	nvlist *d_atlist;	/* e.g., "at tg" (attr list) */
 	struct	attrlist *d_attrs;	/* attributes, if any */
 	struct	devi *d_ihead;		/* first instance, if any */
 	struct	devi **d_ipp;		/* used for tacking on more instances */
-	const char *d_srcfile;		/* file name where we are defined */
+	struct	where d_where;
 	u_short	d_srcline;		/* line number where we are defined */
 };
 /*
  * An "instance" of a device.  The same instance may be listed more
  * than once, e.g., "xx0 at isa? port FOO" + "xx0 at isa? port BAR".
+ *
  * After everything has been read in and verified, the devi's are
  * "packed" to collect all the information needed to generate ioconf.c.
  * In particular, we try to collapse multiple aliases into a single entry.
  * We then assign each "primary" (non-collapsed) instance a cfdata index.
  * Note that there may still be aliases among these.
  */
 struct devi {
 	/* created while parsing config file */
 	const char *i_name;	/* e.g., "sd0" */
 	int	i_unit;		/* unit from name, e.g., 0 */
 	struct	devbase *i_base;/* e.g., pointer to "sd" base */
 	TAILQ_ENTRY(devi) i_next; /* list of all instances */
 	struct	devi *i_bsame;	/* list on same base */
 	struct	devi *i_asame;	/* list on same base attachment */
 	struct	devi *i_alias;	/* other aliases of this instance */
 	const char *i_at;	/* where this is "at" (NULL if at root) */
 	struct	pspec *i_pspec;	/* parent spec (NULL if at root) */
 	struct	deva *i_atdeva;
 	const char **i_locs;	/* locators (as given by pspec's iattr) */
 	int	i_cfflags;	/* flags from config line */
 	int	i_lineno;	/* line # in config, for later errors */
 	const char *i_srcfile;	/* file it appears in */
 	int	i_level;	/* position between negated instances */
 	int	i_active;
 #define	DEVI_ORPHAN	0	/* instance has no active parent */
 #define	DEVI_ACTIVE	1	/* instance has an active parent */
 #define	DEVI_IGNORED	2	/* instance's parent has been removed */
 #define DEVI_BROKEN	3	/* instance is broken (syntax error) */
 	int	i_pseudoroot;	/* instance is pseudoroot */
 	/* created during packing or ioconf.c generation */
 	short	i_collapsed;	/* set => this alias no longer needed */
 	u_short	i_cfindex;	/* our index in cfdata */
 	int	i_locoff;	/* offset in locators.vec */
 	struct	where i_where;
 };
 /* special units */
 #define	STAR	(-1)		/* unit number for, e.g., "sd*" */
 #define	WILD	(-2)		/* unit number for, e.g., "sd?" */
 /*
  * Files (*.c, *.S, or *.o).  This structure defines the common fields
  * between the two.
  */
 struct files {
 	TAILQ_ENTRY(files) fi_next;
 	TAILQ_ENTRY(files) fi_snext;	/* per-suffix list */
-	const char *fi_srcfile;	/* the name of the "files" file that got us */
+	struct	where fi_where;
 	u_short	fi_srcline;	/* and the line number */
 	u_char fi_flags;	/* as below */
 	const char *fi_tail;	/* name, i.e., strrchr(fi_path, '/') + 1 */
 	const char *fi_base;	/* tail minus ".c" (or whatever) */
 	const char *fi_dir;	/* path to file */
 	const char *fi_path;	/* full file path */
 	const char *fi_prefix;	/* any file prefix */
 	const char *fi_buildprefix;	/* prefix in builddir */
 	int fi_suffix;		/* single char suffix */
 	size_t fi_len;		/* path string length */
 	struct condexpr *fi_optx; /* options expression */
 	struct nvlist *fi_optf; /* flattened version of above, if needed */
 	const char *fi_mkrule;	/* special make rule, if any */
 	struct attr *fi_attr;	/* owner attr */
 @@ -408,33 +410,32 @@ struct condexpr {
 struct prefix;
 SLIST_HEAD(prefixlist, prefix);
 struct prefix {
 	SLIST_ENTRY(prefix)	pf_next;	/* next prefix in stack */
 	const char		*pf_prefix;	/* the actual prefix */
 };
 /*
  * Device major informations.
  */
 struct devm {
 	TAILQ_ENTRY(devm) dm_next;
 	const char	*dm_srcfile;	/* the name of the "majors" file */
 	u_short		dm_srcline;	/* the line number */
 	const char	*dm_name;	/* [bc]devsw name */
 	devmajor_t	dm_cmajor;	/* character major */
 	devmajor_t	dm_bmajor;	/* block major */
 	struct condexpr	*dm_opts;	/* options */
 	struct nvlist	*dm_devnodes;	/* information on /dev nodes */
 	struct where dm_where;
 };
 /*
  * Hash tables look up name=value pairs.  The pointer value of the name
  * is assumed to be constant forever; this can be arranged by interning
  * the name.  (This is fairly convenient since our lexer does this for
  * all identifier-like strings---it has to save them anyway, lest yacc's
  * look-ahead wipe out the current one.)
  */
 struct hashtab;
 int lkmmode;
 const char *conffile;		/* source file, e.g., "GENERIC.sparc" */
 @@ -571,40 +572,40 @@ extern	int Sflag;
 void	addoption(const char *, const char *);
 void	addfsoption(const char *);
 void	addmkoption(const char *, const char *);
 void	appendmkoption(const char *, const char *);
 void	appendcondmkoption(struct condexpr *, const char *, const char *);
 void	deffilesystem(struct nvlist *, struct nvlist *);
 void	defoption(const char *, struct defoptlist *, struct nvlist *);
 void	defflag(const char *, struct defoptlist *, struct nvlist *, int);
 void	defparam(const char *, struct defoptlist *, struct nvlist *, int);
 void	deloption(const char *, int);
 void	delfsoption(const char *, int);
 void	delmkoption(const char *, int);
 int	devbase_has_instances(struct devbase *, int);
-int	is_declared_option(const char *);
+struct where *find_declared_option(const char *);
 int	deva_has_instances(struct deva *, int);
 void	setupdirs(void);
 void	fixmaxusers(void);
 void	fixmkoption(void);
 const char *strtolower(const char *);
 /* tests on option types */
 #define OPT_FSOPT(n)	(nvhash_lookup(deffstab, (n)) != NULL)
 #define OPT_DEFOPT(n)	(dlhash_lookup(defopttab, (n)) != NULL)
 #define OPT_DEFFLAG(n)	(dlhash_lookup(defflagtab, (n)) != NULL)
 #define OPT_DEFPARAM(n)	(dlhash_lookup(defparamtab, (n)) != NULL)
 #define OPT_OBSOLETE(n)	(dlhash_lookup(obsopttab, (n)) != NULL)
-#define DEFINED_OPTION(n) (is_declared_option((n)))
+#define DEFINED_OPTION(n) (find_declared_option((n)))
 /* main.c */
 void	logconfig_include(FILE *, const char *);
 /* mkdevsw.c */
 int	mkdevsw(void);
 /* mkheaders.c */
 int	mkheaders(void);
 int	moveifchanged(const char *, const char *);
 int	emitlocs(void);
 int	emitioconfh(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: files.c,v 1.36 2016/09/09 21:09:11 christos Exp $	*/
+/*	$NetBSD: files.c,v 1.36.16.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)files.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: files.c,v 1.36 2016/09/09 21:09:11 christos Exp $");
+__RCSID("$NetBSD: files.c,v 1.36.16.1 2020/03/09 15:22:21 martin Exp $");
 #include <sys/param.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "defs.h"
 extern const char *yyfile;
 int nallfiles;
 @@ -148,39 +148,39 @@ addfile(const char *path, struct condexp
 		free(fi);
 		if ((fi = ht_lookup(pathtab, path)) == NULL)
 			panic("addfile: ht_lookup(%s)", path);
 		/*
 		 * If it's a duplicate entry, it is must specify a make
 		 * rule, and only a make rule, and must come from
 		 * a different source file than the original entry.
 		 * If it does otherwise, it is disallowed.  This allows
 		 * machine-dependent files to override the compilation
 		 * options for specific files.
 		 */
 		if (rule != NULL && optx == NULL && flags == 0 &&
-		    yyfile != fi->fi_srcfile) {
+		    yyfile != fi->fi_where.w_srcfile) {
 			fi->fi_mkrule = rule;
 			return;
+		}
 		cfgerror("duplicate file %s", path);
-		cfgxerror(fi->fi_srcfile, fi->fi_srcline,
+		cfgxerror(fi->fi_where.w_srcfile, fi->fi_where.w_srcline,
 		    "here is the original definition");
 		goto bad;
+	}
 	memcpy(base, tail, baselen);
 	base[baselen] = '\0';
-	fi->fi_srcfile = yyfile;
+	fi->fi_where.w_srcfile = yyfile;
-	fi->fi_srcline = currentline();
+	fi->fi_where.w_srcline = currentline();
 	fi->fi_flags = flags;
 	fi->fi_path = path;
 	fi->fi_tail = tail;
 	fi->fi_base = intern(base);
 	fi->fi_dir = intern(dir);
 	fi->fi_prefix = SLIST_EMPTY(&prefixes) ? NULL :
 			SLIST_FIRST(&prefixes)->pf_prefix;
 	fi->fi_buildprefix = SLIST_EMPTY(&buildprefixes) ? NULL :
 			SLIST_FIRST(&buildprefixes)->pf_prefix;
 	fi->fi_len = strlen(path);
 	fi->fi_suffix = path[fi->fi_len - 1];
 	fi->fi_optx = optx;
 	fi->fi_optf = NULL;
 @@ -194,27 +194,27 @@ addfile(const char *path, struct condexp
 		break;
 	case 'S':
 		fi->fi_suffix = 's';
 		/* FALLTHRU */
 	case 's':
 		TAILQ_INSERT_TAIL(&allsfiles, fi, fi_snext);
 		TAILQ_INSERT_TAIL(&allfiles, fi, fi_next);
 		break;
 	case 'o':
 		TAILQ_INSERT_TAIL(&allofiles, fi, fi_snext);
 		TAILQ_INSERT_TAIL(&allfiles, fi, fi_next);
 		break;
 	default:
-		cfgxerror(fi->fi_srcfile, fi->fi_srcline,
+		cfgxerror(fi->fi_where.w_srcfile, fi->fi_where.w_srcline,
 		    "unknown suffix");
 		break;
+	}
 	CFGDBG(3, "file added `%s' at order score %d", fi->fi_path, fi->fi_order);
 	nallfiles++;
 	return;
  bad:
 	if (optx != NULL) {
 		condexpr_destroy(optx);
+	}
+}
 static void
 @@ -252,27 +252,27 @@ checkfiles(void)
 		unchecked = &TAILQ_NEXT(last, fi_next);
+}
 /*
  * Auxiliary function for checkfiles, called from expr_eval.
  * We are not actually interested in the expression's value.
  */
 static int
 checkaux(const char *name, void *context)
+{
 	struct files *fi = context;
 	if (ht_lookup(devbasetab, name) == NULL) {
-		cfgxerror(fi->fi_srcfile, fi->fi_srcline,
+		cfgxerror(fi->fi_where.w_srcfile, fi->fi_where.w_srcline,
 		    "`%s' is not a countable device",
 		    name);
 		/* keep fixfiles() from complaining again */
 		fi->fi_flags |= FI_HIDDEN;
+	}
 	return (0);
+}
 static int
 cmpfiles(const void *a, const void *b)
+{
 	const struct files * const *fia = a, * const *fib = b;
 	int sa = (*fia)->fi_order;
 @@ -346,30 +346,30 @@ fixfiles(void)
 			if ((ofi = ht_lookup(basetab, fi->fi_base)) == NULL)
 				panic("fixfiles ht_lookup(%s)", fi->fi_base);
 			/*
 			 * If the new file comes from a different source,
 			 * allow the new one to override the old one.
 			 */
 			if (fi->fi_path != ofi->fi_path) {
 				if (ht_replace(basetab, fi->fi_base, fi) != 1)
 					panic("fixfiles ht_replace(%s)",
 					    fi->fi_base);
 				ofi->fi_flags &= (u_char)~FI_SEL;
 				ofi->fi_flags |= FI_HIDDEN;
 			} else {
-				cfgxerror(fi->fi_srcfile, fi->fi_srcline,
+				cfgxerror(fi->fi_where.w_srcfile, fi->fi_where.w_srcline,
 				    "object file collision on %s.o, from %s",
 				    fi->fi_base, fi->fi_path);
-				cfgxerror(ofi->fi_srcfile, ofi->fi_srcline,
+				cfgxerror(ofi->fi_where.w_srcfile, ofi->fi_where.w_srcline,
 				    "here is the previous file: %s",
 				    ofi->fi_path);
 				err = 1;
+			}
+		}
 		fi->fi_flags |= FI_SEL;
 		nselfiles++;
 		CFGDBG(3, "file selected `%s'", fi->fi_path);
 		/* Add other files to the default "netbsd" attribute. */
 		if (fi->fi_attr == NULL) {
 			addfiletoattr(allattr.a_name, fi);
+		}
 @@ -402,88 +402,92 @@ fixdevsw(void)
 	int error;
 	struct devm *dm, *res;
 	struct hashtab *fixdevmtab;
 	char mstr[16];
 	error = 0;
 	fixdevmtab = ht_new();
 	TAILQ_FOREACH(dm, &alldevms, dm_next) {
 		res = ht_lookup(fixdevmtab, intern(dm->dm_name));
 		if (res != NULL) {
 			if (res->dm_cmajor != dm->dm_cmajor ||
 			    res->dm_bmajor != dm->dm_bmajor) {
-				cfgxerror(res->dm_srcfile, res->dm_srcline,
+				cfgxerror(res->dm_where.w_srcfile,
-					"device-major '%s' "
+				    res->dm_where.w_srcline,
-					"block %d, char %d redefined"
+				    "device-major '%s' "
-					" at %s:%d as block %d, char %d",
+				    "block %d, char %d redefined"
-					res->dm_name,
+				    " at %s:%d as block %d, char %d",
-					res->dm_bmajor, res->dm_cmajor,
+				    res->dm_name,
-					dm->dm_srcfile, dm->dm_srcline,
+				    res->dm_bmajor, res->dm_cmajor,
-					dm->dm_bmajor, dm->dm_cmajor);
+				    dm->dm_where.w_srcfile, dm->dm_where.w_srcline,
 				    dm->dm_bmajor, dm->dm_cmajor);
 			} else {
-				cfgxerror(res->dm_srcfile, res->dm_srcline,
+				cfgxerror(res->dm_where.w_srcfile,
-					"device-major '%s' "
+				    res->dm_where.w_srcline,
-					"(block %d, char %d) duplicated"
+				    "device-major '%s' "
-					" at %s:%d",
+				    "(block %d, char %d) duplicated"
-					dm->dm_name, dm->dm_bmajor,
+				    " at %s:%d",
-					dm->dm_cmajor,
+				    dm->dm_name, dm->dm_bmajor,
-					dm->dm_srcfile, dm->dm_srcline);
+				    dm->dm_cmajor,
 				    dm->dm_where.w_srcfile,
 				    dm->dm_where.w_srcline);
+			}
 			error = 1;
 			goto out;
+		}
 		if (ht_insert(fixdevmtab, intern(dm->dm_name), dm)) {
 			panic("fixdevsw: %s char %d block %d",
 			      dm->dm_name, dm->dm_cmajor, dm->dm_bmajor);
+		}
 		if (dm->dm_opts != NULL &&
 		    !expr_eval(dm->dm_opts, fixsel, NULL))
 			continue;
 		if (dm->dm_cmajor != NODEVMAJOR) {
 			if (ht_lookup(cdevmtab, intern(dm->dm_name)) != NULL) {
-				cfgxerror(dm->dm_srcfile, dm->dm_srcline,
+				cfgxerror(dm->dm_where.w_srcfile,
-				       "device-major of character device '%s' "
+				    dm->dm_where.w_srcline,
-				       "is already defined", dm->dm_name);
+				   "device-major of character device '%s' "
 				   "is already defined", dm->dm_name);
 				error = 1;
 				goto out;
+			}
 			(void)snprintf(mstr, sizeof(mstr), "%d", dm->dm_cmajor);
 			if (ht_lookup(cdevmtab, intern(mstr)) != NULL) {
-				cfgxerror(dm->dm_srcfile, dm->dm_srcline,
+				cfgxerror(dm->dm_where.w_srcfile, dm->dm_where.w_srcline,
 				       "device-major of character major '%d' "
 				       "is already defined", dm->dm_cmajor);
 				error = 1;
 				goto out;
+			}
 			if (ht_insert(cdevmtab, intern(dm->dm_name), dm) ||
 			    ht_insert(cdevmtab, intern(mstr), dm)) {
 				panic("fixdevsw: %s character major %d",
 				      dm->dm_name, dm->dm_cmajor);
+			}
+		}
 		if (dm->dm_bmajor != NODEVMAJOR) {
 			if (ht_lookup(bdevmtab, intern(dm->dm_name)) != NULL) {
-				cfgxerror(dm->dm_srcfile, dm->dm_srcline,
+				cfgxerror(dm->dm_where.w_srcfile, dm->dm_where.w_srcline,
 				       "device-major of block device '%s' "
 				       "is already defined", dm->dm_name);
 				error = 1;
 				goto out;
+			}
 			(void)snprintf(mstr, sizeof(mstr), "%d", dm->dm_bmajor);
 			if (ht_lookup(bdevmtab, intern(mstr)) != NULL) {
-				cfgxerror(dm->dm_srcfile, dm->dm_srcline,
+				cfgxerror(dm->dm_where.w_srcfile, dm->dm_where.w_srcline,
 				       "device-major of block major '%d' "
 				       "is already defined", dm->dm_bmajor);
 				error = 1;
 				goto out;
+			}
 			if (ht_insert(bdevmtab, intern(dm->dm_name), dm) ||
 			    ht_insert(bdevmtab, intern(mstr), dm)) {
 				panic("fixdevsw: %s block major %d",
 				      dm->dm_name, dm->dm_bmajor);
+			}
+		}
+	}

 @@ -1,15 +1,15 @@
 %{
-/*	$NetBSD: gram.y,v 1.54 2016/08/07 10:37:24 christos Exp $	*/
+/*	$NetBSD: gram.y,v 1.54.16.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -32,27 +32,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)gram.y	8.1 (Berkeley) 6/6/93
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: gram.y,v 1.54 2016/08/07 10:37:24 christos Exp $");
+__RCSID("$NetBSD: gram.y,v 1.54.16.1 2020/03/09 15:22:21 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include "defs.h"
 #include "sem.h"
 #define	FORMAT(n) (((n).fmt == 8 && (n).val != 0) ? "0%llo" : \
     ((n).fmt == 16) ? "0x%llx" : "%lld")
 @@ -888,27 +888,27 @@ no_opt_list:
 	  no_option
 	| no_opt_list ',' no_option
+;
 /* one option that had NO in front */
 no_option:
 	WORD				{ deloption($1, nowarn); }
+;
 /* the name in "config name root on ..." */
 conf:
 	WORD				{
 		conf.cf_name = $1;
-		conf.cf_lineno = currentline();
+		conf.cf_where.w_srcline = currentline();
 		conf.cf_fstype = NULL;
 		conf.cf_root = NULL;
 		conf.cf_dump = NULL;
+	}
+;
 /* root fs specification */
 root_spec:
 	  ROOT on_opt dev_spec		{ setconf(&conf.cf_root, "root", $3); }
 	| ROOT on_opt dev_spec fs_spec	{ setconf(&conf.cf_root, "root", $3); }
+;
 /* device for root fs or dump */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.98 2018/12/24 02:07:44 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.98.2.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)main.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.98 2018/12/24 02:07:44 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.98.2.1 2020/03/09 15:22:21 martin Exp $");
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
 #define	COPYRIGHT(x)	__COPYRIGHT(x)
 #else
 #define	COPYRIGHT(x)	static const char copyright[] = x
 #endif
 #ifndef lint
 COPYRIGHT("@(#) Copyright (c) 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 @@ -746,27 +746,27 @@ check_dependencies(const char *thing, st
 		/*
 		 * If the dependency is an attribute, it must not
 		 * be an interface attribute.  Otherwise, it must
 		 * be a previously declared option.
 		 */
 		if ((a = ht_lookup(attrtab, dep->nv_name)) != NULL) {
 			if (a->a_iattr)
 				cfgerror("option `%s' dependency `%s' "
 				    "is an interface attribute",
 				    thing, a->a_name);
 		} else if (OPT_OBSOLETE(dep->nv_name)) {
 			cfgerror("option `%s' dependency `%s' "
 			    "is obsolete", thing, dep->nv_name);
-		} else if (!is_declared_option(dep->nv_name)) {
+		} else if (!find_declared_option(dep->nv_name)) {
 			cfgerror("option `%s' dependency `%s' "
 			    "is an unknown option",
 			    thing, dep->nv_name);
+		}
+	}
+}
 static void
 add_fs_dependencies(struct nvlist *nv, struct nvlist *deps)
+{
 	/* Use nv_ptr to link any other options that are implied. */
 	nv->nv_ptr = deps;
 	check_dependencies(nv->nv_name, deps);
 @@ -776,34 +776,36 @@ static void
 add_opt_dependencies(struct defoptlist *dl, struct nvlist *deps)
+{
 	dl->dl_depends = deps;
 	check_dependencies(dl->dl_name, deps);
+}
 /*
  * Define one or more file systems.
  */
 void
 deffilesystem(struct nvlist *fses, struct nvlist *deps)
+{
 	struct nvlist *nv;
 	struct where *w;
 	/*
 	 * Mark these options as ones to skip when creating the Makefile.
 	 */
 	for (nv = fses; nv != NULL; nv = nv->nv_next) {
-		if (DEFINED_OPTION(nv->nv_name)) {
+		if ((w = DEFINED_OPTION(nv->nv_name)) != NULL) {
-			cfgerror("file system or option `%s' already defined",
+			cfgerror("file system or option `%s' already defined"
-			    nv->nv_name);
+			    " at %s:%hu", nv->nv_name, w->w_srcfile,
 			    w->w_srcline);
 			return;
+		}
 		/*
 		 * Also mark it as a valid file system, which may be
 		 * used in "file-system" directives in the config
 		 * file.
 		 */
 		if (nvhash_insert(deffstab, nv->nv_name, nv))
 			panic("file system `%s' already in table?!",
 			    nv->nv_name);
 		add_fs_dependencies(nv, deps);
 @@ -868,87 +870,90 @@ find_declared_fs_option(const char *name
 	struct nvlist *fs;
 	if ((fs = nvhash_lookup(deffstab, name)) != NULL) {
 		return fs;
+	}
 	return (NULL);
+}
 /*
  * Like find_declared_option but doesn't return what it finds, so it
  * can search both the various kinds of options and also filesystems.
  */
-int
+struct where *
-is_declared_option(const char *name)
+find_declared_option(const char *name)
+{
 	struct defoptlist *option = NULL;
 	struct nvlist *fs;
 	if ((option = dlhash_lookup(defopttab, name)) != NULL ||
 	    (option = dlhash_lookup(defparamtab, name)) != NULL ||
 	    (option = dlhash_lookup(defflagtab, name)) != NULL) {
-		return 1;
+		return &option->dl_where;
+	}
 	if ((fs = nvhash_lookup(deffstab, name)) != NULL) {
-		return 1;
+		return &fs->nv_where;
+	}
-	return 0;
+	return NULL;
+}
 /*
  * Define one or more standard options.  If an option file name is specified,
  * place all options in one file with the specified name.  Otherwise, create
  * an option file for each option.
  * record the option information in the specified table.
  */
 void
 defopt(struct dlhash *ht, const char *fname, struct defoptlist *opts,
        struct nvlist *deps, int obs)
+{
 	struct defoptlist *dl, *nextdl, *olddl;
 	const char *name;
 	struct where *w;
 	char buf[500];
 	if (fname != NULL && badfilename(fname)) {
 		return;
+	}
 	/*
 	 * Mark these options as ones to skip when creating the Makefile.
 	 */
 	for (dl = opts; dl != NULL; dl = nextdl) {
 		nextdl = dl->dl_next;
 		if (dl->dl_lintvalue != NULL) {
 			/*
 			 * If an entry already exists, then we are about to
 			 * complain, so no worry.
 			 */
 			(void) dlhash_insert(defoptlint, dl->dl_name,
 			    dl);
+		}
 		/* An option name can be declared at most once. */
-		if (DEFINED_OPTION(dl->dl_name)) {
+		if ((w = DEFINED_OPTION(dl->dl_name)) != NULL) {
-			cfgerror("file system or option `%s' already defined",
+			cfgerror("file system or option `%s' already defined"
-			    dl->dl_name);
+			    " at %s:%hu", dl->dl_name, w->w_srcfile,
 			    w->w_srcline);
 			return;
+		}
 		if (dlhash_insert(ht, dl->dl_name, dl)) {
-			cfgerror("file system or option `%s' already defined",
+			cfgerror("file system or option `%s' already defined"
-			    dl->dl_name);
+			    " at %s:%hu", dl->dl_name, dl->dl_where.w_srcfile,
 			    dl->dl_where.w_srcline);
 			return;
+		}
 		if (fname == NULL) {
 			/*
 			 * Each option will be going into its own file.
 			 * Convert the option name to lower case.  This
 			 * lower case name will be used as the option
 			 * file name.
 			 */
 			(void) snprintf(buf, sizeof(buf), "opt_%s.h",
 			    strtolower(dl->dl_name));
 			name = intern(buf);
 @@ -1369,28 +1374,28 @@ cfcrosscheck(struct config *cf, const ch
 		else
 			devunit = (int)(minor(nv->nv_num) / maxpartitions);
 		if (devbase_has_instances(dev, devunit))
 			continue;
 		if (devbase_has_instances(dev, STAR) &&
 		    devunit >= dev->d_umax)
 			continue;
 		TAILQ_FOREACH(pd, &allpseudo, i_next) {
 			if (pd->i_base == dev && devunit < dev->d_umax &&
 			    devunit >= 0)
 				goto loop;
+		}
 		(void)fprintf(stderr,
-		    "%s:%d: %s says %s on %s, but there's no %s\n",
+		    "%s:%hu: %s says %s on %s, but there's no %s\n",
-		    conffile, cf->cf_lineno,
+		    conffile, cf->cf_where.w_srcline,
 		    cf->cf_name, what, nv->nv_str, nv->nv_str);
 		errs++;
  loop:
+		;
+	}
 	return (errs);
+}
 /*
  * Cross-check the configuration: make sure that each target device
  * or attribute (`at foo[0*?]') names at least one real device.  Also
  * see that the root and dump devices for all configurations are there.
  */

 @@ -1,15 +1,15 @@
 %{
-/*	$NetBSD: scan.l,v 1.26 2016/08/07 10:37:24 christos Exp $	*/
+/*	$NetBSD: scan.l,v 1.26.16.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -32,102 +32,110 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)scan.l	8.1 (Berkeley) 6/6/93
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: scan.l,v 1.26 2016/08/07 10:37:24 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.26.16.1 2020/03/09 15:22:21 martin Exp $");
 #include <sys/param.h>
 #include <errno.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <util.h>
 #undef ECHO
 #include "defs.h"
 #include "gram.h"
 int	yyline;
 const char *yyfile;
 const char *lastfile;
 char curinclpath[PATH_MAX];
-int ifdefstate = -1;
+uint64_t ifdefstate;
-int st;
+int	 ifdefshift = -1;
 /*
  * The state is represented by 3 bits.
  */
 #define IDS_MATCH	1ll
 #define IDS_ELIF	2ll
 #define	IDS_ELSE	4ll
 #define IDS_BITS	7
 #define IDS_SHIFT	3
 #define IDS_ISMATCH(st) (((st) & IDS_MATCH) != 0)
 #define IDS_PARENT_DISABLED \
-    ((ifdefstate > 6) && ((((ifdefstate/6)-1) & 1) == 1))
+	(ifdefshift > 0 && !IDS_ISMATCH(ifdefstate >> IDS_SHIFT))
-#define IDS_MAX_DEPTH		362797056 /* 6^11 */
+#define IDS_MAX_DEPTH	21 /* 64 / 3 */
 /* States for ifdefstate:
 #ifdef IDS_DEBUG
--> matched ifdef
+# define IDS_PRINT(s, st, x) \
--> unmatched ifdef
+	do { \
--> matched elifdef
+		for (int i = 0; i < ifdefshift + 1; i++) \
--> unmatched elifdef
+			fprintf(stderr, " "); \
--> matched else
+		printf("%s%s [%d,%d,%d] %#" PRIx64 "\n", x, # s, \
--> unmatched else
+		    IDS_PARENT_DISABLED, IDS_ISMATCH(st), getcurifdef(), \
 		    ifdefstate); \
-  Upon "ifdef", add one and multiply by 6.
+	} while (/*CONSTCOND*/0)
-  Upon "endif", divide by 6, remove 1.
+#else
 # define IDS_PRINT(s, st, x) __nothing
-  ifdef -> MATCH => continue
+#endif
            MISMATCH => set to 1
-  elifdef -> if (!1) -> MISMATCH
+#define IDS_ENTER(s, st) \
-             MATCH => set to 2
+	IDS_PRINT(s, st, ">")
-             MISMATCH => if (2 || 3) set to 3, else set to 1
+#define IDS_EXIT(s, st) \
-  else -> if (1) -> MATCH
+	IDS_PRINT(s, st, "<")
           MATCH => set to 4
           MISMATCH => set to 5
   in each case, if parent & 1 == 1, MISMATCH
 */
 /*
  * Data for returning to previous files from include files.
  */
 struct incl {
 	struct	incl *in_prev;	/* previous includes in effect, if any */
 	YY_BUFFER_STATE in_buf;	/* previous lex state */
-	const char *in_fname;	/* previous file name */
+	struct where in_where;
 	int	in_lineno;	/* previous line number */
 	int	in_ateof;	/* token to insert at EOF */
 	int	in_interesting;	/* previous value for "interesting" */
-	int	in_ifdefstate;	/* conditional level */
+	uint64_t	in_ifdefstate;	/* conditional level */
 	int	in_ifdefshift;	/* conditional level */
 };
 static struct incl *incl;
 static int endinclude(void);
 static int getincludepath(void);
 static int getcurifdef(void);
 %}
 %option  noyywrap nounput noinput
 PATH	[A-Za-z_0-9]*[./][-A-Za-z_0-9./]*
 QCHARS	\"(\\.|[^\\"])*\"
 WORD	[A-Za-z_][-A-Za-z_0-9]*
 FILENAME	({PATH}|{QCHARS})
 RESTOFLINE	[ \t]*(#[^\n]*)?\n
 WS	^[ \t]*
 %x	IGNORED
 %%
 		/* Local variables for yylex() */
 		int tok;
 and		return AND;
 at		return AT;
 attach		return ATTACH;
 block		return BLOCK;
 build		return BUILD;
 char		return CHAR;
 @@ -170,118 +178,121 @@ pseudo-device	return PSEUDO_DEVICE;
 pseudo-root	return PSEUDO_ROOT;
 root		return ROOT;
 select		return SELECT;
 single		return SINGLE;
 source		return SOURCE;
 type		return TYPE;
 vector 		return VECTOR;
 version 	return VERSION;
 with		return WITH;
 \+=		return PLUSEQ;
 :=		return COLONEQ;
-<*>ifdef[ \t]+{WORD}{RESTOFLINE} {
+<*>{WS}ifdef[ \t]+{WORD}{RESTOFLINE} {
-		ifdefstate = (ifdefstate + 1) * 6;
+		ifdefstate <<= IDS_SHIFT;
-		if (ifdefstate >= IDS_MAX_DEPTH) {
+		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
-		if (!IDS_PARENT_DISABLED && getcurifdef()) {
+		IDS_ENTER(ifdef, 0);
-			BEGIN(INITIAL);
+		if (IDS_PARENT_DISABLED || !getcurifdef()) {
 		} else {
 			ifdefstate++;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		IDS_EXIT(ifdef, 0);
 		yyline++;
+	}
-<*>ifndef[ \t]+{WORD}{RESTOFLINE} {
+<*>{WS}ifndef[ \t]+{WORD}{RESTOFLINE} {
-		ifdefstate = (ifdefstate + 1) * 6;
+		ifdefstate <<= IDS_SHIFT;
-		if (ifdefstate >= IDS_MAX_DEPTH) {
+		if (++ifdefshift >= IDS_MAX_DEPTH) {
 			yyerror("too many levels of conditional");
+		}
-		if (!IDS_PARENT_DISABLED && !getcurifdef()) {
+		IDS_ENTER(ifndef, 0);
-			BEGIN(INITIAL);
+		if (IDS_PARENT_DISABLED || getcurifdef()) {
 		} else {
 			ifdefstate++;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		IDS_EXIT(ifndef, 0);
 		yyline++;
+	}
-<*>elifdef[ \t]+{WORD}{RESTOFLINE} {
+<*>{WS}elifdef[ \t]+{WORD}{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		IDS_ENTER(elifdef, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifdef");
+		}
-		if (IDS_PARENT_DISABLED ||
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || !getcurifdef()) {
 		    st != 1 || !getcurifdef()) {
 			if (st == 2 || st == 3) {
 				ifdefstate += 3 - st;
 			} else {
 				ifdefstate += 1 - st;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate++;
+			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		IDS_EXIT(elifdef, st);
 		yyline++;
+	}
-<*>elifndef[ \t]+{WORD}{RESTOFLINE} {
+<*>{WS}elifndef[ \t]+{WORD}{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		IDS_ENTER(elifndef, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched elifndef");
+		}
-		if (IDS_PARENT_DISABLED ||
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st) || getcurifdef()) {
 		    st != 1 || getcurifdef()) {
 			if (st == 2 || st == 3) {
 				ifdefstate += 3 - st;
 			} else {
 				ifdefstate += 1 - st;
 			BEGIN(IGNORED);
 		} else {
-			ifdefstate++;
+			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELIF;
 		IDS_EXIT(elifndef, st);
 		yyline++;
+	}
-<*>else{RESTOFLINE} {
+<*>{WS}else{RESTOFLINE} {
-		st = ifdefstate % 6;
+		int st = ifdefstate & IDS_BITS;
-		if (ifdefstate < 0 || st > 3) {
+		IDS_ENTER(else, st);
 		if (ifdefshift == -1 || (st & IDS_ELSE) != 0) {
 			yyerror("mismatched else");
+		}
-		if (!IDS_PARENT_DISABLED && (st == 1)) {
+		if (IDS_PARENT_DISABLED || IDS_ISMATCH(st)) {
 			ifdefstate += 3;
 			BEGIN(INITIAL);
 		} else {
 			ifdefstate += 5 - st;
 			BEGIN(IGNORED);
 		} else {
 			ifdefstate |= IDS_MATCH;
 			BEGIN(INITIAL);
+		}
 		ifdefstate |= IDS_ELSE;
 		IDS_ENTER(else, st);
 		yyline++;
+	}
-<*>endif{RESTOFLINE} {
+<*>{WS}endif{RESTOFLINE} {
-		if (ifdefstate < 0) {
+		IDS_ENTER(endif, 0);
 		if (ifdefshift == -1) {
 			yyerror("mismatched endif");
+		}
 		if (!IDS_PARENT_DISABLED) {
 			BEGIN(INITIAL);
+		}
-		ifdefstate = (ifdefstate/6) - 1;
+		IDS_EXIT(endif, 0);
 		ifdefshift--;
 		ifdefstate >>= IDS_SHIFT;
 		yyline++;
+	}
 <IGNORED>\n		{
 		yyline++;
+	}
 <IGNORED>.	/* ignore */
 include[ \t]+{FILENAME}{RESTOFLINE}	{
 		yyline++;
 		if (getincludepath()) {
 			include(curinclpath, 0, 0, 1);
 @@ -360,27 +371,27 @@ package[ \t]+{FILENAME}{RESTOFLINE}	{
 		yyline++;
 		return '\n';
+	}
 \00	{
 		/* Detect NUL characters in the config file and
 		 * error out.
 		 */
 		cfgerror("NUL character detected at line %i", yyline);
+	}
 #.*	{ /* ignored (comment) */; }
 [ \t]+	{ /* ignored (white space) */; }
 .	{ return yytext[0]; }
 <*><<EOF>> {
-		if (ifdefstate > (incl == NULL ? -1 : incl->in_ifdefstate)) {
+		if (ifdefshift > (incl == NULL ? -1 : incl->in_ifdefshift)) {
 			yyerror("reached EOF while looking for endif");
+		}
 		if (incl == NULL)
 			return YY_NULL;
 		tok = endinclude();
 		if (tok)
 			return tok;
 		/* otherwise continue scanning */
+	}
 %%
 int interesting = 1;
 @@ -516,31 +527,32 @@ include(const char *fname, int ateof, in
 			     s, strerror(errno));
 		free(s);
 		return (-1);
+	}
 	if (curdir_push(s) == -1) {
 		cfgerror("cannot record current working directory for %s", s);
 		fclose(fp);
 		free(s);
 		return (-1);
+	}
 	in = ecalloc(1, sizeof *in);
 	in->in_prev = incl;
 	in->in_buf = YY_CURRENT_BUFFER;
-	in->in_fname = yyfile;
+	in->in_where.w_srcfile = yyfile;
-	in->in_lineno = yyline;
+	in->in_where.w_srcline = (u_short)yyline;
 	in->in_ateof = ateof;
 	in->in_interesting = interesting;
 	in->in_ifdefstate = ifdefstate;
 	in->in_ifdefshift = ifdefshift;
 	interesting = direct & interesting;
 	if (interesting)
 		logconfig_include(fp, fname);
 	incl = in;
 	CFGDBG(1, "include `%s' from `%s' line %d", fname, yyfile, yyline);
 	yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE));
 	yyfile = intern(s);
 	yyline = 1;
 	free(s);
 	includedepth++;
 	return (0);
+}
 @@ -587,30 +599,32 @@ static int
 endinclude(void)
+{
 	struct incl *in;
 	int ateof;
 	curdir_pop();
 	if ((in = incl) == NULL)
 		panic("endinclude");
 	incl = in->in_prev;
 	lastfile = yyfile;
 	yy_delete_buffer(YY_CURRENT_BUFFER);
 	(void)fclose(yyin);
 	yy_switch_to_buffer(in->in_buf);
-	yyfile = in->in_fname;
+	yyfile = in->in_where.w_srcfile;
-	yyline = in->in_lineno;
+	yyline = in->in_where.w_srcline;
 	ateof  = in->in_ateof;
 	interesting = in->in_interesting;
 	ifdefstate = in->in_ifdefstate;
 	ifdefshift = in->in_ifdefshift;
 	free(in);
 	includedepth--;
 	return (ateof);
+}
 /*
  * Return the current line number.  If yacc has looked ahead and caused
  * us to consume a newline, we have to subtract one.  yychar is yacc's
  * token lookahead, so we can tell.
  */
 u_short

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sem.c,v 1.83 2018/04/09 17:46:56 christos Exp $	*/
+/*	$NetBSD: sem.c,v 1.83.4.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,27 +35,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)sem.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.83 2018/04/09 17:46:56 christos Exp $");
+__RCSID("$NetBSD: sem.c,v 1.83.4.1 2020/03/09 15:22:21 martin Exp $");
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "defs.h"
 #include "sem.h"
 /*
  * config semantics.
  */
 @@ -266,37 +266,44 @@ void
 setdefmaxusers(int min, int def, int max)
+{
 	if (min < 1 || min > def || def > max)
 		cfgerror("maxusers must have 1 <= min (%d) <= default (%d) "
 		    "<= max (%d)", min, def, max);
 	else {
 		minmaxusers = min;
 		defmaxusers = def;
 		maxmaxusers = max;
+	}
+}
 static const char *maxusers_srcfile;
 static u_short maxusers_srcline;
 void
 setmaxusers(int n)
+{
 	if (maxusers == n) {
-		cfgerror("duplicate maxusers parameter");
+		cfgerror("duplicate maxusers parameter at %s:%hu",
 		    maxusers_srcfile, maxusers_srcline);
 		return;
+	}
 	if (vflag && maxusers != 0)
-		cfgwarn("warning: maxusers already defined");
+		cfgwarn("warning: maxusers already defined at %s:%hu",
 		    maxusers_srcfile, maxusers_srcline);
 	maxusers = n;
 	maxusers_srcfile = yyfile;
 	maxusers_srcline = currentline();
 	if (n < minmaxusers) {
 		cfgerror("warning: minimum of %d maxusers assumed",
 		    minmaxusers);
 		errors--;	/* take it away */
 		maxusers = minmaxusers;
 	} else if (n > maxmaxusers) {
 		cfgerror("warning: maxusers (%d) > %d", n, maxmaxusers);
 		errors--;
+	}
+}
 void
 setident(const char *i)
 @@ -328,27 +335,28 @@ defattr0(const char *name, struct loclis
 		return defdevclass(name, locs, deps, devclass);
 	else
 		return defattr(name, locs, deps, devclass);
+}
 int
 defattr(const char *name, struct loclist *locs, struct attrlist *deps,
     int devclass)
+{
 	struct attr *a, *dep;
 	struct attrlist *al;
 	if (getrefattr(name, &a)) {
-		cfgerror("attribute `%s' already defined", name);
+		cfgerror("attribute `%s' already defined at %s:%hu", name,
 		    a->a_where.w_srcfile, a->a_where.w_srcline);
 		loclist_destroy(locs);
 		return (1);
+	}
 	if (a == NULL)
 		a = mkattr(name);
 	/*
 	 * If this attribute depends on any others, make sure none of
 	 * the dependencies are interface attributes.
 	 */
 	for (al = deps; al != NULL; al = al->al_next) {
 		dep = al->al_this;
 		if (dep->a_iattr) {
 @@ -370,26 +378,28 @@ defattr(const char *name, struct loclist
+}
 struct attr *
 mkattr(const char *name)
+{
 	struct attr *a;
 	a = ecalloc(1, sizeof *a);
 	if (ht_insert(attrtab, name, a)) {
 		free(a);
 		return NULL;
+	}
 	a->a_name = name;
 	a->a_where.w_srcfile = yyfile;
 	a->a_where.w_srcline = currentline();
 	TAILQ_INIT(&a->a_files);
 	CFGDBG(3, "attr `%s' allocated", name);
 	return a;
+}
 /* "interface attribute" initialization */
 int
 defiattr(const char *name, struct loclist *locs, struct attrlist *deps,
     int devclass)
+{
 	struct attr *a;
 	int len;
 @@ -500,27 +510,27 @@ addtoattr(struct nvlist *l, struct devba
  * attribute and/or refer to existing attributes.
  */
 void
 defdev(struct devbase *dev, struct loclist *loclist, struct attrlist *attrs,
        int ispseudo)
+{
 	struct loclist *ll;
 	struct attrlist *al;
 	if (dev == &errdev)
 		goto bad;
 	if (dev->d_isdef) {
 		cfgerror("redefinition of `%s' (previously defined at %s:%d)",
-		    dev->d_name, dev->d_srcfile, dev->d_srcline);
+		    dev->d_name, dev->d_where.w_srcfile, dev->d_where.w_srcline);
 		goto bad;
+	}
 	dev->d_isdef = 1;
 	if (has_errobj(attrs, &errattr))
 		goto bad;
 	/*
 	 * Handle implicit attribute definition from locator list.  Do
 	 * this before scanning the `at' list so that we can have, e.g.:
 	 *	device foo at other, foo { slot = -1 }
 	 * (where you can plug in a foo-bus extender to a foo-bus).
 	 */
 @@ -615,28 +625,28 @@ getdevbase(const char *name)
+	}
 	dev = ht_lookup(devbasetab, name);
 	if (dev == NULL) {
 		dev = ecalloc(1, sizeof *dev);
 		dev->d_name = name;
 		dev->d_isdef = 0;
 		dev->d_major = NODEVMAJOR;
 		dev->d_attrs = NULL;
 		dev->d_ihead = NULL;
 		dev->d_ipp = &dev->d_ihead;
 		dev->d_ahead = NULL;
 		dev->d_app = &dev->d_ahead;
 		dev->d_umax = 0;
-		dev->d_srcfile = yyfile;
+		dev->d_where.w_srcfile = yyfile;
-		dev->d_srcline = currentline();
+		dev->d_where.w_srcline = currentline();
 		TAILQ_INSERT_TAIL(&allbases, dev, d_next);
 		if (ht_insert(devbasetab, name, dev))
 			panic("%s: Can't insert %s", __func__, name);
 		CFGDBG(3, "devbase defined `%s'", dev->d_name);
+	}
 	return (dev);
+}
 /*
  * Define some of a device's allowable parent attachments.
  * There may be a list of (plain) attributes.
  */
 void
 @@ -649,27 +659,27 @@ defdevattach(struct deva *deva, struct d
 	if (dev == &errdev)
 		goto bad;
 	if (deva == NULL)
 		deva = getdevattach(dev->d_name);
 	if (deva == &errdeva)
 		goto bad;
 	if (!dev->d_isdef) {
 		cfgerror("attaching undefined device `%s'", dev->d_name);
 		goto bad;
+	}
 	if (deva->d_isdef) {
 		cfgerror("redefinition of `%s' (previously defined at %s:%d)",
-		    deva->d_name, deva->d_srcfile, deva->d_srcline);
+		    deva->d_name, deva->d_where.w_srcfile, deva->d_where.w_srcline);
 		goto bad;
+	}
 	if (dev->d_ispseudo) {
 		cfgerror("pseudo-devices can't attach");
 		goto bad;
+	}
 	deva->d_isdef = 1;
 	if (has_errobj(attrs, &errattr))
 		goto bad;
 	for (al = attrs; al != NULL; al = al->al_next) {
 		a = al->al_this;
 		if (a == &errattr)
 @@ -758,28 +768,28 @@ getdevattach(const char *name)
 		return (&errdeva);
+	}
 	deva = ht_lookup(devatab, name);
 	if (deva == NULL) {
 		deva = ecalloc(1, sizeof *deva);
 		deva->d_name = name;
 		deva->d_bsame = NULL;
 		deva->d_isdef = 0;
 		deva->d_devbase = NULL;
 		deva->d_atlist = NULL;
 		deva->d_attrs = NULL;
 		deva->d_ihead = NULL;
 		deva->d_ipp = &deva->d_ihead;
-		deva->d_srcfile = yyfile;
+		deva->d_where.w_srcfile = yyfile;
-		deva->d_srcline = currentline();
+		deva->d_where.w_srcline = currentline();
 		TAILQ_INSERT_TAIL(&alldevas, deva, d_next);
 		if (ht_insert(devatab, name, deva))
 			panic("%s: Can't insert %s", __func__, name);
+	}
 	return (deva);
+}
 /*
  * Look up an attribute.
  */
 struct attr *
 getattr(const char *name)
+{
 @@ -1029,33 +1039,38 @@ resolve(struct nvlist **nvp, const char
 	return (0);
+}
 /*
  * Add a completed configuration to the list.
  */
 void
 addconf(struct config *cf0)
+{
 	struct config *cf;
 	const char *name;
 	name = cf0->cf_name;
 	if ((cf = ht_lookup(cfhashtab, name)) != NULL) {
 		cfgerror("configuration `%s' already defined %s:%hu", name,
 			cf->cf_where.w_srcfile, cf->cf_where.w_srcline);
 		goto bad;
+	}
 	cf = ecalloc(1, sizeof *cf);
 	if (ht_insert(cfhashtab, name, cf)) {
 		cfgerror("configuration `%s' already defined", name);
 		free(cf);
 		goto bad;
+	}
 	*cf = *cf0;
 	cf->cf_where.w_srcfile = yyfile;
 	cf->cf_where.w_srcline = currentline();
 	/*
 	 * Resolve the root device.
 	 */
 	if (cf->cf_root == NULL) {
 		cfgerror("%s: no root device specified", name);
 		goto bad;
+	}
 	if (cf->cf_root && cf->cf_root->nv_str != s_qmark) {
 		struct nvlist *nv;
 		nv = cf->cf_root;
 		if (resolve(&cf->cf_root, name, "root", nv, 'a'))
 			goto bad;
 @@ -1147,31 +1162,33 @@ newdevi(const char *name, int unit, stru
 	i = ecalloc(1, sizeof *i);
 	i->i_name = name;
 	i->i_unit = unit;
 	i->i_base = d;
 	i->i_bsame = NULL;
 	i->i_asame = NULL;
 	i->i_alias = NULL;
 	i->i_at = NULL;
 	i->i_pspec = NULL;
 	i->i_atdeva = NULL;
 	i->i_locs = NULL;
 	i->i_cfflags = 0;
-	i->i_lineno = currentline();
+	i->i_where.w_srcline = currentline();
-	i->i_srcfile = yyfile;
+	i->i_where.w_srcfile = yyfile;
 	i->i_active = DEVI_ORPHAN; /* Proper analysis comes later */
 	i->i_level = devilevel;
 	i->i_pseudoroot = 0;
 	i->i_where.w_srcfile = yyfile;
 	i->i_where.w_srcline = currentline();
 	if (unit >= d->d_umax)
 		d->d_umax = unit + 1;
 	return (i);
+}
 static struct attr *
 finddevattr(const char *name, const char *at, struct devbase *ib,
     struct devbase **ab, int *atunit)
+{
 	const char *cp;
 	char atbuf[NAMESIZE];
 	struct attrlist *al;
 	struct attr *attr;
 @@ -1786,28 +1803,29 @@ addpseudo(const char *name, int number)
+{
 	struct devbase *d;
 	struct devi *i;
 	d = ht_lookup(devbasetab, name);
 	if (d == NULL) {
 		cfgerror("undefined pseudo-device %s", name);
 		return;
+	}
 	if (!d->d_ispseudo) {
 		cfgerror("%s is a real device, not a pseudo-device", name);
 		return;
+	}
-	if (ht_lookup(devitab, name) != NULL) {
+	if ((i = ht_lookup(devitab, name)) != NULL) {
-		cfgerror("`%s' already defined", name);
+		cfgerror("`%s' already defined at %s:%hu", name,
 		    i->i_where.w_srcfile, i->i_where.w_srcline);
 		return;
+	}
 	i = newdevi(name, number - 1, d);	/* foo 16 => "foo0..foo15" */
 	if (ht_insert(devitab, name, i))
 		panic("%s: %s", __func__, name);
 	/* Useful to retrieve the instance from the devbase */
 	d->d_ihead = i;
 	i->i_active = DEVI_ACTIVE;
 	TAILQ_INSERT_TAIL(&allpseudo, i, i_next);
+}
 void
 delpseudo(const char *name, int nowarn)
 @@ -1845,28 +1863,28 @@ adddevm(const char *name, devmajor_t cma
 		cfgerror("block major %d is invalid", bmajor);
 		condexpr_destroy(cond);
 		nvfreel(nv_nodes);
 		return;
+	}
 	if (cmajor == NODEVMAJOR && bmajor == NODEVMAJOR) {
 		cfgerror("both character/block majors are not specified");
 		condexpr_destroy(cond);
 		nvfreel(nv_nodes);
 		return;
+	}
 	dm = ecalloc(1, sizeof(*dm));
-	dm->dm_srcfile = yyfile;
+	dm->dm_where.w_srcfile = yyfile;
-	dm->dm_srcline = currentline();
+	dm->dm_where.w_srcline = currentline();
 	dm->dm_name = name;
 	dm->dm_cmajor = cmajor;
 	dm->dm_bmajor = bmajor;
 	dm->dm_opts = cond;
 	dm->dm_devnodes = nv_nodes;
 	TAILQ_INSERT_TAIL(&alldevms, dm, dm_next);
 	maxcdevm = MAX(maxcdevm, dm->dm_cmajor);
 	maxbdevm = MAX(maxbdevm, dm->dm_bmajor);
+}
 int
 @@ -1880,31 +1898,31 @@ fixdevis(void)
 	TAILQ_FOREACH(i, &alldevi, i_next) {
 		CFGDBG(3, "fixing devis `%s'", i->i_name);
 		if (i->i_active == DEVI_ACTIVE)
 			selectbase(i->i_base, i->i_atdeva);
 		else if (i->i_active == DEVI_ORPHAN) {
 			/*
 			 * At this point, we can't have instances for which
 			 * i_at or i_pspec are NULL.
 			 */
 			++error;
 			p = i->i_pspec;
 			msg = p == NULL ? "no parent" :
 			    (p->p_atunit == WILD ? "nothing matching" : "no");
-			cfgxerror(i->i_srcfile, i->i_lineno,
+			cfgxerror(i->i_where.w_srcfile, i->i_where.w_srcline,
 			    "`%s at %s' is orphaned (%s `%s' found)",
 			    i->i_name, i->i_at, msg, i->i_at);
 		} else if (vflag && i->i_active == DEVI_IGNORED)
-			cfgxwarn(i->i_srcfile, i->i_lineno, "ignoring "
+			cfgxwarn(i->i_where.w_srcfile, i->i_where.w_srcline, "ignoring "
 			    "explicitly orphaned instance `%s at %s'",
 			    i->i_name, i->i_at);
+	}
 	if (error)
 		return error;
 	TAILQ_FOREACH(i, &allpseudo, i_next)
 		if (i->i_active == DEVI_ACTIVE)
 			selectbase(i->i_base, NULL);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.20 2015/09/01 13:42:48 uebayasi Exp $	*/
+/*	$NetBSD: util.c,v 1.20.18.1 2020/03/09 15:22:21 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
 @@ -35,39 +35,41 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: util.c,v 1.20 2015/09/01 13:42:48 uebayasi Exp $");
+__RCSID("$NetBSD: util.c,v 1.20.18.1 2020/03/09 15:22:21 martin Exp $");
 #include <sys/types.h>
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <util.h>
 #include <err.h>
 #include "defs.h"
 extern const char *yyfile;
 static void cfgvxerror(const char *, int, const char *, va_list)
 	     __printflike(3, 0);
 static void cfgvxdbg(const char *, int, const char *, va_list)
 	     __printflike(3, 0);
 static void cfgvxwarn(const char *, int, const char *, va_list)
 	     __printflike(3, 0);
 static void cfgvxmsg(const char *, int, const char *, const char *, va_list)
      __printflike(4, 0);
 /************************************************************/
 /*
  * Prefix stack
 @@ -188,26 +190,28 @@ sourcepath(const char *file)
  */
 struct nvlist *
 newnv(const char *name, const char *str, void *ptr, long long i, struct nvlist *next)
+{
 	struct nvlist *nv;
 	nv = ecalloc(1, sizeof(*nv));
 	nv->nv_next = next;
 	nv->nv_name = name;
 	nv->nv_str = str;
 	nv->nv_ptr = ptr;
 	nv->nv_num = i;
 	nv->nv_where.w_srcfile = yyfile;
 	nv->nv_where.w_srcline = currentline();
 	return nv;
+}
 /*
  * Free an nvlist structure (just one).
  */
 void
 nvfree(struct nvlist *nv)
+{
 	free(nv);
+}
 @@ -245,26 +249,28 @@ nvcat(struct nvlist *nv1, struct nvlist
 struct defoptlist *
 defoptlist_create(const char *name, const char *val, const char *lintval)
+{
 	struct defoptlist *dl;
 	dl = emalloc(sizeof(*dl));
 	dl->dl_next = NULL;
 	dl->dl_name = name;
 	dl->dl_value = val;
 	dl->dl_lintvalue = lintval;
 	dl->dl_obsolete = 0;
 	dl->dl_depends = NULL;
 	dl->dl_where.w_srcfile = yyfile;
 	dl->dl_where.w_srcline = currentline();
 	return dl;
+}
 void
 defoptlist_destroy(struct defoptlist *dl)
+{
 	struct defoptlist *next;
 	while (dl != NULL) {
 		next = dl->dl_next;
 		dl->dl_next = NULL;
 		// XXX should we assert that dl->dl_deps is null to

 @@ -249,27 +249,27 @@ o Control ELF sections using linker scri
 		netbsd.ko ---> netbsd.ro	Kernel MI linkage
 		netbsd.ro ---> netbsd		Kernel MD linkage
 	Modular build (kernel):
 		     *.o  --->      *.ko	Generic + Per-module MI linkage
 		     *.ko ---> netbsd.ro	Kernel MI linkage
 		netbsd.ro ---> netbsd		Kernel MD linkage
 	Modular build (module):
 		     *.o  --->      *.ko	Generic + Per-module MI linkage
 		     *.ko --->      *.ro	Modular MI linkage
 		     *.ro --->      *.kmod	Modular MD linkage
-  Genric MI linkage is for processing MI linkage that can be applied generally.
+  Generic MI linkage is for processing MI linkage that can be applied generally.
   Data section alignment (.data.read_mostly and .data.cacheline_aligned) is
   processed here.
   Per-module MI linkage is for modules that want some ordering.  For example,
   machdep.ko wants to put entry code at the top of .text and .data.
   Kernel MI linkage is for collecting kernel global section data, that is what
   link-set is used for now.  Once they are collected and symbols to the ranges
   are assigned, those sections are merged into the pre-existing sections
   (.rodata) because link-set sections in "netbsd" will never be interpreted by
   external loaders.
   Kernel MD linkage is used purely for MD purposes, that is, how kernels are