 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.218 2023/03/03 14:32:48 riastradh Exp $	*/
+/*	$NetBSD: locore.S,v 1.219 2023/04/20 00:42:23 manu Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 1998, 2000, 2007, 2008, 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -446,26 +446,34 @@ tmpstk:
 /*
  * Some hackage to deal with 64bit symbols in 32 bit mode.
  * This may not be needed if things are cleaned up a little.
  */
 	.text
 	.globl	_C_LABEL(kernel_text)
 	.set	_C_LABEL(kernel_text),KERNTEXTOFF
 ENTRY(start)
 #ifndef XENPV
 	.code32
 	call	next
 next:	pop	%edi
 	sub     $(next - kernel_text), %edi
 	/* If not KERNBASE, reloc ourselves to KERNBASE */
 	cmpl	$(KERNTEXTOFF_LO - KERNBASE_LO), %edi
 	jne	selfreloc_start
 	/* Warm boot */
 	movw	$0x1234,0x472
 	/*
 	 * Load parameters from the stack (32 bits):
 	 *     boothowto, [bootdev], bootinfo, esym, biosextmem, biosbasemem
 	 * We are not interested in 'bootdev'.
 	 */
 	/* Load 'boothowto' */
 	movl	4(%esp),%eax
 	movl	%eax,RELOC(boothowto)
 @@ -1747,13 +1755,148 @@ LABEL(noibrs_enter_end)
 LABEL(noibrs_leave)
 	NOIBRS_LEAVE
 LABEL(noibrs_leave_end)
 LABEL(mds_leave)
 	pushq	$GSEL(GDATA_SEL, SEL_KPL)
 	verw	(%rsp)
 	addq	$8,%rsp
 LABEL(mds_leave_end)
 LABEL(nomds_leave)
 	NOMDS_LEAVE
 LABEL(nomds_leave_end)
 /*
  * selfreloc(loadddr edi)
  * This is adapted from sys/arch/i386/i386/locore.S
  */
 	.code32
 ENTRY(selfreloc_start)
 	movl	%edi, %ebx		/* loadaddr saved in ebx */
 	movl	%edi, %esi				/* src */
 	movl	$_RELOC(kernel_text), %edi		/* dest */
 	movl	16(%esp),%ecx				/* esym */
 	subl	$_RELOC(kernel_text), %ecx		/* size */
 #if defined(NO_OVERLAP)
         movl    %ecx, %eax
 #else
         movl    %edi, %eax
         subl    %esi, %eax
         cmpl    %ecx, %eax      /* overlapping? */
         movl    %ecx, %eax
         jb      .Lbackwards
 #endif
         /* nope, copy forwards. */
         shrl    $2, %ecx        /* copy by words */
         rep
         movsl
         and     $3, %eax        /* any bytes left? */
         jnz     .Ltrailing
         jmp     .Lcopy_done
 .Ltrailing:
         cmp     $2, %eax
         jb      11f
         movw    (%esi), %ax
         movw    %ax, (%edi)
         je      .Lcopy_done
         movb    2(%esi), %al
         movb    %al, 2(%edi)
         jmp     .Lcopy_done
 :     movb    (%esi), %al
         movb    %al, (%edi)
         jmp     .Lcopy_done
 #if !defined(NO_OVERLAP)
 .Lbackwards:
         addl    %ecx, %edi      /* copy backwards. */
         addl    %ecx, %esi
         and     $3, %eax        /* any fractional bytes? */
         jnz     .Lback_align
 .Lback_aligned:
         shrl    $2, %ecx
         subl    $4, %esi
         subl    $4, %edi
         std
         rep
         movsl
         cld
         jmp     .Lcopy_done
 .Lback_align:
         sub     %eax, %esi
         sub     %eax, %edi
         cmp     $2, %eax
         jb      11f
         je      12f
         movb    2(%esi), %al
         movb    %al, 2(%edi)
 :     movw    (%esi), %ax
         movw    %ax, (%edi)
         jmp     .Lback_aligned
 :     movb    (%esi), %al
         movb    %al, (%edi)
         jmp     .Lback_aligned
 #endif
         /* End of copy kernel */
 .Lcopy_done:
 	cld			/* LynxOS depends on it */
 	/* load current selfreloc_start addesss in $edi */
 	movl	%ebx, %edi	/* loadaddr was saved in ebx */
 	addl	$(selfreloc_start - kernel_text), %edi
 	/* Prepare jump address */
 	lea	(selfreloc_start32a - selfreloc_start)(%edi), %eax
 	movl	%eax, (selfreloc_start32r - selfreloc_start)(%edi)
 	/* Setup GDT */
 	lea	(gdt - selfreloc_start)(%edi), %eax
 	mov	%eax, (gdtrr - selfreloc_start)(%edi)
 	lgdt	(gdtr - selfreloc_start)(%edi)
 	/* Jump to set %cs */
 	ljmp	*(selfreloc_start32r - selfreloc_start)(%edi)
 	.align	4
 selfreloc_start32a:
 	movl	$0x10, %eax	/* #define DATA_SEGMENT 0x10 */
 	movw	%ax, %ds
 	movw	%ax, %es
 	movw	%ax, %fs
 	movw	%ax, %gs
 	movw	%ax, %ss
 	/* Disable Paging in CR0 */
 	movl	%cr0, %eax
 	andl	$(~CR0_PG), %eax
 	movl	%eax, %cr0
 	/* Disable PAE in CR4 */
 	movl	%cr4, %eax
 	andl	$(~CR4_PAE), %eax
 	movl	%eax, %cr4
 	jmp	selfreloc_start32b
 	.align	4
 selfreloc_start32b:
 	xor	%eax, %eax
 	movl	$_RELOC(start), %esi
 	jmp	*%esi
 	.align	16
 selfreloc_start32r:
 	.long	0
 	.long	0x08	/* #define	CODE_SEGMENT	0x08 */
 	.align	16
 gdt:
 	.long	0, 0
 	.byte	0xff, 0xff, 0x00, 0x00, 0x00, 0x9f, 0xcf, 0x00
 	.byte	0xff, 0xff, 0x00, 0x00, 0x00, 0x93, 0xcf, 0x00
 gdtr:
 	.word	gdtr - gdt
 gdtrr:
 	.quad
 END(selfreloc_start)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.21 2022/06/08 21:43:45 wiz Exp $	*/
