 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.42 2011/12/20 15:45:36 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.43 2011/12/20 21:26:37 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -133,18 +133,20 @@ void 	thunk_free(void *addr);
 void *	thunk_sbrk(intptr_t len);
 void *	thunk_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset);
 int	thunk_munmap(void *addr, size_t len);
 int	thunk_mprotect(void *addr, size_t len, int prot);
 int	thunk_posix_memalign(void **, size_t, size_t);
 int	thunk_idle(void);
 char *	thunk_getenv(const char *);
 vaddr_t	thunk_get_vm_min_address(void);
 int	thunk_getcpuinfo(char *, int *);
 int	thunk_getmachine(char *, size_t);
 int	thunk_sdl_init(unsigned int, unsigned int, unsigned short);
 void *	thunk_sdl_getfb(size_t);
 int	thunk_sdl_getchar(void);
 #endif /* !_ARCH_USERMODE_INCLUDE_THUNK_H */

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.39 2011/12/20 21:01:39 jmcneill Exp $ */
+/* $NetBSD: machdep.c,v 1.40 2011/12/20 21:26:37 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@netbsd.org>
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * 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
 @@ -21,67 +21,70 @@
  * 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 "opt_memsize.h"
 #include "opt_sdl.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2011/12/20 21:01:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2011/12/20 21:26:37 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/exec.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/ucontext.h>
 #include <sys/utsname.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 #include <dev/mm.h>
 #include <machine/machdep.h>
 #include <machine/thunk.h>
 char machine[] = "usermode";
-char machine_arch[] = "usermode";
+char machine_arch[_SYS_NMLN] = "";
 static char **saved_argv;
 char *usermode_root_image_path = NULL;
 void	main(int argc, char *argv[]);
 void	usermode_reboot(void);
 void
 main(int argc, char *argv[])
+{
 #if defined(SDL)
 	extern int genfb_thunkbus_cnattach(void);
 #endif
 	extern void ttycons_consinit(void);
 	extern void pmap_bootstrap(void);
 	extern void kernmain(void);
 	int i, j, r, tmpopt = 0;
 	saved_argv = argv;
 	thunk_getmachine(machine_arch, sizeof(machine_arch));
 #if defined(SDL)
 	if (genfb_thunkbus_cnattach() == 0)
 #endif
 		ttycons_consinit();
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] != '-') {
 			usermode_root_image_path = argv[i];
 			continue;
+		}
 		for (j = 1; argv[i][j] != '\0'; j++) {
 			r = 0;
 			BOOT_FLAG(argv[i][j], r);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.49 2011/12/20 21:07:56 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.50 2011/12/20 21:26:37 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -18,33 +18,35 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.49 2011/12/20 21:07:56 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.50 2011/12/20 21:26:37 jmcneill Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/reboot.h>
 #include <sys/poll.h>
 #include <sys/utsname.h>
 #include <sys/sysctl.h>
 #include <machine/vmparam.h>
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
 @@ -654,13 +656,37 @@ thunk_getcpuinfo(char *cp, int *len)
 	fd = open("/proc/cpuinfo", O_RDONLY);
 	if (fd == -1)
 		return -1;
 	rlen = read(fd, cp, *len - 1);
 	close(fd);
 	if (rlen == -1)
 		return -1;
 	*len = rlen;
 	return 0;
+}
 int
 thunk_getmachine(char *buf, size_t buflen)
+{
 #ifdef __NetBSD__
 	size_t len = buflen - 1;
 	memset(buf, 0, buflen);
 	if (sysctlbyname("hw.machine_arch", buf, &len, NULL, 0) != 0) {
 		perror("sysctlbyname hw.machine_arch failed");
 		return -1;
+	}
 #else
 	struct utsname uts;
 	if (uname(&uts) != 0) {
 		perror("uname failed");
 		return -1;
+	}
 	strlcpy(buf, uts.machine, buflen);
 #endif
 	return 0;
+}