merge

Bvmlinuz fix filters
Style: start using correct IEC binary prefix (KiB, MiB, ...) - see
2008-04-26 13:08:13 -07:00 · 2008-04-26 13:04:13 -07:00 · 2008-04-26 08:48:13 +02:00 · 2008-04-26 08:23:05 +02:00 · 2008-04-25 12:07:38 -07:00 · 2008-04-24 12:15:07 -07:00
369 changed files with 50707 additions and 50465 deletions
@@ -1,8 +1,10 @@
 140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
+1931f4f28074970ec53b4cd21c7fc181b4da8e5e RELEASE_301
 223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
 2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
 2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
 396983c065fc743cb5b9703e266ca87eeff8a6ee RELEASE_291
+46f3a6cca02603000fadc16637b02e30caddd909 RELEASE_302
 70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
 a1c61174f54aac714f59ac20fcba839d71e64c5c RELEASE_292
 a916a2fe22de45167d25abcb40008315f415221c RELEASE_201
@@ -8,7 +8,7 @@


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


@@ -28,7 +28,7 @@ dos/exe
 watcom/le
 ---------
 * 16-bit selector alias fixups
- * 16-bit offset relocation for objects larger than 4 kB
+ * 16-bit offset relocation for objects larger than 4 KiB
 * 16:16 fixups

 If you need any of the above (they're very rare), send us an URL of a
@@ -36,7 +36,7 @@ endif
 	$(MAKE) -C doc $@


-ifneq ($(wildcard .hg/data/.),)
+ifneq ($(wildcard .hg/.),)
 # automatically generate ChangeLog from local Mercurial repo
 ChangeLog:
 	hg log --style=changelog > $@
@@ -2,6 +2,17 @@
 User visible changes for UPX
 ==================================================================

+Changes in 3.03 (27 Apr 2008):
+  * implement cache flushing for PowerPC (esp. model 440)
+  * fix cache flushing on MIPS (>3 MiB compressed, or with holes)
+  * fix MIPS big-endian
+  * bug fixes
+
+Changes in 3.02 (16 Dec 2007):
+  * fix unmapping on arm-linux.elf
+  * fix error checking in mmap for i386-linux.elf [triggered by -fPIE]
+  * bug fixes
+
 Changes in 3.01 (31 Jul 2007):
  * new options --no-mode, --no-owner and --no-time to disable preservation
    of mode (file permissions), file ownership and timestamps.
@@ -8,7 +8,7 @@


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


@@ -8,7 +8,7 @@


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


@@ -108,9 +108,9 @@ THE FUTURE
 COPYRIGHT
 =========

-Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2007 Laszlo Molnar
-Copyright (C) 2000-2007 John F. Reiser
+Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2008 Laszlo Molnar
+Copyright (C) 2000-2008 John F. Reiser

 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.
@@ -128,8 +128,8 @@ Share and enjoy,
 Markus & Laszlo


-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus@oberhumer.com                      ml1050@users.sourceforge.net
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>



@@ -8,7 +8,7 @@


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


@@ -69,7 +69,7 @@ Tools needed to build/modify the UPX sources
  - A C++ compiler supporting inner classes, templates, exceptions
    and RTTI.

-  - GNU make 3.80 or better (GNU make 3.81 recommened).
+  - GNU make 3.81 or better


 To compile the packer sources
@@ -94,9 +94,6 @@ To compile the packer sources
 If you want to modify the stub sources you'll also need
 -------------------------------------------------------

-  - GNU make 3.81 or better
-    http://savannah.gnu.org/projects/make/
-
  - Perl & Python

  - A number of cross-assemblers and cross-compilers - precompiled
@@ -8,7 +8,7 @@


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


@@ -1,5 +1,5 @@
           Decompressing ELF Directly to Memory on Linux/x86
-        Copyright (C) 2000-2007 John F. Reiser  jreiser@BitWagon.com
+        Copyright (C) 2000-2008 John F. Reiser  jreiser@BitWagon.com

 References:
  <elf.h>   definitions for the ELF file format
@@ -46,8 +46,8 @@ may not be used to take the address of a function.

 The address  0x00400000 was chosen to be out of the way of the usual
 load address 0x08048000, and to minimize fragmentation in kernel
-page tables; one page of page tables covers 4MB. The address
-0x00401000 was chosen as 1 page up from a 64KB boundary, to
+page tables; one page of page tables covers 4 MiB. The address
+0x00401000 was chosen as 1 page up from a 64 KiB boundary, to
 make the startup code and its constants smaller.

 Decompression of the executable begins by decompressing the Elf32_Ehdr
@@ -108,14 +108,14 @@ then skip another one - the unfiltering process needs some information
 to be able to reverse the filtering.

 UPX uses the following idea, which works nicely. First we assume that
-the size of the area that should be filtered is less than 16MB. Then
+the size of the area that should be filtered is less than 16 MiB. Then
 UPX scans over this area and keeps a record of the bytes that are
 following the 0xE8 bytes. If we are lucky, there will be bytes that
 were not found following 0xE8. These bytes are our candidates to be
 used as markers.

 Do you still remember that we assumed that the size of scanned area is
-less than 16MB? Well, this means that when we process a real call, the
+less than 16 MiB? Well, this means that when we process a real call, the
 resulting offset will be less than 0x00FFFFFF too. So the MSB is always
 0x00. Which is a nice place to store our marker. Of course we should
 reverse the byte order in the resulting offset - so this marker will
@@ -13,7 +13,7 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
 =head1 ABSTRACT

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


@@ -51,8 +51,8 @@ B<UPX> is a versatile executable packer with the following features:
  - excellent compression ratio: compresses better than zip/gzip,
      use UPX to decrease the size of your distribution !

-  - very fast decompression: about 10 MB/sec on an ancient Pentium 133,
-      about 200 MB/sec on an Athlon XP 2000+.
+  - very fast decompression: about 10 MiB/sec on an ancient Pentium 133,
+      about 200 MiB/sec on an Athlon XP 2000+.

  - no memory overhead for your compressed executables for most of the
      supported formats
@@ -153,7 +153,7 @@ as compared to the first decompressed version.]

 B<UPX> offers ten different compression levels from B<-1> to B<-9>,
 and B<--best>.  The default compression level is B<-8> for files
-smaller than 512 kB, and B<-7> otherwise.
+smaller than 512 KiB, and B<-7> otherwise.

 =over 4

@@ -349,7 +349,7 @@ Extra options available for this executable format:
 First of all, it is recommended to use B<UPX> *instead* of B<strip>. strip has
 the very bad habit of replacing your stub with its own (outdated) version.
 Additionally B<UPX> corrects a bug/feature in strip v2.8.x: it
-will fix the 4 KByte alignment of the stub.
+will fix the 4 KiB alignment of the stub.

 B<UPX> includes the full functionality of stubify. This means it will
 automatically stubify your COFF files. Use the option B<--coff> to
@@ -660,8 +660,8 @@ Specific drawbacks:

  - Because of temporary decompression to disk the decompression speed
    is not as fast as with the other executable formats. Still, I can see
-    no noticeable delay when starting programs like my ~3 MB emacs (which
-    is less than 1 MB when compressed :-).
+    no noticeable delay when starting programs like my ~3 MiB emacs (which
+    is less than 1 MiB when compressed :-).

 Extra options available for this executable format:

@@ -681,7 +681,7 @@ nostalgic feelings of one of the authors.
 Packed programs will be byte-identical to the original after uncompression,
 until further notice.

-Maximum uncompressed size: ~1.89 / ~7.60 Mbytes.
+Maximum uncompressed size: ~1.89 / ~7.60 MiB.

 Notes:

@@ -708,7 +708,7 @@ Extra options available for this executable format:

  --8-bit             Uses 8 bit size compression [default: 32 bit]

-  --8mb-ram           PSone has 8 MB ram available [default: 2 MB]
+  --8mib-ram          PSone has 8 MiB ram available [default: 2 MiB]

  --boot-only         This format is for main exes and CD-Mastering only !
                      It may slightly improve the compression ratio,
@@ -838,7 +838,7 @@ must end with ".scr" (as screensavers are handled slightly different
 than normal exe files).

 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
+10 - 30 KiB range) which can be seen by specifying the "-i" command
 line switch during compression.

 Extra options available for this executable format:
@@ -933,13 +933,13 @@ Please report all bugs immediately to the authors.

 =head1 COPYRIGHT

-Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer

-Copyright (C) 1996-2007 Laszlo Molnar
+Copyright (C) 1996-2008 Laszlo Molnar

-Copyright (C) 2000-2007 John F. Reiser
+Copyright (C) 2000-2008 John F. Reiser

-Copyright (C) 2002-2007 Jens Medoch
+Copyright (C) 2002-2008 Jens Medoch

 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -591,7 +591,7 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);


 /*************************************************************************
-// Provide namespaces and classes to abtract endianness policies.
+// Provide namespaces and classes to abstract endianness policies.
 //
 // CTP - Compile-Time Polymorphism (templates)
 // RTP - Run-Time Polymorphism (virtual functions)
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -276,7 +276,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
 #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
-    //  need about 6 MB of stack during runtime decompression.
+    //  need about 6 MiB of stack during runtime decompression.
    pr[1].uintVal = 4;
    pr[2].uintVal = 8;
 #endif
@@ -545,12 +545,14 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,

 const char *upx_lzma_version_string(void)
 {
-#if (WITH_LZMA == 0x449)
+#if (WITH_LZMA + 0 == 0x457)
+    return "4.57";
+#elif (WITH_LZMA + 0 == 0x449)
    return "4.49";
-#elif (WITH_LZMA == 0x443)
+#elif (WITH_LZMA + 0 == 0x443)
    return "4.43";
 #else
-#  error "unknown version"
+#  error "unknown WITH_LZMA version"
    return NULL;
 #endif
 }
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -379,12 +379,14 @@ inline unsigned UPX_MIN(unsigned a, unsigned b) { return a < b ? a : b; }

 #define ByteArray(var, size)    Array(unsigned char, var, size)

-struct nocopy
+struct noncopyable
 {
-    inline nocopy() {}
+protected:
+    inline noncopyable() {}
+    inline ~noncopyable() {}
 private:
-    nocopy(const nocopy &); // undefined
-    nocopy& operator=(const nocopy &); // undefined
+    noncopyable(const noncopyable &); // undefined
+    const noncopyable& operator=(const noncopyable &); // undefined
 };


@@ -468,6 +470,7 @@ private:
 #define UPX_F_MACH_FAT          134
 #define UPX_F_VMLINUX_ARMEB     135
 #define UPX_F_VMLINUX_PPC32     136
+#define UPX_F_LINUX_ELF32_MIPSEB 137


 // compression methods
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -88,7 +88,7 @@ FileBase::~FileBase()
 }


-void FileBase::sopen()
+bool FileBase::do_sopen()
 {
    if (_shflags < 0)
        _fd = ::open(_name, _flags, _mode);
@@ -101,13 +101,15 @@ void FileBase::sopen()
 #elif defined(SH_DENYRW)
        _fd = ::sopen(_name, _flags, _shflags, _mode);
 #else
-        assert(0);
+        throwInternalError("bad usage of do_sopen()");
 #endif
    }
-    if (!(_fd < 0)) {
-        ::fstat(_fd, &st);
-        _length = st.st_size;
-    }
+    if (_fd < 0)
+        return false;
+    if (::fstat(_fd, &st) != 0)
+        throwIOException(_name, errno);
+    _length = st.st_size;
+    return true;
 }


@@ -232,8 +234,7 @@ void InputFile::sopen(const char *name, int flags, int shflags)
    _mode = 0;
    _offset = 0;
    _length = 0;
-    FileBase::sopen();
-    if (!isOpen())
+    if (!FileBase::do_sopen())
    {
        if (errno == ENOENT)
            throw FileNotFoundException(_name, errno);
@@ -318,8 +319,7 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode)
    _mode = mode;
    _offset = 0;
    _length = 0;
-    FileBase::sopen();
-    if (!isOpen())
+    if (!FileBase::do_sopen())
    {
 #if 0
        // don't throw FileNotFound here -- this is confusing
@@ -366,7 +366,8 @@ off_t OutputFile::st_size() const
        return bytes_written;  // too big if seek()+write() instead of rewrite()
    }
    struct stat my_st;
-    ::fstat(_fd, &my_st);
+    if (::fstat(_fd, &my_st) != 0)
+        throwIOException(_name, errno);
    return my_st.st_size;
 }

@@ -402,15 +403,19 @@ void OutputFile::set_extent(off_t offset, off_t length)
    super::set_extent(offset, length);
    bytes_written = 0;
    if (0==offset && (off_t)~0u==length) {
-        ::fstat(_fd, &st);
+        if (::fstat(_fd, &st) != 0)
+            throwIOException(_name, errno);
        _length = st.st_size - offset;
    }
 }

 off_t OutputFile::unset_extent()
 {
+    off_t l = ::lseek(_fd, 0, SEEK_END);
+    if (l < 0)
+        throwIOException("lseek error", errno);
    _offset = 0;
-    _length = ::lseek(_fd, 0, SEEK_END);
+    _length = l;
    bytes_written = _length;
    return _length;
 }
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -63,7 +63,7 @@ public:
    virtual void set_extent(off_t offset, off_t length);

 protected:
-    void sopen();
+    bool do_sopen();
    virtual int read(void *buf, int len);
    virtual int readx(void *buf, int len);
    virtual void write(const void *buf, int len);
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -47,7 +47,7 @@ static int F(Filter *f)
    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
    unsigned lastnoncall = size, lastcall = 0;

-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
    {
        unsigned char buf[256];
        memset(buf,0,256);
@@ -126,7 +126,7 @@ static int F(Filter *f)
    f->noncalls = noncalls;
    f->lastcall = lastcall;

-#ifdef TESTING
+#if 0 || defined(TESTING)
    printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
    return 0;
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -51,7 +51,7 @@ static int F(Filter *f)
    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
    unsigned lastnoncall = size, lastcall = 0;

-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
    {
        unsigned char buf[256];
        memset(buf,0,256);
@@ -125,7 +125,7 @@ static int F(Filter *f)
    f->noncalls = noncalls;
    f->lastcall = lastcall;

-#ifdef TESTING
+#if 0 || defined(TESTING)
    printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
    return 0;
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -123,8 +123,8 @@ static int F(Filter *f)
        N_MRU : 0;
 #endif  //}

-    // FIXME: We must fit into 8MB because we steal one bit.
-    // find a 16MB large empty address space
+    // FIXME: We must fit into 8 MiB because we steal one bit.
+    // find a 16 MiB large empty address space
    {
        int which;
        unsigned char buf[256];
@@ -249,11 +249,11 @@ static int F(Filter *f)
    f->noncalls = noncalls;
    f->lastcall = lastcall;

-/*#ifdef TESTING*/
+#if 0 || defined(TESTING)
    printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",
        calls,noncalls,noncalls2,size,cto8);
    printf("CALL/JMP/JCC  %d  %d  %d\n",wtally[0],wtally[1],wtally[2]);
