Bump release date.

0x49 and 0x49 for all i386-dos32.* formats. Needs testing.

.hgtags

@@ -2,6 +2,7 @@
 223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
 2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
 2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
+396983c065fc743cb5b9703e266ca87eeff8a6ee RELEASE_291
 70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
 a916a2fe22de45167d25abcb40008315f415221c RELEASE_201
 a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193

BUGS

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 

COPYING

@@ -1,8 +1,8 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
                     GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

NEWS

@@ -2,6 +2,12 @@
 User visible changes for UPX
 ==================================================================
 
+Changes in 2.92 beta (23 Jan 2007):
+  * new option '--ultra-brute' which tries even more variants
+  * slightly improved compression ratio for some files when
+    using '--brute' or '--ultra-brute'
+  * bug fixes
+
 Changes in 2.91 beta (29 Nov 2006):
   * assorted bug fixes
   * arm/pe: fix "missing" icon & version info resource problem for wince 5

PROJECTS

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 

README

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 
@@ -108,9 +108,9 @@ THE FUTURE
 COPYRIGHT
 =========
 
-Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2006 Laszlo Molnar
+Copyright (C) 1996-2007 Laszlo Molnar
-Copyright (C) 2000-2006 John F. Reiser
+Copyright (C) 2000-2007 John F. Reiser
 
 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.

README.1ST

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 

THANKS

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 

TODO

@@ -1,4 +1,4 @@
-UPX TODO list. Last updated 2006-03-11.
+UPX TODO list. Last updated 2006-12-08.
 
 
 IMPORTANT PROBLEMS THAT SHOULD BE FIXED SOON:
@@ -41,8 +41,6 @@ ALL FORMATS
 - implement `--cpu=486' option to use bswap on the 32-bit formats
     (if cpu >= 486)
 
-- consider removing "or ebp,-1" when not needed
-
 
 FORMAT DJGPP2/COFF
 ==================
@@ -86,10 +84,6 @@ FORMAT WATCOM/LE
 
 - handle holes in the file
 
-- implement compressWithFilters()
-
-- add a call to verifyOverlappingDecompression()
-
 
 FORMAT WIN16/NE
 ===============

doc/elf-to-mem.txt

@@ -1,5 +1,5 @@
            Decompressing ELF Directly to Memory on Linux/x86
-        Copyright (C) 2000-2006 John F. Reiser  jreiser@BitWagon.com
+        Copyright (C) 2000-2007 John F. Reiser  jreiser@BitWagon.com
 
 References:
   <elf.h>   definitions for the ELF file format

doc/upx.pod

@@ -13,7 +13,7 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
 =head1 ABSTRACT
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2007 Markus Oberhumer, Laszlo Molnar & John Reiser
                         http://upx.sourceforge.net
 
 
@@ -175,38 +175,13 @@ Note that compression level B<--best> can be somewhat slow for large
 files, but you definitely should use it when releasing a final version
 of your program.
 
-Quick start for achieving the best compression ratio:
+Quick info for achieving the best compression ratio:
-
-=over 4
-
-Try B<upx --brute myfile.exe>.
-
-=back
-
-Details for achieving the best compression ratio:
 
 =over 4
 
 =item *
 
-Use the compression level B<--best>.
+Try B<upx --brute myfile.exe> or even B<upx --ultra-brute myfile.exe>.
-
-=item *
-
-Try one or both of the options B<--all-methods> and B<--all-filters>.
-
-=item *
-
-Try the option B<--crp-ms=NUMBER>. This uses more memory during compression
-to achieve a (slightly) better compression ratio.
-
-NUMBER must be a decimal value from 10000 to 999999, inclusive.
-The default value is 10000 (ten thousand).
-
-=item *
-
-Info: the option B<--brute> is an abbrevation for the options
-B<S<--best> S<--all-methods> S<--all-filters> S<--crp-ms=999999>>.
 
 =item *
 
@@ -855,7 +830,7 @@ Screensavers are supported, with the restriction that the filename
 must end with ".scr" (as screensavers are handled slightly different
 than normal exe files).
 
-UPX compressed PE files has some minor memory overhead (usually in the
+UPX compressed PE files have some minor memory overhead (usually in the
 10 - 30 kbytes range) which can be seen by specifying the "-i" command
 line switch during compression.
 
@@ -951,13 +926,13 @@ Please report all bugs immediately to the authors.
 
 =head1 COPYRIGHT
 
-Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
 
-Copyright (C) 1996-2006 Laszlo Molnar
+Copyright (C) 1996-2007 Laszlo Molnar
 
-Copyright (C) 2000-2006 John F. Reiser
+Copyright (C) 2000-2007 John F. Reiser
 
-Copyright (C) 2002-2006 Jens Medoch
+Copyright (C) 2002-2007 Jens Medoch
 
 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.

src/bele.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -183,65 +183,69 @@ inline void set_le64(void *p, acc_uint64l_t v)
 // get signed values, i.e. sign-extend
 **************************************************************************/
 
-inline int sign_extend(int v, int bits)
+inline int sign_extend(unsigned v, unsigned bits)
 {
     const unsigned sign_bit = 1u << (bits - 1);
-    v |= 0u - (v & sign_bit);
+    v &= sign_bit | (sign_bit - 1);
-    return v;
+    //v = (v ^ sign_bit) - sign_bit;
+    v |= 0 - (v & sign_bit);
+    return (int) v;
 }
 
-inline acc_int64l_t sign_extend(acc_int64l_t v, int bits)
+inline acc_int64l_t sign_extend(acc_uint64l_t v, unsigned bits)
 {
     const acc_uint64l_t sign_bit = ACC_UINT64_C(1) << (bits - 1);
-    v |= ACC_UINT64_C(0) - (v & sign_bit);
+    v &= sign_bit | (sign_bit - 1);
-    return v;
+    //v = (v ^ sign_bit) - sign_bit;
+    v |= 0 - (v & sign_bit);
+    return (acc_int64l_t) v;
 }
 
 inline int get_be16_signed(const void *p)
 {
-    int v = get_be16(p);
+    unsigned v = get_be16(p);
     return sign_extend(v, 16);
 }
 
 inline int get_be24_signed(const void *p)
 {
-    int v = get_be24(p);
+    unsigned v = get_be24(p);
     return sign_extend(v, 24);
 }
 
 inline int get_be32_signed(const void *p)
 {
-    int v = get_be32(p);
+    unsigned v = get_be32(p);
     return sign_extend(v, 32);
 }
 
 inline acc_int64l_t get_be64_signed(const void *p)
 {
-    acc_int64l_t v = get_be64(p);
+    acc_uint64l_t v = get_be64(p);
     return sign_extend(v, 64);
 }
 
 inline int get_le16_signed(const void *p)
 {
-    int v = get_le16(p);
+    unsigned v = get_le16(p);
     return sign_extend(v, 16);
 }
 
 inline int get_le24_signed(const void *p)
 {
-    int v = get_le24(p);
+    unsigned v = get_le24(p);
     return sign_extend(v, 24);
 }
 
 inline int get_le32_signed(const void *p)
 {
-    int v = get_le32(p);
+    unsigned v = get_le32(p);
     return sign_extend(v, 32);
 }
 
 inline acc_int64l_t get_le64_signed(const void *p)
 {
-    acc_int64l_t v = get_le64(p);
+    acc_uint64l_t v = get_le64(p);
     return sign_extend(v, 64);
 }
 
@@ -304,12 +308,18 @@ inline void acc_ua_swab32s(void *p)
 // Important: these classes must be PODs (Plain Old Data), i.e. no
 //   constructor, no destructor, no virtual functions and no default
 //   assignment operator, and all fields must be public(!).
+//
+// [Actually we _can_ use a safe non-POD subset, but for this we need
+//  to have gcc bug 17519 fixed - see http://gcc.gnu.org/PR17519 ]
 **************************************************************************/
 
 struct BE16
 {
     unsigned char d[2];
 
+    //inline BE16() { }
+    //BE16(unsigned v) { set_be16(d, v); }
+
     BE16& operator =  (unsigned v) { set_be16(d, v); return *this; }
     BE16& operator += (unsigned v) { set_be16(d, get_be16(d) + v); return *this; }
     BE16& operator -= (unsigned v) { set_be16(d, get_be16(d) - v); return *this; }
@@ -330,6 +340,9 @@ struct BE32
 {
     unsigned char d[4];
 
+    //inline BE32() { }
+    //BE32(unsigned v) { set_be32(d, v); }
+
     BE32& operator =  (unsigned v) { set_be32(d, v); return *this; }
     BE32& operator += (unsigned v) { set_be32(d, get_be32(d) + v); return *this; }
     BE32& operator -= (unsigned v) { set_be32(d, get_be32(d) - v); return *this; }
@@ -350,6 +363,9 @@ struct BE64
 {
     unsigned char d[8];
 
+    //inline BE64() { }
+    //BE64(acc_uint64l_t v) { set_be64(d, v); }
+
     BE64& operator =  (acc_uint64l_t v) { set_be64(d, v); return *this; }
     BE64& operator += (acc_uint64l_t v) { set_be64(d, get_be64(d) + v); return *this; }
     BE64& operator -= (acc_uint64l_t v) { set_be64(d, get_be64(d) - v); return *this; }
@@ -370,6 +386,9 @@ struct LE16
 {
     unsigned char d[2];
 
+    //inline LE16() { }
+    //LE16(unsigned v) { set_le16(d, v); }
+
     LE16& operator =  (unsigned v) { set_le16(d, v); return *this; }
     LE16& operator += (unsigned v) { set_le16(d, get_le16(d) + v); return *this; }
     LE16& operator -= (unsigned v) { set_le16(d, get_le16(d) - v); return *this; }
@@ -390,6 +409,9 @@ struct LE32
 {
     unsigned char d[4];
 
+    //inline LE32() { }
+    //LE32(unsigned v) { set_le32(d, v); }
+
     LE32& operator =  (unsigned v) { set_le32(d, v); return *this; }
     LE32& operator += (unsigned v) { set_le32(d, get_le32(d) + v); return *this; }
     LE32& operator -= (unsigned v) { set_le32(d, get_le32(d) - v); return *this; }
@@ -410,6 +432,9 @@ struct LE64
 {
     unsigned char d[8];
 
+    //inline LE64() { }
+    //LE64(acc_uint64l_t v) { set_le64(d, v); }
+
     LE64& operator =  (acc_uint64l_t v) { set_le64(d, v); return *this; }
     LE64& operator += (acc_uint64l_t v) { set_le64(d, get_le64(d) + v); return *this; }
     LE64& operator -= (acc_uint64l_t v) { set_le64(d, get_le64(d) - v); return *this; }
@@ -469,11 +494,47 @@ template <class T> T* operator + (const LE64& v, T* ptr);
 template <class T> T* operator - (T* ptr, const LE64& v);
 
 
+/*************************************************************************
+// global overloads
+**************************************************************************/
+
+#if 1 && !defined(ALIGN_DOWN)
+inline unsigned ALIGN_DOWN(unsigned a, const LE32& b) { return ALIGN_DOWN(a, (unsigned) b); }
+inline unsigned ALIGN_DOWN(const LE32& a, unsigned b) { return ALIGN_DOWN((unsigned) a, b); }
+inline unsigned ALIGN_UP  (unsigned a, const LE32& b) { return ALIGN_UP  (a, (unsigned) b); }
+inline unsigned ALIGN_UP  (const LE32& a, unsigned b) { return ALIGN_UP  ((unsigned) a, b); }
+#endif
+
+
+#if !defined(UPX_MAX)
+inline unsigned UPX_MAX(unsigned a, const BE16& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const BE16& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const BE16& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const BE16& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const BE32& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const BE32& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const BE32& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const BE32& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const LE16& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const LE16& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const LE16& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const LE16& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+
+inline unsigned UPX_MAX(unsigned a, const LE32& b)    { return UPX_MAX(a, (unsigned) b); }
+inline unsigned UPX_MAX(const LE32& a, unsigned b)    { return UPX_MAX((unsigned) a, b); }
+inline unsigned UPX_MIN(unsigned a, const LE32& b)    { return UPX_MIN(a, (unsigned) b); }
+inline unsigned UPX_MIN(const LE32& a, unsigned b)    { return UPX_MIN((unsigned) a, b); }
+#endif
+
+
 /*************************************************************************
 // misc
 **************************************************************************/
 
 // for use with qsort()
+extern "C" {
 int __acc_cdecl_qsort be16_compare(const void *, const void *);
 int __acc_cdecl_qsort be24_compare(const void *, const void *);
 int __acc_cdecl_qsort be32_compare(const void *, const void *);
@@ -490,6 +551,7 @@ int __acc_cdecl_qsort le16_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le24_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le32_compare_signed(const void *, const void *);
 int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
+} // extern "C"
 
 
 // just for testing...
@@ -538,26 +600,39 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
 // forward declarations
 namespace N_BELE_CTP {
 class BEPolicy; class LEPolicy;
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
 }
 namespace N_BELE_RTP {
 class AbstractPolicy;
 class BEPolicy; class LEPolicy;
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
 }
 
 namespace N_BELE_CTP {
 #define BELE_CTP 1
 #include "bele_policy.h"
 #undef BELE_CTP
-extern const BEPolicy be_policy;
-extern const LEPolicy le_policy;
 }
 
 namespace N_BELE_RTP {
 #define BELE_RTP 1
 #include "bele_policy.h"
 #undef BELE_RTP
-extern const BEPolicy be_policy;
+}
-extern const LEPolicy le_policy;
+
+namespace N_BELE_CTP {
+
+template <class T>
+inline const N_BELE_RTP::AbstractPolicy* getRTP();
+template <>
+inline const N_BELE_RTP::AbstractPolicy* getRTP<BEPolicy>()
+     { return &N_BELE_RTP::be_policy; }
+template <>
+inline const N_BELE_RTP::AbstractPolicy* getRTP<LEPolicy>()
+     { return &N_BELE_RTP::le_policy; }
+
 }
 
 

src/bele_policy.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -53,7 +53,7 @@
 #if defined(BELE_RTP)
 struct AbstractPolicy
 {
-    AbstractPolicy() {}
+    inline AbstractPolicy() { }
     virtual inline ~AbstractPolicy() { }
     V bool isBE() C = 0;
     V bool isLE() C = 0;
@@ -94,15 +94,14 @@ struct BEPolicy
     : public AbstractPolicy
 #endif
 {
-    BEPolicy() {}
+    inline BEPolicy() { }
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::BEPolicy RTP_Policy;
-    enum { isBE = 1, isLE = 0 };
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::BEPolicy CTP_Policy;
-    V bool isBE() C { return CTP_Policy::isBE; }
-    V bool isLE() C { return CTP_Policy::isLE; }
 #endif
+    V bool isBE() C { return true; }
+    V bool isLE() C { return false; }
 
     typedef BE16 U16;
     typedef BE32 U32;
@@ -157,9 +156,9 @@ struct BEPolicy
         COMPILE_TIME_ASSERT(sizeof(U16) == 2)
         COMPILE_TIME_ASSERT(sizeof(U32) == 4)
         COMPILE_TIME_ASSERT(sizeof(U64) == 8)
-        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U16)
-        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U32)
-        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U64)
     }
 
     // disable dynamic allocation
@@ -172,15 +171,14 @@ struct LEPolicy
     : public AbstractPolicy
 #endif
 {
-    LEPolicy() {}
+    inline LEPolicy() { }
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::LEPolicy RTP_Policy;
-    enum { isBE = 0, isLE = 1 };
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::LEPolicy CTP_Policy;
-    V bool isBE() C { return CTP_Policy::isBE; }
-    V bool isLE() C { return CTP_Policy::isLE; }
 #endif
+    V bool isBE() C { return false; }
+    V bool isLE() C { return true; }
 
     typedef LE16 U16;
     typedef LE32 U32;
@@ -235,9 +233,9 @@ struct LEPolicy
         COMPILE_TIME_ASSERT(sizeof(U16) == 2)
         COMPILE_TIME_ASSERT(sizeof(U32) == 4)
         COMPILE_TIME_ASSERT(sizeof(U64) == 8)
-        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U16)
-        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U32)
-        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+        COMPILE_TIME_ASSERT_ALIGNED1(U64)
     }
 
     // disable dynamic allocation

src/bptr.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/c_file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/c_init.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/c_none.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/c_screen.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/compress.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/compress.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/compress_lzma.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -107,49 +107,49 @@ int compress_lzma_dummy = 0;
 
 namespace MyLzma {
 
-struct InStreamRam: public ISequentialInStream, public CMyUnknownImp
+struct InStream: public ISequentialInStream, public CMyUnknownImp
 {
     MY_UNKNOWN_IMP
-    const Byte *Data; size_t Size; size_t Pos;
+    const Byte *b_buf; size_t b_size; size_t b_pos;
     void Init(const Byte *data, size_t size) {
-        Data = data; Size = size; Pos = 0;
+        b_buf = data; b_size = size; b_pos = 0;
     }
     STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
 };
 
-STDMETHODIMP InStreamRam::Read(void *data, UInt32 size, UInt32 *processedSize)
+STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
-    UInt32 remain = Size - Pos;
+    size_t remain = b_size - b_pos;
-    if (size > remain) size = remain;
+    if (size > remain) size = (UInt32) remain;
-    memmove(data, Data + Pos, size);
+    memcpy(data, b_buf + b_pos, size);
-    Pos += size;
+    b_pos += size;
     if (processedSize != NULL) *processedSize = size;
     return S_OK;
 }
 
-struct OutStreamRam : public ISequentialOutStream, public CMyUnknownImp
+struct OutStream : public ISequentialOutStream, public CMyUnknownImp
 {
     MY_UNKNOWN_IMP
-    Byte *Data; size_t Size; size_t Pos; bool Overflow;
+    Byte *b_buf; size_t b_size; size_t b_pos; bool overflow;
     void Init(Byte *data, size_t size) {
-        Data = data; Size = size; Pos = 0; Overflow = false;
+        b_buf = data; b_size = size; b_pos = 0; overflow = false;
     }
-    HRESULT WriteByte(Byte b) {
+    HRESULT WriteByte(Byte c) {
-        if (Pos >= Size) { Overflow = true; return E_FAIL; }
+        if (b_pos >= b_size) { overflow = true; return E_FAIL; }
-        Data[Pos++] = b;
+        b_buf[b_pos++] = c;
         return S_OK;
     }
     STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
 };
 
-STDMETHODIMP OutStreamRam::Write(const void *data, UInt32 size, UInt32 *processedSize)
+STDMETHODIMP OutStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
-    UInt32 i;
+    size_t remain = b_size - b_pos;
-    for (i = 0; i < size && Pos < Size; i++)
+    if (size > remain) size = (UInt32) remain, overflow = true;
-        Data[Pos++] = ((const Byte *)data)[i];
+    memcpy(b_buf + b_pos, data, size);
-    if (processedSize != NULL) *processedSize = i;
+    b_pos += size;
-    if (i != size) { Overflow = true; return E_FAIL; }
+    if (processedSize != NULL) *processedSize = size;
-    return S_OK;
+    return overflow ? E_FAIL : S_OK;
 }
 
 struct ProgressInfo : public ICompressProgressInfo, public CMyUnknownImp
@@ -169,6 +169,10 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 } // namespace
 
 
+#if (ACC_CC_INTELC) && defined(__linux__)
+#  pragma warning(disable: 424)         // #424: extra ";" ignored
+#endif
+
 #include "C/Common/Alloc.cpp"
 #include "C/Common/CRC.cpp"
 //#include "C/7zip/Common/InBuffer.cpp"
@@ -189,7 +193,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
                              const upx_compress_config_t *cconf_parm,
                                    upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
     assert(level > 0); assert(cresult != NULL);
 
     int r = UPX_E_ERROR;
@@ -197,8 +201,8 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     const lzma_compress_config_t *lcconf = cconf_parm ? &cconf_parm->conf_lzma : NULL;
     lzma_compress_result_t *res = &cresult->result_lzma;
 
-    MyLzma::InStreamRam is; is.AddRef();
+    MyLzma::InStream is; is.AddRef();
-    MyLzma::OutStreamRam os; os.AddRef();
+    MyLzma::OutStream os; os.AddRef();
     is.Init(src, src_len);
     os.Init(dst, *dst_len);
 
@@ -241,6 +245,12 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     pr[3].uintVal = lzma_compress_config_t::dict_size_t::default_value_c;
     pr[5].uintVal = lzma_compress_config_t::num_fast_bytes_t::default_value_c;
 #endif
+    // method overrides
+    if (method >= 0x100) {
+        pr[0].uintVal = (method >> 16) & 15;
+        pr[1].uintVal = (method >> 12) & 15;
+        pr[2].uintVal = (method >>  8) & 15;
+    }
 #if 0
     // DEBUG - set sizes so that we use a maxmimum amount of stack.
     //  These settings cause res->num_probs == 3147574, i.e. we will
@@ -342,16 +352,16 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
         goto error;
     if (enc.WriteCoderProperties(&os) != S_OK)
         goto error;
-    if (os.Overflow) {
+    if (os.overflow) {
         //r = UPX_E_OUTPUT_OVERRUN;
         r = UPX_E_NOT_COMPRESSIBLE;
         goto error;
     }
-    assert(os.Pos == 5);
+    assert(os.b_pos == 5);
 #if defined(USE_LZMA_PROPERTIES)
-    os.Pos = 1;
+    os.b_pos = 1;
 #else
-    os.Pos = 0;
+    os.b_pos = 0;
     // extra stuff in first byte: 5 high bits convenience for stub decompressor
     unsigned t = res->lit_context_bits + res->lit_pos_bits;
     os.WriteByte((t << 3) | res->pos_bits);
@@ -361,27 +371,29 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     rh = enc.Code(&is, &os, NULL, NULL, &progress);
 
 #ifndef _NO_EXCEPTIONS
-    } catch(...) { return UPX_E_OUT_OF_MEMORY; }
+    } catch (...) { rh = E_OUTOFMEMORY; }
 #endif
 
-    assert(is.Pos <=  src_len);
+    assert(is.b_pos <=  src_len);
-    assert(os.Pos <= *dst_len);
+    assert(os.b_pos <= *dst_len);
     if (rh == E_OUTOFMEMORY)
         r = UPX_E_OUT_OF_MEMORY;
-    else if (os.Overflow)
+    else if (os.overflow)
     {
-        assert(os.Pos == *dst_len);
+        assert(os.b_pos == *dst_len);
         //r = UPX_E_OUTPUT_OVERRUN;
         r = UPX_E_NOT_COMPRESSIBLE;
     }
     else if (rh == S_OK)
     {
-        assert(is.Pos == src_len);
+        assert(is.b_pos == src_len);
         r = UPX_E_OK;
     }
 
 error:
-    *dst_len = os.Pos;
+    *dst_len = os.b_pos;
+    //printf("\nlzma_compress: %d: %u %u %u %u %u, %u - > %u\n", r, res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs, src_len, *dst_len);
+    //printf("%u %u %u\n", is.__m_RefCount, os.__m_RefCount, progress.__m_RefCount);
     return r;
 }
 
@@ -402,7 +414,7 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
     // see res->num_probs above
     COMPILE_TIME_ASSERT(sizeof(CProb) == 2)
     COMPILE_TIME_ASSERT(LZMA_BASE_SIZE == 1846)
@@ -479,7 +491,7 @@ int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
                                    int method,
                              const upx_compress_result_t *cresult )
 {
-    assert(method == M_LZMA);
+    assert(M_IS_LZMA(method));
 
     // FIXME - implement this
     // Note that Packer::verifyOverlappingDecompression() will

src/compress_ucl.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -84,13 +84,14 @@ static int convert_errno_from_ucl(int r)
 }
 
 
+extern "C" {
 static void wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, ucl_voidp user)
 {
     if (state != -1 && state != 3) return;
     upx_callback_p cb = (upx_callback_p) user;
     if (cb && cb->nprogress)
         cb->nprogress(cb, a, b);
-}
+}}
 
 
 /*************************************************************************
@@ -135,7 +136,7 @@ int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
     // prepare bit-buffer settings
     cconf.bb_endian = 0;
     cconf.bb_size = 0;
-    if (method >= M_NRV2B_LE32 && method <= M_CL1B_LE16)
+    if (method >= M_NRV2B_LE32 && method <= M_NRV2E_LE16)
     {
         static const unsigned char sizes[3] = {32, 8, 16};
         cconf.bb_size = sizes[(method - M_NRV2B_LE32) % 3];
@@ -165,6 +166,10 @@ int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
         return UPX_E_ERROR;
     }
 
+    // make sure first_offset_found is set
+    if (res[6] == 0)
+        res[6] = 1;
+
     return convert_errno_from_ucl(r);
 }
 

src/compress_zlib.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/conf.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -104,6 +104,8 @@
 #  if (_MSC_VER >= 1400)
 #    pragma warning(disable: 4996)      // W1: 'function': was declared deprecated
 #  endif
+#elif (ACC_CC_SUNPROC)
+//#  pragma error_messages(off,"badargtype2w")    // FIXME
 #elif (ACC_CC_WATCOMC)
 #  if (__WATCOMC__ < 1100)
 #    error "need Watcom C++ 11.0c or newer"
@@ -187,32 +189,6 @@
 
 #define upx_byte                    unsigned char
 #define upx_bytep                   upx_byte *
-#define UPX_E_OK                    (0)
-#define UPX_E_ERROR                 (-1)
-#define UPX_E_OUT_OF_MEMORY         (-2)
-#define UPX_E_NOT_COMPRESSIBLE      (-3)
-#define UPX_E_INPUT_OVERRUN         (-4)
-#define UPX_E_OUTPUT_OVERRUN        (-5)
-#define UPX_E_LOOKBEHIND_OVERRUN    (-6)
-#define UPX_E_EOF_NOT_FOUND         (-7)
-#define UPX_E_INPUT_NOT_CONSUMED    (-8)
-#define UPX_E_NOT_YET_IMPLEMENTED   (-9)
-#define UPX_E_INVALID_ARGUMENT      (-10)
-
-struct upx_callback_t;
-#define upx_callback_p upx_callback_t *
-typedef void* (__acc_cdecl *upx_alloc_func_t)
-    (upx_callback_p self, unsigned items, unsigned size);
-typedef void      (__acc_cdecl *upx_free_func_t)
-    (upx_callback_p self, void* ptr);
-typedef void (__acc_cdecl *upx_progress_func_t)
-    (upx_callback_p, unsigned, unsigned);
-
-struct upx_callback_t
-{
-    upx_progress_func_t nprogress;
-    void * user1;
-};
 
 
 /*************************************************************************
@@ -316,18 +292,6 @@ struct upx_callback_t
 #undef PAGE_MASK
 #undef PAGE_SIZE
 
-
-#undef __attribute_packed
-#if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
-#  if (1 && (ACC_ARCH_I386))
-#    define __attribute_packed
-#  else
-#    define __attribute_packed      __attribute__((__packed__,__aligned__(1)))
-#  endif
-#else
-#  define __attribute_packed
-#endif
-
 #if !defined(O_BINARY)
 #  define O_BINARY  0
 #endif
@@ -337,6 +301,19 @@ struct upx_callback_t
 #endif
 
 
+#undef __attribute_packed
+#if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
+#  if (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386))
+#    define __attribute_packed
+#  else
+#    define __attribute_packed      __attribute__((__packed__,__aligned__(1)))
+#  endif
+#endif
+#if !defined(__attribute_packed)
+#  define __attribute_packed
+#endif
+
+
 /*************************************************************************
 //
 **************************************************************************/
@@ -344,36 +321,53 @@ struct upx_callback_t
 #define UNUSED(var)              ACC_UNUSED(var)
 #define COMPILE_TIME_ASSERT(e)   ACC_COMPILE_TIME_ASSERT(e)
 
-#if 1
 #define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
      typedef a acc_tmp_a_t; typedef b acc_tmp_b_t; \
-     struct acc_tmp_t { acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z[7]; } __attribute_packed; \
+     struct acc_tmp_t { acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z; } __attribute_packed; \
-     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 8*sizeof(b)+sizeof(a)) \
+     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 2*sizeof(b)+sizeof(a)) \
    }
-#else
-#  define __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) { \
-     struct acc_tmp_t { b x; a y; b z[7]; } __attribute_packed; \
-     COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 8*sizeof(b)+sizeof(a)) \
-   }
-#endif
-
 #if defined(__acc_alignof)
-#  define COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
+#  define __COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
      __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b) \
      COMPILE_TIME_ASSERT(__acc_alignof(a) == sizeof(b))
 #else
-#  define COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
+#  define __COMPILE_TIME_ASSERT_ALIGNOF(a,b) \
      __COMPILE_TIME_ASSERT_ALIGNOF_SIZEOF(a,b)
 #endif
+#define COMPILE_TIME_ASSERT_ALIGNED1(a)     __COMPILE_TIME_ASSERT_ALIGNOF(a,char)
 
 #define TABLESIZE(table)    ((sizeof(table)/sizeof((table)[0])))
 
+
+#if 0
 #define ALIGN_DOWN(a,b)     (((a) / (b)) * (b))
 #define ALIGN_UP(a,b)       ALIGN_DOWN((a) + ((b) - 1), b)
 #define ALIGN_GAP(a,b)      (ALIGN_UP(a,b) - (a))
+#elif 1
+template <class T>
+inline T ALIGN_DOWN(const T& a, const T& b) { T r; r = (a / b) * b; return r; }
+template <class T>
+inline T ALIGN_UP  (const T& a, const T& b) { T r; r = ((a + b - 1) / b) * b; return r; }
+template <class T>
+inline T ALIGN_GAP (const T& a, const T& b) { T r; r = ALIGN_UP(a, b) - a; return r; }
+#else
+inline unsigned ALIGN_DOWN(unsigned a, unsigned b) { return (a / b) * b; }
+inline unsigned ALIGN_UP  (unsigned a, unsigned b) { return ((a + b - 1) / b) * b; }
+inline unsigned ALIGN_GAP (unsigned a, unsigned b) { return ALIGN_UP(a, b) - a; }
+#endif
 
+#if 0
 #define UPX_MAX(a,b)        ((a) >= (b) ? (a) : (b))
 #define UPX_MIN(a,b)        ((a) <= (b) ? (a) : (b))
+#elif 1
+template <class T>
+inline const T& UPX_MAX(const T& a, const T& b) { if (a < b) return b; return a; }
+template <class T>
+inline const T& UPX_MIN(const T& a, const T& b) { if (a < b) return a; return b; }
+#else
+inline unsigned UPX_MAX(unsigned a, unsigned b) { return a < b ? b : a; }
+inline unsigned UPX_MIN(unsigned a, unsigned b) { return a < b ? a : b; }
+#endif
 
 
 // An Array allocates memory on the heap, but automatically
@@ -412,30 +406,23 @@ private:
 #define EXIT_INTERNAL   1
 
 
-// compression methods - DO NOT CHANGE
+// magic constants for patching
-#define M_SKIP          (-2)
+#define UPX_MAGIC_LE32          0x21585055      /* "UPX!" */
-#define M_END           (-1)
+#define UPX_MAGIC2_LE32         0xD5D0D8A1
-#define M_NRV2B_LE32    2
-#define M_NRV2B_8       3
-#define M_NRV2B_LE16    4
-#define M_NRV2D_LE32    5
-#define M_NRV2D_8       6
-#define M_NRV2D_LE16    7
-#define M_NRV2E_LE32    8
-#define M_NRV2E_8       9
-#define M_NRV2E_LE16    10
-#define M_CL1B_LE32     11
-#define M_CL1B_8        12
-#define M_CL1B_LE16     13
-#define M_LZMA          14
-#define M_DEFLATE       15      /* zlib */
 
-#define M_IS_NRV2B(x)   ((x) >= M_NRV2B_LE32 && (x) <= M_NRV2B_LE16)
+
-#define M_IS_NRV2D(x)   ((x) >= M_NRV2D_LE32 && (x) <= M_NRV2D_LE16)
+// upx_compress() error codes
-#define M_IS_NRV2E(x)   ((x) >= M_NRV2E_LE32 && (x) <= M_NRV2E_LE16)
+#define UPX_E_OK                    (0)
-#define M_IS_CL1B(x)    ((x) >= M_CL1B_LE32  && (x) <= M_CL1B_LE16)
+#define UPX_E_ERROR                 (-1)
-#define M_IS_LZMA(x)    ((x) == M_LZMA)
+#define UPX_E_OUT_OF_MEMORY         (-2)
-#define M_IS_DEFLATE(x) ((x) == M_DEFLATE)
+#define UPX_E_NOT_COMPRESSIBLE      (-3)
+#define UPX_E_INPUT_OVERRUN         (-4)
+#define UPX_E_OUTPUT_OVERRUN        (-5)
+#define UPX_E_LOOKBEHIND_OVERRUN    (-6)
+#define UPX_E_EOF_NOT_FOUND         (-7)
+#define UPX_E_INPUT_NOT_CONSUMED    (-8)
+#define UPX_E_NOT_YET_IMPLEMENTED   (-9)
+#define UPX_E_INVALID_ARGUMENT      (-10)
 
 
 // Executable formats. Note: big endian types are >= 128.
@@ -466,6 +453,9 @@ private:
 #define UPX_F_BSD_ELF_i386      25
 #define UPX_F_BSD_SH_i386       26
 
+#define UPX_F_VMLINUX_AMD64     27
+#define UPX_F_VMLINUX_ARM       28
+
 #define UPX_F_PLAIN_TEXT        127
 
 #define UPX_F_ATARI_TOS         129
@@ -475,8 +465,65 @@ private:
 #define UPX_F_LINUX_ELF32_ARMBE 133
 
 
-#define UPX_MAGIC_LE32      0x21585055          /* "UPX!" */
+// compression methods
-#define UPX_MAGIC2_LE32     0xD5D0D8A1
+#define M_ALL           (-1)
+#define M_END           (-2)
+#define M_NONE          (-3)
+#define M_SKIP          (-4)
+#define M_ULTRA_BRUTE   (-5)
+// compression methods - DO NOT CHANGE
+#define M_NRV2B_LE32    2
+#define M_NRV2B_8       3
+#define M_NRV2B_LE16    4
+#define M_NRV2D_LE32    5
+#define M_NRV2D_8       6
+#define M_NRV2D_LE16    7
+#define M_NRV2E_LE32    8
+#define M_NRV2E_8       9
+#define M_NRV2E_LE16    10
+//#define M_CL1B_LE32     11
+//#define M_CL1B_8        12
+//#define M_CL1B_LE16     13
+#define M_LZMA          14
+#define M_DEFLATE       15      /* zlib */
+
+#define M_IS_NRV2B(x)   ((x) >= M_NRV2B_LE32 && (x) <= M_NRV2B_LE16)
+#define M_IS_NRV2D(x)   ((x) >= M_NRV2D_LE32 && (x) <= M_NRV2D_LE16)
+#define M_IS_NRV2E(x)   ((x) >= M_NRV2E_LE32 && (x) <= M_NRV2E_LE16)
+//#define M_IS_CL1B(x)    ((x) >= M_CL1B_LE32  && (x) <= M_CL1B_LE16)
+#define M_IS_LZMA(x)    (((x) & 255) == M_LZMA)
+#define M_IS_DEFLATE(x) ((x) == M_DEFLATE)
+
+
+// filters
+#define FT_END          (-1)
+#define FT_NONE         (-2)
+#define FT_SKIP         (-3)
+#define FT_ULTRA_BRUTE  (-4)
+
+
+/*************************************************************************
+// compression - callback_t
+**************************************************************************/
+
+struct upx_callback_t;
+#define upx_callback_p upx_callback_t *
+#if 0
+typedef void* (__acc_cdecl *upx_alloc_func_t)
+    (upx_callback_p self, unsigned items, unsigned size);
+typedef void      (__acc_cdecl *upx_free_func_t)
+    (upx_callback_p self, void* ptr);
+#endif
+typedef void (__acc_cdecl *upx_progress_func_t)
+    (upx_callback_p, unsigned, unsigned);
+
+struct upx_callback_t
+{
+    upx_progress_func_t nprogress;
+    void *user;
+
+    void reset() { memset(this, 0, sizeof(*this)); }
+};
 
 
 /*************************************************************************
@@ -521,15 +568,15 @@ struct OptVar
 
 
 // optional assignments
-template <class T> void oassign(T& self, const T& other) {
+template <class T> inline void oassign(T& self, const T& other) {
     if (other.is_set) { self.v = other.v; self.is_set += 1; }
 }
 #if 0
-template <class V, class T> void oassign(V& v, const T& other) {
+template <class V, class T> inline void oassign(V& v, const T& other) {
     if (other.is_set) { v = other.v; }
 }
 #else
-template <class T> void oassign(unsigned& v, const T& other) {
+template <class T> inline void oassign(unsigned& v, const T& other) {
     if (other.is_set) { v = other.v; }
 }
 #endif
@@ -585,6 +632,8 @@ struct upx_compress_config_t
     void reset() { conf_lzma.reset(); conf_ucl.reset(); conf_zlib.reset(); }
 };
 
+#define NULL_cconf  ((upx_compress_config_t *) NULL)
+
 
 /*************************************************************************
 // compression - result_t
@@ -661,7 +710,6 @@ typedef ElfLinker Linker;
 
 // main.cpp
 extern const char *progname;
-void init_options(struct options_t *o);
 bool set_ec(int ec);
 #if (ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
 void e_exit(int ec) __attribute__((__noreturn__));

src/console.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/except.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/except.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/file.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -131,7 +131,7 @@ public:
 
     off_t getBytesWritten() const { return bytes_written; }
 
-    // FIXME - these won't work when using the `--stdout' option
+    // FIXME - these won't work when using the '--stdout' option
     virtual void seek(off_t off, int whence)
     {
         assert(!opt->to_stdout);

src/filter.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -61,10 +61,10 @@ const FilterImp::FilterEntry *FilterImp::getFilter(int id)
         memset(filter_map, 0xff, sizeof(filter_map));
         for (int i = 0; i < n_filters; i++)
         {
-            int fid = filters[i].id;
+            int filter_id = filters[i].id;
-            assert(fid >= 0 && fid <= 255);
+            assert(filter_id >= 0 && filter_id <= 255);
-            assert(filter_map[fid] == 0xff);
+            assert(filter_map[filter_id] == 0xff);
-            filter_map[fid] = (unsigned char) i;
+            filter_map[filter_id] = (unsigned char) i;
         }
         done = true;
     }
