Module Name: src
Committed By: martin
Date: Fri Sep 27 09:20:16 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-9]: multiboot32.S
Log Message:
Pull up following revision(s) (requested by manu in ticket #251):
sys/arch/i386/stand/efiboot/bootia32/multiboot32.S: revision 1.2
Fix multiboot32 argument usage
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
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.2.2 src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S:1.1.2.3
--- src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S:1.1.2.2 Tue Sep 17 19:32:00 2019
+++ src/sys/arch/i386/stand/efiboot/bootia32/multiboot32.S Fri Sep 27 09:20:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: multiboot32.S,v 1.1.2.2 2019/09/17 19:32:00 martin Exp $ */
+/* $NetBSD: multiboot32.S,v 1.1.2.3 2019/09/27 09:20:16 martin Exp $ */
#include <machine/asm.h>
#include <machine/specialreg.h>
@@ -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:
- movl 16(%esp),%eax
- movl 12(%esp),%ebx
- movl 8(%esp),%edx
+ movl 12(%esp),%eax
+ movl 8(%esp),%ebx
+ movl 4(%esp),%edx
jmp *%edx
multiboot32_end:
