ext: Update libelf from elftoolchain 0.7.1
Change-Id: I8f86cd918ad01897c42aa479f9c64520def36830 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50927 Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Reviewed-by: Austin Harris <mail@austin-harris.com> Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu> Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*-
|
||||
* Copyright (c) 2006 Joseph Koshy
|
||||
* Copyright (c) 2006,2008 Joseph Koshy
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -24,128 +24,136 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include "gelf.h"
|
||||
#include <gelf.h>
|
||||
#include <limits.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "_libelf.h"
|
||||
|
||||
ELFTC_VCSID("$Id: gelf_sym.c 3177 2015-03-30 18:19:41Z emaste $");
|
||||
|
||||
GElf_Sym *
|
||||
gelf_getsym(Elf_Data *d, int ndx, GElf_Sym *dst)
|
||||
gelf_getsym(Elf_Data *ed, int ndx, GElf_Sym *dst)
|
||||
{
|
||||
int ec;
|
||||
Elf *e;
|
||||
Elf_Scn *scn;
|
||||
Elf32_Sym *sym32;
|
||||
Elf64_Sym *sym64;
|
||||
size_t msz;
|
||||
uint32_t sh_type;
|
||||
int ec;
|
||||
Elf *e;
|
||||
size_t msz;
|
||||
Elf_Scn *scn;
|
||||
uint32_t sh_type;
|
||||
Elf32_Sym *sym32;
|
||||
Elf64_Sym *sym64;
|
||||
struct _Libelf_Data *d;
|
||||
|
||||
if (d == NULL || ndx < 0 || dst == NULL ||
|
||||
(scn = d->d_scn) == NULL ||
|
||||
(e = scn->s_elf) == NULL) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
d = (struct _Libelf_Data *) ed;
|
||||
|
||||
ec = e->e_class;
|
||||
assert(ec == ELFCLASS32 || ec == ELFCLASS64);
|
||||
if (d == NULL || ndx < 0 || dst == NULL ||
|
||||
(scn = d->d_scn) == NULL ||
|
||||
(e = scn->s_elf) == NULL) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (ec == ELFCLASS32)
|
||||
sh_type = scn->s_shdr.s_shdr32.sh_type;
|
||||
else
|
||||
sh_type = scn->s_shdr.s_shdr64.sh_type;
|
||||
ec = e->e_class;
|
||||
assert(ec == ELFCLASS32 || ec == ELFCLASS64);
|
||||
|
||||
if (_libelf_xlate_shtype(sh_type) != ELF_T_SYM) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
if (ec == ELFCLASS32)
|
||||
sh_type = scn->s_shdr.s_shdr32.sh_type;
|
||||
else
|
||||
sh_type = scn->s_shdr.s_shdr64.sh_type;
|
||||
|
||||
msz = _libelf_msize(ELF_T_SYM, ec, e->e_version);
|
||||
if (_libelf_xlate_shtype(sh_type) != ELF_T_SYM) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
assert(msz > 0);
|
||||
msz = _libelf_msize(ELF_T_SYM, ec, e->e_version);
|
||||
|
||||
if (msz * ndx >= d->d_size) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
assert(msz > 0);
|
||||
assert(ndx >= 0);
|
||||
|
||||
if (ec == ELFCLASS32) {
|
||||
if (msz * (size_t) ndx >= d->d_data.d_size) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
sym32 = (Elf32_Sym *) d->d_buf + ndx;
|
||||
if (ec == ELFCLASS32) {
|
||||
sym32 = (Elf32_Sym *) d->d_data.d_buf + ndx;
|
||||
|
||||
dst->st_name = sym32->st_name;
|
||||
dst->st_value = (Elf64_Addr) sym32->st_value;
|
||||
dst->st_size = (Elf64_Xword) sym32->st_size;
|
||||
dst->st_info = ELF64_ST_INFO(ELF32_ST_BIND(sym32->st_info),
|
||||
ELF32_ST_TYPE(sym32->st_info));
|
||||
dst->st_other = sym32->st_other;
|
||||
dst->st_shndx = sym32->st_shndx;
|
||||
} else {
|
||||
dst->st_name = sym32->st_name;
|
||||
dst->st_value = (Elf64_Addr) sym32->st_value;
|
||||
dst->st_size = (Elf64_Xword) sym32->st_size;
|
||||
dst->st_info = sym32->st_info;
|
||||
dst->st_other = sym32->st_other;
|
||||
dst->st_shndx = sym32->st_shndx;
|
||||
} else {
|
||||
sym64 = (Elf64_Sym *) d->d_data.d_buf + ndx;
|
||||
|
||||
sym64 = (Elf64_Sym *) d->d_buf + ndx;
|
||||
*dst = *sym64;
|
||||
}
|
||||
|
||||
*dst = *sym64;
|
||||
}
|
||||
|
||||
return (dst);
|
||||
return (dst);
|
||||
}
|
||||
|
||||
int
|
||||
gelf_update_sym(Elf_Data *d, int ndx, GElf_Sym *gs)
|
||||
gelf_update_sym(Elf_Data *ed, int ndx, GElf_Sym *gs)
|
||||
{
|
||||
int ec;
|
||||
Elf *e;
|
||||
Elf_Scn *scn;
|
||||
Elf32_Sym *sym32;
|
||||
Elf64_Sym *sym64;
|
||||
size_t msz;
|
||||
uint32_t sh_type;
|
||||
int ec;
|
||||
Elf *e;
|
||||
size_t msz;
|
||||
Elf_Scn *scn;
|
||||
uint32_t sh_type;
|
||||
Elf32_Sym *sym32;
|
||||
Elf64_Sym *sym64;
|
||||
struct _Libelf_Data *d;
|
||||
|
||||
if (d == NULL || ndx < 0 || gs == NULL ||
|
||||
(scn = d->d_scn) == NULL ||
|
||||
(e = scn->s_elf) == NULL) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
d = (struct _Libelf_Data *) ed;
|
||||
|
||||
ec = e->e_class;
|
||||
assert(ec == ELFCLASS32 || ec == ELFCLASS64);
|
||||
if (d == NULL || ndx < 0 || gs == NULL ||
|
||||
(scn = d->d_scn) == NULL ||
|
||||
(e = scn->s_elf) == NULL) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (ec == ELFCLASS32)
|
||||
sh_type = scn->s_shdr.s_shdr32.sh_type;
|
||||
else
|
||||
sh_type = scn->s_shdr.s_shdr64.sh_type;
|
||||
ec = e->e_class;
|
||||
assert(ec == ELFCLASS32 || ec == ELFCLASS64);
|
||||
|
||||
if (_libelf_xlate_shtype(sh_type) != ELF_T_SYM) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
if (ec == ELFCLASS32)
|
||||
sh_type = scn->s_shdr.s_shdr32.sh_type;
|
||||
else
|
||||
sh_type = scn->s_shdr.s_shdr64.sh_type;
|
||||
|
||||
msz = _libelf_msize(ELF_T_SYM, ec, e->e_version);
|
||||
assert(msz > 0);
|
||||
if (_libelf_xlate_shtype(sh_type) != ELF_T_SYM) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (msz * ndx >= d->d_size) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
msz = _libelf_msize(ELF_T_SYM, ec, e->e_version);
|
||||
|
||||
if (ec == ELFCLASS32) {
|
||||
sym32 = (Elf32_Sym *) d->d_buf + ndx;
|
||||
assert(msz > 0);
|
||||
assert(ndx >= 0);
|
||||
|
||||
sym32->st_name = gs->st_name;
|
||||
sym32->st_info = gs->st_info;
|
||||
sym32->st_other = gs->st_other;
|
||||
sym32->st_shndx = gs->st_shndx;
|
||||
if (msz * (size_t) ndx >= d->d_data.d_size) {
|
||||
LIBELF_SET_ERROR(ARGUMENT, 0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
LIBELF_COPY_U32(sym32, gs, st_value);
|
||||
LIBELF_COPY_U32(sym32, gs, st_size);
|
||||
} else {
|
||||
sym64 = (Elf64_Sym *) d->d_buf + ndx;
|
||||
if (ec == ELFCLASS32) {
|
||||
sym32 = (Elf32_Sym *) d->d_data.d_buf + ndx;
|
||||
|
||||
*sym64 = *gs;
|
||||
}
|
||||
sym32->st_name = gs->st_name;
|
||||
sym32->st_info = gs->st_info;
|
||||
sym32->st_other = gs->st_other;
|
||||
sym32->st_shndx = gs->st_shndx;
|
||||
|
||||
return (1);
|
||||
LIBELF_COPY_U32(sym32, gs, st_value);
|
||||
LIBELF_COPY_U32(sym32, gs, st_size);
|
||||
} else {
|
||||
sym64 = (Elf64_Sym *) d->d_data.d_buf + ndx;
|
||||
|
||||
*sym64 = *gs;
|
||||
}
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user