@@ -85,6 +85,20 @@ bool Filter::isValidFilter(int filter_id)
     return fe != NULL;
 }
 
+bool Filter::isValidFilter(int filter_id, const int *allowed_filters)
+{
+    if (!isValidFilter(filter_id))
+        return false;
+    if (filter_id == 0)
+        return true;
+    if (allowed_filters == NULL)
+        return false;
+    while (*allowed_filters != FT_END)
+        if (*allowed_filters++ == filter_id)
+            return true;
+    return false;
+}
+
 
 /*************************************************************************
 // high level API

src/filter.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -62,6 +62,7 @@ public:
     bool scan(const upx_byte *buf, unsigned buf_len);
 
     static bool isValidFilter(int filter_id);
+    static bool isValidFilter(int filter_id, const int *allowed_filters);
 
 public:
     // Will be set by each call to filter()/unfilter().

src/filter/ct.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/cto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -58,8 +58,16 @@ static int F(Filter *f)
         // must not conflict with the mark.
         // Note that unsigned comparison checks both edges of buffer.
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -79,8 +87,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif

src/filter/ctoj.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -57,8 +57,16 @@ static int F(Filter *f)
         memset(buf,0,256);
 
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic,lastcall))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -78,8 +86,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif

src/filter/ctojr.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/ctok.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -58,8 +58,16 @@ static int F(Filter *f)
         memset(buf,0,256);
 
         for (ic = 0; ic < size - 5; ic++)
-            if (COND(b,ic,lastcall,id) && get_le32(b+ic+1)+ic+1 >= size)
         {
+            if (!COND(b,ic,lastcall,id))
+                continue;
+            jc = get_le32(b+ic+1)+ic+1;
+            if (jc < size)
+            {
+                if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
+                    return -1;
+            }
+            else
                 buf[b[ic+1]] |= 1;
         }
 
@@ -79,8 +87,7 @@ static int F(Filter *f)
         // try to detect 'real' calls only
         if (jc < size)
         {
-            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+            assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
-                return 1;  // fail - buffer not restored
 #ifdef U
             set_be32(b+ic+1,jc+addvalue+cto);
 #endif

src/filter/ctsw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/getcto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/ppcbxx.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2004-2006 John F. Reiser
+   Copyright (C) 2004-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -58,7 +58,7 @@ static int F(Filter *f)
     {
         unsigned char buf[256];
         unsigned short wbuf[256];
-        const size_t WW = (size_t)0 - (~(size_t)0) << W_CTO; // ???
+        const size_t WW = (size_t)0 - ((~(size_t)0) << W_CTO); // ???
         memset(wbuf, 0, sizeof(wbuf));
         memset(buf     , 0,       WW);
         memset(buf + WW, 1, 256 - WW);

src/filter/sub.hh

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/sub16.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/sub32.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/sub8.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter/sw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filteri.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/help.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -28,6 +28,8 @@
 
 #include "conf.h"
 #include "compress.h"
+#include "packmast.h"
+#include "packer.h"
 
 
 /*************************************************************************
@@ -49,7 +51,7 @@ void show_head(void)
     fg = con_fg(f,FG_GREEN);
     con_fprintf(f,
                 "                       Ultimate Packer for eXecutables\n"
-                "    Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006\n"
+                "  Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007\n"
                 "UPX %-10s  Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
 #if (ACC_OS_DOS16 || ACC_OS_DOS32)
                 V("d"),
@@ -89,7 +91,77 @@ void show_usage(void)
 //
 **************************************************************************/
 
-void show_help(int x/*verbose*/)
+struct PackerNames
+{
+    struct Entry {
+        const char* fname;
+        const char* sname;
+    };
+    Entry names[32];
+    size_t names_count;
+    const options_t *o;
+    PackerNames() : names_count(0), o(NULL) { }
+    void add(const Packer *p)
+    {
+        p->assertPacker();
+        assert(names_count < 32);
+        names[names_count].fname = p->getFullName(o);
+        names[names_count].sname = p->getName();
+        names_count++;
+    }
+    static Packer* visit(Packer *p, void *user)
+    {
+        PackerNames *self = (PackerNames *) user;
+        self->add(p);
+        return NULL;
+    }
+    static int __acc_cdecl_qsort cmp_fname(const void *a, const void *b) {
+        return strcmp(((const Entry *) a)->fname, ((const Entry *) b)->fname);
+    }
+    static int __acc_cdecl_qsort cmp_sname(const void *a, const void *b) {
+        return strcmp(((const Entry *) a)->sname, ((const Entry *) b)->sname);
+    }
+};
+
+static void show_all_packers(FILE *f, int verbose)
+{
+    options_t o; o.reset();
+    PackerNames pn; pn.o = &o;
+    PackMaster::visitAllPackers(pn.visit, NULL, &o, &pn);
+    qsort(pn.names, pn.names_count, sizeof(PackerNames::Entry), pn.cmp_fname);
+    size_t pos = 0;
+    for (size_t i = 0; i < pn.names_count; ++i)
+    {
+        const char *fn = pn.names[i].fname;
+        const char *sn = pn.names[i].sname;
+        if (verbose)
+        {
+            con_fprintf(f, "    %-32s %s\n", fn, sn);
+        }
+        else
+        {
+            if (pos == 0) {
+                con_fprintf(f, "  %s", fn);
+                pos = 2 + strlen(fn);
+            } else if (pos + 1 + strlen(fn) > 80) {
+                con_fprintf(f, "\n  %s", fn);
+                pos = 2 + strlen(fn);
+            } else {
+                con_fprintf(f, " %s", fn);
+                pos += 1 + strlen(fn);
+            }
+        }
+    }
+    if (!verbose && pn.names_count)
+        con_fprintf(f, "\n");
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void show_help(int verbose)
 {
     FILE *f = con_term;
     int fg;
@@ -106,8 +178,8 @@ void show_help(int x/*verbose*/)
                 "  -d     decompress                        -l    list compressed file\n"
                 "  -t     test compressed file              -V    display version number\n"
                 "  -h     give %s help                    -L    display software license\n%s",
-                x == 0 ? "" : "  --best compress best (can be slow for big files)\n",
+                verbose == 0 ? "" : "  --best compress best (can be slow for big files)\n",
-                x == 0 ? "more" : "this", x == 0 ? "" : "\n");
+                verbose == 0 ? "more" : "this", verbose == 0 ? "" : "\n");
 
     fg = con_fg(f,FG_YELLOW);
     con_fprintf(f,"Options:\n");
@@ -115,22 +187,29 @@ void show_help(int x/*verbose*/)
 
     con_fprintf(f,
                 "  -q     be quiet                          -v    be verbose\n"
-                "  -oFILE write output to `FILE'\n"
+                "  -oFILE write output to 'FILE'\n"
                 //"  -f     force overwrite of output files and compression of suspicious files\n"
                 "  -f     force compression of suspicious files\n"
                 "%s%s"
-                , (x == 0) ? "  -k     keep backup files\n" : ""
+                , (verbose == 0) ? "  -k     keep backup files\n" : ""
 #if 1
-                , (x > 0) ? "  --no-color, --mono, --color, --no-progress   change look\n" : ""
+                , (verbose > 0) ? "  --no-color, --mono, --color, --no-progress   change look\n" : ""
 #else
                 , ""
 #endif
                 );
 
-    if (x > 0)
+    if (verbose > 0)
     {
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"\nBackup options:\n");
+        con_fprintf(f,"\nCompression tuning options:\n");
+        fg = con_fg(f,fg);
+        con_fprintf(f,
+                    "  --brute             try all available compression methods & filters\n"
+                    "  --ultra-brute       try even more compression variants\n"
+                    "\n");
+        fg = con_fg(f,FG_YELLOW);
+        con_fprintf(f,"Backup options:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  -k, --backup        keep backup files\n"
@@ -222,7 +301,7 @@ void show_help(int x/*verbose*/)
                     "  --le                produce LE output [default: EXE]\n"
                     "\n");
         fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for win32/pe & rtm32/pe:\n");
+        con_fprintf(f,"Options for win32/pe, rtm32/pe & arm/pe:\n");
         fg = con_fg(f,fg);
         con_fprintf(f,
                     "  --compress-exports=0    do not compress the export section\n"
@@ -230,6 +309,7 @@ void show_help(int x/*verbose*/)
                     "  --compress-icons=0      do not compress any icons\n"
                     "  --compress-icons=1      compress all but the first icon\n"
                     "  --compress-icons=2      compress all but the first icon directory [default]\n"
+                    "  --compress-icons=3      compress all icons\n"
                     "  --compress-resources=0  do not compress any resources at all\n"
                     "  --keep-resource=list    do not compress resources specified by list\n"
                     "  --strip-relocs=0        do not strip relocations\n"
@@ -239,43 +319,23 @@ void show_help(int x/*verbose*/)
                     "\n");
     }
 
-    con_fprintf(f,
+    con_fprintf(f, "file..   executables to (de)compress\n");
-                "file..   executables to (de)compress\n"
-                "\n");
-    fg = con_fg(f,FG_YELLOW);
-    con_fprintf(f,"This version supports:\n");
-    fg = con_fg(f,fg);
-    con_fprintf(f,"   "
-// TODO:
-// support for mach/ppc32
-// support for linux elf/ppc32
-// support for linux elf/amd64
-                " arm/pe,"
-                " atari/tos,"
-                " bvmlinuz/386,"
-                " djgpp2/coff,"
-                " dos/com,"
-                " dos/exe,"
-                " dos/sys,"
-                "\n   "
-                //" elks/8086,"
-                " linux/amd64,"
-                " linux/i386,"
-                " linux/ppc32,"
-                " mach/ppc32,"
-                " ps1/exe,"
-                " rtm32/pe,"
-                "\n   "
-                " tmt/adam,"
-                " vmlinux/386,"
-                " vmlinuz/386,"
-                " watcom/le,"
-                //" win16/ne,"
-                " win32/pe"
-                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.sf.net\n"
-//                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details type `upx -L'.\n"
-                "");
 
+    if (verbose > 0)
+    {
+        fg = con_fg(f,FG_YELLOW);
+        con_fprintf(f,"\nThis version supports:\n");
+        fg = con_fg(f,fg);
+        show_all_packers(f, verbose);
+    }
+    else
+    {
+        con_fprintf(f,"\nType '%s --help' for more detailed help.\n", progname);
+    }
+
+    con_fprintf(f,"\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.sf.net\n"
+//                "\nUPX comes with ABSOLUTELY NO WARRANTY; for details type 'upx -L'.\n"
+                "");
 
 #if defined(DEBUG) || defined(TESTING)
     fg = con_fg(f,FG_RED);
@@ -367,17 +427,17 @@ void show_version(int x)
     if (v != NULL && v[0])
         fprintf(fp, "LZMA SDK version %s\n", v);
 #endif
-    fprintf(fp, "Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer\n");
+    fprintf(fp, "Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(fp, "Copyright (C) 1996-2006 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 1996-2007 Laszlo Molnar\n");
-    fprintf(fp, "Copyright (C) 2000-2006 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2000-2007 John F. Reiser\n");
-    fprintf(fp, "Copyright (C) 2002-2006 Jens Medoch\n");
+    fprintf(fp, "Copyright (C) 2002-2007 Jens Medoch\n");
 #if defined(WITH_ZLIB)
-    fprintf(fp, "Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler\n");
+    fprintf(fp, "Copyright (C) 1995" "-2005 Jean-loup Gailly and Mark Adler\n");
 #endif
 #if defined(WITH_LZMA)
-    fprintf(fp, "Copyright (C) 1999-2006 Igor Pavlov\n");
+    fprintf(fp, "Copyright (C) 1999" "-2006 Igor Pavlov\n");
 #endif
-    fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type `%s -L'.\n", progname);
+    fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);
 }
 
 

src/lefile.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/lefile.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/linker.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -173,11 +173,11 @@ void ElfLinker::init(const void *pdata_v, int plen)
     output = new upx_byte[inputlen];
     outputlen = 0;
 
-    int pos = find(input, inputlen, "Sections:", 9);
+    int pos = find(input, inputlen, "Sections:\n", 10);
     assert(pos != -1);
     char *psections = (char *) input + pos;
 
-    char *psymbols = strstr(psections, "SYMBOL TABLE:");
+    char *psymbols = strstr(psections, "SYMBOL TABLE:\n");
     assert(psymbols != NULL);
 
     char *prelocs = strstr(psymbols, "RELOCATION RECORDS FOR ");
@@ -189,7 +189,7 @@ void ElfLinker::init(const void *pdata_v, int plen)
     addLoader("*UND*");
 }
 
-void ElfLinker::preprocessSections(char *start, const char *end)
+void ElfLinker::preprocessSections(char *start, char *end)
 {
     nsections = 0;
     while (start < end)
@@ -215,7 +215,7 @@ void ElfLinker::preprocessSections(char *start, const char *end)
     addSection("*UND*", NULL, 0, 0);
 }
 
-void ElfLinker::preprocessSymbols(char *start, const char *end)
+void ElfLinker::preprocessSymbols(char *start, char *end)
 {
     nsymbols = 0;
     while (start < end)
@@ -250,7 +250,7 @@ void ElfLinker::preprocessSymbols(char *start, const char *end)
     }
 }
 
-void ElfLinker::preprocessRelocations(char *start, const char *end)
+void ElfLinker::preprocessRelocations(char *start, char *end)
 {
     char sect[1024];
     Section *section = NULL;
@@ -369,11 +369,13 @@ ElfLinker::Relocation *ElfLinker::addRelocation(const char *section, unsigned of
     return rel;
 }
 
+#if 0
 void ElfLinker::setLoaderAlignOffset(int phase)
 {
     //assert(phase & 0);
     printf("\nFIXME: ElfLinker::setLoaderAlignOffset %d\n", phase);
 }
+#endif
 
 int ElfLinker::addLoader(const char *sname)
 {
@@ -412,7 +414,7 @@ int ElfLinker::addLoader(const char *sname)
                 assert(tail);
                 assert(tail != section);
                 unsigned const v = ~0u << section->p2align;
-                if (unsigned const l = ~v & -(tail->offset + tail->size)) {
+                if (unsigned const l = ~v & (0u-(tail->offset + tail->size))) {
                     alignCode(l);
                     tail->size += l;
                 }
@@ -617,7 +619,11 @@ void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location,
 
     if (strcmp(type, "8") == 0)
     {
+#if (ACC_CC_PGI)
+        int displ = * (signed char *) location + (int) value; // CBUG
+#else
         int displ = (signed char) *location + (int) value;
+#endif
         if (displ < -128 || displ > 127)
         {
             printf("target out of range (%d) in reloc %s:%x\n",
@@ -659,6 +665,9 @@ void ElfLinkerArmBE::relocate1(const Relocation *rel, upx_byte *location,
         //(b, 0xF000 + ((v - 1) / 2) * 0x10000);
         //set_be32(location, get_be32(location) + value / 4);
     }
+    else if (0==strcmp("R_ARM_ABS8", type)) {
+        *location += value;
+    }
     else
         super::relocate1(rel, location, value, type);
 }
@@ -688,6 +697,9 @@ void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location,
         //(b, 0xF000 + ((v - 1) / 2) * 0x10000);
         //set_le32(location, get_le32(location) + value / 4);
     }
+    else if (0==strcmp("R_ARM_ABS8", type)) {
+        *location += value;
+    }
     else
         super::relocate1(rel, location, value, type);
 }
@@ -815,10 +827,14 @@ void ElfLinkerX86::relocate1(const Relocation *rel, upx_byte *location,
 
     if (strcmp(type, "8") == 0)
     {
+#if (ACC_CC_PGI)
+        int displ = * (signed char *) location + (int) value; // CBUG
+#else
         int displ = (signed char) *location + (int) value;
+#endif
         if (range_check && (displ < -128 || displ > 127)) {
-            printf("target out of range (%d) in reloc %s:%x\n",
+            printf("target out of range (%d,%d,%d) in reloc %s:%x\n",
-                   displ, rel->section->name, rel->offset);
+                   displ, *location, value, rel->section->name, rel->offset);
             abort();
         }
         *location += value;

src/linker.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -66,9 +66,9 @@ protected:
     bool        reloc_done;
 
 protected:
-    void preprocessSections(char *start, const char *end);
+    void preprocessSections(char *start, char *end);
-    void preprocessSymbols(char *start, const char *end);
+    void preprocessSymbols(char *start, char *end);
-    void preprocessRelocations(char *start, const char *end);
+    void preprocessRelocations(char *start, char *end);
     Section *findSection(const char *name, bool fatal=true) const;
     Symbol *findSymbol(const char *name, bool fatal=true) const;
 
@@ -81,7 +81,7 @@ public:
     virtual ~ElfLinker();
 
     virtual void init(const void *pdata, int plen);
-    virtual void setLoaderAlignOffset(int phase);
+    //virtual void setLoaderAlignOffset(int phase);
     virtual int addLoader(const char *sname);
     virtual Section *addSection(const char *sname, const void *sdata, int slen, unsigned p2align);
     virtual int getSection(const char *sname, int *slen=NULL) const;

src/main.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -50,9 +50,9 @@ void options_t::reset()
     o->crp.reset();
 
     o->cmd = CMD_NONE;
-    o->method = -1;
+    o->method = M_NONE;
     o->level = -1;
-    o->filter = -1;
+    o->filter = FT_NONE;
 
     o->backup = -1;
     o->overlay = -1;
@@ -77,8 +77,8 @@ void options_t::reset()
     o->win32_pe.keep_resource = "";
 }
 
-static struct options_t global_options;
+static options_t global_options;
-struct options_t *opt = &global_options;
+options_t *opt = &global_options;
 
 static int done_output_name = 0;
 static int done_script_name = 0;
@@ -183,7 +183,7 @@ static void e_method(int m, int l)
 static void e_optarg(const char *n)
 {
     fflush(con_term);
-    fprintf(stderr,"%s: invalid argument in option `%s'\n", argv0, n);
+    fprintf(stderr,"%s: invalid argument in option '%s'\n", argv0, n);
     e_exit(EXIT_USAGE);
 }
 
