Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax/stand use new loadfile
details: https://anonhg.NetBSD.org/src/rev/2764b19b5a49
branches: trunk
changeset: 472366:2764b19b5a49
user: christos <christos%NetBSD.org@localhost>
date: Wed Apr 28 09:18:47 1999 +0000
description:
use new loadfile
diffstat:
sys/arch/pmax/stand/Makefile.booters | 4 +-
sys/arch/pmax/stand/boot/boot.c | 4 +-
sys/arch/pmax/stand/lib/Makefile | 4 +-
sys/arch/pmax/stand/lib/loadfile.c | 608 -----------------------------------
sys/arch/pmax/stand/lib/loadfile.h | 109 ------
5 files changed, 6 insertions(+), 723 deletions(-)
diffs (truncated from 781 to 300 lines):
diff -r 8489ef6e96d0 -r 2764b19b5a49 sys/arch/pmax/stand/Makefile.booters
--- a/sys/arch/pmax/stand/Makefile.booters Wed Apr 28 09:18:13 1999 +0000
+++ b/sys/arch/pmax/stand/Makefile.booters Wed Apr 28 09:18:47 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.22 1999/04/11 04:24:41 simonb Exp $
+# $NetBSD: Makefile.booters,v 1.23 1999/04/28 09:18:47 christos Exp $
#
# NOTE: $S must correspond to the top of the 'sys' tree
@@ -31,9 +31,9 @@
### find out what to use for libsa
SA_AS= library
+SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes SA_INCLUDE_NET=yes"
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
-SAMISCMAKEFLAGS= SA_INCLUDE_NET=yes
# We don't need libkern/libz for the first stage bootblocks
.if ${PROG} != "bootxx"
diff -r 8489ef6e96d0 -r 2764b19b5a49 sys/arch/pmax/stand/boot/boot.c
--- a/sys/arch/pmax/stand/boot/boot.c Wed Apr 28 09:18:13 1999 +0000
+++ b/sys/arch/pmax/stand/boot/boot.c Wed Apr 28 09:18:47 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.6 1999/04/12 05:19:25 simonb Exp $ */
+/* $NetBSD: boot.c,v 1.7 1999/04/28 09:18:48 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -151,7 +151,7 @@
marks[MARK_START] = 0;
if (name != NULL)
- win = (loadfile(name, marks, LOAD_ALL) != -1);
+ win = (loadfile(name, marks, LOAD_KERNEL) != -1);
else {
win = 0;
for (namep = kernelnames, win = 0; *namep != NULL && !win;
diff -r 8489ef6e96d0 -r 2764b19b5a49 sys/arch/pmax/stand/lib/Makefile
--- a/sys/arch/pmax/stand/lib/Makefile Wed Apr 28 09:18:13 1999 +0000
+++ b/sys/arch/pmax/stand/lib/Makefile Wed Apr 28 09:18:47 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/03/25 04:16:15 simonb Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/28 09:18:48 christos Exp $
S?= ${.CURDIR}/../../../../
@@ -8,7 +8,7 @@
CPPFLAGS= -I$S/lib/libsa ${PMAXCPPFLAGS} ${PMAXMISCCPPFLAGS}
-SRCS= bootinfo.c callvec.c conf.c devopen.c loadfile.c putchar.c rz.c
+SRCS= bootinfo.c callvec.c conf.c devopen.c putchar.c rz.c
SRCS+= bootinit.S bootread.S startprog.S
.include <bsd.lib.mk>
diff -r 8489ef6e96d0 -r 2764b19b5a49 sys/arch/pmax/stand/lib/loadfile.c
--- a/sys/arch/pmax/stand/lib/loadfile.c Wed Apr 28 09:18:13 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,608 +0,0 @@
-/* $NetBSD: loadfile.c,v 1.4 1999/04/17 11:24:16 simonb Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center and 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.
- */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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 University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- *
- * @(#)boot.c 8.1 (Berkeley) 6/10/93
- */
-
-#ifdef _STANDALONE
-#include <lib/libsa/stand.h>
-#include <lib/libkern/libkern.h>
-#else
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <err.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/exec.h>
-
-#include "loadfile.h"
-
-#ifdef BOOT_ECOFF
-#include <sys/exec_ecoff.h>
-static int coff_exec __P((int, struct ecoff_exechdr *, u_long *, int));
-#endif
-#ifdef BOOT_ELF
-#include <sys/exec_elf.h>
-static int elf_exec __P((int, Elf_Ehdr *, u_long *, int));
-#endif
-#ifdef BOOT_AOUT
-#include <sys/exec_aout.h>
-static int aout_exec __P((int, struct exec *, u_long *, int));
-#endif
-
-/*
- * Open 'filename', read in program and and return 0 if ok 1 on error.
- * Fill in marks
- */
-int
-loadfile(fname, marks, flags)
- const char *fname;
- u_long *marks;
- int flags;
-{
- union {
-#ifdef BOOT_ECOFF
- struct ecoff_exechdr coff;
-#endif
-#ifdef BOOT_ELF
- Elf_Ehdr elf;
-#endif
-#ifdef BOOT_AOUT
- struct exec aout;
-#endif
-
- } hdr;
- ssize_t nr;
- int fd, rval;
-
- /* Open the file. */
- if ((fd = open(fname, 0)) < 0) {
- WARN(("open %s", fname ? fname : "<default>"));
- return -1;
- }
-
- /* Read the exec header. */
- if ((nr = read(fd, &hdr, sizeof(hdr))) != sizeof(hdr)) {
- WARN(("read header"));
- goto err;
- }
-
-#ifdef BOOT_ECOFF
- if (!ECOFF_BADMAG(&hdr.coff)) {
- rval = coff_exec(fd, &hdr.coff, marks, flags);
- } else
-#endif
-#ifdef BOOT_ELF
- if (memcmp(Elf_e_ident, hdr.elf.e_ident, Elf_e_siz) == 0) {
- rval = elf_exec(fd, &hdr.elf, marks, flags);
- } else
-#endif
-#ifdef BOOT_AOUT
- if (OKMAGIC(N_GETMAGIC(hdr.aout)) &&
- N_GETMID(hdr.aout) == MID_MACHINE) {
- rval = aout_exec(fd, &hdr.aout, marks, flags);
- } else
-#endif
- {
- rval = 1;
- errno = EFTYPE;
- WARN(("%s", fname ? fname : "<default>"));
- }
-
- if (rval == 0) {
- PROGRESS(("=0x%lx\n", marks[MARK_END] - marks[MARK_START]));
- return fd;
- }
-err:
- (void)close(fd);
- return -1;
-}
-
-#ifdef BOOT_ECOFF
-static int
-coff_exec(fd, coff, marks, flags)
- int fd;
- struct ecoff_exechdr *coff;
- u_long *marks;
- int flags;
-{
- paddr_t offset = marks[MARK_START];
- paddr_t minp = ~0, maxp = 0, pos;
-
- /* Read in text. */
- if (lseek(fd, ECOFF_TXTOFF(coff), SEEK_SET) == -1) {
- WARN(("lseek text"));
- return 1;
- }
-
- if (coff->a.tsize != 0) {
- if (flags & LOAD_TEXT) {
- PROGRESS(("%lu", coff->a.tsize));
- if (READ(fd, coff->a.text_start, coff->a.tsize) !=
- coff->a.tsize) {
- return 1;
- }
- }
- else {
- if (lseek(fd, coff->a.tsize, SEEK_CUR) == -1) {
- WARN(("read text"));
- return 1;
- }
- }
- if (flags & (COUNT_TEXT|LOAD_TEXT)) {
- pos = coff->a.text_start;
- if (minp > pos)
- minp = pos;
- pos += coff->a.tsize;
- if (maxp < pos)
- maxp = pos;
- }
- }
-
- /* Read in data. */
- if (coff->a.dsize != 0) {
- if (flags & LOAD_DATA) {
- PROGRESS(("+%lu", coff->a.dsize));
- if (READ(fd, coff->a.data_start, coff->a.dsize) !=
- coff->a.dsize) {
- WARN(("read data"));
- return 1;
- }
- }
- if (flags & (COUNT_DATA|LOAD_DATA)) {
- pos = coff->a.data_start;
- if (minp > pos)
- minp = pos;
- pos += coff->a.dsize;
- if (maxp < pos)
- maxp = pos;
- }
- }
-
- /* Zero out bss. */
- if (coff->a.bsize != 0) {
- if (flags & LOAD_BSS) {
Home |
Main Index |
Thread Index |
Old Index