 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.c,v 1.31 2008/10/08 22:46:19 joerg Exp $	 */
+/*	$NetBSD: exec.c,v 1.32 2008/10/08 22:57:28 joerg Exp $	 */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -123,85 +123,72 @@
 extern struct btinfo_console btinfo_console;
 boot_module_t *boot_modules;
 bool boot_modules_enabled = true;
 bool kernel_loaded;
 static struct btinfo_modulelist *btinfo_modulelist;
 static size_t btinfo_modulelist_size;
 static uint32_t image_end;
 static char module_base[64] = "/";
 static void	module_init(void);
-int
+static int
-exec_netbsd(const char *file, physaddr_t loadaddr, int boothowto, int floppy)
+common_load_kernel(const char *file, u_long *basemem, u_long *extmem,
     physaddr_t loadaddr, int floppy, u_long marks[MARK_MAX])
+{
-	u_long          boot_argv[BOOT_NARGS];
+	int fd;
 	int		fd;
 	u_long		marks[MARK_MAX];
 	struct btinfo_symtab btinfo_symtab;
 	u_long		extmem;
 	u_long		basemem;
 #ifdef XMS
 	u_long		xmsmem;
 	physaddr_t	origaddr = loadaddr;
 #endif
-#ifdef	DEBUG
+	*extmem = getextmem();
-	printf("exec: file=%s loadaddr=0x%lx\n",
+	*basemem = getbasemem();
 	       file ? file : "NULL", loadaddr);
 #endif
 	BI_ALLOC(32); /* ??? */
 	BI_ADD(&btinfo_console, BTINFO_CONSOLE, sizeof(struct btinfo_console));
 	extmem = getextmem();
 	basemem = getbasemem();
 #ifdef XMS
 	if ((getextmem1() == 0) && (xmsmem = checkxms())) {
 	        u_long kernsize;
 		/*
 		 * With "CONSERVATIVE_MEMDETECT", extmem is 0 because
 		 *  getextmem() is getextmem1(). Without, the "smart"
 		 *  methods could fail to report all memory as well.
 		 * xmsmem is a few kB less than the actual size, but
 		 *  better than nothing.
 		 */
-		if (xmsmem > extmem)
+		if (xmsmem > *extmem)
-			extmem = xmsmem;
+			*extmem = xmsmem;
 		/*
 		 * Get the size of the kernel
 		 */
 		marks[MARK_START] = loadaddr;
 		if ((fd = loadfile(file, marks, COUNT_KERNEL)) == -1)
-			goto out;
+			return EIO;
 		close(fd);
 		kernsize = marks[MARK_END];
 		kernsize = (kernsize + 1023) / 1024;
 		loadaddr = xmsalloc(kernsize);
 		if (!loadaddr)
 			return ENOMEM;
+	}
 #endif
 	marks[MARK_START] = loadaddr;
 	if ((fd = loadfile(file, marks,
 	    LOAD_KERNEL & ~(floppy ? LOAD_NOTE : 0))) == -1)
-		goto out;
+		return EIO;
 	close(fd);
 	/*
 	 * Gather some information for the kernel. Do this after the
 	 * "point of no return" to avoid memory leaks.
 	 * (but before DOS might be trashed in the XMS case)
 	 */
 #ifdef PASS_BIOSGEOM
 	bi_getbiosgeom();
 #endif
 #ifdef PASS_MEMMAP
 	bi_getmemmap();
 @@ -216,26 +203,50 @@ exec_netbsd(const char *file, physaddr_t
 		 */
 		marks[MARK_START] -= loadaddr;
 		marks[MARK_END] -= loadaddr;
 		marks[MARK_SYM] -= loadaddr;
 		marks[MARK_END] -= loadaddr;
 		ppbcopy(loadaddr, origaddr, marks[MARK_END]);
+	}
 #endif
 	marks[MARK_END] = (((u_long) marks[MARK_END] + sizeof(int) - 1)) &
 	    (-sizeof(int));
 	image_end = marks[MARK_END];
 	kernel_loaded = true;
 	return 0;
+}
 int
 exec_netbsd(const char *file, physaddr_t loadaddr, int boothowto, int floppy)
+{
 	u_long          boot_argv[BOOT_NARGS];
 	u_long		marks[MARK_MAX];
 	struct btinfo_symtab btinfo_symtab;
 	u_long		extmem;
 	u_long		basemem;
 #ifdef	DEBUG
 	printf("exec: file=%s loadaddr=0x%lx\n",
 	       file ? file : "NULL", loadaddr);
 #endif
 	BI_ALLOC(32); /* ??? */
 	BI_ADD(&btinfo_console, BTINFO_CONSOLE, sizeof(struct btinfo_console));
 	if (common_load_kernel(file, &basemem, &extmem, loadaddr, floppy, marks))
 		goto out;
 	boot_argv[0] = boothowto;
 	boot_argv[1] = 0;
 	boot_argv[2] = vtophys(bootinfo);	/* old cyl offset */
 	boot_argv[3] = marks[MARK_END];
 	boot_argv[4] = extmem;
 	boot_argv[5] = basemem;
 	/* pull in any modules if necessary */
 	if (boot_modules_enabled) {
 		module_init();
 		if (btinfo_modulelist) {
 			BI_ADD(btinfo_modulelist, BTINFO_MODULELIST,
 			    btinfo_modulelist_size);