[src/sommerfeld_i386mp_1]: src/sys/arch/i386/include Split elf32 vs. elf64 ha...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/26cf6fd1a159
branches:  sommerfeld_i386mp_1
changeset: 482440:26cf6fd1a159
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Oct 31 17:20:47 2001 +0000

description:
Split elf32 vs. elf64 handling in loadfile(), including support for
each separately and explicitly.  BOOT_ELF is now BOOT_ELF32 and
BOOT_ELF64, and ELFSIZE should no longer be defined in loadfile_machdep.h.

diffstat:

 sys/arch/i386/include/loadfile_machdep.h |  81 ++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 0 deletions(-)

diffs (85 lines):

diff -r a8f5771ae36d -r 26cf6fd1a159 sys/arch/i386/include/loadfile_machdep.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/include/loadfile_machdep.h  Wed Oct 31 17:20:47 2001 +0000
@@ -0,0 +1,81 @@
+/*     $NetBSD: loadfile_machdep.h,v 1.4.2.2 2001/10/31 17:20:47 thorpej Exp $  */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define BOOT_AOUT
+#define BOOT_ELF32
+
+#define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
+#define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
+
+#ifdef _STANDALONE
+
+#define LOADADDR(a)            ((((u_long)(a)) & 0x07ffffff) + offset)
+#define ALIGNENTRY(a)          ((u_long)(a) & 0x00100000)
+#define READ(f, b, c)          pread((f), (void *)LOADADDR(b), (c))
+#define BCOPY(s, d, c)         vpbcopy((s), (void *)LOADADDR(d), (c))
+#define BZERO(d, c)            pbzero((void *)LOADADDR(d), (c))
+#define        WARN(a)                 (void)(printf a, \
+                                   printf((errno ? ": %s\n" : "\n"), \
+                                   strerror(errno)))
+#define PROGRESS(a)            (void) printf a
+#define ALLOC(a)               alloc(a)
+#define FREE(a, b)             free(a, b)
+#define OKMAGIC(a)             ((a) == ZMAGIC)
+
+void vpbcopy __P((const void *, void *, size_t));
+void pbzero __P((void *, size_t));
+ssize_t pread __P((int, void *, size_t));
+
+#else
+
+#define LOADADDR(a)            (((u_long)(a)) + offset)
+#define ALIGNENTRY(a)          ((u_long)(a))
+#define READ(f, b, c)          read((f), (void *)LOADADDR(b), (c))
+#define BCOPY(s, d, c)         memcpy((void *)LOADADDR(d), (void *)(s), (c))
+#define BZERO(d, c)            memset((void *)LOADADDR(d), 0, (c))
+#define WARN(a)                        warn a
+#define PROGRESS(a)            /* nothing */
+#define ALLOC(a)               malloc(a)
+#define FREE(a, b)             free(a)
+#define OKMAGIC(a)             ((a) == OMAGIC)
+
+ssize_t vread __P((int, u_long, u_long *, size_t));
+void vcopy __P((u_long, u_long, u_long *, size_t));
+void vzero __P((u_long, u_long *, size_t));
+
+#endif