Detabified.

committer: mfx <mfx> 981585982 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2001-02-07 22:46:22 +00:00
parent 3ba4cd5919
commit c9a1173698
2 changed files with 34 additions and 35 deletions
+14 -15
View File
@@ -69,8 +69,7 @@ const int *PackLinuxI386::getCompressionMethods(int method, int level) const
return m_nrv2d; return m_nrv2d;
} }
int const * const int *PackLinuxI386::getFilters() const
PackLinuxI386::getFilters() const
{ {
static const int filters[] = { static const int filters[] = {
0x49, 0x46, 0x49, 0x46,
@@ -353,19 +352,19 @@ PackLinuxI386::buildLinuxLoader(
if (ph.format==UPX_F_LINUX_ELF_i386) { // decompr, unfilter are separate if (ph.format==UPX_F_LINUX_ELF_i386) { // decompr, unfilter are separate
addLoader("LXUNF000", 0); addLoader("LXUNF000", 0);
addLoader("LXUNF002", 0); addLoader("LXUNF002", 0);
if (0x80==(ft->id & 0xF0)) { if (0x80==(ft->id & 0xF0)) {
if (256==n_mru) { if (256==n_mru) {
addLoader("MRUBYTE0", 0); addLoader("MRUBYTE0", 0);
} }
else if (n_mru) { else if (n_mru) {
addLoader("LXMRU005", 0); addLoader("LXMRU005", 0);
} }
if (n_mru) { if (n_mru) {
addLoader("LXMRU006", 0); addLoader("LXMRU006", 0);
} }
else { else {
addLoader("LXMRU007", 0); addLoader("LXMRU007", 0);
} }
} }
else if (0x40==(ft->id & 0xF0)) { else if (0x40==(ft->id & 0xF0)) {
addLoader("LXUNF008", 0); addLoader("LXUNF008", 0);
+16 -16
View File
@@ -1123,22 +1123,22 @@ void Packer::addFilter32(int filter_id)
unsigned const f_jcc2 = f80_jcc2(filter_id); unsigned const f_jcc2 = f80_jcc2(filter_id);
if (NOFILT!=f_jcc2) { if (NOFILT!=f_jcc2) {
addLoader("LXJCC010", 0); addLoader("LXJCC010", 0);
if (n_mru) { if (n_mru) {
addLoader("LXMRU045", 0); addLoader("LXMRU045", 0);
} }
else { else {
addLoader("LXMRU046", 0); addLoader("LXMRU046", 0);
} }
if (0==n_mru || MRUFLT!=f_jcc2) { if (0==n_mru || MRUFLT!=f_jcc2) {
addLoader("LXJCC020", 0); addLoader("LXJCC020", 0);
} }
else { // 0!=n_mru else { // 0!=n_mru
addLoader("LXJCC021", 0); addLoader("LXJCC021", 0);
} }
if (NOFILT!=f_jcc2) { if (NOFILT!=f_jcc2) {
addLoader("LXJCC023", 0); addLoader("LXJCC023", 0);
} }
} }
addLoader("LXUNF037", 0); addLoader("LXUNF037", 0);
if (x386) { if (x386) {