+/*	$NetBSD: boot.c,v 1.22 2023/04/20 00:42:24 manu Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * 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.
 @@ -73,52 +73,54 @@ void	command_root(char *);
 void	command_dev(char *);
 void	command_devpath(char *);
 void	command_efivar(char *);
 void	command_gop(char *);
 #if LIBSA_ENABLE_LS_OP
 void	command_ls(char *);
 #endif
 void	command_memmap(char *);
 #ifndef SMALL
 void	command_menu(char *);
 #endif
 void	command_modules(char *);
 void	command_multiboot(char *);
 void	command_reloc(char *);
 void	command_text(char *);
 void	command_version(char *);
 const struct bootblk_command commands[] = {
 	{ "help",	command_help },
 	{ "?",		command_help },
 	{ "quit",	command_quit },
 	{ "boot",	command_boot },
 	{ "pkboot",	command_pkboot },
 	{ "consdev",	command_consdev },
 	{ "root",	command_root },
 	{ "dev",	command_dev },
 	{ "devpath",	command_devpath },
 	{ "efivar",	command_efivar },
 	{ "fs",		fs_add },
 	{ "gop",	command_gop },
 	{ "load",	module_add },
 #if LIBSA_ENABLE_LS_OP
 	{ "ls",		command_ls },
 #endif
 	{ "memmap",	command_memmap },
 #ifndef SMALL
 	{ "menu",	command_menu },
 #endif
 	{ "modules",	command_modules },
 	{ "multiboot",	command_multiboot },
 	{ "reloc",	command_reloc },
 	{ "rndseed",	rnd_add },
 	{ "splash",	splash_add },
 	{ "text",	command_text },
 	{ "userconf",	userconf_add },
 	{ "version",	command_version },
 	{ NULL,		NULL },
 };
 static char *default_fsname;
 static char *default_devname;
 static int default_unit, default_partition;
 static const char *default_filename;
 static const char *default_part_name;
 @@ -396,26 +398,27 @@ command_help(char *arg)
 	       "devpath\n"
 	       "efivar\n"
 	       "gop [{modenum|list}]\n"
 	       "load {path_to_module}\n"
 #if LIBSA_ENABLE_LS_OP
 	       "ls [dev:][path]\n"
 #endif
 	       "memmap [{sorted|unsorted|compact}]\n"
 #ifndef SMALL
 	       "menu (reenters boot menu, if defined in boot.cfg)\n"
 #endif
 	       "modules {on|off|enabled|disabled}\n"
 	       "multiboot [dev:][filename] [<args>]\n"
 	       "reloc {address|none|default}\n"
 	       "rndseed {path_to_rndseed_file}\n"
 	       "splash {path_to_image_file}\n"
 	       "text [{modenum|list}]\n"
 	       "userconf {command}\n"
 	       "version\n"
 	       "help|?\n"
 	       "quit\n");
+}
 #if LIBSA_ENABLE_LS_OP
 void
 command_ls(char *arg)
+{
 @@ -631,26 +634,68 @@ void
 command_multiboot(char *arg)
+{
 	char *filename;
 	filename = arg;
 	if (exec_multiboot(filename, gettrailer(arg)) < 0)
 		printf("multiboot: %s: %s\n", sprint_bootsel(filename),
 		       strerror(errno));
 	else
 		printf("boot returned\n");
+}
 void
 command_reloc(char *arg)
+{
 	char *ep;
 	if (*arg == '\0') {
 		switch (efi_reloc_type) {
 		case RELOC_NONE:
 			printf("reloc: none\n");
 			break;
 		case RELOC_ADDR:
 			printf("reloc: %p\n", (void *)efi_kernel_reloc);
 			break;
 		case RELOC_DEFAULT:
 		default:
 			printf("reloc: default\n");
 			break;
+		}
 		goto out;
+	}
 	if (strcmp(arg, "default") == 0) {
 		efi_reloc_type = RELOC_DEFAULT;
 		goto out;
+	}
 	if (strcmp(arg, "none") == 0) {
 		efi_reloc_type = RELOC_NONE;
 		goto out;
+	}
 	errno = 0;
 	efi_kernel_reloc = strtoul(arg, &ep, 0);
 	if (ep == arg || *ep != '\0' || errno)
 		printf("could not parse address \"%s\"\n", arg);
 	else
 		efi_reloc_type = RELOC_ADDR;
 out:
 	return;
+}
 void
 command_version(char *arg)
+{
 	CHAR16 *path;
 	char *upath, *ufirmware;
 	int rv;
 	if (strcmp(arg, "full") == 0) {
 		printf("ImageBase: 0x%" PRIxPTR "\n",
 		    (uintptr_t)efi_li->ImageBase);
 		printf("Stack: 0x%" PRIxPTR "\n", efi_main_sp);
 		printf("EFI version: %d.%02d\n",
 		    ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0xffff);
 		ufirmware = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efiboot.c,v 1.12 2020/02/09 12:13:39 jmcneill Exp $	*/
