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
380 changed files with 61266 additions and 44658 deletions
@@ -2,11 +2,15 @@ syntax: regexp
 ^\.bzr
 ^ChangeLog
 ^Makevars.global
 ^build
 ^maint
 syntax: glob
 .depend
 Makevars.local
 *.a
 *.dll
 *.lib
@@ -1,9 +1,12 @@
 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
 a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193
 b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195
@@ -12,3 +15,5 @@ c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192
 d276aa09033c24d0981bc3f4fee5628aecc988ad RELEASE_290
 eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110
 ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191
 ef9c7f2c9658d73a9b5ab2ed291483d2bbcd8bc7 RELEASE_300
 efa52753e366300c0e0ebe20631adcb24ed3c15b RELEASE_293
@@ -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
@@ -1,16 +1,21 @@
 #
-# UPX toplevel Makefile - needs GNU make 3.80 or better
+# UPX toplevel Makefile - needs GNU make 3.81 or better
 #
 MAKEFLAGS += -rR
 .SUFFIXES:
 export SHELL = /bin/sh
 ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),)
 $(error GNU make 3.81 or better is required)
 endif
 srcdir = .
 top_srcdir = .
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
-# info: src/stub needs GNU make 3.81 and special build tools
+# info: src/stub needs special build tools
 BUILD_STUB = 0
 ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
 BUILD_STUB = 1
@@ -18,9 +23,6 @@ endif
 ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
 BUILD_STUB = 1
 endif
 ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),)
 BUILD_STUB = 0
 endif
 default:
@@ -33,15 +35,14 @@ endif
 	$(MAKE) -C src $@
 	$(MAKE) -C doc $@
-# automatically generate ChangeLog from Mercurial repo
+
 ifneq ($(wildcard .hg/.),)
 # automatically generate ChangeLog from local Mercurial repo
 ChangeLog:
 ifneq ($(wildcard .hg/data/.),)
 	hg log --style=changelog > $@
-else
+.PHONY: ChangeLog
 	@echo "UPX info: no hg repo found"
 endif
 .PHONY: default all mostlyclean clean distclean maintainer-clean
 .PHONY: ChangeLog
@@ -2,6 +2,39 @@
 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.
  * dos/exe: fixed an incorrect error message caused by a bug in
    relocation handling
  * new format linux/mipsel supports ELF on [32-bit] R3000
  * fix argv[0] on PowerPC with --lzma
  * bug fixes
 Changes in 3.00 (27 Apr 2007):
  * watcom/le & tmt/adam: fixed a problem when using certain filters
 Changes in 2.93 beta (08 Mar 2007):
  * new formats Mach/i386 and Mach/fat support Mac OS X i686 and
    Universal binaries [i686 and PowerPC only]
  * dos/exe: LZMA is now also supported for 16-bit dos/exe. Please note that
    you have to explicitly use '--lzma' even for '--ultra-brute' here
    because runtime decompression is about 30 times slower than NRV -
    which is really noticeable on old machines.
  * dos/exe: fixed a rarely occuring bug in relocation handling
  * win32/pe & arm/pe: better icon compression handling
 Changes in 2.92 beta (23 Jan 2007):
  * new option '--ultra-brute' which tries even more variants
  * slightly improved compression ratio for some files when
@@ -302,8 +335,8 @@ Changes in 0.80 (03 Aug 1999)
  * win32/pe: even better TLS support
  * win32/pe: versioninfo works on NT
  * win32/pe: import by ordinal from kernel32.dll works
-  * win32/pe: other import improvements: importing a nonexistant DLL
+  * win32/pe: other import improvements: importing a nonexistent DLL
-    results in a usual Windows message, importing a nonexistant function
+    results in a usual Windows message, importing a nonexistent function
    results in program exit (instead of crash ;-)
  * win32/pe: new option: '--compress-resources=0'
  * win32/pe: reduced memory requirement during uncompression, some
@@ -355,7 +388,7 @@ Changes in 0.60 (06 Mar 1999)
  * win32/pe: fixed file corruption when the size of the export data is invalid
  * win32/pe: fixed a problem with empty resource data
  * win32/pe: compressed file alignment set to minimum value
-  * win32/pe: made all compressed sections writeable
+  * win32/pe: made all compressed sections writable
  * fixed some other win32/pe bugs
  * fixed an address optimization problem for some not Watcom LE files
  * fixed a bug which could make UPX hang when an exe header contained
@@ -396,3 +429,5 @@ Changes in 0.20 (05 Jul 1998)
 Changes in 0.05 (26 May 1998)
  * first public beta release
 # vim:set syntax=off tw=0 ts=4 sw=4 et: -*- coding: utf-8 -*-
@@ -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
@@ -96,7 +96,7 @@ THE FUTURE
  - We will *NOT* add any sort of protection and/or encryption.
    This only gives people a false feeling of security because
    by definition all protectors/compressors can be broken.
-    And don't trust any advertisment of authors of other executable
+    And don't trust any advertisement of authors of other executable
    compressors about this topic - just do a websearch on "unpackers"...
  - Fix all remaining bugs - keep your reports coming ;-)
@@ -108,9 +108,9 @@ THE FUTURE
 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
 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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com                      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
@@ -8,18 +8,10 @@
                    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
 WARNING - UNSTABLE BETA VERSION
 ===============================
 The current stable release is 2.02, and the next stable release
 will be called version 3.00.
 MAJOR NEWS IN UPX 3
 ===================
@@ -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
+page tables; one page of page tables covers 4 MiB. The address
-0x00401000 was chosen as 1 page up from a 64KB boundary, to
+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
@@ -57,7 +57,7 @@ Subroutine do_xmap() of src/stub/l_lx_elf.c performs the
 "virtual execve()" using the compressed data as source, and stores
 the decompressed bytes directly into the appropriate virtual addresses.
-Before transfering control to the PT_INTERP "program interpreter",
+Before transferring control to the PT_INTERP "program interpreter",
 minor tricks are required to setup the Elf32_auxv_t entries,
 clear the free portion of the stack (to compensate for ld-linux.so.2
 assuming that its automatic stack variables are initialized to zero),
@@ -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
@@ -45,6 +45,6 @@ These symbols can be defined later in C++ using
        linker->defineSymbol("xx", yy)
