Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this be endian independent. The installboot program now works correctly 

on big endian machines as well as little endian machines.
This commit is contained in:
dmcmahill 2000-10-15 03:14:24 +00:00
parent b4ef973eab
commit 339897211a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/arch/pmax/stand/installboot/loadbootstrap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: loadbootstrap.c,v 1.5 2000/06/21 20:41:13 matt Exp $ */
/* $NetBSD: loadbootstrap.c,v 1.6 2000/10/15 03:14:24 dmcmahill Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,6 +37,7 @@
#include <sys/param.h> /* XXX for roundup, howmany */
#include <sys/types.h>
#include <sys/exec_elf.h>
#include <sys/endian.h>
#include <err.h>
#include <fcntl.h>
#include <limits.h>
@ -78,27 +79,27 @@ load_bootstrap(const char *bootstrap, char **data,
nsegs = highaddr = 0;
lowaddr = (u_int32_t) ULONG_MAX;
for (i = 0; i < ehdr.e_phnum; i++) {
if (lseek(fd, (off_t) ehdr.e_phoff + i * sizeof(phdr), 0) < 0)
for (i = 0; i < le16toh(ehdr.e_phnum); i++) {
if (lseek(fd, (off_t) le32toh(ehdr.e_phoff) + i * sizeof(phdr), 0) < 0)
err(1, "lseek %s", bootstrap);
if (read(fd, &phdr, sizeof(phdr)) != sizeof(phdr))
err(1, "read %s", bootstrap);
if (phdr.p_type != PT_LOAD)
if (le32toh(phdr.p_type) != PT_LOAD)
continue;
seglist[nsegs].addr = phdr.p_paddr;
seglist[nsegs].f_offset = phdr.p_offset;
seglist[nsegs].f_size = phdr.p_filesz;
seglist[nsegs].addr = le32toh(phdr.p_paddr);
seglist[nsegs].f_offset = le32toh(phdr.p_offset);
seglist[nsegs].f_size = le32toh(phdr.p_filesz);
nsegs++;
if (phdr.p_paddr < lowaddr)
lowaddr = phdr.p_paddr;
if (phdr.p_paddr + phdr.p_filesz > highaddr)
highaddr = phdr.p_paddr + phdr.p_filesz;
if (le32toh(phdr.p_paddr) < lowaddr)
lowaddr = le32toh(phdr.p_paddr);
if (le32toh(phdr.p_paddr) + le32toh(phdr.p_filesz) > highaddr)
highaddr = le32toh(phdr.p_paddr) + le32toh(phdr.p_filesz);
}
*loadaddr = lowaddr;
*execaddr = ehdr.e_entry;
*execaddr = le32toh(ehdr.e_entry);
*len = roundup(highaddr - lowaddr, PMAX_BOOT_BLOCK_BLOCKSIZE);
if ((*data = malloc(*len)) == NULL)
err(1, "malloc %lu bytes", (unsigned long) *len);