 @@ -1,14 +1,14 @@
-/*	$NetBSD: core_elf32.c,v 1.34 2009/10/21 21:12:06 rmind Exp $	*/
+/*	$NetBSD: core_elf32.c,v 1.35 2009/12/14 00:48:35 matt Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -30,27 +30,27 @@
  * 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.
  */
 /*
  * core_elf32.c/core_elf64.c: Support for the Elf32/Elf64 core file format.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.34 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.35 2009/12/14 00:48:35 matt Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_coredump.h"
 #endif
 #ifndef ELFSIZE
 #define	ELFSIZE		32
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 @@ -80,27 +80,31 @@ struct writesegs_state {
 static int	ELFNAMEEND(coredump_writeseghdrs)(struct proc *, void *,
 		    struct uvm_coredump_state *);
 static int	ELFNAMEEND(coredump_notes)(struct proc *, struct lwp *, void *,
 		    size_t *);
 static int	ELFNAMEEND(coredump_note)(struct proc *, struct lwp *, void *,
 		    size_t *);
 #define	ELFROUNDSIZE	4	/* XXX Should it be sizeof(Elf_Word)? */
 #define	elfround(x)	roundup((x), ELFROUNDSIZE)
 #define elf_process_read_regs	CONCAT(process_read_regs, ELFSIZE)
 #ifdef __HAVE_PROCESS_XFPREGS
 #define elf_process_read_xfpregs CONCAT(process_read_xfpregs, ELFSIZE)
 #else
 #define elf_process_read_fpregs	CONCAT(process_read_fpregs, ELFSIZE)
 #endif
 #define elf_reg			CONCAT(process_reg, ELFSIZE)
 #define elf_fpreg		CONCAT(process_fpreg, ELFSIZE)
 int
 ELFNAMEEND(coredump)(struct lwp *l, void *cookie)