-This functionality (we could say it's a simple linker) is achived by
+This functionality (we could say it's a simple linker) is achieved by
 compiling the assembly into an ELF object file which a little C++
 module (src/linker.cpp) can interpret and work with.
@@ -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,
+  - very fast decompression: about 10 MiB/sec on an ancient Pentium 133,
-      about 200 MB/sec on an Athlon XP 2000+.
+      about 200 MiB/sec on an Athlon XP 2000+.
  - no memory overhead for your compressed executables for most of the
      supported formats
@@ -139,7 +139,11 @@ B<--help>: prints the help
 B<--version>: print the version of B<UPX>
 B<--exact>: when compressing, require to be able to get a byte-identical file
-after decompression with option B<-d>
+after decompression with option B<-d>. [NOTE: this is work in progress and is
 not supported for all formats yet. If you do care, as a workaround you can
 compress and then decompress your program a first time - any further
 compress-decompress steps should then yield byte-identical results
 as compared to the first decompressed version.]
 [ ...to be written... - type `B<upx --help>' for now ]
@@ -149,7 +153,7 @@ after decompression with option B<-d>
 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
@@ -197,7 +201,7 @@ For win32/pe programs there's B<--strip-relocs=0>. See notes below.
 =head1 OVERLAY HANDLING OPTIONS
-Info: An "overlay" means auxillary data atached after the logical end of
+Info: An "overlay" means auxiliary data attached after the logical end of
 an executable, and it often contains application specific data
 (this is a common practice to avoid an extra data file, though
 it would be better to use resource sections).
@@ -345,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 aligment 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
@@ -380,7 +384,7 @@ Extra options available for this executable format:
 Introduction
  Linux/386 support in UPX consists of 3 different executable formats,
-  one optimized for ELF excutables ("linux/elf386"), one optimized
+  one optimized for ELF executables ("linux/elf386"), one optimized
  for shell scripts ("linux/sh386"), and one generic format
  ("linux/386").
@@ -408,14 +412,14 @@ General user's overview
  or network I/O.
  Depending on the statistics of usage and access, and the relative
-  speeds of CPU, RAM, swap space, /tmp, and filesystem storage, then
+  speeds of CPU, RAM, swap space, /tmp, and file system storage, then
  invoking and running a compressed executable can be faster than
  directly running the corresponding uncompressed program.
-  The operating system might perfrom fewer expensive I/O operations
+  The operating system might perform fewer expensive I/O operations
  to invoke the compressed program.  Paging to or from swap space
-  or /tmp might be faster than paging from the general filesystem.
+  or /tmp might be faster than paging from the general file system.
  ``Medium-sized'' programs which access about 1/3 to 1/2 of their
-  stored program bytes can do particulary well with compression.
+  stored program bytes can do particularly well with compression.
  Small programs tend not to benefit as much because the absolute
  savings is less.  Big programs tend not to benefit proportionally
  because each invocation may use only a small fraction of the program,
@@ -424,7 +428,7 @@ General user's overview
  then compression may win anyway.
  Currently, executables compressed by UPX do not share RAM at runtime
-  in the way that executables mapped from a filesystem do.  As a
+  in the way that executables mapped from a file system do.  As a
  result, if the same program is run simultaneously by more than one
  process, then using the compressed version will require more RAM and/or
  swap space.  So, shell programs (bash, csh, etc.)  and ``make''
@@ -513,7 +517,7 @@ The linux/elf386 format decompresses directly into RAM,
 uses only one exec, does not use space in /tmp,
 and does not use /proc.
-Linux/elf386 is automatically selected for Linux ELF exectuables.
+Linux/elf386 is automatically selected for Linux ELF executables.
 Packed programs will be byte-identical to the original after uncompression.
@@ -602,7 +606,7 @@ Extra options available for this executable format:
 Please read the general Linux description first.
 The generic linux/386 format decompresses to /tmp and needs
-/proc filesystem support. It starts the decompressed program
+/proc file system support. It starts the decompressed program
 via the execve() syscall.
 Linux/386 is only selected if the specialized linux/elf386
@@ -614,11 +618,11 @@ How it works:
  For files which are not ELF and not a script for a known "-c" shell,
  UPX uses kernel execve(), which first requires decompressing to a
-  temporary file in the filesystem.  Interestingly -
+  temporary file in the file system.  Interestingly -
  because of the good memory management of the Linux kernel - this
-  often does not introduce a noticable delay, and in fact there
+  often does not introduce a noticeable delay, and in fact there
  will be no disk access at all if you have enough free memory as
-  the entire process takes places within the filesystem buffers.
+  the entire process takes places within the file system buffers.
  A compressed executable consists of the UPX stub and an overlay
  which contains the original program in a compressed form.
@@ -644,7 +648,7 @@ Specific drawbacks:
    decompression, but you still need it for the full execution time
    of the program.
-  - You must have /proc filesystem support as the stub wants to open
+  - You must have /proc file system support as the stub wants to open
    /proc/<pid>/exe and needs /proc/<pid>/fd/X. This also means that you
    cannot compress programs that are used during the boot sequence
    before /proc is mounted.
@@ -656,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 noticable delay when starting programs like my ~3 MB emacs (which
+    no noticeable delay when starting programs like my ~3 MiB emacs (which
-    is less than 1 MB when compressed :-).
+    is less than 1 MiB when compressed :-).
 Extra options available for this executable format:
@@ -677,13 +681,16 @@ 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:
  - UPX creates as default a suitable executable for CD-Mastering
    and console transfer. For a CD-Master main executable you could also try
-    the special option "--boot-only" as descriped below.
+    the special option "--boot-only" as described below.
    It has been reported that upx packed executables are fully compatible with
    the Sony PlayStation 2 (PS2, PStwo) and Sony PlayStation Portable (PSP) in
    Sony PlayStation (PSone) emulation mode.
  - Normally the packed files use the same memory areas like the uncompressed
    versions, so they will not override other memory areas while unpacking.
@@ -701,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,
@@ -759,7 +766,7 @@ Benefits:
  - Better compression (but note that the kernel was already compressed,
  so the improvement is not as large as with other formats).
  Still, the bytes saved may be essential for special needs like
-  bootdisks.
+  boot disks.
     For example, this is what I get for my 2.2.16 kernel:
        1589708  vmlinux
@@ -806,13 +813,13 @@ Extra options available for this executable format:
 =head2 NOTES FOR WIN32/PE
 The PE support in B<UPX> is quite stable now, but probably there are
-still some incompabilities with some files.
+still some incompatibilities with some files.
 Because of the way B<UPX> (and other packers for this format) works, you
 can see increased memory usage of your compressed files because the whole
 program is loaded into memory at startup.
 If you start several instances of huge compressed programs you're
-wasting memory because the common segements of the program won't
+wasting memory because the common segments of the program won't
 get shared across the instances.
 On the other hand if you're compressing only smaller programs, or
 running only one instance of larger programs, then this penalty is
@@ -831,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:
@@ -926,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.
@@ -1,5 +1,5 @@
 #
-# UPX Makefile - needs GNU make 3.80 or better
+# UPX Makefile - needs GNU make 3.81 or better
 #
 MAKEFLAGS += -rR
@@ -7,9 +7,19 @@ MAKEFLAGS += -rR
 export SHELL = /bin/sh
 override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1)
-srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.77 3.78 3.78.1 3.79 3.79.1 3.80),)
-ifneq ($(srcdir),./)
+$(error GNU make 3.81 or better is required)
 endif
 ifndef srcdir
 srcdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
 srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,')
 endif
 ifndef top_srcdir
 top_srcdir := $(srcdir)/..
 endif
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 ifneq ($(srcdir),.)
 ##$(info Info: using VPATH . $(srcdir))
 VPATH := . $(srcdir)
 endif
@@ -17,11 +27,10 @@ endif
 ifeq ($(CXX),)
 CXX = g++
 endif
-ifeq ($(firstword $(CXX)),g++)
+ifneq ($(findstring $(firstword $(CXX)),g++),)
 USE_GNUC ?= 1
 endif
 ifeq ($(USE_GNUC),1)
 CXXFLAGS += -MMD
 ifeq ($(DEBUG),1)
 CXXFLAGS += -O0 -g
 else
@@ -46,37 +55,57 @@ INCLUDES += -I$(UPX_UCLDIR)/include
 LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
 endif
 LIBS += -lucl -lz
-# you should set envvar UPX_LZMADIR to point to your unpacked lzma443.tar.bz2
+# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
-ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
+include $(top_srcdir)/src/stub/src/c/Makevars.lzma
-DEFS += -DWITH_LZMA
+ifneq ($(UPX_LZMA_VERSION),)
 DEFS += -DWITH_LZMA=$(UPX_LZMA_VERSION)
 INCLUDES += -I$(UPX_LZMADIR)
 endif
-all: upx$(exeext)
+all: upx$(exeext) | .depend
-.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS)
+.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS) .depend
 upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 	$($(notdir $@).PRE_LINK_STEP)
 	$(strip $(CXXLD) $(call e,CPPFLAGS) $(call e,CXXFLAGS) $(call e,LDFLAGS) -o $@ $(upx_OBJECTS) $(call e,LDADD) $(call e,LIBS))
 	$($(notdir $@).POST_LINK_STEP)
-%.o : %.cpp
+%.o : %.cpp | .depend
 	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
 .depend: $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h) $(MAKEFILE_LIST)
 	@rm -f $@
 ifeq ($(USE_GNUC),1)
 	@echo "Updating $@"
 	@$(strip $(CXX) $(call e,CPPFLAGS) -MM) $(filter %.cpp,$^) > $@
 else
 	touch $@
 endif
 ifeq ($(USE_GNUC),1)
 ##compress_lzma$(objext) : CXXFLAGS += -O3 -fomit-frame-pointer
 compress_lzma$(objext) : CXXFLAGS += -Wno-cast-qual
 compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
 compress_lzma$(objext) : CXXFLAGS += -Wno-shadow
 ifeq ($(UPX_LZMA_VERSION),0x443)
 compress_lzma$(objext) : CXXFLAGS += -Wno-non-virtual-dtor
 compress_lzma$(objext) : CXXFLAGS += -Wno-unused
-##compress_lzma$(objext) : CXXFLAGS += -Wno-error
+endif
 # needed for gcc-4.3:
 compress_lzma$(objext) : CXXFLAGS += -Wno-error
 endif
 mostlyclean clean distclean maintainer-clean:
-	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out upx.ttp upx$(exeext)
+	rm -f *.d *.map *.o *.obj *.res .depend upx.exe upx.out upx.ttp upx$(exeext)
 -include *.d
 .PHONY: all mostlyclean clean distclean maintainer-clean
 ifeq ($(MAKECMDGOALS),mostlyclean)
 else ifeq ($(MAKECMDGOALS),clean)
 else ifeq ($(MAKECMDGOALS),distclean)
 else ifeq ($(MAKECMDGOALS),maintainer-clean)
 else
 -include .depend
 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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -182,8 +182,10 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
 //
 **************************************************************************/
-int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
+int upx_test_overlap       ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult )
 {
@@ -201,15 +203,15 @@ int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
    }
 #if defined(WITH_LZMA)
    else if (M_IS_LZMA(method))
-        r = upx_lzma_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_lzma_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
 #if defined(WITH_NRV)
    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
-        r = upx_nrv_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_nrv_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
 #if defined(WITH_UCL)
    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
-        r = upx_ucl_test_overlap(buf, src_off, src_len, dst_len, method, cresult);
+        r = upx_ucl_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
    else {
        throwInternalError("unknown decompression 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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -46,8 +46,10 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
-int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_lzma_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
 #endif
@@ -65,8 +67,10 @@ int upx_nrv_decompress     ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
-int upx_nrv_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_nrv_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
 #endif
@@ -84,8 +88,10 @@ int upx_ucl_decompress     ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
-int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_ucl_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
 #endif
@@ -102,8 +108,10 @@ int upx_zlib_decompress    ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
-int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_zlib_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
 #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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.
   UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,13 @@
   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>
 */
 #include "conf.h"
 #include "compress.h"
 #include "mem.h"
 void lzma_compress_config_t::reset()
@@ -101,9 +102,15 @@ int compress_lzma_dummy = 0;
 #undef _WIN32_WCE
 #undef COMPRESS_MF_MT
 #undef _NO_EXCEPTIONS
-#include "C/Common/MyInitGuid.h"
+#if (WITH_LZMA >= 0x449)
-//#include "C/7zip/Compress/LZMA/LZMADecoder.h"
+#  define INITGUID 1
-#include "C/7zip/Compress/LZMA/LZMAEncoder.h"
+//#  include "CPP/7zip/Compress/LZMA/LZMADecoder.h"
 #  include "CPP/7zip/Compress/LZMA/LZMAEncoder.h"
 #else
 #  include "C/Common/MyInitGuid.h"
 //#  include "C/7zip/Compress/LZMA/LZMADecoder.h"
 #  include "C/7zip/Compress/LZMA/LZMAEncoder.h"
 #endif
 namespace MyLzma {
@@ -173,16 +180,29 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 #  pragma warning(disable: 424)         // #424: extra ";" ignored
 #endif
-#include "C/Common/Alloc.cpp"
+#if (WITH_LZMA >= 0x449)
-#include "C/Common/CRC.cpp"
+#  include "C/Alloc.c"
-//#include "C/7zip/Common/InBuffer.cpp"
+#  include "C/7zCrc.c"
-#include "C/7zip/Common/OutBuffer.cpp"
+#  include "C/Compress/Lz/MatchFinder.c"
-#include "C/7zip/Common/StreamUtils.cpp"
+//#  include "CPP/7zip/Common/InBuffer.cpp"
-#include "C/7zip/Compress/LZ/LZInWindow.cpp"
+#  include "CPP/7zip/Common/OutBuffer.cpp"
-//#include "C/7zip/Compress/LZ/LZOutWindow.cpp"
+#  include "CPP/7zip/Common/StreamUtils.cpp"
-//#include "C/7zip/Compress/LZMA/LZMADecoder.cpp"
+//#  include "CPP/7zip/Compress/LZ/LZOutWindow.cpp"
-#include "C/7zip/Compress/LZMA/LZMAEncoder.cpp"
+//#  include "CPP/7zip/Compress/LZMA/LZMADecoder.cpp"
-#include "C/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
+#  include "CPP/7zip/Compress/LZMA/LZMAEncoder.cpp"
 #  include "CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
 #else
 #  include "C/Common/Alloc.cpp"
 #  include "C/Common/CRC.cpp"
 //#  include "C/7zip/Common/InBuffer.cpp"
 #  include "C/7zip/Common/OutBuffer.cpp"
 #  include "C/7zip/Common/StreamUtils.cpp"
 #  include "C/7zip/Compress/LZ/LZInWindow.cpp"
 //#  include "C/7zip/Compress/LZ/LZOutWindow.cpp"
 //#  include "C/7zip/Compress/LZMA/LZMADecoder.cpp"
 #  include "C/7zip/Compress/LZMA/LZMAEncoder.cpp"
 #  include "C/7zip/Compress/RangeCoder/RangeCoderBit.cpp"
 #endif
 #undef RC_NORMALIZE
@@ -223,7 +243,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
    PROPVARIANT pr[8];
    pr[0].vt = pr[1].vt = pr[2].vt = pr[3].vt = VT_UI4;
    pr[4].vt = pr[5].vt = pr[6].vt = VT_UI4;
-    pr[7].vt = VT_BSTR;
+    unsigned nprops = 7;
    // setup defaults
    pr[0].uintVal = 2;                  // 0 .. 4
@@ -235,9 +255,11 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
    pr[6].uintVal = 0;
 #ifdef COMPRESS_MF_BT4
    static wchar_t matchfinder[] = L"BT4";
 #endif
    assert(NCompress::NLZMA::FindMatchFinder(matchfinder) >= 0);
-    pr[7].bstrVal = matchfinder;
+    pr[nprops].vt = VT_BSTR;
    pr[nprops].bstrVal = matchfinder;
    nprops++;
 #endif
 #if 1
    pr[0].uintVal = lzma_compress_config_t::pos_bits_t::default_value_c;
    pr[1].uintVal = lzma_compress_config_t::lit_pos_bits_t::default_value_c;
@@ -254,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
@@ -348,7 +370,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
 #  error
 #endif
-    if (enc.SetCoderProperties(propIDs, pr, 8) != S_OK)
+    if (enc.SetCoderProperties(propIDs, pr, nprops) != S_OK)
        goto error;
    if (enc.WriteCoderProperties(&os) != S_OK)
        goto error;
@@ -406,8 +428,13 @@ error:
 #undef _LZMA_OUT_READ
 #undef _LZMA_PROB32
 #undef _LZMA_LOC_OPT
-#include "C/7zip/Compress/LZMA_C/LzmaDecode.h"
+#if (WITH_LZMA >= 0x449)
-#include "C/7zip/Compress/LZMA_C/LzmaDecode.c"
+#  include "C/Compress/Lzma/LzmaDecode.h"
 #  include "C/Compress/Lzma/LzmaDecode.c"
 #else
 #  include "C/7zip/Compress/LZMA_C/LzmaDecode.h"
 #  include "C/7zip/Compress/LZMA_C/LzmaDecode.c"
 #endif
 int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
@@ -483,28 +510,32 @@ error:
 /*************************************************************************
-// test_overlap
+// test_overlap - see <ucl/ucl.h> for semantics
 **************************************************************************/
-int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_lzma_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult )
 {
    assert(M_IS_LZMA(method));
-    // FIXME - implement this
+    MemBuffer b(src_off + src_len);
-    // Note that Packer::verifyOverlappingDecompression() will
+    memcpy(b + src_off, buf + src_off, src_len);
-    // verify the final result in any case.
+    unsigned saved_dst_len = *dst_len;
-    UNUSED(buf);
+    int r = upx_lzma_decompress(b + src_off, src_len, b, dst_len, method, cresult);
-
+    if (r != UPX_E_OK)
-    unsigned overlap_overhead = src_off + src_len - *dst_len;
+        return r;
-    //printf("upx_lzma_test_overlap: %d\n", overlap_overhead);
+    if (*dst_len != saved_dst_len)
-    if ((int)overlap_overhead >= 256)
+        return UPX_E_ERROR;
-        return UPX_E_OK;
+    // NOTE: there is a very tiny possibility that decompression has
-
+    //   succeeded but the data is not restored correctly because of
-    UNUSED(cresult);
+    //   in-place buffer overlapping.
-    return UPX_E_ERROR;
+    if (tbuf != NULL && memcmp(tbuf, b, *dst_len) != 0)
        return UPX_E_ERROR;
    return UPX_E_OK;
 }
@@ -514,9 +545,16 @@ int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
 const char *upx_lzma_version_string(void)
 {
-    // FIXME
+#if (WITH_LZMA + 0 == 0x457)
-//    return NULL;
+    return "4.57";
 #elif (WITH_LZMA + 0 == 0x449)
    return "4.49";
 #elif (WITH_LZMA + 0 == 0x443)
    return "4.43";
 #else
 #  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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -228,12 +228,15 @@ int upx_ucl_decompress     ( const upx_bytep src, unsigned  src_len,
 //
 **************************************************************************/
-int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
+int upx_ucl_test_overlap   ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult )
 {
    int r;
    UNUSED(tbuf); // not needed for UCL
    switch (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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.
   UPX and the UCL library are free software; you can redistribute them
@@ -22,12 +22,13 @@
   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>
 */
 #include "conf.h"
 #include "compress.h"
 #include "mem.h"
 void zlib_compress_config_t::reset()
@@ -188,28 +189,32 @@ done:
 /*************************************************************************
-// test_overlap
+// test_overlap - see <ucl/ucl.h> for semantics
 **************************************************************************/
-int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
+int upx_zlib_test_overlap  ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult )
 {
    assert(method == M_DEFLATE);
-    // FIXME - implement this
+    MemBuffer b(src_off + src_len);
-    // Note that Packer::verifyOverlappingDecompression() will
+    memcpy(b + src_off, buf + src_off, src_len);
-    // verify the final result in any case.
+    unsigned saved_dst_len = *dst_len;
-    UNUSED(buf);
+    int r = upx_zlib_decompress(b + src_off, src_len, b, dst_len, method, cresult);
-
+    if (r != UPX_E_OK)
-    unsigned overlap_overhead = src_off + src_len - *dst_len;
+        return r;
-    //printf("upx_zlib_test_overlap: %d\n", overlap_overhead);
+    if (*dst_len != saved_dst_len)
-    if ((int)overlap_overhead >= 256)
+        return UPX_E_ERROR;
-        return UPX_E_OK;
+    // NOTE: there is a very tiny possibility that decompression has
-
+    //   succeeded but the data is not restored correctly because of
-    UNUSED(cresult);
+    //   in-place buffer overlapping.
-    return UPX_E_ERROR;
+    if (tbuf != NULL && memcmp(tbuf, b, *dst_len) != 0)
        return UPX_E_ERROR;
    return UPX_E_OK;
 }
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -303,8 +303,8 @@
 #undef __attribute_packed
 #if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
-#  if (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386))
+#  if (ACC_ARCH_I386) && (ACC_CC_INTELC && (__INTEL_COMPILER < 800))
-#    define __attribute_packed
+#  elif (0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386))
 #  else
 #    define __attribute_packed      __attribute__((__packed__,__aligned__(1)))
 #  endif
@@ -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
+    noncopyable(const noncopyable &); // undefined
-    nocopy& operator=(const nocopy &); // undefined
+    const noncopyable& operator=(const noncopyable &); // undefined
 };
@@ -448,13 +450,15 @@ private:
 #define UPX_F_LINUX_ELFI_i386   20
 #define UPX_F_WINCE_ARM_PE      21
 #define UPX_F_LINUX_ELF64_AMD   22
-#define UPX_F_LINUX_ELF32_ARMLE 23
+#define UPX_F_LINUX_ELF32_ARMEL 23
 #define UPX_F_BSD_i386          24
 #define UPX_F_BSD_ELF_i386      25
 #define UPX_F_BSD_SH_i386       26
 #define UPX_F_VMLINUX_AMD64     27
-#define UPX_F_VMLINUX_ARM       28
+#define UPX_F_VMLINUX_ARMEL     28
 #define UPX_F_MACH_i386         29
 #define UPX_F_LINUX_ELF32_MIPSEL 30
 #define UPX_F_PLAIN_TEXT        127
@@ -462,7 +466,11 @@ private:
 #define UPX_F_SOLARIS_SPARC     130
 #define UPX_F_MACH_PPC32        131
 #define UPX_F_LINUX_ELFPPC32    132
-#define UPX_F_LINUX_ELF32_ARMBE 133
+#define UPX_F_LINUX_ELF32_ARMEB 133
 #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
@@ -776,8 +784,10 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
                                   upx_bytep dst, unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
-int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
+int upx_test_overlap       ( const upx_bytep buf,
-                                   unsigned  src_len, unsigned* dst_len,
+                             const upx_bytep tbuf,
                                   unsigned  src_off, unsigned src_len,
                                   unsigned* dst_len,
                                   int method,
                             const upx_compress_result_t *cresult );
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -161,6 +161,14 @@ void throwBadLoader()
 }
 void throwOutOfMemoryException(const char *msg)
 {
    if (msg == NULL)
        msg = "out of memory";
    throw OutOfMemoryException(msg);
 }
 void throwIOException(const char *msg, int e)
 {
    throw IOException(msg, e);
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -220,6 +220,7 @@ void throwBadLoader() NORET;
 void throwChecksumError() NORET;
 void throwCompressedDataViolation() NORET;
 void throwInternalError(const char *msg) NORET;
 void throwOutOfMemoryException(const char *msg = NULL) NORET;
 void throwIOException(const char *msg = NULL, int e = 0) NORET;
 void throwEOFException(const char *msg = NULL, int e = 0) NORET;
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -69,7 +69,7 @@ void File::unlink(const char *name)
 **************************************************************************/
 FileBase::FileBase() :
-    _fd(-1), _flags(0), _shflags(0), _mode(0), _name(NULL)
+    _fd(-1), _flags(0), _shflags(0), _mode(0), _name(NULL), _offset(0), _length(0)
 {
    memset(&st,0,sizeof(st));
 }
@@ -88,7 +88,7 @@ FileBase::~FileBase()
 }
-void FileBase::sopen()
+bool FileBase::do_sopen()
 {
    if (_shflags < 0)
        _fd = ::open(_name, _flags, _mode);
@@ -101,9 +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)
        return false;
    if (::fstat(_fd, &st) != 0)
        throwIOException(_name, errno);
    _length = st.st_size;
    return true;
 }
@@ -117,6 +123,8 @@ bool FileBase::close()
    _flags = 0;
    _mode = 0;
    _name = NULL;
    _offset = 0;
    _length = 0;
    return ok;
 }
@@ -164,10 +172,17 @@ void FileBase::seek(off_t off, int whence)
 {
    if (!isOpen())
        throwIOException("bad seek 1");
-    if (whence == SEEK_SET && off < 0)
+    if (whence == SEEK_SET) {
-        throwIOException("bad seek 2");
+        if (off < 0)
-    if (whence == SEEK_END && off > 0)
+            throwIOException("bad seek 2");
-        throwIOException("bad seek 3");
+        off += _offset;
    }
    if (whence == SEEK_END) {
        if (off > 0)
            throwIOException("bad seek 3");
        off += _offset + _length;
        whence = SEEK_SET;
    }
    if (::lseek(_fd,off,whence) < 0)
        throwIOException("seek error",errno);
 }
@@ -180,7 +195,19 @@ off_t FileBase::tell() const
    off_t l = ::lseek(_fd, 0, SEEK_CUR);
    if (l < 0)
        throwIOException("tell error",errno);
-    return l;
+    return l - _offset;
 }
 void FileBase::set_extent(off_t offset, off_t length)
 {
    _offset = offset;
    _length = length;
 }
 off_t FileBase::st_size() const
 {
    return _length;
 }
@@ -205,8 +232,9 @@ void InputFile::sopen(const char *name, int flags, int shflags)
    _flags = flags;
    _shflags = shflags;
    _mode = 0;
-    FileBase::sopen();
+    _offset = 0;
-    if (!isOpen())
+    _length = 0;
    if (!FileBase::do_sopen())
    {
        if (errno == ENOENT)
            throw FileNotFoundException(_name, errno);
@@ -289,8 +317,9 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode)
    _flags = flags;
    _shflags = shflags;
    _mode = mode;
-    FileBase::sopen();
+    _offset = 0;
-    if (!isOpen())
+    _length = 0;
    if (!FileBase::do_sopen())
    {
 #if 0
        // don't throw FileNotFound here -- this is confusing
@@ -316,6 +345,8 @@ bool OutputFile::openStdout(int flags, bool force)
    _flags = flags;
    _shflags = -1;
    _mode = 0;
    _offset = 0;
    _length = 0;
    if (flags && acc_set_binmode(fd, 1) == -1)
        throwIOException(_name, errno);
    _fd = fd;
@@ -329,6 +360,17 @@ void OutputFile::write(const void *buf, int len)
    bytes_written += len;
 }
 off_t OutputFile::st_size() const
 {
    if (opt->to_stdout) {  // might be a pipe ==> .st_size is invalid
        return bytes_written;  // too big if seek()+write() instead of rewrite()
    }
    struct stat my_st;
    if (::fstat(_fd, &my_st) != 0)
        throwIOException(_name, errno);
    return my_st.st_size;
 }
 void OutputFile::write(const MemBuffer *buf, int len)
 {
@@ -343,6 +385,40 @@ void OutputFile::write(const MemBuffer &buf, int len)
    write(&buf, len);
 }
 void OutputFile::rewrite(const void *buf, int len)
 {
    assert(!opt->to_stdout);
    write(buf, len);
    bytes_written -= len;       // restore
 }
 void OutputFile::seek(off_t off, int whence)
 {
    assert(!opt->to_stdout);
    super::seek(off,whence);
 }
 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) {
        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 = l;
    bytes_written = _length;
    return _length;
 }
 void OutputFile::dump(const char *name, const void *buf, int len, int flags)
 {
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -59,9 +59,11 @@ public:
    virtual bool isOpen() const { return _fd >= 0; }
    int getFd() const { return _fd; }
    const char *getName() const { return _name; }
    virtual off_t st_size() const;  // { return _length; }
    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);
@@ -73,6 +75,8 @@ protected:
    int _shflags;
    int _mode;
    const char *_name;
    off_t _offset;
    off_t _length;
 public:
    struct stat st;
 };
@@ -128,21 +132,15 @@ public:
    virtual void write(const void *buf, int len);
    virtual void write(const MemBuffer *buf, int len);
    virtual void write(const MemBuffer &buf, int len);
    virtual void set_extent(off_t offset, off_t length);
    virtual off_t unset_extent();  // returns actual length
    off_t getBytesWritten() const { return bytes_written; }
    virtual off_t st_size() const;  // { return _length; }
    // FIXME - these won't work when using the '--stdout' option
-    virtual void seek(off_t off, int whence)
+    virtual void seek(off_t off, int whence);
-    {
+    virtual void rewrite(const void *buf, int len);
        assert(!opt->to_stdout);
        super::seek(off,whence);
    }
    virtual void rewrite(const void *buf, int len)
    {
        assert(!opt->to_stdout);
        write(buf, len);
        bytes_written -= len;       // restore
    }
    // util
    static void dump(const char *name, const void *buf, int len, int flags=-1);
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-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
   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-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
   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.
+    // FIXME: We must fit into 8 MiB because we steal one bit.
-    // find a 16MB large empty address space
+    // 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-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
   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
-   Copyright (C) 2004-2007 John F. Reiser
+   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 0
+#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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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"),
@@ -97,14 +97,14 @@ struct PackerNames
        const char* fname;
        const char* sname;
    };
-    Entry names[32];
+    Entry names[64];
    size_t names_count;
    const options_t *o;
    PackerNames() : names_count(0), o(NULL) { }
    void add(const Packer *p)
    {
        p->assertPacker();
-        assert(names_count < 32);
+        assert(names_count < 64);
        names[names_count].fname = p->getFullName(o);
        names[names_count].sname = p->getName();
        names_count++;
@@ -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);
+                pos = 2 + fl;
-            } else if (pos + 1 + strlen(fn) > 80) {
+            } 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;
            }
        }
    }
@@ -205,8 +206,8 @@ void show_help(int verbose)
        con_fprintf(f,"\nCompression tuning options:\n");
        fg = con_fg(f,fg);
        con_fprintf(f,
-                    "  --brute             try all available compression methods & filters\n"
+                    "  --brute             try all available compression methods & filters [slow]\n"
-                    "  --ultra-brute       try even more compression variants\n"
+                    "  --ultra-brute       try even more compression variants [very slow]\n"
                    "\n");
        fg = con_fg(f,FG_YELLOW);
        con_fprintf(f,"Backup options:\n");
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(fp, "Copyright (C) 1996-2007 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 1996-2008 Laszlo Molnar\n");
-    fprintf(fp, "Copyright (C) 2000-2007 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2000-2008 John F. Reiser\n");
-    fprintf(fp, "Copyright (C) 2002-2007 Jens Medoch\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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -159,7 +159,9 @@ void ElfLinker::init(const void *pdata_v, int plen)
        input = new upx_byte[inputlen + 1];
        unsigned new_len = u_len;
        int r = upx_decompress(pdata, c_len, input, &new_len, method, NULL);
-        if (r != 0 || new_len != u_len)
+        if (r == UPX_E_OUT_OF_MEMORY)
            throwOutOfMemoryException();
        if (r != UPX_E_OK || new_len != u_len)
            throwBadLoader();
    }
    else
@@ -228,15 +230,21 @@ void ElfLinker::preprocessSymbols(char *start, char *end)
        assert(nextl != NULL);
        if (sscanf(start, "%x g *ABS* %x %1023s",
-                        &value, &offset, symbol) == 3)
+                   &value, &offset, symbol) == 3)
        {
            char *s = strstr(start, symbol);
            s[strlen(symbol)] = 0;
            addSymbol(s, "*ABS*", value);
            assert(offset == 0);
        }
 #if 0
        else if (sscanf(start, "%x%*8c %1023s %*x %1023s",
-                   &offset, section, symbol) == 3)
+#else
        // 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)
        {
            char *s = strstr(start, symbol);
            s[strlen(symbol)] = 0;
@@ -439,6 +447,23 @@ int ElfLinker::addLoader(const char *sname)
    return outputlen;
 }
 void ElfLinker::addLoader(const char *s, va_list ap)
 {
    while (s != NULL)
    {
        addLoader(s);
        s = va_arg(ap, const char *);
    }
 }
 void __acc_cdecl_va ElfLinker::addLoaderVA(const char *s, ...)
 {
    va_list ap;
    va_start(ap, s);
    addLoader(s, ap);
    va_end(ap);
 }
 int ElfLinker::getSection(const char *sname, int *slen) const
 {
    const Section *section = findSection(sname);
@@ -585,6 +610,7 @@ void ElfLinker::relocate1(const Relocation *rel, upx_byte *,
 /*************************************************************************
 // ElfLinker arch subclasses
 // FIXME: add more displacment overflow checks
 // FIXME: add support for our special "ignore_reloc_overflow" section
 **************************************************************************/
 #if 0 // FIXME
@@ -740,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)
 {
@@ -778,6 +835,12 @@ void ElfLinkerPpc32::relocate1(const Relocation *rel, upx_byte *location,
        return super::relocate1(rel, location, value, type);
    type += 6;
    if (strcmp(type, "ADDR32") == 0)
    {
        set_be32(location, get_be32(location) + value);
        return;
    }
    if (strncmp(type, "REL", 3) == 0)
    {
        value -= rel->section->offset + rel->offset;
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <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;
@@ -83,6 +83,12 @@ public:
    virtual void init(const void *pdata, int plen);
    //virtual void setLoaderAlignOffset(int phase);
    virtual int addLoader(const char *sname);
    void addLoader(const char *s, va_list ap);
 #if 1 && (ACC_CC_GNUC >= 0x040100)
    void __acc_cdecl_va addLoaderVA(const char *s, ...) __attribute__((__sentinel__));
 #else
    void __acc_cdecl_va addLoaderVA(const char *s, ...);
 #endif
    virtual Section *addSection(const char *sname, const void *sdata, int slen, unsigned p2align);
    virtual int getSection(const char *sname, int *slen=NULL) const;
    virtual int getSectionSize(const char *sname) const;
@@ -101,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;
@@ -119,7 +133,7 @@ struct ElfLinker::Section : private nocopy
 };
-struct ElfLinker::Symbol : private nocopy
+struct ElfLinker::Symbol : private noncopyable
 {
    char *name;
    Section *section;
@@ -130,7 +144,7 @@ struct ElfLinker::Symbol : private nocopy
 };
-struct ElfLinker::Relocation : private nocopy
+struct ElfLinker::Relocation : private noncopyable
 {
    const Section *section;
    unsigned offset;
@@ -189,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -56,6 +56,9 @@ void options_t::reset()
    o->backup = -1;
    o->overlay = -1;
    o->preserve_mode = true;
    o->preserve_ownership = true;
    o->preserve_timestamp = true;
    o->console = CON_FILE;
 #if defined(__DJGPP__)
@@ -553,23 +556,28 @@ static int do_option(int optc, const char *arg)
    // method
    case 702:
        opt->method_nrv2b_seen = true;
        if (!set_method(M_NRV2B_LE32, -1))
            e_method(M_NRV2B_LE32, opt->level);
        break;
    case 704:
        opt->method_nrv2d_seen = true;
        if (!set_method(M_NRV2D_LE32, -1))
            e_method(M_NRV2D_LE32, opt->level);
        break;
    case 705:
        opt->method_nrv2e_seen = true;
        if (!set_method(M_NRV2E_LE32, -1))
            e_method(M_NRV2E_LE32, opt->level);
        break;
    case 721:
        opt->method_lzma_seen = true;
        opt->all_methods_use_lzma = true;
        if (!set_method(M_LZMA, -1))
            e_method(M_LZMA, opt->level);
        break;
    case 722:
        opt->method_lzma_seen = false;
        opt->all_methods_use_lzma = false;
        if (M_IS_LZMA(opt->method))
            opt->method = -1;
@@ -625,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;
@@ -641,6 +660,15 @@ static int do_option(int optc, const char *arg)
    case 519:
        opt->no_env = true;
        break;
    case 526:
        opt->preserve_mode = false;
        break;
    case 527:
        opt->preserve_ownership = false;
        break;
    case 528:
        opt->preserve_timestamp = false;
        break;
    // compression settings
    case 520:                               // --small
        if (opt->small < 0)
@@ -853,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':
@@ -895,7 +923,10 @@ static const struct mfx_option longopts[] =
    {"force-compress",      0, 0, 'f'},     //   and compression of suspicious files
    {"info",                0, 0, 'i'},     // info mode
    {"no-env",           0x10, 0, 519},     // no environment var
    {"no-mode",          0x10, 0, 526},     // do not preserve mode (permissions)
    {"no-owner",         0x10, 0, 527},     // do not preserve ownership
    {"no-progress",         0, 0, 516},     // no progress bar
    {"no-time",          0x10, 0, 528},     // do not preserve timestamp
    {"output",           0x21, 0, 'o'},
    {"quiet",               0, 0, 'q'},     // quiet mode
    {"silent",              0, 0, 'q'},     // quiet mode
@@ -1014,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 }
 };
@@ -1086,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -192,11 +192,7 @@ void MemBuffer::alloc(unsigned size)
    assert((int)total > 0);
    unsigned char *p = (unsigned char *) malloc(total);
    if (!p)
-    {
+        throwOutOfMemoryException();
        //throw bad_alloc();
        throw OutOfMemoryException("out of memory");
        //exit(1);
    }
    b_size = size;
    if (use_mcheck)
    {
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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     20070112L
+#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
@@ -1302,7 +1310,7 @@ extern "C" {
 #elif !defined(ACC_ABI_BIG_ENDIAN) && !defined(ACC_ABI_LITTLE_ENDIAN)
 #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
 #  define ACC_ABI_BIG_ENDIAN        1
-#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
+#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
 #  define ACC_ABI_LITTLE_ENDIAN     1
 #elif (ACC_ARCH_M68K || ACC_ARCH_S390)
 #  define ACC_ABI_BIG_ENDIAN        1
@@ -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))
+#if 0
-#  pragma warn(push)
+ACCLIB_PUBLIC_NOINLINE(int, acc_syscall_clock_gettime) (int c)
-#  pragma warn(disable:2007)
+{
 }
 #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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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,8 +45,17 @@ 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;
    bool method_nrv2b_seen;
    bool method_nrv2d_seen;
    bool method_nrv2e_seen;
    int level;              // compression level 1..10
    int filter;             // preferred filter from Packer::getFilters()
    bool ultra_brute;
@@ -65,6 +74,9 @@ struct options_t {
    bool no_env;
    bool no_progress;
    const char *output_name;
    bool preserve_mode;
    bool preserve_ownership;
    bool preserve_timestamp;
    int small;
    int verbose;
    bool to_stdout;
@@ -122,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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,6 +507,10 @@ void PackArmPe::buildLoader(const Filter *ft)
 void PackArmPe::pack(OutputFile *fo)
 {
    // FIXME: we need to think about better support for --exact
    if (opt->exact)
        throwCantPackExact();
    const unsigned objs = ih.objects;
    isection = new pe_section_t[objs];
    fi->seek(pe_offset+sizeof(ih),SEEK_SET);
@@ -542,10 +546,12 @@ void PackArmPe::pack(OutputFile *fo)
    else if (opt->win32_pe.strip_relocs < 0)
        opt->win32_pe.strip_relocs = (ih.imagebase >= 0x10000);
    if (opt->win32_pe.strip_relocs)
    {
        if (ih.imagebase < 0x10000)
            throwCantPack("--strip-relocs is not allowed when imagebase < 0x10000");
        else
            ih.flags |= RELOCS_STRIPPED;
    }
    if (memcmp(isection[0].name,"UPX",3) == 0)
        throwAlreadyPackedByUPX();
@@ -632,7 +638,7 @@ void PackArmPe::pack(OutputFile *fo)
    //OutputFile::dump("x1", ibuf, usize);
-    // some checks for broken linkers - disable filter if neccessary
+    // some checks for broken linkers - disable filter if necessary
    bool allow_filter = true;
    if (ih.codebase == ih.database
        || ih.codebase + ih.codesize > ih.imagesize
@@ -708,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()
@@ -882,6 +888,8 @@ void PackArmPe::pack(OutputFile *fo)
    oh.codesize = osection[1].vsize;
    oh.codebase = osection[1].vaddr;
    oh.headersize = osection[1].rawdataptr;
    if (rvamin < osection[0].rawdataptr)
        throwCantPack("object alignment too small");
    if (opt->win32_pe.strip_relocs && !isdll)
        oh.flags |= RELOCS_STRIPPED;
@@ -890,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -42,7 +42,8 @@ public:
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_COM; }
    virtual const char *getName() const { return "dos/com"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.com" : "i286-dos16.com"; }
    virtual const char *getFullName(const options_t *) const { return "i086-dos16.com"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() 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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -76,10 +76,11 @@ const int *PackDjgpp2::getFilters() const
 unsigned PackDjgpp2::findOverlapOverhead(const upx_bytep buf,
                                         const upx_bytep tbuf,
                                         unsigned range,
                                         unsigned upper_limit) const
 {
-    unsigned o = super::findOverlapOverhead(buf, range, upper_limit);
+    unsigned o = super::findOverlapOverhead(buf, tbuf, range, upper_limit);
    o = (o + 0x3ff) &~ 0x1ff;
    return o;
 }
@@ -302,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -43,7 +43,7 @@ public:
    virtual int getVersion() const { return 14; }
    virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
    virtual const char *getName() const { return "djgpp2/coff"; }
-    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.djgpp2.coff"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
@@ -58,6 +58,7 @@ protected:
    virtual int readFileHeader();
    virtual unsigned findOverlapOverhead(const upx_bytep buf,
                                         const upx_bytep tbuf,
                                         unsigned range = 0,
                                         unsigned upper_limit = ~0u) const;
    virtual void buildLoader(const Filter *ft);
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -284,11 +284,11 @@ struct ElfClass_32
 {
    typedef TP BeLePolicy;
-    // integral types
+    // integral types (target endianness)
-    typedef typename TP::U16 U16;
+    typedef typename TP::U16 TE16;
-    typedef typename TP::U32 U32;
+    typedef typename TP::U32 TE32;
-    typedef typename TP::U64 U64;
+    typedef typename TP::U64 TE64;
-    typedef N_Elf::ElfITypes<U16, U32, U32, U32, U32> ElfITypes;
+    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
+    // integral types (target endianness)
-    typedef typename TP::U16 U16;
+    typedef typename TP::U16 TE16;
-    typedef typename TP::U32 U32;
+    typedef typename TP::U32 TE32;
-    typedef typename TP::U64 U64;
+    typedef typename TP::U64 TE64;
-    typedef N_Elf::ElfITypes<U16, U32, U64, U64, U64> ElfITypes;
+    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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.
   UPX and the UCL library are free software; you can redistribute them
@@ -21,15 +21,15 @@
   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
 /*************************************************************************
 // Use the preprocessor to work around
 //   - that the types embedding these enums have to be PODs, and
-//     deriving from an empty base class (which is the ususal C++ way
+//     deriving from an empty base class (which is the usual C++ way
 //     of "importing" enums) does not yield a POD any more
 //   - that older compilers do not correctly perform EBCO
 **************************************************************************/
@@ -68,10 +68,13 @@
    };
    enum { // e_machine
        EM_386    = 3,
        EM_MIPS   = 8,
        EM_MIPS_RS3_LE =  10,   /* MIPS R3000 little-endian */
        EM_PPC    = 20,
        EM_PPC64  = 21,
        EM_ARM    = 40,
        EM_X86_64 = 62
    };
    enum { // e_version
        EV_CURRENT = 1
@@ -138,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -53,24 +53,19 @@ PackExe::PackExe(InputFile *f) :
    bele = &N_BELE_RTP::le_policy;
    COMPILE_TIME_ASSERT(sizeof(exe_header_t) == 32);
    ih_exesize = ih_imagesize = ih_overlay = 0;
    stack_for_lzma = 0;
    use_clear_dirty_stack = false;
    // disable lzma for "--brute" unless explicitly given "--lzma"
    if (opt->all_methods_use_lzma && !opt->method_lzma_seen)
        opt->all_methods_use_lzma = false;
 }
 const int *PackExe::getCompressionMethods(int method, int level) const
 {
    static const int m_all[]   = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, M_END };
    static const int m_nrv2b[] = { M_NRV2B_8, M_END };
    static const int m_nrv2d[] = { M_NRV2D_8, M_END };
    static const int m_nrv2e[] = { M_NRV2E_8, M_END };
    if (method == M_ALL)    return m_all;
    if (M_IS_NRV2B(method)) return m_nrv2b;
    if (M_IS_NRV2D(method)) return m_nrv2d;
    if (M_IS_NRV2E(method)) return m_nrv2e;
    bool small = ih_imagesize <= 256*1024;
-    if (level == 1 || small)
+    return Packer::getDefaultCompressionMethods_8(method, level, small);
        return m_nrv2b;
    return m_nrv2e;
 }
@@ -85,7 +80,7 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
 #define oh  (*eh)
    // fill new exe header
    int flag = 0;
-    if (!opt->dos_exe.no_reloc)
+    if (!opt->dos_exe.no_reloc && !M_IS_LZMA(ph.method))
        flag |= USEJUMP;
    if (ih.relocs == 0)
        flag |= NORELOC;
@@ -94,7 +89,16 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
    oh.ident = 'M' + 'Z' * 256;
    oh.headsize16 = 2;
-    oh.sp = ih.sp > 0x200 ? (unsigned) ih.sp : 0x200;
+    unsigned minsp = 0x200;
    if (M_IS_LZMA(ph.method))
        minsp = stack_for_lzma;
    minsp = ALIGN_UP(minsp, 16u);
    assert(minsp < 0xff00);
    if (oh.sp > minsp)
        minsp = oh.sp;
    if (minsp < 0xff00 - 2)
        minsp = ALIGN_UP(minsp, 2u);
    oh.sp = minsp;
    unsigned destpara = (ph.u_len + ph.overlap_overhead - ph.c_len + 31) / 16;
    oh.ss = ph.c_len/16 + destpara;
@@ -106,27 +110,118 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
    if (oh.ss != ih.ss)
        flag |= SS;
-    if (oh.sp != ih.sp)
+    if (oh.sp != ih.sp || M_IS_LZMA(ph.method))
        flag |= SP;
    return flag;
 #undef oh
 }
 void PackExe::addLoaderEpilogue(int flag)
 {
    addLoader("EXEMAIN5", NULL);
    if (relocsize)
        addLoader(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? "EXENOADJ" : "EXEADJUS",
                  "EXERELO1",
                  has_9a ? "EXEREL9A" : "",
                  "EXERELO2",
                  ih_exesize > 0xFE00 ? "EXEREBIG" : "",
                  "EXERELO3",
                  NULL
                 );
    addLoader("EXEMAIN8",
              device_driver ? "DEVICEEND" : "",
              (flag & SS) ? "EXESTACK" : "",
              (flag & SP) ? "EXESTASP" : "",
              (flag & USEJUMP) ? "EXEJUMPF" : "",
              NULL
             );
    if (!(flag & USEJUMP))
        addLoader(ih.cs ? "EXERCSPO" : "",
                  "EXERETIP",
                  NULL
                 );
    linker->defineSymbol("original_cs", ih.cs);
    linker->defineSymbol("original_ip", ih.ip);
    linker->defineSymbol("original_sp", ih.sp);
    linker->defineSymbol("original_ss", ih.ss);
    linker->defineSymbol("reloc_size",
                         (ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff)
                          >= relocsize ? 0 : MAXRELOCS) - relocsize);
 }
 void PackExe::buildLoader(const Filter *)
 {
-    struct exe_header_t tmp_oh;
+    // get flag
-    int flag = fillExeHeader(&tmp_oh);
+    exe_header_t dummy_oh;
    int flag = fillExeHeader(&dummy_oh);
    // prepare loader
    initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
-    if (device_driver)
+
-        addLoader("DEVICEENTRY", NULL);
+    if (M_IS_LZMA(ph.method))
    {
        addLoader("LZMA_DEC00",
                  opt->small ? "LZMA_DEC10" : "LZMA_DEC20",
                  "LZMA_DEC30",
                  use_clear_dirty_stack ? "LZMA_DEC31" : "",
                  "LZMA_DEC32",
                  ph.u_len > 0xffff ? "LZMA_DEC33" : "",
                  NULL
                 );
        addLoaderEpilogue(flag);
        defineDecompressorSymbols();
        const unsigned lsize0 = getLoaderSize();
        // Lzma decompression code starts at ss:0x10, and its size is
        // lsize bytes. It also needs getDecompressorWrkmemSize() bytes
        // during uncompression. It also uses some stack, so 0x100
        // more bytes are allocated
        stack_for_lzma = 0x10 + lsize0 + getDecompressorWrkmemSize() + 0x100;
        stack_for_lzma = ALIGN_UP(stack_for_lzma, 16u);
        unsigned clear_dirty_stack_low = 0x10 + lsize0;
        clear_dirty_stack_low = ALIGN_UP(clear_dirty_stack_low, 2u);
        if (use_clear_dirty_stack)
            linker->defineSymbol("clear_dirty_stack_low", clear_dirty_stack_low);
        relocateLoader();
        const unsigned lsize = getLoaderSize();
        assert(lsize0 == lsize);
        MemBuffer loader(lsize);
        memcpy(loader, getLoader(), lsize);
        MemBuffer compressed_lzma;
        compressed_lzma.allocForCompression(lsize);
        unsigned c_len_lzma = MemBuffer::getSizeForCompression(lsize);
        int r = upx_compress(loader, lsize, compressed_lzma, &c_len_lzma,
                             NULL, M_NRV2B_LE16, 9, NULL, NULL);
        assert(r == UPX_E_OK); assert(c_len_lzma < lsize);
        info("lzma+relocator code compressed: %u -> %u", lsize, c_len_lzma);
        // reinit the loader
        initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
        // prepare loader
        if (device_driver)
            addLoader("DEVICEENTRY,LZMADEVICE,DEVICEENTRY2", NULL);
        linker->addSection("COMPRESSED_LZMA", compressed_lzma, c_len_lzma, 0);
        addLoader("LZMAENTRY,NRV2B160,NRVDDONE,NRVDECO1,NRVGTD00,NRVDECO2",
                  NULL);
    }
    else if (device_driver)
        addLoader("DEVICEENTRY,DEVICEENTRY2", NULL);
    addLoader("EXEENTRY",
-              device_driver ? "DEVICESUB" : "EXESUB",
+              M_IS_LZMA(ph.method) && device_driver ? "LONGSUB" : "SHORTSUB",
              "JNCDOCOPY",
              relocsize ? "EXERELPU" : "",
-              "EXEMAIN4,+G5DXXXX,UPX1HEAD,EXECUTPO",
+              "EXEMAIN4",
              M_IS_LZMA(ph.method) ? "" : "EXEMAIN4B",
              "EXEMAIN4C",
              M_IS_LZMA(ph.method) ? "COMPRESSED_LZMA_START,COMPRESSED_LZMA" : "",
              "+G5DXXXX,UPX1HEAD,EXECUTPO",
              NULL
             );
    if (ph.method == M_NRV2B_8)
@@ -165,30 +260,12 @@ void PackExe::buildLoader(const Filter *)
                  "NRV2EEX9",
                  NULL
                 );
    else if M_IS_LZMA(ph.method)
        return;
    else
        throwInternalError("unknown compression method");
-    addLoader("EXEMAIN5", NULL);
+
-    if (relocsize)
+    addLoaderEpilogue(flag);
        addLoader(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? "EXENOADJ" : "EXEADJUS",
                  "EXERELO1",
                  has_9a ? "EXEREL9A" : "",
                  "EXERELO2",
                  ih_exesize > 0xFE00 ? "EXEREBIG" : "",
                  "EXERELO3",
                  NULL
                 );
    addLoader("EXEMAIN8",
              device_driver ? "DEVICEEND" : "",
              (flag & SS) ? "EXESTACK" : "",
              (flag & SP) ? "EXESTASP" : "",
              (flag & USEJUMP) ? "EXEJUMPF" : "",
              NULL
             );
    if (!(flag & USEJUMP))
        addLoader(ih.cs ? "EXERCSPO" : "",
                  "EXERETIP",
                  NULL
                 );
 }
@@ -324,7 +401,7 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
                break;
            }
            unsigned offs = addr - es*16;
-            if (offs >= 3 && b[es*16 + offs-3] == 0x9a)
+            if (offs >= 3 && b[es*16 + offs-3] == 0x9a && offs > di + 3)
            {
                for (t = di; t < offs-3; t++)
                    if (b[es*16+t] == 0x9a && get_le16(b+es*16+t+3) <= seg_high)
@@ -401,7 +478,7 @@ void PackExe::pack(OutputFile *fo)
        for (ic = 0; ic < ih.relocs; ic++)
        {
            unsigned jc = get_le32(wr+4*ic);
-            set_le32(wr+4*ic, (jc>>16)*16+(jc&0xffff));
+            set_le32(wr+4*ic, ((jc>>16)*16+(jc&0xffff)) & 0xfffff);
        }
        qsort(wr,ih.relocs,4,le32_compare);
        relocsize = optimize_relocs(ibuf, ih_imagesize, wr, ih.relocs, w, &has_9a);
@@ -429,9 +506,12 @@ 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: ~28 KiB stack
    compressWithFilters(&ft, 32, &cconf);
-    if (ph.max_run_found + ph.max_match_found > 0x8000)
+
-        throwCantPack("decompressor limit exceeded, send a bugreport");
+    if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
        if (ph.max_run_found + ph.max_match_found > 0x8000)
            throwCantPack("decompressor limit exceeded, send a bugreport");
 #ifdef TESTING
    if (opt->debug.debug_level)
@@ -497,15 +577,13 @@ void PackExe::pack(OutputFile *fo)
    }
    extra_info[eisize++] = (unsigned char) flag;
-    linker->defineSymbol("original_cs", ih.cs);
+    if (M_IS_NRV2B(ph.method) || M_IS_NRV2D(ph.method) || M_IS_NRV2E(ph.method))
-    linker->defineSymbol("original_ip", ih.ip);
+        linker->defineSymbol("bx_magic", 0x7FFF + 0x10 * ((packedsize & 15) + 1));
-    linker->defineSymbol("original_sp", ih.sp);
+
-    linker->defineSymbol("original_ss", ih.ss);
+    unsigned decompressor_entry = 1 + (packedsize & 15);
-    linker->defineSymbol("reloc_size",
+    if (M_IS_LZMA(ph.method))
-                         (ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff)
+        decompressor_entry = 0x10;
-                          >= relocsize ? 0 : MAXRELOCS) - relocsize);
+    linker->defineSymbol("decompressor_entry", decompressor_entry);
    linker->defineSymbol("bx_magic", 0x7FFF + 0x10 * ((packedsize & 15) + 1));
    linker->defineSymbol("decompressor_entry", (packedsize & 15) + 1);
    // patch loader
    if (flag & USEJUMP)
@@ -541,8 +619,10 @@ void PackExe::pack(OutputFile *fo)
    oh.m512 = outputlen & 511;
    oh.p512 = (outputlen + 511) >> 9;
-    oh.ip = device_driver ? getLoaderSection("EXEENTRY") - 2 : 0;
+    const char *exeentry = M_IS_LZMA(ph.method) ? "LZMAENTRY" : "EXEENTRY";
    oh.ip = device_driver ? getLoaderSection(exeentry) - 2 : 0;
    defineDecompressorSymbols();
    relocateLoader();
    memcpy(loader, getLoader(), lsize);
    patchPackHeader(loader,e_len);
@@ -591,7 +671,7 @@ int PackExe::canUnpack()
        return false;
    const off_t off = ih.headsize16 * 16;
    fi->seek(off, SEEK_SET);
-    bool b = readPackHeader(256);
+    bool b = readPackHeader(4096);
    return b && (off + (off_t) ph.c_len <= file_size);
 }
@@ -726,6 +806,69 @@ Linker* PackExe::newLinker() const
    return new ElfLinkerX86();
 }
 /*
 memory layout at decompression time
 ===================================
 normal exe
 ----------
 a, at load time
 (e - copying code, C - compressed data, d - decompressor+relocator,
 x - not specified, U - uncompressed code+data, R uncompressed relocation)
 eeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdddd
 ^ CS:0                                       ^ SS:0
 b, after copying
 xxxxxxxxxxxxxxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdddd
 ^ES:DI=0       ^ DS:SI=0                     ^ CS=SS, IP in range 0..0xf
 c, after uncompression
 UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUURRdddd
                                           ^ ES:DI
 device driver
 -------------
 the file has 2 entry points, CS:0 in device driver mode, and
 CS:exe_as_device_entry in normal mode. the code in section DEVICEENTRY
 sets up the same environment for section EXEENTRY, as it would see in normal
 execution mode.
 lzma uncompression for normal exes
 ----------------------------------
 (n - nrv2b uncompressor, l - nrv2b compressed lzma + relocator code)
 a, at load time
 nneelllCCCCCCCCCCCCCCCCCCCCCCCCC
 ^ CS:0                                       ^ SS:0
 b, after nrv2b
 nneelllCCCCCCCCCCCCCCCCCCCCCCCCC             dddd
 ^ CS:0                                       ^ SS:0x10
 after this, normal ee code runs
 lzma + device driver
 --------------------
 (D - device driver adapter)
 a, at load time
 DDnneelllCCCCCCCCCCCCCCCCCCCCCCCCC
 */
 /*
 vi:ts=4:et
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -42,7 +42,8 @@ public:
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_EXE; }
    virtual const char *getName() const { return "dos/exe"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.exe" : "i286-dos16.exe"; }
    virtual const char *getFullName(const options_t *) const { return "i086-dos16.exe"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
@@ -71,6 +72,7 @@ protected:
    virtual int fillExeHeader(struct exe_header_t *) const;
    virtual void buildLoader(const Filter *ft);
    virtual Linker* newLinker() const;
    void addLoaderEpilogue(int flag);
    struct exe_header_t
    {
@@ -110,6 +112,9 @@ protected:
        MINMEM = 16,
        MAXMEM = 32
    };
    unsigned stack_for_lzma;    // stack size required for lzma
    bool use_clear_dirty_stack;
 };
@@ -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-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
   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>
@@ -70,6 +70,8 @@ protected:
    unsigned sz_phdrs;  // sizeof Phdr[]
    unsigned sz_elf_hdrs;  // all Elf headers
    unsigned sz_pack2;  // after pack2(), before loader
    unsigned lg2_page;  // log2(PAGE_SIZE)
    unsigned page_size;  // 1u<<lg2_page
    unsigned short e_machine;
    unsigned char ei_class;
@@ -119,17 +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;
@@ -211,6 +225,7 @@ protected:
 protected:
    Elf64_Ehdr  ehdri; // from input file
    Elf64_Phdr *phdri; // for  input file
    acc_uint64l_t page_mask;  // AND clears the offset-within-page
    struct cprElfHdr1 {
        Elf64_Ehdr ehdr;
@@ -250,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
@@ -264,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
@@ -278,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
 **************************************************************************/
@@ -310,6 +305,7 @@ protected:
    virtual void defineSymbols(Filter const *);
 };
 /*************************************************************************
 // linux/elf32ppc
 **************************************************************************/
@@ -330,6 +326,7 @@ protected:
    virtual Linker* newLinker() const;
 };
 /*************************************************************************
 // linux/elf386
 **************************************************************************/
@@ -406,6 +403,7 @@ protected:
    );
 };
 /*************************************************************************
 // linux/elfarm
 **************************************************************************/
@@ -416,8 +414,8 @@ class PackLinuxElf32armLe : public PackLinuxElf32Le
 public:
    PackLinuxElf32armLe(InputFile *f);
    virtual ~PackLinuxElf32armLe();
-    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMLE; }
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEL; }
-    virtual const char *getName() const { return "linux/armLE"; }
+    virtual const char *getName() const { return "linux/armel"; }
    virtual const char *getFullName(const options_t *) const { return "arm-linux.elf"; }
    virtual const int *getFilters() const;
@@ -436,8 +434,8 @@ class PackLinuxElf32armBe : public PackLinuxElf32Be
 public:
    PackLinuxElf32armBe(InputFile *f);
    virtual ~PackLinuxElf32armBe();
-    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMBE; }
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEB; }
-    virtual const char *getName() const { return "linux/armBE"; }
+    virtual const char *getName() const { return "linux/armeb"; }
    virtual const char *getFullName(const options_t *) const { return "armeb-linux.elf"; }
    virtual const int *getFilters() const;
@@ -450,6 +448,45 @@ 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;
 public:
    PackLinuxElf32mipsel(InputFile *f);
    virtual ~PackLinuxElf32mipsel();
    virtual int getFormat() const { return UPX_F_LINUX_ELF32_MIPSEL; }
    virtual const char *getName() const { return "linux/mipsel"; }
    virtual const char *getFullName(const options_t *) const { return "mipsel-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 *);
 };
 #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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
-   Copyright (C) 2001-2007 John F. Reiser
+   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)) {
+                    if (phdr->PT_NOTE == get_te32(&phdr->p_type)) {
-                        unsigned const offset = get_native32(&phdr->p_offset);
+                        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)
+                        if (4==get_te32(&note.descsz)
-                        &&  1==get_native32(&note.type)
+                        &&  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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
@@ -138,7 +138,7 @@ class PackBSDI386 : public PackLinuxI386
 public:
    PackBSDI386(InputFile *f);
    virtual int getFormat() const { return UPX_F_BSD_i386; }
-    virtual const char *getName() const { return "*BSD/386"; }
+    virtual const char *getName() const { return "BSD/386"; }
    virtual const char *getFullName(const options_t *) const { return "i386-bsd.elf.execve"; }
 protected:
@@ -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-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
   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);
+    unsigned orig_file_size = get_te32(&hbuf.p_filesize);
-    blocksize = get_native32(&hbuf.p_blocksize);
+    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.u_len = get_te32(&bhdr.sz_unc);
-    ph.c_len = get_native32(&bhdr.sz_cpr);
+    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-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
   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-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
   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-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
   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>
 */
@@ -39,22 +39,34 @@ static const
 static const
 #include "stub/powerpc-darwin.macho-fold.h"
-PackMachPPC32::PackMachPPC32(InputFile *f) :
+static const
-    super(f), n_segment(0), rawmseg(0), msegcmd(0)
+#include "stub/i386-darwin.macho-entry.h"
 static const
 #include "stub/i386-darwin.macho-fold.h"
 template <class T>
 PackMachBase<T>::PackMachBase(InputFile *f, unsigned cputype, unsigned flavor,
        unsigned count, unsigned size) :
    super(f), my_cputype(cputype), my_thread_flavor(flavor),
    my_thread_state_word_count(count), my_thread_command_size(size),
    n_segment(0), rawmseg(NULL), msegcmd(NULL)
 {
    MachClass::compileTimeAssertions();
    bele = N_BELE_CTP::getRTP<BeLePolicy>();
 }
-PackMachPPC32::~PackMachPPC32()
+template <class T>
 PackMachBase<T>::~PackMachBase()
 {
    delete [] msegcmd;
    delete [] rawmseg;
    delete [] msegcmd;
 }
-const int *PackMachPPC32::getCompressionMethods(int /*method*/, int /*level*/) const
+template <class T>
 const int *PackMachBase<T>::getCompressionMethods(int method, int level) const
 {
-    // There really is no LE bias in M_NRV2E_LE32.
+    // There really is no LE bias.
-    static const int m_nrv2e[] = { M_NRV2E_LE32, M_END };
+    return Packer::getDefaultCompressionMethods_le32(method, level);
    return m_nrv2e;
 }
@@ -64,13 +76,25 @@ const int *PackMachPPC32::getFilters() const
    return filters;
 }
 int const *PackMachI386::getFilters() const
 {
    static const int filters[] = { 0x49, FT_END };
    return filters;
 }
 Linker *PackMachPPC32::newLinker() const
 {
    return new ElfLinkerPpc32;
 }
 Linker *PackMachI386::newLinker() const
 {
    return new ElfLinkerX86;
 }
 template <class T>
 void
-PackMachPPC32::addStubEntrySections(Filter const *)
+PackMachBase<T>::addStubEntrySections(Filter const *)
 {
    addLoader("MACOS000", NULL);
   //addLoader(getDecompressorSections(), NULL);
@@ -80,18 +104,84 @@ PackMachPPC32::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);
 }
 void PackMachI386::addStubEntrySections(Filter const *ft)
 {
    int const n_mru = ft->n_mru;  // FIXME: belongs to filter? packerf?
-void PackMachPPC32::defineSymbols(Filter const *)
+            // entry to stub
    addLoader("LEXEC000", NULL);
    if (ft->id) {
        { // decompr, unfilter are separate
            addLoader("LXUNF000", NULL);
            addLoader("LXUNF002", NULL);
                if (0x80==(ft->id & 0xF0)) {
                    if (256==n_mru) {
                        addLoader("MRUBYTE0", NULL);
                    }
                    else if (n_mru) {
                        addLoader("LXMRU005", NULL);
                    }
                    if (n_mru) {
                        addLoader("LXMRU006", NULL);
                    }
                    else {
                        addLoader("LXMRU007", NULL);
                    }
            }
            else if (0x40==(ft->id & 0xF0)) {
                addLoader("LXUNF008", NULL);
            }
            addLoader("LXUNF010", NULL);
        }
        if (n_mru) {
            addLoader("LEXEC009", NULL);
        }
    }
    addLoader("LEXEC010", NULL);
    addLoader(getDecompressorSections(), NULL);
    addLoader("LEXEC015", NULL);
    if (ft->id) {
        {  // decompr, unfilter are separate
            if (0x80!=(ft->id & 0xF0)) {
                addLoader("LXUNF042", NULL);
            }
        }
        addFilter32(ft->id);
        { // decompr, unfilter are separate
            if (0x80==(ft->id & 0xF0)) {
                if (0==n_mru) {
                    addLoader("LXMRU058", NULL);
                }
            }
            addLoader("LXUNF035", NULL);
        }
    }
    else {
        addLoader("LEXEC017", NULL);
    }
    addLoader("IDENTSTR", NULL);
    addLoader("LEXEC020", NULL);
    addLoader("FOLDEXEC", NULL);
 }
 template <class T>
 void PackMachBase<T>::defineSymbols(Filter const *)
 {
    // empty
 }
 template <class T>
 void
-PackMachPPC32::buildMachLoader(
+PackMachBase<T>::buildMachLoader(
    upx_byte const *const proto,
    unsigned        const szproto,
    upx_byte const *const fold,
@@ -142,11 +232,23 @@ PackMachPPC32::buildLoader(const Filter *ft)
        stub_powerpc_darwin_macho_entry, sizeof(stub_powerpc_darwin_macho_entry),
        stub_powerpc_darwin_macho_fold,  sizeof(stub_powerpc_darwin_macho_fold),  ft );
 }
 void PackMachPPC32::patchLoader() { }
 void PackMachPPC32::updateLoader(OutputFile *) {}
 void
-PackMachPPC32::patchLoaderChecksum()
+PackMachI386::buildLoader(const Filter *ft)
 {
    buildMachLoader(
        stub_i386_darwin_macho_entry, sizeof(stub_i386_darwin_macho_entry),
        stub_i386_darwin_macho_fold,  sizeof(stub_i386_darwin_macho_fold),  ft );
 }
 template <class T>
 void PackMachBase<T>::patchLoader() { }
 template <class T>
 void PackMachBase<T>::updateLoader(OutputFile *) {}
 template <class T>
 void PackMachBase<T>::patchLoaderChecksum()
 {
    unsigned char *const ptr = getLoader();
    l_info *const lp = &linfo;
@@ -160,8 +262,9 @@ PackMachPPC32::patchLoaderChecksum()
    lp->l_checksum = upx_adler32(ptr, lsize);
 }
-static int __acc_cdecl_qsort
+template <class T>
-compare_segment_command(void const *const aa, void const *const bb)
+int __acc_cdecl_qsort
 PackMachBase<T>::compare_segment_command(void const *const aa, void const *const bb)
 {
    Mach_segment_command const *const a = (Mach_segment_command const *)aa;
    Mach_segment_command const *const b = (Mach_segment_command const *)bb;
@@ -174,8 +277,7 @@ compare_segment_command(void const *const aa, void const *const bb)
                               return  0;
 }
-void
+void PackMachPPC32::pack4(OutputFile *fo, Filter &ft)  // append PackHeader
 PackMachPPC32::pack4(OutputFile *fo, Filter &ft)  // append PackHeader
 {
    // offset of p_info in compressed file
    overlay_offset = sizeof(mhdro) + sizeof(segcmdo) + sizeof(threado) + sizeof(linfo);
@@ -184,31 +286,59 @@ PackMachPPC32::pack4(OutputFile *fo, Filter &ft)  // append PackHeader
    segcmdo.filesize = fo->getBytesWritten();
    segcmdo.vmsize += segcmdo.filesize;
    fo->seek(sizeof(mhdro), SEEK_SET);
-    fo->write(&segcmdo, sizeof(segcmdo));
+    fo->rewrite(&segcmdo, sizeof(segcmdo));
-    fo->write(&threado, sizeof(threado));
+    fo->rewrite(&threado, sizeof(threado));
-    fo->write(&linfo, sizeof(linfo));
+    fo->rewrite(&linfo, sizeof(linfo));
 }
-void
+void PackMachI386::pack4(OutputFile *fo, Filter &ft)  // append PackHeader
-PackMachPPC32::pack3(OutputFile *fo, Filter &ft)  // append loader
+{
    // offset of p_info in compressed file
    overlay_offset = sizeof(mhdro) + sizeof(segcmdo) + sizeof(threado) + sizeof(linfo);
    super::pack4(fo, ft);
    segcmdo.filesize = fo->getBytesWritten();
    segcmdo.vmsize += segcmdo.filesize;
    fo->seek(sizeof(mhdro), SEEK_SET);
    fo->rewrite(&segcmdo, sizeof(segcmdo));
    fo->rewrite(&threado, sizeof(threado));
    fo->rewrite(&linfo, sizeof(linfo));
 }
 void PackMachPPC32::pack3(OutputFile *fo, Filter &ft)  // append loader
 {
    BE32 disp;
    unsigned const zero = 0;
    unsigned len = fo->getBytesWritten();
    fo->write(&zero, 3& (0u-len));
    len += (3& (0u-len)) + sizeof(disp);
-    set_be32(&disp, 4+ len - sz_mach_headers);  // 4: sizeof(instruction)
+    disp = 4+ len - sz_mach_headers;  // 4: sizeof(instruction)
    fo->write(&disp, sizeof(disp));
    threado.state.srr0 = len + segcmdo.vmaddr;  /* entry address */
    super::pack3(fo, ft);
 }
 void PackMachI386::pack3(OutputFile *fo, Filter &ft)  // append loader
 {
    LE32 disp;
    unsigned const zero = 0;
    unsigned len = fo->getBytesWritten();
    fo->write(&zero, 3& (0u-len));
    len += (3& (0u-len));
    disp = len - sz_mach_headers;
    fo->write(&disp, sizeof(disp));
    threado.state.eip = len + sizeof(disp) + segcmdo.vmaddr;  /* entry address */
    super::pack3(fo, ft);
 }
 // Determine length of gap between PT_LOAD phdri[k] and closest PT_LOAD
 // which follows in the file (or end-of-file).  Optimize for common case
 // where the PT_LOAD are adjacent ascending by .p_offset.  Assume no overlap.
-unsigned PackMachPPC32::find_SEGMENT_gap(
+template <class T>
 unsigned PackMachBase<T>::find_SEGMENT_gap(
    unsigned const k
 )
 {
@@ -216,8 +346,7 @@ unsigned PackMachPPC32::find_SEGMENT_gap(
    ||  0==msegcmd[k].filesize ) {
        return 0;
    }
-    unsigned const hi = get_native32(&msegcmd[k].fileoff) +
+    unsigned const hi = msegcmd[k].fileoff + msegcmd[k].filesize;
                        get_native32(&msegcmd[k].filesize);
    unsigned lo = ph.u_file_size;
    unsigned j = k;
    for (;;) { // circular search, optimize for adjacent ascending
@@ -230,7 +359,7 @@ unsigned PackMachPPC32::find_SEGMENT_gap(
        }
        if (Mach_segment_command::LC_SEGMENT==msegcmd[j].cmd
        &&  0!=msegcmd[j].filesize ) {
-            unsigned const t = get_native32(&msegcmd[j].fileoff);
+            unsigned const t = msegcmd[j].fileoff;
            if ((t - hi) < (lo - hi)) {
                lo = t;
                if (hi==lo) {
@@ -242,8 +371,20 @@ unsigned PackMachPPC32::find_SEGMENT_gap(
    return lo - hi;
 }
-void
+template <class T>
-PackMachPPC32::pack2(OutputFile *fo, Filter &ft)  // append compressed body
+void PackMachBase<T>::pack4(OutputFile *fo, Filter &ft)
 {
    PackUnix::pack4(fo, ft);  // FIXME  super() does not work?
 }
 template <class T>
 void PackMachBase<T>::pack3(OutputFile *fo, Filter &ft)
 {
    PackUnix::pack3(fo, ft);  // FIXME  super() does not work?
 }
 template <class T>
 void PackMachBase<T>::pack2(OutputFile *fo, Filter &ft)  // append compressed body
 {
    Extent x;
    unsigned k;
@@ -269,6 +410,17 @@ PackMachPPC32::pack2(OutputFile *fo, Filter &ft)  // append compressed body
    uip->ui_pass = 0;
    ft.addvalue = 0;
    // Packer::compressWithFilters chooses a filter for us, and the stubs
    // can handle only one filter, and most filters are for executable
    // instructions.  So filter only the largest executable segment.
    unsigned exe_filesize_max = 0;
    for (k = 0; k < n_segment; ++k)
    if (Mach_segment_command::LC_SEGMENT==msegcmd[k].cmd
    &&  0!=(Mach_segment_command::VM_PROT_EXECUTE & msegcmd[k].initprot)
    &&  exe_filesize_max < msegcmd[k].filesize) {
        exe_filesize_max = msegcmd[k].filesize;
    }
    int nx = 0;
    for (k = 0; k < n_segment; ++k)
    if (Mach_segment_command::LC_SEGMENT==msegcmd[k].cmd
@@ -280,17 +432,20 @@ PackMachPPC32::pack2(OutputFile *fo, Filter &ft)  // append compressed body
            x.offset    += delta;
            x.size      -= delta;
        }
        bool const do_filter = (msegcmd[k].filesize==exe_filesize_max)
            && 0!=(Mach_segment_command::VM_PROT_EXECUTE & msegcmd[k].initprot);
        packExtent(x, total_in, total_out,
-            ((Mach_segment_command::VM_PROT_EXECUTE & msegcmd[k].initprot)
+            (do_filter ? &ft : 0 ), fo, hdr_u_len );
-                ? &ft : 0 ), fo, hdr_u_len );
+        if (do_filter) {
            exe_filesize_max = 0;
        }
        hdr_u_len = 0;
        ++nx;
    }
    for (k = 0; k < n_segment; ++k) {
        x.size = find_SEGMENT_gap(k);
        if (x.size) {
-            x.offset = get_native32(&msegcmd[k].fileoff) +
+            x.offset = msegcmd[k].fileoff +msegcmd[k].filesize;
                       get_native32(&msegcmd[k].filesize);
            packExtent(x, total_in, total_out, 0, fo);
        }
    }
@@ -304,12 +459,33 @@ PackMachPPC32::pack2(OutputFile *fo, Filter &ft)  // append compressed body
 #undef PAGE_SIZE
 #define PAGE_MASK (~0u<<12)
 #define PAGE_SIZE -PAGE_MASK
-void
+
-PackMachPPC32::pack1(OutputFile *fo, Filter &/*ft*/)  // generate executable header
+void PackMachPPC32::pack1_setup_threado(OutputFile *const fo)
 {
    threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
    threado.cmdsize = sizeof(threado);
    threado.flavor = my_thread_flavor;
    threado.count =  my_thread_state_word_count;
    memset(&threado.state, 0, sizeof(threado.state));
    fo->write(&threado, sizeof(threado));
 }
 void PackMachI386::pack1_setup_threado(OutputFile *const fo)
 {
    threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
    threado.cmdsize = sizeof(threado);
    threado.flavor = my_thread_flavor;
    threado.count =  my_thread_state_word_count;
    memset(&threado.state, 0, sizeof(threado.state));
    fo->write(&threado, sizeof(threado));
 }
 template <class T>
 void PackMachBase<T>::pack1(OutputFile *const fo, Filter &/*ft*/)  // generate executable header
 {
    mhdro = mhdri;
    mhdro.ncmds = 2;
-    mhdro.sizeofcmds = sizeof(segcmdo) + sizeof(threado);
+    mhdro.sizeofcmds = sizeof(segcmdo) + my_thread_command_size;
    mhdro.flags = Mach_header::MH_NOUNDEFS;
    fo->write(&mhdro, sizeof(mhdro));
@@ -329,12 +505,7 @@ PackMachPPC32::pack1(OutputFile *fo, Filter &/*ft*/)  // generate executable hea
    segcmdo.flags = 0;
    fo->write(&segcmdo, sizeof(segcmdo));
-    threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+    pack1_setup_threado(fo);
    threado.cmdsize = sizeof(threado);
    threado.flavor = Mach_thread_command::PPC_THREAD_STATE;
    threado.count =  Mach_thread_command::PPC_THREAD_STATE_COUNT;
    memset(&threado.state, 0, sizeof(threado.state));
    fo->write(&threado, sizeof(threado));
    sz_mach_headers = fo->getBytesWritten();
    memset((char *)&linfo, 0, sizeof(linfo));
@@ -343,22 +514,26 @@ PackMachPPC32::pack1(OutputFile *fo, Filter &/*ft*/)  // generate executable hea
    return;
 }
-void
+template <class T>
-PackMachPPC32::unpack(OutputFile *fo)
+void PackMachBase<T>::unpack(OutputFile *fo)
 {
    overlay_offset = sizeof(mhdro) + sizeof(segcmdo) +
        my_thread_command_size + sizeof(linfo);
    fi->seek(overlay_offset, SEEK_SET);
    p_info hbuf;
    fi->readx(&hbuf, sizeof(hbuf));
-    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
+    unsigned orig_file_size = get_te32(&hbuf.p_filesize);
-    blocksize = get_native32(&hbuf.p_blocksize);
+    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.u_len = get_te32(&bhdr.sz_unc);
-    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.c_len = get_te32(&bhdr.sz_cpr);
    ph.method = bhdr.b_method;
    ph.filter = bhdr.b_ftid;
    ph.filter_cto = bhdr.b_cto8;
    // Uncompress Macho headers
@@ -396,15 +571,14 @@ PackMachPPC32::unpack(OutputFile *fo)
    ) {
        if (Mach_segment_command::LC_SEGMENT==sc->cmd
        &&  0!=sc->filesize ) {
-            unsigned filesize = get_be32(&sc->filesize);
+            unsigned filesize = sc->filesize;
            unpackExtent(filesize, fo, total_in, total_out, c_adler, u_adler, false, sizeof(bhdr));
        }
    }
    for (unsigned j = 0; j < ncmds; ++j) {
        unsigned const size = find_SEGMENT_gap(j);
        if (size) {
-            unsigned const where = get_native32(&msegcmd[k].fileoff) +
+            unsigned const where = msegcmd[k].fileoff +msegcmd[k].filesize;
                                   get_native32(&msegcmd[k].filesize);
            if (fo)
                fo->seek(where, SEEK_SET);
            unpackExtent(size, fo, total_in, total_out,
@@ -414,14 +588,14 @@ PackMachPPC32::unpack(OutputFile *fo)
 }
-bool
+template <class T>
-PackMachPPC32::canPack()
+bool PackMachBase<T>::canPack()
 {
    fi->seek(0, SEEK_SET);
    fi->readx(&mhdri, sizeof(mhdri));
    if (Mach_header::MH_MAGIC         !=mhdri.magic
-    ||  Mach_header::CPU_TYPE_POWERPC !=mhdri.cputype
+    ||  my_cputype                    !=mhdri.cputype
    ||  Mach_header::MH_EXECUTE       !=mhdri.filetype
    )
        return false;
@@ -457,11 +631,204 @@ PackMachPPC32::canPack()
            sz_segment = msegcmd[j].filesize + msegcmd[j].fileoff - msegcmd[0].fileoff;
        }
    }
    // info: currently the header is 36 (32+4) bytes before EOF
    unsigned char buf[256];
    fi->seek(-(off_t)sizeof(buf), SEEK_END);
    fi->readx(buf, sizeof(buf));
    checkAlreadyPacked(buf, sizeof(buf));
    // set options
    opt->o_unix.blocksize = file_size;
    return 0 < n_segment;
 }
 template class PackMachBase<MachClass_BE32>;
 template class PackMachBase<MachClass_LE32>;
 PackMachFat::PackMachFat(InputFile *f) : super(f)
 {
    bele = &N_BELE_RTP::le_policy;  // sham
 }
 PackMachFat::~PackMachFat()
 {
 }
 const int *PackMachFat::getCompressionMethods(int /*method*/, int /*level*/) const
 {
    static const int m_nrv2e[] = { M_NRV2E_LE32, M_END };
    return m_nrv2e;  // sham
 }
 const int *PackMachFat::getFilters() const
 {
    static const int filters[] = { 0x49, FT_END };
    return filters;  // sham
 }
 void PackMachFat::pack(OutputFile *fo)
 {
    unsigned const in_size = this->file_size;
    fo->write(&fat_head, sizeof(fat_head.fat) +
        fat_head.fat.nfat_arch * sizeof(fat_head.arch[0]));
    unsigned length = 0;
    for (unsigned j=0; j < fat_head.fat.nfat_arch; ++j) {
        unsigned base = fo->unset_extent();  // actual length
        base += ~(~0u<<fat_head.arch[j].align) & (0-base);  // align up
        fo->seek(base, SEEK_SET);
        fo->set_extent(base, ~0u);
        ph.u_file_size = fat_head.arch[j].size;
        fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size);
        switch (fat_head.arch[j].cputype) {
        case PackMachFat::CPU_TYPE_I386: {
            PackMachI386 packer(fi);
            packer.initPackHeader();
            packer.canPack();
            packer.updatePackHeader();
            packer.pack(fo);
        } break;
        case PackMachFat::CPU_TYPE_POWERPC: {
            PackMachPPC32 packer(fi);
            packer.initPackHeader();
            packer.canPack();
            packer.updatePackHeader();
            packer.pack(fo);
        } break;
        }  // switch cputype
        fat_head.arch[j].offset = base;
        length = fo->unset_extent();
        fat_head.arch[j].size = length - base;
    }
    ph.u_file_size = in_size;
    fi->set_extent(0, in_size);
    fo->seek(0, SEEK_SET);
    fo->rewrite(&fat_head, sizeof(fat_head.fat) +
        fat_head.fat.nfat_arch * sizeof(fat_head.arch[0]));
    fo->set_extent(0, length);
 }
 void PackMachFat::unpack(OutputFile *fo)
 {
    fo->seek(0, SEEK_SET);
    fo->write(&fat_head, sizeof(fat_head.fat) +
        fat_head.fat.nfat_arch * sizeof(fat_head.arch[0]));
    unsigned length;
    for (unsigned j=0; j < fat_head.fat.nfat_arch; ++j) {
        unsigned base = fo->unset_extent();  // actual length
        base += ~(~0u<<fat_head.arch[j].align) & (0-base);  // align up
        fo->seek(base, SEEK_SET);
        fo->set_extent(base, ~0u);
        ph.u_file_size = fat_head.arch[j].size;
        fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size);
        switch (fat_head.arch[j].cputype) {
        case PackMachFat::CPU_TYPE_I386: {
            PackMachI386 packer(fi);
            packer.initPackHeader();
            packer.canUnpack();
            packer.unpack(fo);
        } break;
        case PackMachFat::CPU_TYPE_POWERPC: {
            PackMachPPC32 packer(fi);
            packer.initPackHeader();
            packer.canUnpack();
            packer.unpack(fo);
        } break;
        }  // switch cputype
        fat_head.arch[j].offset = base;
        length = fo->unset_extent();
        fat_head.arch[j].size = length - base;
    }
    fo->unset_extent();
    fo->seek(0, SEEK_SET);
    fo->rewrite(&fat_head, sizeof(fat_head.fat) +
        fat_head.fat.nfat_arch * sizeof(fat_head.arch[0]));
 }
 bool PackMachFat::canPack()
 {
    struct Mach_fat_arch *arch = &fat_head.arch[0];
    fi->readx(&fat_head, sizeof(fat_head));
    if (Mach_fat_header::FAT_MAGIC!=fat_head.fat.magic
    ||  N_FAT_ARCH < fat_head.fat.nfat_arch) {
        return false;
    }
    for (unsigned j=0; j < fat_head.fat.nfat_arch; ++j) {
        fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size);
        switch (arch[j].cputype) {
        default: return false;
        case PackMachFat::CPU_TYPE_I386: {
            PackMachI386 packer(fi);
            if (!packer.canPack())
                return false;
        } break;
        case PackMachFat::CPU_TYPE_POWERPC: {
            PackMachPPC32 packer(fi);
            if (!packer.canPack())
                return false;
        } break;
        }  // switch cputype
    }
    // info: currently the header is 36 (32+4) bytes before EOF
    unsigned char buf[256];
    fi->seek(-(off_t)sizeof(buf), SEEK_END);
    fi->readx(buf, sizeof(buf));
    checkAlreadyPacked(buf, sizeof(buf));
    return true;
 }
 int PackMachFat::canUnpack()
 {
    struct Mach_fat_arch *arch = &fat_head.arch[0];
    fi->readx(&fat_head, sizeof(fat_head));
    if (Mach_fat_header::FAT_MAGIC!=fat_head.fat.magic
    ||  N_FAT_ARCH < fat_head.fat.nfat_arch) {
        return false;
    }
    for (unsigned j=0; j < fat_head.fat.nfat_arch; ++j) {
        fi->set_extent(fat_head.arch[j].offset, fat_head.arch[j].size);
        switch (arch[j].cputype) {
        default: return false;
        case PackMachFat::CPU_TYPE_I386: {
            PackMachI386 packer(fi);
            if (!packer.canUnpack())
                return 0;
            ph.format = packer.getFormat(); // FIXME: copy entire PackHeader
        } break;
        case PackMachFat::CPU_TYPE_POWERPC: {
            PackMachPPC32 packer(fi);
            if (!packer.canUnpack())
                return 0;
            ph.format = packer.getFormat(); // FIXME: copy entire PackHeader
        } break;
        }  // switch cputype
    }
    return 1;
 }
 void PackMachFat::buildLoader(const Filter */*ft*/)
 {
    assert(false);
 }
 Linker* PackMachFat::newLinker() const
 {
    return new ElfLinkerX86;  // sham
 }
 void PackMachFat::list()
 {
    assert(false);
 }
 /*
 vi:ts=4:et
 */
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
   All Rights Reserved.
   UPX and the UCL library are free software; you can redistribute them
@@ -21,169 +21,336 @@
   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
 #ifndef __UPX_P_MACHO_H
 #define __UPX_P_MACHO_H
 struct Mach_fat_header {
    BE32 magic;
        enum {  // note conflict with java bytecode PackLinuxI386
            FAT_MAGIC      = 0xcafebabe,
            FAT_MAGIC_SWAB = 0xbebafeca
        };
    BE32 nfat_arch;  // Number of Mach_fat_arch which follow.
 }
 __attribute_packed;
 struct Mach_fat_arch {
    BE32 cputype;
    BE32 cpusubtype;
    BE32 offset;
    BE32 size;
    BE32 align;  /* shift count; log base 2 */
 }
 __attribute_packed;
 /*************************************************************************
-// Mach  Mach Object executable
+// Mach  Mach Object executable; all structures are target-endian
 // 'otool' is the Mach analog of 'readelf' (convert executable file to ASCII).
 **************************************************************************/
-struct Mach_header {
+namespace N_Mach {
-    BE32 magic;
+
-        enum {
+// integral types
-            MH_MAGIC = 0xfeedface
+template <class TWord, class TXword, class TAddr, class TOff>
-        };
+struct MachITypes
-    BE32 cputype;
+{
-        enum {
+    typedef TWord   Word;
-            CPU_TYPE_POWERPC = 18
+    typedef TXword  Xword;
-        };
+    typedef TAddr   Addr;
-    BE32 cpysubtype;
+    typedef TOff    Off;
-    BE32 filetype;
+};
-        enum {
+
-            MH_EXECUTE = 2
+template <class TMachITypes>
-        };
+struct Mach_header
-    BE32 ncmds;
+{
-    BE32 sizeofcmds;
+    typedef typename TMachITypes::Word Word;
-    BE32 flags;
+
-        enum {
+    Word magic;
-            MH_NOUNDEFS = 1
+    Word cputype;
-        };
+    Word cpysubtype;
    Word filetype;
    Word ncmds;
    Word sizeofcmds;
    Word flags;
 #define WANT_MACH_HEADER_ENUM 1
 #include "p_mach_enum.h"
 }
 __attribute_packed;
-struct Mach_segment_command {
+template <class TMachITypes>
-    BE32 cmd;
+struct Mach_header64
-        enum {
+{  // only difference is padding to 0 mod 8
-            LC_SEGMENT       = 0x1,
+    typedef typename TMachITypes::Word Word;
-            LC_THREAD        = 0x4,
+
-            LC_UNIXTHREAD    = 0x5,
+    Word magic;
-            LC_LOAD_DYLINKER = 0xe
+    Word cputype;
-        };
+    Word cpysubtype;
-    BE32 cmdsize;
+    Word filetype;
    Word ncmds;
    Word sizeofcmds;
    Word flags;
    Word reserved;  // pad to 0 mod 8
 #define WANT_MACH_HEADER_ENUM 1
 #include "p_mach_enum.h"
 }
 __attribute_packed;
 template <class TMachITypes>
 struct Mach_segment_command
 {
    typedef typename TMachITypes::Word Word;
    typedef typename TMachITypes::Addr Addr;
    typedef typename TMachITypes::Off  Off;
    Word cmd;
    Word cmdsize;
    char segname[16];
-    BE32 vmaddr;
+    Addr vmaddr;
-    BE32 vmsize;
+    Addr vmsize;
-    BE32 fileoff;
+    Off  fileoff;
-    BE32 filesize;
+    Off  filesize;
-    BE32 maxprot;
+    Word maxprot;
-        enum {
+    Word initprot;
-            VM_PROT_READ = 1,
+    Word nsects;
-            VM_PROT_WRITE = 2,
+    Word flags;
-            VM_PROT_EXECUTE = 4
+#define WANT_MACH_SEGMENT_ENUM 1
-        };
+#include "p_mach_enum.h"
    BE32 initprot;
    BE32 nsects;
    BE32 flags;
 }
 __attribute_packed;
-struct Mach_section {
+template <class TMachITypes>
 struct Mach_section_command
 {
    typedef typename TMachITypes::Word Word;
    typedef typename TMachITypes::Addr Addr;
    typedef typename TMachITypes::Off  Off;
    char sectname[16];
    char segname[16];
-    BE32 addr;   /* memory address */
+    Addr addr;   /* memory address */
-    BE32 size;   /* size in bytes */
+    Addr size;   /* size in bytes */
-    BE32 offset; /* file offset */
+    Word offset; /* file offset */  // FIXME: 64 bit?
-    BE32 align;  /* power of 2 */
+    Word align;  /* power of 2 */
-    BE32 reloff; /* file offset of relocation entries */
+    Word reloff; /* file offset of relocation entries */
-    BE32 nreloc; /* number of relocation entries */
+    Word nreloc; /* number of relocation entries */
-    BE32 flags;  /* section type and attributes */
+    Word flags;  /* section type and attributes */
-        enum {
+    Word reserved1;
-            S_REGULAR = 0,
+    Word reserved2;
-            S_ZEROFILL,
+#define WANT_MACH_SECTION_ENUM 1
-            S_CSTRING_LITERALS,
+#include "p_mach_enum.h"
            S_4BYTE_LITERALS,
            S_8BYTE_LITERALS,
            S_LITERAL_POINTERS,
            S_NON_LAZY_SYMBOL_POINTERS,
            S_LAZY_SYMBOL_POINTERS,
            S_SYMBOL_STUBS,
            S_MOD_INIT_FUNC_POINTERS,
            S_MOD_TERM_FNC_POINTERS,
            S_COALESCED
        };
        enum {
            S_ATTR_PURE_INSTRUCTIONS = 0x80000000,
            S_ATTR_NO_TOC            = 0x40000000,
            S_ATTR_STRIP_STATIC_SYMS = 0x20000000,
            S_ATTR_SOME_INSTRUCTIONS = 0x00000400,
            S_ATTR_EXT_RELOC         = 0x00000200,
            S_ATTR_LOC_RELOC         = 0x00000100
        };
    BE32 reserved1;
    BE32 reserved2;
 }
 __attribute_packed;
-struct Mach_ppc_thread_state {
+template <class TMachITypes>
-    BE32 srr0;      /* Instruction address register (PC; entry addr) */
+struct Mach_ppc_thread_state
-    BE32 srr1;      /* Machine state register (supervisor) */
+{
-    BE32  r0, r1, r2, r3, r4, r5, r6, r7;
+    typedef typename TMachITypes::Addr Addr;
    BE32  r8, r9,r10,r11,r12,r13,r14,r15;
    BE32 r16,r17,r18,r19,r20,r21,r22,r23;
    BE32 r24,r25,r26,r27,r28,r29,r30,r31;
-    BE32 cr;        /* Condition register */
+    Addr srr0;      /* Instruction address register (PC; entry addr) */
-    BE32 xer;       /* User's integer exception register */
+    Addr srr1;      /* Machine state register (supervisor) */
-    BE32 lr;        /* Link register */
+    Addr  r0, r1, r2, r3, r4, r5, r6, r7;
-    BE32 ctr;       /* Count register */
+    Addr  r8, r9,r10,r11,r12,r13,r14,r15;
-    BE32 mq;        /* MQ register (601 only) */
+    Addr r16,r17,r18,r19,r20,r21,r22,r23;
    Addr r24,r25,r26,r27,r28,r29,r30,r31;
-    BE32 vrsave;    /* Vector Save Register */
+    Addr cr;        /* Condition register */  // FIXME: Word?
    Addr xer;       /* User's integer exception register */
    Addr lr;        /* Link register */
    Addr ctr;       /* Count register */
    Addr mq;        /* MQ register (601 only) */
    Addr vrsave;    /* Vector Save Register */
 }
 __attribute_packed;
-struct Mach_thread_command {
+template <class TMachITypes>
-    BE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+struct Mach_i386_thread_state
-    BE32 cmdsize;        /* total size of this command */
+{
-    BE32 flavor;
+    typedef typename TMachITypes::Word Word;
-        enum {
+
-            PPC_THREAD_STATE = 1
+    Word eax, ebx, ecx, edx;
-        };
+    Word edi, esi, ebp;
-    BE32 count;          /* sizeof(following_thread_state)/4 */
+    Word esp, ss;
-        enum {
+    Word eflags;
-            PPC_THREAD_STATE_COUNT = sizeof(struct Mach_ppc_thread_state)/4
+    Word eip, cs;
-        };
+    Word ds, es, fs, gs;
    struct Mach_ppc_thread_state state;
 }
 __attribute_packed;
 template <class TMachITypes>
 struct Mach_i386_new_thread_state
 {
    typedef typename TMachITypes::Word Word;
    Word gs, fs, es, ds;
    Word edi, esi, ebp, esp;
    Word ebx, edx, ecx, eax;
    Word eip, cs, efl;
    Word uesp, ss;
 }
 __attribute_packed;
 }  // namespace N_Mach
 namespace N_Mach32 {
 } // namespace N_Mach32
 namespace N_Mach64 {
 template <class TMachITypes>
 struct Mach_ppc_thread_state64
 {
    typedef typename TMachITypes::Word Word;
    typedef typename TMachITypes::Xword Xword;
    Xword srr0;    /* Instruction address register (PC; entry addr) */
    Xword srr1;    /* Machine state register (supervisor) */
    Xword  r0, r1, r2, r3, r4, r5, r6, r7;
    Xword  r8, r9,r10,r11,r12,r13,r14,r15;
    Xword r16,r17,r18,r19,r20,r21,r22,r23;
    Xword r24,r25,r26,r27,r28,r29,r30,r31;
    Word cr;        /* Condition register */  // FIXME: Xword?
    Xword xer;      /* User's integer exception register */
    Xword lr;       /* Link register */
    Xword ctr;      /* Count register */
    Word vrsave;    /* Vector Save Register */
 }
 __attribute_packed;
 }  // namespace N_Mach64
 namespace N_Mach {
 template <class TP>
 struct MachClass_32
 {
    typedef TP BeLePolicy;
    // 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 TE32 Addr;
 #else
    typedef typename MachITypes::Addr Addr;
 #endif
    // Mach types
    typedef N_Mach::Mach_header<MachITypes> Mach_header;
    typedef N_Mach::Mach_segment_command<MachITypes> Mach_segment_command;
    typedef N_Mach::Mach_section_command<MachITypes> Mach_section_command;
    typedef N_Mach::Mach_ppc_thread_state<MachITypes> Mach_ppc_thread_state;
    typedef N_Mach::Mach_i386_thread_state<MachITypes> Mach_i386_thread_state;
    static void compileTimeAssertions() {
        BeLePolicy::compileTimeAssertions();
        COMPILE_TIME_ASSERT(sizeof(Addr) == 4)
    }
 };
 template <class TP>
 struct MachClass_64
 {
    typedef TP BeLePolicy;
    // 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;
    typedef N_Mach::Mach_segment_command<MachITypes> Mach_segment_command;
    typedef N_Mach::Mach_section_command<MachITypes> Mach_section_command;
    static void compileTimeAssertions() {
        BeLePolicy::compileTimeAssertions();
    }
 };
 }  // namespace N_Mach
 typedef N_Mach::MachClass_32<N_BELE_CTP::HostPolicy> MachClass_Host32;
 typedef N_Mach::MachClass_64<N_BELE_CTP::HostPolicy> MachClass_Host64;
 typedef N_Mach::MachClass_32<N_BELE_CTP::BEPolicy>   MachClass_BE32;
 typedef N_Mach::MachClass_64<N_BELE_CTP::BEPolicy>   MachClass_BE64;
 typedef N_Mach::MachClass_32<N_BELE_CTP::LEPolicy>   MachClass_LE32;
 typedef N_Mach::MachClass_64<N_BELE_CTP::LEPolicy>   MachClass_LE64;
 // shortcuts
 typedef MachClass_Host32::Mach_segment_command Mach32_segment_command;
 typedef MachClass_Host32::Mach_section_command Mach32_section_command;
 typedef MachClass_Host64::Mach_segment_command Mach64_segment_command;
 typedef MachClass_Host64::Mach_section_command Mach64_section_command;
 typedef MachClass_BE32::Mach_segment_command   MachBE32_segment_command;
 typedef MachClass_BE32::Mach_section_command   MachBE32_section_command;
 typedef MachClass_BE64::Mach_segment_command   MachBE64_segment_command;
 typedef MachClass_BE64::Mach_section_command   MachBE64_section_command;
 typedef MachClass_LE32::Mach_segment_command   MachLE32_segment_command;
 typedef MachClass_LE32::Mach_section_command   MachLE32_section_command;
 typedef MachClass_LE64::Mach_segment_command   MachLE64_segment_command;
 typedef MachClass_LE64::Mach_section_command   MachLE64_section_command;
 typedef MachClass_BE32::Mach_ppc_thread_state  Mach_ppc_thread_state;
 typedef MachClass_LE32::Mach_i386_thread_state Mach_i386_thread_state;
 #include "p_unix.h"
-class PackMachPPC32 : public PackUnixBe32
+template <class TMachClass>
 class PackMachBase : public PackUnix
 {
-    typedef PackUnixBe32 super;
+    typedef PackUnix super;
 protected:
    typedef TMachClass MachClass;
    typedef typename MachClass::BeLePolicy BeLePolicy;
    typedef typename MachClass::MachITypes MachITypes;
    // 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;
    typedef typename MachClass::Mach_segment_command Mach_segment_command;
    typedef typename MachClass::Mach_section_command Mach_section_command;
 public:
-    PackMachPPC32(InputFile *f);
+    PackMachBase(InputFile *, unsigned cpuid, unsigned t_flavor, unsigned ts_word_cnt, unsigned tc_size);
-    virtual ~PackMachPPC32();
+    virtual ~PackMachBase();
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_MACH_PPC32; }
    virtual const char *getName() const { return "Mach/ppc32"; }
    virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
    // called by the generic pack()
    virtual void pack1(OutputFile *, Filter &);  // generate executable header
    virtual void pack2(OutputFile *, Filter &);  // append compressed data
-    virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual void pack3(OutputFile *, Filter &) = 0;  // append loader
-    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
+    virtual void pack4(OutputFile *, Filter &) = 0;  // append PackHeader
    virtual void pack1_setup_threado(OutputFile *const fo) = 0;
    virtual void unpack(OutputFile *fo);
    virtual bool canPack();
    virtual unsigned find_SEGMENT_gap(unsigned const k);
 protected:
    virtual void buildLoader(const Filter *ft);
    virtual Linker* newLinker() const;
    virtual void patchLoader();
    virtual void patchLoaderChecksum();
    virtual void updateLoader(OutputFile *);
@@ -196,6 +363,13 @@ protected:
    virtual void defineSymbols(Filter const *);
    virtual void addStubEntrySections(Filter const *);
    static int __acc_cdecl_qsort compare_segment_command(void const *aa, void const *bb);
    unsigned my_cputype;
    unsigned my_thread_flavor;
    unsigned my_thread_state_word_count;
    unsigned my_thread_command_size;
    unsigned  n_segment;
    unsigned sz_segment;
    unsigned sz_mach_headers;
@@ -205,11 +379,168 @@ protected:
    Mach_header mhdro;
    Mach_segment_command segcmdo;
-    Mach_thread_command threado;
+
    struct b_info { // 12-byte header before each compressed block
        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
        unsigned char b_unused;
    }
    __attribute_packed;
    struct l_info { // 12-byte trailer in header for loader
        TE32 l_checksum;
        LE32 l_magic;
        TE16 l_lsize;
        unsigned char l_version;
        unsigned char l_format;
    }
    __attribute_packed;
    struct p_info { // 12-byte packed program header
        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)
    }
 };
 class PackMachPPC32 : public PackMachBase<MachClass_BE32>
 {
    typedef PackMachBase<MachClass_BE32> super;
 public:
    PackMachPPC32(InputFile *f) : super(f, Mach_header::CPU_TYPE_POWERPC,
        Mach_thread_command::PPC_THREAD_STATE,
        sizeof(Mach_ppc_thread_state)>>2, sizeof(threado)) { }
    virtual int getFormat() const { return UPX_F_MACH_PPC32; }
    virtual const char *getName() const { return "Mach/ppc32"; }
    virtual const char *getFullName(const options_t *) const { return "powerpc-darwin.macho"; }
 protected:
    virtual const int *getFilters() const;
    virtual void pack1_setup_threado(OutputFile *const fo);
    virtual void pack3(OutputFile *, Filter &);  // append loader
    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
    virtual Linker* newLinker() const;
    virtual void buildLoader(const Filter *ft);
    struct Mach_thread_command
    {
        BE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
        BE32 cmdsize;        /* total size of this command */
        BE32 flavor;
        BE32 count;          /* sizeof(following_thread_state)/4 */
        Mach_ppc_thread_state state;
    #define WANT_MACH_THREAD_ENUM
    #include "p_mach_enum.h"
    }
    __attribute_packed;
    Mach_thread_command threado;
 };
 class PackMachI386 : public PackMachBase<MachClass_LE32>
 {
    typedef PackMachBase<MachClass_LE32> super;
 public:
    PackMachI386(InputFile *f) : super(f, Mach_header::CPU_TYPE_I386,
        (unsigned)Mach_thread_command::i386_THREAD_STATE,
        sizeof(Mach_i386_thread_state)>>2, sizeof(threado)) { }
    virtual int getFormat() const { return UPX_F_MACH_i386; }
    virtual const char *getName() const { return "Mach/i386"; }
    virtual const char *getFullName(const options_t *) const { return "i386-darwin.macho"; }
 protected:
    virtual const int *getFilters() const;
    virtual void pack1_setup_threado(OutputFile *const fo);
    virtual void pack3(OutputFile *, Filter &);  // append loader
    virtual void pack4(OutputFile *, Filter &);  // append PackHeader
    virtual Linker* newLinker() const;
    virtual void buildLoader(const Filter *ft);
    virtual void addStubEntrySections(Filter const *);
    struct Mach_thread_command
    {
        LE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
        LE32 cmdsize;        /* total size of this command */
        LE32 flavor;
        LE32 count;          /* sizeof(following_thread_state)/4 */
        Mach_i386_thread_state state;
    #define WANT_MACH_THREAD_ENUM
    #include "p_mach_enum.h"
    }
    __attribute_packed;
    Mach_thread_command threado;
 };
 class PackMachFat : public Packer
 {
    typedef Packer super;
 public:
    PackMachFat(InputFile *f);
    virtual ~PackMachFat();
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_MACH_FAT; }
    virtual const char *getName() const { return "Mach/fat"; }
    virtual const char *getFullName(const options_t *) const { return "fat-darwin.macho"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
 protected:
    // implementation
    virtual void pack(OutputFile *fo);
    virtual void unpack(OutputFile *fo);
    virtual void list();
 public:
    virtual bool canPack();
    virtual int canUnpack();
 protected:
    // loader core
    virtual void buildLoader(const Filter *ft);
    virtual Linker* newLinker() const;
 #if (ACC_CC_BORLANDC)
 public:
 #endif
    enum { N_FAT_ARCH = 5 };
 protected:
    struct Fat_head {
        struct Mach_fat_header fat;
        struct Mach_fat_arch arch[N_FAT_ARCH];
    }
    __attribute_packed;
    Fat_head fat_head;
    // UI handler
    UiPacker *uip;
    // linker
    Linker *linker;
 #define WANT_MACH_HEADER_ENUM
 #include "p_mach_enum.h"
 };
 #endif /* already included */
@@ -0,0 +1,108 @@
 /* p_mach_enum.h --
   This file is part of the UPX executable compressor.
   Copyright (C) 2007 John F. Reiser
   All Rights Reserved.
   UPX and the UCL library are free software; you can redistribute them
   and/or modify them under the terms of the GNU General Public License as
   published by the Free Software Foundation; either version 2 of
   the License, or (at your option) any later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with this program; see the file COPYING.
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   John F. Reiser
   <jreiser@users.sourceforge.net>
 */
 /*************************************************************************
 // Use the preprocessor to work around
 //   - that the types embedding these enums have to be PODs, and
 //     deriving from an empty base class (which is the usual C++ way
 //     of "importing" enums) does not yield a POD any more
 //   - that older compilers do not correctly perform EBCO
 **************************************************************************/
 #ifdef WANT_MACH_HEADER_ENUM  /*{*/
 #undef WANT_MACH_HEADER_ENUM
    enum { // magic
        MH_MAGIC = 0xfeedface
    };
    enum { // cputype
        CPU_TYPE_I386      =          7,
        CPU_TYPE_POWERPC   = 0x00000012,
        CPU_TYPE_POWERPC64 = 0x01000012
    };
    enum { // filetype
        MH_EXECUTE = 2
    };
    enum { // flags
        MH_NOUNDEFS = 1
    };
 #endif  /*}*/
 #ifdef WANT_MACH_SEGMENT_ENUM  /*{*/
 #undef WANT_MACH_SEGMENT_ENUM
    enum { // cmd
        LC_SEGMENT       = 0x1,
        LC_THREAD        = 0x4,
        LC_UNIXTHREAD    = 0x5,
        LC_LOAD_DYLINKER = 0xe,
        LC_SEGMENT_64    = 0x19
    };
    enum { // maxprot
        VM_PROT_READ = 1,
        VM_PROT_WRITE = 2,
        VM_PROT_EXECUTE = 4
    };
 #endif  /*}*/
 #ifdef WANT_MACH_SECTION_ENUM  /*{*/
 #undef WANT_MACH_SECTION_ENUM
    enum { // section flags
        S_REGULAR = 0,
        S_ZEROFILL,
        S_CSTRING_LITERALS,
        S_4BYTE_LITERALS,
        S_8BYTE_LITERALS,
        S_LITERAL_POINTERS,
        S_NON_LAZY_SYMBOL_POINTERS,
        S_LAZY_SYMBOL_POINTERS,
        S_SYMBOL_STUBS,
        S_MOD_INIT_FUNC_POINTERS,
        S_MOD_TERM_FNC_POINTERS,
        S_COALESCED
    };
    enum {
        S_ATTR_PURE_INSTRUCTIONS = 0x80000000,
        S_ATTR_NO_TOC            = 0x40000000,
        S_ATTR_STRIP_STATIC_SYMS = 0x20000000,
        S_ATTR_SOME_INSTRUCTIONS = 0x00000400,
        S_ATTR_EXT_RELOC         = 0x00000200,
        S_ATTR_LOC_RELOC         = 0x00000100
    };
 #endif  /*}*/
 #ifdef WANT_MACH_THREAD_ENUM  /*{*/
 #undef WANT_MACH_THREAD_ENUM
    enum { // thread flavor
        PPC_THREAD_STATE = 1,
        i386_THREAD_STATE = 1,
        i386_OLD_THREAD_STATE = -1
    };
 #endif  /*}*/
 /*
 vi:ts=4:et
 */
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
-   Copyright (C) 2002-2007 Jens Medoch
+   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
@@ -194,6 +194,8 @@ bool PackPs1::getBkupHeader(unsigned char *p, unsigned char *dst)
        unsigned sz_bh = SZ_IH_BKUP;
        int r = upx_decompress((const unsigned char *)&src->ih_bkup, src->len,
                               unc_bh, &sz_bh, M_NRV2E_8, NULL );
        if (r == UPX_E_OUT_OF_MEMORY)
            throwOutOfMemoryException();
        if (r != UPX_E_OK || sz_bh != SZ_IH_BKUP)
            throwInternalError("header decompression failed");
        unsigned ad = upx_adler32(unc_bh, SZ_IH_BKUP);
@@ -254,8 +256,9 @@ bool PackPs1::canPack()
    fi->readx(buf, sizeof(buf));
    checkAlreadyPacked(buf, sizeof(buf));
-    for (unsigned i = 0; i < sizeof(buf); i++)
+    for (size_t i = 0; i < sizeof(buf); i++)
        if (buf[i] != 0)
        {
            if (!opt->force)
                throwCantPack("unknown data in header (try --force)");
            else
@@ -265,6 +268,7 @@ bool PackPs1::canPack()
                opt->backup = 1;
                break;
            }
        }
    if (!checkFileHeader())
        throwCantPack("unsupported header flags (try --force)");
    if (!opt->force && file_size < PS_MIN_SIZE)
@@ -318,7 +322,8 @@ void PackPs1::buildLoader(const Filter *)
            sa_tmp += overlap = ALIGN_UP((ph.overlap_overhead - sa_tmp), 4u);
    }
-    foundBss = findBssSection();
+    if (isCon || M_IS_LZMA(ph.method))
        foundBss = findBssSection();
    if (M_IS_LZMA(ph.method) && !buildPart2)
    {
@@ -370,16 +375,20 @@ void PackPs1::buildLoader(const Filter *)
        else
        {
            if (M_IS_LZMA(ph.method))
-                addLoader("cdb.start.lzma", "pad.code", "cdb.entry.lzma", method, "cdb.lzma.cpr",
+                addLoader(!foundBss ? "cdb.start.lzma" : "bss.cdb.start.lzma", "pad.code",
                          !foundBss ? "cdb.entry.lzma" : "bss.cdb.entry.lzma",
                          method, "cdb.lzma.cpr",
                          ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
                          "lzma.exec", NULL);
            else
            {
                assert(foundBss != true);
                addLoader("cdb.start", "pad.code", "cdb.entry",
                          ih.tx_ptr & 0xffff ?  "cdb.dec.ptr" : "cdb.dec.ptr.hi",
                          method,
                          sa_cnt ? sa_cnt > (0x10000 << 2) ? "memset.long" : "memset.short" : "",
-                          !foundBss ? "cdb.exit" : "bss.exit",
+                          "cdb.exit", NULL);
-                          "pad.code", NULL);
+            }
        }
        addLoader("UPX1HEAD", "IDENTSTR", NULL);
    }
@@ -491,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)
@@ -554,7 +563,9 @@ void PackPs1::pack(OutputFile *fo)
    }
    else
    {
-        d_len = (lsize - h_len) - getLoaderSectionStart(M_IS_LZMA(ph.method) ? "cdb.entry.lzma" : "cdb.entry");
+        const char* entry_lzma = !foundBss ? "cdb.entry.lzma" : "bss.cdb.entry.lzma";
        d_len = (lsize - h_len) - getLoaderSectionStart(M_IS_LZMA(ph.method) ? entry_lzma : "cdb.entry");
        e_len = (lsize - d_len) - h_len;
    }
@@ -565,11 +576,13 @@ void PackPs1::pack(OutputFile *fo)
    linker->defineSymbol("ldr_sz", M_IS_LZMA(ph.method) ? sz_lunc + 16 : (d_len-pad_code));
    if (foundBss)
    {
        if (M_IS_LZMA(ph.method))
            linker->defineSymbol("wrkmem", bss_end - 160 - getDecompressorWrkmemSize()
                                           - (sz_lunc + 16));
        else
            linker->defineSymbol("wrkmem", bss_end - 16 - (d_len - pad_code));
    }
    const unsigned entry = comp_data_start - e_len;
@@ -578,7 +591,7 @@ void PackPs1::pack(OutputFile *fo)
    unsigned pad = 0;
-    if (!opt->ps1_exe.no_align)
+    if (!opt->ps1_exe.no_align || !isCon)
    {
        pad = oh.tx_len;
        oh.tx_len = ALIGN_UP(oh.tx_len, CD_SEC);
@@ -611,8 +624,12 @@ void PackPs1::pack(OutputFile *fo)
        linker->defineSymbol("PSVR", FIX_PSVR);
        linker->defineSymbol("CPDO", comp_data_start);
        if (M_IS_LZMA(ph.method))
-            linker->defineSymbol("lzma_cpr", getLoaderSectionStart("lzma.exec")
+        {
-                                             - getLoaderSectionStart("cdb.entry.lzma"));
+            unsigned entry_lzma = getLoaderSectionStart( !foundBss ? "cdb.entry.lzma" :
                                                                     "bss.cdb.entry.lzma");
            linker->defineSymbol("lzma_cpr", getLoaderSectionStart("lzma.exec") - entry_lzma);
        }
    }
    relocateLoader();
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   Copyright (C) 1996-2008 Laszlo Molnar
-   Copyright (C) 2002-2007 Jens Medoch
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -42,7 +42,8 @@ public:
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_SYS; }
    virtual const char *getName() const { return "dos/sys"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_8086 ? "i086-dos16.sys" : "i286-dos16.sys"; }
    virtual const char *getFullName(const options_t *) const { return "i086-dos16.sys"; }
    virtual bool canPack();
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -67,11 +67,12 @@ const int *PackTmt::getFilters() const
 unsigned PackTmt::findOverlapOverhead(const upx_bytep buf,
                                      const upx_bytep tbuf,
                                      unsigned range,
                                      unsigned upper_limit) const
 {
    // make sure the decompressor will be paragraph aligned
-    unsigned o = super::findOverlapOverhead(buf, range, upper_limit);
+    unsigned o = super::findOverlapOverhead(buf, tbuf, range, upper_limit);
    o = ((o + 0x20) &~ 0xf) - (ph.u_len & 0xf);
    return o;
 }
@@ -241,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -42,7 +42,7 @@ public:
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_TMT_ADAM; }
    virtual const char *getName() const { return "tmt/adam"; }
-    virtual const char *getFullName(const options_t *) const { return "i386-dos32.tmt"; }
+    virtual const char *getFullName(const options_t *) const { return "i386-dos32.tmt.adam"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
@@ -56,6 +56,7 @@ protected:
    virtual int readFileHeader();
    virtual unsigned findOverlapOverhead(const upx_bytep buf,
                                         const upx_bytep tbuf,
                                         unsigned range = 0,
                                         unsigned upper_limit = ~0u) const;
    virtual void buildLoader(const Filter *ft);
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -173,8 +173,10 @@ void PackUnix::pack2(OutputFile *fo, Filter &ft)
        compressWithFilters(&ft, OVERHEAD, NULL_cconf, filter_strategy);
        if (ph.c_len < ph.u_len) {
            const upx_bytep tbuf = NULL;
            if (ft.id == 0) tbuf = ibuf;
            ph.overlap_overhead = OVERHEAD;
-            if (!testOverlappingDecompression(obuf, ph.overlap_overhead)) {
+            if (!testOverlappingDecompression(obuf, tbuf, ph.overlap_overhead)) {
                // not in-place compressible
                ph.c_len = ph.u_len;
            }
@@ -189,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_te32(&blk_info.sz_unc, ph.u_len);
-        set_native32(&blk_info.sz_cpr, ph.c_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;
@@ -250,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));
 }
@@ -276,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_te32(&hbuf.p_progid, progid);
-    set_native32(&hbuf.p_filesize, file_size);
+    set_te32(&hbuf.p_filesize, file_size);
-    set_native32(&hbuf.p_blocksize, blocksize);
+    set_te32(&hbuf.p_blocksize, blocksize);
    fo->write(&hbuf, sizeof(hbuf));
    pack2(fo, ft);  // append the compressed body
@@ -353,8 +355,10 @@ void PackUnix::packExtent(
        }
        if (ph.c_len < ph.u_len) {
            const upx_bytep tbuf = NULL;
            if (ft == NULL || ft->id == 0) tbuf = ibuf;
            ph.overlap_overhead = OVERHEAD;
-            if (!testOverlappingDecompression(obuf, ph.overlap_overhead)) {
+            if (!testOverlappingDecompression(obuf, tbuf, ph.overlap_overhead)) {
                // not in-place compressible
                ph.c_len = ph.u_len;
            }
@@ -385,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_te32(&tmp.sz_unc, hdr_u_len);
-            set_native32(&tmp.sz_cpr, hdr_c_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);
@@ -396,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_te32(&tmp.sz_unc, ph.u_len);
-        set_native32(&tmp.sz_cpr, ph.c_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) {
@@ -435,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_unc = ph.u_len = get_te32(&hdr.sz_unc);
-        int const sz_cpr = ph.c_len = get_native32(&hdr.sz_cpr);
+        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
@@ -499,13 +503,13 @@ int PackUnix::canUnpack()
    fi->seek(-bufsize, SEEK_END);
    fi->readx(buf, bufsize);
-    if (!getPackHeader(buf, bufsize))
+    if (!getPackHeader(buf, bufsize, true))  // allow incompressible extents
        return false;
    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");
@@ -527,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);
            }
@@ -554,8 +558,8 @@ void PackUnix::unpack(OutputFile *fo)
    {
        p_info hbuf;
        fi->readx(&hbuf, sizeof(hbuf));
-        orig_file_size = get_native32(&hbuf.p_filesize);
+        orig_file_size = get_te32(&hbuf.p_filesize);
-        blocksize = get_native32(&hbuf.p_blocksize);
+        blocksize = get_te32(&hbuf.p_blocksize);
        if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
            throwCantUnpack("file header corrupted");
@@ -579,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.u_len = sz_unc = get_te32(&bhdr.sz_unc);
-        ph.c_len = sz_cpr = get_native32(&bhdr.sz_cpr);
+        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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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
@@ -235,7 +214,7 @@ public:
    virtual bool canPack();
 protected:
-    virtual const upx_byte *getLoader() const;
+    virtual upx_byte *getLoader() const;
    virtual int getLoaderSize() const;
    virtual void patchLoader();
@@ -2,9 +2,9 @@
   This file is part of the UPX executable compressor.
-   Copyright (C) 2004-2007 John Reiser
+   Copyright (C) 2004-2008 John Reiser
-   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
   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
   John Reiser
-   jreiser@users.sourceforge.net
+   <jreiser@users.sourceforge.net>
 */
@@ -44,6 +44,10 @@ static const
 #include "stub/amd64-linux.kernel.vmlinux.h"
 static const
 #include "stub/arm-linux.kernel.vmlinux.h"
 static const
 #include "stub/armeb-linux.kernel.vmlinux.h"
 static const
 #include "stub/powerpc-linux.kernel.vmlinux.h"
 /*************************************************************************
@@ -66,9 +70,9 @@ PackVmlinuxBase<T>::PackVmlinuxBase(InputFile *f,
 template <class T>
 PackVmlinuxBase<T>::~PackVmlinuxBase()
 {
    delete [] shstrtab;
    delete [] phdri;
    delete [] shdri;
    delete [] shstrtab;
 }
 template <class T>
@@ -201,13 +205,14 @@ bool PackVmlinuxBase<T>::canPack()
    return 0 < n_ptload;
 }
 #include "p_elf.h"
 template <class T>
 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)
@@ -264,8 +269,217 @@ 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
-    compressWithFilters(&ft, 512, &cconf, getStrategy(ft));
+
    unsigned ppc32_extra = 0;
    if (Ehdr::EM_PPC==my_e_machine) {
        // output layout:
        //      .long UPX_MAGIC_LE32
        //      .long L20 - L10
        // L10:
        //      b_info for Ehdr; compressed Ehdr; .balign 4  // one block only
        //      b_info for LOAD; compressed LOAD; .balign 4  // possibly many blocks
        //          // This allows per-block filters!
        // L20:
        //      b f_decompress
        // +4:  f_unfilter(char *buf, unsigned len, unsigned cto8, unsigned ftid)
        //          // Code for multiple filters can "daisy chain" on ftid.
        //      f_decompress(char const *src, unsigned  src_len,
        //                   char       *dst, unsigned *dst_len, int method)
        unsigned tmp;
        tmp = UPX_MAGIC_LE32; fo->write(&tmp, sizeof(tmp)); fo_off += sizeof(tmp);
        tmp = 0;              fo->write(&tmp, sizeof(tmp)); fo_off += sizeof(tmp);
        ppc32_extra += 2*sizeof(tmp);
        unsigned const len_unc = sizeof(ehdri) + sizeof(Phdr) * ehdri.e_phnum;
        MemBuffer unc_hdr(len_unc);
        MemBuffer cpr_hdr; cpr_hdr.allocForCompression(len_unc);
        memcpy(&unc_hdr[0],             &ehdri, sizeof(ehdri));
        memcpy(&unc_hdr[sizeof(ehdri)],  phdri, sizeof(Phdr) * ehdri.e_phnum);
        unsigned len_cpr = 0;
        int const r = upx_compress(unc_hdr, len_unc, cpr_hdr, &len_cpr,
            NULL, ph.method, 10, NULL, NULL );
        if (UPX_E_OK!=r || len_unc<=len_cpr)  // FIXME: allow no compression
            throwInternalError("Ehdr compression failed");
        struct b_info { // 12-byte header before each compressed block
            unsigned sz_unc;  // uncompressed_size
            unsigned sz_cpr;  //   compressed_size
            unsigned char b_method;  // compression algorithm
            unsigned char b_ftid;  // filter id
            unsigned char b_cto8;  // filter parameter
            unsigned char b_unused;  // FIXME: !=0  for partial-block unfilter
            // unsigned f_offset, f_len;  // only if    partial-block unfilter
        }
        __attribute_packed;
        struct b_info hdr_info;
        set_be32(&hdr_info.sz_unc, len_unc);
        set_be32(&hdr_info.sz_cpr, len_cpr);
        hdr_info.b_method = ph.method;
        hdr_info.b_ftid = 0;
        hdr_info.b_cto8 = 0;
        hdr_info.b_unused = 0;
        fo->write(&hdr_info, sizeof(hdr_info)); fo_off += sizeof(hdr_info);
        unsigned const frag = (3& (0u-len_cpr));
        ppc32_extra += sizeof(hdr_info) + len_cpr + frag;
        fo_off += len_cpr + frag;
        fo->write(cpr_hdr, len_cpr + frag);
        // Partial filter: .text and following contiguous SHF_EXECINSTR
        upx_bytep f_ptr = ibuf;
        unsigned  f_len = 0;
        Shdr const *shdr = 1+ shdri;  // skip empty shdr[0]
        if (ft.buf_len==0  // not specified yet  FIXME: was set near construction
        && (Shdr::SHF_ALLOC     & shdr->sh_flags)
        && (Shdr::SHF_EXECINSTR & shdr->sh_flags)) {
            // shdr[1] is instructions (probably .text)
            f_ptr = ibuf + (unsigned) (shdr->sh_offset - phdri[0].p_offset);
            f_len = shdr->sh_size;
            ++shdr;
            for (int j= ehdri.e_shnum - 2; --j>=0; ++shdr) {
                unsigned prev_end = shdr[-1].sh_size + shdr[-1].sh_offset;
                prev_end += ~(0u-shdr[0].sh_addralign) & (0u-prev_end);  // align_up
                if ((Shdr::SHF_ALLOC     & shdr->sh_flags)
                &&  (Shdr::SHF_EXECINSTR & shdr->sh_flags)
                &&  shdr[0].sh_offset==prev_end) {
                    f_len += shdr->sh_size;
                }
                else {
                    break;
                }
            }
        }
        else { // ft.buf_len already specified, or Shdr[1] not instructions
            f_ptr = ibuf;
            f_len = ph.u_len;
        }
        compressWithFilters(ibuf, ph.u_len, obuf,
            f_ptr, f_len,  // filter range
            NULL, 0,  // hdr_ptr, hdr_len
            &ft, 512, &cconf, getStrategy(ft));
        set_be32(&hdr_info.sz_unc, ph.u_len);
        set_be32(&hdr_info.sz_cpr, ph.c_len);
        hdr_info.b_ftid = ft.id;
        hdr_info.b_cto8 = ft.cto;
        if (ph.u_len!=f_len) {
            hdr_info.b_unused = 1;  // flag for partial filter
        }
        fo->write(&hdr_info, sizeof(hdr_info)); fo_off += sizeof(hdr_info);
        ppc32_extra += sizeof(hdr_info);
        if (ph.u_len!=f_len) {
            set_be32(&hdr_info.sz_unc, f_ptr - (upx_bytep) ibuf);
            set_be32(&hdr_info.sz_cpr, f_len);
            fo->write(&hdr_info, 2*sizeof(unsigned)); fo_off += 2*sizeof(unsigned);
            ppc32_extra += 2*sizeof(unsigned);
        }
 #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;
 };
 typedef int (*upx_f_unc)(  /* uncompress */
    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 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
 )
 {
    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;
    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));
    }
 =====
    /* 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);
 #endif
        vmlinux.addr += elfoffset;
    }
 =====
 }
 #endif  /*}*/
    }
    else {
        compressWithFilters(&ft, 512, &cconf, getStrategy(ft));
    }
    unsigned const txt_c_len = ph.c_len;
    const unsigned lsize = getLoaderSize();
@@ -285,13 +499,13 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
    shdro[1].sh_name = ptr_diff(p, shstrtab);
    shdro[1].sh_type = Shdr::SHT_PROGBITS;
    shdro[1].sh_flags = Shdr::SHF_ALLOC | Shdr::SHF_EXECINSTR;
-    shdro[1].sh_offset = fo_off;
+    shdro[1].sh_offset = fo_off - ppc32_extra;
-    shdro[1].sh_size = txt_c_len + lsize;  // plus more ...
+    shdro[1].sh_size = ppc32_extra + txt_c_len + lsize;  // plus more ...
    shdro[1].sh_addralign = 1;  // default
    fo_off += write_vmlinux_head(fo, &shdro[1]);
    fo->write(obuf, txt_c_len); fo_off += txt_c_len;
-    unsigned const a = (shdro[1].sh_addralign -1) & (0u-txt_c_len);
+    unsigned const a = (shdro[1].sh_addralign -1) & (0u-(ppc32_extra + txt_c_len));
    if (0!=a) { // align
        fo_off += a;
        shdro[1].sh_size += a;
@@ -359,7 +573,7 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
    shdro[5].sh_name = ptr_diff(p, shstrtab);
    shdro[5].sh_type = Shdr::SHT_SYMTAB;
    shdro[5].sh_offset = fo_off;
-    shdro[5].sh_size = 5*sizeof(Sym);
+    shdro[5].sh_size = ((Ehdr::EM_PPC==my_e_machine) + 5)*sizeof(Sym);
    //shdro[5].sh_flags = Shdr::SHF_INFO_LINK;
    shdro[5].sh_link = 6;  // to .strtab for symbols
    shdro[5].sh_info = 1+3;  // number of non-global symbols [binutils/bfd/elf.c]
@@ -386,26 +600,40 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
    Sym unc_ker;
    unc_ker.st_name = 1;  // 1 byte into strtab
    unc_ker.st_value = 0;
-    unc_ker.st_size = txt_c_len;
+    unc_ker.st_size = ppc32_extra + txt_c_len;
    unc_ker.st_info = unc_ker.make_st_info(Sym::STB_GLOBAL, Sym::STT_FUNC);
    unc_ker.st_other = Sym::STV_DEFAULT;
    unc_ker.st_shndx = 1;  // .text
    fo->write(&unc_ker, sizeof(unc_ker)); fo_off += sizeof(unc_ker);
    unsigned const lablen = strlen(my_boot_label);
    if (Ehdr::EM_PPC==my_e_machine) {
        unc_ker.st_name += 1+ lablen;
        unc_ker.st_value = unc_ker.st_size;
        unc_ker.st_size = 0;
        fo->write(&unc_ker, sizeof(unc_ker)); fo_off += sizeof(unc_ker);
    }
    while (0!=*p++) ;
    shdro[6].sh_name = ptr_diff(p, shstrtab);
    shdro[6].sh_type = Shdr::SHT_STRTAB;
    shdro[6].sh_offset = fo_off;
-    shdro[6].sh_size = 2+ lablen;  // '\0' before and after
+    shdro[6].sh_size = 2+ lablen + (Ehdr::EM_PPC==my_e_machine)*(1+ 12);  // '\0' before and after
    shdro[6].sh_addralign = 1;
    fo->seek(1, SEEK_CUR);  // the '\0' before
    fo->write(my_boot_label, 1+ lablen);  // include the '\0' terminator
    if (Ehdr::EM_PPC==my_e_machine) {
        fo->write("_vmlinux_end", 1+ 12); fo_off += 1+ 12;
    }
    fo_off += 2+ lablen;
    fo->seek(0, SEEK_SET);
    fo->write(&ehdro, sizeof(ehdro));
    fo->write(&shdro, sizeof(shdro));
    if (Ehdr::EM_PPC==my_e_machine) {
        fo->seek(sizeof(unsigned), SEEK_CUR);
        set_be32(&ppc32_extra, ppc32_extra - 2*sizeof(unsigned) + txt_c_len);
        fo->write(&ppc32_extra, sizeof(ppc32_extra));
    }
    if (!checkFinalCompressionRatio(fo))
        throwNotCompressible();
@@ -481,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);
@@ -547,18 +775,41 @@ const int *PackVmlinuxI386::getFilters() const
    return filters;
 }
-const int *PackVmlinuxARM::getCompressionMethods(int method, int level) const
+const int *PackVmlinuxARMEL::getCompressionMethods(int method, int level) const
 {
    return Packer::getDefaultCompressionMethods_8(method, level);
 }
 const int *PackVmlinuxARMEB::getCompressionMethods(int method, int level) const
 {
    return Packer::getDefaultCompressionMethods_8(method, level);
 }
-const int *PackVmlinuxARM::getFilters() const
+const int *PackVmlinuxPPC32::getCompressionMethods(int method, int level) const
 {
    // No real dependency on LE32.
    return Packer::getDefaultCompressionMethods_le32(method, level);
 }
 const int *PackVmlinuxARMEL::getFilters() const
 {
    static const int f50[] = { 0x50, FT_END };
    return f50;
 }
 const int *PackVmlinuxARMEB::getFilters() const
 {
    static const int f51[] = { 0x51, FT_END };
    return f51;
 }
 const int *PackVmlinuxPPC32::getFilters() const
 {
    static const int fd0[] = { 0xd0, FT_END };
    return fd0;
 }
 //
 // Examples as of 2004-07-16 [readelf --segments vmlinux  # before fiddling]:
 //
@@ -586,7 +837,7 @@ const int *PackVmlinuxARM::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
 }
@@ -646,18 +897,39 @@ void PackVmlinuxAMD64::buildLoader(const Filter *ft)
              "LINUX992,IDENTSTR,UPX1HEAD", NULL);
 }
-bool PackVmlinuxARM::is_valid_e_entry(Addr e_entry)
+bool PackVmlinuxARMEL::is_valid_e_entry(Addr e_entry)
 {
    return 0xc0008000==e_entry;
 }
-Linker* PackVmlinuxARM::newLinker() const
+bool PackVmlinuxARMEB::is_valid_e_entry(Addr e_entry)
 {
    return 0xc0008000==e_entry;
 }
 bool PackVmlinuxPPC32::is_valid_e_entry(Addr e_entry)
 {
    return 0xc0000000==e_entry;
 }
 Linker* PackVmlinuxARMEL::newLinker() const
 {
    return new ElfLinkerArmLE;
 }
 Linker* PackVmlinuxARMEB::newLinker() const
 {
    return new ElfLinkerArmBE;
 }
-void PackVmlinuxARM::buildLoader(const Filter *ft)
+Linker* PackVmlinuxPPC32::newLinker() const
 {
    return new ElfLinkerPpc32;
 }
 void PackVmlinuxARMEL::buildLoader(const Filter *ft)
 {
    // prepare loader
    initLoader(stub_arm_linux_kernel_vmlinux, sizeof(stub_arm_linux_kernel_vmlinux));
@@ -679,6 +951,50 @@ void PackVmlinuxARM::buildLoader(const Filter *ft)
    addLoader("IDENTSTR,UPX1HEAD", NULL);
 }
 void PackVmlinuxARMEB::buildLoader(const Filter *ft)
 {
    // prepare loader
    initLoader(stub_armeb_linux_kernel_vmlinux, sizeof(stub_armeb_linux_kernel_vmlinux));
    addLoader("LINUX000", NULL);
    if (ft->id) {
        assert(ft->calls > 0);
        addLoader("LINUX010", NULL);
    }
    addLoader("LINUX020", NULL);
    if (ft->id) {
        addFilter32(ft->id);
    }
    addLoader("LINUX030", NULL);
         if (ph.method == M_NRV2E_8) addLoader("NRV2E", NULL);
    else if (ph.method == M_NRV2B_8) addLoader("NRV2B", NULL);
    else if (ph.method == M_NRV2D_8) addLoader("NRV2D", NULL);
    else if (M_IS_LZMA(ph.method))   addLoader("LZMA_ELF00,LZMA_DEC10,LZMA_DEC30", NULL);
    else throwBadLoader();
    addLoader("IDENTSTR,UPX1HEAD", NULL);
 }
 void PackVmlinuxPPC32::buildLoader(const Filter *ft)
 {
    // prepare loader
    initLoader(stub_powerpc_linux_kernel_vmlinux, sizeof(stub_powerpc_linux_kernel_vmlinux));
    addLoader("LINUX000", NULL);
    if (ft->id) {
        assert(ft->calls > 0);
        addLoader("LINUX010", NULL);
    }
    addLoader("LINUX020", NULL);
    if (ft->id) {
        addFilter32(ft->id);
    }
    addLoader("LINUX030", NULL);
         if (ph.method == M_NRV2E_LE32) addLoader("NRV2E", NULL);
    else if (ph.method == M_NRV2B_LE32) addLoader("NRV2B", NULL);
    else if (ph.method == M_NRV2D_LE32) addLoader("NRV2D", NULL);
    else if (M_IS_LZMA(ph.method))   addLoader("LZMA_ELF00,LZMA_DEC10,LZMA_DEC30", NULL);
    else throwBadLoader();
    addLoader("IDENTSTR,UPX1HEAD", NULL);
 }
 static const
 #include "stub/i386-linux.kernel.vmlinux-head.h"
@@ -686,6 +1002,10 @@ static const
 #include "stub/amd64-linux.kernel.vmlinux-head.h"
 static const
 #include "stub/arm-linux.kernel.vmlinux-head.h"
 static const
 #include "stub/armeb-linux.kernel.vmlinux-head.h"
 static const
 #include "stub/powerpc-linux.kernel.vmlinux-head.h"
 unsigned PackVmlinuxI386::write_vmlinux_head(
    OutputFile *const fo,
@@ -695,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);
@@ -710,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);
@@ -719,7 +1039,7 @@ printf("UnCompressed length=0x%x\n", ph.u_len);
    return sizeof(stub_amd64_linux_kernel_vmlinux_head);
 }
-void PackVmlinuxARM::defineDecompressorSymbols()
+void PackVmlinuxARMEL::defineDecompressorSymbols()
 {
    super::defineDecompressorSymbols();
    linker->defineSymbol(  "COMPRESSED_LENGTH", ph.c_len);
@@ -727,6 +1047,22 @@ void PackVmlinuxARM::defineDecompressorSymbols()
    linker->defineSymbol("METHOD", ph.method);
 }
 void PackVmlinuxARMEB::defineDecompressorSymbols()
 {
    super::defineDecompressorSymbols();
    linker->defineSymbol(  "COMPRESSED_LENGTH", ph.c_len);
    linker->defineSymbol("UNCOMPRESSED_LENGTH", ph.u_len);
    linker->defineSymbol("METHOD", ph.method);
 }
 void PackVmlinuxPPC32::defineDecompressorSymbols()
 {
    super::defineDecompressorSymbols();
    // linker->defineSymbol(  "COMPRESSED_LENGTH", ph.c_len);
    // linker->defineSymbol("UNCOMPRESSED_LENGTH", ph.u_len);
    // linker->defineSymbol("METHOD", ph.method);
 }
 void PackVmlinuxI386::defineDecompressorSymbols()
 {
    super::defineDecompressorSymbols();
@@ -744,7 +1080,7 @@ void PackVmlinuxAMD64::defineDecompressorSymbols()
    linker->defineSymbol("PHYSICAL_START", phdri[0].p_paddr);
 }
-unsigned PackVmlinuxARM::write_vmlinux_head(
+unsigned PackVmlinuxARMEL::write_vmlinux_head(
    OutputFile *const fo,
    Shdr *const stxt
 )
@@ -753,7 +1089,7 @@ unsigned PackVmlinuxARM::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)));
@@ -766,10 +1102,40 @@ unsigned PackVmlinuxARM::write_vmlinux_head(
    return sizeof(stub_arm_linux_kernel_vmlinux_head);
 }
-
+unsigned PackVmlinuxARMEB::write_vmlinux_head(
-bool PackVmlinuxARM::has_valid_vmlinux_head()
+    OutputFile *const fo,
    Shdr *const stxt
 )
 {
-    U32 buf[2];
+    // First word from vmlinux-head.S
    fo->write(&stub_armeb_linux_kernel_vmlinux_head[0], 4);
    // Second word
    TE32 tmp_u32;
    unsigned const t = (0xff000000 &
            BeLePolicy::get32(&stub_armeb_linux_kernel_vmlinux_head[4]))
        | (0x00ffffff & (0u - 1 + ((3+ ph.c_len)>>2)));
    tmp_u32 = t;
    fo->write(&tmp_u32, 4);
    stxt->sh_addralign = 4;
    stxt->sh_size += sizeof(stub_armeb_linux_kernel_vmlinux_head);
    return sizeof(stub_armeb_linux_kernel_vmlinux_head);
 }
 unsigned PackVmlinuxPPC32::write_vmlinux_head(
    OutputFile * /*const fo*/,
    Shdr * /*const stxt*/
 )
 {
    return 0;
 }
 bool PackVmlinuxARMEL::has_valid_vmlinux_head()
 {
    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];
@@ -781,6 +1147,34 @@ bool PackVmlinuxARM::has_valid_vmlinux_head()
    return false;
 }
 bool PackVmlinuxARMEB::has_valid_vmlinux_head()
 {
    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];
    unsigned const word1 = buf[1];
    if (0xeb==(word1>>24)
    &&  (0x00ffffff& word1)==(0u - 1 + ((3+ ph.c_len)>>2))) {
        return true;
    }
    return false;
 }
 bool PackVmlinuxPPC32::has_valid_vmlinux_head()
 {
    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];
    unsigned const word1 = buf[1];
    if (0xeb==(word1>>24)
    &&  (0x00ffffff& word1)==(0u - 1 + ((3+ ph.c_len)>>2))) {
        return true;
    }
    return false;
 }
 bool PackVmlinuxI386::has_valid_vmlinux_head()
 {
    unsigned char buf[5];
@@ -996,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 $0x600000  # 6 MiB length
-//      pushl $0x100000  # 1MB address
+//      pushl $0x100000  # 1 MiB address
 //      call mmap
 //      leal -0x9000(%esp),%esi  # expect "lea 0x9000(%esi),%esp" later
 ///* Fall into .text of upx-compressed vmlinux. */
@@ -1046,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
@@ -1058,6 +1452,7 @@ Linker* PackVmlinuxAMD64::newLinker() const
 // instantiate instances
 template class PackVmlinuxBase<ElfClass_LE32>;
 template class PackVmlinuxBase<ElfClass_BE32>;
 template class PackVmlinuxBase<ElfClass_LE64>;
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <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::TE16  TE16;
-    typedef typename ElfClass::U32   U32;
+    typedef typename ElfClass::TE32  TE32;
-    typedef typename ElfClass::U64   U64;
+    typedef typename ElfClass::TE64  TE64;
    typedef typename ElfITypes::Addr Addr;
    // ELF types
    typedef typename ElfClass::Ehdr Ehdr;
@@ -119,14 +119,14 @@ protected:
 };
-class PackVmlinuxARM : public PackVmlinuxBase<ElfClass_LE32>
+class PackVmlinuxARMEL : public PackVmlinuxBase<ElfClass_LE32>
 {
    typedef PackVmlinuxBase<ElfClass_LE32> super;
 public:
-    PackVmlinuxARM(InputFile *f) : super(f, Ehdr::EM_ARM,
+    PackVmlinuxARMEL(InputFile *f) : super(f, Ehdr::EM_ARM,
        Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "decompress_kernel") { }
-    virtual int getFormat() const { return UPX_F_VMLINUX_ARM; }
+    virtual int getFormat() const { return UPX_F_VMLINUX_ARMEL; }
-    virtual const char *getName() const { return "vmlinux/ARM"; }
+    virtual const char *getName() const { return "vmlinux/armel"; }
    virtual const char *getFullName(const options_t *) const { return "arm-linux.kernel.vmlinux"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
@@ -143,6 +143,54 @@ protected:
    );
 };
 class PackVmlinuxARMEB : public PackVmlinuxBase<ElfClass_BE32>
 {
    typedef PackVmlinuxBase<ElfClass_BE32> super;
 public:
    PackVmlinuxARMEB(InputFile *f) : super(f, Ehdr::EM_ARM,
        Ehdr::ELFCLASS32, Ehdr::ELFDATA2MSB, "decompress_kernel") { }
    virtual int getFormat() const { return UPX_F_VMLINUX_ARMEB; }
    virtual const char *getName() const { return "vmlinux/armeb"; }
    virtual const char *getFullName(const options_t *) const { return "armeb-linux.kernel.vmlinux"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
 protected:
    virtual void buildLoader(const Filter *ft);
    virtual void defineDecompressorSymbols();
    virtual Linker* newLinker() const;
    virtual bool is_valid_e_entry(Addr);
    virtual bool has_valid_vmlinux_head();
    virtual unsigned write_vmlinux_head(
        OutputFile *const fo,
        Shdr *const stxt
    );
 };
 class PackVmlinuxPPC32 : public PackVmlinuxBase<ElfClass_BE32>
 {
    typedef PackVmlinuxBase<ElfClass_BE32> super;
 public:
    PackVmlinuxPPC32(InputFile *f) : super(f, Ehdr::EM_PPC,
        Ehdr::ELFCLASS32, Ehdr::ELFDATA2MSB, "_vmlinux_start") { }
    virtual int getFormat() const { return UPX_F_VMLINUX_PPC32; }
    virtual const char *getName() const { return "vmlinux/ppc32"; }
    virtual const char *getFullName(const options_t *) const { return "powerpc-linux.kernel.vmlinux"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;
 protected:
    virtual void buildLoader(const Filter *ft);
    virtual void defineDecompressorSymbols();
    virtual Linker* newLinker() const;
    virtual bool is_valid_e_entry(Addr);
    virtual bool has_valid_vmlinux_head();
    virtual unsigned write_vmlinux_head(
        OutputFile *const fo,
        Shdr *const stxt
    );
 };
 class PackVmlinuxAMD64 : public PackVmlinuxBase<ElfClass_LE64>
 {
@@ -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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <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)
+    if (0x204<=h.version) {
-        return 0;
+        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];
+    const upx_byte *p = &obuf[setup_size];
-    for (int j= 0; j < 0x200; ++j, ++p)
+    unsigned cpa_0 = 0;
-    if (0==memcmp("\xEA\x00\x00", p, 3) && 0==(0xf & p[3]) && 0==p[4]) {
+    unsigned cpa_1 = 0;
-        /* whole megabyte < 16MB */
+    int j;
-        physical_start = get_le32(1+ p);
+    for ((p = &obuf[setup_size]), (j= 0); j < 0x200; ++j, ++p) {
-        break;
+        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));
@@ -208,15 +288,24 @@ int PackVmlinuzI386::decompressKernel()
        if (fd_pos != file_size)
        {
            //printf("fd_pos: %ld, file_size: %ld\n", (long)fd_pos, (long)file_size);
-            throwCantPack("trailing bytes after kernel image; use option '-f' to force packing");
+
            // linux-2.6.21.5/arch/i386/boot/compressed/vmlinux.lds
            // puts .data.compressed ahead of .text, .rodata, etc;
            // so piggy.o need not be last in bzImage.  Alas.
            //throwCantPack("trailing bytes after kernel image; use option '-f' to force packing");
        }
        // see /usr/src/linux/arch/i386/kernel/head.S
-        // 2.4.x: cld; mov $...,%eax
+        // 2.4.x: [cli;] cld; mov $...,%eax
-        if (memcmp(ibuf, "\xFC\xB8", 2) == 0) goto head_ok;
+        if (memcmp(ibuf,     "\xFC\xB8", 2) == 0) goto head_ok;
-        // 2.6.x: cld; lgdt ...
+        if (memcmp(ibuf, "\xFA\xFC\xB8", 3) == 0) goto head_ok;
-        if (memcmp(ibuf, "\xFC\x0F\x01", 3) == 0) goto head_ok;
+        // 2.6.21.5 CONFIG_PARAVIRT  mov %cs,%eax; test $3,%eax; jne ...;
        if (memcmp(ibuf, "\x8c\xc8\xa9\x03\x00\x00\x00\x0f\x85", 9) == 0) goto head_ok;
        if (memcmp(ibuf, "\x8c\xc8\xa8\x03\x0f\x85", 6) == 0) goto head_ok;
        // 2.6.x: [cli;] cld; lgdt ...
        if (memcmp(ibuf,     "\xFC\x0F\x01", 3) == 0) goto head_ok;
        if (memcmp(ibuf, "\xFA\xFC\x0F\x01", 4) == 0) goto head_ok;
        // 2.6.x+grsecurity+strongswan+openwall+trustix: ljmp $0x10,...
        if (ibuf[0] == 0xEA && memcmp(ibuf+5, "\x10\x00", 2) == 0) goto head_ok;
        // x86_64 2.6.x
@@ -227,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:
@@ -275,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(),
@@ -303,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();
@@ -348,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",
+    if (0!=page_offset) { // relocatable kernel
-              ph.first_offset_found == 1 ? "LINUZ001" : "",
+        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
+    addLoader(getDecompressorSections(), NULL);
    linker->defineSymbol("LZCUTPOI", 0x1000);
    addLoader(getDecompressorSections(),
              NULL
             );
    if (ft->id)
    {
-        assert(ft->calls > 0);
+            assert(ft->calls > 0);
        if (0x40==(0xf0 & ft->id)) {
            addLoader("LZCKLLT9", NULL);
        }
@@ -374,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);
    }
 }
@@ -385,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
@@ -418,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);
+    if (0==page_offset) {  // not relocatable kernel
-    const unsigned decompr_pos = ALIGN_UP(ph.u_len + ph.overlap_overhead, 16u);
+        const unsigned d_len4 = ALIGN_UP(lsize - e_len, 4u);
-    const unsigned copy_size = c_len + d_len4;
+        const unsigned decompr_pos = ALIGN_UP(ph.u_len + ph.overlap_overhead, 16u);
-    const unsigned edi = decompr_pos + d_len4 - 4;          // copy to
+        const unsigned copy_size = c_len + d_len4;
-    const unsigned esi = ALIGN_UP(c_len + lsize, 4u) - 4;   // copy from
+        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("decompressor", decompr_pos - bzimage_offset + physical_start);
-    linker->defineSymbol("src_for_decompressor", physical_start + decompr_pos - c_len);
+        linker->defineSymbol("src_for_decompressor", physical_start + decompr_pos - c_len);
-    linker->defineSymbol("words_to_copy", copy_size / 4);
+        linker->defineSymbol("words_to_copy", copy_size / 4);
-    linker->defineSymbol("copy_dest", physical_start + edi);
+        linker->defineSymbol("copy_dest", physical_start + edi);
-    linker->defineSymbol("copy_source", bzimage_offset + esi);
+        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();
@@ -441,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());
@@ -479,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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -60,7 +60,7 @@ protected:
    virtual void buildLoader(const Filter *ft);
    virtual Linker* newLinker() const;
-//    virtual const upx_byte *getLoader() const;
+//    virtual upx_byte *getLoader() const;
 //    virtual int getLoaderSize() const;
    struct boot_sect_t
@@ -68,8 +68,8 @@ protected:
        char            _[0x1f1];
        unsigned char   setup_sects;
        char            __[2];
-        LE16            sys_size;
+        LE32            sys_size;
-        char            ___[8];
+        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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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 F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@users.sourceforge.net
+   <markus@oberhumer.com>               <ml1050@users.sourceforge.net>
 */
@@ -42,7 +42,8 @@ public:
    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_WIN16_NE; }
    virtual const char *getName() const { return "win16/ne"; }
-    virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
+    //virtual const char *getFullName(const options_t *o) const { return o && o->cpu == o->CPU_286 ? "i286-win16.ne" : "i386-win16.ne"; }
    virtual const char *getFullName(const options_t *) const { return "i286-win16.ne"; }
    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() 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-2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2007 Laszlo Molnar
+   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>
 */
@@ -592,6 +592,10 @@ void PackW32Pe::buildLoader(const Filter *ft)
 void PackW32Pe::pack(OutputFile *fo)
 {
    // FIXME: we need to think about better support for --exact
    if (opt->exact)
        throwCantPackExact();
    const unsigned objs = ih.objects;
    isection = new pe_section_t[objs];
    fi->seek(pe_offset+sizeof(ih),SEEK_SET);
@@ -607,7 +611,8 @@ void PackW32Pe::pack(OutputFile *fo)
           (ih.cpu < 0x14c || ih.cpu > 0x150)
        || (ih.opthdrsize != 0xe0)
        || ((ih.flags & EXECUTABLE) == 0)
-        || (ih.subsystem != 2 && ih.subsystem != 3 && ih.subsystem != 1)
+        || (ih.subsystem != 2 && ih.subsystem != 3
            && ih.subsystem != 1 && ih.subsystem != 9)
        || (ih.entry == 0 && !isdll)
        || (ih.ddirsentries != 16)
        || IDSIZE(PEDIR_EXCEPTION) // is this used on i386?
@@ -615,6 +620,9 @@ void PackW32Pe::pack(OutputFile *fo)
       ))
        throwCantPack("unexpected value in PE header (try --force)");
    if (ih.subsystem == 9)
        throwCantPack("x86/wince files are not yet supported");
    if (IDSIZE(PEDIR_SEC))
        IDSIZE(PEDIR_SEC) = IDADDR(PEDIR_SEC) = 0;
    if (IDSIZE(PEDIR_COMRT))
@@ -625,10 +633,12 @@ void PackW32Pe::pack(OutputFile *fo)
    else if (opt->win32_pe.strip_relocs < 0)
        opt->win32_pe.strip_relocs = (ih.imagebase >= 0x400000);
    if (opt->win32_pe.strip_relocs)
    {
        if (ih.imagebase < 0x400000)
            throwCantPack("--strip-relocs is not allowed when imagebase < 0x400000");
        else
            ih.flags |= RELOCS_STRIPPED;
    }
    if (memcmp(isection[0].name,"UPX",3) == 0)
        throwAlreadyPackedByUPX();
@@ -717,7 +727,7 @@ void PackW32Pe::pack(OutputFile *fo)
    //OutputFile::dump("x1", ibuf, usize);
-    // some checks for broken linkers - disable filter if neccessary
+    // some checks for broken linkers - disable filter if necessary
    bool allow_filter = true;
    if (ih.codebase == ih.database
        || ih.codebase + ih.codesize > ih.imagesize
@@ -1017,6 +1027,8 @@ void PackW32Pe::pack(OutputFile *fo)
    oh.codebase = osection[1].vaddr;
    // oh.headersize = osection[0].rawdataptr;
    oh.headersize = rvamin;
    if (rvamin < osection[0].rawdataptr)
        throwCantPack("object alignment too small");
    if (opt->win32_pe.strip_relocs && !isdll)
        oh.flags |= RELOCS_STRIPPED;
@@ -1025,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]");
--- a/Show More
+++ b/Show More