Magic-Mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx.git synced 2025-03-03 13:27:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Made a method pure virtual.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-12-19 16:21:57 +01:00
parent cb4704c821
commit 5e3a658932
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p_vmlinx.cpp
View File

@ -69,12 +69,6 @@ PackVmlinuxBase<T>::~PackVmlinuxBase()
delete [] shdri; delete [] shdri;
} }
template <class T>
int PackVmlinuxBase<T>::is_valid_e_entry(Addr /*e_entry*/)
{
return 0;
}
template <class T> template <class T>
int PackVmlinuxBase<T>::getStrategy(Filter &/*ft*/) int PackVmlinuxBase<T>::getStrategy(Filter &/*ft*/)
{ {
@ -256,7 +250,7 @@ const int *PackVmlinuxARM::getFilters() const
// LOAD 0x27b000 0xc067a000 0x0067a000 0x10ee64 0x1b07e8 RWE 0x1000 // LOAD 0x27b000 0xc067a000 0x0067a000 0x10ee64 0x1b07e8 RWE 0x1000
// NOTE 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0x4 // NOTE 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0x4
int PackVmlinuxI386::is_valid_e_entry(Addr e_entry) bool PackVmlinuxI386::is_valid_e_entry(Addr e_entry)
{ {
return 0==(0x000fffff & e_entry); // entry on whole 1MB return 0==(0x000fffff & e_entry); // entry on whole 1MB
} }
@ -293,7 +287,7 @@ void PackVmlinuxI386::buildLoader(const Filter *ft)
"LINUX992,IDENTSTR,UPX1HEAD", NULL); "LINUX992,IDENTSTR,UPX1HEAD", NULL);
} }
int PackVmlinuxARM::is_valid_e_entry(Addr e_entry) bool PackVmlinuxARM::is_valid_e_entry(Addr e_entry)
{ {
return 0xc0008000==e_entry; return 0xc0008000==e_entry;
} }
@ -1180,7 +1174,7 @@ const int *PackVmlinuxAMD64::getFilters() const
return filters; return filters;
} }
int PackVmlinuxAMD64::is_valid_e_entry(Addr e_entry) bool PackVmlinuxAMD64::is_valid_e_entry(Addr e_entry)
{ {
return 0x200000<=e_entry; // 2MB return 0x200000<=e_entry; // 2MB
} }

8
src/p_vmlinx.h
View File

@ -78,7 +78,7 @@ protected:
virtual Shdr const *getElfSections(); virtual Shdr const *getElfSections();
virtual int getStrategy(Filter &/*ft*/); virtual int getStrategy(Filter &/*ft*/);
virtual int is_valid_e_entry(Addr); virtual bool is_valid_e_entry(Addr) = 0;
virtual bool canPack(); virtual bool canPack();
static int __acc_cdecl_qsort compare_Phdr(void const *aa, void const *bb); static int __acc_cdecl_qsort compare_Phdr(void const *aa, void const *bb);
}; };
@ -104,7 +104,7 @@ public:
protected: protected:
virtual void buildLoader(const Filter *ft); virtual void buildLoader(const Filter *ft);
virtual Linker* newLinker() const; virtual Linker* newLinker() const;
virtual int is_valid_e_entry(Addr); virtual bool is_valid_e_entry(Addr);
}; };
@ -128,7 +128,7 @@ public:
protected: protected:
virtual void buildLoader(const Filter *ft); virtual void buildLoader(const Filter *ft);
virtual Linker* newLinker() const; virtual Linker* newLinker() const;
virtual int is_valid_e_entry(Addr); virtual bool is_valid_e_entry(Addr);
}; };
@ -152,7 +152,7 @@ public:
protected: protected:
virtual void buildLoader(const Filter *ft); virtual void buildLoader(const Filter *ft);
virtual Linker* newLinker() const; virtual Linker* newLinker() const;
virtual int is_valid_e_entry(Addr); virtual bool is_valid_e_entry(Addr);
}; };

1
src/packmast.cpp
View File

@ -55,7 +55,6 @@
#include "p_ps1.h" #include "p_ps1.h"
#include "p_mach.h" #include "p_mach.h"
#include "p_armpe.h" #include "p_armpe.h"
#include "linker.h"
/************************************************************************* /*************************************************************************