-/*#endif*/
+#endif
    return 0;
 }

@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -52,7 +52,7 @@ static int F(Filter *f)
    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
    unsigned lastnoncall = size, lastcall = 0;

-    // find a 16MB large empty address space
+    // find a 16 MiB large empty address space
    {
        unsigned char buf[256];
        memset(buf,0,256);
@@ -126,7 +126,7 @@ static int F(Filter *f)
    f->noncalls = noncalls;
    f->lastcall = lastcall;

-#ifdef TESTING
+#if 0 || defined(TESTING)
    printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
 #endif
    return 0;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2004-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2004-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -106,7 +106,7 @@ static int F(Filter *f)
    f->noncalls = noncalls;
    f->lastcall = lastcall;

-#if 1
+#if 0 || defined(TESTING)
    printf("\ncalls=%d noncalls=%d text_size=%x calltrickoffset=%x\n",
        calls,noncalls,size,cto8);
 #endif
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -51,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,2007\n"
+                "                          Copyright (C) 1996 - 2008\n"
                "UPX %-10s  Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
 #if (ACC_OS_DOS16 || ACC_OS_DOS32)
                V("d"),
@@ -140,15 +140,16 @@ static void show_all_packers(FILE *f, int verbose)
        }
        else
        {
+            size_t fl = strlen(fn);
            if (pos == 0) {
                con_fprintf(f, "  %s", fn);
-                pos = 2 + strlen(fn);
-            } else if (pos + 1 + strlen(fn) > 80) {
+                pos = 2 + fl;
+            } else if (pos + 1 + fl > 80) {
                con_fprintf(f, "\n  %s", fn);
-                pos = 2 + strlen(fn);
+                pos = 2 + fl;
            } else {
                con_fprintf(f, " %s", fn);
-                pos += 1 + strlen(fn);
+                pos += 1 + fl;
            }
        }
    }
@@ -224,26 +225,16 @@ void show_help(int verbose)
                    "  --overlay=skip      don't compress a file with an overlay\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for atari/tos:\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Options for djgpp2/coff:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
                    "  --coff              produce COFF output [default: EXE]\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Options for dos/com:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
                    "  --8086              make compressed com work on any 8086\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Options for dos/exe:\n");
@@ -251,15 +242,12 @@ void show_help(int verbose)
        con_fprintf(f,
                    "  --8086              make compressed exe work on any 8086\n"
                    "  --no-reloc          put no relocations in to the exe header\n"
-                    "  --all-methods       try all available compression methods\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Options for dos/sys:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
                    "  --8086              make compressed sys work on any 8086\n"
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
                    "\n");
 #if 0
        fg = con_fg(f,FG_YELLOW);
@@ -274,27 +262,12 @@ void show_help(int verbose)
        con_fprintf(f,"Options for ps1/exe:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
                    "  --8-bit             uses 8 bit size compression [default: 32 bit]\n"
-                    "  --8mb-ram           8 megabyte memory limit [default: 2 mb]\n"
+                    "  --8mib-ram          8 megabyte memory limit [default: 2 MiB]\n"
                    "  --boot-only         disables client/host transfer compatibility\n"
                    "  --no-align          don't align to 2048 bytes [enables: --console-run]\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for tmt/adam:\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
-        con_fprintf(f,"Options for vmlinuz/386\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --all-methods       try all available compression methods\n"
-                    "  --all-filters       try all available preprocessing filters\n"
-                    "\n");
-        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Options for watcom/le:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
@@ -314,8 +287,6 @@ void show_help(int verbose)
                    "  --keep-resource=list    do not compress resources specified by list\n"
                    "  --strip-relocs=0        do not strip relocations\n"
                    "  --strip-relocs=1        strip relocations [default]\n"
-                    "  --all-methods           try all available compression methods\n"
-                    "  --all-filters           try all available preprocessing filters\n"
                    "\n");
    }

@@ -387,7 +358,7 @@ void show_license(void)
    con_fprintf(f,
        "\n"
        "   Markus F.X.J. Oberhumer              Laszlo Molnar\n"
-        "   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>\n"
+        "   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>\n"
    );
    fg = con_fg(f,fg);

@@ -427,10 +398,10 @@ void show_version(int x)
    if (v != NULL && v[0])
        fprintf(fp, "LZMA SDK version %s\n", v);
 #endif