+/*	$NetBSD: efiboot.c,v 1.13 2023/04/20 00:42:24 manu Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * 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.
 @@ -26,27 +26,29 @@
  * SUCH DAMAGE.
  */
 #include "efiboot.h"
 #include "bootinfo.h"
 #include "devopen.h"
 EFI_HANDLE IH;
 EFI_DEVICE_PATH *efi_bootdp;
 enum efi_boot_device_type efi_bootdp_type = BOOT_DEVICE_TYPE_HD;
 EFI_LOADED_IMAGE *efi_li;
 uintptr_t efi_main_sp;
-physaddr_t efi_loadaddr, efi_kernel_start;
+physaddr_t efi_loadaddr, efi_kernel_start, efi_load_start;
 physaddr_t efi_kernel_reloc = 0;
 enum efi_reloc_type efi_reloc_type = RELOC_DEFAULT;
 u_long efi_kernel_size;
 bool efi_cleanuped;
 struct btinfo_efimemmap *btinfo_efimemmap = NULL;
 static EFI_PHYSICAL_ADDRESS heap_start = EFI_ALLOCATE_MAX_ADDRESS;
 static UINTN heap_size = 1 * 1024 * 1024;			/* 1MB */
 static struct btinfo_efi btinfo_efi;
 static void efi_heap_init(void);
 EFI_STATUS EFIAPI efi_main(EFI_HANDLE, EFI_SYSTEM_TABLE *);
 EFI_STATUS EFIAPI
 efi_main(EFI_HANDLE imageHandle, EFI_SYSTEM_TABLE *systemTable)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efiboot.h,v 1.11 2021/09/07 11:41:31 nia Exp $	*/
