OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Clean up byte-swapping in elfload.c. 

Remove ifdefs from code by defining empty inline functions
when byte swapping isn't needed.  Push loops over swapping
arrays of structures into the swapping functions.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Richard Henderson 2010-07-27 10:25:32 -07:00 committed by Edgar E. Iglesias
parent 2849023112
commit 991f8f0c91
1 changed files with 48 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
linux-user/elfload.c
View File

@ -871,30 +871,36 @@ static void bswap_ehdr(struct elfhdr *ehdr)
bswap16s(&ehdr->e_shstrndx); /* Section header string table index */ bswap16s(&ehdr->e_shstrndx); /* Section header string table index */
} }
static void bswap_phdr(struct elf_phdr *phdr) static void bswap_phdr(struct elf_phdr *phdr, int phnum)
{ {
bswap32s(&phdr->p_type); /* Segment type */ int i;
bswaptls(&phdr->p_offset); /* Segment file offset */ for (i = 0; i < phnum; ++i, ++phdr) {
bswaptls(&phdr->p_vaddr); /* Segment virtual address */ bswap32s(&phdr->p_type); /* Segment type */
bswaptls(&phdr->p_paddr); /* Segment physical address */ bswap32s(&phdr->p_flags); /* Segment flags */
bswaptls(&phdr->p_filesz); /* Segment size in file */ bswaptls(&phdr->p_offset); /* Segment file offset */
bswaptls(&phdr->p_memsz); /* Segment size in memory */ bswaptls(&phdr->p_vaddr); /* Segment virtual address */
bswap32s(&phdr->p_flags); /* Segment flags */ bswaptls(&phdr->p_paddr); /* Segment physical address */
bswaptls(&phdr->p_align); /* Segment alignment */ bswaptls(&phdr->p_filesz); /* Segment size in file */
bswaptls(&phdr->p_memsz); /* Segment size in memory */
bswaptls(&phdr->p_align); /* Segment alignment */
}
} }
static void bswap_shdr(struct elf_shdr *shdr) static void bswap_shdr(struct elf_shdr *shdr, int shnum)
{ {
bswap32s(&shdr->sh_name); int i;
bswap32s(&shdr->sh_type); for (i = 0; i < shnum; ++i, ++shdr) {
bswaptls(&shdr->sh_flags); bswap32s(&shdr->sh_name);
bswaptls(&shdr->sh_addr); bswap32s(&shdr->sh_type);
bswaptls(&shdr->sh_offset); bswaptls(&shdr->sh_flags);
bswaptls(&shdr->sh_size); bswaptls(&shdr->sh_addr);
bswap32s(&shdr->sh_link); bswaptls(&shdr->sh_offset);
bswap32s(&shdr->sh_info); bswaptls(&shdr->sh_size);
bswaptls(&shdr->sh_addralign); bswap32s(&shdr->sh_link);
bswaptls(&shdr->sh_entsize); bswap32s(&shdr->sh_info);
bswaptls(&shdr->sh_addralign);
bswaptls(&shdr->sh_entsize);
}
} }
static void bswap_sym(struct elf_sym *sym) static void bswap_sym(struct elf_sym *sym)
@ -904,20 +910,15 @@ static void bswap_sym(struct elf_sym *sym)
bswaptls(&sym->st_size); bswaptls(&sym->st_size);
bswap16s(&sym->st_shndx); bswap16s(&sym->st_shndx);
} }
#else
static inline void bswap_ehdr(struct elfhdr *ehdr) { }
static inline void bswap_phdr(struct elf_phdr *phdr, int phnum) { }
static inline void bswap_shdr(struct elf_shdr *shdr, int shnum) { }
static inline void bswap_sym(struct elf_sym *sym) { }
#endif #endif
#ifdef USE_ELF_CORE_DUMP #ifdef USE_ELF_CORE_DUMP
static int elf_core_dump(int, const CPUState *); static int elf_core_dump(int, const CPUState *);
#ifdef BSWAP_NEEDED
static void bswap_note(struct elf_note *en)
{
bswap32s(&en->n_namesz);
bswap32s(&en->n_descsz);
bswap32s(&en->n_type);
}
#endif /* BSWAP_NEEDED */
#endif /* USE_ELF_CORE_DUMP */ #endif /* USE_ELF_CORE_DUMP */
/* /*
@ -1154,9 +1155,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex,
error = 0; error = 0;
#ifdef BSWAP_NEEDED
bswap_ehdr(interp_elf_ex); bswap_ehdr(interp_elf_ex);
#endif
/* First of all, some simple consistency checks */ /* First of all, some simple consistency checks */
if ((interp_elf_ex->e_type != ET_EXEC && if ((interp_elf_ex->e_type != ET_EXEC &&
interp_elf_ex->e_type != ET_DYN) || interp_elf_ex->e_type != ET_DYN) ||
@ -1195,12 +1194,7 @@ static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex,
exit(-1); exit(-1);
} }
} }
#ifdef BSWAP_NEEDED bswap_phdr(elf_phdata, interp_elf_ex->e_phnum);
eppnt = elf_phdata;
for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
bswap_phdr(eppnt);
}
#endif
if (interp_elf_ex->e_type == ET_DYN) { if (interp_elf_ex->e_type == ET_DYN) {
/* in order to avoid hardcoding the interpreter load /* in order to avoid hardcoding the interpreter load
@ -1324,9 +1318,7 @@ static void load_symbols(struct elfhdr *hdr, int fd)
for (i = 0; i < hdr->e_shnum; i++) { for (i = 0; i < hdr->e_shnum; i++) {
if (read(fd, &sechdr, sizeof(sechdr)) != sizeof(sechdr)) if (read(fd, &sechdr, sizeof(sechdr)) != sizeof(sechdr))
return; return;
#ifdef BSWAP_NEEDED bswap_shdr(&sechdr, 1);
bswap_shdr(&sechdr);
#endif
if (sechdr.sh_type == SHT_SYMTAB) { if (sechdr.sh_type == SHT_SYMTAB) {
symtab = sechdr; symtab = sechdr;
lseek(fd, hdr->e_shoff lseek(fd, hdr->e_shoff
@ -1334,9 +1326,7 @@ static void load_symbols(struct elfhdr *hdr, int fd)
if (read(fd, &strtab, sizeof(strtab)) if (read(fd, &strtab, sizeof(strtab))
!= sizeof(strtab)) != sizeof(strtab))
return; return;
#ifdef BSWAP_NEEDED bswap_shdr(&strtab, 1);
bswap_shdr(&strtab);
#endif
goto found; goto found;
} }
} }
@ -1360,9 +1350,7 @@ static void load_symbols(struct elfhdr *hdr, int fd)
i = 0; i = 0;
while (i < nsyms) { while (i < nsyms) {
#ifdef BSWAP_NEEDED
bswap_sym(syms + i); bswap_sym(syms + i);
#endif
// Throw away entries which we do not need. // Throw away entries which we do not need.
if (syms[i].st_shndx == SHN_UNDEF || if (syms[i].st_shndx == SHN_UNDEF ||
syms[i].st_shndx >= SHN_LORESERVE || syms[i].st_shndx >= SHN_LORESERVE ||
@ -1428,9 +1416,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
load_addr = 0; load_addr = 0;
load_bias = 0; load_bias = 0;
elf_ex = *((struct elfhdr *) bprm->buf); /* exec-header */ elf_ex = *((struct elfhdr *) bprm->buf); /* exec-header */
#ifdef BSWAP_NEEDED
bswap_ehdr(&elf_ex); bswap_ehdr(&elf_ex);
#endif
/* First of all, some simple consistency checks */ /* First of all, some simple consistency checks */
if ((elf_ex.e_type != ET_EXEC && elf_ex.e_type != ET_DYN) || if ((elf_ex.e_type != ET_EXEC && elf_ex.e_type != ET_DYN) ||
@ -1461,17 +1447,9 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
exit(-1); exit(-1);
} }
} }
bswap_phdr(elf_phdata, elf_ex.e_phnum);
#ifdef BSWAP_NEEDED
elf_ppnt = elf_phdata;
for (i=0; i<elf_ex.e_phnum; i++, elf_ppnt++) {
bswap_phdr(elf_ppnt);
}
#endif
elf_ppnt = elf_phdata;
elf_brk = 0; elf_brk = 0;
elf_stack = ~((abi_ulong)0UL); elf_stack = ~((abi_ulong)0UL);
elf_interpreter = NULL; elf_interpreter = NULL;
start_code = ~((abi_ulong)0UL); start_code = ~((abi_ulong)0UL);
@ -1480,6 +1458,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
end_data = 0; end_data = 0;
interp_ex.a_info = 0; interp_ex.a_info = 0;
elf_ppnt = elf_phdata;
for(i=0;i < elf_ex.e_phnum; i++) { for(i=0;i < elf_ex.e_phnum; i++) {
if (elf_ppnt->p_type == PT_INTERP) { if (elf_ppnt->p_type == PT_INTERP) {
if ( elf_interpreter != NULL ) if ( elf_interpreter != NULL )
@ -2025,9 +2004,6 @@ static int write_note(struct memelfnote *, int);
static int write_note_info(struct elf_note_info *, int); static int write_note_info(struct elf_note_info *, int);
#ifdef BSWAP_NEEDED #ifdef BSWAP_NEEDED
static void bswap_prstatus(struct target_elf_prstatus *);
static void bswap_psinfo(struct target_elf_prpsinfo *);
static void bswap_prstatus(struct target_elf_prstatus *prstatus) static void bswap_prstatus(struct target_elf_prstatus *prstatus)
{ {
prstatus->pr_info.si_signo = tswapl(prstatus->pr_info.si_signo); prstatus->pr_info.si_signo = tswapl(prstatus->pr_info.si_signo);
@ -2055,6 +2031,17 @@ static void bswap_psinfo(struct target_elf_prpsinfo *psinfo)
psinfo->pr_pgrp = tswap32(psinfo->pr_pgrp); psinfo->pr_pgrp = tswap32(psinfo->pr_pgrp);
psinfo->pr_sid = tswap32(psinfo->pr_sid); psinfo->pr_sid = tswap32(psinfo->pr_sid);
} }
static void bswap_note(struct elf_note *en)
{
bswap32s(&en->n_namesz);
bswap32s(&en->n_descsz);
bswap32s(&en->n_type);
}
#else
static inline void bswap_prstatus(struct target_elf_prstatus *p) { }
static inline void bswap_psinfo(struct target_elf_prpsinfo *p) {}
static inline void bswap_note(struct elf_note *en) { }
#endif /* BSWAP_NEEDED */ #endif /* BSWAP_NEEDED */
/* /*
@ -2207,9 +2194,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs, uint16_t machine,
elf->e_phentsize = sizeof(struct elf_phdr); elf->e_phentsize = sizeof(struct elf_phdr);
elf->e_phnum = segs; elf->e_phnum = segs;
#ifdef BSWAP_NEEDED
bswap_ehdr(elf); bswap_ehdr(elf);
#endif
} }
static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset) static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset)
@ -2223,9 +2208,7 @@ static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset)
phdr->p_flags = 0; phdr->p_flags = 0;
phdr->p_align = 0; phdr->p_align = 0;
#ifdef BSWAP_NEEDED bswap_phdr(phdr, 1);
bswap_phdr(phdr);
#endif
} }
static size_t note_size(const struct memelfnote *note) static size_t note_size(const struct memelfnote *note)
@ -2243,9 +2226,7 @@ static void fill_prstatus(struct target_elf_prstatus *prstatus,
prstatus->pr_pgrp = getpgrp(); prstatus->pr_pgrp = getpgrp();
prstatus->pr_sid = getsid(0); prstatus->pr_sid = getsid(0);
#ifdef BSWAP_NEEDED
bswap_prstatus(prstatus); bswap_prstatus(prstatus);
#endif
} }
static int fill_psinfo(struct target_elf_prpsinfo *psinfo, const TaskState *ts) static int fill_psinfo(struct target_elf_prpsinfo *psinfo, const TaskState *ts)
@ -2279,9 +2260,7 @@ static int fill_psinfo(struct target_elf_prpsinfo *psinfo, const TaskState *ts)
free(base_filename); free(base_filename);
free(filename); free(filename);
#ifdef BSWAP_NEEDED
bswap_psinfo(psinfo); bswap_psinfo(psinfo);
#endif
return (0); return (0);
} }
@ -2406,9 +2385,7 @@ static int write_note(struct memelfnote *men, int fd)
en.n_type = men->type; en.n_type = men->type;
en.n_descsz = men->datasz; en.n_descsz = men->datasz;
#ifdef BSWAP_NEEDED
bswap_note(&en); bswap_note(&en);
#endif
if (dump_write(fd, &en, sizeof(en)) != 0) if (dump_write(fd, &en, sizeof(en)) != 0)
return (-1); return (-1);