Module Name: src
Committed By: jakllsch
Date: Sun Nov 24 17:20:01 UTC 2013
Modified Files:
src/sys/arch/i386/stand/lib: exec.c libi386.h
Log Message:
The x86 kernel entry point stack arguments are always 32-bit, even on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/stand/lib/exec.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/stand/lib/libi386.h
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/lib/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.53 src/sys/arch/i386/stand/lib/exec.c:1.54
--- src/sys/arch/i386/stand/lib/exec.c:1.53 Sun Nov 24 17:17:48 2013
+++ src/sys/arch/i386/stand/lib/exec.c Sun Nov 24 17:20:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.53 2013/11/24 17:17:48 jakllsch Exp $ */
+/* $NetBSD: exec.c,v 1.54 2013/11/24 17:20:00 jakllsch Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -345,7 +345,7 @@ int
exec_netbsd(const char *file, physaddr_t loadaddr, int boothowto, int floppy,
void (*callback)(void))
{
- u_long boot_argv[BOOT_NARGS];
+ uint32_t boot_argv[BOOT_NARGS];
u_long marks[MARK_MAX];
struct btinfo_symtab btinfo_symtab;
u_long extmem;
Index: src/sys/arch/i386/stand/lib/libi386.h
diff -u src/sys/arch/i386/stand/lib/libi386.h:1.39 src/sys/arch/i386/stand/lib/libi386.h:1.40
--- src/sys/arch/i386/stand/lib/libi386.h:1.39 Fri Aug 30 16:42:17 2013
+++ src/sys/arch/i386/stand/lib/libi386.h Sun Nov 24 17:20:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: libi386.h,v 1.39 2013/08/30 16:42:17 jmcneill Exp $ */
+/* $NetBSD: libi386.h,v 1.40 2013/11/24 17:20:00 jakllsch Exp $ */
/*
* Copyright (c) 1996
@@ -35,7 +35,7 @@ void pbzero(void *, size_t);
physaddr_t vtophys(void *);
ssize_t pread(int, void *, size_t);
-void startprog(physaddr_t, int, unsigned long *, physaddr_t);
+void startprog(physaddr_t, uint32_t, uint32_t *, physaddr_t);
void multiboot(physaddr_t, physaddr_t, physaddr_t);
int exec_netbsd(const char *, physaddr_t, int, int, void (*)(void));
