CVS commit: src/sys/arch/i386/stand/efiboot/bootia32
Module Name:src Committed By: manu Date: Tue Sep 24 00:47:46 UTC 2019 Modified Files: src/sys/arch/i386/stand/efiboot/bootia32: multiboot32.S Log Message: Fix multiboot32 argument usage To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/efiboot/bootia32
Module Name:src Committed By: manu Date: Tue Sep 24 00:47:46 UTC 2019 Modified Files: src/sys/arch/i386/stand/efiboot/bootia32: multiboot32.S Log Message: Fix multiboot32 argument usage To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S diff -u src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S:1.1 src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S:1.2 --- src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S:1.1 Fri Sep 13 02:19:45 2019 +++ src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S Tue Sep 24 00:47:46 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: multiboot32.S,v 1.1 2019/09/13 02:19:45 manu Exp $ */ +/* $NetBSD: multiboot32.S,v 1.2 2019/09/24 00:47:46 manu Exp $ */ #include #include @@ -16,12 +16,12 @@ _C_LABEL(multiboot32_size): .p2align 4,,15 /* - * multiboot32(entry 8(%esp), multiboot2_info 12(%esp), magic 16(%esp)) + * multiboot32(entry 4(%esp), multiboot2_info 8(%esp), magic 12(%esp)) */ ENTRY(multiboot32_start) start: -movl16(%esp),%eax -movl12(%esp),%ebx -movl8(%esp),%edx +movl12(%esp),%eax +movl8(%esp),%ebx +movl4(%esp),%edx jmp*%edx multiboot32_end:
CVS commit: src/sys/arch/i386/stand/efiboot/bootia32
Module Name:src Committed By: rin Date: Mon Jun 19 04:30:27 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot/bootia32: efibootia32.c Log Message: whitespace -> tab, blank line, no binary changes. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/efiboot/bootia32
Module Name:src
Committed By: rin
Date: Mon Jun 19 04:30:27 UTC 2023
Modified Files:
src/sys/arch/i386/stand/efiboot/bootia32: efibootia32.c
Log Message:
whitespace -> tab, blank line, no binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
diff -u src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.7 src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.8
--- src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.7 Sun May 14 09:07:54 2023
+++ src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c Mon Jun 19 04:30:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efibootia32.c,v 1.7 2023/05/14 09:07:54 riastradh Exp $ */
+/* $NetBSD: efibootia32.c,v 1.8 2023/06/19 04:30:27 rin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -57,16 +57,15 @@ efi_md_init(void)
startprog32 = (void *)(u_long)addr;
CopyMem(startprog32, startprog32_start, startprog32_size);
-addr = EFI_ALLOCATE_MAX_ADDRESS;
-sz = EFI_SIZE_TO_PAGES(multiboot32_size);
-status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
-EfiLoaderData, sz, &addr);
-if (EFI_ERROR(status))
-panic("%s: AllocatePages() failed: %d page(s): %" PRIxMAX,
-__func__, sz, (uintmax_t)status);
-multiboot32 = (void *)(u_long)addr;
-CopyMem(multiboot32, multiboot32_start, multiboot32_size);
-
+ addr = EFI_ALLOCATE_MAX_ADDRESS;
+ sz = EFI_SIZE_TO_PAGES(multiboot32_size);
+ status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
+ EfiLoaderData, sz, &addr);
+ if (EFI_ERROR(status))
+ panic("%s: AllocatePages() failed: %d page(s): %" PRIxMAX,
+ __func__, sz, (uintmax_t)status);
+ multiboot32 = (void *)(u_long)addr;
+ CopyMem(multiboot32, multiboot32_start, multiboot32_size);
}
/* ARGSUSED */