@@ -191,7 +191,7 @@ static void e_optarg(const char *n)
 static void e_optval(const char *n)
 {
     fflush(con_term);
-    fprintf(stderr,"%s: invalid value for option `%s'\n", argv0, n);
+    fprintf(stderr,"%s: invalid value for option '%s'\n", argv0, n);
     e_exit(EXIT_USAGE);
 }
 
@@ -201,10 +201,10 @@ void e_envopt(const char *n)
 {
     fflush(con_term);
     if (n)
-        fprintf(stderr,"%s: invalid string `%s' in environment variable `%s'\n",
+        fprintf(stderr,"%s: invalid string '%s' in environment variable '%s'\n",
                         argv0, n, OPTIONS_VAR);
     else
-        fprintf(stderr,"%s: illegal option in environment variable `%s'\n",
+        fprintf(stderr,"%s: illegal option in environment variable '%s'\n",
                         argv0, OPTIONS_VAR);
     e_exit(EXIT_USAGE);
 }
@@ -227,7 +227,7 @@ void check_not_both(bool e1, bool e2, const char *c1, const char *c2)
     if (e1 && e2)
     {
         fprintf(stderr,"%s: ",argv0);
-        fprintf(stderr,"cannot use both `%s' and `%s'\n", c1, c2);
+        fprintf(stderr,"cannot use both '%s' and '%s'\n", c1, c2);
         e_usage();
     }
 }
@@ -264,14 +264,14 @@ void check_options(int i, int argc)
     check_not_both(opt->to_stdout, opt->output_name != NULL, "--stdout", "-o");
     if (opt->to_stdout && opt->cmd == CMD_COMPRESS)
     {
-        fprintf(stderr,"%s: cannot use `--stdout' when compressing\n", argv0);
+        fprintf(stderr,"%s: cannot use '--stdout' when compressing\n", argv0);
         e_usage();
     }
     if (opt->to_stdout || opt->output_name)
     {
         if (i + 1 != argc)
         {
-            fprintf(stderr,"%s: need exactly one argument when using `%s'\n",
+            fprintf(stderr,"%s: need exactly one argument when using '%s'\n",
                     argv0, opt->to_stdout ? "--stdout" : "-o");
             e_usage();
         }
@@ -333,7 +333,7 @@ static void set_output_name(const char *n, bool allow_m)
 #if 1
     if (done_output_name > 0)
     {
-        fprintf(stderr,"%s: option `-o' more than once given\n",argv0);
+        fprintf(stderr,"%s: option '-o' more than once given\n",argv0);
         e_usage();
     }
 #endif
@@ -356,7 +356,7 @@ static void set_script_name(const char *n, bool allow_m)
 #if 1
     if (done_script_name > 0)
     {
-        fprintf(stderr,"%s: option `--script' more than once given\n",argv0);
+        fprintf(stderr,"%s: option '--script' more than once given\n",argv0);
         e_usage();
     }
 #endif
@@ -499,7 +499,7 @@ static int do_option(int optc, const char *arg)
     case 'f':
         opt->force++;
         break;
-    case 902:
+    case 909:
         set_cmd(CMD_FILEINFO);
         break;
     case 'h':
@@ -508,10 +508,13 @@ static int do_option(int optc, const char *arg)
         set_cmd(CMD_HELP);
         break;
     case 'h'+256:
-#if 0
+#if 1
+        if (!acc_isatty(STDOUT_FILENO))
+        {
             /* according to GNU standards */
             set_term(stdout);
             opt->console = CON_FILE;
+        }
 #endif
         show_help(1);
         e_exit(EXIT_OK);
@@ -568,7 +571,7 @@ static int do_option(int optc, const char *arg)
         break;
     case 722:
         opt->all_methods_use_lzma = false;
-        if (opt->method == M_LZMA)
+        if (M_IS_LZMA(opt->method))
             opt->method = -1;
         break;
 
@@ -586,6 +589,9 @@ static int do_option(int optc, const char *arg)
             e_method(opt->method, optc);
         break;
 
+    case 902:                               // --ultra-brute
+        opt->ultra_brute = true;
+        /* fallthrough */
     case 901:                               // --brute
         opt->all_methods = true;
         opt->all_methods_use_lzma = true;
@@ -656,6 +662,7 @@ static int do_option(int optc, const char *arg)
         break;
     case 524:                               // --all-methods
         opt->all_methods = true;
+        opt->all_methods_use_lzma = true;
         opt->method = -1;
         break;
     case 525:                               // --exact
@@ -712,7 +719,7 @@ static int do_option(int optc, const char *arg)
         opt->backup = 1;
         break;
     case 541:
-        if (opt->backup != 1)           // do not overide `--backup'
+        if (opt->backup != 1)           // do not overide '--backup'
             opt->backup = 0;
         break;
     // overlay
@@ -871,10 +878,11 @@ static const struct mfx_option longopts[] =
     // commands
     {"best",             0x10, 0, 900},     // compress best
     {"brute",            0x10, 0, 901},     // compress best, brute force
+    {"ultra-brute",      0x10, 0, 902},     // compress best, brute force
     {"decompress",          0, 0, 'd'},     // decompress
     {"fast",             0x10, 0, '1'},     // compress faster
-    {"fileinfo",         0x10, 0, 902},     // display info about file
+    {"fileinfo",         0x10, 0, 909},     // display info about file
-    {"file-info",        0x10, 0, 902},     // display info about file
+    {"file-info",        0x10, 0, 909},     // display info about file
     {"help",                0, 0, 'h'+256}, // give help
     {"license",             0, 0, 'L'},     // display software license
     {"list",                0, 0, 'l'},     // list compressed exe
@@ -1039,6 +1047,7 @@ static const struct mfx_option longopts[] =
     // commands
     {"best",             0x10, 0, 900},     // compress best
     {"brute",            0x10, 0, 901},     // compress best, brute force
+    {"ultra-brute",      0x10, 0, 902},     // compress best, brute force
     {"fast",             0x10, 0, '1'},     // compress faster
 
     // options
@@ -1201,9 +1210,25 @@ static void first_options(int argc, char **argv)
 **************************************************************************/
 
 template <class T> struct TestBELE {
-static int test(void)
+static bool test(void)
 {
+    COMPILE_TIME_ASSERT_ALIGNED1(T)
+    struct test1_t { char a; T b; } __attribute_packed;
+    struct test2_t { char a; T b[3]; } __attribute_packed;
+    test1_t t1[7]; UNUSED(t1); test2_t t2[7]; UNUSED(t2);
+    COMPILE_TIME_ASSERT(sizeof(test1_t) == 1 + sizeof(T))
+    COMPILE_TIME_ASSERT_ALIGNED1(test1_t)
+    COMPILE_TIME_ASSERT(sizeof(t1) == 7 + 7*sizeof(T))
+    COMPILE_TIME_ASSERT(sizeof(test2_t) == 1 + 3*sizeof(T))
+    COMPILE_TIME_ASSERT_ALIGNED1(test2_t)
+    COMPILE_TIME_ASSERT(sizeof(t2) == 7 + 21*sizeof(T))
+#if defined(__acc_alignof)
+    COMPILE_TIME_ASSERT(__acc_alignof(t1) == 1)
+    COMPILE_TIME_ASSERT(__acc_alignof(t2) == 1)
+#endif
+#if 1 && !defined(xUPX_OFFICIAL_BUILD)
     T allbits; allbits = 0; allbits -= 1;
+    //++allbits; allbits++; --allbits; allbits--;
     T v1; v1 = 1; v1 *= 2; v1 -= 1;
     T v2; v2 = 1;
     assert( (v1 == v2)); assert(!(v1 != v2));
@@ -1217,7 +1242,9 @@ static int test(void)
     assert(v1 == 1); assert(v2 == 0);
     v1 <<= 1; v1 |= v2; v1 >>= 1; v2 &= v1; v2 /= v1; v2 *= v1;
     assert(v1 == 1); assert(v2 == 0);
-    return (v1 ^ v2) == 1;
+    if ((v1 ^ v2) != 1) return false;
+#endif
+    return true;
 }};
 
 
@@ -1249,12 +1276,12 @@ void upx_sanity_check(void)
     COMPILE_TIME_ASSERT(sizeof(LE32) == 4)
     COMPILE_TIME_ASSERT(sizeof(LE64) == 8)
 
-    COMPILE_TIME_ASSERT_ALIGNOF(BE16, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE16)
-    COMPILE_TIME_ASSERT_ALIGNOF(BE32, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE32)
-    COMPILE_TIME_ASSERT_ALIGNOF(BE64, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(BE64)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE16, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE16)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE32, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE32)
-    COMPILE_TIME_ASSERT_ALIGNOF(LE64, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(LE64)
 
     COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1)
     assert(strlen(UPX_VERSION_STRING4) == 4);
@@ -1265,14 +1292,12 @@ void upx_sanity_check(void)
     assert(memcmp(UPX_VERSION_DATE + strlen(UPX_VERSION_DATE) - 4, UPX_VERSION_YEAR, 4) == 0);
 
 #if 1
-#  if 1 && !defined(UPX_OFFICIAL_BUILD)
     assert(TestBELE<LE16>::test());
     assert(TestBELE<LE32>::test());
     assert(TestBELE<LE64>::test());
     assert(TestBELE<BE16>::test());
     assert(TestBELE<BE32>::test());
     assert(TestBELE<BE64>::test());
-#  endif
     {
     static const unsigned char dd[32] = { 0, 0, 0, 0, 0, 0, 0,
          0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8,
@@ -1296,6 +1321,7 @@ void upx_sanity_check(void)
     assert(get_le24_signed(d) == -131329);
     assert(get_le32(d) == 0xfcfdfeff);
     assert(get_le32_signed(d) == -50462977);
+    assert(get_le64_signed(d) == ACC_INT64_C(-506097522914230529));
     assert(find_be16(d, 2, 0xfffe) == 0);
     assert(find_le16(d, 2, 0xfeff) == 0);
     assert(find_be32(d, 4, 0xfffefdfc) == 0);
@@ -1304,6 +1330,7 @@ void upx_sanity_check(void)
     assert(get_be16_signed(d) == 32638);
     assert(get_be24_signed(d) == 8355453);
     assert(get_be32_signed(d) == 2138996092);
+    assert(get_be64_signed(d) == ACC_INT64_C(9186918263483431288));
     }
 #endif
 }
@@ -1451,7 +1478,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
     set_term(stdout);
     do_files(i,argc,argv);
 
-#if 0 && (UPX_VERSION_HEX < 0x020000)
+#if 0 && (UPX_VERSION_HEX < 0x030000)
     {
         FILE *f = stdout;
         int fg = con_fg(f,FG_RED);

src/mem.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/mem.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/miniacc.h

@@ -2,6 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
+   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
    Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
@@ -37,7 +38,7 @@
 
 #ifndef __ACC_H_INCLUDED
 #define __ACC_H_INCLUDED 1
-#define ACC_VERSION     20060823L
+#define ACC_VERSION     20070112L
 #if defined(__CYGWIN32__) && !defined(__CYGWIN__)
 #  define __CYGWIN__ __CYGWIN32__
 #endif
@@ -1169,7 +1170,7 @@ extern "C" {
 #  define ACC_SIZEOF_LONG_LONG      8
 #elif (ACC_ARCH_I386 && (ACC_CC_INTELC && defined(__linux__)))
 #  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_ARCH_I386 && (ACC_CC_MWERKS || ACC_CC_PELLESC || ACC_CC_PGI))
+#elif (ACC_ARCH_I386 && (ACC_CC_MWERKS || ACC_CC_PELLESC || ACC_CC_PGI || ACC_CC_SUNPROC))
 #  define ACC_SIZEOF_LONG_LONG      8
 #elif (ACC_ARCH_I386 && (ACC_CC_INTELC || ACC_CC_MSC))
 #  define ACC_SIZEOF___INT64        8
@@ -1634,6 +1635,15 @@ extern "C" {
 #    define ACC_UNUSED_LABEL(l)     switch(0) case 1:goto l
 #  endif
 #endif
+#if !defined(ACC_DEFINE_UNINITIALIZED_VAR)
+#  if 0
+#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var
+#  elif 0 && (ACC_CC_GNUC)
+#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = var
+#  else
+#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = init
+#  endif
+#endif
 #if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
 #  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
 #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
@@ -2745,6 +2755,9 @@ __acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
 #if !defined(acc_signo_t)
 #  define acc_signo_t           int
 #endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
 #if (ACC_BROKEN_CDECL_ALT_SYNTAX)
 typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t);
 #elif defined(RETSIGTYPE)
@@ -2752,6 +2765,9 @@ typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #else
 typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #endif
+#if defined(__cplusplus)
+}
+#endif
 #  if defined(ACC_CFG_NO_ACC_UA_H)
 #  else
 #if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020700ul))
@@ -3164,6 +3180,9 @@ __acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
 #if !defined(acc_signo_t)
 #  define acc_signo_t           int
 #endif
+#if defined(__cplusplus)
+extern "C" {
+#endif
 #if (ACC_BROKEN_CDECL_ALT_SYNTAX)
 typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t);
 #elif defined(RETSIGTYPE)
@@ -3171,6 +3190,9 @@ typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #else
 typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #endif
+#if defined(__cplusplus)
+}
+#endif
 #  if !defined(ACC_CFG_NO_ACC_UA_H)
 #if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020700ul))
 #elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020800ul)) && defined(__cplusplus)
@@ -3968,32 +3990,42 @@ ACCLIB_EXTERN(void, acc_uclock_read) (acc_uclock_handle_p, acc_uclock_p);
 ACCLIB_EXTERN(double, acc_uclock_get_elapsed) (acc_uclock_handle_p, const acc_uclock_p, const acc_uclock_p);
 #endif
 ACCLIB_EXTERN(int, acc_uclock_flush_cpu_cache) (acc_uclock_handle_p, unsigned);
-typedef struct {
+struct acc_getopt_t;
+typedef struct acc_getopt_t acc_getopt_t;
+#ifndef acc_getopt_p
+#define acc_getopt_p acc_getopt_t *
+#endif
+struct acc_getopt_longopt_t;
+typedef struct acc_getopt_longopt_t acc_getopt_longopt_t;
+#ifndef acc_getopt_longopt_p
+#define acc_getopt_longopt_p acc_getopt_longopt_t *
+#endif
+struct acc_getopt_longopt_t {
     const char* name;
     int has_arg;
     int* flag;
     int val;
-} acc_getopt_longopt_t;
+};
-#ifndef acc_getopt_longopt_p
+struct acc_getopt_t {
-#define acc_getopt_longopt_p acc_getopt_longopt_t *
+    void *user;
-#endif
+    char *optarg;
-typedef struct {
+    void (*opterr)(acc_getopt_p, const char*, void *);
-    int go_argc;
+    int optind;
-    char** go_argv;
+    int optopt;
-    const char* go_shortopts;
+    int errcount;
-    const acc_getopt_longopt_p longopts;
+    const char* progname;
-#if (ACC_BROKEN_CDECL_ALT_SYNTAX)
+    int argc; char** argv;
-    int __acc_cdecl_va (*go_error)(const char *, ...);
+    int eof; int shortpos;
-#else
+    int pending_rotate_first, pending_rotate_middle;
-    int (__acc_cdecl_va *go_error)(const char *, ...);
+};
-#endif
+enum { ACC_GETOPT_NO_ARG, ACC_GETOPT_REQUIRED_ARG, ACC_GETOPT_OPTIONAL_ARG, ACC_GETOPT_EXACT_ARG = 0x10 };
-} acc_getopt_t;
+enum { ACC_GETOPT_PERMUTE, ACC_GETOPT_RETURN_IN_ORDER, ACC_GETOPT_REQUIRE_ORDER };
-#ifndef acc_getopt_p
+ACCLIB_EXTERN(void, acc_getopt_init) (acc_getopt_p g,
-#define acc_getopt_p acc_getopt_t *
+                                      int start_argc, int argc, char** argv);
-#endif
+ACCLIB_EXTERN(int, acc_getopt) (acc_getopt_p g,
-ACCLIB_EXTERN(void, acc_getopt_init) (acc_getopt_p);
+                                const char* shortopts,
-ACCLIB_EXTERN(int, acc_getopt) (acc_getopt_p);
+                                const acc_getopt_longopt_p longopts,
-ACCLIB_EXTERN(void, acc_getopt_close)(acc_getopt_p);
+                                int* longind);
 typedef struct {
     acc_uint32l_t seed;
 } acc_rand31_t;
@@ -5245,6 +5277,213 @@ ACCLIB_PUBLIC(int, acc_dos_free) (void __far* p)
 }
 #endif
 #endif
+#if defined(ACC_WANT_ACCLIB_GETOPT)
+#  undef ACC_WANT_ACCLIB_GETOPT
+#define __ACCLIB_GETOPT_CH_INCLUDED 1
+#if !defined(ACCLIB_PUBLIC)
+#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
+#endif
+ACCLIB_PUBLIC(void, acc_getopt_init) (acc_getopt_p g,
+                                      int start_argc, int argc, char** argv)
+{
+    memset(g, 0, sizeof(*g));
+    g->argc = argc;
+    g->argv = argv;
+    g->pending_rotate_first = g->pending_rotate_middle = g->optind = start_argc;
+}
+static int __ACCLIB_FUNCNAME(acc_getopt_rotate) (char **p, int first, int middle, int last)
+{
+    char** a; char** b;
+    if (first >= middle || middle >= last) return 0;
+    for (a = p + first, b = p + middle - 1; a < b; ++a, --b) {
+        char* t = *a; *a = *b; *b = t;
+    }
+    for (a = p + middle, b = p + last - 1; a < b; ++a, --b) {
+        char* t = *a; *a = *b; *b = t;
+    }
+    for (a = p + first, b = p + last - 1; a < b; ++a, --b) {
+        char* t = *a; *a = *b; *b = t;
+    }
+    return middle - first;
+}
+static int __acc_getopt_x(acc_getopt_p g, int ret, int oo, int flags, const char *f, ...)
+{
+    if (oo >= 0)
+        g->optopt = oo;
+    if (flags & 1)
+    {
+        if (g->shortpos == 0)
+            g->optind++;
+        else if (!g->argv[g->optind][++g->shortpos])
+            g->optind++, g->shortpos = 0;
+    }
+    if (f == NULL)
+        return ret;
+    if (g->opterr)
+    {
+#if !defined(HAVE_STDARG_H)
+        g->opterr(g, f, NULL);
+#else
+        va_list ap;
+        va_start(ap, f);
+        g->opterr(g, f, &ap);
+        va_end(ap);
+#endif
+    }
+    g->errcount++;
+    return ret;
+}
+ACCLIB_PUBLIC(int, acc_getopt) (acc_getopt_p g,
+                                const char* shortopts,
+                                const acc_getopt_longopt_p longopts,
+                                int* longind)
+{
+    int ordering = ACC_GETOPT_PERMUTE;
+    char *a;
+    int has_arg = 0;
+    char *arg;
+    unsigned char sc;
+    int i;
+    if (shortopts && (*shortopts == '-' || *shortopts == '+'))
+        ordering = *shortopts++ == '-' ? ACC_GETOPT_RETURN_IN_ORDER : ACC_GETOPT_REQUIRE_ORDER;
+    g->optarg = NULL;
+    g->optopt = '?';
+    if (longind != NULL)
+        *longind = -1;
+    if (g->eof || g->optind >= g->argc || g->argv == NULL)
+        goto acc_label_eof;
+    if (g->shortpos)
+        goto acc_label_next_shortopt;
+    g->optind -= __ACCLIB_FUNCNAME(acc_getopt_rotate)(g->argv, g->pending_rotate_first, g->pending_rotate_middle, g->optind);
+    g->pending_rotate_first = g->pending_rotate_middle = g->optind;
+    if (ordering == ACC_GETOPT_PERMUTE)
+    {
+        while (g->optind < g->argc && !(g->argv[g->optind][0] == '-' && g->argv[g->optind][1]))
+            g->optind++;
+        g->pending_rotate_middle = g->optind;
+    }
+    if (g->optind >= g->argc)
+    {
+        g->optind = g->pending_rotate_first;
+    acc_label_eof:
+        g->optind -= __ACCLIB_FUNCNAME(acc_getopt_rotate)(g->argv, g->pending_rotate_first, g->pending_rotate_middle, g->optind);
+        g->pending_rotate_first = g->pending_rotate_middle = g->optind;
+        g->eof = 1;
+        return -1;
+    }
+    a = g->argv[g->optind];
+    if (strcmp(a, "--") == 0)
+    {
+        g->optind++;
+        goto acc_label_eof;
+    }
+    if (!(a[0] == '-' && a[1]))
+    {
+        if (ordering == ACC_GETOPT_REQUIRE_ORDER)
+            goto acc_label_eof;
+        if (ordering == ACC_GETOPT_RETURN_IN_ORDER)
+        {
+            g->optarg = a;
+            g->optind++;
+            return 1;
+        }
+        __acc_getopt_x(g, -1, -1, 0, "invalid ordering %d", ordering);
+        goto acc_label_eof;
+    }
+    if (a[1] == '-')
+    {
+        const acc_getopt_longopt_p lo = NULL;
+        size_t match_chars;
+        for (arg = a + 2; *arg && *arg != '=' && *arg != '#'; )
+            ++arg;
+        match_chars = (size_t) (arg - (a + 2));
+        for (i = 0; longopts && longopts[i].name; ++i)
+        {
+            size_t n = match_chars;
+            size_t l = strlen(longopts[i].name);
+            if (longopts[i].has_arg & ACC_GETOPT_EXACT_ARG) n = l;
+            if (strncmp(a, longopts[i].name, n) != 0)
+                continue;
+            if (match_chars == l)
+            {
+                lo = &longopts[i];
+                break;
+            }
+            else if (lo == NULL)
+                lo = &longopts[i];
+            else
+                return __acc_getopt_x(g, '?', 0, 1, "option '%s' is ambiguous (could be '--%s' or '--%s')",
+                                      a, lo->name, longopts[i].name);
+        }
+        if (lo == NULL)
+            return __acc_getopt_x(g, '?', 0, 1, "unrecognized option '%s'", a);
+        switch (lo->has_arg & 0x2f)
+        {
+        case ACC_GETOPT_OPTIONAL_ARG:
+            break;
+        case ACC_GETOPT_REQUIRED_ARG:
+            if (*arg)
+                g->optarg = arg + 1;
+            else if (g->optind + 1 < g->argc)
+                g->optarg = g->argv[++g->optind];
+            else
+                return __acc_getopt_x(g, '?', 0, 1, "option '%s' requires an argument", lo->name);
+            g->optind++;
+            break;
+        case ACC_GETOPT_REQUIRED_ARG | 0x20:
+            break;
+        default:
+            if (*arg)
+                return __acc_getopt_x(g, '?', lo->val, 1, "option '%s' doesn't allow an argument", lo->name);
+            g->optind++;
+            break;
+        }
+        if (longind != NULL)
+            *longind = (int) (lo - longopts);
+        if (lo->flag != NULL)
+        {
+            *lo->flag = lo->val;
+            return 0;
+        }
+        return lo->val;
+    }
+    else
+    {
+        const char *sp;
+        g->shortpos = 1;
+    acc_label_next_shortopt:
+        a = g->argv[g->optind] + g->shortpos;
+        sp = NULL; sc = (unsigned char) *a;
+        if (shortopts)
+            sp = strchr(shortopts, sc);
+        if (!sp)
+            return __acc_getopt_x(g, '?', sc, 1, "invalid option '-%c'", sc);
+        if (sp[1] == ':') { has_arg++; if (sp[2] == ':') has_arg++; }
+        arg = a + 1;
+        switch (has_arg)
+        {
+        case ACC_GETOPT_OPTIONAL_ARG:
+            if (*arg)
+                g->optarg = arg + 1;
+            g->optind++, g->shortpos = 0;
+            break;
+        case ACC_GETOPT_REQUIRED_ARG:
+            if (*arg)
+                g->optarg = arg + 1;
+            else if (g->optind + 1 < g->argc)
+                g->optarg = g->argv[++g->optind];
+            else
+                return __acc_getopt_x(g, '?', 0, 1, "option '-%c' requires an argument", sc);
+            g->optind++, g->shortpos = 0;
+            break;
+        default:
+            __acc_getopt_x(g, 0, -1, 1, NULL);
+            break;
+        }
+        return sc;
+    }
+}
+#endif
 #if defined(ACC_WANT_ACCLIB_HALLOC)
 #  undef ACC_WANT_ACCLIB_HALLOC
 #define __ACCLIB_HALLOC_CH_INCLUDED 1
@@ -6161,7 +6400,7 @@ ACCLIB_PUBLIC(acclib_handle_t, acc_get_osfhandle) (int fd)
 }
 ACCLIB_PUBLIC(int, acc_set_binmode) (int fd, int binary)
 {
-#if (ACC_ARCH_M68K && ACC_OS_TOS && defined(__MINT__))
+#if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
     FILE* fp; int old_binary;
     if (fd == STDIN_FILENO) fp = stdin;
     else if (fd == STDOUT_FILENO) fp = stdout;

src/msg.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/options.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -49,6 +49,7 @@ struct options_t {
     int method;
     int level;              // compression level 1..10
     int filter;             // preferred filter from Packer::getFilters()
+    bool ultra_brute;
     bool all_methods;       // try all available compression methods ?
     bool all_methods_use_lzma;
     bool all_filters;       // try all available filters ?

src/p_armpe.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -115,26 +115,25 @@ PackArmPe::~PackArmPe()
 
 const int *PackArmPe::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2E_8, M_LZMA, M_END };
+    static const int m_all[]   = { M_NRV2B_8, M_NRV2E_8, M_LZMA, M_END };
-    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_LZMA, M_END };
     static const int m_lzma[]  = { M_LZMA, M_END };
+    static const int m_nrv2b[] = { M_NRV2B_8, M_END };
+    static const int m_nrv2e[] = { M_NRV2E_8, M_END };
 
     if (!use_thumb_stub)
         return getDefaultCompressionMethods_8(method, level);
 
-    if (M_IS_NRV2B(method))
+    if (method == M_ALL)    return m_all;
-        return m_nrv2b;
+    if (M_IS_LZMA(method))  return m_lzma;
-    if (M_IS_NRV2E(method))
+    if (M_IS_NRV2B(method)) return m_nrv2b;
-        return m_nrv2e;
+    if (M_IS_NRV2E(method)) return m_nrv2e;
-    if (M_IS_LZMA(method))
-        return m_lzma;
     return m_nrv2e;
 }
 
 
 const int *PackArmPe::getFilters() const
 {
-    static const int filters[] = { 0x50, -1 };
+    static const int filters[] = { 0x50, FT_END };
     return filters;
 }
 
@@ -292,7 +291,7 @@ unsigned PackArmPe::processImports() // pass 1
 
     unsigned k32namepos = ptr_diff(dllnames,oimpdlls);
 