-    fprintf(fp, "Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(fp, "Copyright (C) 1996-2007 Laszlo Molnar\n");
-    fprintf(fp, "Copyright (C) 2000-2007 John F. Reiser\n");
-    fprintf(fp, "Copyright (C) 2002-2007 Jens Medoch\n");
+    fprintf(fp, "Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer\n");
+    fprintf(fp, "Copyright (C) 1996-2008 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 2000-2008 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2002-2008 Jens Medoch\n");
 #if defined(WITH_ZLIB)
    fprintf(fp, "Copyright (C) 1995" "-2005 Jean-loup Gailly and Mark Adler\n");
 #endif
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -240,7 +240,8 @@ void ElfLinker::preprocessSymbols(char *start, char *end)
 #if 0
        else if (sscanf(start, "%x%*8c %1023s %*x %1023s",
 #else
-        // work around broken scanf implementations
+        // work around broken scanf() implementations
+        // http://bugs.winehq.org/show_bug.cgi?id=10401 (fixed in Wine 0.9.58)
        else if (sscanf(start, "%x%*c%*c%*c%*c%*c%*c%*c%*c %1023s %*x %1023s",
 #endif
                        &offset, section, symbol) == 3)
@@ -765,6 +766,37 @@ void ElfLinkerM68k::relocate1(const Relocation *rel, upx_byte *location,
 }


+void ElfLinkerMipsBE::relocate1(const Relocation *rel, upx_byte *location,
+                                unsigned value, const char *type)
+{
+#define MIPS_HI(a)      (((a) >> 16) + (((a) & 0x8000) >> 15))
+#define MIPS_LO(a)      ((a) & 0xffff)
+#define MIPS_PC16(a)    ((a) >> 2)
+#define MIPS_PC26(a)    (((a) & 0x0fffffff) >> 2)
+
+    if (strcmp(type, "R_MIPS_HI16") == 0)
+        set_be16(2+location, get_be16(2+location) + MIPS_HI(value));
+    else if (strcmp(type, "R_MIPS_LO16") == 0)
+        set_be16(2+location, get_be16(2+location) + MIPS_LO(value));
+    else if (strcmp(type, "R_MIPS_PC16") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        set_be16(2+location, get_be16(2+location) + MIPS_PC16(value));
+    }
+    else if (strcmp(type, "R_MIPS_26") == 0)
+        set_be32(location, get_be32(location) + MIPS_PC26(value));
+    else if (strcmp(type, "R_MIPS_32") == 0)
+        set_be32(location, get_be32(location) + value);
+    else
+        super::relocate1(rel, location, value, type);
+
+#undef MIPS_HI
+#undef MIPS_LO
+#undef MIPS_PC16
+#undef MIPS_PC26
+}
+
+
 void ElfLinkerMipsLE::relocate1(const Relocation *rel, upx_byte *location,
                                unsigned value, const char *type)
 {
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -34,11 +34,11 @@
 // ElfLinker
 **************************************************************************/

-class ElfLinker : private nocopy
+class ElfLinker : private noncopyable
 {
    friend class Packer;
 public:
-    const N_BELE_RTP::AbstractPolicy *bele;
+    const N_BELE_RTP::AbstractPolicy *bele; // target endianness
 protected:
    struct      Section;
    struct      Symbol;
@@ -107,10 +107,18 @@ protected:
    virtual void relocate();
    virtual void relocate1(const Relocation *, upx_byte *location,
                           unsigned value, const char *type);
+
+    // target endianness abstraction
+    unsigned get_te16(const void *p)        const { return bele->get16(p); }
+    unsigned get_te32(const void *p)        const { return bele->get32(p); }
+    acc_uint64l_t get_te64(const void *p)   const { return bele->get64(p); }
+    void set_te16(void *p, unsigned v)      const { bele->set16(p, v); }
+    void set_te32(void *p, unsigned v)      const { bele->set32(p, v); }
+    void set_te64(void *p, acc_uint64l_t v) const { bele->set64(p, v); }
 };


-struct ElfLinker::Section : private nocopy
+struct ElfLinker::Section : private noncopyable
 {
    char *name;
    void *input;
@@ -125,7 +133,7 @@ struct ElfLinker::Section : private nocopy
 };


-struct ElfLinker::Symbol : private nocopy
+struct ElfLinker::Symbol : private noncopyable
 {
    char *name;
    Section *section;
@@ -136,7 +144,7 @@ struct ElfLinker::Symbol : private nocopy
 };


-struct ElfLinker::Relocation : private nocopy
+struct ElfLinker::Relocation : private noncopyable
 {
    const Section *section;
    unsigned offset;
@@ -195,6 +203,17 @@ protected:
 };


+class ElfLinkerMipsBE : public ElfLinker
+{
+    typedef ElfLinker super;
+public:
+    ElfLinkerMipsBE() { bele = &N_BELE_RTP::be_policy; }
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
 class ElfLinkerMipsLE : public ElfLinker
 {
    typedef ElfLinker super;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -633,6 +633,17 @@ static int do_option(int optc, const char *arg)
        opt->debug.disable_random_id = true;
        break;

+    // mp (meta)
+    case 501:
+        getoptvar(&opt->mp_compress_task, 1, 999999, arg);
+        break;
+    case 502:
+        opt->mp_query_format = true;
+        break;
+    case 503:
+        opt->mp_query_num_tasks = true;
+        break;
+
    // misc
    case 512:
        opt->console = CON_FILE;
@@ -870,7 +881,7 @@ static int do_option(int optc, const char *arg)
        opt->ps1_exe.do_8bit = true;
        break;
    case 673:
-        opt->ps1_exe.do_8mb = false;
+        opt->ps1_exe.do_8mib = false;
        break;

    case '\0':
@@ -1034,8 +1045,14 @@ static const struct mfx_option longopts[] =
    {"boot-only",        0x10, 0, 670},
    {"no-align",         0x10, 0, 671},
    {"8-bit",            0x10, 0, 672},
+    {"8mib-ram",         0x10, 0, 673},
    {"8mb-ram",          0x10, 0, 673},

+    // mp (meta) options
+    {"mp-compress-task",        0x31, 0, 501},
+    {"mp-query-format",         0x10, 0, 502},
+    {"mp-query-num-tasks",      0x10, 0, 503},
+
    { NULL, 0, NULL, 0 }
 };

@@ -1106,6 +1123,13 @@ static const struct mfx_option longopts[] =
    // compression settings
    {"exact",            0x10, 0, 525},     // user requires byte-identical decompression

+    // compression method
+    {"nrv2b",            0x10, 0, 702},     // --nrv2b
+    {"nrv2d",            0x10, 0, 704},     // --nrv2d
+    {"nrv2e",            0x10, 0, 705},     // --nrv2e
+    {"lzma",             0x10, 0, 721},     // --lzma
+    {"no-lzma",          0x10, 0, 722},     // (disable all_methods_use_lzma)
+    // compression settings
    // compression runtime parameters

    // win32/pe
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,6 +2,7 @@

   This file is part of the UPX executable compressor.

+   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
@@ -38,7 +39,7 @@

 #ifndef __ACC_H_INCLUDED
 #define __ACC_H_INCLUDED 1
-#define ACC_VERSION     20070113L
+#define ACC_VERSION     20080102L
 #if defined(__CYGWIN32__) && !defined(__CYGWIN__)
 #  define __CYGWIN__ __CYGWIN32__
 #endif
@@ -419,6 +420,9 @@
 #  elif defined(__NT__) && (__WATCOMC__ < 1100)
 #    define ACC_OS_WIN32        1
 #    define ACC_INFO_OS         "win32"
+#  elif defined(__linux__) || defined(__LINUX__)
+#    define ACC_OS_POSIX        1
+#    define ACC_INFO_OS         "posix"
 #  else
 #    error "please specify a target using the -bt compiler option"
 #  endif
@@ -464,7 +468,7 @@
 #  elif defined(__IRIX__) || defined(__irix__)
 #    define ACC_OS_POSIX_IRIX       1
 #    define ACC_INFO_OS_POSIX       "irix"
-#  elif defined(__linux__) || defined(__linux)
+#  elif defined(__linux__) || defined(__linux) || defined(__LINUX__)
 #    define ACC_OS_POSIX_LINUX      1
 #    define ACC_INFO_OS_POSIX       "linux"
 #  elif defined(__APPLE__) || defined(__MACOS__)
@@ -896,7 +900,7 @@
 #  endif
 #endif
 #if !defined(__ACC_MM_OVERRIDE)
-#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
+#if (ACC_ARCH_I086)
 #if (UINT_MAX != ACC_0xffffL)
 #  error "this should not happen"
 #endif
@@ -927,6 +931,7 @@
 #else
 #  error "unknown memory model"
 #endif
+#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
 #define ACC_HAVE_MM_HUGE_PTR        1
 #define ACC_HAVE_MM_HUGE_ARRAY      1
 #if (ACC_MM_TINY)
@@ -979,6 +984,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
+#endif
 #elif (ACC_ARCH_C166)
 #if !defined(__MODEL__)
 #  error "FIXME - C166 __MODEL__"
@@ -1148,6 +1154,8 @@ extern "C" {
 #    if (ACC_CC_GNUC >= 0x030300ul)
 #      if ((__LONG_MAX__)+0 == (__LONG_LONG_MAX__)+0)
 #        define ACC_SIZEOF_LONG_LONG      ACC_SIZEOF_LONG
+#      elif (__ACC_LSR(__LONG_LONG_MAX__,30) == 1)
+#        define ACC_SIZEOF_LONG_LONG      4
 #      endif
 #    endif
 #  endif
@@ -1396,6 +1404,7 @@ extern "C" {
 #  define ACC_INFO_LIBC         "default"
 #endif
 #endif
+#if !defined(__acc_gnuc_extension__)
 #if (ACC_CC_GNUC >= 0x020800ul)
 #  define __acc_gnuc_extension__    __extension__
 #elif (ACC_CC_LLVM || ACC_CC_PATHSCALE)
@@ -1403,6 +1412,7 @@ extern "C" {
 #else
 #  define __acc_gnuc_extension__
 #endif
+#endif
 #if !defined(__acc_ua_volatile)
 #  define __acc_ua_volatile     volatile
 #endif
@@ -1707,6 +1717,8 @@ extern "C" {
 #  else
 #    define __acc_cdecl_sighandler      __cdecl
 #  endif
+#elif (ACC_ARCH_I386) && (ACC_CC_WATCOMC)
+#  define __acc_cdecl                   __cdecl
 #elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
 #  define __acc_cdecl                   cdecl
 #endif
@@ -1728,6 +1740,7 @@ extern "C" {
 #if !defined(__acc_cdecl_va)
 #  define __acc_cdecl_va                __acc_cdecl
 #endif
+#if !defined(ACC_CFG_NO_WINDOWS_H)
 #if (ACC_OS_CYGWIN || (ACC_OS_EMX && defined(__RSXNT__)) || ACC_OS_WIN32 || ACC_OS_WIN64)
 #  if (ACC_CC_WATCOMC && (__WATCOMC__ < 1000))
 #  elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
@@ -1736,6 +1749,7 @@ extern "C" {
 #    define ACC_HAVE_WINDOWS_H 1
 #  endif
 #endif
+#endif
 #if (ACC_ARCH_ALPHA)
 #  define ACC_OPT_AVOID_UINT_INDEX  1
 #  define ACC_OPT_AVOID_SHORT       1
@@ -2143,6 +2157,7 @@ extern "C" {
 #define HAVE_DIFFTIME 1
 #define HAVE_FILENO 1
 #define HAVE_FSTAT 1
+#define HAVE_GETENV 1
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GMTIME 1
 #define HAVE_ISATTY 1
@@ -2285,7 +2300,7 @@ extern "C" {
 #  if (_MSC_VER < 700)
 #    undef HAVE_SNPRINTF
 #    undef HAVE_VSNPRINTF
-#  else
+#  elif (_MSC_VER < 1500)
 #    define snprintf _snprintf
 #    define vsnprintf _vsnprintf
 #  endif
@@ -2704,6 +2719,9 @@ __acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
 #  elif (ACC_SIZEOF_LONG >= 4)
 #    define ACC_INT32_C(c)      c##L
 #    define ACC_UINT32_C(c)     c##UL
+#  elif (ACC_SIZEOF_LONG_LONG >= 4)
+#    define ACC_INT32_C(c)      c##LL
+#    define ACC_UINT32_C(c)     c##ULL
 #  else
 #    error "ACC_INT32_C"
 #  endif
@@ -2799,7 +2817,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #  define ACC_UA_GET_LE16(p)    ACC_UA_GET16(p)
 #  define ACC_UA_SET_LE16(p,v)  ACC_UA_SET16(p,v)
 #endif
-#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_forceinline)
+#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_HAVE_forceinline)
 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
 #if !defined(ACC_UA_GET_LE16)
 extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
@@ -2835,7 +2853,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
 #  define ACC_UA_GET_LE32(p)    ACC_UA_GET32(p)
 #  define ACC_UA_SET_LE32(p,v)  ACC_UA_SET32(p,v)
 #endif
-#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_forceinline)
+#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_HAVE_forceinline)
 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
 #if !defined(ACC_UA_GET_LE32)
 extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
@@ -3129,6 +3147,9 @@ __acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
 #  elif (ACC_SIZEOF_LONG >= 4)
 #    define ACC_INT32_C(c)      c##L
 #    define ACC_UINT32_C(c)     c##UL
+#  elif (ACC_SIZEOF_LONG_LONG >= 4)
+#    define ACC_INT32_C(c)      c##LL
+#    define ACC_UINT32_C(c)     c##ULL
 #  else
 #    error "ACC_INT32_C"
 #  endif
@@ -3223,7 +3244,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
 #  define ACC_UA_GET_LE16(p)    ACC_UA_GET16(p)
 #  define ACC_UA_SET_LE16(p,v)  ACC_UA_SET16(p,v)
 #endif
-#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_forceinline)
+#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_HAVE_forceinline)
 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
 #if !defined(ACC_UA_GET_LE16)
 extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
@@ -3259,7 +3280,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
 #  define ACC_UA_GET_LE32(p)    ACC_UA_GET32(p)
 #  define ACC_UA_SET_LE32(p,v)  ACC_UA_SET32(p,v)
 #endif
-#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_forceinline)
+#if !defined(ACC_CFG_NO_INLINE_ASM) && defined(__acc_HAVE_forceinline)
 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
 #if !defined(ACC_UA_GET_LE32)
 extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
@@ -3835,6 +3856,7 @@ ACCLIB_EXTERN(int, acc_closedir) (acc_dir_p);
 #  define acc_stackavail()  _chkstack()
 #endif
 ACCLIB_EXTERN(acclib_handle_t, acc_get_osfhandle) (int);
+ACCLIB_EXTERN(const char *, acc_getenv) (const char *);
 ACCLIB_EXTERN(int, acc_isatty) (int);
 ACCLIB_EXTERN(int, acc_mkdir) (const char*, unsigned);
 ACCLIB_EXTERN(int, acc_rmdir) (const char*);
@@ -3849,7 +3871,8 @@ ACCLIB_EXTERN_NOINLINE(void, acc_debug_break) (void);
 ACCLIB_EXTERN_NOINLINE(void, acc_debug_nop) (void);
 ACCLIB_EXTERN_NOINLINE(int, acc_debug_align_check_query) (void);
 ACCLIB_EXTERN_NOINLINE(int, acc_debug_align_check_enable) (int);
-ACCLIB_EXTERN_NOINLINE(int, acc_debug_running_on_valgrind) (void);
+ACCLIB_EXTERN_NOINLINE(unsigned, acc_debug_running_on_qemu) (void);
+ACCLIB_EXTERN_NOINLINE(unsigned, acc_debug_running_on_valgrind) (void);
 #if !defined(acc_int64l_t) || defined(ACC_CFG_NO_DOUBLE)
 #  undef __ACCLIB_PCLOCK_USE_RDTSC
 #  undef __ACCLIB_PCLOCK_USE_PERFCTR
@@ -4603,10 +4626,6 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mode, const char* fn, const char* const * a
    ACCCHK_ASSERT(sizeof(size_t) == 4)
    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#elif (ACC_ARCH_AMD64)
-    ACCCHK_ASSERT(sizeof(size_t) == 8)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 8)
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
 #endif
 #if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32)
    ACCCHK_ASSERT(sizeof(size_t) == 4)
@@ -5277,213 +5296,6 @@ 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
@@ -6374,6 +6186,18 @@ ACCLIB_PUBLIC(int, acc_uclock_flush_cpu_cache) (acc_uclock_handle_p h, unsigned
 #    define ACCLIB_PUBLIC_NOINLINE(r,f)     __acc_noinline r __ACCLIB_FUNCNAME(f)
 #  endif
 #endif
+#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
+#  pragma warn(push)
+#  pragma warn(disable:2007)
+#endif
+ACCLIB_PUBLIC(const char *, acc_getenv) (const char *s)
+{
+#if defined(HAVE_GETENV)
+    return getenv(s);
+#else
+    ACC_UNUSED(s); return (const char *) 0;
+#endif
+}
 ACCLIB_PUBLIC(acclib_handle_t, acc_get_osfhandle) (int fd)
 {
    if (fd < 0)
@@ -6561,9 +6385,10 @@ ACCLIB_PUBLIC(acc_uint32e_t, acc_muldiv32u) (acc_uint32e_t a, acc_uint32e_t b, a
    return r;
 }
 #endif
-#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
-#  pragma warn(push)
-#  pragma warn(disable:2007)
+#if 0
+ACCLIB_PUBLIC_NOINLINE(int, acc_syscall_clock_gettime) (int c)
+{
+}
 #endif
 #if (ACC_OS_WIN16)
 ACC_EXTERN_C void __far __pascal DebugBreak(void);
@@ -6641,13 +6466,27 @@ ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_enable) (int v)
 #endif
    ACC_UNUSED(v); return r;
 }
-ACCLIB_PUBLIC_NOINLINE(int, acc_debug_running_on_valgrind) (void)
+ACCLIB_PUBLIC_NOINLINE(unsigned, acc_debug_running_on_qemu) (void)
+{
+    unsigned r = 0;
+#if (ACC_OS_POSIX_LINUX || ACC_OS_WIN32 || ACC_OS_WIN64)
+    const char* p;
+    p = acc_getenv("ACC_ENV_RUNNING_ON_QEMU");
+    if (p) {
+        if (p[0] == 0) r = 0;
+        else if ((p[0] >= '0' && p[0] <= '9') && p[1] == 0) r = p[0] - '0';
+        else r = 1;
+    }
+#endif
+    return r;
+}
+ACCLIB_PUBLIC_NOINLINE(unsigned, acc_debug_running_on_valgrind) (void)
 {
 #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
    volatile unsigned long args[5] = { 0x1001, 0, 0, 0, 0 };
-    long r = 0;
+    unsigned long r = 0;
    __asm__ __volatile__(".byte 0xc1,0xc0,0x1d,0xc1,0xc0,0x03,0xc1,0xc8,0x1b,0xc1,0xc8,0x05,0xc1,0xc0,0x0d,0xc1,0xc0,0x13\n" : "=d" (r) : "a" (&args[0]), "d" (r) : __ACC_ASM_CLOBBER);
-    return (int) r;
+    return (unsigned) r;
 #else
    return 0;
 #endif
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -45,6 +45,11 @@ enum {
 struct options_t {
    int cmd;

+    // mp (meta) options
+    int mp_compress_task;
+    bool mp_query_format;
+    bool mp_query_num_tasks;
+
    // compression options
    int method;
    bool method_lzma_seen;
@@ -129,7 +134,7 @@ struct options_t {
        bool boot_only;
        bool no_align;
        bool do_8bit;
-        bool do_8mb;
+        bool do_8mib;
    } ps1_exe;
    struct {
        unsigned blocksize;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -714,7 +714,7 @@ void PackArmPe::pack(OutputFile *fo)

    // 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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 2048, &cconf, filter_strategy,
                        ih.codebase, rvamin, 0, NULL, 0);
 // info: see buildLoader()
@@ -898,7 +898,7 @@ void PackArmPe::pack(OutputFile *fo)
    //    set_le32(ibuf + ic,get_le32("UPX "));
    ibuf.clear(0, oh.filealign);

-    info("Image size change: %u -> %u kBytes",
+    info("Image size change: %u -> %u KiB",
         ih.imagesize / 1024, oh.imagesize / 1024);

    infoHeader("[Writing compressed file]");
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -303,7 +303,7 @@ void PackDjgpp2::pack(OutputFile *fo)
    // compress
    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 512, &cconf);

    // patch coff header #2
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -284,11 +284,11 @@ struct ElfClass_32
 {
    typedef TP BeLePolicy;

-    // integral types
-    typedef typename TP::U16 U16;
-    typedef typename TP::U32 U32;
-    typedef typename TP::U64 U64;
-    typedef N_Elf::ElfITypes<U16, U32, U32, U32, U32> ElfITypes;
+    // integral types (target endianness)
+    typedef typename TP::U16 TE16;
+    typedef typename TP::U32 TE32;
+    typedef typename TP::U64 TE64;
+    typedef N_Elf::ElfITypes<TE16, TE32, TE32, TE32, TE32> ElfITypes;

    // ELF types
    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
@@ -319,11 +319,11 @@ struct ElfClass_64
 {
    typedef TP BeLePolicy;

-    // integral types
-    typedef typename TP::U16 U16;
-    typedef typename TP::U32 U32;
-    typedef typename TP::U64 U64;
-    typedef N_Elf::ElfITypes<U16, U32, U64, U64, U64> ElfITypes;
+    // integral types (target endianness)
+    typedef typename TP::U16 TE16;
+    typedef typename TP::U32 TE32;
+    typedef typename TP::U64 TE64;
+    typedef N_Elf::ElfITypes<TE16, TE32, TE64, TE64, TE64> ElfITypes;

    // ELF types
    typedef N_Elf  ::Ehdr<ElfITypes> Ehdr;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -141,10 +141,14 @@
    enum { // d_tag
        DT_NULL     =  0,       /* End flag */
        DT_NEEDED   =  1,       /* Name of needed library */
+        DT_PLTRELSZ =  2,       /* Size in bytes of PLT relocs */
        DT_HASH     =  4,       /* Hash table of symbol names */
        DT_STRTAB   =  5,       /* String table */
        DT_SYMTAB   =  6,       /* Symbol table */
-        DT_STRSZ    = 10        /* Sizeof string table */
+        DT_STRSZ    = 10,       /* Sizeof string table */
+        DT_PLTREL   = 20,       /* Type of reloc in PLT */
+        DT_JMPREL   = 23,       /* Address of PLT relocs */
+        DT_GNU_HASH = 0x6ffffef5        /* GNU-style hash table */
    };
 #endif

@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -506,7 +506,7 @@ void PackExe::pack(OutputFile *fo)
    // compress (max_match = 8192)
    upx_compress_config_t cconf; cconf.reset();
    cconf.conf_ucl.max_match = MAXMATCH;
-    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 32, &cconf);

    if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -121,18 +121,29 @@ protected:
    virtual off_t getbase(const Elf32_Phdr *phdr, int e_phnum) const;

    static unsigned elf_hash(char const *) /*const*/;
+    static unsigned gnu_hash(char const *) /*const*/;
    virtual void const *elf_find_dynamic(unsigned) const;
    virtual Elf32_Sym const *elf_lookup(char const *) const;
    virtual unsigned elf_get_offset_from_address(unsigned) const;
+    Elf32_Shdr const *elf_find_section_name(char const *) const;
+    Elf32_Shdr const *elf_find_section_type(unsigned) const;

 protected:
    Elf32_Ehdr  ehdri; // from input file
    Elf32_Phdr *phdri; // for  input file
+    Elf32_Shdr const *shdri; // from input file
    unsigned page_mask;  // AND clears the offset-within-page

    Elf32_Dyn    const *dynseg;   // from PT_DYNAMIC
    unsigned int const *hashtab;  // from DT_HASH
+    unsigned int const *gashtab;  // from DT_GNU_HASH
    Elf32_Sym    const *dynsym;   // from DT_SYMTAB
+    char const *shstrtab;   // via Elf32_Shdr
+    int n_elf_shnum;  // via e_shnum
+
+    Elf32_Shdr const *sec_strndx;
+    Elf32_Shdr const *sec_dynsym;
+    Elf32_Shdr const *sec_dynstr;

    struct cprElfHdr1 {
        Elf32_Ehdr ehdr;
@@ -254,13 +265,6 @@ class PackLinuxElf32Be : public PackLinuxElf32
    typedef PackLinuxElf32 super;
 protected:
    PackLinuxElf32Be(InputFile *f) : super(f) { bele = &N_BELE_RTP::be_policy; }
-
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_be64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_be32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_be16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_be64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_be32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_be16(b, v); }
 };

 class PackLinuxElf32Le : public PackLinuxElf32
@@ -268,13 +272,6 @@ class PackLinuxElf32Le : public PackLinuxElf32
    typedef PackLinuxElf32 super;
 protected:
    PackLinuxElf32Le(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
-
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }
 };

 class PackLinuxElf64Le : public PackLinuxElf64
@@ -282,15 +279,9 @@ class PackLinuxElf64Le : public PackLinuxElf64
    typedef PackLinuxElf64 super;
 protected:
    PackLinuxElf64Le(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
-
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }
 };

+
 /*************************************************************************
 // linux/elf64amd
 **************************************************************************/
@@ -314,6 +305,7 @@ protected:
    virtual void defineSymbols(Filter const *);
 };

+
 /*************************************************************************
 // linux/elf32ppc
 **************************************************************************/
@@ -334,6 +326,7 @@ protected:
    virtual Linker* newLinker() const;
 };

+
 /*************************************************************************
 // linux/elf386
 **************************************************************************/
@@ -410,6 +403,7 @@ protected:
    );
 };

+
 /*************************************************************************
 // linux/elfarm
 **************************************************************************/
@@ -454,6 +448,25 @@ protected:
    virtual void defineSymbols(Filter const *);
 };

+class PackLinuxElf32mipseb : public PackLinuxElf32Be
+{
+    typedef PackLinuxElf32Be super;
+public:
+    PackLinuxElf32mipseb(InputFile *f);
+    virtual ~PackLinuxElf32mipseb();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEB; }
+    virtual const char *getName() const { return "linux/mipseb"; }
+    virtual const char *getFullName(const options_t *) const { return "mips-linux.elf"; }
+    virtual const int *getFilters() const;
+
+protected:
+    virtual Linker* newLinker() const;
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual void updateLoader(OutputFile *);
+    virtual void defineSymbols(Filter const *);
+};
+
 class PackLinuxElf32mipsel : public PackLinuxElf32Le
 {
    typedef PackLinuxElf32Le super;
@@ -466,7 +479,6 @@ public:
    virtual const int *getFilters() const;

 protected:
-    virtual const int *getCompressionMethods(int method, int level) const;
    virtual Linker* newLinker() const;
    virtual void pack1(OutputFile *, Filter &);  // generate executable header
    virtual void buildLoader(const Filter *);
@@ -474,6 +486,7 @@ protected:
    virtual void defineSymbols(Filter const *);
 };

+
 #endif /*} already included */


@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2001-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2001-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -526,22 +526,22 @@ bool PackLinuxI386::canPack()
                ei_osabi = osabi0;  // Proudly declares its osabi in Ehdr.
                break;
            default:
-            unsigned const e_phnum = get_native16(&ehdr.e_phnum);
+            unsigned const e_phnum = get_te16(&ehdr.e_phnum);
            if (e_phnum<=(512/sizeof(Elf32_Phdr))) {
                char buf2[512];
-                fi->seek(get_native32(&ehdr.e_phoff), SEEK_SET);
+                fi->seek(get_te32(&ehdr.e_phoff), SEEK_SET);
                fi->readx(buf2, sizeof(buf2));
                fi->seek(0, SEEK_SET);
                Elf32_Phdr const *phdr = (Elf32_Phdr const *)buf2;
                for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
-                    if (phdr->PT_NOTE == get_native32(&phdr->p_type)) {
-                        unsigned const offset = get_native32(&phdr->p_offset);
+                    if (phdr->PT_NOTE == get_te32(&phdr->p_type)) {
+                        unsigned const offset = get_te32(&phdr->p_offset);
                        struct Elf32_Note note; memset(&note, 0, sizeof(note));
                        fi->seek(offset, SEEK_SET);
                        fi->readx(&note, sizeof(note));
                        fi->seek(0, SEEK_SET);
-                        if (4==get_native32(&note.descsz)
-                        &&  1==get_native32(&note.type)
+                        if (4==get_te32(&note.descsz)
+                        &&  1==get_te32(&note.type)
                        &&  0==note.end ) {
                            if (0==strcmp("NetBSD", (char const *)&note.text)) {
                                ei_osabi = Elf32_Ehdr::ELFOSABI_NETBSD;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -205,7 +205,7 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
    {
        fi->seek(0, SEEK_SET);
        fi->readx(bufehdr, MAX_INTERP_HDR);
-        unsigned const e_entry = get_native32(&ehdr->e_entry);
+        unsigned const e_entry = get_te32(&ehdr->e_entry);
        if (e_entry < 0x401180) { /* old style, 8-byte b_info */
            szb_info = 2*sizeof(unsigned);
        }
@@ -214,16 +214,16 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
    fi->seek(overlay_offset, SEEK_SET);
    p_info hbuf;
    fi->readx(&hbuf, sizeof(hbuf));
-    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
-    blocksize = get_native32(&hbuf.p_blocksize);
+    unsigned orig_file_size = get_te32(&hbuf.p_filesize);
+    blocksize = get_te32(&hbuf.p_blocksize);
    if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
        throwCantUnpack("file header corrupted");

    ibuf.alloc(blocksize + OVERHEAD);
    b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));
    fi->readx(&bhdr, szb_info);
-    ph.u_len = get_native32(&bhdr.sz_unc);
-    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.u_len = get_te32(&bhdr.sz_unc);
+    ph.c_len = get_te32(&bhdr.sz_cpr);
    ph.filter_cto = bhdr.b_cto8;

    // Uncompress Ehdr and Phdrs.
@@ -277,7 +277,7 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)

    // check for end-of-file
    fi->readx(&bhdr, szb_info);
-    unsigned const sz_unc = ph.u_len = get_native32(&bhdr.sz_unc);
+    unsigned const sz_unc = ph.u_len = get_te32(&bhdr.sz_unc);

    if (sz_unc == 0) { // uncompressed size 0 -> EOF
        // note: magic is always stored le32
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -91,7 +91,7 @@ PackLinuxI386sh::buildLoader(Filter const *ft)
    // filter
    optimizeFilter(&fold_ft, buf, sz_fold);
    unsigned fold_hdrlen = sizeof(l_info) + sizeof(Elf32_Ehdr) +
-        sizeof(Elf32_Phdr) * get_native32(&((Elf32_Ehdr const *)(void *)buf)->e_phnum);
+        sizeof(Elf32_Phdr) * get_te32(&((Elf32_Ehdr const *)(void *)buf)->e_phnum);
    if (0 == get_le32(fold_hdrlen + buf)) {
        // inconsistent SIZEOF_HEADERS in *.lds (ld, binutils)
        fold_hdrlen = umax(0x80, fold_hdrlen);
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2000-2007 John F. Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2000-2008 John F. Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John F. Reiser
   <jreiser@users.sourceforge.net>
@@ -2,7 +2,7 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 2004-2007 John Reiser
+   Copyright (C) 2004-2008 John Reiser
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,7 +21,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   John Reiser
-   jreiser@users.sourceforge.net
+   <jreiser@users.sourceforge.net>
 */


@@ -104,6 +104,8 @@ PackMachBase<T>::addStubEntrySections(Filter const *)
        : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL"
        : M_IS_LZMA(ph.method)  ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30"
        : NULL), NULL);
+    if (hasLoaderSection("CFLUSH"))
+        addLoader("CFLUSH");
    addLoader("ELFMAINY,IDENTSTR,+40,ELFMAINZ,FOLDEXEC", NULL);
 }

@@ -520,16 +522,16 @@ void PackMachBase<T>::unpack(OutputFile *fo)
    fi->seek(overlay_offset, SEEK_SET);
    p_info hbuf;
    fi->readx(&hbuf, sizeof(hbuf));
-    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
-    blocksize = get_native32(&hbuf.p_blocksize);
+    unsigned orig_file_size = get_te32(&hbuf.p_filesize);
+    blocksize = get_te32(&hbuf.p_blocksize);
    if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
        throwCantUnpack("file header corrupted");

    ibuf.alloc(blocksize + OVERHEAD);
    b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));
    fi->readx(&bhdr, sizeof(bhdr));
-    ph.u_len = get_native32(&bhdr.sz_unc);
-    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.u_len = get_te32(&bhdr.sz_unc);
+    ph.c_len = get_te32(&bhdr.sz_cpr);
    ph.method = bhdr.b_method;
    ph.filter = bhdr.b_ftid;
    ph.filter_cto = bhdr.b_cto8;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -236,13 +236,13 @@ struct MachClass_32
 {
    typedef TP BeLePolicy;

-    // integral types
-    typedef typename TP::U16 U16;
-    typedef typename TP::U32 U32;
-    typedef typename TP::U64 U64;
-    typedef N_Mach::MachITypes<U32, U64, U32, U32> MachITypes;
+    // integral types (target endianness)
+    typedef typename TP::U16 TE16;
+    typedef typename TP::U32 TE32;
+    typedef typename TP::U64 TE64;
+    typedef N_Mach::MachITypes<TE32, TE64, TE32, TE32> MachITypes;
 #if (ACC_CC_BORLANDC)
-    typedef U32 Addr;
+    typedef TE32 Addr;
 #else
    typedef typename MachITypes::Addr Addr;
 #endif
@@ -265,11 +265,11 @@ struct MachClass_64
 {
    typedef TP BeLePolicy;

-    // integral types
-    typedef typename TP::U16 U16;
-    typedef typename TP::U32 U32;
-    typedef typename TP::U64 U64;
-    typedef N_Mach::MachITypes<U32, U64, U64, U64> MachITypes;
+    // integral types (target endianness)
+    typedef typename TP::U16 TE16;
+    typedef typename TP::U32 TE32;
+    typedef typename TP::U64 TE64;
+    typedef N_Mach::MachITypes<TE32, TE64, TE64, TE64> MachITypes;

    // Mach types
    typedef N_Mach::Mach_header64<MachITypes> Mach_header;
@@ -322,10 +322,10 @@ protected:
    typedef TMachClass MachClass;
    typedef typename MachClass::BeLePolicy BeLePolicy;
    typedef typename MachClass::MachITypes MachITypes;
-    // integral types
-    typedef typename MachClass::U16   U16;
-    typedef typename MachClass::U32   U32;
-    typedef typename MachClass::U64   U64;
+    // integral types (target endianness)
+    typedef typename MachClass::TE16  TE16;
+    typedef typename MachClass::TE32  TE32;
+    typedef typename MachClass::TE64  TE64;
    typedef typename MachClass::Addr  Addr;
    // Mach types
    typedef typename MachClass::Mach_header Mach_header;
@@ -381,8 +381,8 @@ protected:
    Mach_segment_command segcmdo;

    struct b_info { // 12-byte header before each compressed block
-        U32 sz_unc;  // uncompressed_size
-        U32 sz_cpr;  //   compressed_size
+        TE32 sz_unc;  // uncompressed_size
+        TE32 sz_cpr;  //   compressed_size
        unsigned char b_method;  // compression algorithm
        unsigned char b_ftid;  // filter id
        unsigned char b_cto8;  // filter parameter
@@ -390,22 +390,32 @@ protected:
    }
    __attribute_packed;
    struct l_info { // 12-byte trailer in header for loader
-        U32  l_checksum;
+        TE32 l_checksum;
        LE32 l_magic;
-        U16  l_lsize;
+        TE16 l_lsize;
        unsigned char l_version;
        unsigned char l_format;
    }
    __attribute_packed;

    struct p_info { // 12-byte packed program header
-        U32 p_progid;
-        U32 p_filesize;
-        U32 p_blocksize;
+        TE32 p_progid;
+        TE32 p_filesize;
+        TE32 p_blocksize;
    }
    __attribute_packed;

    struct l_info linfo;
+
+    static void compileTimeAssertions() {
+        MachClass::compileTimeAssertions();
+        COMPILE_TIME_ASSERT(sizeof(b_info) == 12)
+        COMPILE_TIME_ASSERT(sizeof(l_info) == 12)
+        COMPILE_TIME_ASSERT(sizeof(p_info) == 12)
+        COMPILE_TIME_ASSERT_ALIGNED1(b_info)
+        COMPILE_TIME_ASSERT_ALIGNED1(l_info)
+        COMPILE_TIME_ASSERT_ALIGNED1(p_info)
+    }
 };


@@ -422,13 +432,6 @@ public:
    virtual const char *getName() const { return "Mach/ppc32"; }
    virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; }

-    virtual acc_uint64l_t get_native64(const void *b) const { return get_be64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_be32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_be16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_be64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_be32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_be16(b, v); }
-
 protected:
    virtual const int *getFilters() const;

@@ -467,13 +470,6 @@ public:
 protected:
    virtual const int *getFilters() const;

-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }
-
    virtual void pack1_setup_threado(OutputFile *const fo);
    virtual void pack3(OutputFile *, Filter &);  // append loader
    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2002-2007 Jens Medoch
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2002-2008 Jens Medoch
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   Jens Medoch
   <jssg@users.sourceforge.net>
@@ -95,7 +95,7 @@ PackPs1::PackPs1(InputFile *f) :
    COMPILE_TIME_ASSERT(SZ_IH_BKUP == 40)

    fdata_size = file_size - PS_HDR_SIZE;
-    ram_size = !opt->ps1_exe.do_8mb ? 0x200000 : 0x800000;
+    ram_size = !opt->ps1_exe.do_8mib ? 0x200000 : 0x800000;
 }

 const int *PackPs1::getCompressionMethods(int method, int level) const
@@ -500,7 +500,7 @@ void PackPs1::pack(OutputFile *fo)
    // compress (max_match = 65535)
    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, sa_cnt, &cconf);

    if (overlap)
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
-   Copyright (C) 2002-2007 Jens Medoch
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
+   Copyright (C) 2002-2008 Jens Medoch
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   Jens Medoch
   <jssg@users.sourceforge.net>
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -242,7 +242,7 @@ void PackTmt::pack(OutputFile *fo)
    // compress
    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 512, &cconf);

    const unsigned lsize = getLoaderSize();
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -507,7 +507,7 @@ void PackTos::pack(OutputFile *fo)
    // compress (max_match = 65535)
    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 512, &cconf);

    //
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -191,8 +191,8 @@ void PackUnix::pack2(OutputFile *fo, Filter &ft)
        // write block header
        b_info blk_info;
        memset(&blk_info, 0, sizeof(blk_info));
-        set_native32(&blk_info.sz_unc, ph.u_len);
-        set_native32(&blk_info.sz_cpr, ph.c_len);
+        set_te32(&blk_info.sz_unc, ph.u_len);
+        set_te32(&blk_info.sz_cpr, ph.c_len);
        if (ph.c_len < ph.u_len) {
            blk_info.b_method = (unsigned char) ph.method;
            blk_info.b_ftid = (unsigned char) ph.filter;
@@ -252,7 +252,7 @@ void PackUnix::pack4(OutputFile *fo, Filter &)
    writePackHeader(fo);

    unsigned tmp;
-    set_native32(&tmp, overlay_offset);
+    set_te32(&tmp, overlay_offset);
    fo->write(&tmp, sizeof(tmp));
 }

@@ -278,9 +278,9 @@ void PackUnix::pack(OutputFile *fo)
    pack1(fo, ft);  // generate Elf header, etc.

    p_info hbuf;
-    set_native32(&hbuf.p_progid, progid);
-    set_native32(&hbuf.p_filesize, file_size);
-    set_native32(&hbuf.p_blocksize, blocksize);
+    set_te32(&hbuf.p_progid, progid);
+    set_te32(&hbuf.p_filesize, file_size);
+    set_te32(&hbuf.p_blocksize, blocksize);
    fo->write(&hbuf, sizeof(hbuf));

    pack2(fo, ft);  // append the compressed body
@@ -389,8 +389,8 @@ void PackUnix::packExtent(
            ph.c_adler = upx_adler32(obuf, ph.c_len, ph.saved_c_adler);
            end_u_adler = ph.u_adler;
            memset(&tmp, 0, sizeof(tmp));
-            set_native32(&tmp.sz_unc, hdr_u_len);
-            set_native32(&tmp.sz_cpr, hdr_c_len);
+            set_te32(&tmp.sz_unc, hdr_u_len);
+            set_te32(&tmp.sz_cpr, hdr_c_len);
            tmp.b_method = (unsigned char) ph.method;
            fo->write(&tmp, sizeof(tmp));
            b_len += sizeof(b_info);
@@ -400,8 +400,8 @@ void PackUnix::packExtent(
            hdr_u_len = 0;  // compress hdr one time only
        }
        memset(&tmp, 0, sizeof(tmp));
-        set_native32(&tmp.sz_unc, ph.u_len);
-        set_native32(&tmp.sz_cpr, ph.c_len);
+        set_te32(&tmp.sz_unc, ph.u_len);
+        set_te32(&tmp.sz_cpr, ph.c_len);
        if (ph.c_len < ph.u_len) {
            tmp.b_method = (unsigned char) ph.method;
            if (ft) {
@@ -439,8 +439,8 @@ void PackUnix::unpackExtent(unsigned wanted, OutputFile *fo,
    b_info hdr; memset(&hdr, 0, sizeof(hdr));
    while (wanted) {
        fi->readx(&hdr, szb_info);
-        int const sz_unc = ph.u_len = get_native32(&hdr.sz_unc);
-        int const sz_cpr = ph.c_len = get_native32(&hdr.sz_cpr);
+        int const sz_unc = ph.u_len = get_te32(&hdr.sz_unc);
+        int const sz_cpr = ph.c_len = get_te32(&hdr.sz_cpr);
        ph.filter_cto = hdr.b_cto8;

        if (sz_unc == 0) { // must never happen while 0!=wanted
@@ -509,7 +509,7 @@ int PackUnix::canUnpack()
    int l = ph.buf_offset + ph.getPackHeaderSize();
    if (l < 0 || l + 4 > bufsize)
        throwCantUnpack("file corrupted");
-    overlay_offset = get_native32(buf+l);
+    overlay_offset = get_te32(buf+l);
    if ((off_t)overlay_offset >= file_size)
        throwCantUnpack("file corrupted");

@@ -531,15 +531,15 @@ void PackUnix::unpack(OutputFile *fo)
        Elf32_Ehdr ehdr;
        fi->seek(0, SEEK_SET);
        fi->readx(&ehdr, sizeof(ehdr));
-        unsigned const e_entry = get_native32(&ehdr.e_entry);
+        unsigned const e_entry = get_te32(&ehdr.e_entry);
        if (e_entry < 0x401180) { /* old style, 8-byte b_info */
            szb_info = 2*sizeof(unsigned);
        }
        else {
            Elf32_Phdr phdr;
-            fi->seek(get_native32(&ehdr.e_phoff), SEEK_SET);
+            fi->seek(get_te32(&ehdr.e_phoff), SEEK_SET);
            fi->readx(&phdr, sizeof(phdr));
-            unsigned const p_vaddr = get_native32(&phdr.p_vaddr);
+            unsigned const p_vaddr = get_te32(&phdr.p_vaddr);
            if (0x80==(e_entry - p_vaddr)) { /* 1.22 old style */
                szb_info = 2*sizeof(unsigned);
            }
@@ -558,8 +558,8 @@ void PackUnix::unpack(OutputFile *fo)
    {
        p_info hbuf;
        fi->readx(&hbuf, sizeof(hbuf));
-        orig_file_size = get_native32(&hbuf.p_filesize);
-        blocksize = get_native32(&hbuf.p_blocksize);
+        orig_file_size = get_te32(&hbuf.p_filesize);
+        blocksize = get_te32(&hbuf.p_blocksize);

        if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
            throwCantUnpack("file header corrupted");
@@ -583,8 +583,8 @@ void PackUnix::unpack(OutputFile *fo)
        unsigned sz_unc, sz_cpr;

        fi->readx(&bhdr, szb_info);
-        ph.u_len = sz_unc = get_native32(&bhdr.sz_unc);
-        ph.c_len = sz_cpr = get_native32(&bhdr.sz_cpr);
+        ph.u_len = sz_unc = get_te32(&bhdr.sz_unc);
+        ph.c_len = sz_cpr = get_te32(&bhdr.sz_cpr);

        if (sz_unc == 0)                   // uncompressed size 0 -> EOF
        {
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -64,15 +64,6 @@ protected:

    virtual void writePackHeader(OutputFile *fo);

-    // in order too share as much code as possible we introduce
-    // an endian abstraction here
-    virtual acc_uint64l_t get_native64(const void *) const = 0;
-    virtual unsigned get_native32(const void *) const = 0;
-    virtual unsigned get_native16(const void *) const = 0;
-    virtual void set_native64(void *, acc_uint64l_t) const = 0;
-    virtual void set_native32(void *, unsigned) const = 0;
-    virtual void set_native16(void *, unsigned) const = 0;
-
    virtual bool checkCompressionRatio(unsigned, unsigned) const;

 protected:
@@ -142,12 +133,6 @@ class PackUnixBe32 : public PackUnix
    typedef PackUnix super;
 protected:
    PackUnixBe32(InputFile *f) : super(f) { bele = &N_BELE_RTP::be_policy; }
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_be64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_be32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_be16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_be64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_be32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_be16(b, v); }

    // must agree with stub/linux.hh
    struct b_info { // 12-byte header before each compressed block
@@ -183,12 +168,6 @@ class PackUnixLe32 : public PackUnix
    typedef PackUnix super;
 protected:
    PackUnixLe32(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
-    virtual acc_uint64l_t get_native64(const void *b) const { return get_le64(b); }
-    virtual unsigned get_native32(const void *b) const { return get_le32(b); }
-    virtual unsigned get_native16(const void *b) const { return get_le16(b); }
-    virtual void set_native64(void *b, acc_uint64l_t v) const { set_le64(b, v); }
-    virtual void set_native32(void *b, unsigned v) const { set_le32(b, v); }
-    virtual void set_native16(void *b, unsigned v) const { set_le16(b, v); }

    // must agree with stub/linux.hh
    struct b_info { // 12-byte header before each compressed block
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 2004-2007 John Reiser
-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 2004-2008 John Reiser
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,11 +22,11 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>

   John Reiser
-   jreiser@users.sourceforge.net
+   <jreiser@users.sourceforge.net>
 */


@@ -212,7 +212,7 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
 {
    unsigned fo_off = 0;
    Ehdr ehdro;
-    U32 tmp_u32;
+    TE32 tmp_u32;

    // NULL
    // .text(PT_LOADs) .note(1st page) .note(rest)
@@ -269,7 +269,7 @@ void PackVmlinuxBase<T>::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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack

    unsigned ppc32_extra = 0;
    if (Ehdr::EM_PPC==my_e_machine) {
@@ -376,102 +376,102 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)

 #if 0  /*{ Documentation: changes to arch/powerpc/boot/main.c */
 struct b_info {
-	unsigned sz_unc;
-	unsigned sz_cpr;
-	unsigned char b_method;
-	unsigned char b_ftid;
-	unsigned char b_cto8;
-	unsigned char b_unused;
+    unsigned sz_unc;
+    unsigned sz_cpr;
+    unsigned char b_method;
+    unsigned char b_ftid;
+    unsigned char b_cto8;
+    unsigned char b_unused;
 };
 typedef int (*upx_f_unc)(  /* uncompress */
-	unsigned char const *src, unsigned  src_len,
-	unsigned char       *dst, unsigned *dst_len,
-	int method
+    unsigned char const *src, unsigned  src_len,
+    unsigned char       *dst, unsigned *dst_len,
+    int method
 );
 typedef int (*upx_f_unf)(  /* unfilter */
-	unsigned char *buf,
-	unsigned len,
-	unsigned cto8,
-	unsigned ftid
+    unsigned char *buf,
+    unsigned len,
+    unsigned cto8,
+    unsigned ftid
 );

 unsigned char const *upx_expand(  // return updated src [aligned, too]
-	unsigned char const *src,
-	unsigned char       *dst,
-	unsigned *const dst_len,
-	upx_f_unc const f_unc
+    unsigned char const *src,
+    unsigned char       *dst,
+    unsigned *const dst_len,
+    upx_f_unc const f_unc
 )
 {
-	if (0==*dst_len) {
-		*dst_len = ((struct b_info const *)src)->sz_unc;
-	}
-	upx_f_unf const f_unf = (upx_f_unf)(sizeof(int) + (char *)f_unc);
-	unsigned total_len = 0;
-	unsigned need = *dst_len;
-	while (0 < need) {
-		struct b_info const *const b_hdr = (struct b_info const *)src;
-		src = (unsigned char const *)(1+ b_hdr);
-		unsigned blk_len = b_hdr->sz_unc;
-		int const rv = (*f_unc)(src, b_hdr->sz_cpr, dst, &blk_len, b_hdr->b_method);
-		if (0!=rv) {
-			printf("decompress error %d\n\r", rv);
-			exit();
-		}
-		if (b_hdr->b_ftid) {
-			(*f_unf)(dst, b_hdr->sz_unc, b_hdr->b_cto8, b_hdr->b_ftid);
-		}
-		src += b_hdr->sz_cpr;
-		src += (3& -(int)src);  // 4-byte align
-		dst += b_hdr->sz_unc;
-		total_len += b_hdr->sz_unc;
-		need -= b_hdr->sz_unc;
-	}
-	*dst_len = total_len;
-	return src;
+    if (0==*dst_len) {
+        *dst_len = ((struct b_info const *)src)->sz_unc;
+    }
+    upx_f_unf const f_unf = (upx_f_unf)(sizeof(int) + (char *)f_unc);
+    unsigned total_len = 0;
+    unsigned need = *dst_len;
+    while (0 < need) {
+        struct b_info const *const b_hdr = (struct b_info const *)src;
+        src = (unsigned char const *)(1+ b_hdr);
+        unsigned blk_len = b_hdr->sz_unc;
+        int const rv = (*f_unc)(src, b_hdr->sz_cpr, dst, &blk_len, b_hdr->b_method);
+        if (0!=rv) {
+            printf("decompress error %d\n\r", rv);
+            exit();
+        }
+        if (b_hdr->b_ftid) {
+            (*f_unf)(dst, b_hdr->sz_unc, b_hdr->b_cto8, b_hdr->b_ftid);
+        }
+        src += b_hdr->sz_cpr;
+        src += (3& -(int)src);  // 4-byte align
+        dst += b_hdr->sz_unc;
+        total_len += b_hdr->sz_unc;
+        need -= b_hdr->sz_unc;
+    }
+    *dst_len = total_len;
+    return src;
 }

 void prep_kernel(unsigned long a1, unsigned long a2)
 {
-	upx_f_unc f_unc = (upx_f_unc)0;
+    upx_f_unc f_unc = (upx_f_unc)0;

-	vmlinuz.addr = (unsigned long)_vmlinux_start;
-	vmlinuz.size = (unsigned long)(_vmlinux_end - _vmlinux_start);
+    vmlinuz.addr = (unsigned long)_vmlinux_start;
+    vmlinuz.size = (unsigned long)(_vmlinux_end - _vmlinux_start);

-	if (0x55505821 == *(unsigned *)vmlinuz.addr) {
-		/* was compressed by upx */
-		/* Uncompress elfheader */
-		unsigned const *const fwa = (unsigned *)vmlinuz.addr;
-		f_unc = (upx_f_unc)((char *)&fwa[2] + fwa[1]);
-		unsigned dst_len = 0;
-		unsigned char const *src = (unsigned char const *)&fwa[2];
-		src = upx_expand(src, (unsigned char *)elfheader, &dst_len, f_unc);
-		unsigned const src_len = src - (unsigned char const *)&fwa[0];
-		vmlinuz.addr += src_len;
-		vmlinuz.size -= src_len;
-	} else {
-		memcpy(elfheader, (const void *)vmlinuz.addr,
-		       sizeof(elfheader));
-	}
+    if (0x55505821 == *(unsigned *)vmlinuz.addr) {
+        /* was compressed by upx */
+        /* Uncompress elfheader */
+        unsigned const *const fwa = (unsigned *)vmlinuz.addr;
+        f_unc = (upx_f_unc)((char *)&fwa[2] + fwa[1]);
+        unsigned dst_len = 0;
+        unsigned char const *src = (unsigned char const *)&fwa[2];
+        src = upx_expand(src, (unsigned char *)elfheader, &dst_len, f_unc);
+        unsigned const src_len = src - (unsigned char const *)&fwa[0];
+        vmlinuz.addr += src_len;
+        vmlinuz.size -= src_len;
+    } else {
+        memcpy(elfheader, (const void *)vmlinuz.addr,
+               sizeof(elfheader));
+    }
 =====
-	/* Eventually gunzip the kernel */
-	if (f_unc) {
-		/* was compressed by upx */
-		printf("upx_expand (0x%lx <- 0x%lx:0x%0lx)...",
-		       vmlinux.addr, vmlinuz.addr, vmlinuz.addr+vmlinuz.size);
-		unsigned dst_len = vmlinux.size - elfoffset;
-		upx_expand((unsigned char const *)vmlinuz.addr,
-		           (unsigned char       *)vmlinux.addr, &dst_len, f_unc);
-		printf("done 0x%lx bytes\n\r", len);
-	} else {
-		memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,
-			vmlinuz.size);
-		/* Skip over the ELF header */
+    /* Eventually gunzip the kernel */
+    if (f_unc) {
+        /* was compressed by upx */
+        printf("upx_expand (0x%lx <- 0x%lx:0x%0lx)...",
+               vmlinux.addr, vmlinuz.addr, vmlinuz.addr+vmlinuz.size);
+        unsigned dst_len = vmlinux.size - elfoffset;
+        upx_expand((unsigned char const *)vmlinuz.addr,
+                   (unsigned char       *)vmlinux.addr, &dst_len, f_unc);
+        printf("done 0x%lx bytes\n\r", len);
+    } else {
+        memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,
+            vmlinuz.size);
+        /* Skip over the ELF header */
 #ifdef DEBUG
-		printf("... skipping 0x%lx bytes of ELF header\n\r",
-				elfoffset);
+        printf("... skipping 0x%lx bytes of ELF header\n\r",
+                elfoffset);
 #endif
-		vmlinux.addr += elfoffset;
-	}
+        vmlinux.addr += elfoffset;
+    }
 =====
 }
 #endif  /*}*/
@@ -485,9 +485,7 @@ void prep_kernel(unsigned long a1, unsigned long a2)
    const unsigned lsize = getLoaderSize();

    defineDecompressorSymbols();
-    if (ft.id!=0) {
-        defineFilterSymbols(&ft);
-    }
+    defineFilterSymbols(&ft);
    relocateLoader();

    MemBuffer loader(lsize);
@@ -711,7 +709,7 @@ int PackVmlinuxBase<T>::canUnpack()
 template <class T>
 void PackVmlinuxBase<T>::unpack(OutputFile *fo)
 {
-    U32 word;
+    TE32 word;
    PackHeader const ph_tmp(ph);

    fi->seek(p_note0->sh_offset, SEEK_SET);
@@ -839,7 +837,7 @@ const int *PackVmlinuxPPC32::getFilters() const

 bool PackVmlinuxI386::is_valid_e_entry(Addr e_entry)
 {
-    return 0==(0x000fffff & e_entry); // entry on whole 1MB
+    return 0==(0x000fffff & e_entry); // entry on whole 1 MiB
 }


@@ -1017,7 +1015,7 @@ unsigned PackVmlinuxI386::write_vmlinux_head(
    // COMPRESSED_LENGTH
    fo->write(&stub_i386_linux_kernel_vmlinux_head[0],
        sizeof(stub_i386_linux_kernel_vmlinux_head)-(1+ 4) +1);
-    U32 tmp_u32; tmp_u32 = ph.c_len; fo->write(&tmp_u32, 4);
+    TE32 tmp_u32; tmp_u32 = ph.c_len; fo->write(&tmp_u32, 4);

    stxt->sh_size += sizeof(stub_i386_linux_kernel_vmlinux_head);

@@ -1032,7 +1030,7 @@ unsigned PackVmlinuxAMD64::write_vmlinux_head(
    // COMPRESSED_LENGTH
    fo->write(&stub_amd64_linux_kernel_vmlinux_head[0],
        sizeof(stub_amd64_linux_kernel_vmlinux_head)-(1+ 4) +1);
-    U32 tmp_u32; tmp_u32 = ph.c_len; fo->write(&tmp_u32, 4);
+    TE32 tmp_u32; tmp_u32 = ph.c_len; fo->write(&tmp_u32, 4);
 printf("  Compressed length=0x%x\n", ph.c_len);
 printf("UnCompressed length=0x%x\n", ph.u_len);

@@ -1091,7 +1089,7 @@ unsigned PackVmlinuxARMEL::write_vmlinux_head(
    fo->write(&stub_arm_linux_kernel_vmlinux_head[0], 4);

    // Second word
-    U32 tmp_u32;
+    TE32 tmp_u32;
    unsigned const t = (0xff000000 &
            BeLePolicy::get32(&stub_arm_linux_kernel_vmlinux_head[4]))
        | (0x00ffffff & (0u - 1 + ((3+ ph.c_len)>>2)));
@@ -1113,7 +1111,7 @@ unsigned PackVmlinuxARMEB::write_vmlinux_head(
    fo->write(&stub_armeb_linux_kernel_vmlinux_head[0], 4);

    // Second word
-    U32 tmp_u32;
+    TE32 tmp_u32;
    unsigned const t = (0xff000000 &
            BeLePolicy::get32(&stub_armeb_linux_kernel_vmlinux_head[4]))
        | (0x00ffffff & (0u - 1 + ((3+ ph.c_len)>>2)));
@@ -1137,7 +1135,7 @@ unsigned PackVmlinuxPPC32::write_vmlinux_head(

 bool PackVmlinuxARMEL::has_valid_vmlinux_head()
 {
-    U32 buf[2];
+    TE32 buf[2];
    fi->seek(p_text->sh_offset + sizeof(stub_arm_linux_kernel_vmlinux_head) -8, SEEK_SET);
    fi->readx(buf, sizeof(buf));
    //unsigned const word0 = buf[0];
@@ -1151,7 +1149,7 @@ bool PackVmlinuxARMEL::has_valid_vmlinux_head()

 bool PackVmlinuxARMEB::has_valid_vmlinux_head()
 {
-    U32 buf[2];
+    TE32 buf[2];
    fi->seek(p_text->sh_offset + sizeof(stub_armeb_linux_kernel_vmlinux_head) -8, SEEK_SET);
    fi->readx(buf, sizeof(buf));
    //unsigned const word0 = buf[0];
@@ -1165,7 +1163,7 @@ bool PackVmlinuxARMEB::has_valid_vmlinux_head()

 bool PackVmlinuxPPC32::has_valid_vmlinux_head()
 {
-    U32 buf[2];
+    TE32 buf[2];
    fi->seek(p_text->sh_offset + sizeof(stub_powerpc_linux_kernel_vmlinux_head) -8, SEEK_SET);
    fi->readx(buf, sizeof(buf));
    //unsigned const word0 = buf[0];
@@ -1392,8 +1390,8 @@ bool PackVmlinuxAMD64::has_valid_vmlinux_head()
 //      pushl $0
 //      pushl $ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED
 //      pushl $ PROT_EXEC | PROT_WRITE | PROT_READ
-//      pushl $0x600000  # 6MB length
-//      pushl $0x100000  # 1MB address
+//      pushl $0x600000  # 6 MiB length
+//      pushl $0x100000  # 1 MiB address
 //      call mmap
 //      leal -0x9000(%esp),%esi  # expect "lea 0x9000(%esi),%esp" later
 ///* Fall into .text of upx-compressed vmlinux. */
@@ -1442,7 +1440,7 @@ const int *PackVmlinuxAMD64::getFilters() const

 bool PackVmlinuxAMD64::is_valid_e_entry(Addr e_entry)
 {
-    return 0x200000<=e_entry; // 2MB
+    return 0x200000<=e_entry; // 2 MiB
 }

 Linker* PackVmlinuxAMD64::newLinker() const
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -45,9 +45,9 @@ protected:
    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 ElfClass::TE16  TE16;
+    typedef typename ElfClass::TE32  TE32;
+    typedef typename ElfClass::TE64  TE64;
    typedef typename ElfITypes::Addr Addr;
    // ELF types
    typedef typename ElfClass::Ehdr Ehdr;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -51,7 +51,7 @@ static const unsigned bzimage_offset = 0x100000;
 **************************************************************************/

 PackVmlinuzI386::PackVmlinuzI386(InputFile *f) :
-    super(f), physical_start(0x100000)
+    super(f), physical_start(0x100000), page_offset(0), config_physical_align(0)
 {
    bele = &N_BELE_RTP::le_policy;
    COMPILE_TIME_ASSERT(sizeof(boot_sect_t) == 0x218);
@@ -73,6 +73,15 @@ const int *PackVmlinuzI386::getFilters() const
    return filters;
 }

+const int *PackBvmlinuzI386::getFilters() const
+{
+    // The destination buffer might be relocated at runtime.
+    static const int filters[] = {
+        0x49, 0x46,
+    FT_END };
+    return filters;
+}
+

 bool PackVmlinuzI386::canPack()
 {
@@ -111,12 +120,16 @@ int PackVmlinuzI386::readFileHeader()
    else if (hdrs && (h.load_flags & 1) != 0)
    {
        format = UPX_F_BVMLINUZ_i386;
-        // account for 16-bit h.sys_size, wrap around at 20 bits
-        sys_size &= (1 << 20) - 1;
    }

-    if (16u * h.sys_size != sys_size)
-        return 0;
+    if (0x204<=h.version) {
+        if ((16u * h.sys_size) != sys_size)
+            return 0;
+    }
+    else { // h.sys_size is only 2 bytes
+        if ((16u * (0xffff & h.sys_size)) != (~(~0u<<20) & sys_size))
+            return 0;
+    }

    // FIXME: add more checks for a valid kernel

@@ -124,6 +137,11 @@ int PackVmlinuzI386::readFileHeader()
 }


+static int is_pow2(unsigned const x)
+{
+    return !(x & (x - 1));
+}
+
 // read full kernel into obuf[], gzip-decompress into ibuf[],
 // return decompressed size
 int PackVmlinuzI386::decompressKernel()
@@ -133,14 +151,76 @@ int PackVmlinuzI386::decompressKernel()
    fi->seek(0, SEEK_SET);
    fi->readx(obuf, file_size);

-    // Find "ljmp $__BOOT_CS,$__PHYSICAL_START" if any.
+    {
+    const upx_byte *base = NULL;
+    unsigned relocated = 0;
+
    // 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==memcmp("\xEA\x00\x00", p, 3) && 0==(0xf & p[3]) && 0==p[4]) {
-        /* whole megabyte < 16MB */
-        physical_start = get_le32(1+ p);
-        break;
+    const upx_byte *p = &obuf[setup_size];
+    unsigned cpa_0 = 0;
+    unsigned cpa_1 = 0;
+    int j;
+    for ((p = &obuf[setup_size]), (j= 0); j < 0x200; ++j, ++p) {
+        if (0==memcmp("\x89\xeb\x81\xc3", p, 4)
+        &&  0==memcmp("\x81\xe3",      8+ p, 2)) {
+            // movl %ebp,%ebx
+            // addl $imm.w,%ebx
+            // andl $imm.w,%ebx
+            cpa_0 = 1+ get_te32( 4+ p);
+            cpa_1 =    get_te32(10+ p);
+            break;
+        }
+    }
+    for ((p = &obuf[setup_size]), (j= 0); j < 0x200; ++j, ++p) {
+        if (0==memcmp("\x8d\x83",    p, 2)  // leal d32(%ebx),%eax
+        &&  0==memcmp("\xff\xe0", 6+ p, 2)  // jmp *%eax
+        ) {
+            relocated = get_te32(2+ p);
+        }
+        if (0==memcmp("\xE8\x00\x00\x00\x00\x5D", p, 6)) {
+            // "call 1f; 1f: pop %ebp"  determines actual execution address.
+            // linux-2.6.21 (spring 2007) and later; upx stub needs work
+            // unless LOAD_PHYSICAL_ADDR is known.
+            // Allowed code is:  linux-2.6.23/arch/x86/head_32.S  2008-01-01
+            //      call 1f
+            //  1:  popl %ebp
+            //      subl $1b, %ebp  # 32-bit immediate
+            //      movl $LOAD_PHYSICAL_ADDR, %ebx
+            //
+            if (0==memcmp("\x81\xed", 6+  p, 2)      // subl $imm.w,%ebp
+            &&  0==memcmp("\xbb",     12+ p, 1) ) {  // movl $imm.w,%ebx
+                physical_start = get_te32(13+ p);
+            } else
+            if (0==memcmp("\x81\xed", 6+  p, 2)  // subl $imm.w,%ebp
+            &&  is_pow2(cpa_0) && (0u-cpa_0)==cpa_1) {
+                base = (5+ p) - get_te32(8+ p);
+                config_physical_align = cpa_0;
+            }
+            else {
+                throwCantPack("Unrecognized relocatable kernel");
+            }
+        }
+        // Find "ljmp $__BOOT_CS,$__PHYSICAL_START" if any.
+        if (0==memcmp("\xEA\x00\x00", p, 3) && 0==(0xf & p[3]) && 0==p[4]) {
+            /* whole megabyte < 16 MiB */
+            physical_start = get_te32(1+ p);
+            break;
+        }
+    }
+    if (base && relocated) {
+        p = base + relocated;
+        for (j = 0; j < 0x200; ++j, ++p) {
+            if (0==memcmp("\x01\x9c\x0b", p, 3)  // addl %ebx,d32(%ebx,%ecx)
+            ) {
+                page_offset = 0u - get_te32(3+ p);
+            }
+            if (0==memcmp("\x89\xeb",    p, 2)  // movl %ebp,%ebx
+            &&  0==memcmp("\x81\xeb", 2+ p, 2)  // subl $imm32,%ebx
+            ) {
+                physical_start = get_te32(4+ p);
+            }
+        }
+    }
    }

    checkAlreadyPacked(obuf + setup_size, UPX_MIN(file_size - setup_size, (off_t)1024));
@@ -236,6 +316,15 @@ int PackVmlinuzI386::decompressKernel()
        &&  0x0F==ibuf[19] && 0xA2==ibuf[20]  // cpuid
        ) goto head_ok;

+        // cmpw   $0x207,0x206(%esi)  Debian vmlinuz-2.6.24-12-generic
+        if (0==memcmp("\x66\x81\xbe\x06\x02\x00\x00\x07\x02", ibuf, 9)) goto head_ok;
+
+        // testb  $0x40,0x211(%esi)  Fedora vmlinuz-2.6.25-0.218.rc8.git7.fc9.i686
+        if (0==memcmp("\xf6\x86\x11\x02\x00\x00\x40", ibuf, 7)) goto head_ok;
+
+        // rex.W prefix for x86_64
+        if (0x48==ibuf[0]) throwCantPack("x86_64 bzImage is not yet supported");
+
        throwCantPack("unrecognized kernel architecture; use option '-f' to force packing");
    head_ok:

@@ -284,7 +373,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" : "",
+              ph.first_offset_found == 1 ? "LINUZ010" : "",
              ft->id ? "LZCALLT1" : "",
              "LZIMAGE0",
              getDecompressorSections(),
@@ -312,7 +401,7 @@ void PackVmlinuzI386::pack(OutputFile *fo)
    // compress
    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(&ft, 512, &cconf);

    const unsigned lsize = getLoaderSize();
@@ -357,24 +446,33 @@ 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" : "",
+    if (0!=page_offset) { // relocatable kernel
+        assert(0==ft->id || 0x40==(0xf0 & ft->id));  // others assume fixed buffer address
+        addLoader("LINUZ000,LINUZVGA,LINUZ101,LINUZ110",
+            ((0!=config_physical_align) ? "LINUZ120" : "LINUZ130"),
+            "LINUZ140,LZCUTPOI,LINUZ141",
+            (ft->id ? "LINUZ145" : ""),
+            (ph.first_offset_found == 1 ? "LINUZ010" : ""),
+            NULL);
+    }
+    else {
+        addLoader("LINUZ000,LINUZVGA,LINUZ001",
+              ph.first_offset_found == 1 ? "LINUZ010" : "",
              (0x40==(0xf0 & ft->id)) ? "LZCKLLT1" : (ft->id ? "LZCALLT1" : ""),
              "LBZIMAGE,IDENTSTR",
              "+40", // align the stuff to 4 byte boundary
              "UPX1HEAD", // 32 byte
              "LZCUTPOI",
              NULL);
+        // fake alignment for the start of the decompressor
+        //linker->defineSymbol("LZCUTPOI", 0x1000);
+    }

-    // fake alignment for the start of the decompressor
-    linker->defineSymbol("LZCUTPOI", 0x1000);
+    addLoader(getDecompressorSections(), NULL);

-    addLoader(getDecompressorSections(),
-              NULL
-             );
    if (ft->id)
    {
-        assert(ft->calls > 0);
+            assert(ft->calls > 0);
        if (0x40==(0xf0 & ft->id)) {
            addLoader("LZCKLLT9", NULL);
        }
@@ -383,7 +481,27 @@ void PackBvmlinuzI386::buildLoader(const Filter *ft)
        }
        addFilter32(ft->id);
    }
-    addLoader("LINUZ990", NULL);
+    if (0!=page_offset) {
+        addLoader("LINUZ150,IDENTSTR,+40,UPX1HEAD", NULL);
+        unsigned const l_len = getLoaderSize();
+        unsigned const c_len = ALIGN_UP(ph.c_len, 4u);
+        unsigned const e_len = getLoaderSectionStart("LINUZ141") -
+                               getLoaderSectionStart("LINUZ110");
+        linker->defineSymbol("compressed_length", c_len);
+        linker->defineSymbol("load_physical_address", physical_start);  // FIXME
+        if (0!=config_physical_align) {
+            linker->defineSymbol("neg_config_physical_align", 0u - config_physical_align);
+        }
+        linker->defineSymbol("neg_length_mov", 0u - ALIGN_UP(c_len + l_len, 4u));
+        linker->defineSymbol("neg_page_offset", 0u - page_offset);
+        //linker->defineSymbol("physical_start", physical_start);
+        linker->defineSymbol("unc_length", ph.u_len);
+        linker->defineSymbol("dec_offset", ph.overlap_overhead + e_len);
+        linker->defineSymbol("unc_offset", ph.overlap_overhead + ph.u_len - c_len);
+    }
+    else {
+        addLoader("LINUZ990", NULL);
+    }
 }


@@ -394,11 +512,15 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
    // prepare filter
    Filter ft(ph.level);
    ft.buf_len = ph.u_len;
-    ft.addvalue = physical_start;  // saves 4 bytes in unfilter code
+    ft.addvalue = 0;  // The destination buffer might be relocated at runtime.

    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
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
+
+    // FIXME: new stub allows most of low memory as stack for Bvmlinuz ?
+    //cconf.conf_lzma.max_num_probs = (0x99000 - 0x10250)>>1; // ushort: 560560 stack
+
    compressWithFilters(&ft, 512, &cconf);

    // align everything to dword boundary - it is easier to handle
@@ -427,21 +549,25 @@ void PackBvmlinuzI386::pack(OutputFile *fo)
    const int e_len = getLoaderSectionStart("LZCUTPOI");
    assert(e_len > 0);

-    const unsigned d_len4 = ALIGN_UP(lsize - e_len, 4u);
-    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, 4u) - 4;   // copy from
+    if (0==page_offset) {  // not relocatable kernel
+        const unsigned d_len4 = ALIGN_UP(lsize - e_len, 4u);
+        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, 4u) - 4;   // copy from

-    linker->defineSymbol("decompressor", decompr_pos - bzimage_offset + physical_start);
-    linker->defineSymbol("src_for_decompressor", physical_start + decompr_pos - c_len);
-    linker->defineSymbol("words_to_copy", copy_size / 4);
-    linker->defineSymbol("copy_dest", physical_start + edi);
-    linker->defineSymbol("copy_source", bzimage_offset + esi);
+        linker->defineSymbol("decompressor", decompr_pos - bzimage_offset + physical_start);
+        linker->defineSymbol("src_for_decompressor", physical_start + decompr_pos - c_len);
+        linker->defineSymbol("words_to_copy", copy_size / 4);
+        linker->defineSymbol("copy_dest", physical_start + edi);
+        linker->defineSymbol("copy_source", bzimage_offset + esi);
+    }

    defineFilterSymbols(&ft);
    defineDecompressorSymbols();
-    linker->defineSymbol("original_entry", physical_start);
+    if (0==page_offset) {
+        linker->defineSymbol("original_entry", physical_start);
+    }
    linker->defineSymbol("stack_offset", stack_offset_during_uncompression);
    relocateLoader();

@@ -450,11 +576,21 @@ 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, 16u) / 16) & 0xffff;
+    bs->sys_size = (ALIGN_UP(lsize + c_len, 16u) / 16);

    fo->write(setup_buf, setup_buf.getSize());
-    fo->write(loader, e_len);
+
+    unsigned const e_pfx = (0==page_offset) ? 0 : getLoaderSectionStart("LINUZ110");
+    if (0!=page_offset) {
+        fo->write(loader, e_pfx);
+    }
+    else {
+        fo->write(loader, e_len);
+    }
    fo->write(obuf, c_len);
+    if (0!=page_offset) {
+        fo->write(loader + e_pfx, e_len - e_pfx);
+    }
    fo->write(loader + e_len, lsize - e_len);
 #if 0
    printf("%-13s: setup        : %8ld bytes\n", getName(), (long) setup_buf.getSize());
@@ -488,7 +624,7 @@ int PackVmlinuzI386::canUnpack()
 void PackVmlinuzI386::unpack(OutputFile *fo)
 {
    // no uncompression support for this format, so that
-    // it is possible to remove the original deflate code (>10KB)
+    // it is possible to remove the original deflate code (>10 KiB)

    // FIXME: but we could write the uncompressed "vmlinux" image

@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -68,8 +68,8 @@ protected:
        char            _[0x1f1];
        unsigned char   setup_sects;
        char            __[2];
-        LE16            sys_size;
-        char            ___[8];
+        LE32            sys_size;
+        char            ___[6];
        LE16            boot_flag;      // 0xAA55
        // 0x200
        char            ____[2];
@@ -88,6 +88,8 @@ protected:
    MemBuffer setup_buf;
    int setup_size;
    unsigned physical_start;
+    unsigned page_offset;
+    unsigned config_physical_align;
 };


@@ -103,6 +105,7 @@ public:
    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 const int *getFilters() const;

    virtual void pack(OutputFile *fo);

@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -1037,7 +1037,7 @@ void PackW32Pe::pack(OutputFile *fo)
    //    set_le32(ibuf + ic,get_le32("UPX "));
    ibuf.clear(0, oh.filealign);

-    info("Image size change: %u -> %u kBytes",
+    info("Image size change: %u -> %u KiB",
         ih.imagesize / 1024, oh.imagesize / 1024);

    infoHeader("[Writing compressed file]");
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

   Markus F.X.J. Oberhumer              Laszlo Molnar
-   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -433,7 +433,7 @@ void PackWcle::encodeImage(Filter *ft)
    // prepare filter [already done]
    // compress
    upx_compress_config_t cconf; cconf.reset();
-    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28KB stack
+    cconf.conf_lzma.max_num_probs = 1846 + (768 << 4); // ushort: ~28 KiB stack
    compressWithFilters(ibuf, isize,
                        oimage + RESERVED,
                        ibuf + ft->addvalue, ft->buf_len,
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

-   Copyright (C) 1996-2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   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
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */


@@ -1121,6 +1121,11 @@ int Packer::getLoaderSize() const
    return size;
 }

+bool Packer::hasLoaderSection(const char *name) const
+{
+    void *section = linker->findSection(name, false);
+    return section != NULL;
+}

 int Packer::getLoaderSection(const char *name, int *slen) const
 {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Reiser	1e38bbfbc1	merge	2008-04-26 13:08:13 -07:00
John Reiser	1c62e95812	Bvmlinuz fix filters	2008-04-26 13:04:13 -07:00
Markus F.X.J. Oberhumer	d453cc27a3	Style: start using correct IEC binary prefix (KiB, MiB, ...) - see http://en.wikipedia.org/wiki/Binary_prefix for more details.	2008-04-26 08:48:13 +02:00
Markus F.X.J. Oberhumer	2c3e841d8a	Fix comment.	2008-04-26 08:23:05 +02:00
John Reiser	50668c462f	Bvmlinuz h.sys_size, and more heuristics	2008-04-25 12:07:38 -07:00
John Reiser	8d1192e832	Bvmlinuz,Vmlinuz make room for largest possible decompression stack by moving kernel command line up, and real mode area down	2008-04-24 12:15:07 -07:00
John Reiser	4a8e2e9ed4	grub-0.97-33.fc9 does not leave enough room for lzma	2008-04-23 16:37:16 -07:00
Markus F.X.J. Oberhumer	12fc45220a	Shorten --help text.	2008-04-17 14:07:03 +02:00
Markus F.X.J. Oberhumer	6bce68fbe7	Bump tentative release date.	2008-04-17 12:16:23 +02:00
Markus F.X.J. Oberhumer	d54f947c98	Add Packer::hasLoaderSection() to handle missing CFLUSH sections.	2008-04-07 18:44:00 +02:00
Markus F.X.J. Oberhumer	6c8bb3a22e	Rebuild all stubs with new formatting - no binary changes.	2008-04-04 17:21:24 +02:00
Markus F.X.J. Oberhumer	ed29ce5183	bin2h.py: improve formatting.	2008-04-04 17:20:17 +02:00
Markus F.X.J. Oberhumer	a51d269b7c	Use new bin2h.py mode.	2008-04-04 16:37:12 +02:00
Markus F.X.J. Oberhumer	8283e4e6d6	bin2h.py: add support for --mode=gas-be32 and --mode=gas-le32.	2008-04-04 16:35:58 +02:00
John Reiser	23ce91eb55	MIPS big-endian lzma build rules	2008-04-03 09:01:55 -07:00
John Reiser	545ac7fcfa	Merge	2008-04-02 19:10:39 -07:00
John Reiser	3926ccccad	MIPS-linux.elf flush icache after moving decompressor	2008-04-02 19:09:31 -07:00
Markus F.X.J. Oberhumer	f431307ef2	Silence some compilation warnings.	2008-04-02 19:24:05 +02:00
Markus F.X.J. Oberhumer	ca368e0f9b	Add a note about broken scanf() implementations.	2008-04-02 16:34:31 +02:00
John Reiser	8afeb56c11	Big-endian MIPS NRV nested subroutine must save+restore register ra.	2008-04-01 22:09:14 -07:00
John Reiser	2a6f90c5f3	Big-endian MIPS must fetch NRV 32-bit "control" words as little endian.	2008-04-01 20:06:27 -07:00
John Reiser	271031128e	Fix ElfLinkerMipsBE::relocate1. Create CFLUSH section in mipsel.r3000-linux.elf-entry.S and powerpc-darwin.macho-entry.S .	2008-03-31 08:55:35 -07:00
John Reiser	b991f954d0	Fix "Failure with Ubuntu 7.10" SourceForge Bug tracker 1825006 when --force-execve with kernel 2.6.22-14-generic et al.	2008-03-27 15:51:19 -07:00
John Reiser	f12bb3f80d	bvmlinuz must preserve register esi	2008-03-04 15:41:42 -08:00
Markus F.X.J. Oberhumer	6dc978e8d8	Remove trailing whitespace.	2008-02-28 00:04:32 +01:00
John Reiser	9f05a873bc	Merge	2008-02-26 12:17:21 -08:00
John Reiser	703d498772	Implement cache flush for PowerPC.	2008-02-26 12:15:09 -08:00
Markus F.X.J. Oberhumer	ed3b9543bb	Cosmetic Makefile update.	2008-02-26 02:59:00 +01:00
Markus F.X.J. Oberhumer	fc7efba7d8	Silence some compilation warnings.	2008-02-26 02:55:39 +01:00
Markus F.X.J. Oberhumer	b3178fe8f4	stub/Makefile: cosmetic updates.	2008-01-30 16:39:45 +01:00
Markus F.X.J. Oberhumer	e36798a993	Remove unused stub/amd64-linux.kernel.vmlinuz.	2008-01-30 16:19:46 +01:00
Markus F.X.J. Oberhumer	a143605465	Remove trailing whitespace.	2008-01-30 07:22:32 +01:00
Markus F.X.J. Oberhumer	d3ad35b21e	Rebuild stubs.	2008-01-30 07:20:45 +01:00
Markus F.X.J. Oberhumer	68134941bf	Small Makefile update.	2008-01-30 07:20:19 +01:00
John Reiser	54d0fef559	BvmlinuzI386 runtime-relocatable kernels	2008-01-29 10:33:45 -08:00
Markus F.X.J. Oberhumer	7f9c47176a	Introduce target endianness accessors get_teXX() and set_teXX() in packer.h to replace all [gs]et_nativeXX() member functions.	2008-01-09 13:57:47 +01:00
Markus F.X.J. Oberhumer	9060ac7897	Rename template integral types from U32 to TE32 to emphasize on target endianness.	2008-01-09 12:45:44 +01:00
John Reiser	d9073e4a17	PackVmlinuzI386 detects non-relocated kernel	2008-01-08 09:03:21 -08:00
Markus F.X.J. Oberhumer	de1c1d7cc2	Update help header message.	2008-01-02 11:40:16 +01:00
Markus F.X.J. Oberhumer	6ff1bd5917	Update my email address.	2008-01-02 10:12:42 +01:00
Markus F.X.J. Oberhumer	a6b04f426e	Bump version year.	2008-01-02 09:47:52 +01:00
Markus F.X.J. Oberhumer	fa49dbe2cb	Enter 2008.	2008-01-02 09:42:31 +01:00
Markus F.X.J. Oberhumer	682eb04a52	New ACC version.	2008-01-02 09:34:45 +01:00
Markus F.X.J. Oberhumer	77064fb09e	Makefile update.	2008-01-02 09:32:32 +01:00
Markus F.X.J. Oberhumer	be8d93563a	Introduce first --mp-xxx options.	2007-12-20 06:39:31 +01:00
Markus F.X.J. Oberhumer	d4a6a5216d	Makefile updates.	2007-12-18 22:37:30 +01:00
Markus F.X.J. Oberhumer	1cb1427050	Detabify.	2007-12-17 06:00:33 +01:00
Markus F.X.J. Oberhumer	e4f4eace1c	Added support for LZMA SDK 4.57. Compiles, but pretty much untested.	2007-12-17 05:54:08 +01:00
Markus F.X.J. Oberhumer	30a98b7e8c	Remove trailing whitespace.	2007-12-17 05:49:34 +01:00
Markus F.X.J. Oberhumer	d36c8d95ad	Bump version for next release.	2007-12-16 15:10:44 +01:00
Markus F.X.J. Oberhumer	506bd0abcf	Add tag for RELEASE_302.	2007-12-16 15:08:32 +01:00
Markus F.X.J. Oberhumer	8dd810c41d	Bump release date.	2007-12-16 15:07:05 +01:00
John Reiser	d9d0dc5201	get_native(&Elf32_Phdr.p_align)	2007-12-15 10:07:09 -08:00
Markus F.X.J. Oberhumer	72880d9e03	Disable leftover debug printf statements.	2007-12-12 08:36:03 +01:00
Markus F.X.J. Oberhumer	6c7ec6eb1b	Update brandelf.py.	2007-12-12 05:25:15 +01:00
Markus F.X.J. Oberhumer	705fc5d116	Rebuild stubs.	2007-11-27 01:12:45 +01:00
Markus F.X.J. Oberhumer	d20b575b9b	Merge.	2007-11-27 01:12:09 +01:00
John Reiser	c949beab9c	mipsel.r3000-linux.elf-entry.S syscall clobbers t8	2007-11-26 14:56:23 -08:00
Markus F.X.J. Oberhumer	3fb857c435	Cleanup brandelf.py.	2007-11-26 19:57:00 +01:00
Markus F.X.J. Oberhumer	0a4f999ade	Fix missing rebuild from previous commit.	2007-11-25 08:59:52 +01:00
John Reiser	f0b7147881	mips*.r3000-linux.elf clear stack to workaround suspected bug in glibc-2.3.2	2007-11-24 15:24:10 -08:00
John Reiser	b36a42cd0a	PackVmlinuzI386 detects relocatable kernel (cannot handle yet)	2007-11-20 12:01:50 -08:00
Markus F.X.J. Oberhumer	000309b47f	stub: remove filename from dumps in order reduce diff noise when renaming files.	2007-11-20 06:34:48 +01:00
Markus F.X.J. Oberhumer	5cb12988f0	Merge.	2007-11-20 06:31:16 +01:00
John Reiser	50c4b749ec	PackVmlinuxBase<T>::pack always defineFilterSymbols(), esp. for PackVmlinuxAMD64	2007-11-19 18:39:25 -08:00
Markus F.X.J. Oberhumer	5db2734e6f	Small Makefile updates.	2007-11-19 09:48:27 +01:00
Markus F.X.J. Oberhumer	e9e5507483	stub: rename "mipseb" to "mips".	2007-11-14 04:54:33 +01:00
Markus F.X.J. Oberhumer	d63dc7adfb	stub: we can reuse our existing mipsel-* tools for mips (big endian).	2007-11-14 04:40:40 +01:00
John Reiser	27db44a8db	generated headers for mipseb.r3000-linux.elf	2007-11-13 17:54:05 -08:00
John Reiser	1a035e2866	PackLinuxElf32::canPack must use explicit get_native32	2007-11-13 11:11:31 -08:00
John Reiser	887aa20116	ElfLinkerMipsBE is big endian	2007-11-13 11:09:15 -08:00
John Reiser	5e03d86695	new PackLinuxElf32mipseb	2007-11-13 11:08:48 -08:00
John Reiser	95075aa28e	MIPSEB implementation [still broken because no big-endian tools]	2007-11-12 09:23:45 -08:00
John Reiser	0260f0790a	mipseb.r3000-linux.elf [broken because no big-endian tool chain]	2007-11-12 09:12:51 -08:00
John Reiser	34d65ba292	ET_DYN -fPIE position-independent executables	2007-11-12 09:11:16 -08:00
John Reiser	27a77a15ed	prepare to deal with DT_GNU_HASH instead of DT_HASH	2007-11-12 09:05:36 -08:00
John Reiser	76025bfae1	_NR_link	2007-11-12 08:54:34 -08:00
John Reiser	4957faf482	DT_GNU_HASH, DT_JMPREL, etc.	2007-11-12 08:54:02 -08:00
Markus F.X.J. Oberhumer	0d8e16d5c8	Rename nocopy to noncopyable.	2007-11-07 23:13:20 +01:00
Markus F.X.J. Oberhumer	07baed1581	Improved IO error checking.	2007-11-06 03:21:32 +01:00
Markus F.X.J. Oberhumer	eab5da075a	And yet some more dos/exe size reduction.	2007-09-14 16:59:19 +02:00
Markus F.X.J. Oberhumer	0d1bbb19ce	Small Makefile cleanup.	2007-09-14 16:31:17 +02:00
Markus F.X.J. Oberhumer	58d6cbc6ac	More dos/exe lzma size reduction.	2007-09-14 16:03:51 +02:00
Markus F.X.J. Oberhumer	4d3b627839	Save some more bytes in dos/exe lzma stub.	2007-09-14 15:47:18 +02:00
Markus F.X.J. Oberhumer	49455c99ad	Save 1 byte in dos/exe stub.	2007-09-14 13:48:00 +02:00
Markus F.X.J. Oberhumer	31bb6bedbd	stub i086: use decimal constants.	2007-09-13 22:52:43 +02:00
Markus F.X.J. Oberhumer	8d54678ea1	Switch back to using binutils-multiarch-2.17.	2007-09-13 20:14:29 +02:00
Markus F.X.J. Oberhumer	590767c299	Make stub files compatible with binutils-multiarch-2.18.	2007-09-13 19:59:41 +02:00
John Reiser	ec1bd342b8	fix error checking in mmap for i386-linux.elf [triggered by -fPIE]	2007-09-08 06:55:47 -07:00
John Reiser	b031c9e7f6	fix unmapping on arm-linux.elf	2007-08-30 11:55:58 -07:00
John Reiser	ea0dfe83b7	arm-linux.elf-entry.S clobbered ADRU with sz_unc of fold	2007-08-30 11:53:16 -07:00
Markus F.X.J. Oberhumer	bdd90f2c57	Allow setting the compression method in the environment variable (popular request from our users).	2007-08-04 12:13:09 +02:00
Markus F.X.J. Oberhumer	288dac5d70	Bump version for next release.	2007-07-31 22:50:23 +02:00
Markus F.X.J. Oberhumer	9d22e1c35e	Added tag for RELEASE_301.	2007-07-31 22:42:40 +02:00