From c9a1173698c22fe45bf3c1950d8b677e9ec92fe3 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 7 Feb 2001 22:46:22 +0000 Subject: [PATCH] Detabified. committer: mfx 981585982 +0000 --- src/p_lx_exc.cpp | 31 +++++++++++++++---------------- src/packer.cpp | 38 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp index 641f0eea..de048335 100644 --- a/src/p_lx_exc.cpp +++ b/src/p_lx_exc.cpp @@ -42,7 +42,7 @@ #define DT_NULL Elf_LE32_Dyn::DT_NULL #define DT_NEEDED Elf_LE32_Dyn::DT_NEEDED #define DT_STRTAB Elf_LE32_Dyn::DT_STRTAB -#define DT_STRSZ Elf_LE32_Dyn::DT_STRSZ +#define DT_STRSZ Elf_LE32_Dyn::DT_STRSZ /************************************************************************* @@ -69,8 +69,7 @@ const int *PackLinuxI386::getCompressionMethods(int method, int level) const return m_nrv2d; } -int const * -PackLinuxI386::getFilters() const +const int *PackLinuxI386::getFilters() const { static const int filters[] = { 0x49, 0x46, @@ -353,19 +352,19 @@ PackLinuxI386::buildLinuxLoader( if (ph.format==UPX_F_LINUX_ELF_i386) { // decompr, unfilter are separate addLoader("LXUNF000", 0); addLoader("LXUNF002", 0); - if (0x80==(ft->id & 0xF0)) { - if (256==n_mru) { - addLoader("MRUBYTE0", 0); - } - else if (n_mru) { - addLoader("LXMRU005", 0); - } - if (n_mru) { - addLoader("LXMRU006", 0); - } - else { - addLoader("LXMRU007", 0); - } + if (0x80==(ft->id & 0xF0)) { + if (256==n_mru) { + addLoader("MRUBYTE0", 0); + } + else if (n_mru) { + addLoader("LXMRU005", 0); + } + if (n_mru) { + addLoader("LXMRU006", 0); + } + else { + addLoader("LXMRU007", 0); + } } else if (0x40==(ft->id & 0xF0)) { addLoader("LXUNF008", 0); diff --git a/src/packer.cpp b/src/packer.cpp index 6bd0db43..24eafb05 100644 --- a/src/packer.cpp +++ b/src/packer.cpp @@ -1123,22 +1123,22 @@ void Packer::addFilter32(int filter_id) unsigned const f_jcc2 = f80_jcc2(filter_id); if (NOFILT!=f_jcc2) { - addLoader("LXJCC010", 0); - if (n_mru) { - addLoader("LXMRU045", 0); - } - else { - addLoader("LXMRU046", 0); - } - if (0==n_mru || MRUFLT!=f_jcc2) { - addLoader("LXJCC020", 0); - } - else { // 0!=n_mru - addLoader("LXJCC021", 0); - } - if (NOFILT!=f_jcc2) { - addLoader("LXJCC023", 0); - } + addLoader("LXJCC010", 0); + if (n_mru) { + addLoader("LXMRU045", 0); + } + else { + addLoader("LXMRU046", 0); + } + if (0==n_mru || MRUFLT!=f_jcc2) { + addLoader("LXJCC020", 0); + } + else { // 0!=n_mru + addLoader("LXJCC021", 0); + } + if (NOFILT!=f_jcc2) { + addLoader("LXJCC023", 0); + } } addLoader("LXUNF037", 0); if (x386) { @@ -1236,7 +1236,7 @@ void Packer::addFilter32(int filter_id) addLoader("LXCALLB1", 0); } } - if (n_mru) { + if (n_mru) { if (256!=n_mru && mrupwr2) { addLoader("MRUBITS1", 0); } @@ -1262,7 +1262,7 @@ void Packer::addFilter32(int filter_id) else { addLoader("LXCJ1MRU", 0); } - + // determine if in range if ((NOFILT!=f_call) && (NOFILT!=f_jmp1)) { // unfilter both addLoader("LXCALJMP", 0); @@ -1275,7 +1275,7 @@ void Packer::addFilter32(int filter_id) addLoader("LXCALL01", 0); } } - + // determine if mru applies if (0==n_mru || ! ((FNOMRU==f_call) || (FNOMRU==f_jmp1)) ) { addLoader("LXCJ2MRU", 0); // no mru, or no exceptions