-    memcpy(importednames, llgpa, ALIGN_UP(sizeof(llgpa), 2));
+    memcpy(importednames, llgpa, ALIGN_UP((unsigned) sizeof(llgpa), 2u));
     strcpy(dllnames,kernel32dll);
     im->dllname = k32namepos;
     im->iat = ptr_diff(ordinals,oimpdlls);
@@ -440,7 +439,7 @@ unsigned PackArmPe::processImports() // pass 1
 
 void PackArmPe::processTls(Interval *) // pass 1
 {
-    if ((sotls = ALIGN_UP(IDSIZE(PEDIR_TLS),4)) == 0)
+    if ((sotls = ALIGN_UP(IDSIZE(PEDIR_TLS),4u)) == 0)
         return;
 
     // never should happen on wince
@@ -555,7 +554,7 @@ void PackArmPe::pack(OutputFile *fo)
     if (ih.entry && ih.entry < rvamin)
         throwCantPack("run a virus scanner on this file!");
     if (!opt->force && ih.subsystem == 1)
-        throwCantPack("subsystem `native' is not supported (try --force)");
+        throwCantPack("subsystem 'native' is not supported (try --force)");
     if (ih.filealign < 0x200)
         throwCantPack("filealign < 0x200 is not yet supported");
 
@@ -698,20 +697,20 @@ void PackArmPe::pack(OutputFile *fo)
     ft.buf_len = ih.codesize;
     ft.addvalue = ih.codebase - rvamin;
     // compress
-    int strategy = allow_filter ? 0 : -3;
+    int filter_strategy = allow_filter ? 0 : -3;
 
     // disable filters for files with broken headers
     if (ih.codebase + ih.codesize > ph.u_len)
     {
         ft.buf_len = 1;
-        strategy = -3;
+        filter_strategy = -3;
     }
 
     // limit stack size needed for runtime decompression
     upx_compress_config_t cconf; cconf.reset();
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, 2048, strategy,
+    compressWithFilters(&ft, 2048, &cconf, filter_strategy,
-                        NULL, &cconf, ih.codebase, rvamin);
+                        ih.codebase, rvamin, 0, NULL, 0);
 // info: see buildLoader()
     newvsize = (ph.u_len + rvamin + ph.overlap_overhead + oam1) &~ oam1;
     /*
@@ -746,7 +745,7 @@ void PackArmPe::pack(OutputFile *fo)
     const unsigned c_len = ((ph.c_len + ic) & 15) == 0 ? ph.c_len : ph.c_len + 16 - ((ph.c_len + ic) & 15);
     obuf.clear(ph.c_len, c_len - ph.c_len);
 
-    const unsigned s1size = ALIGN_UP(ic + c_len + codesize,4) + sotls;
+    const unsigned s1size = ALIGN_UP(ic + c_len + codesize,4u) + sotls;
     const unsigned s1addr = (newvsize - (ic + c_len) + oam1) &~ oam1;
 
     const unsigned ncsection = (s1addr + s1size + oam1) &~ oam1;
@@ -1028,7 +1027,8 @@ int PackArmPe::canUnpack()
 
 void PackArmPe::rebuildImports(upx_byte *& extrainfo)
 {
-    if (ODADDR(PEDIR_IMPORT) == 0)
+    if (ODADDR(PEDIR_IMPORT) == 0
+        || ODSIZE(PEDIR_IMPORT) <= sizeof(import_desc))
         return;
 
 //    const upx_byte * const idata = obuf + get_le32(extrainfo);
@@ -1046,6 +1046,7 @@ void PackArmPe::rebuildImports(upx_byte *& extrainfo)
     for (p = idata; get_le32(p) != 0; ++p)
     {
         const upx_byte *dname = get_le32(p) + import;
+        ICHECK(dname, 1);
         const unsigned dlen = strlen(dname);
         ICHECK(dname, dlen + 1);
 
@@ -1058,7 +1059,7 @@ void PackArmPe::rebuildImports(upx_byte *& extrainfo)
             else
                 p += 5;
     }
-    sdllnames = ALIGN_UP(sdllnames,2);
+    sdllnames = ALIGN_UP(sdllnames,2u);
 
     upx_byte * const Obuf = obuf - rvamin;
     import_desc * const im0 = (import_desc*) (Obuf + ODADDR(PEDIR_IMPORT));
@@ -1071,6 +1072,7 @@ void PackArmPe::rebuildImports(upx_byte *& extrainfo)
     {
         // restore the name of the dll
         const upx_byte *dname = get_le32(p) + import;
+        ICHECK(dname, 1);
         const unsigned dlen = strlen(dname);
         ICHECK(dname, dlen + 1);
 

src/p_armpe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual ~PackArmPe();
     virtual int getFormat() const { return UPX_F_WINCE_ARM_PE; }
     virtual const char *getName() const { return "arm/pe"; }
+    virtual const char *getFullName(const options_t *) const { return "arm-wince.pe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_com.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -45,16 +45,11 @@ static const
 
 const int *PackCom::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE16, -1 };
+    static const int m_nrv2b[] = { M_NRV2B_LE16, M_END };
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
 #if 0
-    // NOT IMPLEMENTED
+    static const int m_nrv2d[] = { M_NRV2D_LE16, M_END };
-    static const int m_nrv2d[] = { M_NRV2D_LE16, -1 };
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
 #endif
-    UNUSED(level);
+    UNUSED(method); UNUSED(level);
     return m_nrv2b;
 }
 
@@ -63,7 +58,7 @@ const int *PackCom::getFilters() const
 {
     static const int filters[] = {
         0x06, 0x03, 0x04, 0x01, 0x05, 0x02,
-    -1 };
+    FT_END };
     return filters;
 }
 
@@ -202,7 +197,7 @@ void PackCom::pack(OutputFile *fo)
     ft.addvalue = getCallTrickOffset();
     // compress
     const unsigned overlap_range = ph.u_len < 0xFE00 - ft.addvalue ? 32 : 0;
-    compressWithFilters(&ft, overlap_range);
+    compressWithFilters(&ft, overlap_range, NULL_cconf);
 
     const int lsize = getLoaderSize();
     MemBuffer loader(lsize);

src/p_com.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_COM; }
     virtual const char *getName() const { return "dos/com"; }
+    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_djgpp2.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -47,11 +47,11 @@ PackDjgpp2::PackDjgpp2(InputFile *f) :
     super(f), coff_offset(0)
 {
     bele = &N_BELE_RTP::le_policy;
-    COMPILE_TIME_ASSERT(sizeof(external_scnhdr_t) == 40);
+    COMPILE_TIME_ASSERT(sizeof(external_scnhdr_t) == 40)
-    COMPILE_TIME_ASSERT(sizeof(coff_header_t) == 0xa8);
+    COMPILE_TIME_ASSERT(sizeof(coff_header_t) == 0xa8)
-    COMPILE_TIME_ASSERT_ALIGNOF(external_scnhdr_t, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(external_scnhdr_t)
-    COMPILE_TIME_ASSERT_ALIGNOF(coff_header_t, char)
+    COMPILE_TIME_ASSERT_ALIGNED1(coff_header_t)
-    COMPILE_TIME_ASSERT(sizeof(stub_i386_dos32_djgpp2_stubify) == 2048);
+    COMPILE_TIME_ASSERT(sizeof(stub_i386_dos32_djgpp2_stubify) == 2048)
     COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_ADLER32 == 0xbf689ba8)
     COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_CRC32   == 0x2ae982b2)
     //printf("0x%08x\n", upx_adler32(stubify_stub, sizeof(stubify_stub)));
@@ -68,8 +68,9 @@ const int *PackDjgpp2::getCompressionMethods(int method, int level) const
 const int *PackDjgpp2::getFilters() const
 {
     static const int filters[] = {
-        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x15, 0x12,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-    -1 };
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
+    FT_END };
     return filters;
 }
 
@@ -96,10 +97,10 @@ void PackDjgpp2::buildLoader(const Filter *ft)
     initLoader(stub_i386_dos32_djgpp2, sizeof(stub_i386_dos32_djgpp2));
     addLoader("IDENTSTR,DJ2MAIN1",
               ft->id ? "DJCALLT1" : "",
-              "DJ2MAIN2",
+              ph.first_offset_found == 1 ? "DJ2MAIN2" : "",
-              ph.method == M_LZMA ? "LZMA_INIT_STACK" : "",
+              M_IS_LZMA(ph.method) ? "LZMA_INIT_STACK" : "",
               getDecompressorSections(),
-              ph.method == M_LZMA ? "LZMA_DONE_STACK" : "",
+              M_IS_LZMA(ph.method) ? "LZMA_DONE_STACK" : "",
               "DJ2BSS00",
               NULL
              );
@@ -234,29 +235,6 @@ void PackDjgpp2::stripDebug()
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-
-#if 0
-    if (0x80==(ft->id & 0xF0)) {
-        int const mru = ph.n_mru ? 1+ ph.n_mru : 0;
-        if (mru && mru!=256) {
-            unsigned const is_pwr2 = (0==((mru -1) & mru));
-            //patch_le32(0x80 + (char *)loader, lsize - 0x80, "NMRU", mru - is_pwr2);
-        }
-    }
-#endif
-    return true;
-}
-
 /*************************************************************************
 //
 **************************************************************************/
@@ -325,7 +303,7 @@ void PackDjgpp2::pack(OutputFile *fo)
     upx_compress_config_t cconf; cconf.reset();
     // limit stack size needed for runtime decompression
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, 512, 0, NULL, &cconf);
+    compressWithFilters(&ft, 512, &cconf);
 
     // patch coff header #2
     const unsigned lsize = getLoaderSize();
@@ -334,7 +312,7 @@ void PackDjgpp2::pack(OutputFile *fo)
     data->size = ph.c_len;                // new size of .data
 
     unsigned stack = 1024 + ph.overlap_overhead + getDecompressorWrkmemSize();
-    stack = ALIGN_UP(stack, 16);
+    stack = ALIGN_UP(stack, 16u);
     if (bss->size < stack)  // give it a .bss
         bss->size = stack;
 
@@ -350,7 +328,7 @@ void PackDjgpp2::pack(OutputFile *fo)
     linker->defineSymbol("stack_for_lzma", bss->vaddr + bss->size);
     linker->defineSymbol("start_of_uncompressed", text->vaddr - hdrsize);
     linker->defineSymbol("start_of_compressed", data->vaddr);
-    defineFilterSymbols(linker, &ft);
+    defineFilterSymbols(&ft);
 
     // we should not overwrite our decompressor during unpacking
     // the original coff header (which is put just before the

src/p_djgpp2.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -43,6 +43,7 @@ public:
     virtual int getVersion() const { return 14; }
     virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
     virtual const char *getName() const { return "djgpp2/coff"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_elf.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -31,15 +31,34 @@
 
 
 /*************************************************************************
-// Some ELF type definitinons
+// N_Elf
 **************************************************************************/
 
 namespace N_Elf {
 
+// integral types
+template <class THalf, class TWord, class TXword, class TAddr, class TOff>
+struct ElfITypes
+{
+    typedef THalf   Half;
+    typedef TWord   Word;
+    typedef TXword  Xword;
+    typedef TAddr   Addr;
+    typedef TOff    Off;
+    typedef THalf   Section;
+    typedef THalf   Versym;
+};
+
+
 // The ELF file header. This appears at the start of every ELF file.
-template <class Word, class Addr, class Off, class Half>
+template <class TElfITypes>
 struct Ehdr
 {
+    typedef typename TElfITypes::Half    Half;
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     unsigned char e_ident[16];  /* Magic number and other info */
     Half e_type;                /* Object file type */
     Half e_machine;             /* Architecture */
@@ -55,76 +74,57 @@ struct Ehdr
     Half e_shnum;               /* Section header table entry count */
     Half e_shstrndx;            /* Section header string table index */
 
-    enum { // e_ident[]
+#   define WANT_EHDR_ENUM 1
-        EI_CLASS      = 4,
+#   include "p_elf_enum.h"
-        EI_DATA       = 5,      /* Data encoding */
-        EI_VERSION    = 6,
-        EI_OSABI      = 7,
-        EI_ABIVERSION = 8,
-    };
-    enum { // e_ident[EI_CLASS]
-        ELFCLASS32 = 1,         /* 32-bit objects */
-        ELFCLASS64 = 2,         /* 64-bit objects */
-    };
-    enum { // e_ident[EI_DATA]
-        ELFDATA2LSB = 1,        /* 2's complement, little endian */
-        ELFDATA2MSB = 2         /* 2's complement, big endian */
-    };
-    enum { // e_ident[EI_OSABI]
-        ELFOSABI_NONE = 0,
-        ELFOSABI_NETBSD = 2,
-        ELFOSABI_LINUX = 3,
-        ELFOSABI_FREEBSD = 9,
-        ELFOSABI_OPENBSD = 12,
-        ELFOSABI_ARM = 97
-    };
-    enum { // e_type
-        ET_NONE = 0,            /* No file type */
-        ET_REL  = 1,            /* Relocatable file */
-        ET_EXEC = 2,            /* Executable file */
-        ET_DYN  = 3,            /* Shared object file */
-        ET_CORE = 4,            /* Core file */
-    };
-    enum { // e_machine
-        EM_386    = 3,
-        EM_PPC    = 20,
-        EM_PPC64  = 21,
-        EM_ARM    = 40,
-        EM_X86_64 = 62,
-    };
-    enum { // e_version
-        EV_CURRENT = 1,
-    };
 }
 __attribute_packed;
 
 
-template <class Word, class Addr>
+template <class TElfITypes>
 struct Dyn
 {
-    Word d_tag;
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+
+    Xword d_tag;
     Addr d_val;
 
-    enum { // d_tag
+#   define WANT_DYN_ENUM 1
-        DT_NULL     =  0,       /* End flag */
+#   include "p_elf_enum.h"
-        DT_NEEDED   =  1,       /* Name of needed library */
-        DT_HASH     =  4,       /* Hash table of symbol names */
-        DT_STRTAB   =  5,       /* String table */
-        DT_SYMTAB   =  6,       /* Symbol table */
-        DT_STRSZ    = 10,       /* Sizeof string table */
-    };
 }
 __attribute_packed;
 
+
+template <class TElfITypes>
+struct External_Note
+{
+    typedef typename TElfITypes::Word   Word;
+
+    Word xn_namesz;  // includes terminating '\0'
+    Word xn_datasz;
+    Word xn_type;
+    //char xn_name[N];  // terminate with '\0'
+    //char xn_data[M];  // aligned to 0 mod 4
+}
+__attribute_packed;
+
+
 } // namespace N_Elf
 
 
+/*************************************************************************
+// N_Elf32
+**************************************************************************/
+
 namespace N_Elf32 {
 
-// Program segment header.
+template <class TElfITypes>
-template <class Word, class Addr, class Off>
 struct Phdr
 {
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word p_type;                /* Segment type */
     Off  p_offset;              /* Segment file offset */
     Addr p_vaddr;               /* Segment virtual address */
@@ -134,25 +134,19 @@ struct Phdr
     Word p_flags;               /* Segment flags */
     Word p_align;               /* Segment alignment */
 
-    enum { // p_type
+#   define WANT_PHDR_ENUM 1
-        PT_LOAD    = 1,         /* Loadable program segment */
+#   include "p_elf_enum.h"
-        PT_DYNAMIC = 2,         /* Dynamic linking information */
-        PT_INTERP  = 3,         /* Name of program interpreter */
-        PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
-        PT_PHDR    = 6,         /* Entry for header table itself */
-    };
-
-    enum { // p_flags
-        PF_X = 1,               /* Segment is executable */
-        PF_W = 2,               /* Segment is writable */
-        PF_R = 4,               /* Segment is readable */
-    };
 }
 __attribute_packed;
 
-template <class Word, class Addr, class Off>
+
+template <class TElfITypes>
 struct Shdr
 {
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word sh_name;               /* Section name (string tbl index) */
     Word sh_type;               /* Section type */
     Word sh_flags;              /* Section flags */
@@ -164,94 +158,53 @@ struct Shdr
     Word sh_addralign;          /* Section alignment */
     Word sh_entsize;            /* Entry size if section holds table */
 
-    enum { // sh_type
+#   define WANT_SHDR_ENUM 1
-        SHT_NULL = 0,           /* Section header table entry unused */
+#   include "p_elf_enum.h"
-        SHT_PROGBITS = 1,       /* Program data */
-        SHT_SYMTAB = 2,         /* Symbol table */
-        SHT_STRTAB = 3,         /* String table */
-        SHT_RELA = 4,           /* Relocation entries with addends */
-        SHT_HASH = 5,           /* Symbol hash table */
-        SHT_DYNAMIC = 6,        /* Dynamic linking information */
-        SHT_NOTE = 7,           /* Notes */
-        SHT_NOBITS = 8,         /* Program space with no data (bss) */
-        SHT_REL = 9,            /* Relocation entries, no addends */
-        SHT_SHLIB = 10,         /* Reserved */
-        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
-            /* 12, 13  hole */
-        SHT_INIT_ARRAY = 14,    /* Array of constructors */
-        SHT_FINI_ARRAY = 15,    /* Array of destructors */
-        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
-        SHT_GROUP = 17,         /* Section group */
-        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
-        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
-    };
-
-    enum { // sh_flags
-        SHF_WRITE      = (1 << 0),  /* Writable */
-        SHF_ALLOC      = (1 << 1),  /* Occupies memory during execution */
-        SHF_EXECINSTR  = (1 << 2),  /* Executable */
-        SHF_MERGE      = (1 << 4),  /* Might be merged */
-        SHF_STRINGS    = (1 << 5),  /* Contains nul-terminated strings */
-        SHF_INFO_LINK  = (1 << 6),  /* `sh_info' contains SHT index */
-        SHF_LINK_ORDER = (1 << 7),  /* Preserve order after combining */
-    };
 }
 __attribute_packed;
 
-template <class TT16, class TT32>
+
+template <class TElfITypes>
 struct Sym
 {
-    TT32 st_name;               /* symbol name (index into string table) */
+    typedef typename TElfITypes::Word    Word;
-    TT32 st_value;              /* symbol value */
+    typedef typename TElfITypes::Addr    Addr;
-    TT32 st_size;               /* symbol size */
+    typedef typename TElfITypes::Section Section;
+
+    Word st_name;               /* symbol name (index into string table) */
+    Addr st_value;              /* symbol value */
+    Word st_size;               /* symbol size */
     unsigned char st_info;      /* symbol type and binding */
     unsigned char st_other;     /* symbol visibility */
-    TT16 st_shndx;              /* section index */
+    Section st_shndx;           /* section index */
 
-    unsigned int st_bind(unsigned int x) const { return 0xf & (x>>4); }
+#   define WANT_SYM_ENUM 1
-    unsigned int st_type(unsigned int x) const { return 0xf &  x    ; }
+#   include "p_elf_enum.h"
-    unsigned char St_info(unsigned bind, unsigned type) const { return (bind<<4) + (0xf & type); }
 
-    enum { // st_bind (high 4 bits of st_info)
+    static unsigned int  get_st_bind(unsigned x) { return 0xf & (x>>4); }
-        STB_LOCAL   =   0,      /* Local symbol */
+    static unsigned int  get_st_type(unsigned x) { return 0xf &  x    ; }
-        STB_GLOBAL  =   1,      /* Global symbol */
+    static unsigned char make_st_info(unsigned bind, unsigned type) { return (bind<<4) + (0xf & type); }
-        STB_WEAK    =   2,      /* Weak symbol */
-    };
-
-    enum { // st_type (low 4 bits of st_info)
-        STT_NOTYPE  =   0,      /* Symbol type is unspecified */
-        STT_OBJECT  =   1,      /* Symbol is a data object */
-        STT_FUNC    =   2,      /* Symbol is a code object */
-        STT_SECTION =   3,      /* Symbol associated with a section */
-        STT_FILE    =   4,      /* Symbol's name is file name */
-        STT_COMMON  =   5,      /* Symbol is a common data object */
-        STT_TLS     =   6,      /* Symbol is thread-local data object*/
-    };
-
-    enum { // st_other (visibility)
-        STV_DEFAULT  =  0,      /* Default symbol visibility rules */
-        STV_INTERNAL =  1,      /* Processor specific hidden class */
-        STV_HIDDEN   =  2,      /* Sym unavailable in other modules */
-        STV_PROTECTED=  3,      /* Not preemptible, not exported */
-    };
-
-    enum { // st_shndx
-        SHN_UNDEF   =   0,      /* Undefined section */
-        SHN_ABS     =   0xfff1, /* Associated symbol is absolute */
-        SHN_COMMON  =   0xfff2, /* Associated symbol is common */
-    };
 }
 __attribute_packed;
 
+
 } // namespace N_Elf32
 
 
+/*************************************************************************
+// N_Elf64
+**************************************************************************/
+
 namespace N_Elf64 {
 
-// Program segment header.
+template <class TElfITypes>
-template <class Word, class Xword, class Addr, class Off>
 struct Phdr
 {
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word  p_type;               /* Segment type */
     Word  p_flags;              /* Segment flags */
     Off   p_offset;             /* Segment file offset */
@@ -261,24 +214,20 @@ struct Phdr
     Xword p_memsz;              /* Segment size in memory */
     Xword p_align;              /* Segment alignment */
 
-    enum { // p_type
+#   define WANT_PHDR_ENUM 1
-        PT_LOAD    = 1,         /* Loadable program segment */
+#   include "p_elf_enum.h"
-        PT_DYNAMIC = 2,         /* Dynamic linking information */
-        PT_INTERP  = 3,         /* Name of program interpreter */
-        PT_PHDR    = 6,         /* Entry for header table itself */
-    };
-
-    enum { // p_flags
-        PF_X = 1,               /* Segment is executable */
-        PF_W = 2,               /* Segment is writable */
-        PF_R = 4,               /* Segment is readable */
-    };
 }
 __attribute_packed;
 
-template <class Word, class Xword, class Addr, class Off>
+
+template <class TElfITypes>
 struct Shdr
 {
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Off     Off;
+
     Word  sh_name;              /* Section name (string tbl index) */
     Word  sh_type;              /* Section type */
     Xword sh_flags;             /* Section flags */
@@ -290,115 +239,172 @@ struct Shdr
     Xword sh_addralign;         /* Section alignment */
     Xword sh_entsize;           /* Entry size if section holds table */
 
-    enum { // sh_type
+#   define WANT_SHDR_ENUM 1
-        SHT_NULL = 0,           /* Section header table entry unused */
+#   include "p_elf_enum.h"
-        SHT_PROGBITS = 1,       /* Program data */
-        SHT_SYMTAB = 2,         /* Symbol table */
-        SHT_STRTAB = 3,         /* String table */
-        SHT_RELA = 4,           /* Relocation entries with addends */
-        SHT_HASH = 5,           /* Symbol hash table */
-        SHT_DYNAMIC = 6,        /* Dynamic linking information */
-        SHT_NOTE = 7,           /* Notes */
-        SHT_NOBITS = 8,         /* Program space with no data (bss) */
-        SHT_REL = 9,            /* Relocation entries, no addends */
-        SHT_SHLIB = 10,         /* Reserved */
-        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
-            /* 12, 13  hole */
-        SHT_INIT_ARRAY = 14,    /* Array of constructors */
-        SHT_FINI_ARRAY = 15,    /* Array of destructors */
-        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
-        SHT_GROUP = 17,         /* Section group */
-        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
-        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
-    };
 }
 __attribute_packed;
 
+
+template <class TElfITypes>
+struct Sym
+{
+    typedef typename TElfITypes::Word    Word;
+    typedef typename TElfITypes::Xword   Xword;
+    typedef typename TElfITypes::Addr    Addr;
+    typedef typename TElfITypes::Section Section;
+
+    Word st_name;               /* symbol name (index into string table) */
+    unsigned char st_info;      /* symbol type and binding */
+    unsigned char st_other;     /* symbol visibility */
+    Section st_shndx;           /* section index */
+    Addr st_value;              /* symbol value */
+    Xword st_size;              /* symbol size */
+
+#   define WANT_SYM_ENUM 1
+#   include "p_elf_enum.h"
+
+    static unsigned int  get_st_bind(unsigned x) { return 0xf & (x>>4); }
+    static unsigned int  get_st_type(unsigned x) { return 0xf &  x    ; }
+    static unsigned char make_st_info(unsigned bind, unsigned type) { return (bind<<4) + (0xf & type); }
+}
+__attribute_packed;
+
+
 } // namespace N_Elf64
 
 
 /*************************************************************************
-// now for the actual types
+// aggregate types into an ElfClass
 **************************************************************************/
 
-#define P N_BELE_CTP::HostPolicy
+namespace N_Elf {
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf32_Ehdr;
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf32_Phdr;
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf32_Shdr;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf32_Dyn;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf32_Sym;
-#undef P
 
-#define P N_BELE_CTP::BEPolicy
+template <class TP>
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_BE32_Ehdr;
+struct ElfClass_32
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_BE32_Phdr;
+{
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_BE32_Shdr;
+    typedef TP BeLePolicy;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_BE32_Dyn;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf_BE32_Sym;
-#undef P
 
-#define P N_BELE_CTP::LEPolicy
+    // integral types
-typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_LE32_Ehdr;
+    typedef typename TP::U16 U16;
-typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_LE32_Phdr;
+    typedef typename TP::U32 U32;
-typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_LE32_Shdr;
+    typedef typename TP::U64 U64;
-typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_LE32_Dyn;
+    typedef N_Elf::ElfITypes<U16, U32, U32, U32, U32> ElfITypes;
-typedef N_Elf32::Sym <P::U16,P::U32>               Elf_LE32_Sym;
-#undef P
 
-#define P N_BELE_CTP::HostPolicy
+    // ELF types
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf64_Ehdr;
+    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf64_Phdr;
+    typedef N_Elf32::Phdr<ElfITypes> Phdr;
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf64_Shdr;
+    typedef N_Elf32::Shdr<ElfITypes> Shdr;
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf64_Dyn;
+    typedef N_Elf  ::Dyn <ElfITypes> Dyn;
-#undef P
+    typedef N_Elf32::Sym <ElfITypes> Sym;
+    typedef N_Elf  ::External_Note<ElfITypes> External_Note;
 
-#define P N_BELE_CTP::BEPolicy
+    static void compileTimeAssertions() {
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_BE64_Ehdr;
+        BeLePolicy::compileTimeAssertions();
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Phdr;
+        COMPILE_TIME_ASSERT(sizeof(Ehdr) == 52)
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Shdr;
+        COMPILE_TIME_ASSERT(sizeof(Phdr) == 32)
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_BE64_Dyn;
+        COMPILE_TIME_ASSERT(sizeof(Shdr) == 40)
-#undef P
+        COMPILE_TIME_ASSERT(sizeof(Dyn)  ==  8)
-
+        COMPILE_TIME_ASSERT(sizeof(Sym)  == 16)
-#define P N_BELE_CTP::LEPolicy
+        COMPILE_TIME_ASSERT_ALIGNED1(Ehdr)
-typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_LE64_Ehdr;
+        COMPILE_TIME_ASSERT_ALIGNED1(Phdr)
-typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Phdr;
+        COMPILE_TIME_ASSERT_ALIGNED1(Shdr)
-typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Shdr;
+        COMPILE_TIME_ASSERT_ALIGNED1(Dyn)
-typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_LE64_Dyn;
+        COMPILE_TIME_ASSERT_ALIGNED1(Sym)
-#undef P
+    }
+};
 
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Ehdr)    == 52)
+template <class TP>
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Phdr)    == 32)
+struct ElfClass_64
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Shdr)    == 40)
+{
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Dyn)     ==  8)
+    typedef TP BeLePolicy;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Sym)     == 16)
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Ehdr) == 52)
+    // integral types
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Phdr) == 32)
+    typedef typename TP::U16 U16;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Shdr) == 40)
+    typedef typename TP::U32 U32;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Dyn)  ==  8)
+    typedef typename TP::U64 U64;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Sym)  == 16)
+    typedef N_Elf::ElfITypes<U16, U32, U64, U64, U64> ElfITypes;
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Ehdr) == 52)
+    // ELF types
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Phdr) == 32)
+    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Shdr) == 40)
+    typedef N_Elf64::Phdr<ElfITypes> Phdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Dyn)  ==  8)
+    typedef N_Elf64::Shdr<ElfITypes> Shdr;
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Sym)  == 16)
+    typedef N_Elf  ::Dyn <ElfITypes> Dyn;
+    typedef N_Elf64::Sym <ElfITypes> Sym;
+    typedef N_Elf  ::External_Note<ElfITypes> External_Note;
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Ehdr)    == 64)
+    static void compileTimeAssertions() {
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Phdr)    == 56)
+        BeLePolicy::compileTimeAssertions();
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Shdr)    == 64)
+        COMPILE_TIME_ASSERT(sizeof(Ehdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Dyn)     == 16)
+        COMPILE_TIME_ASSERT(sizeof(Phdr) == 56)
+        COMPILE_TIME_ASSERT(sizeof(Shdr) == 64)
+        COMPILE_TIME_ASSERT(sizeof(Dyn)  == 16)
+        COMPILE_TIME_ASSERT(sizeof(Sym)  == 24)
+        COMPILE_TIME_ASSERT_ALIGNED1(Ehdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Phdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Shdr)
+        COMPILE_TIME_ASSERT_ALIGNED1(Dyn)
+        COMPILE_TIME_ASSERT_ALIGNED1(Sym)
+    }
+};
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Ehdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Phdr) == 56)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Shdr) == 64)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Dyn)  == 16)
 
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Ehdr) == 64)
+} // namespace N_Elf
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Phdr) == 56)
+
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Shdr) == 64)
+
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Dyn)  == 16)
+typedef N_Elf::ElfClass_32<N_BELE_CTP::HostPolicy> ElfClass_Host32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::HostPolicy> ElfClass_Host64;
+typedef N_Elf::ElfClass_32<N_BELE_CTP::BEPolicy>   ElfClass_BE32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::BEPolicy>   ElfClass_BE64;
+typedef N_Elf::ElfClass_32<N_BELE_CTP::LEPolicy>   ElfClass_LE32;
+typedef N_Elf::ElfClass_64<N_BELE_CTP::LEPolicy>   ElfClass_LE64;
+
+
+/*************************************************************************
+// shortcuts
+**************************************************************************/
+
+typedef ElfClass_Host32::Ehdr Elf32_Ehdr;
+typedef ElfClass_Host32::Phdr Elf32_Phdr;
+typedef ElfClass_Host32::Shdr Elf32_Shdr;
+typedef ElfClass_Host32::Dyn  Elf32_Dyn;
+typedef ElfClass_Host32::Sym  Elf32_Sym;
+typedef ElfClass_Host32::External_Note  Elf32_External_Note;
+
+typedef ElfClass_Host64::Ehdr Elf64_Ehdr;
+typedef ElfClass_Host64::Phdr Elf64_Phdr;
+typedef ElfClass_Host64::Shdr Elf64_Shdr;
+typedef ElfClass_Host64::Dyn  Elf64_Dyn;
+typedef ElfClass_Host64::Sym  Elf64_Sym;
+typedef ElfClass_Host64::External_Note  Elf64_External_Note;
+
+typedef ElfClass_BE32::Ehdr   Elf_BE32_Ehdr;
+typedef ElfClass_BE32::Phdr   Elf_BE32_Phdr;
+typedef ElfClass_BE32::Shdr   Elf_BE32_Shdr;
+typedef ElfClass_BE32::Dyn    Elf_BE32_Dyn;
+typedef ElfClass_BE32::Sym    Elf_BE32_Sym;
+typedef ElfClass_BE32::External_Note    Elf_BE32_External_Note;
+
+typedef ElfClass_BE64::Ehdr   Elf_BE64_Ehdr;
+typedef ElfClass_BE64::Phdr   Elf_BE64_Phdr;
+typedef ElfClass_BE64::Shdr   Elf_BE64_Shdr;
+typedef ElfClass_BE64::Dyn    Elf_BE64_Dyn;
+typedef ElfClass_BE64::Sym    Elf_BE64_Sym;
+typedef ElfClass_BE64::External_Note    Elf_BE64_External_Note;
+
+typedef ElfClass_LE32::Ehdr   Elf_LE32_Ehdr;
+typedef ElfClass_LE32::Phdr   Elf_LE32_Phdr;
+typedef ElfClass_LE32::Shdr   Elf_LE32_Shdr;
+typedef ElfClass_LE32::Dyn    Elf_LE32_Dyn;
+typedef ElfClass_LE32::Sym    Elf_LE32_Sym;
+typedef ElfClass_LE32::External_Note    Elf_LE32_External_Note;
+
+typedef ElfClass_LE64::Ehdr   Elf_LE64_Ehdr;
+typedef ElfClass_LE64::Phdr   Elf_LE64_Phdr;
+typedef ElfClass_LE64::Shdr   Elf_LE64_Shdr;
+typedef ElfClass_LE64::Dyn    Elf_LE64_Dyn;
+typedef ElfClass_LE64::Sym    Elf_LE64_Sym;
+typedef ElfClass_LE64::External_Note    Elf_LE64_External_Note;
 
 
 #endif /* already included */