+/*	$NetBSD: efiboot.h,v 1.12 2023/04/20 00:42:24 manu Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * 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.
 @@ -42,27 +42,33 @@ extern EFI_GUID GraphicsOutputProtocol;
 void boot(void);
 void clearit(void);
 /* efiboot.c */
 extern EFI_HANDLE IH;
 extern EFI_DEVICE_PATH *efi_bootdp;
 extern enum efi_boot_device_type {
 	BOOT_DEVICE_TYPE_HD,
 	BOOT_DEVICE_TYPE_CD,
 	BOOT_DEVICE_TYPE_NET
 } efi_bootdp_type;
 extern EFI_LOADED_IMAGE *efi_li;
 extern uintptr_t efi_main_sp;
-extern physaddr_t efi_loadaddr, efi_kernel_start;
+extern physaddr_t efi_loadaddr, efi_kernel_start, efi_load_start;
 extern physaddr_t efi_kernel_reloc;
 extern enum efi_reloc_type {
 	RELOC_DEFAULT,
 	RELOC_NONE,
 	RELOC_ADDR,
 } efi_reloc_type;
 extern u_long efi_kernel_size;
 extern bool efi_cleanuped;
 void efi_cleanup(void);
 /* efichar.c */
 size_t ucs2len(const CHAR16 *);
 int ucs2_to_utf8(const CHAR16 *, char **);
 int utf8_to_ucs2(const char *, CHAR16 **, size_t *);
 /* eficons.c */
 int cninit(void);
 void efi_consinit(int, int, int);
 void efi_cons_show(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efibootia32.c,v 1.5 2019/09/13 02:19:45 manu Exp $	*/
+/*	$NetBSD: efibootia32.c,v 1.6 2023/04/20 00:42:24 manu Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * 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.
 @@ -66,23 +66,23 @@ efi_md_init(void)
                     __func__, sz, (uintmax_t)status);
         multiboot32 = (void *)(u_long)addr;
         CopyMem(multiboot32, multiboot32_start, multiboot32_size);
+}
 /* ARGSUSED */
 void
 startprog(physaddr_t entry, uint32_t argc, uint32_t *argv, physaddr_t sp)
+{
 	(*startprog32)(entry, argc, argv,
 	    (physaddr_t)startprog32 + startprog32_size,
-	    efi_kernel_start, efi_kernel_start + efi_loadaddr,
+	    efi_kernel_start, efi_load_start,
 	    efi_kernel_size, startprog32);
+}
 /* ARGSUSED */
 void
 multiboot(physaddr_t entry, physaddr_t header, physaddr_t sp, uint32_t magic)
+{
 	(*multiboot32)(entry, header, magic);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: startprog32.S,v 1.2 2017/02/24 12:24:25 nonaka Exp $	*/
+/*	$NetBSD: startprog32.S,v 1.3 2023/04/20 00:42:24 manu Exp $	*/
 /*	NetBSD: startprog.S,v 1.4 2016/12/04 08:21:08 maxv Exp	*/
 /*
  * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
+ *
  * Mach Operating System
  * Copyright (c) 1992, 1991 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
 @@ -107,26 +107,31 @@ start:
 	addl	16(%ebp), %eax	/* ptr to last arg */
 	movl	%eax, %esi
 	std			/* backwards */
 	rep
 	movsl			/* copy %ds:(%esi) -> %es:(%edi) */
 	cld
 	mov	%edi, %esp	/* set new stack pointer */
 	/* Copy kernel */
 	movl	24(%ebp), %edi	/* dest */
 	movl	28(%ebp), %esi	/* src */
 	movl	32(%ebp), %ecx	/* size */
 	/* skip copy if same source and destination */
 	cmpl    %edi,%esi
 	jz      .Lcopy_done
 #if defined(NO_OVERLAP)
 	movl	%ecx, %eax
 #else
 	movl	%edi, %eax
 	subl	%esi, %eax
 	cmpl	%ecx, %eax	/* overlapping? */
 	movl	%ecx, %eax
 	jb	.Lbackwards
 #endif
 	/* nope, copy forwards. */
 	shrl	$2, %ecx	/* copy by words */
 	rep
 	movsl

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efibootx64.c,v 1.5 2019/09/13 02:19:46 manu Exp $	*/
+/*	$NetBSD: efibootx64.c,v 1.6 2023/04/20 00:42:24 manu Exp $	*/
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka@netbsd.org>
  * 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.
 @@ -70,23 +70,23 @@ efi_md_init(void)
 /* ARGSUSED */
 void
 startprog(physaddr_t entry, uint32_t argc, uint32_t *argv, physaddr_t sp)
+{
 	uint32_t *newsp = (void *)((char *)startprog64 + startprog64_size);
 	/* Copy argv to new stack pointer */
 	if (argc > 0) {
 		newsp -= argc;
 		memcpy(newsp, argv, sizeof(*argv) * argc);
+	}
-	(*startprog64)(efi_kernel_start, efi_kernel_start + efi_loadaddr,
+	(*startprog64)(efi_kernel_start, efi_load_start,
 	    (physaddr_t)newsp, efi_kernel_size, startprog64, entry);
+}
 /* ARGSUSED */
 void
 multiboot(physaddr_t entry, physaddr_t header, physaddr_t sp, uint32_t magic)
+{
 	(*multiboot64)(entry, header, magic);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: startprog64.S,v 1.3 2017/02/11 10:23:39 nonaka Exp $	*/
+/*	$NetBSD: startprog64.S,v 1.4 2023/04/20 00:42:24 manu Exp $	*/
 /*	NetBSD: startprog.S,v 1.3 2003/02/01 14:48:18 dsl Exp	*/
 /* starts program in protected mode / flat space
  with given stackframe
  needs global variables flatcodeseg and flatdataseg
  (gdt offsets)
   derived from: NetBSD:sys/arch/i386/boot/asm.S
  */
 /*
  * Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
+ *
  * Mach Operating System
 @@ -87,26 +87,30 @@ start:
 	 * 32bit segment mode from x64 mode.
 	 * %rdi: kernel start address
 	 * %rsi: loaded kernel address
 	 * %rdx: stack address
 	 * %rcx: loaded kernel size
 	 * %r8 : loaded start address
 	 * %r9 : kernel entry address
 	 */
 	cld		/* LynxOS depends on it */
 	cli
 	/* skip copy if same source and destination */
 	cmpq	%rdi,%rsi
 	jz	.Lcopy_done
 	/* Copy kernel */
 	mov	%rcx, %r12		/* original kernel size */
 	movq	%rdi, %r11		/* for misaligned check */
 #if !defined(NO_OVERLAP)
 	movq	%rdi, %r13
 	subq	%rsi, %r13
 #endif
 	shrq	$3, %rcx		/* count for copy by words */
 	jz	8f			/* j if less than 8 bytes */
 	lea	-8(%rdi, %r12), %r14	/* target address of last 8 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.c,v 1.78 2022/09/21 14:29:45 riastradh Exp $	 */
+/*	$NetBSD: exec.c,v 1.79 2023/04/20 00:42:24 manu Exp $	 */
 /*
  * Copyright (c) 2008, 2009 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.
 @@ -455,26 +455,27 @@ common_load_kernel(const char *file, u_l
 	return 0;
+}
 int
 exec_netbsd(const char *file, physaddr_t loadaddr, int boothowto, int floppy,
     void (*callback)(void))
+{
 	uint32_t boot_argv[BOOT_NARGS];
 	u_long marks[MARK_MAX];
 	struct btinfo_symtab btinfo_symtab;
 	u_long extmem;
 	u_long basemem;
 	u_long entry;
 	int error;
 #ifdef EFIBOOT
 	int i;
 #endif
 #ifdef	DEBUG
 	printf("exec: file=%s loadaddr=0x%lx\n", file ? file : "NULL",
 	    loadaddr);
 #endif
 	BI_ALLOC(BTINFO_MAX);
 	BI_ADD(&btinfo_console, BTINFO_CONSOLE, sizeof(struct btinfo_console));
 @@ -487,26 +488,28 @@ exec_netbsd(const char *file, physaddr_t
 	if (has_prekern) {
 		error = common_load_prekern(file, &basemem, &extmem, loadaddr,
 		    floppy, marks);
 	} else {
 		error = common_load_kernel(file, &basemem, &extmem, loadaddr,
 		    floppy, marks);
+	}
 	if (error) {
 		errno = error;
 		goto out;
+	}
 #ifdef EFIBOOT
 	efi_load_start = marks[MARK_START];
 	/* adjust to the real load address */
 	marks[MARK_START] -= efi_loadaddr;
 	marks[MARK_ENTRY] -= efi_loadaddr;
 	marks[MARK_DATA] -= efi_loadaddr;
 	/* MARK_NSYM */
 	marks[MARK_SYM] -= efi_loadaddr;
 	marks[MARK_END] -= efi_loadaddr;
 #endif
 	boot_argv[0] = boothowto;
 	boot_argv[1] = 0;
 	boot_argv[2] = vtophys(bootinfo);	/* old cyl offset */
 	boot_argv[3] = marks[MARK_END];
 @@ -542,39 +545,55 @@ exec_netbsd(const char *file, physaddr_t
 	btinfo_symtab.nsym = marks[MARK_NSYM];
 	btinfo_symtab.ssym = marks[MARK_SYM];
 	btinfo_symtab.esym = marks[MARK_END];
 	BI_ADD(&btinfo_symtab, BTINFO_SYMTAB, sizeof(struct btinfo_symtab));
 	/* set new video mode if necessary */
 	vbe_commit();
 	BI_ADD(&btinfo_framebuffer, BTINFO_FRAMEBUFFER,
 	    sizeof(struct btinfo_framebuffer));
 	if (callback != NULL)
 		(*callback)();
 	entry = marks[MARK_ENTRY];
 #ifdef EFIBOOT
 	/* Copy bootinfo to safe arena. */
 	for (i = 0; i < bootinfo->nentries; i++) {
 		struct btinfo_common *bi = (void *)(u_long)bootinfo->entry[i];
 		char *p = alloc(bi->len);
 		memcpy(p, bi, bi->len);
 		bootinfo->entry[i] = vtophys(p);
+	}
 	efi_kernel_start = marks[MARK_START];
 	efi_kernel_size = image_end - (efi_loadaddr + efi_kernel_start);
 	switch (efi_reloc_type) {
 	case RELOC_NONE:
 		entry += (efi_load_start - efi_kernel_start);
 		efi_kernel_start = efi_load_start;
 		break;
 	case RELOC_ADDR:
 		entry += (efi_kernel_reloc - efi_kernel_start);
 		efi_kernel_start = efi_kernel_reloc;
 		break;
 	case RELOC_DEFAULT:
 	default:
 		break;
+	}
 #endif
-	startprog(marks[MARK_ENTRY], BOOT_NARGS, boot_argv,
+	startprog(entry, BOOT_NARGS, boot_argv,
 	    x86_trunc_page(basemem * 1024));
 	panic("exec returned");
 out:
 	BI_FREE();
 	bootinfo = NULL;
 	return -1;
+}
 static void
 extract_device(const char *path, char *buf, size_t buflen)
+{
 	size_t i;