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

Cosmetic cleanups.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2006-12-19 15:22:50 +01:00
parent cc0b7d1492
commit cb4704c821
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_elf.h
+15 -3
View File
@@ -36,10 +36,10 @@
namespace N_Elf {
// integral types
template <class THalf, class TWord, class TXword, class TAddr, class TOff>
struct ElfITypes
{
// integral types
typedef THalf Half;
typedef TWord Word;
typedef TXword Xword;
@@ -94,6 +94,7 @@ struct Dyn
}
__attribute_packed;
} // namespace N_Elf
@@ -255,7 +256,7 @@ __attribute_packed;
/*************************************************************************
// aggregate types in an ElfClass
// aggregate types into an ElfClass
**************************************************************************/
namespace N_Elf {
@@ -285,6 +286,11 @@ struct ElfClass_32
COMPILE_TIME_ASSERT(sizeof(Shdr) == 40)
COMPILE_TIME_ASSERT(sizeof(Dyn) == 8)
COMPILE_TIME_ASSERT(sizeof(Sym) == 16)
COMPILE_TIME_ASSERT_ALIGNOF(Ehdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Phdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Shdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Dyn, char)
COMPILE_TIME_ASSERT_ALIGNOF(Sym, char)
}
};
@@ -314,9 +320,15 @@ struct ElfClass_64
COMPILE_TIME_ASSERT(sizeof(Shdr) == 64)
COMPILE_TIME_ASSERT(sizeof(Dyn) == 16)
COMPILE_TIME_ASSERT(sizeof(Sym) == 24)
COMPILE_TIME_ASSERT_ALIGNOF(Ehdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Phdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Shdr, char)
COMPILE_TIME_ASSERT_ALIGNOF(Dyn, char)
COMPILE_TIME_ASSERT_ALIGNOF(Sym, char)
}
};
} // namespace N_Elf
@@ -329,7 +341,7 @@ typedef N_Elf::ElfClass_64<N_BELE_CTP::LEPolicy> ElfClass_LE64;
/*************************************************************************
// typedef shortcuts
// shortcuts
**************************************************************************/
typedef ElfClass_Host32::Ehdr Elf32_Ehdr;
src/p_vmlinx.h
+7 -6
View File
@@ -65,6 +65,7 @@ protected:
unsigned int const my_e_machine;
unsigned char const my_elfclass;
unsigned char const my_elfdata;
int n_ptload;
unsigned sz_ptload;
Phdr *phdri; // from input file
@@ -87,8 +88,8 @@ class PackVmlinuxI386 : public PackVmlinuxBase<ElfClass_LE32>
{
typedef PackVmlinuxBase<ElfClass_LE32> super;
public:
PackVmlinuxI386(InputFile *f) : super(f, Elf32_Ehdr::EM_386,
Elf32_Ehdr::ELFCLASS32, Elf32_Ehdr::ELFDATA2LSB) { }
PackVmlinuxI386(InputFile *f) : super(f, Ehdr::EM_386,
Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB) { }
virtual int getFormat() const { return UPX_F_VMLINUX_i386; }
virtual const char *getName() const { return "vmlinux/386"; }
virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.vmlinux"; }
@@ -111,8 +112,8 @@ class PackVmlinuxARM : public PackVmlinuxBase<ElfClass_LE32>
{
typedef PackVmlinuxBase<ElfClass_LE32> super;
public:
PackVmlinuxARM(InputFile *f) : super(f, Elf32_Ehdr::EM_ARM,
Elf32_Ehdr::ELFCLASS32, Elf32_Ehdr::ELFDATA2LSB) { }
PackVmlinuxARM(InputFile *f) : super(f, Ehdr::EM_ARM,
Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB) { }
virtual int getFormat() const { return UPX_F_VMLINUX_ARM; }
virtual const char *getName() const { return "vmlinux/ARM"; }
virtual const char *getFullName(const options_t *) const { return "ARM-linux.kernel.vmlinux"; }
@@ -135,8 +136,8 @@ class PackVmlinuxAMD64 : public PackVmlinuxBase<ElfClass_LE64>
{
typedef PackVmlinuxBase<ElfClass_LE64> super;
public:
PackVmlinuxAMD64(InputFile *f) : super(f, Elf64_Ehdr::EM_X86_64,
Elf64_Ehdr::ELFCLASS64, Elf64_Ehdr::ELFDATA2LSB) { }
PackVmlinuxAMD64(InputFile *f) : super(f, Ehdr::EM_X86_64,
Ehdr::ELFCLASS64, Ehdr::ELFDATA2LSB) { }
virtual int getFormat() const { return UPX_F_VMLINUX_AMD64; }
virtual const char *getName() const { return "vmlinux/AMD64"; }
virtual const char *getFullName(const options_t *) const { return "amd64-linux.kernel.vmlinux"; }