src/p_elf_enum.h

@@ -0,0 +1,185 @@
+/* p_elf_enum.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
+ */
+
+
+/*************************************************************************
+// Use the preprocessor to work around
+//   - that the types embedding these enums have to be PODs, and
+//     deriving from an empty base class (which is the ususal C++ way
+//     of "importing" enums) does not yield a POD any more
+//   - that older compilers do not correctly perform EBCO
+**************************************************************************/
+
+#ifdef WANT_EHDR_ENUM
+#undef WANT_EHDR_ENUM
+    enum { // e_ident[]
+        EI_CLASS      = 4,
+        EI_DATA       = 5,      /* Data encoding */
+        EI_VERSION    = 6,
+        EI_OSABI      = 7,
+        EI_ABIVERSION = 8
+    };
+    enum { // e_ident[EI_CLASS]
+        ELFCLASS32 = 1,         /* 32-bit objects */
+        ELFCLASS64 = 2          /* 64-bit objects */
+    };
+    enum { // e_ident[EI_DATA]
+        ELFDATA2LSB = 1,        /* 2's complement, little endian */
+        ELFDATA2MSB = 2         /* 2's complement, big endian */
+    };
+    enum { // e_ident[EI_OSABI]
+        ELFOSABI_NONE    = 0,      // == ELFOSABI_SYSV
+        ELFOSABI_NETBSD  = 2,
+        ELFOSABI_LINUX   = 3,
+        ELFOSABI_FREEBSD = 9,
+        ELFOSABI_OPENBSD = 12,
+        ELFOSABI_ARM     = 97
+    };
+    enum { // e_type
+        ET_NONE = 0,            /* No file type */
+        ET_REL  = 1,            /* Relocatable file */
+        ET_EXEC = 2,            /* Executable file */
+        ET_DYN  = 3,            /* Shared object file */
+        ET_CORE = 4             /* Core file */
+    };
+    enum { // e_machine
+        EM_386    = 3,
+        EM_PPC    = 20,
+        EM_PPC64  = 21,
+        EM_ARM    = 40,
+        EM_X86_64 = 62
+    };
+    enum { // e_version
+        EV_CURRENT = 1
+    };
+#endif
+
+
+#ifdef WANT_PHDR_ENUM
+#undef WANT_PHDR_ENUM
+    enum { // p_type
+        PT_LOAD    = 1,         /* Loadable program segment */
+        PT_DYNAMIC = 2,         /* Dynamic linking information */
+        PT_INTERP  = 3,         /* Name of program interpreter */
+        PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
+        PT_PHDR    = 6          /* Entry for header table itself */
+    };
+
+    enum { // p_flags
+        PF_X = 1,               /* Segment is executable */
+        PF_W = 2,               /* Segment is writable */
+        PF_R = 4                /* Segment is readable */
+    };
+#endif
+
+
+#ifdef WANT_SHDR_ENUM
+#undef WANT_SHDR_ENUM
+    enum { // sh_type
+        SHT_NULL = 0,           /* Section header table entry unused */
+        SHT_PROGBITS = 1,       /* Program data */
+        SHT_SYMTAB = 2,         /* Symbol table */
+        SHT_STRTAB = 3,         /* String table */
+        SHT_RELA = 4,           /* Relocation entries with addends */
+        SHT_HASH = 5,           /* Symbol hash table */
+        SHT_DYNAMIC = 6,        /* Dynamic linking information */
+        SHT_NOTE = 7,           /* Notes */
+        SHT_NOBITS = 8,         /* Program space with no data (bss) */
+        SHT_REL = 9,            /* Relocation entries, no addends */
+        SHT_SHLIB = 10,         /* Reserved */
+        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
+            /* 12, 13  hole */
+        SHT_INIT_ARRAY = 14,    /* Array of constructors */
+        SHT_FINI_ARRAY = 15,    /* Array of destructors */
+        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
+        SHT_GROUP = 17,         /* Section group */
+        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
+        SHT_GNU_LIBLIST = 0x6ffffff7    /* Prelink library list */
+    };
+
+    enum { // sh_flags
+        SHF_WRITE      = (1 << 0),  /* Writable */
+        SHF_ALLOC      = (1 << 1),  /* Occupies memory during execution */
+        SHF_EXECINSTR  = (1 << 2),  /* Executable */
+        SHF_MERGE      = (1 << 4),  /* Might be merged */
+        SHF_STRINGS    = (1 << 5),  /* Contains nul-terminated strings */
+        SHF_INFO_LINK  = (1 << 6),  /* 'sh_info' contains SHT index */
+        SHF_LINK_ORDER = (1 << 7)   /* Preserve order after combining */
+    };
+#endif
+
+
+#ifdef WANT_DYN_ENUM
+#undef WANT_DYN_ENUM
+    enum { // d_tag
+        DT_NULL     =  0,       /* End flag */
+        DT_NEEDED   =  1,       /* Name of needed library */
+        DT_HASH     =  4,       /* Hash table of symbol names */
+        DT_STRTAB   =  5,       /* String table */
+        DT_SYMTAB   =  6,       /* Symbol table */
+        DT_STRSZ    = 10        /* Sizeof string table */
+    };
+#endif
+
+
+#ifdef WANT_SYM_ENUM
+#undef WANT_SYM_ENUM
+    enum { // st_bind (high 4 bits of st_info)
+        STB_LOCAL   =   0,      /* Local symbol */
+        STB_GLOBAL  =   1,      /* Global symbol */
+        STB_WEAK    =   2       /* Weak symbol */
+    };
+
+    enum { // st_type (low 4 bits of st_info)
+        STT_NOTYPE  =   0,      /* Symbol type is unspecified */
+        STT_OBJECT  =   1,      /* Symbol is a data object */
+        STT_FUNC    =   2,      /* Symbol is a code object */
+        STT_SECTION =   3,      /* Symbol associated with a section */
+        STT_FILE    =   4,      /* Symbol's name is file name */
+        STT_COMMON  =   5,      /* Symbol is a common data object */
+        STT_TLS     =   6       /* Symbol is thread-local data object*/
+    };
+
+    enum { // st_other (visibility)
+        STV_DEFAULT  =  0,      /* Default symbol visibility rules */
+        STV_INTERNAL =  1,      /* Processor specific hidden class */
+        STV_HIDDEN   =  2,      /* Sym unavailable in other modules */
+        STV_PROTECTED=  3       /* Not preemptible, not exported */
+    };
+
+    enum { // st_shndx
+        SHN_UNDEF   =   0,      /* Undefined section */
+        SHN_ABS     =   0xfff1, /* Associated symbol is absolute */
+        SHN_COMMON  =   0xfff2  /* Associated symbol is common */
+    };
+#endif
+
+
+/*
+vi:ts=4:et
+*/
+

src/p_elks.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -112,7 +112,7 @@ void PackElks8086::pack(OutputFile *fo)
     ft.buf_len = ph.u_len;
     ft.addvalue = kernel_entry;
     // compress
-    compressWithFilters(&ft, overlap_range);
+    compressWithFilters(&ft, overlap_range, NULL_cconf);
 
     const unsigned lsize = getLoaderSize();
     MemBuffer loader(lsize);
@@ -121,7 +121,7 @@ void PackElks8086::pack(OutputFile *fo)
     patchPackHeader(loader, lsize);
 #if 0
     // FIXME
-    defineFilterSymbols();
+    defineFilterSymbols(&ft);
     defineDecompressorSymbols();
     //patch_le32(loader, lsize, "ESI1", zimage_offset + lsize);
     //patch_le32(loader, lsize, "KEIP", kernel_entry);

src/p_exe.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -58,17 +58,16 @@ PackExe::PackExe(InputFile *f) :
 
 const int *PackExe::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, M_END };
+    static const int m_all[]   = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, M_END };
-    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, M_NRV2E_8, M_END };
+    static const int m_nrv2b[] = { M_NRV2B_8, M_END };
-    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_NRV2D_8, M_END };
+    static const int m_nrv2d[] = { M_NRV2D_8, M_END };
+    static const int m_nrv2e[] = { M_NRV2E_8, M_END };
 
+    if (method == M_ALL)    return m_all;
+    if (M_IS_NRV2B(method)) return m_nrv2b;
+    if (M_IS_NRV2D(method)) return m_nrv2d;
+    if (M_IS_NRV2E(method)) return m_nrv2e;
     bool small = ih_imagesize <= 256*1024;
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (M_IS_NRV2E(method))
-        return m_nrv2e;
     if (level == 1 || small)
         return m_nrv2b;
     return m_nrv2e;
@@ -430,7 +429,7 @@ void PackExe::pack(OutputFile *fo)
     // compress (max_match = 8192)
     upx_compress_config_t cconf; cconf.reset();
     cconf.conf_ucl.max_match = MAXMATCH;
-    compressWithFilters(&ft, 32, 0, NULL, &cconf);
+    compressWithFilters(&ft, 32, &cconf);
     if (ph.max_run_found + ph.max_match_found > 0x8000)
         throwCantPack("decompressor limit exceeded, send a bugreport");
 

src/p_exe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_EXE; }
     virtual const char *getName() const { return "dos/exe"; }
+    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_lx_elf.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -249,8 +249,8 @@ int const *
 PackLinuxElf32ppc::getFilters() const
 {
     static const int filters[] = {
-        0xd0, -1
+        0xd0,
-    };
+    FT_END };
     return filters;
 }
 
@@ -258,8 +258,8 @@ int const *
 PackLinuxElf64amd::getFilters() const
 {
     static const int filters[] = {
-        0x49, -1
+        0x49,
-    };
+    FT_END };
     return filters;
 }
 
@@ -464,7 +464,7 @@ PackLinuxElf32::buildLinuxLoader(
     if (r != UPX_E_OK || h.sz_cpr >= h.sz_unc)
         throwInternalError("loader compression failed");
 #if 0  //{  debugging only
-    if (M_LZMA==ph.method) {
+    if (M_IS_LZMA(ph.method)) {
         ucl_uint tmp_len = h.sz_unc;  // LZMA uses this as EOF
         unsigned char *tmp = new unsigned char[tmp_len];
         memset(tmp, 0, tmp_len);
@@ -776,12 +776,12 @@ bool PackLinuxElf32::canPack()
 
     // additional requirements for linux/elf386
     if (get_native16(&ehdr->e_ehsize) != sizeof(*ehdr)) {
-        throwCantPack("invalid Ehdr e_ehsize; try `--force-execve'");
+        throwCantPack("invalid Ehdr e_ehsize; try '--force-execve'");
         return false;
     }
     unsigned const e_phoff = get_native32(&ehdr->e_phoff);
     if (e_phoff != sizeof(*ehdr)) {// Phdrs not contiguous with Ehdr
-        throwCantPack("non-contiguous Ehdr/Phdr; try `--force-execve'");
+        throwCantPack("non-contiguous Ehdr/Phdr; try '--force-execve'");
         return false;
     }
 
@@ -794,7 +794,7 @@ bool PackLinuxElf32::canPack()
                 return false;
         if (1!=exetype && phdr->PT_LOAD32 == get_native32(&phdr->p_type)) {
             if (phdr->p_offset != 0) {
-                throwCantPack("invalid Phdr p_offset; try `--force-execve'");
+                throwCantPack("invalid Phdr p_offset; try '--force-execve'");
                 return false;
             }
             exetype = 1;
@@ -863,7 +863,7 @@ bool PackLinuxElf32::canPack()
             // elf_lookup() returns 0 if any required table is missing.
             Elf32_Sym const *const lsm = elf_lookup(run_start[j]);
             if (lsm && get_native16(&lsm->st_shndx)==Elf32_Sym::SHN_UNDEF
-            && get_native16(&lsm->st_info)==lsm->Elf32_Sym::St_info(Elf32_Sym::STB_GLOBAL, Elf32_Sym::STT_FUNC)
+            && get_native16(&lsm->st_info)==lsm->Elf32_Sym::make_st_info(Elf32_Sym::STB_GLOBAL, Elf32_Sym::STT_FUNC)
             && get_native16(&lsm->st_other)==Elf32_Sym::STV_DEFAULT ) {
                 break;
             }
@@ -901,25 +901,25 @@ PackLinuxElf64amd::canPack()
 
     // additional requirements for linux/elf386
     if (get_native16(&ehdr->e_ehsize) != sizeof(*ehdr)) {
-        throwCantPack("invalid Ehdr e_ehsize; try `--force-execve'");
+        throwCantPack("invalid Ehdr e_ehsize; try '--force-execve'");
         return false;
     }
     acc_uint64l_t const e_phoff = get_native64(&ehdr->e_phoff);
     if (e_phoff != sizeof(*ehdr)) {// Phdrs not contiguous with Ehdr
-        throwCantPack("non-contiguous Ehdr/Phdr; try `--force-execve'");
+        throwCantPack("non-contiguous Ehdr/Phdr; try '--force-execve'");
         return false;
     }
 
     // The first PT_LOAD64 must cover the beginning of the file (0==p_offset).
     unsigned const e_phnum = get_native16(&ehdr->e_phnum);
-    Elf64_Phdr const *phdr = (Elf64_Phdr const *)(buf + e_phoff);
+    Elf64_Phdr const *phdr = (Elf64_Phdr const *)(buf + (unsigned) e_phoff);
     for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
         if (j >= 14)
             return false;
         if (phdr->PT_LOAD64 == get_native32(&phdr->p_type)) {
             // Just avoid the "rewind" when unpacking?
             //if (phdr->p_offset != 0) {
-            //    throwCantPack("invalid Phdr p_offset; try `--force-execve'");
+            //    throwCantPack("invalid Phdr p_offset; try '--force-execve'");
             //    return false;
             //}
             exetype = 1;
@@ -1424,8 +1424,8 @@ using namespace N_BELE_CTP;
 static const int *
 ARM_getFilters(bool const isBE)
 {
-    static const int f50[] = { 0x50, -1 };
+    static const int f50[] = { 0x50, FT_END };
-    static const int f51[] = { 0x51, -1 };
+    static const int f51[] = { 0x51, FT_END };
     if (isBE)
         return f51;
     return f50;
@@ -1857,7 +1857,7 @@ PackLinuxElf32x86::getFilters() const
         0x82, 0x85,
         0x24, 0x16, 0x13, 0x14, 0x11, 0x25, 0x15, 0x12,
 #endif
-    -1 };
+    FT_END };
     return filters;
 }
 

src/p_lx_elf.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -161,6 +161,15 @@ protected:
         char text[0x18 - 4*4];  // "OpenBSD"
         unsigned end;     // 0
     } elfnote;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 52 + 1*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 52 + 2*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 52 + 3*32 + 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+    }
 };
 
 
@@ -225,6 +234,15 @@ protected:
     __attribute_packed;
 
     cprElfHdr3 elfout;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 64 + 1*56 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 64 + 2*56 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 64 + 3*56 + 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+    }
 };
 
 class PackLinuxElf32Be : public PackLinuxElf32
@@ -281,6 +299,7 @@ public:
     virtual ~PackLinuxElf64amd();
     virtual int getFormat() const { return UPX_F_LINUX_ELF64_AMD; }
     virtual const char *getName() const { return "linux/ElfAMD"; }
+    virtual const char *getFullName(const options_t *) const { return "amd64-linux.elf"; }
     virtual const int *getFilters() const;
     virtual bool canPack();
 protected:
@@ -303,6 +322,7 @@ public:
     virtual ~PackLinuxElf32ppc();
     virtual int getFormat() const { return UPX_F_LINUX_ELFPPC32; }
     virtual const char *getName() const { return "linux/ElfPPC"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc-linux.elf"; }
     virtual const int *getFilters() const;
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
@@ -322,6 +342,7 @@ public:
     virtual ~PackLinuxElf32x86();
     virtual int getFormat() const { return UPX_F_LINUX_ELF_i386; }
     virtual const char *getName() const { return "linux/elf386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf"; }
     virtual const int *getFilters() const;
 
     virtual void unpack(OutputFile *fo);
@@ -356,6 +377,7 @@ class PackFreeBSDElf32x86 : public PackBSDElf32x86
 public:
     PackFreeBSDElf32x86(InputFile *f);
     virtual ~PackFreeBSDElf32x86();
+    virtual const char *getFullName(const options_t *) const { return "i386-freebsd.elf"; }
 };
 
 class PackNetBSDElf32x86 : public PackBSDElf32x86
@@ -364,6 +386,7 @@ class PackNetBSDElf32x86 : public PackBSDElf32x86
 public:
     PackNetBSDElf32x86(InputFile *f);
     virtual ~PackNetBSDElf32x86();
+    virtual const char *getFullName(const options_t *) const { return "i386-netbsd.elf"; }
 };
 
 class PackOpenBSDElf32x86 : public PackBSDElf32x86
@@ -372,6 +395,7 @@ class PackOpenBSDElf32x86 : public PackBSDElf32x86
 public:
     PackOpenBSDElf32x86(InputFile *f);
     virtual ~PackOpenBSDElf32x86();
+    virtual const char *getFullName(const options_t *) const { return "i386-openbsd.elf"; }
 
 protected:
     virtual void buildLoader(const Filter *ft);
@@ -394,6 +418,7 @@ public:
     virtual ~PackLinuxElf32armLe();
     virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMLE; }
     virtual const char *getName() const { return "linux/armLE"; }
+    virtual const char *getFullName(const options_t *) const { return "arm-linux.elf"; }
     virtual const int *getFilters() const;
 
 protected:
@@ -413,6 +438,7 @@ public:
     virtual ~PackLinuxElf32armBe();
     virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMBE; }
     virtual const char *getName() const { return "linux/armBE"; }
+    virtual const char *getFullName(const options_t *) const { return "armeb-linux.elf"; }
     virtual const int *getFilters() const;
 
 protected:

src/p_lx_exc.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2001-2006 John F. Reiser
+   Copyright (C) 2001-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -100,7 +100,7 @@ const int *PackLinuxI386::getFilters() const
         0x83, 0x86, 0x80, 0x84, 0x87, 0x81, 0x82, 0x85,
         0x24, 0x16, 0x13, 0x14, 0x11, 0x25, 0x15, 0x12,
 #endif
-    -1 };
+    FT_END };
     return filters;
 }
 
@@ -204,7 +204,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
         ((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) ;
     unsigned nw = fo->getBytesWritten();
     elfout.phdr[0].p_filesz = nw;
-    nw = -(-elfout.phdr[0].p_align & -nw);  // ALIGN_UP
+    nw = 0u-((0u-elfout.phdr[0].p_align) & (0u-nw));  // ALIGN_UP
     super::pack4(fo, ft);  // write PackHeader and overlay_offset
     set_stub_brk(&elfout.phdr[1], nw + elfout.phdr[0].p_vaddr);
 
@@ -373,7 +373,7 @@ PackLinuxI386::buildLinuxLoader(
     addLoader("IDENTSTR", NULL);
     addLoader("LEXEC020", NULL);
     addLoader("FOLDEXEC", NULL);
-    if (ph.method == M_LZMA) {
+    if (M_IS_LZMA(ph.method)) {
         const lzma_compress_result_t *res = &ph.compress_result.result_lzma;
         acc_uint32e_t properties = // lc, lp, pb, dummy
             (res->lit_context_bits << 0) |

src/p_lx_exc.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -49,6 +49,7 @@ public:
     );
     virtual int getFormat() const { return UPX_F_LINUX_i386; }
     virtual const char *getName() const { return "linux/386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.execve"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
     virtual void buildLoader(const Filter *);
@@ -119,6 +120,15 @@ protected:
 
     unsigned char ei_osabi;
     char const *osabi_note;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr1) == 52 + 1*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr2) == 52 + 2*32 + 12)
+        COMPILE_TIME_ASSERT(sizeof(cprElfHdr3) == 52 + 3*32 + 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr1)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr2)
+        COMPILE_TIME_ASSERT_ALIGNED1(cprElfHdr3)
+    }
 };
 
 
@@ -129,6 +139,7 @@ public:
     PackBSDI386(InputFile *f);
     virtual int getFormat() const { return UPX_F_BSD_i386; }
     virtual const char *getName() const { return "*BSD/386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; }
 
 protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header

src/p_lx_interp.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -164,9 +164,9 @@ void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
         ph.method = M_NRV2E_LE32; addLoader(getDecompressorSections(), NULL);
         addLoader("LXPTI090", NULL);
 
-        addLoader("LXPTI043", NULL);
+        //addLoader("LXPTI043", NULL);
-        ph.method = M_CL1B_LE32;  addLoader(getDecompressorSections(), NULL);
+        //ph.method = M_CL1B_LE32;  addLoader(getDecompressorSections(), NULL);
-        addLoader("LXPTI090", NULL);
+        //addLoader("LXPTI090", NULL);
 
         addLoader("LXPTI091", NULL);
 

src/p_lx_interp.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -47,6 +47,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_LINUX_ELFI_i386; }
     virtual const char *getName() const { return "linux/elfi386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.interp"; }
 
     virtual bool canPack();
     virtual void unpack(OutputFile *fo);

src/p_lx_sh.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/p_lx_sh.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2006 John F. Reiser
+   Copyright (C) 2000-2007 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -47,6 +47,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_LINUX_SH_i386; }
     virtual const char *getName() const { return "linux/sh386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.elf.shell"; }
     virtual const int *getFilters() const { return NULL; }
     virtual void buildLoader(const Filter *);
 

src/p_mach.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2004-2006 John Reiser
+   Copyright (C) 2004-2007 John Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -53,14 +53,14 @@ PackMachPPC32::~PackMachPPC32()
 const int *PackMachPPC32::getCompressionMethods(int /*method*/, int /*level*/) const
 {
     // There really is no LE bias in M_NRV2E_LE32.
-    static const int m_nrv2e[] = { M_NRV2E_LE32, -1 };
+    static const int m_nrv2e[] = { M_NRV2E_LE32, M_END };
     return m_nrv2e;
 }
 
 
 const int *PackMachPPC32::getFilters() const
 {
-    static const int filters[] = { 0xd0, -1 };
+    static const int filters[] = { 0xd0, FT_END };
     return filters;
 }
 
@@ -195,8 +195,8 @@ PackMachPPC32::pack3(OutputFile *fo, Filter &ft)  // append loader
     BE32 disp;
     unsigned const zero = 0;
     unsigned len = fo->getBytesWritten();
-    fo->write(&zero, 3& -len);
+    fo->write(&zero, 3& (0u-len));
-    len += (3& -len) + sizeof(disp);
+    len += (3& (0u-len)) + sizeof(disp);
     set_be32(&disp, 4+ len - sz_mach_headers);  // 4: sizeof(instruction)
     fo->write(&disp, sizeof(disp));
 

