Nuke the alpha ecoff/elf bootloader and use the libsa/ one instead.
This commit is contained in:
ross
parent
54ab5cdc54
commit
e66e48676c
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.bootprogs,v 1.13 1999/04/11 03:36:21 cgd Exp $
|
||||
# $NetBSD: Makefile.bootprogs,v 1.14 1999/09/10 07:31:16 ross Exp $
|
||||
|
||||
S= ${.CURDIR}/../../../..
|
||||
|
||||
@ -87,7 +87,7 @@ SECONDARY_HEAP_LIMIT= (${REGION1_START} + ${REGION1_SIZE})
|
||||
STANDPROG_LOAD_ADDRESS= 0xfffffc0000300000
|
||||
|
||||
|
||||
FILE_FORMAT_CPPFLAGS= -DALPHA_BOOT_ECOFF -DALPHA_BOOT_ELF
|
||||
FILE_FORMAT_CPPFLAGS= -DBOOT_ECOFF -DBOOT_ELF
|
||||
|
||||
UNIFIED_CPPFLAGS= -DUNIFIED_BOOTBLOCK \
|
||||
-DHEAP_LIMIT="${UNIFIED_HEAP_LIMIT}" \
|
||||
@ -119,5 +119,6 @@ LIBZ= ${ZLIB}
|
||||
|
||||
### find out what to use for libsa
|
||||
SA_AS= library
|
||||
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
|
||||
.include "${S}/lib/libsa/Makefile.inc"
|
||||
LIBSA= ${SALIB}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.27 1999/08/18 20:01:06 cgd Exp $
|
||||
# $NetBSD: Makefile,v 1.28 1999/09/10 07:31:17 ross Exp $
|
||||
|
||||
PROG = boot
|
||||
|
||||
SRCS = start.S boot.c loadfile.c blkdev.c prom.c prom_disp.S OSFpal.c
|
||||
SRCS = start.S boot.c blkdev.c prom.c prom_disp.S OSFpal.c
|
||||
SRCS+= filesystem.c prom_swpal.S booted_dev.c
|
||||
|
||||
# XXX for debugging primary and secondary together
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: boot.c,v 1.21 1999/04/09 17:50:15 cgd Exp $ */
|
||||
/* $NetBSD: boot.c,v 1.22 1999/09/10 07:31:17 ross Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
@ -40,6 +40,7 @@
|
||||
|
||||
#include <lib/libsa/stand.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
#include <lib/libsa/loadfile.h>
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/exec.h>
|
||||
@ -57,8 +58,6 @@
|
||||
#error not UNIFIED_BOOTBLOCK and not SECONDARY_BOOTBLOCK
|
||||
#endif
|
||||
|
||||
int loadfile __P((char *, u_int64_t *));
|
||||
|
||||
char boot_file[128];
|
||||
char boot_flags[128];
|
||||
|
||||
@ -66,8 +65,6 @@ struct bootinfo_v1 bootinfo_v1;
|
||||
|
||||
paddr_t ffp_save, ptbr_save;
|
||||
|
||||
extern vaddr_t ssym, esym;
|
||||
|
||||
int debug;
|
||||
|
||||
char *kernelnames[] = {
|
||||
@ -86,6 +83,7 @@ main(long fd)
|
||||
#endif
|
||||
{
|
||||
char *name, **namep;
|
||||
u_long marks[MARK_MAX];
|
||||
u_int64_t entry;
|
||||
int win;
|
||||
|
||||
@ -127,25 +125,26 @@ main(long fd)
|
||||
gets(boot_file);
|
||||
}
|
||||
|
||||
memset(marks, 0, sizeof marks);
|
||||
if (boot_file[0] != '\0')
|
||||
win = (loadfile(name = boot_file, &entry) == 0);
|
||||
win = loadfile(name = boot_file, marks, LOAD_KERNEL) == 0;
|
||||
else
|
||||
for (namep = kernelnames, win = 0; *namep != NULL && !win;
|
||||
namep++)
|
||||
win = (loadfile(name = *namep, &entry) == 0);
|
||||
win = loadfile(name = *namep, marks, LOAD_KERNEL) == 0;
|
||||
|
||||
entry = marks[MARK_ENTRY];
|
||||
booted_dev_close();
|
||||
printf("\n");
|
||||
if (!win) {
|
||||
if (!win)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Fill in the bootinfo for the kernel.
|
||||
*/
|
||||
bzero(&bootinfo_v1, sizeof(bootinfo_v1));
|
||||
bootinfo_v1.ssym = ssym;
|
||||
bootinfo_v1.esym = esym;
|
||||
bootinfo_v1.ssym = marks[MARK_SYM];
|
||||
bootinfo_v1.esym = marks[MARK_END];
|
||||
bcopy(name, bootinfo_v1.booted_kernel,
|
||||
sizeof(bootinfo_v1.booted_kernel));
|
||||
bcopy(boot_flags, bootinfo_v1.boot_flags,
|
||||
|
||||
@ -1,336 +0,0 @@
|
||||
/* $NetBSD: loadfile.c,v 1.11 1998/08/14 16:50:04 thorpej 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.
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#define ELFSIZE 64
|
||||
|
||||
#include <lib/libsa/stand.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/exec.h>
|
||||
#include <sys/exec_ecoff.h>
|
||||
#include <sys/exec_elf.h>
|
||||
|
||||
#include <machine/prom.h>
|
||||
|
||||
#define _KERNEL
|
||||
#include "include/pte.h"
|
||||
|
||||
#ifdef ALPHA_BOOT_ECOFF
|
||||
static int coff_exec __P((int, struct ecoff_exechdr *, u_int64_t *));
|
||||
#endif
|
||||
#ifdef ALPHA_BOOT_ELF
|
||||
static int elf_exec __P((int, Elf_Ehdr *, u_int64_t *));
|
||||
#endif
|
||||
int loadfile __P((char *, u_int64_t *));
|
||||
|
||||
paddr_t ffp_save, ptbr_save;
|
||||
vaddr_t ssym, esym;
|
||||
|
||||
/*
|
||||
* Open 'filename', read in program and return the entry point or -1 if error.
|
||||
*/
|
||||
int
|
||||
loadfile(fname, entryp)
|
||||
char *fname;
|
||||
u_int64_t *entryp;
|
||||
{
|
||||
union {
|
||||
#ifdef ALPHA_BOOT_ECOFF
|
||||
struct ecoff_exechdr coff;
|
||||
#endif
|
||||
#ifdef ALPHA_BOOT_ELF
|
||||
Elf_Ehdr elf;
|
||||
#endif
|
||||
} hdr;
|
||||
ssize_t nr;
|
||||
int fd, rval;
|
||||
|
||||
printf("\nLoading %s...\n", fname);
|
||||
|
||||
/* Open the file. */
|
||||
rval = 1;
|
||||
if ((fd = open(fname, 0)) < 0) {
|
||||
(void)printf("open %s: %s\n", fname, strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Read the exec header. */
|
||||
if ((nr = read(fd, &hdr, sizeof(hdr))) != sizeof(hdr)) {
|
||||
(void)printf("read header: %s\n", strerror(errno));
|
||||
goto err;
|
||||
}
|
||||
|
||||
#ifdef ALPHA_BOOT_ECOFF
|
||||
if (!ECOFF_BADMAG(&hdr.coff)) {
|
||||
rval = coff_exec(fd, &hdr.coff, entryp);
|
||||
} else
|
||||
#endif
|
||||
#ifdef ALPHA_BOOT_ELF
|
||||
if (memcmp(Elf_e_ident, hdr.elf.e_ident, Elf_e_siz) == 0) {
|
||||
rval = elf_exec(fd, &hdr.elf, entryp);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
(void)printf("%s: unknown executable format\n", fname);
|
||||
}
|
||||
|
||||
err:
|
||||
if (fd >= 0)
|
||||
(void)close(fd);
|
||||
return (rval);
|
||||
}
|
||||
|
||||
#ifdef ALPHA_BOOT_ECOFF
|
||||
static int
|
||||
coff_exec(fd, coff, entryp)
|
||||
int fd;
|
||||
struct ecoff_exechdr *coff;
|
||||
u_int64_t *entryp;
|
||||
{
|
||||
|
||||
/* Read in text. */
|
||||
(void)printf("%lu", coff->a.tsize);
|
||||
if (lseek(fd, ECOFF_TXTOFF(coff), SEEK_SET) == -1) {
|
||||
(void)printf("lseek text: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (read(fd, (void *)coff->a.text_start, coff->a.tsize) !=
|
||||
coff->a.tsize) {
|
||||
(void)printf("read text: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* Read in data. */
|
||||
if (coff->a.dsize != 0) {
|
||||
(void)printf("+%lu", coff->a.dsize);
|
||||
if (read(fd, (void *)coff->a.data_start, coff->a.dsize) !=
|
||||
coff->a.dsize) {
|
||||
(void)printf("read data: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Zero out bss. */
|
||||
if (coff->a.bsize != 0) {
|
||||
(void)printf("+%lu", coff->a.bsize);
|
||||
bzero((void *)coff->a.bss_start, coff->a.bsize);
|
||||
}
|
||||
|
||||
ffp_save = coff->a.text_start + coff->a.tsize;
|
||||
if (ffp_save < coff->a.data_start + coff->a.dsize)
|
||||
ffp_save = coff->a.data_start + coff->a.dsize;
|
||||
if (ffp_save < coff->a.bss_start + coff->a.bsize)
|
||||
ffp_save = coff->a.bss_start + coff->a.bsize;
|
||||
ffp_save = ALPHA_K0SEG_TO_PHYS((ffp_save + PGOFSET) & ~PGOFSET) >> PGSHIFT;
|
||||
ffp_save += 2; /* XXX OSF/1 does this, no idea why. */
|
||||
|
||||
(void)printf("\n");
|
||||
*entryp = coff->a.entry;
|
||||
return (0);
|
||||
}
|
||||
#endif /* ALPHA_BOOT_ECOFF */
|
||||
|
||||
#ifdef ALPHA_BOOT_ELF
|
||||
static int
|
||||
elf_exec(fd, elf, entryp)
|
||||
int fd;
|
||||
Elf_Ehdr *elf;
|
||||
u_int64_t *entryp;
|
||||
{
|
||||
Elf_Shdr *shp;
|
||||
Elf_Off off;
|
||||
int i;
|
||||
int first = 1;
|
||||
int havesyms;
|
||||
|
||||
for (i = 0; i < elf->e_phnum; i++) {
|
||||
Elf_Phdr phdr;
|
||||
if (lseek(fd, elf->e_phoff + sizeof(phdr) * i, SEEK_SET)
|
||||
== -1) {
|
||||
(void)printf("lseek phdr: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (read(fd, (void *)&phdr, sizeof(phdr)) != sizeof(phdr)) {
|
||||
(void)printf("read phdr: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (phdr.p_type != Elf_pt_load ||
|
||||
(phdr.p_flags & (Elf_pf_w|Elf_pf_x)) == 0)
|
||||
continue;
|
||||
|
||||
/* Read in segment. */
|
||||
(void)printf("%s%lu", first ? "" : "+", phdr.p_filesz);
|
||||
if (lseek(fd, phdr.p_offset, SEEK_SET) == -1) {
|
||||
(void)printf("lseek text: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (read(fd, (void *)phdr.p_vaddr, phdr.p_filesz) !=
|
||||
phdr.p_filesz) {
|
||||
(void)printf("read text: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (first || ffp_save < phdr.p_vaddr + phdr.p_memsz)
|
||||
ffp_save = phdr.p_vaddr + phdr.p_memsz;
|
||||
|
||||
/* Zero out bss. */
|
||||
if (phdr.p_filesz < phdr.p_memsz) {
|
||||
(void)printf("+%lu", phdr.p_memsz - phdr.p_filesz);
|
||||
bzero((void *)(phdr.p_vaddr + phdr.p_filesz),
|
||||
phdr.p_memsz - phdr.p_filesz);
|
||||
}
|
||||
first = 0;
|
||||
}
|
||||
/*
|
||||
* Copy the ELF and section headers.
|
||||
*/
|
||||
ffp_save = roundup(ffp_save, sizeof(long));
|
||||
ssym = ffp_save;
|
||||
bcopy(elf, (void *)ffp_save, sizeof(Elf_Ehdr));
|
||||
ffp_save += sizeof(Elf_Ehdr);
|
||||
if (lseek(fd, elf->e_shoff, SEEK_SET) == -1) {
|
||||
printf("lseek section headers: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (read(fd, (void *)ffp_save, elf->e_shnum * sizeof(Elf_Shdr)) !=
|
||||
elf->e_shnum * sizeof(Elf_Shdr)) {
|
||||
printf("read section headers: %s\n", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
shp = (Elf_Shdr *)ffp_save;
|
||||
ffp_save += roundup((elf->e_shnum * sizeof(Elf_Shdr)), sizeof(long));
|
||||
|
||||
/*
|
||||
* Now load the symbol sections themselves. Make sure the
|
||||
* sections are aligned. Don't bother with string tables if
|
||||
* there are no symbol sections.
|
||||
*/
|
||||
off = roundup((sizeof(Elf_Ehdr) + (elf->e_shnum * sizeof(Elf_Shdr))),
|
||||
sizeof(long));
|
||||
for (havesyms = i = 0; i < elf->e_shnum; i++)
|
||||
if (shp[i].sh_type == Elf_sht_symtab)
|
||||
havesyms = 1;
|
||||
for (first = 1, i = 0; i < elf->e_shnum; i++) {
|
||||
if (shp[i].sh_type == Elf_sht_symtab ||
|
||||
shp[i].sh_type == Elf_sht_strtab) {
|
||||
printf("%s%ld", first ? " [" : "+", shp[i].sh_size);
|
||||
if (havesyms) {
|
||||
if (lseek(fd, shp[i].sh_offset, SEEK_SET)
|
||||
== -1) {
|
||||
printf("\nlseek symbols: %s\n",
|
||||
strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
if (read(fd, (void *)ffp_save, shp[i].sh_size)
|
||||
!= shp[i].sh_size) {
|
||||
printf("\nread symbols: %s\n",
|
||||
strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
ffp_save += roundup(shp[i].sh_size, sizeof(long));
|
||||
shp[i].sh_offset = off;
|
||||
off += roundup(shp[i].sh_size, sizeof(long));
|
||||
first = 0;
|
||||
}
|
||||
}
|
||||
esym = ffp_save;
|
||||
|
||||
if (first == 0)
|
||||
printf("]");
|
||||
|
||||
ffp_save = ALPHA_K0SEG_TO_PHYS((ffp_save + PGOFSET) & ~PGOFSET)
|
||||
>> PGSHIFT;
|
||||
ffp_save += 2; /* XXX OSF/1 does this, no idea why. */
|
||||
|
||||
(void)printf("\n");
|
||||
*entryp = elf->e_entry;
|
||||
|
||||
/*
|
||||
* Frob the copied ELF header to give information relative
|
||||
* to ssym.
|
||||
*/
|
||||
elf = (Elf_Ehdr *)ssym;
|
||||
elf->e_phoff = 0;
|
||||
elf->e_shoff = sizeof(Elf_Ehdr);
|
||||
elf->e_phentsize = 0;
|
||||
elf->e_phnum = 0;
|
||||
|
||||
return (0);
|
||||
}
|
||||
#endif /* ALPHA_BOOT_ELF */
|
||||
@ -1,11 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.20 1999/04/05 06:56:23 cgd Exp $
|
||||
# $NetBSD: Makefile,v 1.21 1999/09/10 07:31:18 ross Exp $
|
||||
|
||||
PROG = netboot
|
||||
|
||||
SRCS = start.S boot.c prom.c prom_disp.S OSFpal.c prom_swpal.S
|
||||
SRCS+= rpcc.S
|
||||
SRCS+= dev_net.c conf.c devopen.c
|
||||
SRCS+= if_prom.c loadfile.c getsecs.c booted_dev.c
|
||||
SRCS+= if_prom.c getsecs.c booted_dev.c
|
||||
|
||||
BOOT_RELOC = ${UNIFIED_LOAD_ADDRESS}
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.3 1999/04/05 06:56:24 cgd Exp $
|
||||
# $NetBSD: Makefile,v 1.4 1999/09/10 07:31:18 ross Exp $
|
||||
|
||||
PROG = ustarboot
|
||||
|
||||
SRCS = start.S boot.c loadfile.c blkdev.c prom.c prom_disp.S OSFpal.c
|
||||
SRCS = start.S boot.c blkdev.c prom.c prom_disp.S OSFpal.c
|
||||
SRCS+= prom_swpal.S booted_dev.c
|
||||
|
||||
BOOT_RELOC = ${UNIFIED_LOAD_ADDRESS}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user