+{
 	struct proc *p;
 	Elf_Ehdr ehdr;
 	Elf_Phdr phdr, *psections;
 	struct countsegs_state cs;
 	struct writesegs_state ws;
 	off_t notestart, secstart, offset;
 	size_t notesize;
 @@ -152,26 +156,30 @@ ELFNAMEEND(coredump)(struct lwp *l, void
 	ehdr.e_machine = ELFDEFNNAME(MACHDEP_ID);
 	ehdr.e_version = EV_CURRENT;
 	ehdr.e_entry = 0;
 	ehdr.e_phoff = sizeof(ehdr);
 	ehdr.e_shoff = 0;
 	ehdr.e_flags = 0;
 	ehdr.e_ehsize = sizeof(ehdr);
 	ehdr.e_phentsize = sizeof(Elf_Phdr);
 	ehdr.e_phnum = cs.npsections;
 	ehdr.e_shentsize = 0;
 	ehdr.e_shnum = 0;
 	ehdr.e_shstrndx = 0;
 #ifdef ELF_MD_COREDUMP_SETUP
 	ELF_MD_COREDUMP_SETUP(l, &ehdr);
 #endif
 	/* Write out the ELF header. */
 	error = coredump_write(cookie, UIO_SYSSPACE, &ehdr, sizeof(ehdr));
 	if (error)
 		goto out;
 	offset = sizeof(ehdr);
 	notestart = offset + sizeof(phdr) * cs.npsections;
 	secstart = notestart + notesize;
 	psections = malloc(cs.npsections * sizeof(Elf_Phdr),
 	    M_TEMP, M_WAITOK|M_ZERO);
 @@ -441,32 +449,37 @@ ELFNAMEEND(coredump_note)(struct proc *p
 		nhdr.n_type = PT_GETREGS;
 		error = ELFNAMEEND(coredump_writenote)(p, iocookie, &nhdr,
 		    name, &intreg);
 		if (error)
 			return (error);
+	}
 	size += notesize;
 #ifdef PT_GETFPREGS
 	notesize = sizeof(nhdr) + elfround(namesize) + elfround(sizeof(freg));
 	if (iocookie) {
 		size_t freglen = sizeof(freg);
 #ifdef __HAVE_PROCESS_XFPREGS
 		error = elf_process_read_xfpregs(l, &freg, &freglen);
 #else
 		error = elf_process_read_fpregs(l, &freg);
 #endif
 		if (error)
 			return (error);
 		nhdr.n_namesz = namesize;
-		nhdr.n_descsz = sizeof(freg);
+		nhdr.n_descsz = freglen;
 		nhdr.n_type = PT_GETFPREGS;
 		error = ELFNAMEEND(coredump_writenote)(p, iocookie, &nhdr,
 		    name, &freg);
 		if (error)
 			return (error);
+	}
 	size += notesize;
 #endif
 	*sizep = size;
 	/* XXX Add hook for machdep per-LWP notes. */
 	return (0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec_elf.c,v 1.11 2008/12/17 20:51:35 cegger Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.12 2009/12/14 00:48:35 matt Exp $	*/
 /*-
  * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -47,27 +47,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.11 2008/12/17 20:51:35 cegger Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.12 2009/12/14 00:48:35 matt Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 @@ -899,18 +899,21 @@ next:
 out:
 	kmem_free(ph, phsize);
 	return error;
+}
 int
 netbsd_elf_probe(struct lwp *l, struct exec_package *epp, void *eh, char *itp,
     vaddr_t *pos)
+{
 	int error;
 	if ((error = netbsd_elf_signature(l, epp, eh)) != 0)
 		return error;
-#ifdef ELF_INTERP_NON_RELOCATABLE
+#ifdef ELF_MD_PROBE_FUNC
 	if ((error = ELF_MD_PROBE_FUNC(l, epp, eh, itp, pos)) != 0)
 		return error;
 #elif defined(ELF_INTERP_NON_RELOCATABLE)
 	*pos = ELF_LINK_ADDR;
 #endif
 	return 0;
+}

 @@ -1,24 +1,24 @@
-/* $NetBSD: init_sysent.c,v 1.241 2009/10/13 21:57:53 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.242 2009/12/14 00:48:35 matt Exp $ */
 /*
  * System call switch table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.229 2009/07/21 23:59:00 pooka Exp
+ * created from	NetBSD
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.241 2009/10/13 21:57:53 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.242 2009/12/14 00:48:35 matt Exp $");
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include "fs_lfs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/sched.h>
 #include <sys/syscallargs.h>
 #ifdef COMPAT_43
 @@ -455,29 +455,29 @@ struct sysent sysent[] = {
 #else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 170 = excluded 1.0 msgsys */
 #endif
 #if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
 	{ ns(struct compat_10_sys_shmsys_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 171 = compat_10_oshmsys */
 #else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 171 = excluded 1.0 shmsys */
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 172 = unimplemented */
-	{ ns(struct sys_pread_args), 0,
+	{ ns(struct sys_pread_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
 	    (sy_call_t *)sys_pread },		/* 173 = pread */
-	{ ns(struct sys_pwrite_args), 0,
+	{ ns(struct sys_pwrite_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
 	    (sy_call_t *)sys_pwrite },		/* 174 = pwrite */
 	{ ns(struct compat_30_sys_ntp_gettime_args), 0,
 	    (sy_call_t *)compat_30(sys_ntp_gettime) },/* 175 = compat_30_ntp_gettime */
 #if defined(NTP) || !defined(_KERNEL_OPT)
 	{ ns(struct sys_ntp_adjtime_args), 0,
 	    (sy_call_t *)sys_ntp_adjtime },	/* 176 = ntp_adjtime */
 #else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 176 = excluded ntp_adjtime */
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 177 = unimplemented */
 	{ 0, 0, 0,
 @@ -519,35 +519,35 @@ struct sysent sysent[] = {
 	    (sy_call_t *)sys_nomodule },	/* 190 = compat_12_lstat12 */
 	{ ns(struct sys_pathconf_args), 0,
 	    (sy_call_t *)sys_pathconf },	/* 191 = pathconf */
 	{ ns(struct sys_fpathconf_args), 0,
 	    (sy_call_t *)sys_fpathconf },	/* 192 = fpathconf */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 193 = unimplemented */
 	{ ns(struct sys_getrlimit_args), 0,
 	    (sy_call_t *)sys_getrlimit },	/* 194 = getrlimit */
 	{ ns(struct sys_setrlimit_args), 0,
 	    (sy_call_t *)sys_setrlimit },	/* 195 = setrlimit */
 	{ ns(struct compat_12_sys_getdirentries_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 196 = compat_12_getdirentries */
-	{ ns(struct sys_mmap_args), 0,
+	{ ns(struct sys_mmap_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG6_64,
 	    (sy_call_t *)sys_mmap },		/* 197 = mmap */
-	{ ns(struct sys___syscall_args), SYCALL_INDIRECT,
+	{ ns(struct sys___syscall_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG0_64 | SYCALL_RET_64 | SYCALL_INDIRECT,
 	    (sy_call_t *)sys___syscall },	/* 198 = __syscall */
-	{ ns(struct sys_lseek_args), 0,
+	{ ns(struct sys_lseek_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64 | SYCALL_RET_64,
 	    (sy_call_t *)sys_lseek },		/* 199 = lseek */
-	{ ns(struct sys_truncate_args), 0,
+	{ ns(struct sys_truncate_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64,
 	    (sy_call_t *)sys_truncate },	/* 200 = truncate */
-	{ ns(struct sys_ftruncate_args), 0,
+	{ ns(struct sys_ftruncate_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG2_64,
 	    (sy_call_t *)sys_ftruncate },	/* 201 = ftruncate */
 	{ ns(struct sys___sysctl_args), 0,
 	    (sy_call_t *)sys___sysctl },	/* 202 = __sysctl */
 	{ ns(struct sys_mlock_args), 0,
 	    (sy_call_t *)sys_mlock },		/* 203 = mlock */
 	{ ns(struct sys_munlock_args), 0,
 	    (sy_call_t *)sys_munlock },		/* 204 = munlock */
 	{ ns(struct sys_undelete_args), 0,
 	    (sy_call_t *)sys_undelete },	/* 205 = undelete */
 	{ ns(struct compat_50_sys_futimes_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 206 = compat_50_futimes */
 	{ ns(struct sys_getpgid_args), 0,
 	    (sy_call_t *)sys_getpgid },		/* 207 = getpgid */
 @@ -736,29 +736,29 @@ struct sysent sysent[] = {
 	    (sy_call_t *)sys___vfork14 },	/* 282 = __vfork14 */
 	{ ns(struct sys___posix_chown_args), 0,
 	    (sy_call_t *)sys___posix_chown },	/* 283 = __posix_chown */
 	{ ns(struct sys___posix_fchown_args), 0,
 	    (sy_call_t *)sys___posix_fchown },	/* 284 = __posix_fchown */
 	{ ns(struct sys___posix_lchown_args), 0,
 	    (sy_call_t *)sys___posix_lchown },	/* 285 = __posix_lchown */
 	{ ns(struct sys_getsid_args), 0,
 	    (sy_call_t *)sys_getsid },		/* 286 = getsid */
 	{ ns(struct sys___clone_args), 0,
 	    (sy_call_t *)sys___clone },		/* 287 = __clone */
 	{ ns(struct sys_fktrace_args), 0,
 	    (sy_call_t *)sys_fktrace },		/* 288 = fktrace */
-	{ ns(struct sys_preadv_args), 0,
+	{ ns(struct sys_preadv_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
 	    (sy_call_t *)sys_preadv },		/* 289 = preadv */
-	{ ns(struct sys_pwritev_args), 0,
+	{ ns(struct sys_pwritev_args), SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
 	    (sy_call_t *)sys_pwritev },		/* 290 = pwritev */
 	{ ns(struct compat_16_sys___sigaction14_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 291 = compat_16___sigaction14 */
 	{ ns(struct sys___sigpending14_args), 0,
 	    (sy_call_t *)sys___sigpending14 },	/* 292 = __sigpending14 */
 	{ ns(struct sys___sigprocmask14_args), 0,
 	    (sy_call_t *)sys___sigprocmask14 },	/* 293 = __sigprocmask14 */
 	{ ns(struct sys___sigsuspend14_args), 0,
 	    (sy_call_t *)sys___sigsuspend14 },	/* 294 = __sigsuspend14 */
 	{ ns(struct compat_16_sys___sigreturn14_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 295 = compat_16___sigreturn14 */
 	{ ns(struct sys___getcwd_args), 0,
 	    (sy_call_t *)sys___getcwd },	/* 296 = __getcwd */
 @@ -881,27 +881,27 @@ struct sysent sysent[] = {
 	    (sy_call_t *)sys__sched_getparam },	/* 347 = _sched_getparam */
 	{ ns(struct sys__sched_setaffinity_args), 0,
 	    (sy_call_t *)sys__sched_setaffinity },/* 348 = _sched_setaffinity */
 	{ ns(struct sys__sched_getaffinity_args), 0,
 	    (sy_call_t *)sys__sched_getaffinity },/* 349 = _sched_getaffinity */
 	{ 0, 0, 0,
 	    (sy_call_t *)sys_sched_yield },	/* 350 = sched_yield */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 351 = unimplemented */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 352 = unimplemented */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 353 = unimplemented */
-	{ ns(struct sys_fsync_range_args), 0,
+	{ ns(struct sys_fsync_range_args), SYCALL_NARGS64_VAL(2) | SYCALL_ARG3_64 | SYCALL_ARG2_64,
 	    (sy_call_t *)sys_fsync_range },	/* 354 = fsync_range */
 	{ ns(struct sys_uuidgen_args), 0,
 	    (sy_call_t *)sys_uuidgen },		/* 355 = uuidgen */
 	{ ns(struct sys_getvfsstat_args), 0,
 	    (sy_call_t *)sys_getvfsstat },	/* 356 = getvfsstat */
 	{ ns(struct sys_statvfs1_args), 0,
 	    (sy_call_t *)sys_statvfs1 },	/* 357 = statvfs1 */
 	{ ns(struct sys_fstatvfs1_args), 0,
 	    (sy_call_t *)sys_fstatvfs1 },	/* 358 = fstatvfs1 */
 	{ ns(struct compat_30_sys_fhstatvfs1_args), 0,
 	    (sy_call_t *)sys_nomodule },	/* 359 = compat_30_fhstatvfs1 */
 	{ ns(struct sys_extattrctl_args), 0,
 	    (sy_call_t *)sys_extattrctl },	/* 360 = extattrctl */
 @@ -1005,27 +1005,27 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 409 = unimplemented */
 	{ ns(struct sys___mount50_args), 0,
 	    (sy_call_t *)sys___mount50 },	/* 410 = __mount50 */
 	{ ns(struct sys_mremap_args), 0,
 	    (sy_call_t *)sys_mremap },		/* 411 = mremap */
 	{ ns(struct sys_pset_create_args), 0,
 	    (sy_call_t *)sys_pset_create },	/* 412 = pset_create */
 	{ ns(struct sys_pset_destroy_args), 0,
 	    (sy_call_t *)sys_pset_destroy },	/* 413 = pset_destroy */
 	{ ns(struct sys_pset_assign_args), 0,
 	    (sy_call_t *)sys_pset_assign },	/* 414 = pset_assign */
 	{ ns(struct sys__pset_bind_args), 0,
 	    (sy_call_t *)sys__pset_bind },	/* 415 = _pset_bind */
-	{ ns(struct sys___posix_fadvise50_args), 0,
+	{ ns(struct sys___posix_fadvise50_args), SYCALL_NARGS64_VAL(2) | SYCALL_ARG3_64 | SYCALL_ARG2_64,
 	    (sy_call_t *)sys___posix_fadvise50 },/* 416 = __posix_fadvise50 */
 	{ ns(struct sys___select50_args), 0,
 	    (sy_call_t *)sys___select50 },	/* 417 = __select50 */
 	{ ns(struct sys___gettimeofday50_args), 0,
 	    (sy_call_t *)sys___gettimeofday50 },/* 418 = __gettimeofday50 */
 	{ ns(struct sys___settimeofday50_args), 0,
 	    (sy_call_t *)sys___settimeofday50 },/* 419 = __settimeofday50 */
 	{ ns(struct sys___utimes50_args), 0,
 	    (sy_call_t *)sys___utimes50 },	/* 420 = __utimes50 */
 	{ ns(struct sys___adjtime50_args), 0,
 	    (sy_call_t *)sys___adjtime50 },	/* 421 = __adjtime50 */
 #if defined(LFS) || !defined(_KERNEL)
 	{ ns(struct sys___lfs_segwait50_args), 0,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_process.c,v 1.151 2009/10/21 21:12:06 rmind Exp $	*/
+/*	$NetBSD: sys_process.c,v 1.152 2009/12/14 00:48:35 matt Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -108,27 +108,27 @@
 /*
  * References:
  *	(1) Bach's "The Design of the UNIX Operating System",
  *	(2) sys/miscfs/procfs from UCB's 4.4BSD-Lite distribution,
  *	(3) the "4.4BSD Programmer's Reference Manual" published
  *		by USENIX and O'Reilly & Associates.
  * The 4.4BSD PRM does a reasonably good job of documenting what the various
  * ptrace() requests should actually do, and its text is quoted several times
  * in this file.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.151 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.152 2009/12/14 00:48:35 matt Exp $");
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/ptrace.h>
 #include <sys/uio.h>
 #include <sys/user.h>
 #include <sys/ras.h>
 #include <sys/kmem.h>
 @@ -886,47 +886,55 @@ process_validregs(struct lwp *l)
 	return (0);
 #endif
+}
 int
 process_dofpregs(struct lwp *curl /*tracer*/,
     struct lwp *l /*traced*/,
     struct uio *uio)
+{
 #if defined(PT_GETFPREGS) || defined(PT_SETFPREGS)
 	int error;
 	struct fpreg r;
 	char *kv;
-	int kl;
+	size_t kl;
 	if (uio->uio_offset < 0 || uio->uio_offset > (off_t)sizeof(r))
 		return EINVAL;
 	kl = sizeof(r);
 	kv = (char *)&r;
 	kv += uio->uio_offset;
 	kl -= uio->uio_offset;
 	if ((size_t)kl > uio->uio_resid)
 		kl = uio->uio_resid;
 #ifdef __HAVE_PROCESS_XFPREGS
 	error = process_read_xfpregs(l, &r, &kl);
 #else
 	error = process_read_fpregs(l, &r);
 #endif
 	if (error == 0)
 		error = uiomove(kv, kl, uio);
 	if (error == 0 && uio->uio_rw == UIO_WRITE) {
 		if (l->l_stat != LSSTOP)
 			error = EBUSY;
 		else
 #ifdef __HAVE_PROCESS_XFPREGS
 			error = process_write_xfpregs(l, &r, kl);
 #else
 			error = process_write_fpregs(l, &r);
 #endif
+	}
 	uio->uio_offset = 0;
 	return (error);
 #else
 	return (EINVAL);
 #endif
+}
 int
 process_validfpregs(struct lwp *l)
+{
 #if defined(PT_SETFPREGS) || defined(PT_GETFPREGS)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.h,v 1.128 2009/12/10 14:13:54 matt Exp $	*/
+/*	$NetBSD: exec.h,v 1.129 2009/12/14 00:48:35 matt Exp $	*/
 /*-
  * Copyright (c) 1992, 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:
 @@ -205,27 +205,27 @@ struct exec_package {
 #define	EXEC_INDIR	0x0001		/* script handling already done */
 #define	EXEC_HASFD	0x0002		/* holding a shell script */
 #define	EXEC_HASARGL	0x0004		/* has fake args vector */
 #define	EXEC_SKIPARG	0x0008		/* don't copy user-supplied argv[0] */
 #define	EXEC_DESTR	0x0010		/* destructive ops performed */
 #define	EXEC_32		0x0020		/* 32-bit binary emulation */
 struct exec_vmcmd {
 	int	(*ev_proc)(struct lwp *, struct exec_vmcmd *);
 				/* procedure to run for region of vmspace */
 	vsize_t	ev_len;		/* length of the segment to map */
 	vaddr_t	ev_addr;	/* address in the vmspace to place it at */
 	struct	vnode *ev_vp;	/* vnode pointer for the file w/the data */
-	u_long	ev_offset;	/* offset in the file for the data */
+	vsize_t	ev_offset;	/* offset in the file for the data */
 	u_int	ev_prot;	/* protections for segment */
 	int	ev_flags;
 #define	VMCMD_RELATIVE	0x0001	/* ev_addr is relative to base entry */
 #define	VMCMD_BASE	0x0002	/* marks a base entry */
 #define	VMCMD_FIXED	0x0004	/* entry must be mapped at ev_addr */
 #define	VMCMD_STACK	0x0008	/* entry is for a stack */
 };
 #ifdef _KERNEL
 /*
  * funtions used either by execve() or the various CPU-dependent execve()
  * hooks.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptrace.h,v 1.41 2009/10/02 22:18:56 elad Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.42 2009/12/14 00:48:35 matt Exp $	*/
 /*-
  * Copyright (c) 1984, 1993
  *	The Regents of the University of California.  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.
 @@ -103,48 +103,62 @@ void	ptrace_init(void);
 int	process_doregs(struct lwp *, struct lwp *, struct uio *);
 int	process_validregs(struct lwp *);
 int	process_dofpregs(struct lwp *, struct lwp *, struct uio *);
 int	process_validfpregs(struct lwp *);
 int	process_domem(struct lwp *, struct lwp *, struct uio *);
 void	process_stoptrace(void);
 void	proc_reparent(struct proc *, struct proc *);
 #ifdef PT_GETFPREGS
 #ifdef __HAVE_PROCESS_XFPREGS
 int	process_read_xfpregs(struct lwp *, struct fpreg *, size_t *);
 #ifndef process_read_xfpregs32
 #define process_read_xfpregs32	process_read_xfpregs
 #endif
 #ifndef process_read_xfpregs64
 #define process_read_xfpregs64	process_read_xfpregs
 #endif
 #else
 int	process_read_fpregs(struct lwp *, struct fpreg *);
 #ifndef process_read_fpregs32
 #define process_read_fpregs32	process_read_fpregs
 #endif
 #ifndef process_read_fpregs64
 #define process_read_fpregs64	process_read_fpregs
 #endif
 #endif
 #endif
 #ifdef PT_GETREGS
 int	process_read_regs(struct lwp *, struct reg *);
 #ifndef process_read_regs32
 #define process_read_regs32	process_read_regs
 #endif
 #ifndef process_read_regs64
 #define process_read_regs64	process_read_regs
 #endif
 #endif
 int	process_set_pc(struct lwp *, void *);
 int	process_sstep(struct lwp *, int);
 #ifdef PT_SETFPREGS
 #ifdef __HAVE_PROCESS_XFPREGS
 int	process_write_xfpregs(struct lwp *, const struct fpreg *, size_t);
 #else
 int	process_write_fpregs(struct lwp *, const struct fpreg *);
 #endif
 #endif
 #ifdef PT_SETREGS
 int	process_write_regs(struct lwp *, const struct reg *);
 #endif
 #ifdef __HAVE_PROCFS_MACHDEP
 int	ptrace_machdep_dorequest(struct lwp *, struct lwp *, int,
 	    void *, int);
 #endif
 #ifndef FIX_SSTEP
 #define FIX_SSTEP(p)
 #endif

 @@ -1,9 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.20 2009/08/14 19:23:54 dsl Exp $
+#	$NetBSD: Makefile.inc,v 1.21 2009/12/14 00:48:35 matt Exp $
+#
 #	There are likely more that we will notice when we go native
 NO_SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
 NO_SRCS+= __main.c
-SRCS+=	byte_swap_2.S byte_swap_4.S ffs.S memcpy.S memset.S memmove.S
+SRCS+=	__assert.c memchr.c memcmp.c random.c scanc.c \
-SRCS+=	strlen.S strcmp.S
+	skpc.c strcat.c strcpy.c strcasecmp.c \
 	strncasecmp.c strncmp.c strncpy.c strtoul.c
 SRCS+=	byte_swap_2.S byte_swap_4.S byte_swap_8.S \
 	ffs.S memcpy.S memset2.c memmove.S \
 	strlen.S strcmp.S