src/p_mach.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -135,7 +135,8 @@ struct Mach_ppc_thread_state {
     BE32 mq;        /* MQ register (601 only) */
 
     BE32 vrsave;    /* Vector Save Register */
-};
+}
+__attribute_packed;
 
 struct Mach_thread_command {
     BE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
@@ -165,6 +166,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_MACH_PPC32; }
     virtual const char *getName() const { return "Mach/ppc32"; }
+    virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_ps1.cpp

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2002-2006 Jens Medoch
+   Copyright (C) 2002-2007 Jens Medoch
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -53,7 +53,7 @@ static const
 #define K0_BS           (0x80000000)
 #define K1_BS           (0xa0000000)
 #define EXE_BS          (ih.epc & K0_BS)
-#define FIX_PSVR        (K1_BS - EXE_BS) + (PS_HDR_SIZE - HD_CODE_OFS)
+#define FIX_PSVR        ((K1_BS - EXE_BS) + (PS_HDR_SIZE - HD_CODE_OFS))
 
 // lui / addiu
 #define MIPS_HI(a)      (((a) >> 16) + (((a) & 0x8000) >> 15))
@@ -83,16 +83,17 @@ PackPs1::PackPs1(InputFile *f) :
     pad_code(0), bss_start(0), bss_end(0)
 {
     bele = &N_BELE_RTP::le_policy;
-    COMPILE_TIME_ASSERT(sizeof(ps1_exe_t) == 136);
-    COMPILE_TIME_ASSERT(sizeof(ps1_exe_hb_t) == 44);
-    COMPILE_TIME_ASSERT(sizeof(ps1_exe_chb_t) == 5);
 
-    COMPILE_TIME_ASSERT(PS_HDR_SIZE > sizeof(ps1_exe_t));
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_t) == 136)
-    COMPILE_TIME_ASSERT(SZ_IH_BKUP == 40);
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_hb_t) == 44)
-#if 0 // 1 || defined(WITH_NRV)
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_chb_t) == 5)
-    COMPILE_TIME_ASSERT(sizeof(nrv_loader) == 14812);
+    COMPILE_TIME_ASSERT_ALIGNED1(ps1_exe_t)
-    COMPILE_TIME_ASSERT(NRV_BOOT_LOADER_CRC32 == 0x0);
+    COMPILE_TIME_ASSERT_ALIGNED1(ps1_exe_hb_t)
-#endif
+    COMPILE_TIME_ASSERT_ALIGNED1(ps1_exe_chb_t)
+
+    COMPILE_TIME_ASSERT(PS_HDR_SIZE > sizeof(ps1_exe_t))
+    COMPILE_TIME_ASSERT(SZ_IH_BKUP == 40)
+
     fdata_size = file_size - PS_HDR_SIZE;
     ram_size = !opt->ps1_exe.do_8mb ? 0x200000 : 0x800000;
 }
@@ -151,7 +152,7 @@ bool PackPs1::readBkupHeader()
 }
 
 #define INIT_BH_BKUP(p, l)  {(p)->id = '1'; (p)->len = l;}
-#define ADLER16(a)          ((a) >> 16 ^ ((a) & 0xffff))
+#define ADLER16(a)          (((a) >> 16) ^ ((a) & 0xffff))
 
 void PackPs1::putBkupHeader(const unsigned char *src, unsigned char *dst, unsigned *len)
 {
@@ -169,7 +170,7 @@ void PackPs1::putBkupHeader(const unsigned char *src, unsigned char *dst, unsign
         if (r != UPX_E_OK || sz_cbh >= SZ_IH_BKUP)
             throwInternalError("header compression failed");
         INIT_BH_BKUP(p, sz_cbh);
-        *len = ALIGN_UP(sz_cbh + sizeof(ps1_exe_chb_t) - 1, 4);
+        *len = ALIGN_UP(sz_cbh + (unsigned) sizeof(ps1_exe_chb_t) - 1, 4u);
         p->ih_csum = ADLER16(upx_adler32(&ih.epc, SZ_IH_BKUP));
         memcpy(dst, cpr_bh, SZ_IH_BKUP);
         delete [] cpr_bh;
@@ -300,7 +301,7 @@ void PackPs1::buildLoader(const Filter *)
     else if (ph.method == M_NRV2E_LE32)
         method = isCon ? "nrv2e.small,32bit.sub,nrv.done" :
                     "nrv2e.32bit,nrv.done";
-    else if (ph.method == M_LZMA)
+    else if (M_IS_LZMA(ph.method))
         method = "nrv2b.small,8bit.sub,nrv.done,lzma.prep";
     else
         throwInternalError("unknown compression method");
@@ -314,12 +315,12 @@ void PackPs1::buildLoader(const Filter *)
             throwCantPack("packed data overlap (try --force)");
         }
         else
-            sa_tmp += overlap = ALIGN_UP((ph.overlap_overhead - sa_tmp),4);
+            sa_tmp += overlap = ALIGN_UP((ph.overlap_overhead - sa_tmp), 4u);
     }
 
     foundBss = findBssSection();
 
-    if (ph.method == M_LZMA && !buildPart2)
+    if (M_IS_LZMA(ph.method) && !buildPart2)
     {
         initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1));
         addLoader("decompressor.start",
@@ -329,7 +330,7 @@ void PackPs1::buildLoader(const Filter *)
     }
     else
     {
-        if (ph.method == M_LZMA && buildPart2)
+        if (M_IS_LZMA(ph.method) && buildPart2)
         {
             sz_lcpr = MemBuffer::getSizeForCompression(sz_lunc);
             unsigned char *cprLoader = new unsigned char[sz_lcpr];
@@ -338,21 +339,21 @@ void PackPs1::buildLoader(const Filter *)
             if (r != UPX_E_OK || sz_lcpr >= sz_lunc)
                 throwInternalError("loader compression failed");
             initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1),
-                      (ph.method != M_LZMA || isCon) ? 0 : 1);
+                      isCon || !M_IS_LZMA(ph.method) ? 0 : 1);
             linker->addSection("lzma.exec", cprLoader, sz_lcpr, 0);
             delete [] cprLoader;
         }
         else
             initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1));
 
-        pad_code = ALIGN_GAP((ph.c_len + (isCon ? sz_lcpr : 0)), 4);
+        pad_code = ALIGN_GAP((ph.c_len + (isCon ? sz_lcpr : 0)), 4u);
         assert(pad_code < 4);
         static const unsigned char pad_buffer[4] = { 0, 0, 0, 0 };
         linker->addSection("pad.code", pad_buffer, pad_code, 0);
 
         if (isCon)
         {
-            if (ph.method == M_LZMA)
+            if (M_IS_LZMA(ph.method))
                 addLoader(!foundBss ? "con.start" : "bss.con.start",
                           method,
                           ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
@@ -368,7 +369,7 @@ void PackPs1::buildLoader(const Filter *)
         }
         else
         {
-            if (ph.method == M_LZMA)
+            if (M_IS_LZMA(ph.method))
                 addLoader("cdb.start.lzma", "pad.code", "cdb.entry.lzma", method, "cdb.lzma.cpr",
                           ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
                           "lzma.exec", NULL);
@@ -389,7 +390,7 @@ void PackPs1::buildLoader(const Filter *)
 #define REG1(x)       (((x) >> 5) & 0x1f)
 #define REG2(x)       ((x) & 0x1f)
 
-#define MIPS_IMM(a,b) (((a) - (((b) & 0x8000) >> 15) << 16) | (b))
+#define MIPS_IMM(a,b) ((((a) - (((b) & 0x8000) >> 15)) << 16) | (b))
 
 // Type
 #define REGIMM  1
@@ -439,12 +440,12 @@ bool PackPs1::findBssSection()
                         bss_start = MIPS_IMM(p->hi1, p->lo1);
                         bss_end = MIPS_IMM(p->hi2, p->lo2);
 
-                        if (0 < ALIGN_DOWN(bss_end - bss_start, 4) )
+                        if (0 < ALIGN_DOWN(bss_end - bss_start, 4u))
                         {
-                            unsigned wkmem_sz = (ph.method == M_LZMA) ? 32768 : 800;
+                            unsigned wkmem_sz = M_IS_LZMA(ph.method) ? 32768 : 800;
                             unsigned end_offs = ih.tx_ptr + fdata_size + overlap;
                             if (bss_end > (end_offs + wkmem_sz))
-                                return (isCon || (!isCon && (ph.method == M_LZMA)));
+                                return isCon || (!isCon && M_IS_LZMA(ph.method));
                             else
                                 return false;
                         }
@@ -478,9 +479,9 @@ void PackPs1::pack(OutputFile *fo)
     while (!(*--p_scan)) { if (sa_cnt++ > (0x10000 << 5) || sa_cnt >= fdata_size - 1024) break; }
 
     if (sa_cnt > (0x10000 << 2))
-        sa_cnt = ALIGN_DOWN(sa_cnt,32);
+        sa_cnt = ALIGN_DOWN(sa_cnt, 32u);
     else
-        sa_cnt = ALIGN_DOWN(sa_cnt,4);
+        sa_cnt = ALIGN_DOWN(sa_cnt, 4u);
 
     // prepare packheader
     ph.u_len = (fdata_size - sa_cnt);
@@ -491,7 +492,7 @@ void PackPs1::pack(OutputFile *fo)
     upx_compress_config_t cconf; cconf.reset();
     cconf.conf_ucl.max_match = 65535;
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, sa_cnt, 0, NULL, &cconf);
+    compressWithFilters(&ft, sa_cnt, &cconf);
 
     if (overlap)
     {
@@ -507,7 +508,7 @@ void PackPs1::pack(OutputFile *fo)
 
     unsigned lzma_init = 0;
 
-    if (ph.method == M_LZMA)
+    if (M_IS_LZMA(ph.method))
     {
         sz_lunc = getLoaderSize();
 
@@ -553,7 +554,7 @@ void PackPs1::pack(OutputFile *fo)
     }
     else
     {
-        d_len = (lsize - h_len) - getLoaderSectionStart((ph.method == M_LZMA) ? "cdb.entry.lzma" : "cdb.entry");
+        d_len = (lsize - h_len) - getLoaderSectionStart(M_IS_LZMA(ph.method) ? "cdb.entry.lzma" : "cdb.entry");
         e_len = (lsize - d_len) - h_len;
     }
 
@@ -561,10 +562,10 @@ void PackPs1::pack(OutputFile *fo)
     linker->defineSymbol("SC", MIPS_LO(sa_cnt > (0x10000 << 2) ?
                                        sa_cnt >> 5 : sa_cnt >> 2));
     linker->defineSymbol("DECO", decomp_data_start);
-    linker->defineSymbol("ldr_sz", (ph.method == M_LZMA ? sz_lunc + 16 : (d_len-pad_code)));
+    linker->defineSymbol("ldr_sz", M_IS_LZMA(ph.method) ? sz_lunc + 16 : (d_len-pad_code));
 
     if (foundBss)
-        if (ph.method == M_LZMA)
+        if (M_IS_LZMA(ph.method))
             linker->defineSymbol("wrkmem", bss_end - 160 - getDecompressorWrkmemSize()
                                            - (sz_lunc + 16));
         else
@@ -588,7 +589,7 @@ void PackPs1::pack(OutputFile *fo)
     ibuf.clear(0,fdata_size);
     upx_bytep paddata = ibuf;
 
-    if (ph.method == M_LZMA)
+    if (M_IS_LZMA(ph.method))
     {
         linker->defineSymbol("lzma_init_off", lzma_init);
         linker->defineSymbol("gb_e", linker->getSymbolOffset("gb8_e"));
@@ -600,7 +601,7 @@ void PackPs1::pack(OutputFile *fo)
     if (isCon)
     {
         linker->defineSymbol("PAD", pad_code);
-        if (ph.method == M_LZMA)
+        if (M_IS_LZMA(ph.method))
             linker->defineSymbol("DCRT", (entry + getLoaderSectionStart("lzma.exec")));
         else
             linker->defineSymbol("DCRT", (entry + (e_len - d_len)));
@@ -609,7 +610,7 @@ void PackPs1::pack(OutputFile *fo)
     {
         linker->defineSymbol("PSVR", FIX_PSVR);
         linker->defineSymbol("CPDO", comp_data_start);
-        if (ph.method == M_LZMA)
+        if (M_IS_LZMA(ph.method))
             linker->defineSymbol("lzma_cpr", getLoaderSectionStart("lzma.exec")
                                              - getLoaderSectionStart("cdb.entry.lzma"));
     }
@@ -621,7 +622,7 @@ void PackPs1::pack(OutputFile *fo)
     memcpy(loader, getLoader(), lsize);
     patchPackHeader(loader, lsize);
 
-    if (!isCon && ph.method == M_LZMA && (HD_CODE_OFS + d_len + h_len) > CD_SEC)
+    if (!isCon && M_IS_LZMA(ph.method) && (HD_CODE_OFS + d_len + h_len) > CD_SEC)
         throwInternalError("lzma --boot-only loader > 2048");
 
     // ps1_exe_t structure
@@ -655,7 +656,7 @@ void PackPs1::pack(OutputFile *fo)
     printf("%-13s: eof in mem OF : %08X bytes\n", getName(), (unsigned int) oh.tx_ptr + oh.tx_len);
     unsigned char i = 0;
     if (isCon) { if (foundBss) i = 1; }
-    else { i = 2; if (ph.method == M_LZMA) { if (!foundBss) i = 3; else i = 4; } }
+    else { i = 2; if (M_IS_LZMA(ph.method)) { if (!foundBss) i = 3; else i = 4; } }
     const char *loader_method[] = { "con/stack", "con/bss", "cdb", "cdb/stack", "cdb/bss" };
     char method_name[32+1]; set_method_name(method_name, sizeof(method_name), ph.method, ph.level);
     printf("%-13s: methods       : %s, %s\n", getName(), method_name, loader_method[i]);

src/p_ps1.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2002-2006 Jens Medoch
+   Copyright (C) 2002-2007 Jens Medoch
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -46,6 +46,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_PS1_EXE; }
     virtual const char *getName() const { return "ps1/exe"; }
+    virtual const char *getFullName(const options_t *) const { return "mipsel.r3000-ps1"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -111,7 +112,7 @@ protected:
     }
     __attribute_packed;
 
-    typedef struct bss_nfo
+    struct bss_nfo
     {
         LE16    hi1, op1, lo1, op2;
         LE16    hi2, op3, lo2, op4;

src/p_sys.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/p_sys.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_DOS_SYS; }
     virtual const char *getName() const { return "dos/sys"; }
+    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
 
     virtual bool canPack();
 

src/p_tmt.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -59,8 +59,9 @@ const int *PackTmt::getCompressionMethods(int method, int level) const
 const int *PackTmt::getFilters() const
 {
     static const int filters[] = {
-        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x12, 0x15,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-    -1 };
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
+    FT_END };
     return filters;
 }
 
@@ -87,6 +88,8 @@ void PackTmt::buildLoader(const Filter *ft)
     // prepare loader
     initLoader(stub_i386_dos32_tmt, sizeof(stub_i386_dos32_tmt));
     addLoader("IDENTSTR,TMTMAIN1",
+              ph.first_offset_found == 1 ? "TMTMAIN1A" : "",
+              "TMTMAIN1B",
               ft->id ? "TMTCALT1" : "",
               "TMTMAIN2,UPX1HEAD,TMTCUTPO",
               NULL);
@@ -168,7 +171,7 @@ int PackTmt::readFileHeader()
 
     fi->seek(adam_offset,SEEK_SET);
     fi->readx(&ih,sizeof(ih));
-    // FIXME: should add some checks for the values in `ih'
+    // FIXME: should add some checks for the values in 'ih'
 
     return UPX_F_TMT_ADAM;
 #undef H4
@@ -184,19 +187,6 @@ bool PackTmt::canPack()
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-    return true;
-}
-
 /*************************************************************************
 //
 **************************************************************************/
@@ -249,7 +239,10 @@ void PackTmt::pack(OutputFile *fo)
     Filter ft(ph.level);
     ft.buf_len = usize;
     // compress
-    compressWithFilters(&ft, 512);
+    upx_compress_config_t cconf; cconf.reset();
+    // limit stack size needed for runtime decompression
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
+    compressWithFilters(&ft, 512, &cconf);
 
     const unsigned lsize = getLoaderSize();
     const unsigned s_point = getLoaderSection("TMTMAIN1");
@@ -259,11 +252,11 @@ void PackTmt::pack(OutputFile *fo)
 
     // patch loader
     linker->defineSymbol("original_entry", ih.entry);
-    defineFilterSymbols(linker, &ft);
     defineDecompressorSymbols();
+    defineFilterSymbols(&ft);
 
     linker->defineSymbol("bytes_to_copy", ph.c_len + d_len);
-    linker->defineSymbol("copy_dest", ph.u_len + ph.overlap_overhead + d_len - 1);
+    linker->defineSymbol("copy_dest", 0u - (ph.u_len + ph.overlap_overhead + d_len - 1));
     linker->defineSymbol("copy_source", ph.c_len + lsize - 1);
     //fprintf(stderr,"\nelen=%x dlen=%x copy_len=%x  copy_to=%x  oo=%x  jmp_pos=%x  ulen=%x  c_len=%x \n\n",
     //                e_len,d_len,copy_len,copy_to,ph.overlap_overhead,jmp_pos,ph.u_len,ph.c_len);

src/p_tmt.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_TMT_ADAM; }
     virtual const char *getName() const { return "tmt/adam"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.tmt"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_tos.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -307,19 +307,19 @@ bool PackTos::checkFileHeader()
     if ((f & F_PROTMODE) != F_PROT_P)
     {
         if (opt->force < 1)
-            throwCantPack("no private memory protection; use option `-f' to force packing");
+            throwCantPack("no private memory protection; use option '-f' to force packing");
     }
     if (f & F_SHTEXT)
     {
         if (opt->force < 1)
-            throwCantPack("shared text segment; use option `-f' to force packing");
+            throwCantPack("shared text segment; use option '-f' to force packing");
     }
 #if 0
     // fh_reserved seems to be unused
     if (ih.fh_reserved != 0)
     {
         if (opt->force < 1)
-            throwCantPack("reserved header field set; use option `-f' to force packing");
+            throwCantPack("reserved header field set; use option '-f' to force packing");
     }
 #endif
     return true;
@@ -508,7 +508,7 @@ void PackTos::pack(OutputFile *fo)
     upx_compress_config_t cconf; cconf.reset();
     cconf.conf_ucl.max_match = 65535;
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, 512, 0, NULL, &cconf);
+    compressWithFilters(&ft, 512, &cconf);
 
     //
     // multipass buildLoader()

src/p_tos.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_ATARI_TOS; }
     virtual const char *getName() const { return "atari/tos"; }
+    virtual const char *getFullName(const options_t *) const { return "m68k-atari.tos"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_unix.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -62,7 +62,7 @@ bool PackUnix::canPack()
 #if defined(__unix__)
     // must be executable by owner
     if ((fi->st.st_mode & S_IXUSR) == 0)
-        throwCantPack("file not executable; try `chmod +x'");
+        throwCantPack("file not executable; try 'chmod +x'");
 #endif
     if (file_size < 4096)
         throwCantPack("file is too small");
@@ -125,8 +125,8 @@ int PackUnix::getStrategy(Filter &/*ft*/)
     // Called just before reading and compressing each block.
     // Might want to adjust blocksize, etc.
 
-    // If user specified the filter, then use it (-2==strategy).
+    // If user specified the filter, then use it (-2==filter_strategy).
-    // Else try the first two filters, and pick the better (2==strategy).
+    // Else try the first two filters, and pick the better (2==filter_strategy).
     return (opt->no_filter ? -3 : ((opt->filter > 0) ? -2 : 2));
 }
 
@@ -151,9 +151,9 @@ void PackUnix::pack2(OutputFile *fo, Filter &ft)
         // which assumes it has free choice on each call [block].
         // And if the choices aren't the same on each block,
         // then un-filtering will give incorrect results.
-        int strategy = getStrategy(ft);
+        int filter_strategy = getStrategy(ft);
         if (file_size > (off_t)blocksize)
-            strategy = -3;      // no filters
+            filter_strategy = -3;      // no filters
 
         int l = fi->readx(ibuf, UPX_MIN(blocksize, remaining));
         remaining -= l;
@@ -170,7 +170,7 @@ void PackUnix::pack2(OutputFile *fo, Filter &ft)
         // that is, AFTER filtering.  We want BEFORE filtering,
         // so that decompression checks the end-to-end checksum.
         unsigned const end_u_adler = upx_adler32(ibuf, ph.u_len, ph.u_adler);
-        compressWithFilters(&ft, OVERHEAD, strategy);
+        compressWithFilters(&ft, OVERHEAD, NULL_cconf, filter_strategy);
 
         if (ph.c_len < ph.u_len) {
             ph.overlap_overhead = OVERHEAD;
@@ -318,7 +318,7 @@ void PackUnix::packExtent(
     }
     fi->seek(x.offset, SEEK_SET);
     for (off_t rest = x.size; 0 != rest; ) {
-        int const strategy = getStrategy(*ft);
+        int const filter_strategy = getStrategy(*ft);
         int l = fi->readx(ibuf, UPX_MIN(rest, (off_t)blocksize));
         if (l == 0) {
             break;
@@ -345,12 +345,11 @@ void PackUnix::packExtent(
             ft->id = 0;
             ft->cto = 0;
 
-            compressWithFilters(ft, OVERHEAD, strategy,
+            compressWithFilters(ft, OVERHEAD, NULL_cconf, filter_strategy,
-                NULL, NULL, 0, 0, // those 4 args are the defaults
+                                0, 0, 0, hdr_ibuf, hdr_u_len);
-                hdr_ibuf, hdr_u_len);
         }
         else {
-            (void) compress(ibuf, obuf);    // ignore return value
+            (void) compress(ibuf, ph.u_len, obuf);    // ignore return value
         }
 
         if (ph.c_len < ph.u_len) {

src/p_unix.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/p_vmlinx.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -31,45 +31,141 @@
 
 #include "p_elf.h"
 
+
 /*************************************************************************
 // vmlinx/i386 (bare binary Linux kernel image)
 **************************************************************************/
 
-class PackVmlinuxI386 : public Packer
+template <class TElfClass>
+class PackVmlinuxBase : public Packer
 {
     typedef Packer super;
+protected:
+    typedef TElfClass ElfClass;
+    typedef typename ElfClass::BeLePolicy BeLePolicy;
+    typedef typename ElfClass::ElfITypes  ElfITypes;
+    // integral types
+    typedef typename ElfClass::U16   U16;
+    typedef typename ElfClass::U32   U32;
+    typedef typename ElfClass::U64   U64;
+    typedef typename ElfITypes::Addr Addr;
+    // ELF types
+    typedef typename ElfClass::Ehdr Ehdr;
+    typedef typename ElfClass::Shdr Shdr;
+    typedef typename ElfClass::Phdr Phdr;
+    typedef typename ElfClass::Dyn  Dyn;
+    typedef typename ElfClass::Sym  Sym;
+
 public:
-    PackVmlinuxI386(InputFile *f);
+    PackVmlinuxBase(InputFile *, unsigned, unsigned, unsigned, char const *);
-    virtual ~PackVmlinuxI386();
+    virtual ~PackVmlinuxBase();
     virtual int getVersion() const { return 13; }
-    virtual int getFormat() const { return UPX_F_VMLINUX_i386; }
-    virtual const char *getName() const { return "vmlinux/386"; }
-    virtual const int *getCompressionMethods(int method, int level) const;
-    virtual const int *getFilters() const;
-    virtual int getStrategy(Filter &);
-
-    virtual void pack(OutputFile *fo);
-    virtual void unpack(OutputFile *fo);
-
-    virtual bool canPack();
-    virtual int canUnpack();
 
 protected:
-    virtual Elf_LE32_Shdr const *getElfSections();
+    unsigned int const my_e_machine;
-    virtual void buildLoader(const Filter *ft);
+    unsigned char const my_elfclass;
-    virtual Linker* newLinker() const;
+    unsigned char const my_elfdata;
-//    virtual const upx_byte *getLoader() const;
+    char const *const my_boot_label;
-//    virtual int getLoaderSize() const;
 
     int n_ptload;
     unsigned sz_ptload;
-    Elf_LE32_Phdr *phdri; // from input file
+    unsigned paddr_min;
-    Elf_LE32_Shdr *shdri; // from input file
+    Phdr *phdri; // from input file
+    Shdr *shdri; // from input file
     char *shstrtab; // from input file
-    Elf_LE32_Shdr *p_text;
+    Shdr *p_text;
-    Elf_LE32_Shdr *p_note0;
+    Shdr *p_note0;
-    Elf_LE32_Shdr *p_note1;
+    Shdr *p_note1;
-    Elf_LE32_Ehdr ehdri; // from input file
+    Ehdr ehdri; // from input file
+
+    virtual Shdr const *getElfSections();
+    virtual int getStrategy(Filter &/*ft*/);
+    virtual bool is_valid_e_entry(Addr) = 0;
+    virtual bool has_valid_vmlinux_head() = 0;
+    virtual bool canPack();
+    virtual void pack(OutputFile *fo);
+    virtual int canUnpack();  // bool, except -1: format known, but not packed
+    virtual void unpack(OutputFile *fo);
+    virtual unsigned write_vmlinux_head(
+        OutputFile *const fo,
+        Shdr *const stxt
+    ) = 0;
+    static int __acc_cdecl_qsort compare_Phdr(void const *aa, void const *bb);
+};
+
+
+class PackVmlinuxI386 : public PackVmlinuxBase<ElfClass_LE32>
+{
+    typedef PackVmlinuxBase<ElfClass_LE32> super;
+public:
+    PackVmlinuxI386(InputFile *f) : super(f, Ehdr::EM_386,
+        Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "startup_32") { }
+    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"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual void defineDecompressorSymbols();
+    virtual Linker* newLinker() const;
+    virtual bool is_valid_e_entry(Addr);
+    virtual bool has_valid_vmlinux_head();
+    virtual unsigned write_vmlinux_head(
+        OutputFile *const fo,
+        Shdr *const stxt
+    );
+};
+
+
+class PackVmlinuxARM : public PackVmlinuxBase<ElfClass_LE32>
+{
+    typedef PackVmlinuxBase<ElfClass_LE32> super;
+public:
+    PackVmlinuxARM(InputFile *f) : super(f, Ehdr::EM_ARM,
+        Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "decompress_kernel") { }
+    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"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual void defineDecompressorSymbols();
+    virtual Linker* newLinker() const;
+    virtual bool is_valid_e_entry(Addr);
+    virtual bool has_valid_vmlinux_head();
+    virtual unsigned write_vmlinux_head(
+        OutputFile *const fo,
+        Shdr *const stxt
+    );
+};
+
+
+class PackVmlinuxAMD64 : public PackVmlinuxBase<ElfClass_LE64>
+{
+    typedef PackVmlinuxBase<ElfClass_LE64> super;
+public:
+    PackVmlinuxAMD64(InputFile *f) : super(f, Ehdr::EM_X86_64,
+        Ehdr::ELFCLASS64, Ehdr::ELFDATA2LSB, "startup_32") { }
+    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"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual void defineDecompressorSymbols();
+    virtual Linker* newLinker() const;
+    virtual bool is_valid_e_entry(Addr);
+    virtual bool has_valid_vmlinux_head();
+    virtual unsigned write_vmlinux_head(
+        OutputFile *const fo,
+        Shdr *const stxt
+    );
 };
 
 

src/p_vmlinz.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -67,9 +67,9 @@ const int *PackVmlinuzI386::getCompressionMethods(int method, int level) const
 const int *PackVmlinuzI386::getFilters() const
 {
     static const int filters[] = {
-        0x49,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x15, 0x12,
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
-    -1 };
+    FT_END };
     return filters;
 }
 
@@ -100,7 +100,7 @@ int PackVmlinuzI386::readFileHeader()
         return 0;
 
     int format = UPX_F_VMLINUZ_i386;
-    unsigned sys_size = ALIGN_UP(file_size, 16) - setup_size;
+    unsigned sys_size = ALIGN_UP((unsigned) file_size, 16u) - setup_size;
 
     const unsigned char *p = (const unsigned char *) &h + 0x1e3;
 
@@ -137,13 +137,13 @@ int PackVmlinuzI386::decompressKernel()
     // See startup_32: in linux/arch/i386/boot/compressed/head.S
     char const *p = (char const *)&obuf[setup_size];
     for (int j= 0; j < 0x200; ++j, ++p)
-    if (0==strncmp("\xEA\x00\x00", p, 3) && 0==(0xf & p[3]) && 0==p[4]) {
+    if (0==memcmp("\xEA\x00\x00", p, 3) && 0==(0xf & p[3]) && 0==p[4]) {
         /* whole megabyte < 16MB */
         physical_start = get_le32(1+ p);
         break;
     }
 
-    checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, 1024));
+    checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024));
 
     for (int gzoff = setup_size; gzoff < file_size; gzoff++)
     {
@@ -208,7 +208,7 @@ int PackVmlinuzI386::decompressKernel()
         if (fd_pos != file_size)
         {
             //printf("fd_pos: %ld, file_size: %ld\n", (long)fd_pos, (long)file_size);
-            throwCantPack("trailing bytes after kernel image; use option `-f' to force packing");
+            throwCantPack("trailing bytes after kernel image; use option '-f' to force packing");
         }
 
 
@@ -227,7 +227,7 @@ int PackVmlinuzI386::decompressKernel()
         &&  0x0F==ibuf[19] && 0xA2==ibuf[20]  // cpuid
         ) goto head_ok;
 
