jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

unify PackLinuxElf32arm...::pack1()

Browse Source
This commit is contained in:
John Reiser
2006-06-15 15:41:00 -07:00
parent 299dcf6686
commit fa702b48e3
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+10 -21
View File
@@ -1024,20 +1024,18 @@ void PackLinuxElf32x86::pack1(OutputFile *fo, Filter &ft)
generateElfHdr(fo, linux_i386elf_fold, getbrk(phdri, ehdri.e_phnum) ); generateElfHdr(fo, linux_i386elf_fold, getbrk(phdri, ehdri.e_phnum) );
} }
void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft) void PackLinuxElf32::ARM_pack1(OutputFile *fo, void (*fix_ehdr)(void *, void const *))
{ {
super::pack1(fo, ft);
Elf32_Ehdr const *const fold = (Elf32_Ehdr const *)&linux_elf32arm_fold; Elf32_Ehdr const *const fold = (Elf32_Ehdr const *)&linux_elf32arm_fold;
cprElfHdr3 h3; cprElfHdr3 h3;
// We need Elf32_Ehdr and Elf32_Phdr with the correct byte gender. // We need Elf32_Ehdr and Elf32_Phdr with the correct byte gender.
// The stub may have been compiled differently. // The stub may have been compiled differently.
if (this->ei_data==fold->e_ident[Elf32_Ehdr::EI_DATA]) { if (this->ei_data==fold->e_ident[Elf32_Ehdr::EI_DATA]) {
memcpy(&h3, (Elf_BE32_Ehdr const *)linux_elf32arm_fold, memcpy(&h3, (void const *)linux_elf32arm_fold,
sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr) ); sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr) );
} }
else { else {
ehdr_lebe((Elf_LE32_Ehdr *)&h3.ehdr, (Elf_BE32_Ehdr const *)linux_elf32arm_fold); fix_ehdr((void *)&h3.ehdr, (void const *)linux_elf32arm_fold);
brev((unsigned char *)&h3.phdr[0], brev((unsigned char *)&h3.phdr[0],
sizeof(Elf32_Ehdr) + (unsigned char const *)&linux_elf32arm_fold, sizeof(Elf32_Ehdr) + (unsigned char const *)&linux_elf32arm_fold,
3*sizeof(Elf32_Phdr) ); 3*sizeof(Elf32_Phdr) );
@@ -1045,25 +1043,16 @@ void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft)
generateElfHdr(fo, &h3, getbrk(phdri, ehdri.e_phnum) ); generateElfHdr(fo, &h3, getbrk(phdri, ehdri.e_phnum) );
} }
void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft)
{
super::pack1(fo, ft);
ARM_pack1(fo, (void (*)(void *, void const *))ehdr_lebe);
}
void PackLinuxElf32armBe::pack1(OutputFile *fo, Filter &ft) // FIXME void PackLinuxElf32armBe::pack1(OutputFile *fo, Filter &ft) // FIXME
{ {
super::pack1(fo, ft); super::pack1(fo, ft);
ARM_pack1(fo, (void (*)(void *, void const *))ehdr_bele);
Elf32_Ehdr const *const fold = (Elf32_Ehdr const *)&linux_elf32arm_fold;
cprElfHdr3 h3;
// We need Elf32_Ehdr and Elf32_Phdr with the correct byte gender.
// The stub may have been compiled differently.
if (this->ei_data==fold->e_ident[Elf32_Ehdr::EI_DATA]) {
memcpy(&h3, (Elf_BE32_Ehdr const *)linux_elf32arm_fold,
sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr) );
}
else {
ehdr_bele((Elf_BE32_Ehdr *)&h3.ehdr, (Elf_LE32_Ehdr const *)linux_elf32arm_fold);
brev((unsigned char *)&h3.phdr[0],
sizeof(Elf32_Ehdr) + (unsigned char const *)&linux_elf32arm_fold,
3*sizeof(Elf32_Phdr) );
}
generateElfHdr(fo, &h3, getbrk(phdri, ehdri.e_phnum) );
} }
void PackLinuxElf32ppc::pack1(OutputFile *fo, Filter &ft) void PackLinuxElf32ppc::pack1(OutputFile *fo, Filter &ft)
src/p_lx_elf.h
+1
View File
@@ -88,6 +88,7 @@ protected:
virtual int ARM_buildLoader(Filter const *ft, virtual int ARM_buildLoader(Filter const *ft,
void (*fix_ehdr)(void *, void const *) ); void (*fix_ehdr)(void *, void const *) );
virtual void ARM_pack3(OutputFile *, Filter &, bool); virtual void ARM_pack3(OutputFile *, Filter &, bool);
virtual void ARM_pack1(OutputFile *, void (*)(void *, void const *));
virtual void pack1(OutputFile *, Filter &); // generate executable header virtual void pack1(OutputFile *, Filter &); // generate executable header
virtual void pack2(OutputFile *, Filter &); // append compressed data virtual void pack2(OutputFile *, Filter &); // append compressed data