d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to use the new elf headers.

Browse Source
This commit is contained in:
dfr 1998-08-17 08:47:19 +00:00
parent 9c410acd54
commit a6a6acddcf
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/libc/gen/nlist.c
View File

@ -197,6 +197,19 @@ __aout_fdnlist(fd, list)
#endif
#ifdef _NLIST_DO_ELF
#if ELF_TARG_CLASS == ELFCLASS32
#define Elf(x) Elf32_##x
#define ELF(x) ELF32_##x
#else
#define Elf(x) Elf64_##x
#define ELF(x) ELF64_##x
#endif
/*
* __elf_is_okay__ - Determine if ehdr really
* is ELF and valid for the target platform.
@ -206,13 +219,13 @@ __aout_fdnlist(fd, list)
*/
int
__elf_is_okay__(ehdr)
register Elf32_Ehdr *ehdr;
register Elf(Ehdr) *ehdr;
{
register int retval = 0;
/*
* We need to check magic, class size, endianess,
* and version before we look at the rest of the
* Elf32_Ehdr structure. These few elements are
* Elf(Ehdr) structure. These few elements are
* represented in a machine independant fashion.
*/
if (IS_ELF(*ehdr) &&
@ -235,19 +248,19 @@ __elf_fdnlist(fd, list)
{
register struct nlist *p;
register caddr_t strtab;
register Elf32_Off symoff = 0, symstroff = 0;
register Elf32_Word symsize = 0, symstrsize = 0;
register Elf32_Sword nent, cc, i;
Elf32_Sym sbuf[1024];
Elf32_Sym *s;
Elf32_Ehdr ehdr;
Elf32_Shdr *shdr = NULL;
Elf32_Word shdr_size;
register Elf_Off symoff = 0, symstroff = 0;
register Elf_Word symsize = 0, symstrsize = 0;
register Elf_Sword nent, cc, i;
Elf_Sym sbuf[1024];
Elf_Sym *s;
Elf_Ehdr ehdr;
Elf_Shdr *shdr = NULL;
Elf_Word shdr_size;
struct stat st;
/* Make sure obj is OK */
if (lseek(fd, (off_t)0, SEEK_SET) == -1 ||
read(fd, &ehdr, sizeof(Elf32_Ehdr)) != sizeof(Elf32_Ehdr) ||
read(fd, &ehdr, sizeof(Elf_Ehdr)) != sizeof(Elf_Ehdr) ||
!__elf_is_okay__(&ehdr) ||
fstat(fd, &st) < 0)
return (-1);
@ -262,9 +275,9 @@ __elf_fdnlist(fd, list)
}
/* mmap section header table */
shdr = (Elf32_Shdr *)mmap(NULL, (size_t)shdr_size,
shdr = (Elf_Shdr *)mmap(NULL, (size_t)shdr_size,
PROT_READ, 0, fd, (off_t) ehdr.e_shoff);
if (shdr == (Elf32_Shdr *)-1)
if (shdr == (Elf_Shdr *)-1)
return (-1);
/*
@ -349,7 +362,7 @@ __elf_fdnlist(fd, list)
/* XXX - type conversion */
/* is pretty rude. */
switch(ELF32_ST_TYPE(s->st_info)) {
switch(ELF(ST_TYPE)(s->st_info)) {
case STT_NOTYPE:
p->n_type = N_UNDF;
break;
@ -363,7 +376,7 @@ __elf_fdnlist(fd, list)
p->n_type = N_FN;
break;
}
if (ELF32_ST_BIND(s->st_info) ==
if (ELF(ST_BIND)(s->st_info) ==
STB_LOCAL)
p->n_type = N_EXT;
p->n_desc = 0;

21
usr.sbin/kvm_mkdb/nlist.c
View File

@ -36,7 +36,7 @@
static char sccsid[] = "@(#)from: nlist.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$Id$";
"$Id: nlist.c,v 1.8 1997/09/24 06:44:10 charnier Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -179,6 +179,7 @@ __aout_knlist(name, db)
#endif /* DO_AOUT */
#ifdef DO_ELF
int
__elf_knlist(name, db)
char *name;
@ -189,11 +190,11 @@ __elf_knlist(name, db)
register u_long symsize;
register u_long kernvma, kernoffs;
register int i;
Elf32_Sym *sbuf;
Elf_Sym *sbuf;
size_t symstrsize;
char *shstr, buf[1024];
Elf32_Ehdr *eh;
Elf32_Shdr *sh = NULL;
Elf_Ehdr *eh;
Elf_Shdr *sh = NULL;
DBT data, key;
NLIST nbuf;
int fd;
@ -217,12 +218,12 @@ __elf_knlist(name, db)
err(1, "mmap failed");
/* Read in exec structure. */
eh = (Elf32_Ehdr *) filep;
eh = (Elf_Ehdr *) filep;
if (!IS_ELF(*eh))
return(-1);
sh = (Elf32_Shdr *)&filep[eh->e_shoff];
sh = (Elf_Shdr *)&filep[eh->e_shoff];
shstr = (char *)&filep[sh[eh->e_shstrndx].sh_offset];
@ -247,16 +248,16 @@ __elf_knlist(name, db)
data.size = sizeof(NLIST);
/* Read each symbol and enter it into the database. */
for (i = 0; symsize > 0; i++, symsize -= sizeof(Elf32_Sym)) {
for (i = 0; symsize > 0; i++, symsize -= sizeof(Elf_Sym)) {
sbuf = (Elf32_Sym *)&filep[symoff + i * sizeof(*sbuf)];
sbuf = (Elf_Sym *)&filep[symoff + i * sizeof(*sbuf)];
if (!sbuf->st_name)
continue;
nbuf.n_value = sbuf->st_value;
/*XXX type conversion is pretty rude... */
switch (ELF32_ST_TYPE(sbuf->st_info)) {
switch (ELF_ST_TYPE(sbuf->st_info)) {
case STT_NOTYPE:
nbuf.n_type = N_UNDF;
break;
@ -267,7 +268,7 @@ __elf_knlist(name, db)
nbuf.n_type = N_DATA;
break;
}
if (ELF32_ST_BIND(sbuf->st_info) == STB_LOCAL)
if (ELF_ST_BIND(sbuf->st_info) == STB_LOCAL)
nbuf.n_type = N_EXT;
key.data = (u_char *)(strtab + sbuf->st_name);