-        throwCantPack("unrecognized kernel architecture; use option `-f' to force packing");
+        throwCantPack("unrecognized kernel architecture; use option '-f' to force packing");
     head_ok:
 
         // FIXME: more checks for special magic bytes in ibuf ???
@@ -275,6 +275,7 @@ void PackVmlinuzI386::buildLoader(const Filter *ft)
     // prepare loader
     initLoader(stub_i386_linux_kernel_vmlinuz, sizeof(stub_i386_linux_kernel_vmlinuz));
     addLoader("LINUZ000",
+              ph.first_offset_found == 1 ? "LINUZ001" : "",
               ft->id ? "LZCALLT1" : "",
               "LZIMAGE0",
               getDecompressorSections(),
@@ -290,19 +291,6 @@ void PackVmlinuzI386::buildLoader(const Filter *ft)
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-    return true;
-}
-
 void PackVmlinuzI386::pack(OutputFile *fo)
 {
     readKernel();
@@ -316,12 +304,12 @@ void PackVmlinuzI386::pack(OutputFile *fo)
     upx_compress_config_t cconf; cconf.reset();
     // limit stack size needed for runtime decompression
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, 512, 0, NULL, &cconf);
+    compressWithFilters(&ft, 512, &cconf);
 
     const unsigned lsize = getLoaderSize();
 
-    defineFilterSymbols(linker, &ft);
     defineDecompressorSymbols();
+    defineFilterSymbols(&ft);
     linker->defineSymbol("src_for_decompressor", zimage_offset + lsize);
     linker->defineSymbol("original_entry", physical_start);
     linker->defineSymbol("stack_offset", stack_offset_during_uncompression);
@@ -332,7 +320,7 @@ void PackVmlinuzI386::pack(OutputFile *fo)
     patchPackHeader(loader, lsize);
 
     boot_sect_t * const bs = (boot_sect_t *) ((unsigned char *) setup_buf);
-    bs->sys_size = ALIGN_UP(lsize + ph.c_len, 16) / 16;
+    bs->sys_size = ALIGN_UP(lsize + ph.c_len, 16u) / 16;
 
     fo->write(setup_buf, setup_buf.getSize());
     fo->write(loader, lsize);
@@ -361,6 +349,7 @@ void PackBvmlinuzI386::buildLoader(const Filter *ft)
     // prepare loader
     initLoader(stub_i386_linux_kernel_vmlinuz, sizeof(stub_i386_linux_kernel_vmlinuz));
     addLoader("LINUZ000",
+              ph.first_offset_found == 1 ? "LINUZ001" : "",
               (0x40==(0xf0 & ft->id)) ? "LZCKLLT1" : (ft->id ? "LZCALLT1" : ""),
               "LBZIMAGE,IDENTSTR",
               "+40", // align the stuff to 4 byte boundary
@@ -401,16 +390,16 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
     upx_compress_config_t cconf; cconf.reset();
     // limit stack size needed for runtime decompression
     cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    compressWithFilters(&ft, 512, 0, NULL, &cconf);
+    compressWithFilters(&ft, 512, &cconf);
 
     // align everything to dword boundary - it is easier to handle
     unsigned c_len = ph.c_len;
     memset(obuf + c_len, 0, 4);
-    c_len = ALIGN_UP(c_len, 4);
+    c_len = ALIGN_UP(c_len, 4u);
 
     const unsigned lsize = getLoaderSize();
 
-    if (ph.method == M_LZMA) {
+    if (M_IS_LZMA(ph.method)) {
         const lzma_compress_result_t *res = &ph.compress_result.result_lzma;
         acc_uint32e_t properties = // lc, lp, pb, dummy
             (res->lit_context_bits << 0) |
@@ -429,11 +418,11 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
     const int e_len = getLoaderSectionStart("LZCUTPOI");
     assert(e_len > 0);
 
-    const unsigned d_len4 = ALIGN_UP(lsize - e_len, 4);
+    const unsigned d_len4 = ALIGN_UP(lsize - e_len, 4u);
-    const unsigned decompr_pos = ALIGN_UP(ph.u_len + ph.overlap_overhead, 16);
+    const unsigned decompr_pos = ALIGN_UP(ph.u_len + ph.overlap_overhead, 16u);
     const unsigned copy_size = c_len + d_len4;
     const unsigned edi = decompr_pos + d_len4 - 4;          // copy to
-    const unsigned esi = ALIGN_UP(c_len + lsize, 4) - 4;     // copy from
+    const unsigned esi = ALIGN_UP(c_len + lsize, 4u) - 4;   // copy from
 
     linker->defineSymbol("decompressor", decompr_pos - bzimage_offset + physical_start);
     linker->defineSymbol("src_for_decompressor", physical_start + decompr_pos - c_len);
@@ -441,10 +430,7 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
     linker->defineSymbol("copy_dest", physical_start + edi);
     linker->defineSymbol("copy_source", bzimage_offset + esi);
 
-    defineFilterSymbols(linker, &ft);
+    defineFilterSymbols(&ft);
-    if (0x40==(0xf0 & ft.id)) {
-        linker->defineSymbol("filter_length", ph.u_len); // redefine
-    }
     defineDecompressorSymbols();
     linker->defineSymbol("original_entry", physical_start);
     linker->defineSymbol("stack_offset", stack_offset_during_uncompression);
@@ -455,7 +441,7 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
     patchPackHeader(loader, lsize);
 
     boot_sect_t * const bs = (boot_sect_t *) ((unsigned char *) setup_buf);
-    bs->sys_size = (ALIGN_UP(lsize + c_len, 16) / 16) & 0xffff;
+    bs->sys_size = (ALIGN_UP(lsize + c_len, 16u) / 16) & 0xffff;
 
     fo->write(setup_buf, setup_buf.getSize());
     fo->write(loader, e_len);

src/p_vmlinz.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_VMLINUZ_i386; }
     virtual const char *getName() const { return "vmlinuz/386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.vmlinuz"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -101,6 +102,7 @@ public:
     PackBvmlinuzI386(InputFile *f) : super(f) { }
     virtual int getFormat() const { return UPX_F_BVMLINUZ_i386; }
     virtual const char *getName() const { return "bvmlinuz/386"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-linux.kernel.bvmlinuz"; }
 
     virtual void pack(OutputFile *fo);
 
@@ -120,6 +122,7 @@ public:
     PackElks8086(InputFile *f) : super(f) { }
     virtual int getFormat() const { return UPX_F_ELKS_8086; }
     virtual const char *getName() const { return "elks/8086"; }
+    virtual const char *getFullName(const options_t *) const { return "i086-elks ???"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_vxd.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -59,7 +59,7 @@ protected:
     virtual void encodeFixups();
     virtual void decodeFixups();
 
-    virtual void encodeImage(const Filter *ft);
+    virtual void encodeImage(Filter *ft);
     virtual void decodeImage();
 };
 

src/p_w16ne.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/p_w16ne.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_WIN16_NE; }
     virtual const char *getName() const { return "win16/ne"; }
+    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_w32pe.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -142,8 +142,9 @@ const int *PackW32Pe::getCompressionMethods(int method, int level) const
 const int *PackW32Pe::getFilters() const
 {
     static const int filters[] = {
-        0x26, 0x24, 0x16, 0x13, 0x14, 0x11, 0x25, 0x15, 0x12,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-    -1 };
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
+    FT_END };
     return filters;
 }
 
@@ -168,20 +169,6 @@ int PackW32Pe::readFileHeader()
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-    return true;
-}
-
-
 /*************************************************************************
 // import handling
 **************************************************************************/
@@ -530,7 +517,7 @@ void PackW32Pe::processLoadConf(Reloc *rel, const Interval *iv,
 
 bool PackW32Pe::canPack()
 {
-    if (!readFileHeader())
+    if (!readFileHeader() || ih.cpu < 0x14c || ih.cpu > 0x150)
         return false;
     return true;
 }
@@ -552,6 +539,7 @@ void PackW32Pe::buildLoader(const Filter *ft)
               icondir_count > 1 ? (icondir_count == 2 ? "PEICONS1" : "PEICONS2") : "",
               tmp_tlsindex ? "PETLSHAK" : "",
               "PEMAIN02",
+              ph.first_offset_found == 1 ? "PEMAIN03" : "",
               getDecompressorSections(),
               /*multipass ? "PEMULTIP" :  */  "",
               "PEMAIN10",
@@ -649,7 +637,7 @@ void PackW32Pe::pack(OutputFile *fo)
     if (ih.entry && ih.entry < rvamin)
         throwCantPack("run a virus scanner on this file!");
     if (!opt->force && ih.subsystem == 1)
-        throwCantPack("subsystem `native' is not supported (try --force)");
+        throwCantPack("subsystem 'native' is not supported (try --force)");
     if (ih.filealign < 0x200)
         throwCantPack("filealign < 0x200 is not yet supported");
 
@@ -722,9 +710,9 @@ void PackW32Pe::pack(OutputFile *fo)
 
     const unsigned dllstrings = processImports();
     processTls(&tlsiv); // call before processRelocs!!
+    processLoadConf(&loadconfiv);
     processResources(&res);
     processExports(&xport);
-    processLoadConf(&loadconfiv);
     processRelocs();
 
     //OutputFile::dump("x1", ibuf, usize);
@@ -794,17 +782,17 @@ void PackW32Pe::pack(OutputFile *fo)
     ft.buf_len = ih.codesize;
     ft.addvalue = ih.codebase - rvamin;
     // compress
-    int strategy = allow_filter ? 0 : -3;
+    int filter_strategy = allow_filter ? 0 : -3;
 
     // disable filters for files with broken headers
     if (ih.codebase + ih.codesize > ph.u_len)
     {
         ft.buf_len = 1;
-        strategy = -3;
+        filter_strategy = -3;
     }
 
-    compressWithFilters(&ft, 2048, strategy,
+    compressWithFilters(&ft, 2048, NULL_cconf, filter_strategy,
-                        NULL, NULL, ih.codebase, rvamin);
+                        ih.codebase, rvamin, 0, NULL, 0);
 // info: see buildLoader()
     newvsize = (ph.u_len + rvamin + ph.overlap_overhead + oam1) &~ oam1;
     if (tlsindex && ((newvsize - ph.c_len - 1024 + oam1) &~ oam1) > tlsindex + 4)
@@ -818,12 +806,14 @@ void PackW32Pe::pack(OutputFile *fo)
 
     pe_section_t osection[3];
     // section 0 : bss
-    //         1 : [ident + header] + packed_data + unpacker + tls
+    //         1 : [ident + header] + packed_data + unpacker + tls + loadconf
     //         2 : not compressed data
 
     // section 2 should start with the resource data, because lots of lame
     // windoze codes assume that resources starts on the beginning of a section
 
+    // note: there should be no data in section 2 which needs fixup
+
     // identsplit - number of ident + (upx header) bytes to put into the PE header
     int identsplit = pe_offset + sizeof(osection) + sizeof(oh);
     if ((identsplit & 0x1ff) == 0)
@@ -837,7 +827,7 @@ void PackW32Pe::pack(OutputFile *fo)
     const unsigned c_len = ((ph.c_len + ic) & 15) == 0 ? ph.c_len : ph.c_len + 16 - ((ph.c_len + ic) & 15);
     obuf.clear(ph.c_len, c_len - ph.c_len);
 
-    const unsigned s1size = ALIGN_UP(ic + c_len + codesize,4) + sotls;
+    const unsigned s1size = ALIGN_UP(ic + c_len + codesize,4u) + sotls + soloadconf;
     const unsigned s1addr = (newvsize - (ic + c_len) + oam1) &~ oam1;
 
     const unsigned ncsection = (s1addr + s1size + oam1) &~ oam1;
@@ -888,9 +878,9 @@ void PackW32Pe::pack(OutputFile *fo)
     linker->defineSymbol("VirtualFree", myimport + get_le32(oimpdlls + 16) + 16);
 #endif
 
-    defineFilterSymbols(linker, &ft);
-    linker->defineSymbol("filter_buffer_start", ih.codebase - rvamin);
     defineDecompressorSymbols();
+    defineFilterSymbols(&ft);
+    linker->defineSymbol("filter_buffer_start", ih.codebase - rvamin);
 
     // in case of overlapping decompression, this hack is needed,
     // because windoze zeroes the word pointed by tlsindex before
@@ -907,6 +897,7 @@ void PackW32Pe::pack(OutputFile *fo)
     linker->defineSymbol("start_of_compressed", esi0 + ih.imagebase);
 
     linker->defineSymbol(isdll ? "PEISDLL1" : "PEMAIN01", upxsection);
+    //linker->dumpSymbols();
     relocateLoader();
 
     const unsigned lsize = getLoaderSize();
@@ -934,14 +925,19 @@ void PackW32Pe::pack(OutputFile *fo)
     ODADDR(PEDIR_BOUNDIM) = 0;
     ODSIZE(PEDIR_BOUNDIM) = 0;
 
-    // tls is put into section 1
+    // tls & loadconf are put into section 1
 
-    ic = s1addr + s1size - sotls;
+    ic = s1addr + s1size - sotls - soloadconf;
     processTls(&rel,&tlsiv,ic);
     ODADDR(PEDIR_TLS) = sotls ? ic : 0;
     ODSIZE(PEDIR_TLS) = sotls ? 0x18 : 0;
     ic += sotls;
 
+    processLoadConf(&rel, &loadconfiv, ic);
+    ODADDR(PEDIR_LOADCONF) = soloadconf ? ic : 0;
+    ODSIZE(PEDIR_LOADCONF) = soloadconf;
+    ic += soloadconf;
+
     // these are put into section 2
 
     ic = ncsection;
@@ -966,19 +962,13 @@ void PackW32Pe::pack(OutputFile *fo)
     }
     ic += soexport;
 
-    processLoadConf(&rel, &loadconfiv, ic);
-    ODADDR(PEDIR_LOADCONF) = soloadconf ? ic : 0;
-    ODSIZE(PEDIR_LOADCONF) = soloadconf;
-    ic += soloadconf;
-
     processRelocs(&rel);
     ODADDR(PEDIR_RELOC) = soxrelocs ? ic : 0;
     ODSIZE(PEDIR_RELOC) = soxrelocs;
     ic += soxrelocs;
 
     // this is computed here, because soxrelocs changes some lines above
-    const unsigned ncsize = soresources + soimpdlls + soexport + soloadconf
+    const unsigned ncsize = soresources + soimpdlls + soexport + soxrelocs;
-        + soxrelocs;
     ic = oh.filealign - 1;
 
     // this one is tricky: it seems windoze touches 4 bytes after
@@ -1060,12 +1050,12 @@ void PackW32Pe::pack(OutputFile *fo)
     if ((ic = fo->getBytesWritten() & 3) != 0)
         fo->write(ibuf,4 - ic);
     fo->write(otls,sotls);
+    fo->write(oloadconf, soloadconf);
     if ((ic = fo->getBytesWritten() & (oh.filealign-1)) != 0)
         fo->write(ibuf,oh.filealign - ic);
     fo->write(oresources,soresources);
     fo->write(oimpdlls,soimpdlls);
     fo->write(oexport,soexport);
-    fo->write(oloadconf, soloadconf);
     fo->write(oxrelocs,soxrelocs);
 
     if ((ic = fo->getBytesWritten() & (oh.filealign-1)) != 0)
@@ -1165,7 +1155,8 @@ int PackW32Pe::canUnpack()
 
 void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
 {
-    if (ODADDR(PEDIR_IMPORT) == 0)
+    if (ODADDR(PEDIR_IMPORT) == 0
+        || ODSIZE(PEDIR_IMPORT) <= sizeof(import_desc))
         return;
 
 //    const upx_byte * const idata = obuf + get_le32(extrainfo);
@@ -1183,6 +1174,7 @@ void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
     for (p = idata; get_le32(p) != 0; ++p)
     {
         const upx_byte *dname = get_le32(p) + import;
+        ICHECK(dname, 1);
         const unsigned dlen = strlen(dname);
         ICHECK(dname, dlen + 1);
 
@@ -1195,7 +1187,7 @@ void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
             else
                 p += 5;
     }
-    sdllnames = ALIGN_UP(sdllnames,2);
+    sdllnames = ALIGN_UP(sdllnames, 2u);
 
     upx_byte * const Obuf = obuf - rvamin;
     import_desc * const im0 = (import_desc*) (Obuf + ODADDR(PEDIR_IMPORT));
@@ -1208,6 +1200,7 @@ void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
     {
         // restore the name of the dll
         const upx_byte *dname = get_le32(p) + import;
+        ICHECK(dname, 1);
         const unsigned dlen = strlen(dname);
         ICHECK(dname, dlen + 1);
 

src/p_w32pe.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -35,13 +35,14 @@
 
 class PackW32Pe : public PeFile
 {
-    typedef PeFile super;;
+    typedef PeFile super;
 
 public:
     PackW32Pe(InputFile *f);
     virtual ~PackW32Pe();
     virtual int getFormat() const { return UPX_F_WIN32_PE; }
     virtual const char *getName() const { return isrtm ? "rtm32/pe" : "win32/pe"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-win32.pe"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 

src/p_wcle.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -76,8 +76,9 @@ const int *PackWcle::getCompressionMethods(int method, int level) const
 const int *PackWcle::getFilters() const
 {
     static const int filters[] = {
-        0x26, 0x24, 0x14, 0x11, 0x16, 0x13, 0x25, 0x12, 0x15,
+        0x26, 0x24, 0x49, 0x46, 0x16, 0x13, 0x14, 0x11,
-    -1 };
+        FT_ULTRA_BRUTE, 0x25, 0x15, 0x12,
+    FT_END };
     return filters;
 }
 
@@ -92,7 +93,9 @@ void PackWcle::buildLoader(const Filter *ft)
 {
     // prepare loader
     initLoader(stub_i386_dos32_watcom_le, sizeof(stub_i386_dos32_watcom_le));
-    addLoader("IDENTSTR,WCLEMAIN,UPX1HEAD,WCLECUTP", NULL);
+    addLoader("IDENTSTR,WCLEMAIN",
+              ph.first_offset_found == 1 ? "WCLEMAIN02" : "",
+              "WCLEMAIN03,UPX1HEAD,WCLECUTP", NULL);
 
     // fake alignment for the start of the decompressor
     linker->defineSymbol("WCLECUTP", 0x1000);
@@ -140,20 +143,6 @@ bool PackWcle::canPack()
 }
 
 
-static bool defineFilterSymbols(Linker *linker, const Filter *ft)
-{
-    if (ft->id == 0)
-        return false;
-    assert(ft->calls > 0);
-
-    linker->defineSymbol("filter_cto", ft->cto);
-    linker->defineSymbol("filter_length",
-                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
-                         ft->lastcall - ft->calls * 4);
-    return true;
-}
-
-
 /*************************************************************************
 //
 **************************************************************************/
@@ -428,7 +417,7 @@ void PackWcle::preprocessFixups()
 
 
 #define RESERVED 0x1000
-void PackWcle::encodeImage(const Filter *ft)
+void PackWcle::encodeImage(Filter *ft)
 {
     // concatenate image & preprocessed fixups
     unsigned isize = soimage + sofixups;
@@ -438,16 +427,18 @@ void PackWcle::encodeImage(const Filter *ft)
 
     delete[] ifixups; ifixups = NULL;
 
-    // compress
     oimage.allocForCompression(isize, RESERVED+512);
-    ph.filter = ft->id;
+    // prepare packheader
-    ph.filter_cto = ft->cto;
     ph.u_len = isize;
-    // reserve RESERVED bytes for the decompressor
+    // prepare filter [already done]
-    if (!compress(ibuf,oimage+RESERVED))
+    // compress
-        throwNotCompressible();
+    upx_compress_config_t cconf; cconf.reset();
-    ph.overlap_overhead = findOverlapOverhead(oimage+RESERVED, 512);
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
-    buildLoader(ft);
+    compressWithFilters(ibuf, isize,
+                        oimage + RESERVED,
+                        ibuf + ft->addvalue, ft->buf_len,
+                        NULL, 0,
+                        ft, 512, &cconf, 0);
 
     ibuf.dealloc();
     soimage = ph.c_len;
@@ -506,15 +497,13 @@ void PackWcle::pack(OutputFile *fo)
     ifixups[sofixups+12] = (unsigned char) (unsigned) objects;
     sofixups += 13;
 
-    // filter
+    // prepare filter
     Filter ft(ph.level);
-    tryFilters(&ft, iimage+text_vaddr, text_size, text_vaddr);
+    ft.buf_len = text_size;
-
+    ft.addvalue = text_vaddr;
+    // compress
     encodeImage(&ft);
 
-    // verify filter
-    ft.verifyUnfilter();
-
     const unsigned lsize = getLoaderSize();
     neweip = getLoaderSection("WCLEMAIN");
     int e_len = getLoaderSectionStart("WCLECUTP");
@@ -546,9 +535,9 @@ void PackWcle::pack(OutputFile *fo)
     linker->defineSymbol("original_stack", ih.init_esp_offset +
                          IOT(ih.init_ss_object - 1, my_base_address));
     linker->defineSymbol("start_of_relocs", mps*pages);
-    defineFilterSymbols(linker, &ft);
-    linker->defineSymbol("filter_buffer_start", text_vaddr);
     defineDecompressorSymbols();
+    defineFilterSymbols(&ft);
+    linker->defineSymbol("filter_buffer_start", text_vaddr);
 
     unsigned jpos = (((ph.c_len + 3) &~ 3) + d_len + 3) / 4;
     linker->defineSymbol("words_to_copy", jpos);
@@ -566,6 +555,9 @@ void PackWcle::pack(OutputFile *fo)
 
     writeFile(fo, opt->watcom_le.le);
 
+    // verify
+    verifyOverlappingDecompression(oimage + e_len, oimage.getSize() - e_len);
+
     // copy the overlay
     const unsigned overlaystart = ih.data_pages_offset + exe_offset
         + getImageSize();

src/p_wcle.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,6 +42,7 @@ public:
     virtual int getVersion() const { return 13; }
     virtual int getFormat() const { return UPX_F_WATCOM_LE; }
     virtual const char *getName() const { return "watcom/le"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.watcom.le"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
 
@@ -73,7 +74,7 @@ protected:
     virtual void encodeFixups();
     virtual void decodeFixups();
 
-    virtual void encodeImage(const Filter *ft);
+    virtual void encodeImage(Filter *ft);
     virtual void decodeImage();
 
     static void virt2rela(const le_object_table_entry_t *, unsigned *objn, unsigned *addr);

src/packer.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -45,7 +45,8 @@ Packer::Packer(InputFile *f) :
     uip(NULL), linker(NULL),
     last_patch(NULL), last_patch_len(0), last_patch_off(0)
 {
-    file_size = f->st.st_size;
+    if (fi != NULL)
+        file_size = fi->st.st_size;
     uip = new UiPacker(this);
     memset(&ph, 0, sizeof(ph));
 }
@@ -59,13 +60,15 @@ Packer::~Packer()
 
 
 // for PackMaster
-void Packer::assertPacker()
+void Packer::assertPacker() const
 {
     assert(getFormat() > 0);
     assert(getFormat() <= 255);
     assert(getVersion() >= 11);
     assert(getVersion() <= 14);
     assert(strlen(getName()) <= 13);
+    assert(strlen(getFullName(opt)) <= 26);     // "i386-linux.kernel.bvmlinuz"
+    assert(strlen(getFullName(NULL)) <= 26);    // "i386-linux.kernel.bvmlinuz"
     if (bele == NULL) fprintf(stderr, "%s\n", getName());
     assert(bele != NULL);
 #if 1
@@ -160,7 +163,9 @@ bool Packer::testUnpackFormat(int format) const
 
 bool ph_skipVerify(const PackHeader &ph)
 {
-    if (ph.method == M_LZMA)
+    if (M_IS_DEFLATE(ph.method))
+        return false;
+    if (M_IS_LZMA(ph.method))
         return false;
     if (ph.level > 1)
         return false;
@@ -172,9 +177,10 @@ bool ph_skipVerify(const PackHeader &ph)
 // compress - wrap call to low-level upx_compress()
 **************************************************************************/
 
-bool Packer::compress(upx_bytep in, upx_bytep out,
+bool Packer::compress(upx_bytep i_ptr, unsigned i_len, upx_bytep o_ptr,
                       const upx_compress_config_t *cconf_parm)
 {
+    ph.u_len = i_len;
     ph.c_len = 0;
     assert(ph.level >= 1); assert(ph.level <= 10);
 
@@ -185,7 +191,7 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
     ph.saved_u_adler = ph.u_adler;
     ph.saved_c_adler = ph.c_adler;
     // update checksum of uncompressed data
-    ph.u_adler = upx_adler32(in, ph.u_len, ph.u_adler);
+    ph.u_adler = upx_adler32(i_ptr, ph.u_len, ph.u_adler);
 
     // set compression paramters
     upx_compress_config_t cconf; cconf.reset();
@@ -231,7 +237,7 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
     //OutputFile::dump("data.raw", in, ph.u_len);
 
     // compress
-    int r = upx_compress(in, ph.u_len, out, &ph.c_len,
+    int r = upx_compress(i_ptr, ph.u_len, o_ptr, &ph.c_len,
                          uip->getCallback(),
                          ph.method, ph.level, &cconf, &ph.compress_result);
 
@@ -269,13 +275,13 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
         return false;
 
     // update checksum of compressed data
-    ph.c_adler = upx_adler32(out, ph.c_len, ph.c_adler);
+    ph.c_adler = upx_adler32(o_ptr, ph.c_len, ph.c_adler);
     // Decompress and verify. Skip this when using the fastest level.
     if (!ph_skipVerify(ph))
     {
         // decompress
         unsigned new_len = ph.u_len;
-        r = upx_decompress(out, ph.c_len, in, &new_len, ph.method, &ph.compress_result);
+        r = upx_decompress(o_ptr, ph.c_len, i_ptr, &new_len, ph.method, &ph.compress_result);
         //printf("%d %d: %d %d %d\n", ph.method, r, ph.c_len, ph.u_len, new_len);
         if (r != UPX_E_OK)
             throwInternalError("decompression failed");
@@ -283,7 +289,7 @@ bool Packer::compress(upx_bytep in, upx_bytep out,
             throwInternalError("decompression failed (size error)");
 
         // verify decompression
-        if (ph.u_adler != upx_adler32(in, ph.u_len, ph.saved_u_adler))
+        if (ph.u_adler != upx_adler32(i_ptr, ph.u_len, ph.saved_u_adler))
             throwInternalError("decompression failed (checksum error)");
     }
     return true;
@@ -360,9 +366,8 @@ void ph_decompress(PackHeader &ph, const upx_bytep in, upx_bytep out,
     // verify checksum of decompressed data
     if (verify_checksum)
     {
-        if (ft) {
+        if (ft)
             ft->unfilter(out, ph.u_len);
-        }
         adler = upx_adler32(out, ph.u_len, ph.saved_u_adler);
         if (adler != ph.u_adler)
             throwChecksumError();
@@ -444,6 +449,20 @@ void Packer::verifyOverlappingDecompression(Filter *ft)
 }
 
 
+void Packer::verifyOverlappingDecompression(upx_bytep o_ptr, unsigned o_size, Filter *ft)
+{
+    assert(ph.c_len < ph.u_len);
+    assert((int)ph.overlap_overhead > 0);
+    if (ph_skipVerify(ph))
+        return;
+    unsigned offset = (ph.u_len + ph.overlap_overhead) - ph.c_len;
+    if (offset + ph.c_len > o_size)
+        return;
+    memmove(o_ptr + offset, o_ptr, ph.c_len);
+    decompress(o_ptr + offset, o_ptr, true, ft);
+}
+
+
 /*************************************************************************
 // Find overhead for in-place decompression in an heuristic way
 // (using a binary search). Return 0 on error.
@@ -464,7 +483,7 @@ unsigned Packer::findOverlapOverhead(const upx_bytep buf,
     unsigned low = 1;
     unsigned high = UPX_MIN(ph.u_len / 4 + 512, upper_limit);
     // but be optimistic for first try (speedup)
-    unsigned m = UPX_MIN(16, high);
+    unsigned m = UPX_MIN(16u, high);
     //
     unsigned overhead = 0;
     unsigned nr = 0;          // statistics
@@ -527,13 +546,13 @@ void Packer::handleStub(InputFile *fif, OutputFile *fo, long size)
 
 void Packer::checkOverlay(unsigned overlay)
 {
-    assert((int)overlay >= 0);
+    if ((int)overlay < 0 || (off_t)overlay > file_size)
-    assert((off_t)overlay < file_size);
+        throw OverlayException("invalid overlay size; file is possibly corrupt");
     if (overlay == 0)
         return;
     info("Found overlay: %d bytes", overlay);
     if (opt->overlay == opt->SKIP_OVERLAY)
-        throw OverlayException("file has overlay -- skipped; try `--overlay=copy'");
+        throw OverlayException("file has overlay -- skipped; try '--overlay=copy'");
 }
 
 
@@ -559,7 +578,7 @@ void Packer::copyOverlay(OutputFile *fo, unsigned overlay,
     // get buffer size, align to improve i/o speed
     unsigned buf_size = buf->getSize();
     if (buf_size > 65536)
-        buf_size = ALIGN_DOWN(buf_size, 4096);
+        buf_size = ALIGN_DOWN(buf_size, 4096u);
     assert((int)buf_size > 0);
 
     do {
@@ -622,7 +641,7 @@ void Packer::initPackHeader()
     memset(&ph, 0, sizeof(ph));
     ph.version = getVersion();
     ph.format = getFormat();
-    ph.method = -1;
+    ph.method = M_NONE;
     ph.level = -1;
     ph.u_adler = ph.c_adler = ph.saved_u_adler = ph.saved_c_adler = upx_adler32(NULL,0);
     ph.buf_offset = -1;
@@ -727,7 +746,7 @@ void Packer::checkAlreadyPacked(const void *b, int blen)
     //if (!tmp.fillPackHeader((unsigned char *)b + boff, blen - boff))
     //    return;
     //
-    // This also would require that the buffer in `b' holds
+    // This also would require that the buffer in 'b' holds
     // the full PackHeader, and not only the 4 magic bytes.
 
     throwAlreadyPacked();
@@ -1036,23 +1055,40 @@ void Packer::initLoader(const void *pdata, int plen, int small)
     linker->addSection("IDENTSTR", ident, size, 0);
 }
 
-void Packer::addLoader(const char *s)
-{
-    if (s)
-        linker->addLoader(s);
-}
 
-// provide specialization for [T = char]
+#define C const char *
-template <>
+void Packer::addLoader(C a)
-void __acc_cdecl_va Packer::addLoader<char>(const char *s, ...)
+{ addLoaderVA(a, NULL); }
+void Packer::addLoader(C a, C b)
+{ addLoaderVA(a, b, NULL); }
+void Packer::addLoader(C a, C b, C c)
+{ addLoaderVA(a, b, c, NULL); }
+void Packer::addLoader(C a, C b, C c, C d)
+{ addLoaderVA(a, b, c, d, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e)
+{ addLoaderVA(a, b, c, d, e, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e, C f)
+{ addLoaderVA(a, b, c, d, e, f, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e, C f, C g)
+{ addLoaderVA(a, b, c, d, e, f, g, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e, C f, C g, C h)
+{ addLoaderVA(a, b, c, d, e, f, g, h, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e, C f, C g, C h, C i)
+{ addLoaderVA(a, b, c, d, e, f, g, h, i, NULL); }
+void Packer::addLoader(C a, C b, C c, C d, C e, C f, C g, C h, C i, C j)
+{ addLoaderVA(a, b, c, d, e, f, g, h, i, j, NULL); }
+#undef C
+
+void __acc_cdecl_va Packer::addLoaderVA(const char *s, ...)
 {
     va_list ap;
+    const char *t = s;
 
     va_start(ap, s);
-    while (s != NULL)
+    while (t != NULL)
     {
-        linker->addLoader(s);
+        linker->addLoader(t);
-        s = va_arg(ap, const char *);
+        t = va_arg(ap, const char *);
     }
     va_end(ap);
 }
@@ -1134,10 +1170,10 @@ void Packer::relocateLoader()
 //
 // - updates this->ph
 // - updates *ft
-// - ibuf[] is restored to the original unfiltered version
+// - i_ptr[] is restored to the original unfiltered version
-// - obuf[] contains the best compressed version
+// - o_ptr[] contains the best compressed version
 //
-// strategy:
+// filter_strategy:
 //   n:  try the first N filters, use best one
 //  -1:  try all filters, use first working one
 //  -2:  try only the opt->filter filter
@@ -1167,26 +1203,109 @@ void Packer::relocateLoader()
 // is OK because of the simplicity of not having two output arrays.
 **************************************************************************/
 
-void Packer::compressWithFilters(Filter *parm_ft,
+static int prepareMethods(int *methods, int ph_method, const int *all_methods)
-                                 const unsigned overlap_range,
-                                 int strategy, const int *parm_filters,
-                                 const upx_compress_config_t *cconf,
-                                 unsigned filter_off, unsigned compress_buf_off,
-                                 unsigned char *hdr_buf,
-                                 unsigned hdr_u_len)
 {
-    const int *f;
+    int nmethods = 0;
-    //
+    if (!opt->all_methods || all_methods == NULL)
+    {
+        methods[nmethods++] = ph_method;
+        return nmethods;
+    }
+    for (int mm = 0; all_methods[mm] != M_END; ++mm)
+    {
+        int method = all_methods[mm];
+        if (method == M_ULTRA_BRUTE && !opt->ultra_brute)
+            break;
+        if (method == M_SKIP || method == M_ULTRA_BRUTE)
+            continue;
+        if (opt->all_methods && !opt->all_methods_use_lzma && M_IS_LZMA(method))
+            continue;
+        // use this method
+        assert(Packer::isValidCompressionMethod(method));
+        methods[nmethods++] = method;
+    }
+    return nmethods;
+}
+
+
+static int prepareFilters(int *filters, int &filter_strategy,
+                          const int *all_filters)
+{
+    int nfilters = 0;
+
+    // setup filter filter_strategy
+    if (filter_strategy == 0)
+    {
+        if (opt->all_filters)
+            // choose best from all available filters
+            filter_strategy = INT_MAX;
+        else if (opt->filter >= 0 && Filter::isValidFilter(opt->filter, all_filters))
+            // try opt->filter
+            filter_strategy = -2;
+        else
+            // try the first working filter
+            filter_strategy = -1;
+    }
+    assert(filter_strategy != 0);
+
+    if (filter_strategy == -3)
+        goto done;
+    if (filter_strategy == -2)
+    {
+        if (opt->filter >= 0 && Filter::isValidFilter(opt->filter, all_filters))
+        {
+            filters[nfilters++] = opt->filter;
+            goto done;
+        }
+        filter_strategy = -1;
+    }
+    assert(filter_strategy >= -1);
+
+    while (all_filters && *all_filters != FT_END)
+    {
+        int filter_id = *all_filters++;
+        if (filter_id == FT_ULTRA_BRUTE && !opt->ultra_brute)
+            break;
+        if (filter_id == FT_SKIP || filter_id == FT_ULTRA_BRUTE)
+            continue;
+        if (filter_id == 0)
+            continue;
+        // use this filter
+        assert(Filter::isValidFilter(filter_id));
+        filters[nfilters++] = filter_id;
+        if (filter_strategy >= 0 && nfilters >= filter_strategy)
+            break;
+    }
+
+done:
+    // filter_strategy now only means "stop after first successful filter"
+    filter_strategy = (filter_strategy < 0) ? -1 : 0;
+    // make sure that we have a "no filter" fallback
+    for (int i = 0; i < nfilters; i++)
+        if (filters[i] == 0)
+            return nfilters;
+    filters[nfilters++] = 0;
+    return nfilters;
+}
+
+
+void Packer::compressWithFilters(upx_bytep i_ptr, unsigned i_len,
+                                 upx_bytep o_ptr,
+                                 upx_bytep f_ptr, unsigned f_len,
+                                 const upx_bytep hdr_ptr, unsigned hdr_len,
+                                 Filter *parm_ft,
+                                 const unsigned overlap_range,
+                                 const upx_compress_config_t *cconf,
+                                 int filter_strategy)
+{
+    parm_ft->buf_len = f_len;
+    // struct copies
     const PackHeader orig_ph = this->ph;
           PackHeader best_ph = this->ph;
-    //
     const Filter orig_ft = *parm_ft;
           Filter best_ft = *parm_ft;
     //
-    const unsigned compress_buf_len = orig_ph.u_len;
+    best_ph.c_len = i_len;
-    const unsigned filter_len = orig_ft.buf_len ? orig_ft.buf_len : compress_buf_len;
-    //
-    best_ph.c_len = orig_ph.u_len;
     best_ph.overlap_overhead = 0;
     unsigned best_ph_lsize = 0;
     unsigned best_hdr_c_len = 0;
@@ -1194,135 +1313,70 @@ void Packer::compressWithFilters(Filter *parm_ft,
     // preconditions
     assert(orig_ph.filter == 0);
     assert(orig_ft.id == 0);
-    assert(filter_off + filter_len <= compress_buf_off + compress_buf_len);
 
-    // setup filter strategy
+    // prepare methods and filters
-    if (strategy == 0)
+    int methods[256];
-    {
+    int nmethods = prepareMethods(methods, ph.method, getCompressionMethods(M_ALL, ph.level));
-        if (opt->all_filters)
+    assert(nmethods > 0); assert(nmethods < 256);
-            // choose best from all available filters
+    int filters[256];
-            strategy = INT_MAX;
+    int nfilters = prepareFilters(filters, filter_strategy, getFilters());
-        else if (opt->filter >= 0 && isValidFilter(opt->filter))
+    assert(nfilters > 0); assert(nfilters < 256);
-            // try opt->filter
+#if 0
-            strategy = -2;
+    printf("compressWithFilters: m(%d):", nmethods);
+    for (int i = 0; i < nmethods; i++) printf(" %d", methods[i]);
+    printf(" f(%d):", nfilters);
+    for (int i = 0; i < nfilters; i++) printf(" %d", filters[i]);
+    printf("\n");
+#endif
+
+    // update total_passes; previous (ui_total_passes > 0) means incremental
+    if (uip->ui_total_passes > 0)
+        uip->ui_total_passes -= 1;
+    if (filter_strategy < 0)
+        uip->ui_total_passes += nmethods;
     else
-            // try the first working filter
+        uip->ui_total_passes += nfilters * nmethods;
-            strategy = -1;
-    }
-    assert(strategy != 0);
 
-    // setup raw_filters
+    // Working buffer for compressed data. Don't waste memory and allocate as needed.
-    int tmp_filters[] = { 0, -1 };
+    upx_bytep o_tmp = o_ptr;
-    const int *raw_filters = NULL;
+    MemBuffer o_tmp_buf;
-    if (strategy == -3)
-        raw_filters = tmp_filters;
-    else if (strategy == -2 && opt->filter >= 0)
-    {
-        tmp_filters[0] = opt->filter;
-        raw_filters = tmp_filters;
-    }
-    else
-    {
-        raw_filters = parm_filters;
-        if (raw_filters == NULL)
-            raw_filters = getFilters();
-        if (raw_filters == NULL)
-            raw_filters = tmp_filters;
-    }
 
-    // first pass - count number of filters
+    // compress using all methods/filters
-    int raw_nfilters = 0;
+    int nfilters_success_total = 0;
-    for (f = raw_filters; *f >= 0; f++)
+    for (int mm = 0; mm < nmethods; mm++) // for all methods
     {
-        assert(isValidFilter(*f));
-        raw_nfilters++;
-    }
-
-    // copy filters, add a 0
-    int nfilters = 0;
-    bool zero_seen = false;
-    Array(int, filters, raw_nfilters + 2);
-    for (f = raw_filters; *f >= 0; f++)
-    {
-        if (*f == 0)
-            zero_seen = true;
-        filters[nfilters++] = *f;
-        if (nfilters == strategy)
-            break;
-    }
-    if (!zero_seen)
-        filters[nfilters++] = 0;
-    filters[nfilters] = -1;
-
-    // methods
-    int tmp_methods[] = { ph.method, M_END };
-    const int *methods = NULL;
-    if (opt->all_methods)
-        methods = getCompressionMethods(-1, ph.level);
-    if (methods == NULL)
-        methods = tmp_methods;
-    int nmethods = 0;
-    for (int mm = 0; methods[mm] != M_END; ++mm)
-    {
-        if (methods[mm] == M_SKIP)
-            continue;
-        if (opt->all_methods && !opt->all_methods_use_lzma && methods[mm] == M_LZMA)
-            continue;
         assert(isValidCompressionMethod(methods[mm]));
-        nmethods++;
-    }
-    assert(nmethods > 0);
-
-    // update total_passes; previous (0 < ui_total_passes) means incremental
-    if (strategy < 0)
-        uip->ui_total_passes += 1 * nmethods - (0 < uip->ui_total_passes);
-    else
-        uip->ui_total_passes += nfilters * nmethods - (0 < uip->ui_total_passes);
-
-    // Working buffer for compressed data. Don't waste memory.
-    MemBuffer *otemp = &obuf;
-    MemBuffer otemp_buf;
-
-    // compress
-    int nfilters_success = 0;
-    for (int mm = 0; methods[mm] != M_END; ++mm) // for all methods
-    {
-        if (methods[mm] == M_SKIP)
-            continue;
-        if (opt->all_methods && !opt->all_methods_use_lzma && methods[mm] == M_LZMA)
-            continue;
         unsigned hdr_c_len = 0;
-        if (hdr_buf && hdr_u_len)
+        if (hdr_ptr != NULL && hdr_len)
         {
-            if (nfilters_success != 0 && otemp == &obuf)
+            if (nfilters_success_total != 0 && o_tmp == o_ptr)
             {
-                // do not overwrite obuf
+                // do not overwrite o_ptr
-                otemp_buf.allocForCompression(compress_buf_len);
+                o_tmp_buf.allocForCompression(UPX_MAX(hdr_len, i_len));
-                otemp = &otemp_buf;
+                o_tmp = o_tmp_buf;
             }
-            int r = upx_compress(hdr_buf, hdr_u_len, *otemp, &hdr_c_len,
+            int r = upx_compress(hdr_ptr, hdr_len, o_tmp, &hdr_c_len,
                                  NULL, methods[mm], 10, NULL, NULL);
             if (r != UPX_E_OK)
                 throwInternalError("header compression failed");
-            if (hdr_c_len >= hdr_u_len)
+            if (hdr_c_len >= hdr_len)
                 throwInternalError("header compression size increase");
         }
-        for (int i = 0; i < nfilters; i++)          // for all filters
+        int nfilters_success_mm = 0;
+        for (int ff = 0; ff < nfilters; ff++) // for all filters
         {
-            ibuf.checkState();
+            assert(isValidFilter(filters[ff]));
-            obuf.checkState();
             // get fresh packheader
             ph = orig_ph;
             ph.method = methods[mm];
-            ph.filter = filters[i];
+            ph.filter = filters[ff];
             ph.overlap_overhead = 0;
             // get fresh filter
             Filter ft = orig_ft;
             ft.init(ph.filter, orig_ft.addvalue);
             // filter
-            optimizeFilter(&ft, ibuf + filter_off, filter_len);
+            optimizeFilter(&ft, f_ptr, f_len);
-
+            bool success = ft.filter(f_ptr, f_len);
-            bool success = ft.filter(ibuf + filter_off, filter_len);
             if (ft.id != 0 && ft.calls == 0)
             {
                 // filter did not do anything - no need to call ft.unfilter()
@@ -1331,9 +1385,9 @@ void Packer::compressWithFilters(Filter *parm_ft,
             if (!success)
             {
                 // filter failed or was useless
-                if (strategy > 0)
+                if (filter_strategy >= 0)
                 {
-                    // adjust passes
+                    // adjust ui passes
                     if (uip->ui_pass >= 0)
                         uip->ui_pass++;
                 }
@@ -1344,22 +1398,24 @@ void Packer::compressWithFilters(Filter *parm_ft,
             printf("filter: id 0x%02x size %6d, calls %5d/%5d/%3d/%5d/%5d, cto 0x%02x\n",
                    ft.id, ft.buf_len, ft.calls, ft.noncalls, ft.wrongcalls, ft.firstcall, ft.lastcall, ft.cto);
 #endif
-            if (nfilters_success != 0 && otemp == &obuf)
+            if (nfilters_success_total != 0 && o_tmp == o_ptr)
             {
-                otemp_buf.allocForCompression(compress_buf_len);
+                o_tmp_buf.allocForCompression(i_len);
-                otemp = &otemp_buf;
+                o_tmp = o_tmp_buf;
             }
-            nfilters_success++;
+            nfilters_success_total++;
+            nfilters_success_mm++;
             ph.filter_cto = ft.cto;
             ph.n_mru = ft.n_mru;
             // compress
-            if (compress(ibuf + compress_buf_off, *otemp, cconf))
+            if (compress(i_ptr, i_len, o_tmp, cconf))
             {
                 unsigned lsize = 0;
+                // findOverlapOperhead() might be slow; omit if already too big.
                 if (ph.c_len + lsize + hdr_c_len <= best_ph.c_len + best_ph_lsize + best_hdr_c_len)
                 {
                     // get results
-                    ph.overlap_overhead = findOverlapOverhead(*otemp, overlap_range);
+                    ph.overlap_overhead = findOverlapOverhead(o_tmp, overlap_range);
                     buildLoader(&ft);
                     lsize = getLoaderSize();
                     assert(lsize > 0);
@@ -1387,9 +1443,9 @@ void Packer::compressWithFilters(Filter *parm_ft,
                 if (update)
                 {
                     assert((int)ph.overlap_overhead > 0);
-                    // update obuf[] with best version
+                    // update o_ptr[] with best version
-                    if (otemp != &obuf)
+                    if (o_tmp != o_ptr)
-                        memcpy(obuf, *otemp, ph.c_len);
+                        memcpy(o_ptr, o_tmp, ph.c_len);
                     // save compression results
                     best_ph = ph;
                     best_ph_lsize = lsize;
@@ -1397,20 +1453,16 @@ void Packer::compressWithFilters(Filter *parm_ft,
                     best_ft = ft;
                 }
             }
-            // restore ibuf[] - unfilter with verify
+            // restore - unfilter with verify
-            ft.unfilter(ibuf + filter_off, filter_len, true);
+            ft.unfilter(f_ptr, f_len, true);
-            //
+            if (filter_strategy < 0)
-            ibuf.checkState();
-            obuf.checkState();
-            otemp->checkState();
-            //
-            if (strategy < 0)
                 break;
         }
+        assert(nfilters_success_mm > 0);
     }
 
     // postconditions 1)
-    assert(nfilters_success > 0);
+    assert(nfilters_success_total > 0);
     assert(best_ph.u_len == orig_ph.u_len);
     assert(best_ph.filter == best_ft.id);
     assert(best_ph.filter_cto == best_ft.cto);
@@ -1434,6 +1486,49 @@ void Packer::compressWithFilters(Filter *parm_ft,
 }
 
 
+/*************************************************************************
+//
+**************************************************************************/
+
+void Packer::compressWithFilters(Filter *ft,
+                                 const unsigned overlap_range,
+                                 const upx_compress_config_t *cconf,
+                                 int filter_strategy)
+{
+    compressWithFilters(ft, overlap_range, cconf, filter_strategy,
+                        0, 0, 0, NULL, 0);
+}
+
+
+void Packer::compressWithFilters(Filter *ft,
+                                 const unsigned overlap_range,
+                                 const upx_compress_config_t *cconf,
+                                 int filter_strategy,
+                                 unsigned filter_off,
+                                 unsigned ibuf_off,
+                                 unsigned obuf_off,
+                                 const upx_bytep hdr_ptr, unsigned hdr_len)
+{
+    ibuf.checkState(); obuf.checkState();
+
+    upx_bytep i_ptr = ibuf + ibuf_off;
+    unsigned  i_len = ph.u_len;
+    upx_bytep o_ptr = obuf + obuf_off;
+    upx_bytep f_ptr = ibuf + filter_off;
+    unsigned  f_len = ft->buf_len ? ft->buf_len : i_len;
+
+    assert(f_ptr + f_len <= i_ptr + i_len);
+
+    compressWithFilters(i_ptr, i_len,
+                        o_ptr,
+                        f_ptr, f_len,
+                        hdr_ptr, hdr_len,
+                        ft, overlap_range, cconf, filter_strategy);
+
+    ibuf.checkState(); obuf.checkState();
+}
+
+
 /*
 vi:ts=4:et:nowrap
 */

src/packer.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 1996-2007 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -119,12 +119,13 @@ protected:
     Packer(InputFile *f);
 public:
     virtual ~Packer();
-    virtual void assertPacker();
+    virtual void assertPacker() const;
 
     virtual int getVersion() const = 0;
     // A unique integer ID for this executable format. See conf.h.
     virtual int getFormat() const = 0;
     virtual const char *getName() const = 0;
+    virtual const char *getFullName(const options_t *) const = 0;
     virtual const int *getCompressionMethods(int method, int level) const = 0;
     virtual const int *getFilters() const = 0;
 
@@ -168,7 +169,7 @@ public:
 
 protected:
     // main compression drivers
-    virtual bool compress(upx_bytep in, upx_bytep out,
+    virtual bool compress(upx_bytep i_ptr, unsigned i_len, upx_bytep o_ptr,
                           const upx_compress_config_t *cconf = NULL);
     virtual void decompress(const upx_bytep in, upx_bytep out,
                             bool verify_checksum = true, Filter *ft = NULL);
@@ -179,13 +180,25 @@ protected:
     // high-level compression drivers
     void compressWithFilters(Filter *ft,
                              const unsigned overlap_range,
-                             int strategy = 0,
+                             const upx_compress_config_t *cconf,
-                             const int *filters = NULL,
+                             int filter_strategy = 0);
-                             const upx_compress_config_t *cconf = NULL,
+    void compressWithFilters(Filter *ft,
-                             unsigned filter_buf_off = 0,
+                             const unsigned overlap_range,
-                             unsigned compress_buf_off = 0,
+                             const upx_compress_config_t *cconf,
-                             unsigned char *header_buffer = 0,
+                             int filter_strategy,
-                             unsigned header_length = 0);
+                             unsigned filter_buf_off,
+                             unsigned compress_ibuf_off,
+                             unsigned compress_obuf_off,
+                             const upx_bytep hdr_ptr, unsigned hdr_len);
+    // real compression driver
+    void compressWithFilters(upx_bytep i_ptr, unsigned i_len,
+                             upx_bytep o_ptr,
+                             upx_bytep f_ptr, unsigned f_len,
+                             const upx_bytep hdr_ptr, unsigned hdr_len,
+                             Filter *ft,
+                             const unsigned overlap_range,
+                             const upx_compress_config_t *cconf,
+                             int filter_strategy);
 
     // util for verifying overlapping decompresion
     //   non-destructive test
@@ -196,7 +209,8 @@ protected:
                                          unsigned range = 0,
                                          unsigned upper_limit = ~0u) const;
     //   destructive decompress + verify
-    virtual void verifyOverlappingDecompression(Filter *ft = NULL);
+    void verifyOverlappingDecompression(Filter *ft = NULL);
+    void verifyOverlappingDecompression(upx_bytep o_ptr, unsigned o_size, Filter *ft = NULL);
 
     // packheader handling
     virtual int patchPackHeader(void *b, int blen);
@@ -212,11 +226,17 @@ protected:
     virtual upx_byte *getLoader() const;
     virtual int getLoaderSize() const;
     virtual void initLoader(const void *pdata, int plen, int small=-1);
-    void addLoader(const char *);
+#define C const char *
+    void addLoader(C); void addLoader(C,C); void addLoader(C,C,C);
+    void addLoader(C,C,C,C); void addLoader(C,C,C,C,C);
+    void addLoader(C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C);
+    void addLoader(C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C);
+    void addLoader(C,C,C,C,C,C,C,C,C,C);
+#undef C
 #if 1 && (ACC_CC_GNUC >= 0x040100)
-    template <class T> void __acc_cdecl_va addLoader(const T *, ...) __attribute__((__sentinel__));
+    void __acc_cdecl_va addLoaderVA(const char *s, ...) __attribute__((__sentinel__));
 #else
-    template <class T> void __acc_cdecl_va addLoader(const T *, ...);
+    void __acc_cdecl_va addLoaderVA(const char *s, ...);
 #endif
     virtual int getLoaderSection(const char *name, int *slen=NULL) const;
     virtual int getLoaderSectionStart(const char *name, int *slen=NULL) const;
@@ -233,13 +253,9 @@ protected:
 
     // filter handling [see packer_f.cpp]
     virtual bool isValidFilter(int filter_id) const;
-    virtual void tryFilters(Filter *ft, upx_byte *buf, unsigned buf_len,
+    virtual void optimizeFilter(Filter *, const upx_byte *, unsigned) const { }
-                            unsigned addvalue=0) const;
-    virtual void scanFilters(Filter *ft, const upx_byte *buf, unsigned buf_len,
-                             unsigned addvalue=0) const;
-    virtual void optimizeFilter(Filter *, const upx_byte *, unsigned) const
-        { }
     virtual void addFilter32(int filter_id);
+    virtual void defineFilterSymbols(const Filter *ft);
 
     // stub and overlay util
     static void handleStub(InputFile *fi, OutputFile *fo, long size);
@@ -296,10 +312,6 @@ private:
 };
 
 
-template <>
-void __acc_cdecl_va Packer::addLoader<char>(const char *s, ...);
-
-
 #endif /* already included */