Bump release date.

Initalize isrtm member.
Improve xstrip.py.
2006-11-29 03:43:29 +01:00 · 2006-11-27 17:35:16 +01:00 · 2006-11-25 15:36:56 +01:00 · 2006-11-23 05:27:40 +01:00 · 2006-11-23 03:31:43 +01:00 · 2006-11-23 03:11:53 +01:00
402 changed files with 105401 additions and 15927 deletions
@@ -1,5 +0,0 @@
-.cvsignore
-.mfxcvsup
-ChangeLog.cvs*
-build
-maint
@@ -0,0 +1,48 @@
+syntax: regexp
+
+^\.bzr
+^ChangeLog
+^build
+^maint
+
+syntax: glob
+
+*.a
+*.dll
+*.lib
+*.py[cdo]
+*.so
+*.swp
+
+doc/*.1
+doc/*.doc
+doc/*.html
+doc/*.man
+doc/*.ps
+doc/*.tex
+
+src/GNUmakefile
+src/MMakefile
+src/compress_nrv*
+src/*.mft
+src/*.rc
+
+src/*.d
+src/*.exe
+src/*.map
+src/*.o
+src/*.obj
+src/*.out
+src/*.res
+src/*.ttp
+
+stub/**MMakefile
+stub/**.*-stamp
+stub/tmp*/*
+stub/**/tmp*/*
+
+stub/tools/armpe/armpe_tester
+
+stub/tools/sstrip/amd64-linux-sstrip
+stub/tools/sstrip/i386-linux-sstrip
+stub/tools/sstrip/sstrip
@@ -0,0 +1,13 @@
+140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
+223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
+2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
+2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
+70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
+a916a2fe22de45167d25abcb40008315f415221c RELEASE_201
+a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193
+b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195
+b82ef51896199484afe5b0553af7d1e59b7ce428 BRANCHPOINT_FOR_upx2.hg
+c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192
+d276aa09033c24d0981bc3f4fee5628aecc988ad RELEASE_290
+eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110
+ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191
@@ -8,9 +8,8 @@


                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                            http://upx.tsx.org
+   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+                        http://upx.sourceforge.net


 Limitations and other things which are not (yet) supported:
@@ -1,27 +1,47 @@
-# Toplevel Makefile for UPX
+#
+# UPX toplevel Makefile - needs GNU make 3.80 or better
+#

-all:
-	$(MAKE) -C src/stub
-	$(MAKE) -C src
-	$(MAKE) -C doc
+MAKEFLAGS += -rR
+.SUFFIXES:
+export SHELL = /bin/sh

-mostlyclean clean distclean maintainer-clean:
+srcdir = .
+top_srcdir = .
+
+
+# info: src/stub needs GNU make 3.81 and special build tools
+BUILD_STUB = 0
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+BUILD_STUB = 1
+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:
+	@echo "UPX info: please choose a target for 'make'"
+
+all mostlyclean clean distclean maintainer-clean:
+ifeq ($(BUILD_STUB),1)
 	$(MAKE) -C src/stub $@
+endif
 	$(MAKE) -C src $@
 	$(MAKE) -C doc $@

-dist: distclean
-	false
-
-cvs-admin-ko:
-	cvs admin -ko .
-	cvs update
-
+# automatically generate ChangeLog from Mercurial repo
 ChangeLog:
-	perl scripts/cvs2cl.pl --utc -f ChangeLog.cvs
+ifneq ($(wildcard .hg/data/.),)
+	hg log --style=changelog > $@
+else
+	@echo "UPX info: no hg repo found"
+endif

-.PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: dist cvs-admin-ko ChangeLog

-.NOEXPORT:
+.PHONY: default all mostlyclean clean distclean maintainer-clean
+.PHONY: ChangeLog

@@ -2,16 +2,183 @@
 User visible changes for UPX
 ==================================================================

+Changes in 2.91 beta (29 Nov 2006):
+  * assorted bug fixes
+  * arm/pe: fix "missing" icon & version info resource problem for wince 5
+  * win32/pe & arm/pe: added option --compress-icons=3 to compress all icons
+
+Changes in 2.90 beta (08 Oct 2006):
+  * LZMA algorithm support for most of the 32-bit and 64-bit file formats;
+    use new option '--lzma' to enable
+  * new format: BSD/elf386 supporting FreeBSD, NetBSD and OpenBSD
+    via auto-detection of PT_NOTE or EI_OSABI
+  * arm/pe: all the NRV compression methods are now supported
+    (only NRV2D is missing in thumb mode)
+  * linux/elf386, linux/ElfAMD: remember /proc/self/exe in environment
+  * major source code changes: the runtime decompression stubs are now
+    built from internal ELF objects
+
+==================================================================
+
+Changes in 2.03 (07 Nov 2006):
+  * bvmlinuz/386: fix for kernels not at 0x100000; also allow x86_64
+  * linux/elf386: work around Linux kernel bug (0-length .bss needs PF_W)
+
+Changes in 2.02 (13 Aug 2006):
+  * linux/386: work around Linux kernel bug (".bss" requires PF_W)
+  * linux/ppc32, mach/ppc32: compressed programs now work on a 405 CPU
+  * vmlinuz/386: fixed zlib uncompression problem on DOS
+
+Changes in 2.01 (06 Jun 2006):
+  * arm/pe: better DLL support
+  * dos/exe: device driver support added
+  * linux/386: Fix --force-execve for PaX, grSecurity, and strict SELinux.
+    /tmp must support execve(); therefore /tmp cannot be mounted 'noexec'.
+  * win32/pe & arm/pe: added new option '--keep-resource=' for
+    excluding selected resources from compression
+
+Changes in 2.00 (27 Apr 2006):
+  * linux/386: the stub now prints an error message if some strict
+    SELinux mode does prevent runtime decompression and execution
+    (for a fully SELinux-compatible but otherwise inferior compression
+    format you can use the '--force-execve' option)
+  * linux/386: worked around a problem where certain Linux kernels
+    clobber the %ebx register during a syscall
+  * win32/pe: disable filters for files with broken PE headers
+
+Changes in 1.96 beta (13 Apr 2006):
+  * arm/pe: added filter support
+  * win32/pe: removed an unnecessary check so that Delphi 2006 and
+    Digital Mars C++ programs finally are supported
+
+Changes in 1.95 beta (09 Apr 2006):
+  * arm/pe: added DLL support
+  * arm/pe: added thumb mode stub support
+  * arm/pe: added unpacking support
+  * win32/pe: really worked around R6002 runtime errors
+
+Changes in 1.94 beta (11 Mar 2006):
+  * new format: added support for arm/pe (ARM executables running on WinCE)
+  * new format: added support for linux elf/amd64
+  * new format: added support for linux elf/ppc32
+  * new format: added support for mach/ppc32 (Apple Mac OS X)
+  * win32/pe: hopefully working "load config" support
+  * win32/pe: R6002 runtime errors worked around
+  * win32/pe: the stub now clears the dirty stack
+
+Changes in 1.93 beta (07 Feb 2005):
+  * vmlinuz/386: fixes to support more kernels
+
+Changes in 1.92 beta (20 Jul 2004):
+  * win32/pe: added option '--strip-loadconf' to strip the SEH load
+    config section [NOTE: this option is obsolete since UPX 1.94]
+  * win32/pe: try to detect .NET (win32/net) files [not yet supported by UPX]
+  * vmlinux/386: new format that directly supports building Linux kernels
+  * source code: now compiles cleanly under Win64
+
+Changes in 1.91 beta (30 Jun 2004):
+  * djgpp2/coff: added support for recent binutils versions
+  * linux/elf386, linux/sh386: lots of improvements
+  * vmlinuz/386: added support for recent kernels
+  * watcom/le: don't crash on files without relocations
+  * win32/pe: stricter checks of some PE values
+  * option '--brute' now implies '--crp-ms=999999'.
+  * source code: much improved portability using ACC, the
+    Automatic Compiler Configuration
+  * source code: compile fixes for strict ISO C++ compilers
+  * source code: compile fixes for Win64
+  * re-synced with upx 1.25 branch
+
+Changes in 1.90 beta (11 Nov 2002):
+  * implemented several new options for finer compression control:
+    '--all-methods', '--all-filters' and '--brute'
+  * ps1/exe: new format - UPX now supports PlayStation One programs
+  * linux/386: added the option '--force-execve'
+  * vmlinuz/386: better kernel detection and sanity checks
+  * re-synced with upx 1.24 branch
+  * documentation updates
+
 Changes in 1.11 beta (20 Dec 2000):
-  * UNSTABLE BETA VERSION - DO NOT USE EXCEPT FOR TESTING!!! REALLY.
  * vmlinuz/386: new format - UPX now supports bootable linux kernels
-  * linux/386: added the new direct-to-memory executable formats - no
+  * linux/elf386: added the new ELF direct-to-memory executable format - no
+    more temp files are needed for decompression!
+  * linux/sh386: added the new shell direct-to-memory executable format - no
    more temp files are needed for decompression!
  * reduced overall memory requirements during packing
  * quite a number of internal source code rearrangements

+==================================================================
+
+Changes in 1.25 (29 Jun 2004)
+  * INFO: http://upx.sourceforge.net is the permanent UPX home page
+  * watcom/le: don't crash on files without relocations
+  * win32/pe: stricter checks of some PE values
+  * source code: much improved portability using ACC, the
+    Automatic Compiler Configuration
+  * source code: compile fixes for strict ISO C++ compilers
+  * source code: compile fixes for Win64
+
+Changes in 1.24 (07 Nov 2002)
+  * djgpp2/coff: stricter check of the COFF header to work around a
+    problem with certain binutils versions
+
+Changes in 1.23 (05 Sep 2002)
+  * atari/tos: fixed an unpacking problem where a buffer was too
+    small (introduced in 1.22)
+  * linux/386: don't give up too early if a single block turns out
+    to be incompressible
+  * documentation: added some quick tips how to achieve the best
+    compression ratio for the final release of your application
+  * fixed a rare situation where the exit code was not set correctly
+
+Changes in 1.22 (27 Jun 2002)
+  * atari/tos: the stub now flushes the CPU cache to avoid
+    problems on 68030+ machines
+  * source code: additional compiler support for Borland C++,
+    Digital Mars C++ and Watcom C++
+
+Changes in 1.21 (01 Jun 2002)
+  * New option '--crp-ms=' for slightly better compression at the cost
+    of higher memory requirements during compression.
+    Try 'upx --best --crp-ms=100000'. See the docs for more info.
+  * source code: portability fixes
+  * source code: compile fixes for g++ 3.0 and g++ 3.1
+
+Changes in 1.20 (23 May 2001)
+  * slightly faster compression
+  * work around a gcc problem in the latest djgpp2 distribution
+  * watcom/le: fixed detection of already compressed files
+  * win32/pe: do not compress RT_MANIFEST resource types
+  * win32/pe: improved the error message for empty resource sections
+  * [NOTE: the jump from 1.08 to 1.20 is to avoid confusion with
+           our unstable development releases 1.1x and 1.9x]
+
+Changes in 1.08 (30 Apr 2001)
+  * new native port to atari/tos
+  * win32/pe: shortened the identstring
+  * source code: portability fixes - UPX now builds cleanly under m68k CPUs
+
+Changes in 1.07 (20 Feb 2001)
+  * win32/pe: corrected the TLS callback check
+  * win32/pe: really fixed that rare bug in relocation handling
+  * win32/pe: experimental support for SizeOfHeaders > 0x1000
+  * win32/pe: check for superfluous data between sections
+  * win32/pe: compressing screensavers (.scr) should finally work
+
+Changes in 1.06 (27 Jan 2001)
+  * win32/pe: the check for TLS callbacks introduced in 1.05
+      was too strict - disabled for now
+  * dos/com: decreased the decompressor stack size a little bit
+
+Changes in 1.05 (24 Jan 2001)
+  * win32/pe: refuse to compress programs with TLS callbacks
+  * win32/pe: stub changes to avoid slowdowns with some virus monitors
+  * win32/pe: reverted the relocation handling changes in 1.04
+  * linux/386: dont try to compress Linux kernel images (have a look
+      at the unstable UPX 1.1x beta versions for that)
+
 Changes in 1.04 (19 Dec 2000)
-  * dos/exe: fixed an internal error when using `--no-reloc'
+  * dos/exe: fixed an internal error when using '--no-reloc'
  * win32/pe: fixed a rare bug in the relocation handling code
  * some tunings for the default compression level

@@ -19,7 +186,7 @@ Changes in 1.03 (30 Nov 2000)
  * linked with a new version of the NRV compression library:
      - improved compression ratio a little bit
      - overall significantly faster compression
-      - much faster when using high compression levels like `-9' or `--best'
+      - much faster when using high compression levels like '-9' or '--best'
      - much faster with large files
  * atari/tos: added support for FreeMiNT
  * the 32-bit DOS version now uses the new CWSDSTUB extender
@@ -27,7 +194,7 @@ Changes in 1.03 (30 Nov 2000)
 Changes in 1.02 (13 Sep 2000)
  * watcom/le: fixed a problem with the Causeway extender
  * win32/pe: don't automatically strip relocs if they seem needed
-  * support multiple backup generations when using `-k'
+  * support multiple backup generations when using '-k'
  * updated the console screen driver

 Changes in 1.01 (09 Apr 2000)
@@ -55,7 +222,7 @@ Changes in 0.99.1 (29 Feb 2000)

 Changes in 0.99 (25 Feb 2000)
  * FULL SOURCE CODE RELEASED UNDER THE TERMS OF THE GNU GPL
-  * win32/pe: changed default to `--strip-relocs=1'
+  * win32/pe: changed default to '--strip-relocs=1'
  * dos/com and dos/sys: fixed a bad decompressor problem
  * linux/386: the counter for the progress indicator was off by one

@@ -78,7 +245,7 @@ Changes in 0.91 (13 Nov 1999)
  * dos/exe: correctly restore cs when uncompressing

 Changes in 0.90 (10 Nov 1999)
-  * all formats: `--overlay=copy' now is the default overlay mode
+  * all formats: '--overlay=copy' now is the default overlay mode
  * improved compression ratio for most files
  * win32/pe: uncompression is finally supported
  * win32/pe: never compress REGISTRY resources
@@ -88,7 +255,7 @@ Changes in 0.90 (10 Nov 1999)
  * win32/pe: somewhat less memory is required during compression
  * linux/386: fixed compression of scripts which was broken since 0.71
  * linux/386: more FreeBSD compatibility issues
-  * changed option: `-i' now prints some more details during compression
+  * changed option: '-i' now prints some more details during compression
    (not finished yet)

 Changes in 0.84 (04 Oct 1999)
@@ -104,7 +271,7 @@ Changes in 0.83 (17 Sep 1999)
 Changes in 0.82 (16 Aug 1999)
  * dos/exe: fixed a decompressor bug which could cause crash on some files
  * linux/386: section headers are now stripped from the stub so that
-    `strip' won't ruin a compressed file any longer
+    'strip' won't ruin a compressed file any longer
  * wc/le: support for stack not in the last object disabled again
  * win32/pe: removed some unneeded data

@@ -113,32 +280,32 @@ Changes in 0.81 (04 Aug 1999)
  * dos/com: fixed an internal error that could happen with very small files

 Changes in 0.80 (03 Aug 1999)
-  * you can set some default options in the environment var `UPX'
+  * you can set some default options in the environment var 'UPX'
  * dos/com: the decompressor stub now checks for enough free memory
  * dos/exe: decompressor rewritten, some bugs are fixed
-  * dos/exe: new option `--no-reloc': no relocation data is put into
+  * dos/exe: new option '--no-reloc': no relocation data is put into
    the DOS header
  * tmt/adam: added support for more stubs, detect already packed files
-  * tmt/adam: new option `--copy-overlay'
+  * tmt/adam: new option '--copy-overlay'
  * wc/le: reduced memory requirement during uncompression
  * wc/le: support files which do not contain their stack in the last object
  * wc/le: fixed a bug which could cause a crash, improved relocation
    handling
-  * wc/le: new option `--copy-overlay'
-  * win32/pe: `--compress-icons=2' is now the default
+  * wc/le: new option '--copy-overlay'
+  * win32/pe: '--compress-icons=2' is now the default
  * 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
    results in a usual Windows message, importing a nonexistant function
    results in program exit (instead of crash ;-)
-  * win32/pe: new option: `--compress-resources=0'
+  * win32/pe: new option: '--compress-resources=0'
  * win32/pe: reduced memory requirement during uncompression, some
    files might even require LESS memory when they're compressed
  * win32/pe: TYPELIBs should work now
  * win32/pe: improved relocation handling, 16-bit relocations should work
-  * win32/pe: new option `--strip-relocs' (only if you know what you are doing)
-  * win32/pe: new option `--copy-overlay'
+  * win32/pe: new option '--strip-relocs' (only if you know what you are doing)
+  * win32/pe: new option '--copy-overlay'
  * important internal changes: now the stubs are built at runtime

 Changes in 0.72 (12 May 1999)
@@ -152,20 +319,20 @@ Changes in 0.72 (12 May 1999)
  * linux/386: minor decompressor stub updates, nicer progress bar

 Changes in 0.71 (19 Apr 1999)
-  * dos/exe: added option `--no-overlay'
+  * dos/exe: added option '--no-overlay'
  * linux/386: various improvements in the stub, most notably the
    overhead for an extra cleanup process has been removed
  * win32/pe: added support for export forwarders
  * win32/pe: added support for DLLs without entry point or imports
  * win32/pe: yet another .bss fix
-  * win32/pe: new option `--compress-icons=2': compress all icons
+  * win32/pe: new option '--compress-icons=2': compress all icons
    which are not in the first icon directory
  * win32/pe: rearranged stub to avoid false alerts from some virus scanners

 Changes in 0.70 (30 Mar 1999)
  * added support for linux/386 executables
  * improved compression ratio quite a bit
-  * added new compression level `--best' to squeeze out even some more bytes
+  * added new compression level '--best' to squeeze out even some more bytes
  * win32/pe: TLS support is much better now
  * win32/pe: --compress-icons=0 should now work as well
  * the usual minor fixes for win32/pe
@@ -188,7 +355,7 @@ Changes in 0.60 (06 Mar 1999)
  * fixed a bug which could make UPX hang when an exe header contained
    an illegal value
  * added some compression flags for the win32/pe format
-  * added support for Atari ST executables (atari/tos)
+  * added support for Atari ST/TT executables (atari/tos)
  * improved compression ratio
  * improved compression speed

@@ -206,7 +373,7 @@ Changes in 0.40 (05 Oct 1998)
  * fixed a small but fatal bug in dos/sys introduced in 0.30
  * fixed a rare bug in dos/exe
  * worked around a bug in djgpp's strip 2.8
-  * Allegro packfile support should work now
+  * djgpp/coff: Allegro packfile support should work now
  * added dos/exeh compression method (works on 386+)

 Changes in 0.30 (27 Jul 1998)
@@ -8,9 +8,8 @@


                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                            http://upx.tsx.org
+   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+                        http://upx.sourceforge.net


 Here are some possible projects from which you can choose if you'd like to
@@ -31,8 +30,17 @@ User interface:
 More formats:
 -------------

- - add more file formats / platforms (there were volunteers for FreeBSD,
-   BeOS, Windows CE, Amiga, C64, ...)
+ - Amiga
+
+ - BeOS
+
+ - C64
+
+ - elks/8086 (this is a 16-bit linux-8086 kernel)
+   See http://www.elks.ecs.soton.ac.uk/
+
+ - freebsd/386 (generic), freebsd/elf386 (specialized).
+   Probably could share most of the linux code.

 - add support for self-extracting HTML pages using a Javascript stub
   (like the AlgART HTML Packer "AHP")
@@ -41,32 +49,24 @@ More formats:
 Existing formats:
 -----------------

- - dos/com: add support for very long files - convert to exe if necessary
-
- - dos/sys: add support for sys/exe combos
-
- - dos/exe: implement filter support
-
 - djgpp2/coff: add support for DLX dynamic loading
     (see SEAL http://www.home.sk/public/seal/ )

+ - dos/com: add support for very long files - convert to exe if necessary
+
+ - dos/exe: implement filter support
+
 - linux/i386:
     - use the new assembly preprocessor stuff (ie. process the file
       headers internally)
     - UPX uncompressor daemon
     - rewrite the stub in assembly (not sure if this is a good idea...)
-     - etc...
- - linux/i386: add a special elf/i386 format that understands
-     ELF files and has filter support

 - watcom/le: add support for per section compression, LX support, VXD

 - win32/pe: display a nice dialog box in the stub in case
     of problems (like importing a DLL or function fails)
- - win32/pe: finer control over resource compression, per section
-     compression
- - win32/pe: compressing screensavers looses the description - probably
-     should not compress a special resource type
+ - win32/pe: per section compression


 Compression ratio:
@@ -8,34 +8,17 @@


                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                            http://upx.tsx.org
+   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+                        http://upx.sourceforge.net



-WARNING - UNSTABLE BETA VERSION
-===============================
-
-All versions 1.1x are unstable beta releases - use them only for testing,
-and never distribute a program that is packed with them !
-There will be hidden bugs. Really.
-
-The current stable release is 1.04, and the next stable release
-will be called version 1.20.
-
-The main news since 1.04 are support for bootable Linux kernels ("vmlinuz/386")
-and direct Linux ELF-to-memory decompression ("linux/elf386"), so there's
-no reason to use the unstable versions unless you want to try the new formats.
-
-
 WELCOME
 =======

-Welcome to UPX 1.0x, the first production release after almost two years
-of beta testing.
+Welcome to UPX !

-Please don't forget to read the new LICENSE - UPX is now distributed
+Please don't forget to read the file LICENSE - UPX is distributed
 under the GNU General Public License (GPL) with special exceptions
 allowing the distribution of all compressed executables, including
 commercial programs.
@@ -54,8 +37,8 @@ and run exactly as before, with no runtime or memory penalty for most
 of the supported formats.

 UPX supports a number of different executable formats, including
-Win95/98/ME/NT/2000 programs and DLLs, DOS programs, and Linux
-executables and kernels.
+Windows 95/98/ME/NT/2000/XP/CE programs and DLLs, DOS programs,
+and Linux executables and kernels.

 UPX is free software distributed under the term of the GNU General
 Public License. Full source code is available.
@@ -64,7 +47,7 @@ UPX may be distributed and used freely, even with commercial applications.
 See the UPX License Agreement for details.

 UPX is rated number one in the well known Archive Comparison Test. Visit
-http://web.act.by.net/~act/act-exepack.html
+http://compression.ca/ .

 UPX aims to be Commercial Quality Freeware.

@@ -72,8 +55,8 @@ UPX aims to be Commercial Quality Freeware.
 SHORT DOCUMENTATION
 ===================

-`upx program.exe' will compress a program or DLL. For best compression
-results try `upx --best program.exe'.
+'upx program.exe' will compress a program or DLL. For best compression
+results try 'upx --brute program.exe'.

 Please see the file UPX.DOC for the full documentation. The files
 NEWS and BUGS also contain various tidbits of information.
@@ -87,7 +70,7 @@ UPX comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE.
 Having said that, we think that UPX is quite stable now. Indeed we
 have compressed lots of files without any problems. Also, the
 current version has undergone several months of beta testing -
-actually it's almost 2 years since our first public beta.
+actually it's almost 8 years since our first public beta.

 This is the first production quality release, and we plan that future
 releases will be backward compatible with this version.
@@ -114,8 +97,7 @@ THE FUTURE
    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
-    compressors about this topic - just do a websearch on something
-    like "procdump"...
+    compressors about this topic - just do a websearch on "unpackers"...

  - Fix all remaining bugs - keep your reports coming ;-)

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

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

 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.
@@ -146,7 +129,7 @@ Markus & Laszlo


   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   markus@oberhumer.com                      ml1050@users.sourceforge.net



@@ -8,21 +8,24 @@


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



 WARNING - UNSTABLE BETA VERSION
 ===============================

-All versions 1.1x are unstable beta releases - use them only for testing,
-and never distribute a program that is packed with them !
-There will be hidden bugs. Really.
-
-The current stable release is 1.04, and the next stable release
-will be called version 1.20.
-
-The main news since 1.04 are support for bootable Linux kernels ("vmlinuz/386")
-and direct Linux ELF-to-memory decompression ("linux/elf386"), so there's
-no reason to use the unstable versions unless you want to try the new formats.
+The current stable release is 2.02, and the next stable release
+will be called version 3.00.


+MAJOR NEWS IN UPX 3
+===================
+
+The main news since UPX 2 are:
+
+  * new format: added support for linux elf/arm
+
+  * better compression using the LZMA algorithm (option '--lzma')
+
@@ -60,55 +60,48 @@ Prerequisites
 -------------

  - first of all you need to build the UCL compression library
-    http://wildsau.idv.uni-linz.ac.at/mfx/ucl.html
+    http://www.oberhumer.com/opensource/ucl/


 Tools needed to build/modify the UPX sources
 --------------------------------------------

-  - A modern C++ compiler like gcc 2.95.2 or Visual C++ 6
-    (egcs 1.1.x may work, half-baked implementations like Borland C++ 5.5 won't)
+  - A C++ compiler supporting inner classes, templates, exceptions
+    and RTTI.

-  - GNU make for Win32
-    http://wildsau.idv.uni-linz.ac.at/mfx/download/upx/tools/
-
-  - GNU make for DOS
-    ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/
+  - GNU make 3.80 or better (GNU make 3.81 recommened).


 To compile the packer sources
 -----------------------------

-  set the environment variable UCLDIR to point to your UCL installation, e.g.
+  Set the environment variable UPX_UCLDIR to point to your
+  UCL build directory, e.g.

-     set UCLDIR=c:\src\ucl-0.92                       (DOS / Windows)
-     export UCLDIR=$HOME/local/src/ucl-0.92           (Unix)
+     set UPX_UCLDIR=c:\src\ucl-1.03                   (DOS / Windows)
+     export UPX_UCLDIR=$HOME/local/src/ucl-1.03       (Unix)

-  then type
+  Set the environment variable UPX_LZMADIR to point to your
+  to your unpacked lzma443.tar.bz2 source directory, e.g.

-     make target=linux         # on linux
-     make target=djgpp2        # for djgpp2
-     make target=mingw32       # for mingw32
-     make target=no-cygwin     # for mingw32 as included in cygwin
-     make target=msc           # for Visual C++ 6.0
+     export UPX_LZMADIR=$HOME/local/src/lzma-4.43     (Unix)
+
+  Finally type
+
+     make


 If you want to modify the stub sources you'll also need
 -------------------------------------------------------

-  - Nasm - the Netwide Assembler
-    http://www.cryogen.com/Nasm
+  - GNU make 3.81 or better
+    http://savannah.gnu.org/projects/make/

-  - Perl 5.004 or better
-    ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/perl*b.zip
+  - Perl & Python

-  - A68K - a 68000 macro assembler
-    http://wildsau.idv.uni-linz.ac.at/mfx/download/upx/tools/
-
-  - djasm - an assembler for the djgpp stub
-    http://wildsau.idv.uni-linz.ac.at/mfx/download/upx/tools/
-
-  - Linux (for the linux/i386 stubs)
+  - A number of cross-assemblers and cross-compilers - precompiled
+    binaries for i386-linux hosts are available from
+    http://sourceforge.net/project/showfiles.php?group_id=2331


 Misc. notes
@@ -123,9 +116,6 @@ Misc. notes
    stream.
  - Use gcc extensions and other compiler specific stuff only through
    macros.
-  - Keep in mind that it should be possible to build UPX on braindead
-    file systems (FAT). Don't use long file names or other things
-    that break building under plain DOS.

 ***

@@ -150,3 +140,5 @@ Patches/Contributions

      diff -uNr olddirectory newdirectory

+
+# vi:ts=4:et
@@ -8,9 +8,8 @@


                    The Ultimate Packer for eXecutables
-          Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
-               http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                            http://upx.tsx.org
+   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+                        http://upx.sourceforge.net


 .___..        .
@@ -40,12 +39,12 @@ Ice
  for debugging the PE headersize problem down
 Joergen Ibsen <jibz@hotmail.com> and d'b
  for the relocation & address optimization ideas
-John F. Reiser <jreiser@BitWagon.com>
-  for the new Linux executable formats
 John S. Fine <johnfine@erols.com>
  for the new version of the dos/exe decompressor
 Lukundoo <Lukundoo@softhome.net>
  for beta testing
+Michael Devore
+  for initial dos/exe device driver support
 Oleg V. Volkov <rover@lglobus.ru>
  for various FreeBSD specific informations
 The Owl & G-RoM
@@ -1,187 +1,120 @@
-NOTE: this TODO list is completely out of date (~ Dec 1999)
-
-===================================================================
-
- Rearrange this TODO list, sort by categories, add a priority (1-5)
+UPX TODO list. Last updated 2006-03-11.


-For 0.95:
+IMPORTANT PROBLEMS THAT SHOULD BE FIXED SOON:

- FIXME: what do we want in 1.00 ???
-
- add NRV2D for dos/exe (use by default when >= 400 kB)
-
- implement switch `-m' for method: 1 NRV2B, 2 NRV2D
-
- DLL problem under NT ? is this fixed ???
+- [None]


-PE
-==
+OTHER:

-2 - easy - mfx + ml) new switch(es) : do not compress resource types x,y,z
-    or resource names a,b,c
-3 - medium - ml) rebuild exports
-3 - difficult) don't compress the BSS section and other holes.
-4 - medium - ml) fix when objectalign < 0x1000
-4 - easy - ml) put the original offset of moved resources somewhere into
-    the res.dir. (if it's safe to do)
-4 - ??? - ml) fix FIXMEs
-5 - medium - ml) try to put the preprocessed imports & relocs back to their
-    original section if possible this could save some virtual memory
-    address space
+- docs: convert docs from upx.pod to use AsciiDoc
+
+- check all <const_cast> to make sure they are not invalid
+
+- throwNotCompressible() is not a real error, so make the output nicer
+  (info: bla bla). Also ui.cpp (total_*).


-COM
-===
+-----------------------------------------------------------------------


-EXE
-===
+IMPROVED COMPRESSION RATIO
+==========================
+
+- experiment with new filters
+
+- implement filters for dos/exe
+
+- filters: could we exploit a f->firstcall info field ?
+
+- for small programs (e.g. < 64k), try an additional algorithm
+  to see if it gives better compression


+ALL FORMATS
+===========

-LE
-==
-
-4 - easy - ml) the decompressors are already aligned, no need for an
-    extra alignment
-
-4 - difficult - ml) handle holes in the file
-
-
-TMT
-===
-
-4 - easy - ml) the decompressors are already aligned, no need for an
-    extra alignment
-
-
-LINUX
-=====
-
-4 - ???)
-    - test with AOUT binaries
-    - test with Java binaries
-    - make a compressed program suid. what happens ?
-
-5 - difficult) rewrite the whole stub in assembly
-
-
-SPARC
-=====
-
-3 - easy - ml) finish support - should generate byte-identical versions
-  for all formats (except those which are using Packer::getRandomId())
-
-
-DJGPP2
-======
-
-1 - ???) do we support overlays at all ???
-
-5 - ???) fix file extension handling when the --coff option is set
-
-
-FOR 0.95
-========
-
- enable automatic dependency tracking
-
-1 - mfx) determine when to use NRV2D, find best c_flags values for
-  NRV2B & NRV2D (see util/runtest.sh)
-
-5 - boring - mfx) Finally fix all screen and UI problems. How boring...
-  Probably should think about the whole system (printf vs. fprintf vs.
-  con_fprintf...)
-
-5 - policy - ml+mfx) Discuss a default C++ style (GNU indent 2.2.3)
-    with Laszlo and use it. Or maybe Artistic Style?
-
-10) Examine why pod2text breaks lines within something like `B<--coff>'.
-    (pod sucks anyway. unfortunately all alternatives as well.)
-
-
-MISC
-====
-
-3 - difficult ml) The first two sentences of the README look too much like
-  those from the aspack docs. Laszlo, could you rewrite this ?
-
-1 - easy - mfx) Check whether the compressed size of the executable is
-  really smaller than the uncompressed
-
-1 - ??? - mfx) Implement a more informational interface.
-    Probably add some global functions in msg.cpp.
-    Should think about the requirements first, i.e. should there be
-    some simple hierarchies (header1, header2, ...) etc. ?
-    Could use the `-v' switch for enabling this (or `-i' ??).
-  - Something like this would be fine:  (with colors :-)
-    [Processing kernel32.dll]
-      [Import]
-        3 DLL.
-        Original size: 12345 bytes.
-        Preprocessed size: 6789 bytes.
-      [Relocations]
-        Original size: 50000 bytes.
-        Preprocessed size: 25000 bytes.
-      [Exports]
-        <warning> exports compressed (try --compress-export=0 if needed)
-      [TLS]
-        Added 56 bytes TLS data.
-        Added 5 fixup records.
-      [Resources]
-        Directory size: 1234 bytes.
-        Resource data size: 100000 bytes.
-        Compressed resources: 8 (99900 bytes).
-        Not compressed resources: 1 (100 bytes).
-
-3 - ???) delete temporary files when something wrong happens
-
-4 - easy - ml) Add a `--486' option to use bswap on the 32-bit formats.
-
-4 - easy - ml) consider removing 'sbb bp,bp' or "or ebp,-1" when not needed
-
-5 - ???) idea: --subfile=xx  compress xx. subfile: we'd need a list_subfiles
-  for this...
-
-
-FIXME: classify
-
-GOALS FOR 0.90
-==============
-
- Provide additional NRV2D stubs for all 32-bit formats. Try to do this
-    in a generic way so that we can possibly add more algorithms.
-    Start by adding a `--nrv2d' switch.
-
-FOR 0.90
-========
-
-/ update the output of `--help'
-
- filters: implement the missing scan() function for f_cto32.
-    Maybe could use this to try to find an optimal filter (e.g.
-    if level >= 9) based on the counts.
-
- filters: could we have use for a f->firstcall info field ?
-
-TODO
-====
-
- all formats: more thoroughly test the exe-header in canPack()
+- more thoroughly test the exe-header in canPack()
  and throw exceptions when encountering bad values.

- experiment with filters
+- implement `--cpu=486' option to use bswap on the 32-bit formats
+    (if cpu >= 486)

- for small programs (e.g. < 64k) try an additional algorithm (like
-  the non yet finished NRV2C) to see if it gives better compression ?
+- consider removing "or ebp,-1" when not needed

-/ make checkerg++ work -> test

- fix file extension handling when the --coff option is set
+FORMAT DJGPP2/COFF
+==================

- set up an "official" test suite
+- handle overlays

- finish documentation
+- fix default file extension handling when the --coff option is set
+
+
+FORMAT DOS/EXE
+==============
+
+- implement filters
+
+- add a check so that we don't pack djgpp1 binaries
+
+
+FORMAT LINUX/386
+================
+
+- don't mmap() the temporary output file - this seems to improve
+    file io speed
+
+
+FORMAT TMT/ADAM
+===============
+
+- the decompressors are already aligned, no need for an
+    extra alignment
+
+
+FORMAT WATCOM/LE
+================
+
+- handle files without relocations
+
+- the decompressors are already aligned, no need for an
+    extra alignment
+
+- fix default file extension handling when the --le option is set
+
+- handle holes in the file
+
+- implement compressWithFilters()
+
+- add a call to verifyOverlappingDecompression()
+
+
+FORMAT WIN16/NE
+===============
+
+- implement readFileHeader() to correctly identify a win16/ne
+  executable, so that the call for contribution will get thrown
+
+
+FORMAT WIN32/PE
+===============
+
+- fix the section alignment with the Intel compiler
+
+- decrease runtime memory overhead
+
+3 - difficult) don't compress the BSS section and other holes.
+
+4 - medium - ml) fix when objectalign < 0x1000
+
+4 - easy - ml) put the original offset of moved resources somewhere into
+    the res.dir. (if it's safe to do)
+
+4 - ??? - ml) fix FIXMEs
+
+5 - medium - ml) try to put the preprocessed imports & relocs back to their
+    original section if possible. this could save some virtual memory
+    address space.

@@ -1,6 +0,0 @@
-upx.1
-upx.doc
-upx.html
-upx.man
-upx.ps
-upx.tex
@@ -1,34 +1,51 @@
+#
+# UPX doc Makefile - needs GNU make 3.80 or better
+#
+
+MAKEFLAGS += -rR
+.SUFFIXES:
 SHELL = /bin/sh

-top_srcdir = ..
+# internal make variables
+comma := ,
+empty :=
+space := $(empty) $(empty)
+tab   := $(empty)	$(empty)

-PACKAGE      = upx
-VERSION_DATE = 20 Dec 2000
-VERSION     := $(shell sed -n 's/^.*UPX_VERSION_STRING.*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
+# update $PATH for our special stub build tools
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
+endif
+ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
+export PATH := $(HOME)/bin/bin-upx:$(PATH)
+endif

-TRIMSPACE = cat
-TRIMSPACE = sed -e 's/ *$$//'
+
+# /***********************************************************************
+# //
+# ************************************************************************/
+
+top_srcdir ?= ..
+
+PACKAGE       = upx
+VERSION_DATE := $(shell sed -n 's/^.*UPX_VERSION_DATE_ISO .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
+VERSION      := $(shell sed -n 's/^.*UPX_VERSION_STRING .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h)
+
+RTRIM  := sed -e 's/[ $(tab)]*$$//'
+DETAB2 := sed -e 's/$(tab)/  /g'

 BUILT_SOURCES = upx.1 upx.doc upx.html upx.man upx.ps upx.tex
-BUILT_SOURCES = upx.1 upx.doc upx.html upx.man
+BUILT_SOURCES = upx.1 upx.doc upx.html


 ###
-###
+### targets
 ###

 all: $(BUILT_SOURCES)

-mostlyclean:
-	-rm -f $(BUILT_SOURCES) pod2htm*
-
-clean: mostlyclean
-
-distclean: clean
-
-maintainer-clean: distclean
-
-.SUFFIXES: .1 .doc .html .man .pod .ps .tex .texi
+mostlyclean clean distclean maintainer-clean:
+	rm -f $(BUILT_SOURCES) pod2htm*

 .PHONY: all mostlyclean clean distclean maintainer-clean

@@ -37,32 +54,32 @@ maintainer-clean: distclean
 ### rules
 ###

-.pod.1:
-	pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(TRIMSPACE) > $@
+.SUFFIXES: .1 .doc .html .man .pod .ps .tex

-.pod.html:
-###	pod2html $< | $(TRIMSPACE) > $@
-	pod2html --noindex $< | $(TRIMSPACE) > $@
-	@-rm -f pod2htm*
+%.1 : %.pod
+	pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@

-.pod.tex:
+%.doc : %.pod
+	pod2text < $< | $(RTRIM) > $@
+
+%.html : %.pod
+	pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@
+	@rm -f pod2htm*
+
+%.man : %.1
+	nroff -man $< | $(RTRIM) > $@
+
+%.ps : %.1
+	groff -man $< | $(RTRIM) > $@
+
+%.tex : %.pod
 	pod2latex $<

-.pod.doc:
-	pod2text < $< | $(TRIMSPACE) > $@
-
-.1.man:
-	nroff -man $< | $(TRIMSPACE) > $@
-
-.1.ps:
-	groff -man $< | $(TRIMSPACE) > $@
-

 ###
 ### dependencies
 ###

-$(BUILT_SOURCES): $(top_srcdir)/src/version.h Makefile
-
-.NOEXPORT:
+$(BUILT_SOURCES): $(top_srcdir)/src/version.h $(MAKEFILE_LIST)
+.DELETE_ON_ERROR: $(BUILT_SOURCES)

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

 References:
  <elf.h>   definitions for the ELF file format
@@ -17,7 +17,7 @@ program itself.  So, the decompressor program (which contains the
 compressed version of the original executable) must have the same
 brk() as the original executable.  So, the second PT_LOAD
 ELF "segment" of the compressed program is used only to set the brk(0).
-See src/p_lx_elf.cpp, function PackLinuxI386elf::patchLoader().
+See src/p_lx_elf.cpp, function PackLinuxElf32::generateElfHdr.
 All of the decompressor's code, and all of the compressed image
 of the original executable, reside in the first PT_LOAD of the
 decompressor program.
@@ -63,3 +63,19 @@ clear the free portion of the stack (to compensate for ld-linux.so.2
 assuming that its automatic stack variables are initialized to zero),
 and remove (all but 4 bytes of) the decompression program (and
 compressed executable) from the address space.
+
+Because the UPX runtime stub removes all traces of the compressed file
+from the address space, then the Linux kernel erases the symlink
+/proc/self/exe.  Linux stores the pathname argument that was specified
+to execve() immediately after the '\0' which terminates the character
+string of the last environment variable [as of execve()].  This is true
+for at least all Linux 2.6, 2.4, and 2.2 kernels.  The pathname is not
+"bound" to the file as strongly as /proc/self/exe (the file may be changed
+without affecting the pathname), but the pathname does provide some
+information.  The pathname may be relative to the working directory,
+so look before any chdir().
+
+The Elf formats for Linux add an environment variable named "   " [three
+spaces] which saves the results of readlink("/proc/self/exe",,) before
+the runtime stub unmaps all its pages.  As of 2006-10-03 this works
+for linux/elf386 and linux/ElfAMD.
@@ -1,17 +1,9 @@
-This documentation was written for those brave souls who want to
+This documentation is written for those brave souls who want to
 understand and/or modify the UPX assembly stubs - the small snippets
 that do the runtime decompression when a compressed program is started.

-So, how the runtime stub/loader generation works?
-
-You might have already noticed that for some file formats the loaders
-are quite simple (linux/i386 & tos) while in the other cases the
-loaders look very suspicious: they're full of `%ifdef's and contain
-loads of cryptic comments like `__PERELOC2__'.
-
-If you look at the C++ source files, however you can notice that these
-comment strings (without the leading and trailing underscores) are used
-in the following way (they are all 8 character length strings):
+If you look at the C++ source files, you can find code fragments like
+this:

    addLoader("PEMAIN20",
              ih.entry ? "PEDOJUMP" : "PERETURN",
@@ -19,71 +11,40 @@ in the following way (they are all 8 character length strings):
              NULL
             );

-Basically that's all you have to know: when you want to add a section
-of assembly code to the runtime loader, you just write
+    linker->defineSymbol("original_entry", ih.entry);

-l_foo.asm
---------
-    ;__FOOBAR00__
+and in the assembly files fragments like this:

-    xor eax, eax
-    label1:
-    jmps label1
+    section         PEISDLL1
+                    cmpb    [esp + 8], 1
+                    jnz     reloc_end_jmp

-    ;__FOOBARZZ__
+    section         PEMAIN21
+    reloc_end_jmp:

-p_foo.cpp
---------
+    section         PERETURN
+                    xor     eax, eax
+                    inc     eax
+                    ret     0x0C
+    section         PEDOJUMP
+                    jmp    original_entry

-    addLoader("FOOBAR00", NULL);
-
-This will add the assembly section starting from __FOOBAR00__ and ending
-before __FOOBARZZ__ to the loader. You can add an %ifdef - %endif pair
-before these comments if you wish - but these conditionals will NOT be
-seen by the assembler, they are just syntactic sugar to make the code a
-little bit more readable and understandable. (Note however, that only
-%ifdefs which are started on the 1st column are removed by the upx
-assembly preprocessor program, so you can still use preprocessor
-conditionals if you wish - just write them starting from the 2nd
-column.)
+Everything works as you would expect. If you want to add the code
+fragment which is in `section PERETURN' to the runtime stub, then
+simply use `addLoader("PERETURN")' in the C++ source.

 That's nice, you could say, but how cross section jumps and calls are
 handled? Well, that is the nicest part of this stuff - they are handled
 automatically. All you have to do is to add the required sections to the
 loader using `addLoader()' and the rest is done by upx. It will resolve
-every conditional or unconditional jumps or subrutine calls for you.
+every conditional or unconditional jumps or subroutine calls for you.

-This functionality (we could say it's a simple linker) is achived by the
-assembly preprocessor (src/stub/scripts/app.pl) and a little C++ module
-(src/linker.cpp). And of course NASM - the Netwide Assembler. You can
-see what's going on behind the scenes - just do:
+You can also use (undefined) symbols in the assembly for values that
+can only be computed during compression time (like `original_entry').
+These symbols can be defined later in C++ using

-    cd src/stubs
-    make maintainer-clean
-    make all
+        linker->defineSymbol("xx", yy)

-This will rebuild all the loaders - and keep the temporary files (*.as[xy])
-which are seen by the assembler.
-
-Currently this loader/stub building method only works with ix86
-assembly - both app.pl and linker.cpp heavily rely on this when dealing
-with cross section references.
-
-And finally some important features/requirements you should be aware of:
-
- - as previously stated - preprocessor conditionals starting on the 1st
-   column are removed by app.pl
- - sections are separated by comments in the form `;__X1234567__'
- - jumps are recognized by searching for a word which starts with `j'
-   and followed by a label - this also means that `jmp short label1'
-   will NOT be recognized (but you can use a macro called `jmps' for it
-   by adding `%define jmps jmp short' to the beginning of the file)
- - at the end of the file you need something like this
-
-    eof:
-    ;       __XTHEENDX__
-            section .data
-            dd      -1
-            dw      eof
-
-That's all for now.
+This functionality (we could say it's a simple linker) is achived by
+compiling the assembly into an ELF object file which a little C++
+module (src/linker.cpp) can interpret and work with.
@@ -0,0 +1,43 @@
+                        UPX and SELinux
+                        March 6, 2006
+
+
+When a program that has been compressed by UPX is run, the decompressor
+must create and write new memory pages of executable instructions.
+SELinux (Security Enhanced Linux) directly controls the conditions
+under which generating and/or executing new instructions is allowed,
+so the configuration settings of SELinux affect the running of programs
+that have been compressed by UPX.
+
+In SELinux "strict enforcing" mode (the most restrictive), generating
+new instructions at runtime is not allowed at all: any page with
+PROT_EXEC permission must be mapped from a file in a mounted filesystem
+that has 'x' [eXecute] permission, and the generation of such files is
+also tightly controlled.  A program that was compressed by UPX will not
+run in SELinux strict enforcing mode.  Attempts will fail with exit
+code 127, and a record will be added to the history file
+/var/log/audit/audit.log.
+
+In "targeted enforcing" mode, SELinux pays close attention mostly to
+designated processes that run with elevated privileges: web server,
+print server, login server, etc.  Ordinary user excutables receive
+much less scrutiny.  However, one of the eventual goals of SELinux is to
+eradicate runtime generation of instructions because of the possibility
+for exploitation by malware (virus, trojan, key logger, privilege
+elevation exploit, etc.)  Thus targeted enforcing mode notices and
+logs the use of "execmem" capability that is used by a program which
+was compressed by UPX.  In keeping with the goal of eventual prohibition,
+SELinux ordinarily would deny execmem.  However, most current SELinux
+systems, including Fedora Core 5 [set for release March 15, 2006],
+override this with "allow_exemem=1" in /etc/selinux/targeted/booleans.
+Thus a program compressed by UPX will run in the default installed
+configuration (targeted enforcing, allow_execmem=1) of SELinux under
+Fedora Core 5.  Each invocation will add a few lines to the log file
+/var/log/audit/audit.log, one line for each use of execmem.  If the
+SELinux policy becomes more restrictive in the future, then a special
+SELinux class or other mechanism must be created for compressed programs,
+or else UPX-compressed executables will not run then.
+
+In its "permissive" modes, SELinux just logs the potential problems,
+but otherwise does not interfere.  A program compressed by UPX will run
+in any permissive mode.
@@ -12,36 +12,30 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...

 =head1 ABSTRACT

-             The Ultimate Packer for eXecutables
-          Copyright (c) 1996, 1997, 1998, 1999, 2000
-     Markus F.X.J. Oberhumer, Laszlo Molnar & John F. Reiser
-        http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
-                    http://upx.tsx.org
+                    The Ultimate Packer for eXecutables
+   Copyright (c) 1996-2006 Markus Oberhumer, Laszlo Molnar & John Reiser
+                        http://upx.sourceforge.net


 B<UPX> is a portable, extendable, high-performance executable packer for
 several different executable formats. It achieves an excellent compression
 ratio and offers I<*very*> fast decompression. Your executables suffer
-no memory overhead or other drawbacks for most of the formats supported.
+no memory overhead or other drawbacks for most of the formats supported,
+because of in-place decompression.

-While you may use UPX freely for both non-commercial and commercial
+While you may use B<UPX> freely for both non-commercial and commercial
 executables (for details see the file LICENSE), we would highly
-appreciate if you credit UPX and ourselves in the documentation,
-possibly including a reference to the UPX home page. Thanks.
+appreciate if you credit B<UPX> and ourselves in the documentation,
+possibly including a reference to the B<UPX> home page. Thanks.

-[ Using UPX in non-OpenSource applications without proper credits
+[ Using B<UPX> in non-OpenSource applications without proper credits
 is considered not politically correct ;-) ]



 =head1 DISCLAIMER

-UPX comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE.
-
-Having said that, we think that UPX is quite stable now. Indeed we
-have compressed lots of files without any problems. Also, the
-current version has undergone several months of beta testing -
-actually it's more than 2 1/2 years since our first public beta.
+B<UPX> comes with ABSOLUTELY NO WARRANTY; for details see the file LICENSE.

 This is the first production quality release, and we plan that future 1.xx
 releases will be backward compatible with this version.
@@ -57,7 +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 even on my old Pentium 133
+  - very fast decompression: about 10 MB/sec on an ancient Pentium 133,
+      about 200 MB/sec on an Athlon XP 2000+.

  - no memory overhead for your compressed executables for most of the
      supported formats
@@ -76,11 +71,17 @@ B<UPX> is a versatile executable packer with the following features:
      * linux/386
      * linux/elf386
      * linux/sh386
+      * ps1/exe
      * rtm32/pe
      * tmt/adam
      * vmlinuz/386     [bootable Linux kernel]
+      * vmlinux/386
      * watcom/le (supporting DOS4G, PMODE/W, DOS32a and CauseWay)
-      * win32/pe
+      * win32/pe (exe and dll)
+      * arm/pe (exe and dll)
+      * linux/elfamd64
+      * linux/elfppc32
+      * mach/elfppc32

  - portable: UPX is written in portable endian-neutral C++

@@ -91,7 +92,7 @@ B<UPX> is a versatile executable packer with the following features:
      the full source code of UPX is released under the GNU General Public
      License (GPL) !

-You probably understand now why we call UPX the "I<ultimate>"
+You probably understand now why we call B<UPX> the "I<ultimate>"
 executable packer.


@@ -105,7 +106,7 @@ specified on the command line.

 =head2 Decompress

-All UPX supported file formats can be unpacked using the B<-d> switch, eg.
+All B<UPX> supported file formats can be unpacked using the B<-d> switch, eg.
 B<upx -d yourfile.exe> will uncompress the file you've just compressed.

 =head2 Test
@@ -135,9 +136,10 @@ B<-q -q -q> (or B<-qqq>): produce no output at all

 B<--help>: prints the help

-B<--version>: print the version of UPX
+B<--version>: print the version of B<UPX>

-B<--stdout>: writes all output to stdout
+B<--exact>: when compressing, require to be able to get a byte-identical file
+after decompression with option B<-d>

 [ ...to be written... - type `B<upx --help>' for now ]

@@ -169,19 +171,43 @@ Compression level B<--best> may take a long time.

 =back

-Note that compression level B<-9> can be somewhat slow for large
+Note that compression level B<--best> can be somewhat slow for large
 files, but you definitely should use it when releasing a final version
 of your program.

-Since UPX 0.70 there is also an extra compression level B<--best> which
-squeezes out even some more compression ratio. While it is usually fine
-to use this option with your favorite .com file it may take a long time
-to compress a multi-megabyte program. You have been warned.
-
-Tips for even better compression:
+Quick start for achieving the best compression ratio:

 =over 4

+Try B<upx --brute myfile.exe>.
+
+=back
+
+Details for achieving the best compression ratio:
+
+=over 4
+
+=item *
+
+Use the compression level B<--best>.
+
+=item *
+
+Try one or both of the options B<--all-methods> and B<--all-filters>.
+
+=item *
+
+Try the option B<--crp-ms=NUMBER>. This uses more memory during compression
+to achieve a (slightly) better compression ratio.
+
+NUMBER must be a decimal value from 10000 to 999999, inclusive.
+The default value is 10000 (ten thousand).
+
+=item *
+
+Info: the option B<--brute> is an abbrevation for the options
+B<S<--best> S<--all-methods> S<--all-filters> S<--crp-ms=999999>>.
+
 =item *

 Try if B<--overlay=strip> works.
@@ -196,12 +222,15 @@ 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
+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).
+
 B<UPX> handles overlays like many other executable packers do: it simply
 copies the overlay after the compressed image. This works with some
-files, but doesn't work with others.
-
-Since version 0.90 UPX defaults to B<--overlay=copy> for
-all executable formats.
+files, but doesn't work with others, depending on how an application
+actually accesses this overlayed data.

  --overlay=copy    Copy any extra data attached to the file. [DEFAULT]

@@ -216,25 +245,22 @@ all executable formats.
 =head1 ENVIRONMENT

 The environment variable B<UPX> can hold a set of default
-options for UPX. These options are interpreted first and
+options for B<UPX>. These options are interpreted first and
 can be overwritten by explicit command line parameters.
 For example:

-    for DOS/Windows:   set UPX=-9 --compress-icons#1
-    for sh/ksh/zsh:    UPX="-9 --compress-icons=1"; export UPX
-    for csh/tcsh:      setenv UPX "-9 --compress-icons=1"
+    for DOS/Windows:   set UPX=-9 --compress-icons#0
+    for sh/ksh/zsh:    UPX="-9 --compress-icons=0"; export UPX
+    for csh/tcsh:      setenv UPX "-9 --compress-icons=0"

 Under DOS/Windows you must use '#' instead of '=' when setting the
 environment variable because of a COMMAND.COM limitation.

-On Vax/VMS, the name of the environment variable is
-UPX_OPT, to avoid a conflict with the symbol set for
-invocation of the program.
-
 Not all of the options are valid in the environment variable -
-UPX will tell you.
+B<UPX> will tell you.

-You can use the B<--no-env> option to turn this support off.
+You can explicitly use the B<--no-env> option to ignore the
+environment variable.



@@ -242,17 +268,21 @@ You can use the B<--no-env> option to turn this support off.

 =head2 NOTES FOR ATARI/TOS

-This is the executable format used by the Atari ST/TT, a 68000 based
-personal computer which was popular in the late '80s. Support
+This is the executable format used by the Atari ST/TT, a Motorola 68000
+based personal computer which was popular in the late '80s. Support
 of this format is only because of nostalgic feelings of one of
 the authors and serves no practical purpose :-).
+See http://www.freemint.de for more info.

 Packed programs will be byte-identical to the original after uncompression.
 All debug information will be stripped, though.

 Extra options available for this executable format:

-  (none)
+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.



@@ -264,7 +294,7 @@ Same as vmlinuz/i386.

 =head2 NOTES FOR DOS/COM

-Obviously UPX won't work with executables that want to read data from
+Obviously B<UPX> won't work with executables that want to read data from
 themselves (like some commandline utilities that ship with Win95/98/ME).

 Compressed programs only work on a 286+.
@@ -277,13 +307,23 @@ Extra options available for this executable format:

  --8086              Create an executable that works on any 8086 CPU.

+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.
+


 =head2 NOTES FOR DOS/EXE

 dos/exe stands for all "normal" 16-bit DOS executables.

-Obviously UPX won't work with executables that want to read data from
+Obviously B<UPX> won't work with executables that want to read data from
 themselves (like some command line utilities that ship with Win95/98/ME).

 Compressed programs only work on a 286+.
@@ -294,13 +334,15 @@ Extra options available for this executable format:

  --no-reloc          Use no relocation records in the exe header.

+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+


 =head2 NOTES FOR DOS/SYS

-You can only compress plain sys files, sys/exe (two in one)
-combos are not supported.
-
 Compressed programs only work on a 286+.

 Packed programs will be byte-identical to the original after uncompression.
@@ -311,33 +353,51 @@ Extra options available for this executable format:

  --8086              Create an executable that works on any 8086 CPU.

+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.
+


 =head2 NOTES FOR DJGPP2/COFF

-First of all, it is recommended to use UPX *instead* of B<strip>. strip has
+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 UPX corrects a bug/feature in strip v2.8.x: it
+Additionally B<UPX> corrects a bug/feature in strip v2.8.x: it
 will fix the 4 KByte aligment of the stub.

-UPX includes the full functionality of stubify. This means it will
+B<UPX> includes the full functionality of stubify. This means it will
 automatically stubify your COFF files. Use the option B<--coff> to
-disable this behaviour (see below).
+disable this functionality (see below).

-UPX automatically handles Allegro packfiles.
+B<UPX> automatically handles Allegro packfiles.

 The DLM format (a rather exotic shared library extension) is not supported.

 Packed programs will be byte-identical to the original after uncompression.
 All debug information and trailing garbage will be stripped, though.

-BTW, UPX is the successor of the DJP executable packer.
-
 Extra options available for this executable format:

  --coff              Produce COFF output instead of EXE. By default
                      UPX keeps your current stub.

+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.
+


 =head2 NOTES FOR LINUX [general]
@@ -520,7 +580,7 @@ Extra options available for this executable format:
 Please read the general Linux description first.

 Shell scripts where the underling shell accepts a ``-c'' argument
-can use the Linux/sh386 format.  UPX decompresses the shell script
+can use the Linux/sh386 format.  B<UPX> decompresses the shell script
 into low memory, then maps the shell and passes the entire text of the
 script as an argument with a leading ``-c''.
 It does not use space in /tmp, and does not use /proc.
@@ -566,8 +626,9 @@ Extra options available for this executable format:

 Please read the general Linux description first.

-The generic linux/386 format deompresses to /tmp
-and needs /proc filesystem support.
+The generic linux/386 format decompresses to /tmp and needs
+/proc filesystem support. It starts the decompressed program
+via the execve() syscall.

 Linux/386 is only selected if the specialized linux/elf386
 and linux/sh386 won't recognize a file.
@@ -577,7 +638,7 @@ Packed programs will be byte-identical to the original after uncompression.
 How it works:

  For files which are not ELF and not a script for a known "-c" shell,
-  UPX uses kernel exec(), which first requires decompressing to a
+  UPX uses kernel execve(), which first requires decompressing to a
  temporary file in the filesystem.  Interestingly -
  because of the good memory management of the Linux kernel - this
  often does not introduce a noticable delay, and in fact there
@@ -625,11 +686,61 @@ Specific drawbacks:

 Extra options available for this executable format:

-  (none)
+  --force-execve      Force the use of the generic linux/386 "execve"
+                      format, i.e. do not try the linux/elf386 and
+                      linux/sh386 formats.



-=head2 NOTES FOR RTM32/PE
+=head2 NOTES FOR PS1/EXE
+
+This is the executable format used by the Sony PlayStation (PSone),
+a Mips R3000 based gaming console which is popular since the late '90s.
+Support of this format is very similar to the Atari one, because of
+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.
+
+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.
+
+  - Normally the packed files use the same memory areas like the uncompressed
+    versions, so they will not override other memory areas while unpacking.
+    If this isn't possible UPX will abort showing a 'packed data overlap'
+    error. With the "--force" option UPX will relocate the loading address
+    for the packed file, but this isn't a real problem if it is a single or
+    the main executable.
+
+Extra options available for this executable format:
+
+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --8-bit             Uses 8 bit size compression [default: 32 bit]
+
+  --8mb-ram           PSone has 8 MB ram available [default: 2 MB]
+
+  --boot-only         This format is for main exes and CD-Mastering only !
+                      It may slightly improve the compression ratio,
+                      decompression routines are faster than default ones.
+                      But it cannot be used for console transfer !
+
+  --no-align          This option disables CD mode 2 data sector format
+                      alignment. May slightly improves the compression ratio,
+                      but the compressed executable will not boot from a CD.
+                      Use it for console transfer only !
+
+
+
+=head2 NOTES FOR RTM32/PE and ARM/PE

 Same as win32/pe.

@@ -641,15 +752,23 @@ This format is used by the TMT Pascal compiler - see http://www.tmt.com/ .

 Extra options available for this executable format:

-  (none)
+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.



 =head2 NOTES FOR VMLINUZ/386

 The vmlinuz/386 and bvmlinuz/386 formats take a gzip-compressed
-bootable kernel image ("vmlinuz", "zImage", "bzImage"), gzip-decompress
-it and re-compress it with the UPX compression method.
+bootable Linux kernel image ("vmlinuz", "zImage", "bzImage"),
+gzip-decompress it and re-compress it with the B<UPX> compression method.

 vmlinuz/386 is completely unrelated to the other Linux executable
 formats, and it does not share any of their drawbacks.
@@ -672,7 +791,8 @@ Benefits:
         641073  bzImage        [original]
         560755  bzImage.upx    [compressed by "upx -9"]

-  - Much faster decompression at kernel boot time.
+  - Much faster decompression at kernel boot time (but kernel
+    decompression speed is not really an issue these days).

 Drawbacks:

@@ -680,22 +800,26 @@ Drawbacks:

 Extra options available for this executable format:

-  (none)
+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.



 =head2 NOTES FOR WATCOM/LE

-UPX has been successfully tested with the following extenders:
+B<UPX> has been successfully tested with the following extenders:
  DOS4G, DOS4GW, PMODE/W, DOS32a, CauseWay.
  The WDOS/X extender is partly supported (for details
  see the file bugs BUGS).

-Yes, you can use your compressed executables with DOS4GW.
-
-The LX format is not yet supported.
-
-DLLs are not supported.
+DLLs and the LX format are not supported.

 Extra options available for this executable format:

@@ -706,14 +830,15 @@ Extra options available for this executable format:

 =head2 NOTES FOR WIN32/PE

-The PE support in UPX is quite stable now, but probably there are
+The PE support in B<UPX> is quite stable now, but probably there are
 still some incompabilities with some files.

-Because of the way UPX (and other packers for this format) works, you
-can see increased memory usage of your compressed files. If you start
-several instances of huge compressed programs you're wasting memory
-because the common segements of the program won't get shared
-across the instances.
+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
+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
 smaller, but it's still there.
@@ -721,7 +846,18 @@ smaller, but it's still there.
 If you're running executables from network, then compressed programs
 will load faster, and require less bandwidth during execution.

-DLLs are supported.
+DLLs are supported. But UPX compressed DLLs can not share common data and
+code when they got used by multiple applications. So compressing msvcrt.dll
+is a waste of memory, but compressing the dll plugins of a particular
+application may be a better idea.
+
+Screensavers are supported, with the restriction that the filename
+must end with ".scr" (as screensavers are handled slightly different
+than normal exe files).
+
+UPX compressed PE files has some minor memory overhead (usually in the
+10 - 30 kbytes range) which can be seen by specifying the "-i" command
+line switch during compression.

 Extra options available for this executable format:

@@ -739,9 +875,26 @@ Extra options available for this executable format:
  --compress-icons=1  Compress all but the first icon.
  --compress-icons=2  Compress all icons which are not in the
                      first icon directory. [DEFAULT]
+  --compress-icons=3  Compress all icons.

  --compress-resources=0  Don't compress any resources at all.

+  --keep-resource=list Don't compress resources specified by the list.
+                      The members of the list are separated by commas.
+                      A list member has the following format: I<type[/name]>.
+                      I<Type> is the type of the resource. Standard types
+                      must be specified as decimal numbers, user types can be
+                      specified by decimal IDs or strings. I<Name> is the
+                      identifier of the resource. It can be a decimal number
+                      or a string. For example:
+
+                      --keep-resource=2/MYBITMAP,5,6/12345
+
+                      UPX won't compress the named bitmap resource "MYBITMAP",
+                      it leaves every dialog (5) resource uncompressed, and
+                      it won't touch the string table resource with identifier
+                      12345.
+
  --force             Force compression even when there is an
                      unexpected value in a header field.
                      Use with care.
@@ -752,10 +905,20 @@ Extra options available for this executable format:
                      address greater or equal to 0x400000. Usually the
                      compressed files becomes smaller, but some files
                      may become larger. Note that the resulting file will
-                      not work under Win32s.
+                      not work under Windows 3.x (Win32s).
                      UPX never strips relocations from a DLL
                      regardless of this option.

+  --all-methods       Compress the program several times, using all
+                      available compression methods. This may improve
+                      the compression ratio in some cases, but usually
+                      the default method gives the best results anyway.
+
+  --all-filters       Compress the program several times, using all
+                      available preprocessing filters. This may improve
+                      the compression ratio in some cases, but usually
+                      the default filter gives the best results anyway.
+


 =head1 DIAGNOSTICS
@@ -775,22 +938,26 @@ Please report all bugs immediately to the authors.

 =head1 AUTHORS

- Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>
- http://wildsau.idv.uni-linz.ac.at/mfx/
+ Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ http://www.oberhumer.com

- Laszlo Molnar <ml1050@cdata.tvnet.hu>
+ Laszlo Molnar <ml1050@users.sourceforge.net>

 John F. Reiser <jreiser@BitWagon.com>

+ Jens Medoch <jssg@users.sourceforge.net>
+


 =head1 COPYRIGHT

-Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer

-Copyright (C) 1996-2000 Laszlo Molnar
+Copyright (C) 1996-2006 Laszlo Molnar

-Copyright (C) 2000 John Reiser
+Copyright (C) 2000-2006 John F. Reiser
+
+Copyright (C) 2002-2006 Jens Medoch

 This program may be used freely, and you are welcome to
 redistribute it under certain conditions.
@@ -798,7 +965,7 @@ redistribute it under certain conditions.
 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
-UPX License Agreement for more details.
+B<UPX License Agreement> for more details.

 You should have received a copy of the UPX License Agreement along
 with this program; see the file LICENSE. If not, visit the UPX home page.
@@ -1,101 +0,0 @@
-The GNU bfd binary file descriptor package, part of the GNU binutils package,
-contains code to recognize an Elf file by looking at fields in the file header.
-Many programs (such as gdb, size, objdump, objcopy, strip and others) use bfd.
-Unfortunately, bfd has been overly strict.  In releases
-   binutils-2.9.1.0.4, binutils-2.9.1.0.23, binutils-2.9.5.0.0,
-   binutils-2.10.1,
-   gdb-4.17, gdb-5.0,
-and probably others,
-bfd does not recognize a file with zero in Elf32_Ehdr.e_shoff, .e_shentsize,
-or .e_shnum, even though the operating system kernel does not care, and many
-bfd clients would work just fine in these cases.
-
-Because of its desire to create small size compressed executables, UPX
-generates and uses Elf files with zero in .e_shoff, .e_shentsizes, and .e_shnum.
-As a result, many widely-distributed instances of gdb, size, objdump, etc.,
-refuse to work on UPX-packed executables.
-
-Here is a patch to bfd/elfcode.h which enables many bfd clients to work
-with UPX-packed executables.  The last two lines of the patch are
-       if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) == -1)
- 	return -1;
-
-
--- elfcode.h.orig	Mon Jun 16 11:45:32 1997
-+++ elfcode.h	Sat Apr 22 10:18:56 2000
-@@ -1,5 +1,5 @@
- /* ELF executable support for BFD.
-   Copyright 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-+   Copyright 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
- 
-    Written by Fred Fish @ Cygnus Support, from information published
-    in "UNIX System V Release 4, Programmers Guide: ANSI C and
-@@ -517,14 +517,14 @@
-   elf_debug_file (i_ehdrp);
- #endif
- 
-  /* If there is no section header table, we're hosed. */
-  if (i_ehdrp->e_shoff == 0)
-+  /* If there is no section header table, and relocatable, then we're hosed. */
-+  if (i_ehdrp->e_shoff == 0 && i_ehdrp->e_type == ET_REL)
-     goto got_wrong_format_error;
- 
-   /* As a simple sanity check, verify that the what BFD thinks is the
-      size of each section header table entry actually matches the size
-     recorded in the file. */
-  if (i_ehdrp->e_shentsize != sizeof (x_shdr))
-+     recorded in the file, but only if there are any sections. */
-+  if (i_ehdrp->e_shentsize != sizeof (x_shdr) &&  i_ehdrp->e_shnum != 0)
-     goto got_wrong_format_error;
- 
-   ebd = get_elf_backend_data (abfd);
-@@ -579,6 +579,7 @@
-   /* Allocate space for a copy of the section header table in
-      internal form, seek to the section header table in the file,
-      read it in, and convert it to internal form.  */
-+ if (i_ehdrp->e_shnum!=0) {
-   i_shdrp = ((Elf_Internal_Shdr *)
- 	     bfd_alloc (abfd, sizeof (*i_shdrp) * i_ehdrp->e_shnum));
-   elf_elfsections (abfd) = ((Elf_Internal_Shdr **)
-@@ -609,6 +610,7 @@
-       if (! bfd_section_from_shdr (abfd, i_ehdrp->e_shstrndx))
- 	goto got_no_match;
-     }
-+ }
- 
-   /* Read in the program headers.  */
-   if (i_ehdrp->e_phnum == 0)
-@@ -644,6 +646,7 @@
-      bfd_section_from_shdr with it (since this particular strtab is
-      used to find all of the ELF section names.) */
- 
-+ if (i_ehdrp->e_shstrndx != 0) {
-   shstrtab = bfd_elf_get_str_section (abfd, i_ehdrp->e_shstrndx);
-   if (!shstrtab)
-     goto got_no_match;
-@@ -657,6 +660,7 @@
-       if (! bfd_section_from_shdr (abfd, shindex))
- 	goto got_no_match;
-     }
-+ }
- 
-   /* Let the backend double check the format and override global
-      information.  */
-@@ -930,7 +934,7 @@
- {
-   Elf_Internal_Shdr *hdr;
-   Elf_Internal_Shdr *verhdr;
-  long symcount;		/* Number of external ELF symbols */
-+  unsigned long symcount;	/* Number of external ELF symbols */
-   elf_symbol_type *sym;		/* Pointer to current bfd symbol */
-   elf_symbol_type *symbase;	/* Buffer for generated bfd symbols */
-   Elf_Internal_Sym i_sym;
-@@ -978,7 +982,7 @@
-     sym = symbase = NULL;
-   else
-     {
-      long i;
-+      unsigned long i;
- 
-       if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) == -1)
- 	return -1;
@@ -1,12 +0,0 @@
-*.0??
-*.idb
-*.map
-*.pdb
-*.upx
-.gdbinit
-.Attic
-upx
-upx_nrv
-upx_nrv.*
-upx_ucl
-upx_ucl.*
@@ -1,482 +1,82 @@
-# UPX Makefile (GNU make) - works with djgpp2/win32/unix
 #
-# usage:
-#   `make target=linux'         # linux
-#   `make target=djggp2'        # djggp2 2.03
-#   `make target=cygwin'        # cygwin 1.1.x
-#   `make target=mingw32'       # mingw32
-#   `make target=no-cygwin'     # mingw32 as included in cygwin 1.1.x
-#   `make target=vc6'           # Visual C++ 6.0
+# UPX Makefile - needs GNU make 3.80 or better
 #

-
-# configuration section
-
-ifeq ($(strip $(UCLDIR)),)
-# change this to reflect where the UCL library is
-UCLDIR = $(HOME)/local/src/ucl-0.92
-endif
-
-DEBUG = 0
-
-
-# -------------------------------------------------------
-# You should not have to change anything below this line.
-# -------------------------------------------------------
-
-SHELL = /bin/sh
-
-
+MAKEFLAGS += -rR
 .SUFFIXES:
-.SUFFIXES: .a .c .cpp .exe .lib .o .obj
+export SHELL = /bin/sh
+override e = $($1) $(EXTRA_$1) $(upx_$1) $($(basename $(notdir $@)).$1)

-
-srcdir = .
-top_srcdir = ..
-
-
-# auto-detect the target unless given on the commandline
-target = djgpp2
-ifneq ($(strip $(wildcard /usr/include/linux)),)
-target = linux
-endif
-ifneq ($(strip $(wildcard /platform/sun4?/kernel/unix)),)
-target = sparc
-endif
-ifeq ($(target),msc)
-override target = vc6
+srcdir ?= $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+ifneq ($(srcdir),./)
+srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,')
+##$(info Info: using VPATH . $(srcdir))
+VPATH := . $(srcdir)
 endif

-
-# util var for use in the rules - basename of the current target
-override T = $(basename $@)
-
-
-# /***********************************************************************
-# // object files
-# ************************************************************************/
-
-# these use exceptions & RTTI
-OBJECTS1 = \
-	compress$o except$o file$o lefile$o \
-	filter$o mem$o msg$o stdcxx$o work$o ui$o \
-	packer$o packhead$o packmast$o \
-	p_com$o p_djgpp2$o p_exe$o p_lx_elf$o p_lx_sep$o p_lx_sh$o \
-	p_sys$o p_tmt$o p_tos$o \
-	p_unix$o p_vmlinz$o p_w32pe$o p_wcle$o
-
-# no exceptions or RTTI
-OBJECTS2 = \
-	filteri$o help$o main$o mygetopt$o util$o linker$o \
-	c_init$o c_file$o c_none$o c_screen$o \
-	s_object$o s_djgpp2$o s_vcsa$o s_win32$o
-
-# pure C sources
-OBJECTS3 =
-
-OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
-
-
-# /***********************************************************************
-# // compiler settings
-# ************************************************************************/
-
-# default to a gcc unix-type compiler
-CC = gcc
-CXX = $(CC)
-DEFS =
-INCLUDES = -I$(srcdir)
-CFLAGS_OUTPUT = -o $@
-CXXFLAGS_OUTPUT = $(CFLAGS_OUTPUT)
-
-LINK_EXE = $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^ $(LDLIBS)
-STUBEDIT_EXE =
-
-o = .o
-a = .a
-e = .exe
-
-
-###
-### gcc defaults
-###
-
-##CFLAGS_O  = -Os
-CFLAGS_O  = -O2
-##CFLAGS_WERROR = -Werror
-CFLAGS_W  = $(CFLAGS_WERROR)
-CFLAGS_W += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wwrite-strings
-##CFLAGS_M  = -fno-builtin
-## CFLAGS_M += -malign-functions=0 -malign-jumps=0 -malign-loops=0
-
-CFLAGS    = $(CFLAGS_W) $(CFLAGS_O) $(CFLAGS_M)
-CXXFLAGS  = $(CFLAGS) -Wsynth -fconserve-space
-CXXFLAGS1 = $(CXXFLAGS)
-CXXFLAGS2 = $(CXXFLAGS) -fno-exceptions -fno-rtti
-
+ifeq ($(CXX),)
+CXX = g++
+endif
+ifeq ($(firstword $(CXX)),g++)
+USE_GNUC ?= 1
+endif
+ifeq ($(USE_GNUC),1)
+CXXFLAGS += -MMD
 ifeq ($(DEBUG),1)
-DEFS += -DDEBUG
-## DEFS += -DTESTING
-endif
-
-ifeq ($(DEBUG),1)
-LDFLAGS = -g
+CXXFLAGS += -O0 -g
 else
-LDFLAGS = -s
+CXXFLAGS += -O2
 endif
-LDFLAGS += -Wl,-Map,$T.map
-LDLIBS =
-LDLIBS = -lz
-LIBDIRS =
-DOS_LIBDIRS =
-
-
-###
-### compression library
-###
-
-UCLDIR:=$(strip $(subst \,/,$(UCLDIR)))
-NRVDIR:=$(strip $(subst \,/,$(NRVDIR)))
-u = ucl
-U = UCL
-upx_exe = upx$e
-include $(srcdir)/Makefile.inc
-ifneq ($(strip $(wildcard $(NRVDIR)/include/nrv)),)
-  u = nrv
-  U = NRV
-  upx_exe = upx_$u$e
-  include $(srcdir)/Makefile.inc
+CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
+##CXXFLAGS += -Wshadow
 endif
+CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+CXXLD ?= $(CXX)

-tmp := -Wl,--rpath,
-LDRPATH := $(addprefix $(tmp),$(LIBDIRS))
-LIBDIRS += .
-LDLIBDIRS := $(addprefix -L,$(LIBDIRS))
+exeext ?= .out
+libext ?= .a
+objext ?= .o

-##LDFLAGS += $(LDRPATH)
-LDFLAGS += $(LDLIBDIRS)
+upx_SOURCES := $(wildcard $(srcdir)/*.cpp)
+upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))

-
-###
-### linux/i386
-###
-
-ifeq ($(target),linux)
-e =
-###CC = /usr/local/packages/gcc-cvs/bin/g++
-DEFS += '-DUPX_CONFIG_H="config_h/linux.h"'
-##CFLAGS_M += -mno-schedule-prologue
-CFLAGS_M += -march=i386 -mcpu=pentium
-CFLAGS_WERROR = -Werror
-LDLIBS += -lmcheck
-
-ifeq (1,2) 	# checkergcc
-  CC = checkergcc
-  CXX = checkerg++
-else
-ifeq ($(DEBUG),1)
-  ##CFLAGS += -O0 -gstabs+3
-  CFLAGS += -O0 -gdwarf-2
-else
-  ##LDFLAGS += -static
-  STUBEDIT_EXE = objcopy -S -R .comment -R .note $@ && perl $(srcdir)/stub/scripts/brandelf.pl $@ && chmod 755 $@
+# we need UCL and zlib - you can set envvar UPX_UCLDIR
+ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
+INCLUDES += -I$(UPX_UCLDIR)/include
+LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
 endif
-endif
-
-endif	# linux
-
-
-###
-### djgpp2
-###
-
-ifeq ($(target),djgpp2)
-CFLAGS_M += -mno-schedule-prologue
-CFLAGS_M += -march=i386 -mcpu=pentium
-CFLAGS_WERROR = -Werror
-STUBEDIT_EXE = stubedit $@ bufsize=0xfc00
-endif	# djgpp2
-
-
-###
-### cygwin / mingw32
-###
-
-ifeq ($(target),cygwin)
-CFLAGS_M += -mno-schedule-prologue
-CFLAGS_M += -march=i386 -mcpu=pentium
-CFLAGS_WERROR = -Werror
-endif
-
-ifeq ($(target),mingw32)
-CFLAGS_M += -mno-schedule-prologue
-CFLAGS_M += -march=i386 -mcpu=pentium
-endif
-
-# mingw32 as included in cygwin
-ifeq ($(target),no-cygwin)
-CC = gcc -mno-cygwin
-CFLAGS_M += -mno-schedule-prologue
-CFLAGS_M += -march=i386 -mcpu=pentium
-CFLAGS_WERROR = -Werror
+LIBS += -lucl -lz
+# you should set envvar UPX_LZMADIR to point to your unpacked lzma443.tar.bz2
+ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
+DEFS += -DWITH_LZMA
+INCLUDES += -I$(UPX_LZMADIR)
 endif


-###
-### Microsoft 32-bit C/C++ Compiler 12.00 (aka Visual C++ 6)
-###
+all: upx$(exeext)
+.DELETE_ON_ERROR: upx$(exeext) $(upx_OBJECTS)

-ifeq ($(target),vc6)
-o = .obj
-a = .lib
-CC = cl -nologo
-CFLAGS = -W4 -WX
-CXXFLAGS1 = $(CFLAGS) -GR -GX -EHa
-CXXFLAGS2 = $(CFLAGS)
-LDFLAGS =
-LINK_LDFLAGS = /link /map:$T.map
+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)

-ifneq ($(strip $(DOS_LIBDIRS)),)
-LIB := $(DOS_LIBDIRS);$(LIB)
-endif
-export LIB
-
-ifeq (1,2)
-  # statically link libc.lib
-  CC += -ML
-  ##LDLIBS = $(u)_s.lib zlib_s.lib setargv.obj
-  LDLIBS = $(u)_s.lib setargv.obj
-else
-  # link against msvcrt.dll
-  CC += -MD
-  LDLIBS = $(DOS_LDLIBS) zlib.lib setargv.obj
-endif
-ifeq ($(DEBUG),1)
-  CFLAGS += -Od -ZI
-  LINK_LDFLAGS += /debug
-else
-  CFLAGS += -O2 -GF
-  LINK_LDFLAGS += /release
-endif
-
-##LINK_LDFLAGS += /verbose
-LINK_EXE = $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -Fe$@ $^ $(LDLIBS) $(LINK_LDFLAGS)
-
-endif	# vc6
+%.o : %.cpp
+	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)


-###
-### sparc
-###
-
-ifeq ($(target),sparc)
-e =
-DEFS += '-DUPX_CONFIG_H="config_h/sparc.h"'
-INCLUDES += -I/home/ethmola/local/include
-
-ifeq (1,2) # native compiler
-  CFLAGS = -O0 -g
-  CXXFLAGS1 =
-  CXXFLAGS2 =
-  CFLAGS_M =
-  DEFS += -DUSE_STDNAMESPACE
-else # gcc
-  CFLAGS += -O0 -gstabs+
-endif
-
-ifeq (1,2) # purify
-  DEFS += -D__PURIFY__
-  LDFLAGS = -g -L/home/ethmola/local/lib
-  LINK_EXE = purify $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^ $(LDLIBS)
-else
-  LDFLAGS += -g -L/home/ethmola/local/lib
-  LINK_EXE = $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^ $(LDLIBS)
-endif
-
-endif	# sparc
-
-
-###
-### Borland C++ 5.5 (DOES NOT WORK - INCOMPLETE C++ IMPLEMENTATION)
-###
-
-ifeq ($(target),bcc)
-o = .obj
-a = .lib
-CC = bcc32
-CFLAGS = -w -w-par
-CXXFLAGS1 = $(CFLAGS)
-CXXFLAGS2 = $(CFLAGS)
-CFLAGS_OUTPUT = -o$@
-LDFLAGS =
-LDLIBS = $(DOS_LDLIBS) zlib.lib
-
-ifneq ($(strip $(DOS_LIBDIRS)),)
-LIB := $(DOS_LIBDIRS);$(LIB)
-endif
-export LIB
-
-ifeq ($(DEBUG),1)
-  CFLAGS += -Od -d
-else
-  CFLAGS += -O2 -d
-endif
-
-LINK_EXE = $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) -e$@ $^ $(LDLIBS)
-
-endif	# bcc
-
-
-###
-### malloc debuggers (Linux only)
-###
-
-ifeq (1,2)
-  LDLIBS += -lefence
-endif
-
-ifeq (1,2)
-  CFLAGS += -DWITH_DMALLOC
-  LDLIBS += -ldmalloc
-endif
-
-ifeq (1,2)
-  CFLAGS += -DWITH_GC -DLINUX_THREADS -D_REENTRANT
-  LDLIBS += -lgc -lpthread
-  # only needed when using -static:
-  ##LDFLAGS += -Wl,-defsym,_DYNAMIC=0
-endif
-
-ifeq (1,2)
-  CFLAGS += -DWITH_MSS
-  LDLIBS += -lmss
+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
+compress_lzma$(objext) : CXXFLAGS += -Wno-unused
+##compress_lzma$(objext) : CXXFLAGS += -Wno-error
 endif


-# /***********************************************************************
-# // main targets
-# ************************************************************************/
+mostlyclean clean distclean maintainer-clean:
+	rm -f *.d *.map *.o *.obj *.res upx.exe upx.out upx.ttp upx$(exeext)

-all: $(upx_exe)
-
-.PHONY: all unupx mostlyclean clean distclean maintainer-clean untabify tags
-
-$(upx_exe): $(OBJECTS) $(LIBS)
-	$(LINK_EXE)
-	$(STUBEDIT_EXE)
-
-
-ifeq ($(target),djgpp2)
-cwsbind: $(upx_exe)
-	-rm -f $T.cof
-	$(upx_exe) -1 --coff -o $T.cof $(upx_exe)
-	cat $(DJDIR)/bin/cwsdstub.exe $T.cof > $(upx_exe)
-	$(upx_exe) -d $(upx_exe)
-	$(upx_exe) --best $(upx_exe)
-endif
-
-
-unupx:
-	$(MAKE) target=vc6 unupx.dll
-
-unupx.dll: $(OBJECTS) $(LIBS)
-	$(LINK_DLL)
-
-
-mostlyclean:
-	-rm -f *.d *.err *.i *.log *.map *~ gdb-trans*
-
-clean: mostlyclean
-	-rm -f *.a *.lib *.o *.obj tags TAGS ID
-	-rm -f *.idb *.pdb
-	-rm -f upx upx.exe upx_nrv upx_nrv.exe upx_ucl upx_ucl.exe
-
-distclean: clean
-
-maintainer-clean: distclean
-
-
-untabify:
-	mfxtu -d4 -t *.h *.cpp *.ch
-	mfxtu -d8 -t stub/[ln]*.asm stub/*.ash stub/*.[cs]
-
-tags TAGS:
-	ctags *.h *.cpp *.ch
-
-ID:
-	mkid *.h *.cpp *.ch
-
-
-# /***********************************************************************
-# // rules
-# ************************************************************************/
-
-.c$o:
-	$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CFLAGS_OUTPUT) -c $<
-
-.cpp$o:
-	$(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS1) $(CXXFLAGS_OUTPUT) -c $<
-
-$(OBJECTS1): %$o : %.cpp
-	$(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS1) $(CXXFLAGS_OUTPUT) -c $<
-
-$(OBJECTS2): %$o : %.cpp
-	$(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS2) $(CXXFLAGS_OUTPUT) -c $<
-
-ifneq ($(strip $(OBJECTS3)),)
-$(OBJECTS3): %$o : %.c
-	$(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CFLAGS_OUTPUT) -c $<
-endif
-
-
-# /***********************************************************************
-# // dependencies
-# ************************************************************************/
-
-# FIXME: use automated dependencies
-
-main$o:     mygetopt.h version.h
-filter$o:   filter.h
-filteri$o:  filter.h fcto_ml.ch fcto_ml2.ch fcto_ml3.ch
-help$o:     version.h
-msg$o:      ui.h
-lefile$o:   lefile.h
-linker$o:   linker.h
-mygetopt$o: mygetopt.h
-packer$o:   packer.h filter.h linker.h ui.h version.h
-packhead$o: packer.h
-packmast$o: packmast.h packer.h lefile.h \
-		p_com.h p_djgpp2.h p_exe.h p_lx_elf.h p_lx_sep.h p_lx_sh.h \
-		p_sys.h p_tmt.h p_tos.h \
-		p_unix.h p_vmlinz.h p_vxd.h p_w32pe.h p_wcle.h
-ui$o:       packer.h ui.h
-work$o:     packer.h ui.h packmast.h
-
-p_com$o:    packer.h p_com.h \
-		stub/l_com.h
-p_djgpp2$o: packer.h p_djgpp2.h stub/stubify.h \
-		stub/l_djgpp2.h
-p_exe$o:    packer.h p_exe.h \
-		stub/l_exe.h
-p_lx_elf$o: packer.h p_lx_elf.h p_unix.h p_elf.h \
-		stub/l_le_n2b.h stub/l_le_n2d.h
-p_lx_sep$o: packer.h p_lx_sep.h p_lx_elf.h p_unix.h p_elf.h
-p_lx_sh$o:  packer.h p_lx_sh.h p_lx_elf.h p_unix.h p_elf.h \
-		stub/l_sh_n2b.h stub/l_sh_n2d.h
-p_sys$o:    packer.h p_sys.h p_com.h \
-		stub/l_sys.h
-p_tmt$o:    packer.h p_tmt.h \
-		stub/l_tmt.h
-p_tos$o:    packer.h p_tos.h \
-		stub/l_t_n2b.h stub/l_t_n2bs.h \
-		stub/l_t_n2d.h stub/l_t_n2ds.h
-p_unix$o:   packer.h p_unix.h p_elf.h \
-		stub/l_lx_n2b.h stub/l_lx_n2d.h
-p_vmlinz$o: packer.h p_vmlinz.h \
-		stub/l_vmlinz.h
-p_w32pe$o:  packer.h p_w32pe.h \
-		stub/l_w32pe.h
-p_wcle$o:   packer.h p_wcle.h lefile.h \
-		stub/l_wcle.h
-
-# vi:nowrap
+-include *.d
+.PHONY: all mostlyclean clean distclean maintainer-clean
@@ -1,37 +0,0 @@
-UDIR := $($(U)DIR)
-
-DEFS += -DWITH_$(U)
-
-ifneq ($(strip $(wildcard $(UDIR)/include)),)
-INCLUDES += -I$(UDIR)/include
-endif
-
-ifneq ($(strip $(wildcard $(UDIR)/src/.libs)),)
-LIBDIRS += $(UDIR)/src/.libs
-endif
-ifeq ($(DEBUG),1)
-ifneq ($(strip $(wildcard $(UDIR)/build/debug/src/.libs)),)
-LIBDIRS += $(UDIR)/build/debug/src/.libs
-endif
-endif
-ifneq ($(strip $(wildcard $(UDIR)/build/release/src/.libs)),)
-LIBDIRS += $(UDIR)/build/release/src/.libs
-endif
-ifneq ($(strip $(wildcard $(UDIR)/build/src/.libs)),)
-LIBDIRS += $(UDIR)/build/src/.libs
-endif
-ifneq ($(strip $(wildcard $(UDIR))),)
-LIBDIRS += $(UDIR)
-DOS_LIBDIRS := $(DOS_LIBDIRS);$(UDIR)
-endif
-
-LDLIBS += -l$(u)
-DOS_LDLIBS += $(u).lib
-
-
-DEFS := $(DEFS)
-INCLUDES := $(INCLUDES)
-LIBDIRS := $(LIBDIRS)
-LDLIBS := $(LDLIBS)
-DOS_LDLIBS := $(DOS_LDLIBS)
-
@@ -1,9 +1,9 @@
-/* bele.h --
+/* bele.h -- access memory in BigEndian and LittleEndian byte order

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -31,215 +31,442 @@


 /*************************************************************************
-// access memory in BigEndian and LittleEndian byte order
+// core
 **************************************************************************/

-inline unsigned short get_be16(const void *bb, int off=0)
+inline unsigned get_be16(const void *p)
 {
-    const upx_bytep const b = reinterpret_cast<const upx_bytep>(bb) + off;
-    unsigned v;
-    v  = (unsigned) b[1] <<  0;
-    v |= (unsigned) b[0] <<  8;
-    return (unsigned short) v;
-}
-
-inline void set_be16(void *bb, unsigned v, int off=0)
-{
-    upx_bytep const b = reinterpret_cast<upx_bytep>(bb) + off;
-    b[1] = (unsigned char) (v >>  0);
-    b[0] = (unsigned char) (v >>  8);
-}
-
-
-inline unsigned get_be32(const void *bb, int off=0)
-{
-    const upx_bytep const b = reinterpret_cast<const upx_bytep>(bb) + off;
-    unsigned v;
-    v  = (unsigned) b[3] <<  0;
-    v |= (unsigned) b[2] <<  8;
-    v |= (unsigned) b[1] << 16;
-    v |= (unsigned) b[0] << 24;
-    return v;
-}
-
-inline void set_be32(void *bb, unsigned v, int off=0)
-{
-    upx_bytep const b = reinterpret_cast<upx_bytep>(bb) + off;
-    b[3] = (unsigned char) (v >>  0);
-    b[2] = (unsigned char) (v >>  8);
-    b[1] = (unsigned char) (v >> 16);
-    b[0] = (unsigned char) (v >> 24);
-}
-
-
-inline unsigned short get_le16(const void *bb, int off=0)
-{
-    const upx_bytep const b = reinterpret_cast<const upx_bytep>(bb) + off;
-    unsigned v;
-#if defined(__i386__)
-    v = * (const unsigned short *) b;
+#if defined(ACC_UA_GET_BE16)
+    return ACC_UA_GET_BE16(p);
 #else
-    v  = (unsigned) b[0] <<  0;
-    v |= (unsigned) b[1] <<  8;
-#endif
-    return (unsigned short) v;
-}
-
-inline void set_le16(void *bb, unsigned v, int off=0)
-{
-    upx_bytep const b = reinterpret_cast<upx_bytep>(bb) + off;
-#if defined(__i386__)
-    (* (unsigned short *) b) = (unsigned short) v;
-#else
-    b[0] = (unsigned char) (v >>  0);
-    b[1] = (unsigned char) (v >>  8);
+    return acc_ua_get_be16(p);
 #endif
 }

-
-inline unsigned get_le24(const void *bb, int off=0)
+inline void set_be16(void *p, unsigned v)
 {
-    const upx_bytep const b = reinterpret_cast<const upx_bytep>(bb) + off;
-    unsigned v;
-    v  = (unsigned) b[0] <<  0;
-    v |= (unsigned) b[1] <<  8;
-    v |= (unsigned) b[2] << 16;
-    return v;
-}
-
-inline void set_le24(void *bb, unsigned v, int off=0)
-{
-    upx_bytep const b = reinterpret_cast<upx_bytep>(bb) + off;
-    b[0] = (unsigned char) (v >>  0);
-    b[1] = (unsigned char) (v >>  8);
-    b[2] = (unsigned char) (v >> 16);
-}
-
-
-inline unsigned get_le32(const void *bb, int off=0)
-{
-    const upx_bytep const b = reinterpret_cast<const upx_bytep>(bb) + off;
-    unsigned v;
-#if defined(__i386__)
-    v = * (const unsigned *) b;
+#if defined(ACC_UA_SET_BE16)
+    ACC_UA_SET_BE16(p, v);
 #else
-    v  = (unsigned) b[0] <<  0;
-    v |= (unsigned) b[1] <<  8;
-    v |= (unsigned) b[2] << 16;
-    v |= (unsigned) b[3] << 24;
+    acc_ua_set_be16(p, v);
 #endif
-    return v;
 }

-inline void set_le32(void *bb, unsigned v, int off=0)
+inline unsigned get_be24(const void *p)
 {
-    upx_bytep const b = reinterpret_cast<upx_bytep>(bb) + off;
-#if defined(__i386__)
-    (* (unsigned *) b) = v;
+#if defined(ACC_UA_GET_BE24)
+    return ACC_UA_GET_BE24(p);
 #else
-    b[0] = (unsigned char) (v >>  0);
-    b[1] = (unsigned char) (v >>  8);
-    b[2] = (unsigned char) (v >> 16);
-    b[3] = (unsigned char) (v >> 24);
+    return acc_ua_get_be24(p);
+#endif
+}
+
+inline void set_be24(void *p, unsigned v)
+{
+#if defined(ACC_UA_SET_BE24)
+    ACC_UA_SET_BE24(p, v);
+#else
+    acc_ua_set_be24(p, v);
+#endif
+}
+
+inline unsigned get_be32(const void *p)
+{
+#if defined(ACC_UA_GET_BE32)
+    return ACC_UA_GET_BE32(p);
+#else
+    return acc_ua_get_be32(p);
+#endif
+}
+
+inline void set_be32(void *p, unsigned v)
+{
+#if defined(ACC_UA_SET_BE32)
+    ACC_UA_SET_BE32(p, v);
+#else
+    acc_ua_set_be32(p, v);
+#endif
+}
+
+inline acc_uint64l_t get_be64(const void *p)
+{
+#if defined(ACC_UA_GET_BE64)
+    return ACC_UA_GET_BE64(p);
+#else
+    return acc_ua_get_be64(p);
+#endif
+}
+
+inline void set_be64(void *p, acc_uint64l_t v)
+{
+#if defined(ACC_UA_SET_BE64)
+    ACC_UA_SET_BE64(p, v);
+#else
+    acc_ua_set_be64(p, v);
+#endif
+}
+
+inline unsigned get_le16(const void *p)
+{
+#if defined(ACC_UA_GET_LE16)
+    return ACC_UA_GET_LE16(p);
+#else
+    return acc_ua_get_le16(p);
+#endif
+}
+
+inline void set_le16(void *p, unsigned v)
+{
+#if defined(ACC_UA_SET_LE16)
+    ACC_UA_SET_LE16(p, v);
+#else
+    acc_ua_set_le16(p, v);
+#endif
+}
+
+inline unsigned get_le24(const void *p)
+{
+#if defined(ACC_UA_GET_LE24)
+    return ACC_UA_GET_LE24(p);
+#else
+    return acc_ua_get_le24(p);
+#endif
+}
+
+inline void set_le24(void *p, unsigned v)
+{
+#if defined(ACC_UA_SET_LE24)
+    ACC_UA_SET_LE24(p, v);
+#else
+    acc_ua_set_le24(p, v);
+#endif
+}
+
+inline unsigned get_le32(const void *p)
+{
+#if defined(ACC_UA_GET_LE32)
+    return ACC_UA_GET_LE32(p);
+#else
+    return acc_ua_get_le32(p);
+#endif
+}
+
+inline void set_le32(void *p, unsigned v)
+{
+#if defined(ACC_UA_SET_LE32)
+    ACC_UA_SET_LE32(p, v);
+#else
+    acc_ua_set_le32(p, v);
+#endif
+}
+
+inline acc_uint64l_t get_le64(const void *p)
+{
+#if defined(ACC_UA_GET_LE64)
+    return ACC_UA_GET_LE64(p);
+#else
+    return acc_ua_get_le64(p);
+#endif
+}
+
+inline void set_le64(void *p, acc_uint64l_t v)
+{
+#if defined(ACC_UA_SET_LE64)
+    ACC_UA_SET_LE64(p, v);
+#else
+    acc_ua_set_le64(p, v);
 #endif
 }


 /*************************************************************************
-// classes for portable unaligned access
+// get signed values, i.e. sign-extend
 **************************************************************************/

-class BE16
+inline int sign_extend(int v, int bits)
+{
+    const unsigned sign_bit = 1u << (bits - 1);
+    v |= 0u - (v & sign_bit);
+    return v;
+}
+
+inline acc_int64l_t sign_extend(acc_int64l_t v, int bits)
+{
+    const acc_uint64l_t sign_bit = ACC_UINT64_C(1) << (bits - 1);
+    v |= ACC_UINT64_C(0) - (v & sign_bit);
+    return v;
+}
+
+inline int get_be16_signed(const void *p)
+{
+    int v = get_be16(p);
+    return sign_extend(v, 16);
+}
+
+inline int get_be24_signed(const void *p)
+{
+    int v = get_be24(p);
+    return sign_extend(v, 24);
+}
+
+inline int get_be32_signed(const void *p)
+{
+    int v = get_be32(p);
+    return sign_extend(v, 32);
+}
+
+inline acc_int64l_t get_be64_signed(const void *p)
+{
+    acc_int64l_t v = get_be64(p);
+    return sign_extend(v, 64);
+}
+
+inline int get_le16_signed(const void *p)
+{
+    int v = get_le16(p);
+    return sign_extend(v, 16);
+}
+
+inline int get_le24_signed(const void *p)
+{
+    int v = get_le24(p);
+    return sign_extend(v, 24);
+}
+
+inline int get_le32_signed(const void *p)
+{
+    int v = get_le32(p);
+    return sign_extend(v, 32);
+}
+
+inline acc_int64l_t get_le64_signed(const void *p)
+{
+    acc_int64l_t v = get_le64(p);
+    return sign_extend(v, 64);
+}
+
+
+/*************************************************************************
+// swab (bswap)
+**************************************************************************/
+
+inline unsigned acc_swab16(unsigned v)
+{
+    return ((v & 0x00ff) << 8) |
+           ((v & 0xff00) >> 8);
+}
+
+inline unsigned acc_swab32(unsigned v)
+{
+    return ((v & 0x000000ff) << 24) |
+           ((v & 0x0000ff00) <<  8) |
+           ((v & 0x00ff0000) >>  8) |
+           ((v & 0xff000000) >> 24);
+}
+
+
+inline unsigned acc_swab16p(const acc_uint16e_t *p)
+{
+    return acc_swab16(*p);
+}
+
+inline unsigned acc_swap32p(const acc_uint32e_t *p)
+{
+    return acc_swab32(*p);
+}
+
+
+inline void acc_swab16s(acc_uint16e_t *p)
+{
+    *p = acc_swab16(*p);
+}
+
+inline void acc_swab32s(acc_uint32e_t *p)
+{
+    *p = acc_swab32(*p);
+}
+
+
+inline void acc_ua_swab16s(void *p)
+{
+    set_be16(p, get_le16(p));
+}
+
+inline void acc_ua_swab32s(void *p)
+{
+    set_be32(p, get_le32(p));
+}
+
+
+/*************************************************************************
+// classes for portable unaligned access
+//
+// Important: these classes must be PODs (Plain Old Data), i.e. no
+//   constructor, no destructor, no virtual functions and no default
+//   assignment operator, and all fields must be public(!).
+**************************************************************************/
+
+struct BE16
 {
    unsigned char d[2];

-public:
-    BE16& operator =  (const BE16 &v) { memcpy(d, v.d, sizeof(d)); return *this; }
+    BE16& operator =  (unsigned v) { set_be16(d, v); return *this; }
+    BE16& operator += (unsigned v) { set_be16(d, get_be16(d) + v); return *this; }
+    BE16& operator -= (unsigned v) { set_be16(d, get_be16(d) - v); return *this; }
+    BE16& operator *= (unsigned v) { set_be16(d, get_be16(d) * v); return *this; }
+    BE16& operator /= (unsigned v) { set_be16(d, get_be16(d) / v); return *this; }
+    BE16& operator &= (unsigned v) { set_be16(d, get_be16(d) & v); return *this; }
+    BE16& operator |= (unsigned v) { set_be16(d, get_be16(d) | v); return *this; }
+    BE16& operator ^= (unsigned v) { set_be16(d, get_be16(d) ^ v); return *this; }
+    BE16& operator <<= (unsigned v) { set_be16(d, get_be16(d) << v); return *this; }
+    BE16& operator >>= (unsigned v) { set_be16(d, get_be16(d) >> v); return *this; }

-    BE16& operator =  (unsigned v)    { set_be16(d, v); return *this; }
-    BE16& operator += (unsigned v)    { set_be16(d, get_be16(d) + v); return *this; }
-    BE16& operator -= (unsigned v)    { set_be16(d, get_be16(d) - v); return *this; }
-    BE16& operator &= (unsigned v)    { set_be16(d, get_be16(d) & v); return *this; }
-    BE16& operator |= (unsigned v)    { set_be16(d, get_be16(d) | v); return *this; }
-
-    operator const unsigned () const  { return get_be16(d); }
-};
+    operator unsigned () const  { return get_be16(d); }
+}
+__attribute_packed;


-class BE32
+struct BE32
 {
    unsigned char d[4];

-public:
-    BE32& operator =  (const BE32 &v) { memcpy(d, v.d, sizeof(d)); return *this; }
+    BE32& operator =  (unsigned v) { set_be32(d, v); return *this; }
+    BE32& operator += (unsigned v) { set_be32(d, get_be32(d) + v); return *this; }
+    BE32& operator -= (unsigned v) { set_be32(d, get_be32(d) - v); return *this; }
+    BE32& operator *= (unsigned v) { set_be32(d, get_be32(d) * v); return *this; }
+    BE32& operator /= (unsigned v) { set_be32(d, get_be32(d) / v); return *this; }
+    BE32& operator &= (unsigned v) { set_be32(d, get_be32(d) & v); return *this; }
+    BE32& operator |= (unsigned v) { set_be32(d, get_be32(d) | v); return *this; }
+    BE32& operator ^= (unsigned v) { set_be32(d, get_be32(d) ^ v); return *this; }
+    BE32& operator <<= (unsigned v) { set_be32(d, get_be32(d) << v); return *this; }
+    BE32& operator >>= (unsigned v) { set_be32(d, get_be32(d) >> v); return *this; }

-    BE32& operator =  (unsigned v)    { set_be32(d, v); return *this; }
-    BE32& operator += (unsigned v)    { set_be32(d, get_be32(d) + v); return *this; }
-    BE32& operator -= (unsigned v)    { set_be32(d, get_be32(d) - v); return *this; }
-    BE32& operator &= (unsigned v)    { set_be32(d, get_be32(d) & v); return *this; }
-    BE32& operator |= (unsigned v)    { set_be32(d, get_be32(d) | v); return *this; }
-
-    operator const unsigned () const  { return get_be32(d); }
-};
+    operator unsigned () const  { return get_be32(d); }
+}
+__attribute_packed;


-class LE16
+struct BE64
+{
+    unsigned char d[8];
+
+    BE64& operator =  (acc_uint64l_t v) { set_be64(d, v); return *this; }
+    BE64& operator += (acc_uint64l_t v) { set_be64(d, get_be64(d) + v); return *this; }
+    BE64& operator -= (acc_uint64l_t v) { set_be64(d, get_be64(d) - v); return *this; }
+    BE64& operator *= (acc_uint64l_t v) { set_be64(d, get_be64(d) * v); return *this; }
+    BE64& operator /= (acc_uint64l_t v) { set_be64(d, get_be64(d) / v); return *this; }
+    BE64& operator &= (acc_uint64l_t v) { set_be64(d, get_be64(d) & v); return *this; }
+    BE64& operator |= (acc_uint64l_t v) { set_be64(d, get_be64(d) | v); return *this; }
+    BE64& operator ^= (acc_uint64l_t v) { set_be64(d, get_be64(d) ^ v); return *this; }
+    BE64& operator <<= (unsigned v) { set_be64(d, get_be64(d) << v); return *this; }
+    BE64& operator >>= (unsigned v) { set_be64(d, get_be64(d) >> v); return *this; }
+
+    operator acc_uint64l_t () const  { return get_be64(d); }
+}
+__attribute_packed;
+
+
+struct LE16
 {
    unsigned char d[2];

-public:
-    LE16& operator =  (const LE16 &v) { memcpy(d, v.d, sizeof(d)); return *this; }
+    LE16& operator =  (unsigned v) { set_le16(d, v); return *this; }
+    LE16& operator += (unsigned v) { set_le16(d, get_le16(d) + v); return *this; }
+    LE16& operator -= (unsigned v) { set_le16(d, get_le16(d) - v); return *this; }
+    LE16& operator *= (unsigned v) { set_le16(d, get_le16(d) * v); return *this; }
+    LE16& operator /= (unsigned v) { set_le16(d, get_le16(d) / v); return *this; }
+    LE16& operator &= (unsigned v) { set_le16(d, get_le16(d) & v); return *this; }
+    LE16& operator |= (unsigned v) { set_le16(d, get_le16(d) | v); return *this; }
+    LE16& operator ^= (unsigned v) { set_le16(d, get_le16(d) ^ v); return *this; }
+    LE16& operator <<= (unsigned v) { set_le16(d, get_le16(d) << v); return *this; }
+    LE16& operator >>= (unsigned v) { set_le16(d, get_le16(d) >> v); return *this; }

-    LE16& operator =  (unsigned v)    { set_le16(d, v); return *this; }
-    LE16& operator += (unsigned v)    { set_le16(d, get_le16(d) + v); return *this; }
-    LE16& operator -= (unsigned v)    { set_le16(d, get_le16(d) - v); return *this; }
-    LE16& operator &= (unsigned v)    { set_le16(d, get_le16(d) & v); return *this; }
-    LE16& operator |= (unsigned v)    { set_le16(d, get_le16(d) | v); return *this; }
-
-    operator const unsigned () const  { return get_le16(d); }
-};
+    operator unsigned () const  { return get_le16(d); }
+}
+__attribute_packed;


-class LE32
+struct LE32
 {
    unsigned char d[4];

-public:
-    LE32& operator =  (const LE32 &v) { memcpy(d, v.d, sizeof(d)); return *this; }
+    LE32& operator =  (unsigned v) { set_le32(d, v); return *this; }
+    LE32& operator += (unsigned v) { set_le32(d, get_le32(d) + v); return *this; }
+    LE32& operator -= (unsigned v) { set_le32(d, get_le32(d) - v); return *this; }
+    LE32& operator *= (unsigned v) { set_le32(d, get_le32(d) * v); return *this; }
+    LE32& operator /= (unsigned v) { set_le32(d, get_le32(d) / v); return *this; }
+    LE32& operator &= (unsigned v) { set_le32(d, get_le32(d) & v); return *this; }
+    LE32& operator |= (unsigned v) { set_le32(d, get_le32(d) | v); return *this; }
+    LE32& operator ^= (unsigned v) { set_le32(d, get_le32(d) ^ v); return *this; }
+    LE32& operator <<= (unsigned v) { set_le32(d, get_le32(d) << v); return *this; }
+    LE32& operator >>= (unsigned v) { set_le32(d, get_le32(d) >> v); return *this; }

-    LE32& operator =  (unsigned v)    { set_le32(d, v); return *this; }
-    LE32& operator += (unsigned v)    { set_le32(d, get_le32(d) + v); return *this; }
-    LE32& operator -= (unsigned v)    { set_le32(d, get_le32(d) - v); return *this; }
-    LE32& operator &= (unsigned v)    { set_le32(d, get_le32(d) & v); return *this; }
-    LE32& operator |= (unsigned v)    { set_le32(d, get_le32(d) | v); return *this; }
+    operator unsigned () const  { return get_le32(d); }
+}
+__attribute_packed;

-    operator const unsigned () const  { return get_le32(d); }
-};
+
+struct LE64
+{
+    unsigned char d[8];
+
+    LE64& operator =  (acc_uint64l_t v) { set_le64(d, v); return *this; }
+    LE64& operator += (acc_uint64l_t v) { set_le64(d, get_le64(d) + v); return *this; }
+    LE64& operator -= (acc_uint64l_t v) { set_le64(d, get_le64(d) - v); return *this; }
+    LE64& operator *= (acc_uint64l_t v) { set_le64(d, get_le64(d) * v); return *this; }
+    LE64& operator /= (acc_uint64l_t v) { set_le64(d, get_le64(d) / v); return *this; }
+    LE64& operator &= (acc_uint64l_t v) { set_le64(d, get_le64(d) & v); return *this; }
+    LE64& operator |= (acc_uint64l_t v) { set_le64(d, get_le64(d) | v); return *this; }
+    LE64& operator ^= (acc_uint64l_t v) { set_le64(d, get_le64(d) ^ v); return *this; }
+    LE64& operator <<= (unsigned v) { set_le64(d, get_le64(d) << v); return *this; }
+    LE64& operator >>= (unsigned v) { set_le64(d, get_le64(d) >> v); return *this; }
+
+    operator acc_uint64l_t () const  { return get_le64(d); }
+}
+__attribute_packed;


 /*************************************************************************
 // global operators
 **************************************************************************/

-inline bool operator < (const BE16& v1, const BE16& v2)
-{
-    return (const unsigned)v1 < (const unsigned)v2;
-}
+template <class T>
+inline T* operator + (T* ptr, const BE16& v) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator + (const BE16& v, T* ptr) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator - (T* ptr, const BE16& v) { return ptr - (unsigned) v; }

-inline bool operator < (const BE32& v1, const BE32& v2)
-{
-    return (const unsigned)v1 < (const unsigned)v2;
-}
+template <class T>
+inline T* operator + (T* ptr, const BE32& v) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator + (const BE32& v, T* ptr) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator - (T* ptr, const BE32& v) { return ptr - (unsigned) v; }

-inline bool operator < (const LE16& v1, const LE16& v2)
-{
-    return (const unsigned)v1 < (const unsigned)v2;
-}
+// these are not implemented on purpose and will cause link-time errors
+template <class T> T* operator + (T* ptr, const BE64& v);
+template <class T> T* operator + (const BE64& v, T* ptr);
+template <class T> T* operator - (T* ptr, const BE64& v);

-inline bool operator < (const LE32& v1, const LE32& v2)
-{
-    return (const unsigned)v1 < (const unsigned)v2;
-}
+template <class T>
+inline T* operator + (T* ptr, const LE16& v) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator + (const LE16& v, T* ptr) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator - (T* ptr, const LE16& v) { return ptr - (unsigned) v; }
+
+template <class T>
+inline T* operator + (T* ptr, const LE32& v) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator + (const LE32& v, T* ptr) { return ptr + (unsigned) v; }
+template <class T>
+inline T* operator - (T* ptr, const LE32& v) { return ptr - (unsigned) v; }
+
+// these are not implemented on purpose and will cause link-time errors
+template <class T> T* operator + (T* ptr, const LE64& v);
+template <class T> T* operator + (const LE64& v, T* ptr);
+template <class T> T* operator - (T* ptr, const LE64& v);


 /*************************************************************************
@@ -247,10 +474,91 @@ inline bool operator < (const LE32& v1, const LE32& v2)
 **************************************************************************/

 // for use with qsort()
-int be16_compare(const void *e1, const void *e2);
-int be32_compare(const void *e1, const void *e2);
-int le16_compare(const void *e1, const void *e2);
-int le32_compare(const void *e1, const void *e2);
+int __acc_cdecl_qsort be16_compare(const void *, const void *);
+int __acc_cdecl_qsort be24_compare(const void *, const void *);
+int __acc_cdecl_qsort be32_compare(const void *, const void *);
+int __acc_cdecl_qsort be64_compare(const void *, const void *);
+int __acc_cdecl_qsort le16_compare(const void *, const void *);
+int __acc_cdecl_qsort le24_compare(const void *, const void *);
+int __acc_cdecl_qsort le32_compare(const void *, const void *);
+int __acc_cdecl_qsort le64_compare(const void *, const void *);
+int __acc_cdecl_qsort be16_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort be24_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort be32_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort be64_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort le16_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort le24_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort le32_compare_signed(const void *, const void *);
+int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
+
+
+// just for testing...
+#if !defined(ACC_CFG_NO_UNALIGNED)
+#if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_GNUC >= 0x030200)
+   typedef acc_uint16e_t LE16_unaligned __attribute__((__aligned__(1)));
+   typedef acc_uint32e_t LE32_unaligned __attribute__((__aligned__(1)));
+#  ifndef LE16
+#    define LE16    LE16_unaligned
+#  endif
+#  ifndef LE32
+#    define LE32    LE32_unaligned
+#  endif
+#endif
+#if 0 && (ACC_ARCH_I386) && (ACC_CC_INTELC)
+   typedef __declspec(align(1)) acc_uint16e_t LE16_unaligned;
+   typedef __declspec(align(1)) acc_uint32e_t LE32_unaligned;
+#  ifndef LE16
+#    define LE16    LE16_unaligned
+#  endif
+#  ifndef LE32
+#    define LE32    LE32_unaligned
+#  endif
+#endif
+#if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_MSC) && (_MSC_VER >= 1200)
+   typedef __declspec(align(1)) acc_uint16e_t LE16_unaligned;
+   typedef __declspec(align(1)) acc_uint32e_t LE32_unaligned;
+#  ifndef LE16
+#    define LE16    LE16_unaligned
+#  endif
+#  ifndef LE32
+#    define LE32    LE32_unaligned
+#  endif
+#  pragma warning(disable: 4244)        // Wx: conversion, possible loss of data
+#endif
+#endif
+
+
+/*************************************************************************
+// Provide namespaces and classes to abtract endianness policies.
+//
+// CTP - Compile-Time Polymorphism (templates)
+// RTP - Run-Time Polymorphism (virtual functions)
+**************************************************************************/
+
+// forward declarations
+namespace N_BELE_CTP {
+class BEPolicy; class LEPolicy;
+}
+namespace N_BELE_RTP {
+class AbstractPolicy;
+class BEPolicy; class LEPolicy;
+}
+
+namespace N_BELE_CTP {
+#define BELE_CTP 1
+#include "bele_policy.h"
+#undef BELE_CTP
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
+}
+
+namespace N_BELE_RTP {
+#define BELE_RTP 1
+#include "bele_policy.h"
+#undef BELE_RTP
+extern const BEPolicy be_policy;
+extern const LEPolicy le_policy;
+}


 #endif /* already included */
@@ -0,0 +1,285 @@
+/* bele_policy.h -- access memory in BigEndian and LittleEndian byte order
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_BELE_H
+#  error "this is an internal include file"
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if defined(BELE_CTP)
+   // CTP - Compile-Time Polymorphism (templates)
+#  define V     static inline
+#  define S     static int __acc_cdecl_qsort
+#  define C
+#elif defined(BELE_RTP)
+   // RTP - Run-Time Polymorphism (virtual functions)
+#  define V     virtual
+#  define S     virtual int
+#  define C     const
+#else
+#  error
+#endif
+
+
+#if defined(BELE_RTP)
+struct AbstractPolicy
+{
+    AbstractPolicy() {}
+    virtual inline ~AbstractPolicy() {}
+    V bool isBE() C = 0;
+    V bool isLE() C = 0;
+
+    V unsigned get16(const void *p) C = 0;
+    V unsigned get24(const void *p) C = 0;
+    V unsigned get32(const void *p) C = 0;
+    V acc_uint64l_t get64(const void *p) C = 0;
+
+    V void set16(void *p, unsigned v) C = 0;
+    V void set24(void *p, unsigned v) C = 0;
+    V void set32(void *p, unsigned v) C = 0;
+    V void set64(void *p, acc_uint64l_t v) C = 0;
+
+    V unsigned get16_signed(const void *p) C = 0;
+    V unsigned get24_signed(const void *p) C = 0;
+    V unsigned get32_signed(const void *p) C = 0;
+    V acc_uint64l_t get64_signed(const void *p) C = 0;
+
+    S u16_compare(const void *a, const void *b) C = 0;
+    S u24_compare(const void *a, const void *b) C = 0;
+    S u32_compare(const void *a, const void *b) C = 0;
+    S u64_compare(const void *a, const void *b) C = 0;
+
+    S u16_compare_signed(const void *a, const void *b) C = 0;
+    S u24_compare_signed(const void *a, const void *b) C = 0;
+    S u32_compare_signed(const void *a, const void *b) C = 0;
+    S u64_compare_signed(const void *a, const void *b) C = 0;
+
+    // disable dynamic allocation
+    DISABLE_NEW_DELETE
+};
+#endif
+
+
+struct BEPolicy
+#if defined(BELE_RTP)
+    : public AbstractPolicy
+#endif
+{
+    BEPolicy() {}
+#if defined(BELE_CTP)
+    typedef N_BELE_RTP::BEPolicy RTP_Policy;
+    enum { isBE = 1, isLE = 0 };
+#elif defined(BELE_RTP)
+    typedef N_BELE_CTP::BEPolicy CTP_Policy;
+    V bool isBE() C { return CTP_Policy::isBE; }
+    V bool isLE() C { return CTP_Policy::isLE; }
+#endif
+
+    typedef BE16 U16;
+    typedef BE32 U32;
+    typedef BE64 U64;
+
+    V unsigned get16(const void *p) C
+        { return get_be16(p); }
+    V unsigned get24(const void *p) C
+        { return get_be24(p); }
+    V unsigned get32(const void *p) C
+        { return get_be32(p); }
+    V acc_uint64l_t get64(const void *p) C
+        { return get_be64(p); }
+
+    V void set16(void *p, unsigned v) C
+        { set_be16(p, v); }
+    V void set24(void *p, unsigned v) C
+        { set_be24(p, v); }
+    V void set32(void *p, unsigned v) C
+        { set_be32(p, v); }
+    V void set64(void *p, acc_uint64l_t v) C
+        { set_be64(p, v); }
+
+    V unsigned get16_signed(const void *p) C
+        { return get_be16_signed(p); }
+    V unsigned get24_signed(const void *p) C
+        { return get_be24_signed(p); }
+    V unsigned get32_signed(const void *p) C
+        { return get_be32_signed(p); }
+    V acc_uint64l_t get64_signed(const void *p) C
+        { return get_be64_signed(p); }
+
+    S u16_compare(const void *a, const void *b) C
+        { return be16_compare(a, b); }
+    S u24_compare(const void *a, const void *b) C
+        { return be24_compare(a, b); }
+    S u32_compare(const void *a, const void *b) C
+        { return be32_compare(a, b); }
+    S u64_compare(const void *a, const void *b) C
+        { return be64_compare(a, b); }
+
+    S u16_compare_signed(const void *a, const void *b) C
+        { return be16_compare_signed(a, b); }
+    S u24_compare_signed(const void *a, const void *b) C
+        { return be24_compare_signed(a, b); }
+    S u32_compare_signed(const void *a, const void *b) C
+        { return be32_compare_signed(a, b); }
+    S u64_compare_signed(const void *a, const void *b) C
+        { return be64_compare_signed(a, b); }
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(U16) == 2)
+        COMPILE_TIME_ASSERT(sizeof(U32) == 4)
+        COMPILE_TIME_ASSERT(sizeof(U64) == 8)
+        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+    }
+
+    // disable dynamic allocation
+    DISABLE_NEW_DELETE
+};
+
+
+struct LEPolicy
+#if defined(BELE_RTP)
+    : public AbstractPolicy
+#endif
+{
+    LEPolicy() {}
+#if defined(BELE_CTP)
+    typedef N_BELE_RTP::LEPolicy RTP_Policy;
+    enum { isBE = 0, isLE = 1 };
+#elif defined(BELE_RTP)
+    typedef N_BELE_CTP::LEPolicy CTP_Policy;
+    V bool isBE() C { return CTP_Policy::isBE; }
+    V bool isLE() C { return CTP_Policy::isLE; }
+#endif
+
+    typedef LE16 U16;
+    typedef LE32 U32;
+    typedef LE64 U64;
+
+    V unsigned get16(const void *p) C
+        { return get_le16(p); }
+    V unsigned get24(const void *p) C
+        { return get_le24(p); }
+    V unsigned get32(const void *p) C
+        { return get_le32(p); }
+    V acc_uint64l_t get64(const void *p) C
+        { return get_le64(p); }
+
+    V void set16(void *p, unsigned v) C
+        { set_le16(p, v); }
+    V void set24(void *p, unsigned v) C
+        { set_le24(p, v); }
+    V void set32(void *p, unsigned v) C
+        { set_le32(p, v); }
+    V void set64(void *p, acc_uint64l_t v) C
+        { set_le64(p, v); }
+
+    V unsigned get16_signed(const void *p) C
+        { return get_le16_signed(p); }
+    V unsigned get24_signed(const void *p) C
+        { return get_le24_signed(p); }
+    V unsigned get32_signed(const void *p) C
+        { return get_le32_signed(p); }
+    V acc_uint64l_t get64_signed(const void *p) C
+        { return get_le64_signed(p); }
+
+    S u16_compare(const void *a, const void *b) C
+        { return le16_compare(a, b); }
+    S u24_compare(const void *a, const void *b) C
+        { return le24_compare(a, b); }
+    S u32_compare(const void *a, const void *b) C
+        { return le32_compare(a, b); }
+    S u64_compare(const void *a, const void *b) C
+        { return le64_compare(a, b); }
+
+    S u16_compare_signed(const void *a, const void *b) C
+        { return le16_compare_signed(a, b); }
+    S u24_compare_signed(const void *a, const void *b) C
+        { return le24_compare_signed(a, b); }
+    S u32_compare_signed(const void *a, const void *b) C
+        { return le32_compare_signed(a, b); }
+    S u64_compare_signed(const void *a, const void *b) C
+        { return le64_compare_signed(a, b); }
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(U16) == 2)
+        COMPILE_TIME_ASSERT(sizeof(U32) == 4)
+        COMPILE_TIME_ASSERT(sizeof(U64) == 8)
+        COMPILE_TIME_ASSERT_ALIGNOF(U16, char)
+        COMPILE_TIME_ASSERT_ALIGNOF(U32, char)
+        COMPILE_TIME_ASSERT_ALIGNOF(U64, char)
+    }
+
+    // disable dynamic allocation
+    DISABLE_NEW_DELETE
+};
+
+
+#if (ACC_ABI_BIG_ENDIAN)
+typedef BEPolicy HostPolicy;
+#elif (ACC_ABI_LITTLE_ENDIAN)
+typedef LEPolicy HostPolicy;
+#else
+#  error "ACC_ABI_ENDIAN"
+#endif
+
+
+#if 0 /* UNUSED */
+struct HostAlignedPolicy
+{
+#if defined(BELE_CTP)
+    enum { isBE = HostPolicy::isBE, isLE = HostPolicy::isLE };
+#endif
+
+    typedef acc_uint16e_t U16;
+    typedef acc_uint32e_t U32;
+    typedef acc_uint64l_t U64;
+
+    static void compileTimeAssertions() {
+        COMPILE_TIME_ASSERT(sizeof(U16) == 2)
+        COMPILE_TIME_ASSERT(sizeof(U32) == 4)
+        COMPILE_TIME_ASSERT(sizeof(U64) == 8)
+    }
+};
+#endif
+
+
+#undef V
+#undef S
+#undef C
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,115 @@
+/* bptr.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_BPTR_H
+#define __UPX_BPTR_H
+
+
+/*************************************************************************
+// BoundedPtr
+**************************************************************************/
+
+template <class T>
+class BoundedPtr
+{
+//    typedef BoundedPtr<T> Self;
+public:
+    typedef T* StoredType;
+    typedef T* PointerType;
+    typedef T& ReferenceType;
+
+    ~BoundedPtr() { }
+
+    explicit BoundedPtr(void* base, unsigned size, T* ptr=0)
+        : ptr_(ptr), base_(base), size_(size) { check(); }
+    BoundedPtr& operator= (const BoundedPtr& other) {
+        assert(base_ == other.base_); assert(size_ == other.size_);
+        ptr_ = other.ptr_; check(); return *this;
+    }
+    BoundedPtr& operator= (T* other) {
+        ptr_ = other; check(); return *this;
+    }
+
+    operator T* () { check(); return ptr_; }
+    operator const T* () const { check(); return ptr_; }
+
+    BoundedPtr& operator += (size_t n) {
+        checkStrict(); ptr_ += n; checkStrict(); return *this;
+    }
+    BoundedPtr& operator -= (size_t n) {
+        checkStrict(); ptr_ -= n; checkStrict(); return *this;
+    }
+    BoundedPtr& operator ++ (void) {
+        checkStrict(); ptr_ += 1; checkStrict(); return *this;
+    }
+//    T* operator ++ (int) {
+//        T* p = ptr_; checkStrict(); ptr_ += 1; checkStrict(); return p;
+//    }
+//    BoundedPtr& operator -- (void) {
+//        checkStrict(); ptr_ -= 1; checkStrict(); return *this;
+//    }
+
+
+private:
+    void checkNULL() const {
+        if (!ptr_)
+            throwCantUnpack("unexpected NULL pointer; take care!");
+    }
+    void checkRange(size_t extra=0) const {
+        size_t off = (const char *) ptr_ - (const char *) base_;
+        if (off > size_ || off + extra > size_)
+            throwCantUnpack("pointer out of range; take care!");
+    }
+    void checkStrict(size_t extra=0) const {
+        checkNULL();
+        checkRange(extra);
+    }
+    void check(size_t extra=0) const {
+        if (ptr_) checkRange(extra);
+    }
+
+    T* ptr_;
+    void* base_;
+    size_t size_;
+
+    // disable copy
+    BoundedPtr(const BoundedPtr&); // {}
+//    BoundedPtr& operator= (const BoundedPtr&); // { return *this; }
+
+    // disable dynamic allocation
+    DISABLE_NEW_DELETE
+};
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -1,9 +1,9 @@
-/* c_file.cpp -- file console output
+/* c_file.cpp --

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -72,7 +72,7 @@ static void print0(FILE *f, const char *s)
 }


-static upx_bool intro(FILE *f)
+static bool intro(FILE *f)
 {
    UNUSED(f);
    return 0;
@@ -1,9 +1,9 @@
-/* c_init.cpp -- console initialization
+/* c_init.cpp --

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -81,7 +81,7 @@ static int do_init(FILE *f)
    if (opt->console == CON_NONE || opt->to_stdout)
        return con_mode;
    try_init(&console_file,f);
-    if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) || !isatty(STDERR_FILENO))
+    if (!acc_isatty(STDIN_FILENO) || !acc_isatty(STDOUT_FILENO) || !acc_isatty(STDERR_FILENO))
        return con_mode;

 #if defined(USE_ANSI)
@@ -124,7 +124,7 @@ static int set_fg(FILE *f, int fg)
 }


-static upx_bool intro(FILE *f)
+static bool intro(FILE *f)
 {
    if (con == me)
        init(f,-1,-1);
@@ -142,13 +142,13 @@ console_t console_init =
 };


-void con_fprintf(FILE *f, const char *format, ...)
+void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
 {
    va_list args;
    char buf[80*25];

-    va_start(args,format);
-    upx_vsnprintf(buf,sizeof(buf),format,args);
+    va_start(args, format);
+    upx_vsnprintf(buf, sizeof(buf), format,args);
    va_end(args);

    if (con == me)
@@ -1,9 +1,9 @@
-/* c_none.cpp -- dummy console output
+/* c_none.cpp --

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -58,7 +58,7 @@ static void print0(FILE *f, const char *s)
 }


-static upx_bool intro(FILE *f)
+static bool intro(FILE *f)
 {
    UNUSED(f);
    return 0;
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -88,7 +88,7 @@ static screen_t *do_construct(screen_t *s, int fd)

 static screen_t *screen = NULL;

-static void do_destroy(void)
+static void __acc_cdecl_atexit do_destroy(void)
 {
    if (screen)
    {
@@ -130,7 +130,7 @@ static int init(FILE *f, int o, int now)
    if (!screen)
        screen = do_construct(screen_djgpp2_construct(),fd);
 #endif
-#if defined(__MFX_WIN32)
+#if defined(USE_SCREEN_WIN32)
    if (!screen)
        screen = do_construct(screen_win32_construct(),fd);
 #endif
@@ -196,7 +196,7 @@ static void print0(FILE *f, const char *ss)

    // Note:
    //   We use 2 passes to avoid unnecessary system calls because
-    //   scrollUp() under Win95/98 is *extremely* slow.
+    //   scrollUp() under Win32 is *extremely* slow.
    UNUSED(f);

    screen->getCursor(screen,&old_cx,&old_cy);
@@ -295,7 +295,7 @@ static void print0(FILE *f, const char *ss)
 }


-static upx_bool intro(FILE *f)
+static bool intro(FILE *f)
 {
    UNUSED(f);
 #if defined(USE_FRAMES)
@@ -1,9 +1,9 @@
-/* compress.cpp -- interface to the compression library
+/* compress.cpp --

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,217 +21,116 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #include "conf.h"
-
-#if defined(WITH_UCL) && !defined(WITH_NRV)
-#  define nrv2b_99_compress_internal    ucl_nrv2b_99_compress
-#  define nrv2d_99_compress_internal    ucl_nrv2d_99_compress
-#  if 0 && defined(__i386__)
-#    include <ucl/ucl_asm.h>
-#    define nrv2b_decompress_safe_8     ucl_nrv2b_decompress_asm_safe_8
-#    define nrv2b_decompress_safe_le16  ucl_nrv2b_decompress_asm_safe_le16
-#    define nrv2b_decompress_safe_le32  ucl_nrv2b_decompress_asm_safe_le32
-#    define nrv2d_decompress_safe_8     ucl_nrv2d_decompress_asm_safe_8
-#    define nrv2d_decompress_safe_le16  ucl_nrv2d_decompress_asm_safe_le16
-#    define nrv2d_decompress_safe_le32  ucl_nrv2d_decompress_asm_safe_le32
-#  else
-#    define nrv2b_decompress_safe_8     ucl_nrv2b_decompress_safe_8
-#    define nrv2b_decompress_safe_le16  ucl_nrv2b_decompress_safe_le16
-#    define nrv2b_decompress_safe_le32  ucl_nrv2b_decompress_safe_le32
-#    define nrv2d_decompress_safe_8     ucl_nrv2d_decompress_safe_8
-#    define nrv2d_decompress_safe_le16  ucl_nrv2d_decompress_safe_le16
-#    define nrv2d_decompress_safe_le32  ucl_nrv2d_decompress_safe_le32
-#  endif
-#endif
-
-#if defined(WITH_NRV)
-#  include <nrv/nrv2b.h>
-#  include <nrv/nrv2d.h>
-#  if !defined(NRV_VERSION) || (NRV_VERSION < 0x007300L)
-#    error
-#  endif
-#  if 1 && defined(__i386__)
-#    define nrv2b_decompress_safe_8     nrv2b_decompress_asm_safe_8
-#    define nrv2b_decompress_safe_le16  nrv2b_decompress_asm_safe_le16
-#    define nrv2d_decompress_safe_8     nrv2d_decompress_asm_safe_8
-#    define nrv2d_decompress_safe_le16  nrv2d_decompress_asm_safe_le16
-#    if (NRV_VERSION < 0x008000L)
-#    define nrv2b_decompress_safe_le32  nrv2b_decompress_asm_safe
-#    define nrv2d_decompress_safe_le32  nrv2d_decompress_asm_safe
-#    else
-#    define nrv2b_decompress_safe_le32  nrv2b_decompress_asm_safe_le32
-#    define nrv2d_decompress_safe_le32  nrv2d_decompress_asm_safe_le32
-#    endif
-#  endif
-   NRV_EXTERN_CDECL(int) nrv2b_99_compress_internal(...);
-   NRV_EXTERN_CDECL(int) nrv2d_99_compress_internal(...);
-   NRV_EXTERN_CDECL(int) nrv2b_decompress_safe_8(...);
-   NRV_EXTERN_CDECL(int) nrv2b_decompress_safe_le16(...);
-   NRV_EXTERN_CDECL(int) nrv2b_decompress_safe_le32(...);
-   NRV_EXTERN_CDECL(int) nrv2d_decompress_safe_8(...);
-   NRV_EXTERN_CDECL(int) nrv2d_decompress_safe_le16(...);
-   NRV_EXTERN_CDECL(int) nrv2d_decompress_safe_le32(...);
-#endif
-
-#if 0 && defined(WITH_ZLIB) && defined(M_ZLIB)
-#  include <zlib.h>
-#endif
+#include "compress.h"
+#include "mem.h"
+#include <zlib.h>


 /*************************************************************************
 //
 **************************************************************************/

-int upx_compress           ( const upx_byte *src, upx_uint  src_len,
-                                   upx_byte *dst, upx_uint *dst_len,
-                                   upx_progress_callback_t *cb,
+unsigned upx_adler32(const void *buf, unsigned len, unsigned adler)
+{
+    if (len == 0)
+        return adler;
+    assert(buf != NULL);
+#if 0
+    return adler32(adler, (const Bytef *) buf, len); // zlib
+#elif defined(WITH_UCL)
+    return ucl_adler32(adler, (const ucl_bytep) buf, len);
+#else
+#  error
+#endif
+}
+
+
+#if 0 /* UNUSED */
+unsigned upx_crc32(const void *buf, unsigned len, unsigned crc)
+{
+    if (len == 0)
+        return crc;
+    assert(buf != NULL);
+#if 0
+    return crc32(crc, (const Bytef *) buf, len); // zlib
+#elif defined(WITH_UCL)
+    return ucl_crc32(crc, (const ucl_bytep) buf, len);
+#else
+#  error
+#endif
+}
+#endif /* UNUSED */
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_compress           ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
                                   int method, int level,
-                             const struct upx_compress_config_t *conf_parm,
-                                   upx_uintp result)
+                             const upx_compress_config_t *cconf,
+                                   upx_compress_result_t *cresult )
 {
-    struct upx_compress_config_t conf;
-    upx_uint result_buffer[16];
    int r = UPX_E_ERROR;
+    upx_compress_result_t cresult_buffer;

-    assert(level > 0);
-    memset(&conf, 0xff, sizeof(conf));
-    if (conf_parm)
-        conf = *conf_parm;     // struct copy
-    if (!result)
-        result = result_buffer;
+    assert(method > 0); assert(level > 0);

-    // assume no info available - fill in worst case results
-    //result[0] = 1;            // min_offset_found - NOT USED
-    result[1] = src_len - 1;    // max_offset_found
-    //result[2] = 2;            // min_match_found - NOT USED
-    result[3] = src_len - 1;    // max_match_found
-    //result[4] = 1;            // min_run_found - NOT USED
-    result[5] = src_len;        // max_run_found
-    result[6] = 1;              // first_offset_found
-    //result[7] = 999999;       // same_match_offsets_found - NOT USED
+#if 1
+    // set available bytes in dst
+    if (*dst_len == 0)
+        *dst_len = MemBuffer::getSizeForCompression(src_len);
+#else
+    // force users to provide *dst_len
+    assert(*dst_len != 0);
+#endif
+    // for UPX, we always require a reasonably sized outbut buffer
+    assert(*dst_len >= MemBuffer::getSizeForCompression(src_len));

-#if 0 && defined(WITH_ZLIB) && defined(M_ZLIB)
-    if (method == M_ZLIB)
-    {
-        uLong destLen = src_len + src_len / 8 + 256;
-        r = compress2(dst, &destLen, src, src_len, UPX_MIN(level, 9));
-        *dst_len = destLen;
-        if (r == Z_MEM_ERROR)
-            return UPX_E_OUT_OF_MEMORY;
-        if (r != Z_OK)
-            return UPX_E_ERROR;
-        return UPX_E_OK;
+    if (!cresult)
+        cresult = &cresult_buffer;
+    memset(cresult, 0, sizeof(*cresult));
+#if 1
+    // debug
+    cresult->method = method;
+    cresult->level = level;
+    cresult->u_len = src_len;
+    cresult->c_len = 0;
+#endif
+
+    if (0) {
    }
+#if defined(WITH_LZMA)
+    else if (M_IS_LZMA(method))
+        r = upx_lzma_compress(src, src_len, dst, dst_len,
+                              cb, method, level, cconf, cresult);
 #endif
-
-    // prepare bit-buffer settings
-    conf.bb_endian = 0;
-    conf.bb_size = 0;
-    if (method == M_NRV2B_LE32 || method == M_NRV2D_LE32)
-        conf.bb_size = 32;
-    else if (method == M_NRV2B_8 || method == M_NRV2D_8)
-        conf.bb_size = 8;
-    else if (method == M_NRV2B_LE16 || method == M_NRV2D_LE16)
-        conf.bb_size = 16;
-    else
-        throwInternalError("unknown compression method");
-
-#if 1 && defined(WITH_NRV)
-    if (level == 1 && conf.bb_size == 32 &&
-        conf.max_offset == UPX_UINT_MAX && conf.max_match == UPX_UINT_MAX)
-    {
-        if (method == M_NRV2B_LE32)
-        {
-            upx_byte wrkmem[NRV2B_1_16_MEM_COMPRESS];
-#if defined(__UPX_CHECKER)
-            memset(wrkmem,0,NRV2B_1_16_MEM_COMPRESS);
-#endif
-            r = nrv2b_1_16_compress(src, src_len, dst, dst_len, wrkmem);
-        }
-        else if (method == M_NRV2D_LE32)
-        {
-            upx_byte wrkmem[NRV2D_1_16_MEM_COMPRESS];
-#if defined(__UPX_CHECKER)
-            memset(wrkmem,0,NRV2D_1_16_MEM_COMPRESS);
-#endif
-            r = nrv2d_1_16_compress(src, src_len, dst, dst_len, wrkmem);
-        }
-        else
-            throwInternalError("unknown compression method");
-        return r;
-    }
-#endif
-
-    // optimize compression parms
-    if (level <= 3 && conf.max_offset == UPX_UINT_MAX)
-        conf.max_offset = 8*1024-1;
-    else if (level == 4 && conf.max_offset == UPX_UINT_MAX)
-        conf.max_offset = 32*1024-1;
 #if defined(WITH_NRV)
-    else if (level <= 7 && conf.max_offset == UPX_UINT_MAX)
-        conf.max_offset = 1024*1024-1;
-    else if (level <= 8 && conf.max_offset == UPX_UINT_MAX)
-        conf.max_offset = 2048*1024-1;
-    else if (level <= 10 && conf.max_offset == UPX_UINT_MAX)
-        conf.max_offset = 4096*1024-1;
+    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
+        r = upx_nrv_compress(src, src_len, dst, dst_len,
+                             cb, method, level, cconf, cresult);
 #endif
-
-    if M_IS_NRV2B(method)
-        r = nrv2b_99_compress_internal(src, src_len, dst, dst_len,
-                                       cb, level, &conf, result);
-    else if M_IS_NRV2D(method)
-        r = nrv2d_99_compress_internal(src, src_len, dst, dst_len,
-                                       cb, level, &conf, result);
-    else
+#if defined(WITH_UCL)
+    else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
+        r = upx_ucl_compress(src, src_len, dst, dst_len,
+                             cb, method, level, cconf, cresult);
+#endif
+    else {
        throwInternalError("unknown compression method");
-
-    return r;
-}
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-int upx_decompress         ( const upx_byte *src, upx_uint  src_len,
-                                   upx_byte *dst, upx_uint *dst_len,
-                                   int method )
-{
-    int r = UPX_E_ERROR;
-
-#if 0 && defined(WITH_ZLIB) && defined(M_ZLIB)
-    if (method == M_ZLIB)
-    {
-        uLong destLen = *dst_len;
-        r = uncompress(dst, &destLen, src, src_len);
-        *dst_len = destLen;
-        if (r == Z_MEM_ERROR)
-            return UPX_E_OUT_OF_MEMORY;
-        if (r != Z_OK)
-            return UPX_E_ERROR;
-        return UPX_E_OK;
    }
-#endif

-    if (method == M_NRV2B_LE32)
-        r = nrv2b_decompress_safe_le32(src,src_len,dst,dst_len,NULL);
-    else if (method == M_NRV2B_8)
-        r = nrv2b_decompress_safe_8(src,src_len,dst,dst_len,NULL);
-    else if (method == M_NRV2B_LE16)
-        r = nrv2b_decompress_safe_le16(src,src_len,dst,dst_len,NULL);
-    else if (method == M_NRV2D_LE32)
-        r = nrv2d_decompress_safe_le32(src,src_len,dst,dst_len,NULL);
-    else if (method == M_NRV2D_8)
-        r = nrv2d_decompress_safe_8(src,src_len,dst,dst_len,NULL);
-    else if (method == M_NRV2D_LE16)
-        r = nrv2d_decompress_safe_le16(src,src_len,dst,dst_len,NULL);
-    else
-        throwInternalError("unknown decompression method");
+#if 1
+    // debug
+    cresult->c_len = *dst_len;
+#endif
    return r;
 }

@@ -240,26 +139,82 @@ int upx_decompress         ( const upx_byte *src, upx_uint  src_len,
 //
 **************************************************************************/

-int upx_test_overlap       ( const upx_byte *buf, upx_uint src_off,
-                                   upx_uint  src_len, upx_uint *dst_len,
-                                   int method )
+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 r = UPX_E_ERROR;

-    if (method == M_NRV2B_LE32)
-        r = ucl_nrv2b_test_overlap_le32(buf,src_off,src_len,dst_len,NULL);
-    else if (method == M_NRV2B_8)
-        r = ucl_nrv2b_test_overlap_8(buf,src_off,src_len,dst_len,NULL);
-    else if (method == M_NRV2B_LE16)
-        r = ucl_nrv2b_test_overlap_le16(buf,src_off,src_len,dst_len,NULL);
-    else if (method == M_NRV2D_LE32)
-        r = ucl_nrv2d_test_overlap_le32(buf,src_off,src_len,dst_len,NULL);
-    else if (method == M_NRV2D_8)
-        r = ucl_nrv2d_test_overlap_8(buf,src_off,src_len,dst_len,NULL);
-    else if (method == M_NRV2D_LE16)
-        r = ucl_nrv2d_test_overlap_le16(buf,src_off,src_len,dst_len,NULL);
-    else
+    assert(*dst_len > 0);
+    assert(src_len < *dst_len); // must be compressed
+
+    if (cresult && cresult->method == 0)
+        cresult = NULL;
+
+    if (0) {
+    }
+#if defined(WITH_LZMA)
+    else if (M_IS_LZMA(method))
+        r = upx_lzma_decompress(src, src_len, dst, 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_decompress(src, src_len, dst, 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_decompress(src, src_len, dst, dst_len, method, cresult);
+#endif
+#if defined(WITH_ZLIB)
+    else if (M_IS_DEFLATE(method))
+        r = upx_zlib_decompress(src, src_len, dst, dst_len, method, cresult);
+#endif
+    else {
        throwInternalError("unknown decompression method");
+    }
+
+    return r;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_test_overlap       ( const upx_bytep buf, unsigned src_off,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult )
+{
+    int r = UPX_E_ERROR;
+
+    if (cresult && cresult->method == 0)
+        cresult = NULL;
+
+    assert(*dst_len > 0);
+    assert(src_len < *dst_len); // must be compressed
+    unsigned overlap_overhead = src_off + src_len - *dst_len;
+    assert((int)overlap_overhead > 0);
+
+    if (0) {
+    }
+#if defined(WITH_LZMA)
+    else if (M_IS_LZMA(method))
+        r = upx_lzma_test_overlap(buf, 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);
+#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);
+#endif
+    else {
+        throwInternalError("unknown decompression method");
+    }
+
    return r;
 }

@@ -0,0 +1,118 @@
+/* compress.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_COMPRESS_H
+#define __UPX_COMPRESS_H
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#if defined(WITH_LZMA)
+const char *upx_lzma_version_string(void);
+int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf,
+                                   upx_compress_result_t *cresult );
+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,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult );
+#endif
+
+
+#if defined(WITH_NRV)
+const char *upx_nrv_version_string(void);
+int upx_nrv_compress       ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf,
+                                   upx_compress_result_t *cresult );
+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,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult );
+#endif
+
+
+#if defined(WITH_UCL)
+const char *upx_ucl_version_string(void);
+int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf,
+                                   upx_compress_result_t *cresult );
+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,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult );
+#endif
+
+#if defined(WITH_ZLIB)
+const char *upx_zlib_version_string(void);
+int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf,
+                                   upx_compress_result_t *cresult );
+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,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult );
+#endif
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,515 @@
+/* compress_lzma.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+#include "compress.h"
+
+
+void lzma_compress_config_t::reset()
+{
+    memset(this, 0, sizeof(*this));
+
+    pos_bits.reset();
+    lit_pos_bits.reset();
+    lit_context_bits.reset();
+    dict_size.reset();
+    fast_mode = 2;
+    num_fast_bytes.reset();
+    match_finder_cycles = 0;
+
+    max_num_probs = 0;
+}
+
+
+#if !defined(WITH_LZMA)
+extern int compress_lzma_dummy;
+int compress_lzma_dummy = 0;
+#else
+
+
+// INFO: the LZMA SDK is covered by a permissive license which allows
+//   using unmodified LZMA source code in UPX and the UPX stubs.
+//   See SPECIAL EXCEPTION below.
+//
+// Quoting from lzma-4.43/lzma.txt:
+//
+//   LICENSE
+//   -------
+//
+//   LZMA SDK is available under any of the following licenses:
+//
+//   1) GNU Lesser General Public License (GNU LGPL)
+//   2) Common Public License (CPL)
+//   3) Simplified license for unmodified code (read SPECIAL EXCEPTION)
+//   4) Proprietary license
+//
+//   It means that you can select one of these four options and follow rules
+//   of that license.
+//
+//   1,2) GNU LGPL and CPL licenses are pretty similar and both these
+//   licenses are classified as
+//    - "Free software licenses" at http://www.gnu.org/
+//    - "OSI-approved" at http://www.opensource.org/
+//
+//   3) SPECIAL EXCEPTION
+//
+//   Igor Pavlov, as the author of this code, expressly permits you
+//   to statically or dynamically link your code (or bind by name)
+//   to the files from LZMA SDK without subjecting your linked
+//   code to the terms of the CPL or GNU LGPL.
+//   Any modifications or additions to files from LZMA SDK, however,
+//   are subject to the GNU LGPL or CPL terms.
+//
+//   SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code,
+//   while you keep LZMA SDK code unmodified.
+
+
+/*************************************************************************
+// cruft because of pseudo-COM layer
+**************************************************************************/
+
+#undef USE_LZMA_PROPERTIES
+
+#undef MSDOS
+#undef OS2
+#undef _WIN32
+#undef _WIN32_WCE
+#undef COMPRESS_MF_MT
+#undef _NO_EXCEPTIONS
+#include "C/Common/MyInitGuid.h"
+//#include "C/7zip/Compress/LZMA/LZMADecoder.h"
+#include "C/7zip/Compress/LZMA/LZMAEncoder.h"
+
+namespace MyLzma {
+
+struct InStreamRam: public ISequentialInStream, public CMyUnknownImp
+{
+    MY_UNKNOWN_IMP
+    const Byte *Data; size_t Size; size_t Pos;
+    void Init(const Byte *data, size_t size) {
+        Data = data; Size = size; Pos = 0;
+    }
+    STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
+};
+
+STDMETHODIMP InStreamRam::Read(void *data, UInt32 size, UInt32 *processedSize)
+{
+    UInt32 remain = Size - Pos;
+    if (size > remain) size = remain;
+    memmove(data, Data + Pos, size);
+    Pos += size;
+    if (processedSize != NULL) *processedSize = size;
+    return S_OK;
+}
+
+struct OutStreamRam : public ISequentialOutStream, public CMyUnknownImp
+{
+    MY_UNKNOWN_IMP
+    Byte *Data; size_t Size; size_t Pos; bool Overflow;
+    void Init(Byte *data, size_t size) {
+        Data = data; Size = size; Pos = 0; Overflow = false;
+    }
+    HRESULT WriteByte(Byte b) {
+        if (Pos >= Size) { Overflow = true; return E_FAIL; }
+        Data[Pos++] = b;
+        return S_OK;
+    }
+    STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
+};
+
+STDMETHODIMP OutStreamRam::Write(const void *data, UInt32 size, UInt32 *processedSize)
+{
+    UInt32 i;
+    for (i = 0; i < size && Pos < Size; i++)
+        Data[Pos++] = ((const Byte *)data)[i];
+    if (processedSize != NULL) *processedSize = i;
+    if (i != size) { Overflow = true; return E_FAIL; }
+    return S_OK;
+}
+
+struct ProgressInfo : public ICompressProgressInfo, public CMyUnknownImp
+{
+    MY_UNKNOWN_IMP
+    STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
+    upx_callback_p cb;
+};
+
+STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
+{
+    if (cb && cb->nprogress)
+        cb->nprogress(cb, (unsigned) *inSize, (unsigned) *outSize);
+    return S_OK;
+}
+
+} // namespace
+
+
+#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"
+#undef RC_NORMALIZE
+
+
+int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf_parm,
+                                   upx_compress_result_t *cresult )
+{
+    assert(method == M_LZMA);
+    assert(level > 0); assert(cresult != NULL);
+
+    int r = UPX_E_ERROR;
+    HRESULT rh;
+    const lzma_compress_config_t *lcconf = cconf_parm ? &cconf_parm->conf_lzma : NULL;
+    lzma_compress_result_t *res = &cresult->result_lzma;
+
+    MyLzma::InStreamRam is; is.AddRef();
+    MyLzma::OutStreamRam os; os.AddRef();
+    is.Init(src, src_len);
+    os.Init(dst, *dst_len);
+
+    MyLzma::ProgressInfo progress; progress.AddRef();
+    progress.cb = cb;
+
+    NCompress::NLZMA::CEncoder enc;
+    const PROPID propIDs[8] = {
+        NCoderPropID::kPosStateBits,        // 0  pb    _posStateBits(2)
+        NCoderPropID::kLitPosBits,          // 1  lp    _numLiteralPosStateBits(0)
+        NCoderPropID::kLitContextBits,      // 2  lc    _numLiteralContextBits(3)
+        NCoderPropID::kDictionarySize,      // 3  ds
+        NCoderPropID::kAlgorithm,           // 4  fm    _fastmode
+        NCoderPropID::kNumFastBytes,        // 5  fb
+        NCoderPropID::kMatchFinderCycles,   // 6  mfc   _matchFinderCycles, _cutValue
+        NCoderPropID::kMatchFinder          // 7  mf
+    };
+    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;
+
+    // setup defaults
+    pr[0].uintVal = 2;                  // 0 .. 4
+    pr[1].uintVal = 0;                  // 0 .. 4
+    pr[2].uintVal = 3;                  // 0 .. 8
+    pr[3].uintVal = 4 * 1024 * 1024;    // 1 .. 2**30
+    pr[4].uintVal = 2;
+    pr[5].uintVal = 64;                 // 5 .. 273
+    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;
+#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;
+    pr[2].uintVal = lzma_compress_config_t::lit_context_bits_t::default_value_c;
+    pr[3].uintVal = lzma_compress_config_t::dict_size_t::default_value_c;
+    pr[5].uintVal = lzma_compress_config_t::num_fast_bytes_t::default_value_c;
+#endif
+#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.
+    pr[1].uintVal = 4;
+    pr[2].uintVal = 8;
+#endif
+
+    // FIXME: tune these settings according to level
+    switch (level)
+    {
+    case 1:
+        pr[3].uintVal = 256 * 1024;
+        pr[4].uintVal = 0;
+        pr[5].uintVal = 8;
+        break;
+    case 2:
+        pr[3].uintVal = 256 * 1024;
+        pr[4].uintVal = 0;
+        break;
+    case 3:
+        break;
+    case 4:
+        break;
+    case 5:
+        break;
+    case 6:
+        break;
+    case 7:
+        break;
+    case 8:
+        break;
+    case 9:
+        pr[3].uintVal = 8 * 1024 * 1024;
+        break;
+    case 10:
+        pr[3].uintVal = src_len;
+        break;
+    default:
+        goto error;
+    }
+
+    // cconf overrides
+    if (lcconf)
+    {
+        oassign(pr[0].uintVal, lcconf->pos_bits);
+        oassign(pr[1].uintVal, lcconf->lit_pos_bits);
+        oassign(pr[2].uintVal, lcconf->lit_context_bits);
+        oassign(pr[3].uintVal, lcconf->dict_size);
+        oassign(pr[5].uintVal, lcconf->num_fast_bytes);
+    }
+
+    // limit dictionary size
+    if (pr[3].uintVal > src_len)
+        pr[3].uintVal = src_len;
+
+    // limit num_probs
+    if (lcconf && lcconf->max_num_probs)
+    {
+        for (;;)
+        {
+            unsigned n = 1846 + (768 << (pr[2].uintVal + pr[1].uintVal));
+            if (n <= lcconf->max_num_probs)
+                break;
+            if (pr[1].uintVal > pr[2].uintVal)
+            {
+                if (pr[1].uintVal == 0)
+                    goto error;
+                pr[1].uintVal -= 1;
+            }
+            else
+            {
+                if (pr[2].uintVal == 0)
+                    goto error;
+                pr[2].uintVal -= 1;
+            }
+        }
+    }
+
+    res->pos_bits = pr[0].uintVal;
+    res->lit_pos_bits = pr[1].uintVal;
+    res->lit_context_bits = pr[2].uintVal;
+    res->dict_size = pr[3].uintVal;
+    res->fast_mode = pr[4].uintVal;
+    res->num_fast_bytes = pr[5].uintVal;
+    res->match_finder_cycles = pr[6].uintVal;
+    //res->num_probs = LzmaGetNumProbs(&s.Properties));
+    //res->num_probs = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
+    res->num_probs = 1846 + (768 << (res->lit_context_bits + res->lit_pos_bits));
+    //printf("\nlzma_compress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
+
+#ifndef _NO_EXCEPTIONS
+    try {
+#else
+#  error
+#endif
+
+    if (enc.SetCoderProperties(propIDs, pr, 8) != S_OK)
+        goto error;
+    if (enc.WriteCoderProperties(&os) != S_OK)
+        goto error;
+    if (os.Overflow) {
+        //r = UPX_E_OUTPUT_OVERRUN;
+        r = UPX_E_NOT_COMPRESSIBLE;
+        goto error;
+    }
+    assert(os.Pos == 5);
+#if defined(USE_LZMA_PROPERTIES)
+    os.Pos = 1;
+#else
+    os.Pos = 0;
+    // extra stuff in first byte: 5 high bits convenience for stub decompressor
+    unsigned t = res->lit_context_bits + res->lit_pos_bits;
+    os.WriteByte((t << 3) | res->pos_bits);
+    os.WriteByte((res->lit_pos_bits << 4) | (res->lit_context_bits));
+#endif
+
+    rh = enc.Code(&is, &os, NULL, NULL, &progress);
+
+#ifndef _NO_EXCEPTIONS
+    } catch(...) { return UPX_E_OUT_OF_MEMORY; }
+#endif
+
+    assert(is.Pos <=  src_len);
+    assert(os.Pos <= *dst_len);
+    if (rh == E_OUTOFMEMORY)
+        r = UPX_E_OUT_OF_MEMORY;
+    else if (os.Overflow)
+    {
+        assert(os.Pos == *dst_len);
+        //r = UPX_E_OUTPUT_OVERRUN;
+        r = UPX_E_NOT_COMPRESSIBLE;
+    }
+    else if (rh == S_OK)
+    {
+        assert(is.Pos == src_len);
+        r = UPX_E_OK;
+    }
+
+error:
+    *dst_len = os.Pos;
+    return r;
+}
+
+
+/*************************************************************************
+// decompress
+**************************************************************************/
+
+#undef _LZMA_IN_CB
+#undef _LZMA_OUT_READ
+#undef _LZMA_PROB32
+#undef _LZMA_LOC_OPT
+#include "C/7zip/Compress/LZMA_C/LzmaDecode.h"
+#include "C/7zip/Compress/LZMA_C/LzmaDecode.c"
+
+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 )
+{
+    assert(method == M_LZMA);
+    // see res->num_probs above
+    COMPILE_TIME_ASSERT(sizeof(CProb) == 2)
+    COMPILE_TIME_ASSERT(LZMA_BASE_SIZE == 1846)
+    COMPILE_TIME_ASSERT(LZMA_LIT_SIZE == 768)
+
+    CLzmaDecoderState s; memset(&s, 0, sizeof(s));
+    SizeT src_out = 0, dst_out = 0;
+    int r = UPX_E_ERROR;
+    int rh;
+
+#if defined(USE_LZMA_PROPERTIES)
+    if (src_len < 2)
+        goto error;
+    rh = LzmaDecodeProperties(&s.Properties, src, src_len);
+    if (rh != 0)
+        goto error;
+    src += 1; src_len -= 1;
+#else
+    if (src_len < 3)
+        goto error;
+    s.Properties.pb = src[0] & 7;
+    s.Properties.lp = (src[1] >> 4);
+    s.Properties.lc = src[1] & 15;
+    if (s.Properties.pb >= 5) goto error;
+    if (s.Properties.lp >= 5) goto error;
+    if (s.Properties.lc >= 9) goto error;
+    // extra
+    if ((src[0] >> 3) != s.Properties.lc + s.Properties.lp) goto error;
+    src += 2; src_len -= 2;
+#endif
+
+    if (cresult)
+    {
+        assert(cresult->method == method);
+        assert(cresult->result_lzma.pos_bits == (unsigned) s.Properties.pb);
+        assert(cresult->result_lzma.lit_pos_bits == (unsigned) s.Properties.lp);
+        assert(cresult->result_lzma.lit_context_bits == (unsigned) s.Properties.lc);
+        assert(cresult->result_lzma.num_probs == (unsigned) LzmaGetNumProbs(&s.Properties));
+        const lzma_compress_result_t *res = &cresult->result_lzma;
+        UNUSED(res);
+        //printf("\nlzma_decompress config: %u %u %u %u %u\n", res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs);
+    }
+    s.Probs = (CProb *) malloc(sizeof(CProb) * LzmaGetNumProbs(&s.Properties));
+    if (!s.Probs)
+    {
+        r = UPX_E_OUT_OF_MEMORY;
+        goto error;
+    }
+    rh = LzmaDecode(&s, src, src_len, &src_out, dst, *dst_len, &dst_out);
+    assert(src_out <=  src_len);
+    assert(dst_out <= *dst_len);
+    if (rh == 0)
+    {
+        r = UPX_E_OK;
+        if (src_out != src_len)
+            r = UPX_E_INPUT_NOT_CONSUMED;
+    }
+
+error:
+    *dst_len = dst_out;
+    free(s.Probs);
+
+    UNUSED(cresult);
+    return r;
+}
+
+
+/*************************************************************************
+// test_overlap
+**************************************************************************/
+
+int upx_lzma_test_overlap  ( const upx_bytep buf, unsigned src_off,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult )
+{
+    assert(method == M_LZMA);
+
+    // FIXME - implement this
+    // Note that Packer::verifyOverlappingDecompression() will
+    // verify the final result in any case.
+    UNUSED(buf);
+
+    unsigned overlap_overhead = src_off + src_len - *dst_len;
+    //printf("upx_lzma_test_overlap: %d\n", overlap_overhead);
+    if ((int)overlap_overhead >= 256)
+        return UPX_E_OK;
+
+    UNUSED(cresult);
+    return UPX_E_ERROR;
+}
+
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+const char *upx_lzma_version_string(void)
+{
+    // FIXME
+//    return NULL;
+    return "4.43";
+}
+
+
+#endif /* WITH_LZMA */
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,286 @@
+/* compress_ucl.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+#include "compress.h"
+#if !defined(WITH_UCL)
+extern int compress_ucl_dummy;
+int compress_ucl_dummy = 0;
+#else
+
+#if 1 && !defined(UCL_USE_ASM) && (ACC_ARCH_I386)
+#  if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_WATCOMC)
+#    define UCL_USE_ASM
+#  endif
+#endif
+#if defined(UCL_NO_ASM)
+#  undef UCL_USE_ASM
+#endif
+#if defined(ACC_CFG_NO_UNALIGNED)
+#  undef UCL_USE_ASM
+#endif
+#if 1 && defined(UCL_USE_ASM)
+#  include <ucl/ucl_asm.h>
+#  define ucl_nrv2b_decompress_safe_8       ucl_nrv2b_decompress_asm_safe_8
+#  define ucl_nrv2b_decompress_safe_le16    ucl_nrv2b_decompress_asm_safe_le16
+#  define ucl_nrv2b_decompress_safe_le32    ucl_nrv2b_decompress_asm_safe_le32
+#  define ucl_nrv2d_decompress_safe_8       ucl_nrv2d_decompress_asm_safe_8
+#  define ucl_nrv2d_decompress_safe_le16    ucl_nrv2d_decompress_asm_safe_le16
+#  define ucl_nrv2d_decompress_safe_le32    ucl_nrv2d_decompress_asm_safe_le32
+#  define ucl_nrv2e_decompress_safe_8       ucl_nrv2e_decompress_asm_safe_8
+#  define ucl_nrv2e_decompress_safe_le16    ucl_nrv2e_decompress_asm_safe_le16
+#  define ucl_nrv2e_decompress_safe_le32    ucl_nrv2e_decompress_asm_safe_le32
+#endif
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+static int convert_errno_from_ucl(int r)
+{
+    switch (r)
+    {
+    case UCL_E_OK:                  return UPX_E_OK;
+    case UCL_E_ERROR:               return UPX_E_ERROR;
+    case UCL_E_OUT_OF_MEMORY:       return UPX_E_OUT_OF_MEMORY;
+    case UCL_E_NOT_COMPRESSIBLE:    return UPX_E_NOT_COMPRESSIBLE;
+    case UCL_E_INPUT_OVERRUN:       return UPX_E_INPUT_OVERRUN;
+    case UCL_E_OUTPUT_OVERRUN:      return UPX_E_OUTPUT_OVERRUN;
+    case UCL_E_LOOKBEHIND_OVERRUN:  return UPX_E_LOOKBEHIND_OVERRUN;
+    case UCL_E_EOF_NOT_FOUND:       return UPX_E_EOF_NOT_FOUND;
+    case UCL_E_INPUT_NOT_CONSUMED:  return UPX_E_INPUT_NOT_CONSUMED;
+//  case UCL_E_NOT_YET_IMPLEMENTED: return UPX_E_NOT_YET_IMPLEMENTED;
+    case UCL_E_INVALID_ARGUMENT:    return UPX_E_INVALID_ARGUMENT;
+    // UCL extra:
+    case UCL_E_OVERLAP_OVERRUN:     return UPX_E_ERROR;
+    }
+    return UPX_E_ERROR;
+}
+
+
+static void wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, ucl_voidp user)
+{
+    if (state != -1 && state != 3) return;
+    upx_callback_p cb = (upx_callback_p) user;
+    if (cb && cb->nprogress)
+        cb->nprogress(cb, a, b);
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb_parm,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf_parm,
+                                   upx_compress_result_t *cresult )
+{
+    int r;
+    assert(level > 0); assert(cresult != NULL);
+
+    COMPILE_TIME_ASSERT(sizeof(ucl_compress_config_t) == sizeof(REAL_ucl_compress_config_t))
+
+    ucl_progress_callback_t cb;
+    cb.callback = 0;
+    cb.user = NULL;
+    if (cb_parm && cb_parm->nprogress) {
+        cb.callback = wrap_nprogress_ucl;
+        cb.user = cb_parm;
+    }
+
+    ucl_compress_config_t cconf; cconf.reset();
+    if (cconf_parm)
+        cconf = cconf_parm->conf_ucl; // struct copy
+
+    ucl_uint *res = cresult->result_ucl.result;
+    // assume no info available - fill in worst case results
+    //res[0] = 1;                 // min_offset_found - NOT USED
+    res[1] = src_len - 1;       // max_offset_found
+    //res[2] = 2;                 // min_match_found - NOT USED
+    res[3] = src_len - 1;       // max_match_found
+    //res[4] = 1;                 // min_run_found - NOT USED
+    res[5] = src_len;           // max_run_found
+    res[6] = 1;                 // first_offset_found
+    //res[7] = 999999;            // same_match_offsets_found - NOT USED
+
+    // prepare bit-buffer settings
+    cconf.bb_endian = 0;
+    cconf.bb_size = 0;
+    if (method >= M_NRV2B_LE32 && method <= M_CL1B_LE16)
+    {
+        static const unsigned char sizes[3] = {32, 8, 16};
+        cconf.bb_size = sizes[(method - M_NRV2B_LE32) % 3];
+    }
+    else {
+        throwInternalError("unknown compression method");
+        return UPX_E_ERROR;
+    }
+
+    // optimize compression parms
+    if (level <= 3 && cconf.max_offset == UCL_UINT_MAX)
+        cconf.max_offset = 8*1024-1;
+    else if (level == 4 && cconf.max_offset == UCL_UINT_MAX)
+        cconf.max_offset = 32*1024-1;
+
+    if M_IS_NRV2B(method)
+        r = ucl_nrv2b_99_compress(src, src_len, dst, dst_len,
+                                  &cb, level, &cconf, res);
+    else if M_IS_NRV2D(method)
+        r = ucl_nrv2d_99_compress(src, src_len, dst, dst_len,
+                                  &cb, level, &cconf, res);
+    else if M_IS_NRV2E(method)
+        r = ucl_nrv2e_99_compress(src, src_len, dst, dst_len,
+                                  &cb, level, &cconf, res);
+    else {
+        throwInternalError("unknown compression method");
+        return UPX_E_ERROR;
+    }
+
+    return convert_errno_from_ucl(r);
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+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 r;
+
+    switch (method)
+    {
+    case M_NRV2B_8:
+        r = ucl_nrv2b_decompress_safe_8(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2B_LE16:
+        r = ucl_nrv2b_decompress_safe_le16(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2B_LE32:
+        r = ucl_nrv2b_decompress_safe_le32(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2D_8:
+        r = ucl_nrv2d_decompress_safe_8(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2D_LE16:
+        r = ucl_nrv2d_decompress_safe_le16(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2D_LE32:
+        r = ucl_nrv2d_decompress_safe_le32(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2E_8:
+        r = ucl_nrv2e_decompress_safe_8(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2E_LE16:
+        r = ucl_nrv2e_decompress_safe_le16(src,src_len,dst,dst_len,NULL);
+        break;
+    case M_NRV2E_LE32:
+        r = ucl_nrv2e_decompress_safe_le32(src,src_len,dst,dst_len,NULL);
+        break;
+    default:
+        throwInternalError("unknown decompression method");
+        return UPX_E_ERROR;
+    }
+
+    UNUSED(cresult);
+    return convert_errno_from_ucl(r);
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_ucl_test_overlap   ( const upx_bytep buf, unsigned src_off,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult )
+{
+    int r;
+
+    switch (method)
+    {
+    case M_NRV2B_8:
+        r = ucl_nrv2b_test_overlap_8(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2B_LE16:
+        r = ucl_nrv2b_test_overlap_le16(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2B_LE32:
+        r = ucl_nrv2b_test_overlap_le32(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2D_8:
+        r = ucl_nrv2d_test_overlap_8(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2D_LE16:
+        r = ucl_nrv2d_test_overlap_le16(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2D_LE32:
+        r = ucl_nrv2d_test_overlap_le32(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2E_8:
+        r = ucl_nrv2e_test_overlap_8(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2E_LE16:
+        r = ucl_nrv2e_test_overlap_le16(buf,src_off,src_len,dst_len,NULL);
+        break;
+    case M_NRV2E_LE32:
+        r = ucl_nrv2e_test_overlap_le32(buf,src_off,src_len,dst_len,NULL);
+        break;
+    default:
+        throwInternalError("unknown decompression method");
+        return UPX_E_ERROR;
+    }
+
+    UNUSED(cresult);
+    return convert_errno_from_ucl(r);
+}
+
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+const char *upx_ucl_version_string(void)
+{
+    return ucl_version_string();
+}
+
+
+#endif /* WITH_UCL */
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,230 @@
+/* compress_zlib.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+#include "compress.h"
+
+
+void zlib_compress_config_t::reset()
+{
+    memset(this, 0, sizeof(*this));
+
+    mem_level.reset();
+    window_bits.reset();
+    strategy.reset();
+}
+
+
+#if !defined(WITH_ZLIB)
+extern int compress_zlib_dummy;
+int compress_zlib_dummy = 0;
+#else
+
+#include <zlib.h>
+
+
+static int convert_errno_from_zlib(int zr)
+{
+    switch (zr)
+    {
+    case Z_OK:                  return UPX_E_OK;
+    case Z_DATA_ERROR:          return UPX_E_ERROR;
+    case Z_NEED_DICT:           return UPX_E_ERROR;
+    }
+    return UPX_E_ERROR;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
+                                   upx_bytep dst, unsigned* dst_len,
+                                   upx_callback_p cb_parm,
+                                   int method, int level,
+                             const upx_compress_config_t *cconf_parm,
+                                   upx_compress_result_t *cresult )
+{
+    assert(method == M_DEFLATE);
+    assert(level > 0); assert(cresult != NULL);
+    UNUSED(cb_parm);
+    int r = UPX_E_ERROR;
+    int zr;
+    const zlib_compress_config_t *lcconf = cconf_parm ? &cconf_parm->conf_zlib : NULL;
+    zlib_compress_result_t *res = &cresult->result_zlib;
+
+    if (level == 10)
+        level = 9;
+
+    zlib_compress_config_t::mem_level_t mem_level;
+    zlib_compress_config_t::window_bits_t window_bits;
+    zlib_compress_config_t::strategy_t strategy;
+    // cconf overrides
+    if (lcconf)
+    {
+        oassign(mem_level, lcconf->mem_level);
+        oassign(window_bits, lcconf->window_bits);
+        oassign(strategy, lcconf->strategy);
+    }
+
+    res->dummy = 0;
+
+    z_stream s;
+    s.zalloc = (alloc_func) 0;
+    s.zfree = (free_func) 0;
+    s.next_in = const_cast<upx_bytep>(src); // UNCONST
+    s.avail_in = src_len;
+    s.next_out = dst;
+    s.avail_out = *dst_len;
+    s.total_in = s.total_out = 0;
+
+    zr = deflateInit2(&s, level, Z_DEFLATED, 0 - (int)window_bits,
+                      mem_level, strategy);
+    if (zr != Z_OK)
+        goto error;
+    zr = deflate(&s, Z_FINISH);
+    if (zr != Z_STREAM_END)
+        goto error;
+    zr = deflateEnd(&s);
+    if (zr != Z_OK)
+        goto error;
+    r = UPX_E_OK;
+    goto done;
+error:
+    (void) deflateEnd(&s);
+    r = convert_errno_from_zlib(zr);
+    if (r == UPX_E_OK)
+        r = UPX_E_ERROR;
+done:
+    if (r == UPX_E_OK)
+    {
+        if (s.avail_in != 0 || s.total_in != src_len)
+            r = UPX_E_ERROR;
+    }
+    assert(s.total_in  <=  src_len);
+    assert(s.total_out <= *dst_len);
+    *dst_len = s.total_out;
+    return r;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+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 )
+{
+    assert(method == M_DEFLATE);
+    UNUSED(method);
+    UNUSED(cresult);
+    int r = UPX_E_ERROR;
+    int zr;
+
+    z_stream s;
+    s.zalloc = (alloc_func) 0;
+    s.zfree = (free_func) 0;
+    s.next_in = const_cast<upx_bytep>(src); // UNCONST
+    s.avail_in = src_len;
+    s.next_out = dst;
+    s.avail_out = *dst_len;
+    s.total_in = s.total_out = 0;
+
+    zr = inflateInit2(&s, -15);
+    if (zr != Z_OK)
+        goto error;
+    zr = inflate(&s, Z_FINISH);
+    if (zr != Z_STREAM_END)
+        goto error;
+    zr = inflateEnd(&s);
+    if (zr != Z_OK)
+        goto error;
+    r = UPX_E_OK;
+    goto done;
+error:
+    (void) inflateEnd(&s);
+    r = convert_errno_from_zlib(zr);
+    if (r == UPX_E_OK)
+        r = UPX_E_ERROR;
+done:
+    if (r == UPX_E_OK)
+    {
+        if (s.avail_in != 0 || s.total_in != src_len)
+            r = UPX_E_INPUT_NOT_CONSUMED;
+    }
+    assert(s.total_in  <=  src_len);
+    assert(s.total_out <= *dst_len);
+    *dst_len = s.total_out;
+    return r;
+}
+
+
+/*************************************************************************
+// test_overlap
+**************************************************************************/
+
+int upx_zlib_test_overlap  ( const upx_bytep buf, unsigned src_off,
+                                   unsigned  src_len, unsigned* dst_len,
+                                   int method,
+                             const upx_compress_result_t *cresult )
+{
+    assert(method == M_DEFLATE);
+
+    // FIXME - implement this
+    // Note that Packer::verifyOverlappingDecompression() will
+    // verify the final result in any case.
+    UNUSED(buf);
+
+    unsigned overlap_overhead = src_off + src_len - *dst_len;
+    //printf("upx_zlib_test_overlap: %d\n", overlap_overhead);
+    if ((int)overlap_overhead >= 256)
+        return UPX_E_OK;
+
+    UNUSED(cresult);
+    return UPX_E_ERROR;
+}
+
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+const char *upx_zlib_version_string(void)
+{
+    return zlibVersion();
+}
+
+
+#endif /* WITH_ZLIB */
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -1,240 +0,0 @@
-/* pseudo <config.h> for Linux */
-
-#ifndef __UPX_CONFIG_H
-#define __UPX_CONFIG_H
-
-/* $TOP$ */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your memcmp is broken.  */
-/* #undef NO_MEMCMP */
-
-/* Define to `long' if <stddef.h> doesn't define.  */
-/* #undef ptrdiff_t */
-
-/* The number of bytes in a ptrdiff_t.  */
-#define SIZEOF_PTRDIFF_T 4
-
-/* The number of bytes in a size_t.  */
-#define SIZEOF_SIZE_T 4
-
-/* Define when using the dmalloc package.  */
-/* #undef WITH_DMALLOC */
-
-/* Define if you have the access function.  */
-#define HAVE_ACCESS 1
-
-/* Define if you have the atoi function.  */
-#define HAVE_ATOI 1
-
-/* Define if you have the chmod function.  */
-#define HAVE_CHMOD 1
-
-/* Define if you have the chown function.  */
-#define HAVE_CHOWN 1
-
-/* Define if you have the ctime function.  */
-#define HAVE_CTIME 1
-
-/* Define if you have the difftime function.  */
-#define HAVE_DIFFTIME 1
-
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
-
-/* Define if you have the fileno function.  */
-#define HAVE_FILENO 1
-
-/* Define if you have the fstat function.  */
-#define HAVE_FSTAT 1
-
-/* Define if you have the XXX function.  */
-#define HAVE_GETPID 1
-
-/* Define if you have the XXX function.  */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have the getumask function.  */
-/* #undef HAVE_GETUMASK */
-
-/* Define if you have the gmtime function.  */
-#define HAVE_GMTIME 1
-
-/* Define if you have the index function.  */
-#define HAVE_INDEX 1
-
-/* Define if you have the isatty function.  */
-#define HAVE_ISATTY 1
-
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
-
-/* Define if you have the localtime function.  */
-#define HAVE_LOCALTIME 1
-
-/* Define if you have the memcmp function.  */
-#define HAVE_MEMCMP 1
-
-/* Define if you have the memcpy function.  */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the memset function.  */
-#define HAVE_MEMSET 1
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME 1
-
-/* Define if you have the setmode function.  */
-/* #undef HAVE_SETMODE */
-
-/* Define if you have the stat function.  */
-#define HAVE_STAT 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the stricmp function.  */
-/* #undef HAVE_STRICMP */
-
-/* Define if you have the strncasecmp function.  */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the strnicmp function.  */
-/* #undef HAVE_STRNICMP */
-
-/* Define if you have the strstr function.  */
-#define HAVE_STRSTR 1
-
-/* Define if you have the tzset function.  */
-#define HAVE_TZSET 1
-
-/* Define if you have the umask function.  */
-#define HAVE_UMASK 1
-
-/* Define if you have the utime function.  */
-#define HAVE_UTIME 1
-
-/* Define if you have the vsnprintf function.  */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have the <assert.h> header file.  */
-#define HAVE_ASSERT_H 1
-
-/* Define if you have the <ctype.h> header file.  */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <curses.h> header file.  */
-#define HAVE_CURSES_H 1
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <linux/kd.h> header file.  */
-#define HAVE_LINUX_KD_H 1
-
-/* Define if you have the <linux/kdev_t.h> header file.  */
-#define HAVE_LINUX_KDEV_T_H 1
-
-/* Define if you have the <linux/major.h> header file.  */
-#define HAVE_LINUX_MAJOR_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ncurses.h> header file.  */
-#define HAVE_NCURSES_H 1
-
-/* Define if you have the <signal.h> header file.  */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/times.h> header file.  */
-#define HAVE_SYS_TIMES_H 1
-
-/* Define if you have the <sys/utime.h> header file.  */
-/* #undef HAVE_SYS_UTIME_H */
-
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
-
-/* $BOTTOM$ */
-
-#if defined(HAVE_GMTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_GMTIME
-#endif
-
-#if defined(HAVE_LOCALTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_LOCALTIME
-#endif
-
-#if defined(HAVE_STRFTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_STRFTIME
-#endif
-
-#if defined(HAVE_SYS_RESOURCE_H) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_SYS_RESOURCE_H
-#endif
-
-#if defined(HAVE_SYS_TIMES_H) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_SYS_TIMES_H
-#endif
-
-#if (SIZEOF_PTRDIFF_T <= 0)
-#  undef /**/ SIZEOF_PTRDIFF_T
-#endif
-
-#if (SIZEOF_SIZE_T <= 0)
-#  undef /**/ SIZEOF_SIZE_T
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4
-*/
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -34,8 +34,9 @@
 #undef USE_CONSOLE
 #undef USE_ANSI
 #undef USE_SCREEN
-#undef USE_SCREEN_VCSA
 #undef USE_SCREEN_CURSES
+#undef USE_SCREEN_VCSA
+#undef USE_SCREEN_WIN32
 #undef USE_FRAMES

 #if defined(WITH_GUI) && !defined(NO_CONSOLE)
@@ -57,10 +58,12 @@

 #if 1 && defined(__DJGPP__)
 #  define USE_SCREEN
-#endif
-
-#if 1 && defined(__MFX_WIN32)
+#elif 1 && (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64)
 #  define USE_SCREEN
+#  define USE_SCREEN_WIN32
+#elif 1 && (ACC_OS_EMX && defined(__RSXNT__))
+#  define USE_SCREEN
+#  define USE_SCREEN_WIN32
 #endif


@@ -114,16 +117,16 @@ typedef struct
    int (*init)(FILE *f, int, int);
    int (*set_fg)(FILE *f, int fg);
    void (*print0)(FILE *f, const char *s);
-    upx_bool (*intro)(FILE *f);
+    bool (*intro)(FILE *f);
 }
 console_t;


 #if defined(__GNUC__)
-void con_fprintf(FILE *f, const char *format, ...)
-        __attribute__((format(printf,2,3)));
+void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
+        __attribute__((__format__(printf,2,3)));
 #else
-void con_fprintf(FILE *f, const char *format, ...);
+void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...);
 #endif


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,14 +21,55 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #include "conf.h"


+/*************************************************************************
+//
+**************************************************************************/
+
+long Throwable::counter = 0;
+
+Throwable::Throwable(const char *m, int e, bool w) NOTHROW
+    : super(), msg(NULL), err(e), is_warning(w)
+{
+    if (m)
+        msg = strdup(m);
+#if 0
+    fprintf(stderr, "construct exception: %s %ld\n", msg, counter);
+    counter++;
+#endif
+}
+
+
+Throwable::Throwable(const Throwable &other) NOTHROW
+    : super(other), msg(NULL), err(other.err), is_warning(other.is_warning)
+{
+    if (other.msg)
+        msg = strdup(other.msg);
+#if 0
+    fprintf(stderr, "copy exception: %s %ld\n", msg, counter);
+    counter++;
+#endif
+}
+
+
+Throwable::~Throwable() NOTHROW
+{
+#if 0
+    counter--;
+    fprintf(stderr, "destruct exception: %s %ld\n", msg, counter);
+#endif
+    if (msg)
+        free(msg);
+}
+
+
 /*************************************************************************
 // compression
 **************************************************************************/
@@ -44,6 +85,11 @@ void throwCantPack(const char *msg)
        throw CantUnpackException(msg);
 }

+void throwCantPackExact()
+{
+    throwCantPack("option '--exact' does not work with this file");
+}
+
 void throwFilterException()
 {
    throwCantPack("filter problem");
@@ -133,20 +179,24 @@ void throwEOFException(const char *msg, int e)
 //
 **************************************************************************/

-const char *prettyName(const char *n)
+const char *prettyName(const char *n) NOTHROW
 {
-    while (*n >= '0' && *n <= '9')              // gcc / egcs
-        n++;
-    if (strncmp(n, "class ", 6) == 0)           // Visual C++
-        n += 6;
+    if (n == NULL)
+        return "(null)";
+    while (*n)
+    {
+        if (*n >= '0' && *n <= '9')             // Linux ABI
+            n++;
+        else if (*n == ' ')
+            n++;
+        else if (strncmp(n, "class ", 6) == 0)  // Visual C++
+            n += 6;
+        else
+            break;
+    }
    return n;
 }

-const char *prettyName(const type_info &ti)
-{
-    return prettyName(ti.name());
-}
-

 /*
 vi:ts=4:et
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -31,32 +31,38 @@

 #ifdef __cplusplus

-const char *prettyName(const char *n);
-const char *prettyName(const type_info &ti);
+const char *prettyName(const char *n) NOTHROW;


 /*************************************************************************
 // exceptions
 **************************************************************************/

-class Throwable : public exception
+class Throwable : public std::exception
 {
+    typedef std::exception super;
 protected:
-    Throwable(const char *m = 0, int e = 0, bool w = false)
-        : msg(m), err(e), is_warning(w) { }
+    Throwable(const char *m = 0, int e = 0, bool w = false) NOTHROW;
 public:
-    virtual ~Throwable() { }
-    const char *getMsg() const { return msg; }
-    int getErrno() const { return err; }
-    bool isWarning() const { return is_warning; }
+    Throwable(const Throwable &) NOTHROW;
+    virtual ~Throwable() NOTHROW;
+    const char *getMsg() const NOTHROW { return msg; }
+    int getErrno() const NOTHROW { return err; }
+    bool isWarning() const NOTHROW { return is_warning; }
 private:
-    //Throwable(const Throwable &);
-private:
-//  void * operator new(size_t);        // ...
-    const char *msg;
+    char *msg;
    int err;
 protected:
    bool is_warning;                    // can be set by subclasses
+
+private:
+    // disable assignment
+    Throwable& operator= (const Throwable &);
+    // disable dynamic allocation
+    DISABLE_NEW_DELETE
+
+private:
+    static long counter;                // for debugging
 };


@@ -65,7 +71,7 @@ class Exception : public Throwable
 {
    typedef Throwable super;
 public:
-    Exception(const char *m = 0, int e = 0, bool w = false) : super(m,e,w) { }
+    Exception(const char *m = 0, int e = 0, bool w = false) NOTHROW : super(m,e,w) { }
 };


@@ -74,7 +80,7 @@ class Error : public Throwable
 {
    typedef Throwable super;
 public:
-    Error(const char *m = 0, int e = 0) : super(m,e) { }
+    Error(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -86,7 +92,7 @@ class OutOfMemoryException : public Exception
 {
    typedef Exception super;
 public:
-    OutOfMemoryException(const char *m = 0, int e = 0) : super(m,e) { }
+    OutOfMemoryException(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -94,7 +100,7 @@ class IOException : public Exception
 {
    typedef Exception super;
 public:
-    IOException(const char *m = 0, int e = 0) : super(m,e) { }
+    IOException(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -102,7 +108,7 @@ class EOFException : public IOException
 {
    typedef IOException super;
 public:
-    EOFException(const char *m = 0, int e = 0) : super(m,e) { }
+    EOFException(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -110,7 +116,7 @@ class FileNotFoundException : public IOException
 {
    typedef IOException super;
 public:
-    FileNotFoundException(const char *m = 0, int e = 0) : super(m,e) { }
+    FileNotFoundException(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -118,7 +124,7 @@ class FileAlreadyExistsException : public IOException
 {
    typedef IOException super;
 public:
-    FileAlreadyExistsException(const char *m = 0, int e = 0) : super(m,e) { }
+    FileAlreadyExistsException(const char *m = 0, int e = 0) NOTHROW : super(m,e) { }
 };


@@ -130,35 +136,35 @@ class OverlayException : public Exception
 {
    typedef Exception super;
 public:
-    OverlayException(const char *m = 0, bool w = false) : super(m,0,w) { }
+    OverlayException(const char *m = 0, bool w = false) NOTHROW : super(m,0,w) { }
 };

 class CantPackException : public Exception
 {
    typedef Exception super;
 public:
-    CantPackException(const char *m = 0, bool w = false) : super(m,0,w) { }
+    CantPackException(const char *m = 0, bool w = false) NOTHROW : super(m,0,w) { }
 };

 class UnknownExecutableFormatException : public CantPackException
 {
    typedef CantPackException super;
 public:
-    UnknownExecutableFormatException(const char *m = 0, bool w = false) : super(m,w) { }
+    UnknownExecutableFormatException(const char *m = 0, bool w = false) NOTHROW : super(m,w) { }
 };

 class AlreadyPackedException : public CantPackException
 {
    typedef CantPackException super;
 public:
-    AlreadyPackedException(const char *m = 0) : super(m) { is_warning = true; }
+    AlreadyPackedException(const char *m = 0) NOTHROW : super(m) { is_warning = true; }
 };

 class NotCompressibleException : public CantPackException
 {
    typedef CantPackException super;
 public:
-    NotCompressibleException(const char *m = 0) : super(m) { }
+    NotCompressibleException(const char *m = 0) NOTHROW : super(m) { }
 };


@@ -166,14 +172,14 @@ class CantUnpackException : public Exception
 {
    typedef Exception super;
 public:
-    CantUnpackException(const char *m = 0, bool w = false) : super(m,0,w) { }
+    CantUnpackException(const char *m = 0, bool w = false) NOTHROW : super(m,0,w) { }
 };

 class NotPackedException : public CantUnpackException
 {
    typedef CantUnpackException super;
 public:
-    NotPackedException(const char *m = 0) : super(m,true) { }
+    NotPackedException(const char *m = 0) NOTHROW : super(m,true) { }
 };


@@ -185,7 +191,7 @@ class InternalError : public Error
 {
    typedef Error super;
 public:
-    InternalError(const char *m = 0) : super(m,0) { }
+    InternalError(const char *m = 0) NOTHROW : super(m,0) { }
 };


@@ -196,25 +202,26 @@ public:
 #undef NORET
 #if 0 && defined(__GNUC__)
 // (noreturn) is probably not the correct semantics for throwing exceptions
-#define NORET __attribute__((noreturn))
+#define NORET __attribute__((__noreturn__))
 #else
 #define NORET
 #endif

 void throwCantPack(const char *msg) NORET;
-void throwUnknownExecutableFormat(const char *msg = 0, bool warn = false) NORET;
-void throwNotCompressible(const char *msg = 0) NORET;
-void throwAlreadyPacked(const char *msg = 0) NORET;
-void throwAlreadyPackedByUPX(const char *msg = 0) NORET;
+void throwCantPackExact() NORET;
+void throwUnknownExecutableFormat(const char *msg = NULL, bool warn = false) NORET;
+void throwNotCompressible(const char *msg = NULL) NORET;
+void throwAlreadyPacked(const char *msg = NULL) NORET;
+void throwAlreadyPackedByUPX(const char *msg = NULL) NORET;
 void throwCantUnpack(const char *msg) NORET;
-void throwNotPacked(const char *msg = 0) NORET;
+void throwNotPacked(const char *msg = NULL) NORET;
 void throwFilterException() NORET;
 void throwBadLoader() NORET;
 void throwChecksumError() NORET;
 void throwCompressedDataViolation() NORET;
 void throwInternalError(const char *msg) NORET;
-void throwIOException(const char *msg = 0, int e = 0) NORET;
-void throwEOFException(const char *msg = 0, int e = 0) NORET;
+void throwIOException(const char *msg = NULL, int e = 0) NORET;
+void throwEOFException(const char *msg = NULL, int e = 0) NORET;

 #undef NORET

@@ -1,125 +0,0 @@
-/* fctl_ml.ch -- filter CTO implementation
-
-   This file is part of the UPX executable compressor.
-
-   Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2000 Laszlo Molnar
-   All Rights Reserved.
-
-   UPX and the UCL library are free software; you can redistribute them
-   and/or modify them under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
- */
-
-
-
-/*************************************************************************
-// these are not implemented here
-**************************************************************************/
-
-// filter: e8, e9, e8e9
-#define f_cto32_e8              NULL
-#define f_cto32_e9              NULL
-#define f_cto32_e8e9            NULL
-
-// unfilter: e8, e9, e8e9
-#define u_cto32_e8              NULL
-#define u_cto32_e9              NULL
-#define u_cto32_e8e9            NULL
-
-// scan: e8, e9, e8e9
-#define s_cto32_e8              NULL
-#define s_cto32_e9              NULL
-#define s_cto32_e8e9            NULL
-
-// filter: e8, e9, e8e9 with bswap be->le
-#define f_cto32_e8_bswap_be     NULL
-#define f_cto32_e9_bswap_be     NULL
-#define f_cto32_e8e9_bswap_be   NULL
-
-// unfilter: e8, e9, e8e9 with bswap be->le
-#define u_cto32_e8_bswap_be     NULL
-#define u_cto32_e9_bswap_be     NULL
-#define u_cto32_e8e9_bswap_be   NULL
-
-// scan: e8, e9, e8e9 with bswap be->le
-#define s_cto32_e8_bswap_be     NULL
-#define s_cto32_e9_bswap_be     NULL
-#define s_cto32_e8e9_bswap_be   NULL
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-#define COND(b,x)   (b[x] == 0xe8)
-#define F           f_cto32_e8_bswap_le
-#define U           u_cto32_e8_bswap_le
-#include "fcto_ml2.ch"
-#undef U
-#undef F
-#define F           s_cto32_e8_bswap_le
-#include "fcto_ml2.ch"
-#undef F
-#undef COND
-
-#define COND(b,x)   (b[x] == 0xe9)
-#define F           f_cto32_e9_bswap_le
-#define U           u_cto32_e9_bswap_le
-#include "fcto_ml2.ch"
-#undef U
-#undef F
-#define F           s_cto32_e9_bswap_le
-#include "fcto_ml2.ch"
-#undef F
-#undef COND
-
-#define COND(b,x)   (b[x] == 0xe8 || b[x] == 0xe9)
-#define F           f_cto32_e8e9_bswap_le
-#define U           u_cto32_e8e9_bswap_le
-#include "fcto_ml2.ch"
-#undef U
-#undef F
-#define F           s_cto32_e8e9_bswap_le
-#include "fcto_ml2.ch"
-#undef F
-#undef COND
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-#define COND(b,x,lastcall)  (b[x] == 0xe8 || b[x] == 0xe9 \
-                            || (lastcall!=(x) && 0xf==b[(x)-1] \
-                               && 0x80<=b[x] && b[x]<=0x8f) )
-#define F           f_ctjo32_e8e9_bswap_le
-#define U           u_ctjo32_e8e9_bswap_le
-#include "fcto_ml3.ch"
-#undef U
-#undef F
-#define F           s_ctjo32_e8e9_bswap_le
-#include "fcto_ml3.ch"
-#undef F
-#undef COND
-
-
-
-/*
-vi:ts=4:et
-*/
-
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,13 +21,14 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #include "conf.h"
 #include "file.h"
+#include "mem.h"


 /*************************************************************************
@@ -39,13 +40,15 @@ void File::chmod(const char *name, int mode)
 #if defined(HAVE_CHMOD)
    if (::chmod(name,mode) != 0)
        throwIOException(name,errno);
+#else
+    UNUSED(name); UNUSED(mode);
 #endif
 }


 void File::rename(const char *old_, const char *new_)
 {
-#if 1 && defined(__DJGPP__)
+#if defined(__DJGPP__)
    if (::_rename(old_,new_) != 0)
 #else
    if (::rename(old_,new_) != 0)
@@ -85,6 +88,25 @@ FileBase::~FileBase()
 }


+void FileBase::sopen()
+{
+    if (_shflags < 0)
+        _fd = ::open(_name, _flags, _mode);
+    else
+    {
+#if defined(__DJGPP__)
+        _fd = ::open(_name,_flags | _shflags, _mode);
+#elif defined(__MINT__)
+        _fd = ::open(_name,_flags | (_shflags & O_SHMODE), _mode);
+#elif defined(SH_DENYRW)
+        _fd = ::sopen(_name, _flags, _shflags, _mode);
+#else
+        assert(0);
+#endif
+    }
+}
+
+
 bool FileBase::close()
 {
    bool ok = true;
@@ -108,35 +130,19 @@ void FileBase::closex()

 int FileBase::read(void *buf, int len)
 {
-    int l;
    if (!isOpen() || len < 0)
        throwIOException("bad read");
-    if (len == 0)
-        return 0;
-    for (;;)
-    {
-#if 1 && defined(__DJGPP__)
-        l = ::_read(_fd,buf,len);
-#else
-        l = ::read(_fd,buf,len);
-#endif
-        if (l < 0)
-        {
-#if defined(EINTR)
-            if (errno == EINTR)
-                continue;
-#endif
-            throwIOException("read error",errno);
-        }
-        break;
-    }
-    return l;
+    errno = 0;
+    long l = acc_safe_hread(_fd, buf, len);
+    if (errno)
+        throwIOException("read error",errno);
+    return (int) l;
 }


 int FileBase::readx(void *buf, int len)
 {
-    int l = this->read(buf,len);
+    int l = this->read(buf, len);
    if (l != len)
        throwEOFException();
    return l;
@@ -145,43 +151,33 @@ int FileBase::readx(void *buf, int len)

 void FileBase::write(const void *buf, int len)
 {
-    int l;
    if (!isOpen() || len < 0)
        throwIOException("bad write");
-    if (len == 0)
-        return;
-    for (;;)
-    {
-#if 1 && defined(__DJGPP__)
-        l = ::_write(_fd,buf,len);
-#else
-        l = ::write(_fd,buf,len);
-#endif
-#if defined(EINTR)
-        if (l < 0 && errno == EINTR)
-            continue;
-#endif
-        if (l != len)
-            throwIOException("write error",errno);
-        break;
-    }
+    errno = 0;
+    long l = acc_safe_hwrite(_fd, buf, len);
+    if (l != len)
+        throwIOException("write error",errno);
 }


 void FileBase::seek(off_t off, int whence)
 {
    if (!isOpen())
-        throwIOException("bad seek");
+        throwIOException("bad seek 1");
+    if (whence == SEEK_SET && off < 0)
+        throwIOException("bad seek 2");
+    if (whence == SEEK_END && off > 0)
+        throwIOException("bad seek 3");
    if (::lseek(_fd,off,whence) < 0)
        throwIOException("seek error",errno);
 }


-off_t FileBase::tell()
+off_t FileBase::tell() const
 {
    if (!isOpen())
        throwIOException("bad tell");
-    off_t l = ::lseek(_fd,0,SEEK_CUR);
+    off_t l = ::lseek(_fd, 0, SEEK_CUR);
    if (l < 0)
        throwIOException("tell error",errno);
    return l;
@@ -209,37 +205,53 @@ void InputFile::sopen(const char *name, int flags, int shflags)
    _flags = flags;
    _shflags = shflags;
    _mode = 0;
-    if (shflags < 0)
-        _fd = ::open(_name,_flags);
-    else
-#if defined(__DJGPP__)
-        _fd = ::open(_name,_flags | _shflags);
-#elif defined(SH_DENYRW)
-        _fd = ::sopen(_name,_flags,_shflags);
-#else
-        assert(0);
-#endif
+    FileBase::sopen();
    if (!isOpen())
    {
        if (errno == ENOENT)
-            throw FileNotFoundException(_name,errno);
+            throw FileNotFoundException(_name, errno);
        else if (errno == EEXIST)
-            throw FileAlreadyExistsException(_name,errno);
+            throw FileAlreadyExistsException(_name, errno);
        else
-            throwIOException(_name,errno);
+            throwIOException(_name, errno);
    }
 }


 int InputFile::read(void *buf, int len)
 {
-    return super::read(buf,len);
+    return super::read(buf, len);
 }

-
 int InputFile::readx(void *buf, int len)
 {
-    return super::readx(buf,len);
+    return super::readx(buf, len);
+}
+
+
+int InputFile::read(MemBuffer *buf, int len)
+{
+    buf->checkState();
+    assert((unsigned)len <= buf->getSize());
+    return read(buf->getVoidPtr(), len);
+}
+
+int InputFile::readx(MemBuffer *buf, int len)
+{
+    buf->checkState();
+    assert((unsigned)len <= buf->getSize());
+    return read(buf->getVoidPtr(), len);
+}
+
+
+int InputFile::read(MemBuffer &buf, int len)
+{
+    return read(&buf, len);
+}
+
+int InputFile::readx(MemBuffer &buf, int len)
+{
+    return readx(&buf, len);
 }


@@ -249,7 +261,7 @@ void InputFile::seek(off_t off, int whence)
 }


-off_t InputFile::tell()
+off_t InputFile::tell() const
 {
    return super::tell();
 }
@@ -277,16 +289,7 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode)
    _flags = flags;
    _shflags = shflags;
    _mode = mode;
-    if (shflags < 0)
-        _fd = ::open(_name,_flags,_mode);
-    else
-#if defined(__DJGPP__)
-        _fd = ::open(_name,_flags | _shflags, _mode);
-#elif defined(SH_DENYRW)
-        _fd = ::sopen(_name,_flags,_shflags,_mode);
-#else
-        assert(0);
-#endif
+    FileBase::sopen();
    if (!isOpen())
    {
 #if 0
@@ -306,45 +309,48 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode)
 bool OutputFile::openStdout(int flags, bool force)
 {
    close();
-    if (!force)
-    {
-        if (!isafile(STDOUT_FILENO))
-            return false;
-    }
-    _fd = STDOUT_FILENO;
+    int fd = STDOUT_FILENO;
+    if (!force && acc_isatty(fd))
+        return false;
    _name = "<stdout>";
    _flags = flags;
    _shflags = -1;
    _mode = 0;
-    if (flags != 0)
-    {
-        assert(flags == O_BINARY);
-#if defined(HAVE_SETMODE) && defined(USE_SETMODE)
-        if (setmode(_fd, O_BINARY) == -1)
-            throwIOException(_name,errno);
-#if defined(__DJGPP__)
-        __djgpp_set_ctrl_c(1);
-#endif
-#endif
-    }
+    if (flags && acc_set_binmode(fd, 1) == -1)
+        throwIOException(_name, errno);
+    _fd = fd;
    return true;
 }


 void OutputFile::write(const void *buf, int len)
 {
-    super::write(buf,len);
+    super::write(buf, len);
    bytes_written += len;
 }


+void OutputFile::write(const MemBuffer *buf, int len)
+{
+    buf->checkState();
+    assert((unsigned)len <= buf->getSize());
+    write(buf->getVoidPtr(), len);
+}
+
+
+void OutputFile::write(const MemBuffer &buf, int len)
+{
+    write(&buf, len);
+}
+
+
 void OutputFile::dump(const char *name, const void *buf, int len, int flags)
 {
    if (flags < 0)
         flags = O_CREAT | O_BINARY | O_TRUNC;
    flags |= O_WRONLY;
    OutputFile f;
-    f.open(name, flags, 0666);
+    f.open(name, flags, 0600);
    f.write(buf, len);
    f.closex();
 }
@@ -354,6 +360,8 @@ void OutputFile::dump(const char *name, const void *buf, int len, int flags)
 //
 **************************************************************************/

+#if 0
+
 MemoryOutputFile::MemoryOutputFile() :
    b(NULL), b_size(0), b_pos(0), bytes_written(0)
 {
@@ -374,6 +382,9 @@ void MemoryOutputFile::write(const void *buf, int len)
 }


+#endif /* if 0 */
+
+
 /*
 vi:ts=4:et
 */
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,14 +21,16 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #ifndef __UPX_FILE_H
 #define __UPX_FILE_H

+class MemBuffer;
+

 /*************************************************************************
 //
@@ -36,6 +38,9 @@

 class File
 {
+protected:
+    File() { }
+    virtual ~File() { }
 public:
    static void chmod(const char *name, int mode);
    static void rename(const char *old_, const char *new_);
@@ -56,11 +61,12 @@ public:
    const char *getName() const { return _name; }

 protected:
+    void sopen();
    virtual int read(void *buf, int len);
    virtual int readx(void *buf, int len);
    virtual void write(const void *buf, int len);
    virtual void seek(off_t off, int whence);
-    virtual off_t tell();
+    virtual off_t tell() const;

    int _fd;
    int _flags;
@@ -89,11 +95,15 @@ public:
        sopen(name, flags, -1);
    }

-    virtual int read(void * buf, int len);
-    virtual int readx(void * buf, int len);
+    virtual int read(void *buf, int len);
+    virtual int readx(void *buf, int len);
+    virtual int read(MemBuffer *buf, int len);
+    virtual int readx(MemBuffer *buf, int len);
+    virtual int read(MemBuffer &buf, int len);
+    virtual int readx(MemBuffer &buf, int len);

    virtual void seek(off_t off, int whence);
-    virtual off_t tell();
+    virtual off_t tell() const;
 };


@@ -116,16 +126,20 @@ public:
    virtual bool openStdout(int flags=0, bool force=false);

    virtual void write(const void *buf, int len);
+    virtual void write(const MemBuffer *buf, int len);
+    virtual void write(const MemBuffer &buf, int len);

    off_t getBytesWritten() const { return bytes_written; }

    // FIXME - these won't work when using the `--stdout' option
    virtual void seek(off_t off, int whence)
    {
+        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
    }
@@ -142,6 +156,7 @@ protected:
 //
 **************************************************************************/

+#if 0 /* NOT USED */
 class MemoryOutputFile : public FileBase
 {
    typedef FileBase super;
@@ -164,6 +179,7 @@ protected:
    unsigned b_pos;
    off_t bytes_written;
 };
+#endif /* if 0 */


 #endif /* already included */
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,13 +21,14 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #include "conf.h"
 #include "filter.h"
+#include "file.h"


 /*************************************************************************
@@ -40,7 +41,7 @@ void initFilter(Filter *f, upx_byte *buf, unsigned buf_len)
    f->buf = buf;
    f->buf_len = buf_len;
    // clear output parameters
-    f->calls = f->wrongcalls = f->noncalls = f->lastcall = 0;
+    f->calls = f->wrongcalls = f->noncalls = f->firstcall = f->lastcall = 0;
 }


@@ -78,6 +79,13 @@ const FilterImp::FilterEntry *FilterImp::getFilter(int id)
 }


+bool Filter::isValidFilter(int filter_id)
+{
+    const FilterImp::FilterEntry * const fe = FilterImp::getFilter(filter_id);
+    return fe != NULL;
+}
+
+
 /*************************************************************************
 // high level API
 **************************************************************************/
@@ -88,10 +96,10 @@ void Filter::init(int id_, unsigned addvalue_)
    initFilter(this, NULL, 0);
    // clear input parameters
    this->addvalue = addvalue_;
-    this->forced_cto = -1;
    this->preferred_ctos = NULL;
    // clear input/output parameters
    this->cto = 0;
+    this->n_mru = 0;
 }


@@ -112,13 +120,12 @@ bool Filter::filter(upx_byte *buf_, unsigned buf_len_)
        throwInternalError("filter-2");

    // save checksum
+    this->adler = 0;
    if (clevel != 1)
-    {
-        this->adler = upx_adler32(0,NULL,0);
-        this->adler = upx_adler32(this->adler, this->buf, this->buf_len);
-    }
+        this->adler = upx_adler32(this->buf, this->buf_len);

    //printf("filter: %02x %p %d\n", this->id, this->buf, this->buf_len);
+    //OutputFile::dump("filter.dat", buf, buf_len);
    int r = (*fe->do_filter)(this);
    //printf("filter: %02x %d\n", fe->id, r);
    if (r > 0)
@@ -129,7 +136,7 @@ bool Filter::filter(upx_byte *buf_, unsigned buf_len_)
 }


-bool Filter::unfilter(upx_byte *buf_, unsigned buf_len_, bool verify_checksum)
+void Filter::unfilter(upx_byte *buf_, unsigned buf_len_, bool verify_checksum)
 {
    initFilter(this, buf_, buf_len_);

@@ -137,11 +144,11 @@ bool Filter::unfilter(upx_byte *buf_, unsigned buf_len_, bool verify_checksum)
    if (fe == NULL)
        throwInternalError("unfilter-1");
    if (fe->id == 0)
-        return true;
+        return;
    if (buf_len < fe->min_buf_len)
-        return false;
+        return;
    if (fe->max_buf_len && buf_len > fe->max_buf_len)
-        return false;
+        return;
    if (!fe->do_unfilter)
        throwInternalError("unfilter-2");

@@ -150,20 +157,18 @@ bool Filter::unfilter(upx_byte *buf_, unsigned buf_len_, bool verify_checksum)
    //printf("unfilter: %02x %d\n", fe->id, r);
    if (r != 0)
        throwInternalError("unfilter-3");
+    //OutputFile::dump("unfilter.dat", buf, buf_len);

    // verify checksum
    if (verify_checksum && clevel != 1)
    {
-        unsigned a = upx_adler32(0,NULL,0);
-        if (this->adler != upx_adler32(a, this->buf, this->buf_len))
+        if (this->adler != upx_adler32(this->buf, this->buf_len))
            throwInternalError("unfilter-4");
    }
-
-    return true;
 }


-bool Filter::verifyUnfilter()
+void Filter::verifyUnfilter()
 {
    // Note:
    //   This verify is just because of complete paranoia that there
@@ -175,9 +180,8 @@ bool Filter::verifyUnfilter()
    //   Packer::verifyOverlappingDecompression()

    //printf("verifyUnfilter: %02x %p %d\n", this->id, this->buf, this->buf_len);
-    if (clevel == 1)
-        return true;
-    return unfilter(this->buf, this->buf_len, true);
+    if (clevel != 1)
+        unfilter(this->buf, this->buf_len, true);
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -44,8 +44,7 @@ class FilterImp;
 // call throwFilterException() - this will cause the compression
 // to fail.
 //
-// The return value of unfilters can/should be ignored. They throw
-// exceptions in case of errors.
+// Unfilters throw exceptions in case of errors.
 //
 // The main idea behind filters is to convert relative jumps and calls
 // to absolute addresses so that the buffer compresses better.
@@ -58,10 +57,12 @@ public:
    void init(int id=0, unsigned addvalue=0);

    bool filter(upx_byte *buf, unsigned buf_len);
-    bool unfilter(upx_byte *buf, unsigned buf_len, bool verify_checksum=false);
-    bool verifyUnfilter();
+    void unfilter(upx_byte *buf, unsigned buf_len, bool verify_checksum=false);
+    void verifyUnfilter();
    bool scan(const upx_byte *buf, unsigned buf_len);

+    static bool isValidFilter(int filter_id);
+
 public:
    // Will be set by each call to filter()/unfilter().
    // Read-only afterwards.
@@ -74,7 +75,6 @@ public:

    // Input parameters used by various filters.
    unsigned addvalue;
-    int forced_cto;
    const int *preferred_ctos;

    // Input/output parameters used by various filters
@@ -84,7 +84,9 @@ public:
    unsigned calls;
    unsigned noncalls;
    unsigned wrongcalls;
+    unsigned firstcall;
    unsigned lastcall;
+    unsigned n_mru;  // ctojr only

    // Read only.
    int id;
@@ -0,0 +1,465 @@
+/* ct.h -- calltrick filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+// 16-bit calltrick ("naive")
+**************************************************************************/
+
+#define CT16(f, cond, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 3; \
+    do { \
+        if (cond) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+            b += 2 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 2; \
+    return 0;
+
+
+
+// filter: e8, e9, e8e9
+static int f_ct16_e8(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_le16)
+}
+
+static int f_ct16_e9(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_le16)
+}
+
+static int f_ct16_e8e9(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_le16)
+}
+
+
+// unfilter: e8, e9, e8e9
+static int u_ct16_e8(Filter *f)
+{
+    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_le16)
+}
+
+static int u_ct16_e9(Filter *f)
+{
+    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
+}
+
+static int u_ct16_e8e9(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
+}
+
+
+// scan: e8, e9, e8e9
+static int s_ct16_e8(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
+}
+
+static int s_ct16_e9(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
+}
+
+static int s_ct16_e8e9(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
+}
+
+
+// filter: e8, e9, e8e9 with bswap le->be
+static int f_ct16_e8_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_be16)
+}
+
+static int f_ct16_e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_be16)
+}
+
+static int f_ct16_e8e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_be16)
+}
+
+
+// unfilter: e8, e9, e8e9 with bswap le->be
+static int u_ct16_e8_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_be16, set_le16)
+}
+
+static int u_ct16_e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
+}
+
+static int u_ct16_e8e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
+}
+
+
+// scan: e8, e9, e8e9 with bswap le->be
+static int s_ct16_e8_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_dummy)
+}
+
+static int s_ct16_e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_dummy)
+}
+
+static int s_ct16_e8e9_bswap_le(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_dummy)
+}
+
+
+// filter: e8, e9, e8e9 with bswap be->le
+static int f_ct16_e8_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_le16)
+}
+
+static int f_ct16_e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_le16)
+}
+
+static int f_ct16_e8e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_le16)
+}
+
+
+// unfilter: e8, e9, e8e9 with bswap be->le
+static int u_ct16_e8_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_be16)
+}
+
+static int u_ct16_e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
+}
+
+static int u_ct16_e8e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
+}
+
+
+// scan: e8, e9, e8e9 with bswap be->le
+static int s_ct16_e8_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
+}
+
+static int s_ct16_e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
+}
+
+static int s_ct16_e8e9_bswap_be(Filter *f)
+{
+    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
+}
+
+
+#undef CT16
+
+
+/*************************************************************************
+// 32-bit calltrick ("naive")
+**************************************************************************/
+
+#define CT32(f, cond, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 5; \
+    do { \
+        if (cond) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+            b += 4 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+
+// filter: e8, e9, e8e9
+static int f_ct32_e8(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_le32)
+}
+
+static int f_ct32_e9(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_le32)
+}
+
+static int f_ct32_e8e9(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_le32)
+}
+
+
+// unfilter: e8, e9, e8e9
+static int u_ct32_e8(Filter *f)
+{
+    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_le32)
+}
+
+static int u_ct32_e9(Filter *f)
+{
+    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
+}
+
+static int u_ct32_e8e9(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
+}
+
+
+// scan: e8, e9, e8e9
+static int s_ct32_e8(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
+}
+
+static int s_ct32_e9(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
+}
+
+static int s_ct32_e8e9(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
+}
+
+
+// filter: e8, e9, e8e9 with bswap le->be
+static int f_ct32_e8_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_be32)
+}
+
+static int f_ct32_e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_be32)
+}
+
+static int f_ct32_e8e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_be32)
+}
+
+
+// unfilter: e8, e9, e8e9 with bswap le->be
+static int u_ct32_e8_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_be32, set_le32)
+}
+
+static int u_ct32_e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
+}
+
+static int u_ct32_e8e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
+}
+
+
+// scan: e8, e9, e8e9 with bswap le->be
+static int s_ct32_e8_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_dummy)
+}
+
+static int s_ct32_e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_dummy)
+}
+
+static int s_ct32_e8e9_bswap_le(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_dummy)
+}
+
+
+// filter: e8, e9, e8e9 with bswap be->le
+static int f_ct32_e8_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_le32)
+}
+
+static int f_ct32_e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_le32)
+}
+
+static int f_ct32_e8e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_le32)
+}
+
+
+// unfilter: e8, e9, e8e9 with bswap be->le
+static int u_ct32_e8_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_be32)
+}
+
+static int u_ct32_e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
+}
+
+static int u_ct32_e8e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
+}
+
+
+// scan: e8, e9, e8e9 with bswap be->le
+static int s_ct32_e8_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
+}
+
+static int s_ct32_e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
+}
+
+static int s_ct32_e8e9_bswap_be(Filter *f)
+{
+    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
+}
+
+
+#undef CT32
+
+/*************************************************************************
+// 24-bit ARM calltrick ("naive")
+**************************************************************************/
+
+#define CT24ARM_LE(f, cond, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 4; \
+    do { \
+        if (cond) \
+        { \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+        } \
+        b += 4; \
+    } while (b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+
+#define ARMCT_COND_le (((b[3] & 0x0f) == 0x0b))
+
+static int f_ct24arm_le(Filter *f)
+{
+    CT24ARM_LE(f, ARMCT_COND_le, a / 4 + f->addvalue, get_le24, set_le24)
+}
+
+static int u_ct24arm_le(Filter *f)
+{
+    CT24ARM_LE(f, ARMCT_COND_le, 0 - a / 4 - f->addvalue, get_le24, set_le24)
+}
+
+static int s_ct24arm_le(Filter *f)
+{
+    CT24ARM_LE(f, ARMCT_COND_le, a + f->addvalue, get_le24, set_dummy)
+}
+
+#undef CT24ARM_LE
+
+#define CT24ARM_BE(f, cond, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 4; \
+    do { \
+        if (cond) \
+        { \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(1+b, get(1+b) + (addvalue)); \
+            f->calls++; \
+        } \
+        b += 4; \
+    } while (b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+#define ARMCT_COND_be (((b[0] & 0x0f) == 0x0b))
+
+static int f_ct24arm_be(Filter *f)
+{
+    CT24ARM_BE(f, ARMCT_COND_be, a / 4 + f->addvalue, get_be24, set_be24)
+}
+
+static int u_ct24arm_be(Filter *f)
+{
+    CT24ARM_BE(f, ARMCT_COND_be, 0 - a / 4 - f->addvalue, get_be24, set_be24)
+}
+
+static int s_ct24arm_be(Filter *f)
+{
+    CT24ARM_BE(f, ARMCT_COND_be, a + f->addvalue, get_be24, set_dummy)
+}
+
+#undef CT24ARM_BE
+#undef ARMCT_COND
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -1,9 +1,9 @@
-/* fctl_ml2.ch -- filter CTO implementation
+/* cto.h -- calltrick filter

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,14 +21,14 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */



 /*************************************************************************
-//
+// filter / scan
 **************************************************************************/

 static int F(Filter *f)
@@ -36,72 +36,40 @@ static int F(Filter *f)
 #ifdef U
    // filter
    upx_byte *b = f->buf;
-    const unsigned addvalue = f->addvalue;
 #else
    // scan
    const upx_byte *b = f->buf;
 #endif
+    const unsigned addvalue = f->addvalue;
    const unsigned size = f->buf_len;

    unsigned ic, jc, kc;
-    unsigned cto;
-    unsigned char cto8;
    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
    unsigned lastnoncall = size, lastcall = 0;

    // find a 16MB large empty address space
-    if (f->forced_cto >= 0 && f->forced_cto <= 255)
-        cto8 = (unsigned char) f->forced_cto;
-    else
    {
        unsigned char buf[256];
        memset(buf,0,256);

-#if 1
+        // A call to a destination that is inside the buffer
+        // will be rewritten and marked with cto8 as first byte.
+        // So, a call to a destination that is outside the buffer
+        // must not conflict with the mark.
+        // Note that unsigned comparison checks both edges of buffer.
        for (ic = 0; ic < size - 5; ic++)
            if (COND(b,ic) && get_le32(b+ic+1)+ic+1 >= size)
            {
                buf[b[ic+1]] |= 1;
            }
-#else
-        {
-            int i = size - 6;
-            do {
-                if (COND(b,i) && get_le32(b+i+1)+i+1 >= size)
-                    buf[b[i+1]] |= 1;
-            } while (--i >= 0);
-        }
-#endif

-        ic = 256;
-        if (f->preferred_ctos)
-        {
-            for (const int *pc = f->preferred_ctos; *pc >= 0; pc++)
-            {
-                if (buf[*pc & 255] == 0)
-                {
-                    ic = *pc & 255;
-                    break;
-                }
-            }
-        }
-#if 0
-        // just a test to see if certain ctos would improve compression
-        if (ic >= 256)
-            for (ic = 0; ic < 256; ic += 16)
-                if (buf[ic] == 0)
-                    break;
-#endif
-        if (ic >= 256)
-            for (ic = 0; ic < 256; ic++)
-                if (buf[ic] == 0)
-                    break;
-        if (ic >= 256)
-            //throwCantPack("call trick problem");
+        if (getcto(f, buf) < 0)
            return -1;
-        cto8 = (unsigned char) ic;
    }
-    cto = (unsigned)cto8 << 24;
+    const unsigned char cto8 = f->cto;
+#ifdef U
+    const unsigned cto = (unsigned)f->cto << 24;
+#endif

    for (ic = 0; ic < size - 5; ic++)
    {
@@ -111,6 +79,8 @@ static int F(Filter *f)
        // try to detect 'real' calls only
        if (jc < size)
        {
+            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+                return 1;  // fail - buffer not restored
 #ifdef U
            set_be32(b+ic+1,jc+addvalue+cto);
 #endif
@@ -145,7 +115,6 @@ static int F(Filter *f)
        }
    }

-    f->cto = cto8;
    f->calls = calls;
    f->noncalls = noncalls;
    f->lastcall = lastcall;
@@ -157,13 +126,17 @@ static int F(Filter *f)
 }


+/*************************************************************************
+// unfilter
+**************************************************************************/
+
 #ifdef U
 static int U(Filter *f)
 {
    upx_byte *b = f->buf;
    const unsigned size5 = f->buf_len - 5;
    const unsigned addvalue = f->addvalue;
-    const unsigned cto = f->cto << 24;
+    const unsigned cto = (unsigned)f->cto << 24;

    unsigned ic, jc;

@@ -186,7 +159,11 @@ static int U(Filter *f)
 #endif


+#undef F
+#undef U
+
+
 /*
-vi:ts=4:et
+vi:ts=4:et:nowrap
 */

@@ -1,10 +1,10 @@
-/* fctl_ml3.ch -- filter CTO implementation
+/* ctoj.h -- filter CTO implementation

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -22,14 +22,17 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
 */



 /*************************************************************************
-//
+// filter / scan
 **************************************************************************/

 static int F(Filter *f)
@@ -37,72 +40,35 @@ static int F(Filter *f)
 #ifdef U
    // filter
    upx_byte *b = f->buf;
-    const unsigned addvalue = f->addvalue;
 #else
    // scan
    const upx_byte *b = f->buf;
 #endif
+    const unsigned addvalue = f->addvalue;
    const unsigned size = f->buf_len;

    unsigned ic, jc, kc;
-    unsigned cto;
-    unsigned char cto8;
    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
    unsigned lastnoncall = size, lastcall = 0;

    // find a 16MB large empty address space
-    if (f->forced_cto >= 0 && f->forced_cto <= 255)
-        cto8 = (unsigned char) f->forced_cto;
-    else
    {
        unsigned char buf[256];
        memset(buf,0,256);

-#if 1
        for (ic = 0; ic < size - 5; ic++)
            if (COND(b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
            {
                buf[b[ic+1]] |= 1;
            }
-#else
-        {
-            int i = size - 6;
-            do {
-                if (COND(b,i,lastcall) && get_le32(b+i+1)+i+1 >= size)
-                    buf[b[i+1]] |= 1;
-            } while (--i >= 0);
-        }
-#endif

-        ic = 256;
-        if (f->preferred_ctos)
-        {
-            for (const int *pc = f->preferred_ctos; *pc >= 0; pc++)
-            {
-                if (buf[*pc & 255] == 0)
-                {
-                    ic = *pc & 255;
-                    break;
-                }
-            }
-        }
-#if 0
-        // just a test to see if certain ctos would improve compression
-        if (ic >= 256)
-            for (ic = 0; ic < 256; ic += 16)
-                if (buf[ic] == 0)
-                    break;
-#endif
-        if (ic >= 256)
-            for (ic = 0; ic < 256; ic++)
-                if (buf[ic] == 0)
-                    break;
-        if (ic >= 256)
-            //throwCantPack("call trick problem");
+        if (getcto(f, buf) < 0)
            return -1;
-        cto8 = (unsigned char) ic;
    }
-    cto = (unsigned)cto8 << 24;
+    const unsigned char cto8 = f->cto;
+#ifdef U
+    const unsigned cto = (unsigned)f->cto << 24;
+#endif

    for (ic = 0; ic < size - 5; ic++)
    {
@@ -112,6 +78,8 @@ static int F(Filter *f)
        // try to detect 'real' calls only
        if (jc < size)
        {
+            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+                return 1;  // fail - buffer not restored
 #ifdef U
            set_be32(b+ic+1,jc+addvalue+cto);
 #endif
@@ -146,7 +114,6 @@ static int F(Filter *f)
        }
    }

-    f->cto = cto8;
    f->calls = calls;
    f->noncalls = noncalls;
    f->lastcall = lastcall;
@@ -158,15 +125,18 @@ static int F(Filter *f)
 }


+/*************************************************************************
+// unfilter
+**************************************************************************/
+
 #ifdef U
 static int U(Filter *f)
 {
    upx_byte *b = f->buf;
    const unsigned size5 = f->buf_len - 5;
    const unsigned addvalue = f->addvalue;
-    const unsigned cto = f->cto << 24;
-    unsigned lastcall = 0;
-
+    const unsigned cto = (unsigned)f->cto << 24;
+//    unsigned lastcall = 0;    // lastcall is not used in COND macro
    unsigned ic, jc;

    for (ic = 0; ic < size5; ic++)
@@ -178,7 +148,7 @@ static int U(Filter *f)
                set_le32(b+ic+1,jc-ic-1-addvalue-cto);
                f->calls++;
                ic += 4;
-                f->lastcall = lastcall = ic+1;
+                f->lastcall = ic+1;
            }
            else
                f->noncalls++;
@@ -188,7 +158,11 @@ static int U(Filter *f)
 #endif


+#undef F
+#undef U
+
+
 /*
-vi:ts=4:et
+vi:ts=4:et:nowrap
 */

@@ -0,0 +1,348 @@
+/* ctojr.h -- filter CTO implementation; renumber destinations MRU
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2000-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+#if (ACC_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1300))
+#  pragma warning(disable: 4702)        // W4: unreachable code
+#endif
+
+
+/*************************************************************************
+// filter / scan
+**************************************************************************/
+
+#ifdef U  //{
+#define NOFILT 0  // no filter
+#define FNOMRU 1  // filter, but not using mru
+#define MRUFLT 2  // mru filter
+
+static unsigned
+f80_call(Filter const *f)
+{
+    return (1+ (0x0f & f->id)) % 3;
+}
+
+static unsigned
+f80_jmp1(Filter const *f)
+{
+    return ((1+ (0x0f & f->id)) / 3) % 3;
+}
+
+static unsigned
+f80_jcc2(Filter const *f)
+{
+    return f80_jmp1(f);
+}
+
+static int const N_MRU = 32;  // does not have to be a power of 2
+
+// Adaptively remember recent destinations.
+static void
+update_mru(
+    unsigned const jc,  // destination address
+    int const kh,  // mru[kh] is slot where found
+    unsigned mru[N_MRU],  // circular buffer of most recent destinations
+    int &hand,  // mru[hand] is most recent destination
+    int &tail   // mru[tail] is beyond oldest destination ("cold cache" startup)
+)
+{
+    if (0 > --hand) {
+        hand = N_MRU -1;
+    }
+    unsigned const t = mru[hand];  // entry which will be overwritten by jc
+    if (0!=t) { // have seen at least N_MRU destinations
+        mru[kh] = t;
+    }
+    else { // "cold cache": keep active region contiguous
+        if (0 > --tail) {
+            tail = N_MRU -1;
+        }
+        unsigned const t2 = mru[tail];
+        mru[tail] = 0;
+        mru[kh] = t2;
+    }
+    mru[hand] = jc;
+}
+#endif  //}
+
+
+static int F(Filter *f)
+{
+#ifdef U
+    // filter
+    upx_byte *const b = f->buf;
+#else
+    // scan
+    const upx_byte *b = f->buf;
+#endif
+    const unsigned size = f->buf_len;
+
+    unsigned ic, jc, kc;
+    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
+    unsigned lastnoncall = size, lastcall = 0;
+    unsigned wtally[3]; memset(wtally, 0, sizeof(wtally));
+
+#ifdef U  //{
+    unsigned const f_call = f80_call(f);
+    unsigned const f_jmp1 = f80_jmp1(f);
+    unsigned const f_jcc2 = f80_jcc2(f);
+
+    int hand = 0, tail = 0;
+    unsigned mru[N_MRU];
+    memset(&mru[0], 0, sizeof(mru));
+    assert(N_MRU<=256);
+    f->n_mru = (MRUFLT==f_call || MRUFLT==f_jmp1 || MRUFLT==f_jcc2) ?
+        N_MRU : 0;
+#endif  //}
+
+    // FIXME: We must fit into 8MB because we steal one bit.
+    // find a 16MB large empty address space
+    {
+        int which;
+        unsigned char buf[256];
+        memset(buf,0,256);
+
+        for (ic = 0; ic < size - 5; ic++)
+            if (CONDF(which,b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
+            {
+                buf[b[ic+1]] |= 1;
+            }
+        UNUSED(which);
+
+        if (getcto(f, buf) < 0)
+            return -1;
+    }
+    const unsigned char cto8 = f->cto;
+#ifdef U
+    const unsigned cto = (unsigned)f->cto << 24;
+#endif
+
+    for (ic = 0; ic < size - 5; ic++)
+    {
+        int which;
+        int f_on = 0;
+        if (!CONDF(which,b,ic,lastcall))
+            continue;
+        ++wtally[which];
+        jc = get_le32(b+ic+1)+ic+1;
+        // try to detect 'real' calls only
+        if (jc < size)
+        {
+#ifdef U
+            if (2==which && NOFILT!=f_jcc2) { // 6-byte Jcc <disp32>
+                // Prefix 0x0f is constant, but opcode condition 0x80..0x8f
+                // varies.  Because we store the destination (or its mru index)
+                // in be32 big endian format, the low-addressed bytes
+                // will tend to be constant.  Swap prefix and opcode
+                // so that constants are together for better compression.
+                unsigned char const t =
+                b[ic-1];
+                b[ic-1] = b[ic];
+                          b[ic] = t;
+            }
+    // FIXME [?]: Extend to 8 bytes if "ADD ESP, byte 4*n" follows CALL.
+    //   This will require two related cto's (consecutive, or otherwise).
+            if ((0==which && MRUFLT==f_call)
+            ||  (1==which && MRUFLT==f_jmp1)
+            ||  (2==which && MRUFLT==f_jcc2) ) {
+                f_on = 1;
+                // Recode the destination: narrower mru indices
+                // should compress better than wider addresses.
+                // (But not when offset of match is unlimited?)
+                int k;
+                for (k = 0; k < N_MRU; ++k) {
+                    int kh = hand + k;
+                    if (N_MRU <= kh) {
+                        kh -= N_MRU;
+                    }
+                    if (mru[kh] == jc) { // destination was seen recently
+                        set_be32(b+ic+1,((k<<1)|0)+cto);
+                        update_mru(jc, kh, mru, hand, tail);
+                        break;
+                    }
+                }
+                if (k == N_MRU) { // loop failed; jc is not in mru[]
+                    set_be32(b+ic+1,((jc<<1)|1)+cto);
+                    // Adaptively remember recent destinations.
+                    if (0 > --hand) {
+                        hand = N_MRU -1;
+                    }
+                    mru[hand] = jc;
+                }
+            } else
+            if ((0==which && NOFILT!=f_call)
+            ||  (1==which && NOFILT!=f_jmp1)
+            ||  (2==which && NOFILT!=f_jcc2) ) {
+                f_on = 1;
+                set_be32(b+ic+1, jc+cto);
+            }
+#endif
+            if (f_on) {
+                    if (ic - lastnoncall < 5)
+                    {
+                        // check the last 4 bytes before this call
+                        for (kc = 4; kc; kc--)
+                            if (CONDF(which,b,ic-kc,lastcall) && b[ic-kc+1] == cto8)
+                                break;
+                        if (kc)
+                        {
+        #ifdef U
+                            // restore original
+                            if (2==which) {
+                                // Unswap prefix and opcode for 6-byte Jcc <disp32>
+                                unsigned char const t =
+                                b[ic-1];
+                                b[ic-1] = b[ic];
+                                          b[ic] = t;
+                            }
+                            set_le32(b+ic+1,jc-ic-1);
+        #endif
+                            if (b[ic+1] == cto8)
+                                return 1;           // fail - buffer not restored
+                            lastnoncall = ic;
+                            noncalls2++;
+                            continue;
+                        }
+                    }
+                    calls++;
+                    ic += 4;
+                    lastcall = ic+1;
+            }
+        }
+        else
+        {
+            assert(b[ic+1] != cto8);        // this should not happen
+            lastnoncall = ic;
+            noncalls++;
+        }
+    }
+
+    f->calls = calls;
+    f->noncalls = noncalls;
+    f->lastcall = lastcall;
+
+/*#ifdef 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*/
+    return 0;
+}
+
+
+/*************************************************************************
+// unfilter
+**************************************************************************/
+
+#ifdef U
+static int U(Filter *f)
+{
+    unsigned ic, jc;
+
+    upx_byte *const b = f->buf;
+    const unsigned size5 = f->buf_len - 5;
+    const unsigned cto = (unsigned)f->cto << 24;
+    unsigned lastcall = 0;
+    int hand = 0, tail = 0;
+    unsigned const f_call = f80_call(f);
+    unsigned const f_jmp1 = f80_jmp1(f);
+    unsigned const f_jcc2 = f80_jcc2(f);
+
+    unsigned mru[N_MRU];
+    memset(&mru[0], 0, sizeof(mru));
+
+    for (ic = 0; ic < size5; ic++) {
+        int which;
+        if (CONDU(which,b,ic,lastcall))
+        {
+            unsigned f_on = 0;
+            jc = get_be32(b+ic+1) - cto;
+            if (b[ic+1] == f->cto)
+            {
+                if ((0==which && MRUFLT==f_call)
+                ||  (1==which && MRUFLT==f_jmp1)
+                ||  (2==which && MRUFLT==f_jcc2) ) {
+                    f_on = 1;
+                        if (1&jc) { // 1st time at this destination
+                            jc >>= 1;
+                            if (0 > --hand) {
+                                hand = N_MRU -1;
+                            }
+                            mru[hand] = jc;
+                        }
+                        else { // not 1st time at this destination
+                            jc >>= 1;
+                            int kh = jc + hand;
+                            if (N_MRU <= kh) {
+                                kh -= N_MRU;
+                            }
+                            jc = mru[kh];
+                            update_mru(jc, kh, mru, hand, tail);
+                        }
+                    set_le32(b+ic+1,jc-ic-1);
+                } else
+                if ((0==which && NOFILT!=f_call)
+                ||  (1==which && NOFILT!=f_jmp1)
+                ||  (2==which && NOFILT!=f_jcc2) ) {
+                    f_on = 1;
+                    set_le32(b+ic+1,jc-ic-1);
+                }
+                if (2==which && NOFILT!=f_jcc2) {
+                    // Unswap prefix and opcode for 6-byte Jcc <disp32>
+                    unsigned char const t =
+                    b[ic-1];
+                    b[ic-1] = b[ic];
+                            b[ic] = t;
+                }
+
+                if (f_on) {
+                    f->calls++;
+                    ic += 4;
+                    f->lastcall = lastcall = ic+1;
+                }
+            }
+            else
+                f->noncalls++;
+        }
+    }
+    return 0;
+}
+#endif
+
+
+#undef F
+#undef U
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,171 @@
+/* ctok.h -- filter CTO implementation
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2000-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+// filter / scan
+**************************************************************************/
+
+static int F(Filter *f)
+{
+#ifdef U
+    // filter
+    upx_byte *b = f->buf;
+#else
+    // scan
+    const upx_byte *b = f->buf;
+#endif
+    const unsigned addvalue = f->addvalue;
+    const unsigned size = f->buf_len;
+    unsigned const id = f->id;
+
+    unsigned ic, jc, kc;
+    unsigned calls = 0, noncalls = 0, noncalls2 = 0;
+    unsigned lastnoncall = size, lastcall = 0;
+
+    // find a 16MB large empty address space
+    {
+        unsigned char buf[256];
+        memset(buf,0,256);
+
+        for (ic = 0; ic < size - 5; ic++)
+            if (COND(b,ic,lastcall,id) && get_le32(b+ic+1)+ic+1 >= size)
+            {
+                buf[b[ic+1]] |= 1;
+            }
+
+        if (getcto(f, buf) < 0)
+            return -1;
+    }
+    const unsigned char cto8 = f->cto;
+#ifdef U
+    const unsigned cto = (unsigned)f->cto << 24;
+#endif
+
+    for (ic = 0; ic < size - 5; ic++)
+    {
+        if (!COND(b,ic,lastcall,id))
+            continue;
+        jc = get_le32(b+ic+1)+ic+1;
+        // try to detect 'real' calls only
+        if (jc < size)
+        {
+            if ((1u<<24)<=(jc+addvalue))  // hi 8 bits won't be cto8
+                return 1;  // fail - buffer not restored
+#ifdef U
+            set_be32(b+ic+1,jc+addvalue+cto);
+#endif
+            if (ic - lastnoncall < 5)
+            {
+                // check the last 4 bytes before this call
+                for (kc = 4; kc; kc--)
+                    if (COND(b,ic-kc,lastcall,id) && b[ic-kc+1] == cto8)
+                        break;
+                if (kc)
+                {
+#ifdef U
+                    // restore original
+                    set_le32(b+ic+1,jc-ic-1);
+#endif
+                    if (b[ic+1] == cto8)
+                        return 1;           // fail - buffer not restored
+                    lastnoncall = ic;
+                    noncalls2++;
+                    continue;
+                }
+            }
+            calls++;
+            ic += 4;
+            lastcall = ic+1;
+        }
+        else
+        {
+            assert(b[ic+1] != cto8);        // this should not happen
+            lastnoncall = ic;
+            noncalls++;
+        }
+    }
+
+    f->calls = calls;
+    f->noncalls = noncalls;
+    f->lastcall = lastcall;
+
+#ifdef TESTING
+    printf("\ncalls=%d noncalls=%d noncalls2=%d text_size=%x calltrickoffset=%x\n",calls,noncalls,noncalls2,size,cto);
+#endif
+    return 0;
+}
+
+
+/*************************************************************************
+// unfilter
+**************************************************************************/
+
+#ifdef U
+static int U(Filter *f)
+{
+    upx_byte *b = f->buf;
+    const unsigned size5 = f->buf_len - 5;
+    const unsigned addvalue = f->addvalue;
+    const unsigned cto = (unsigned)f->cto << 24;
+    unsigned const id = f->id;
+    unsigned lastcall = 0;
+
+    unsigned ic, jc;
+
+    for (ic = 0; ic < size5; ic++)
+        if (COND(b,ic,lastcall,id))
+        {
+            jc = get_be32(b+ic+1);
+            if (b[ic+1] == f->cto)
+            {
+                set_le32(b+ic+1,jc-ic-1-addvalue-cto);
+                f->calls++;
+                ic += 4;
+                f->lastcall = lastcall = ic+1;
+            }
+            else
+                f->noncalls++;
+        }
+    return 0;
+}
+#endif
+
+
+#undef F
+#undef U
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,173 @@
+/* ctsw.h -- call-/swaptrick filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+// 16-bit call-/swaptrick ("naive")
+**************************************************************************/
+
+#define CTSW16(f, cond1, cond2, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 3; \
+    do { \
+        if (cond1) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+            b += 2 - 1; \
+        } \
+        else if (cond2) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b)); \
+            f->calls++; \
+            b += 2 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 2; \
+    return 0;
+
+
+// filter
+static int f_ctsw16_e8_e9(Filter *f)
+{
+    CTSW16(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le16, set_be16)
+}
+
+static int f_ctsw16_e9_e8(Filter *f)
+{
+    CTSW16(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le16, set_be16)
+}
+
+
+// unfilter
+static int u_ctsw16_e8_e9(Filter *f)
+{
+    CTSW16(f, (*b == 0xe8), (*b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
+}
+
+static int u_ctsw16_e9_e8(Filter *f)
+{
+    CTSW16(f, (*b == 0xe9), (*b == 0xe8), 0 - a - f->addvalue, get_be16, set_le16)
+}
+
+
+// scan
+static int s_ctsw16_e8_e9(Filter *f)
+{
+    CTSW16(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
+}
+
+static int s_ctsw16_e9_e8(Filter *f)
+{
+    CTSW16(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
+}
+
+
+#undef CTSW16
+
+
+/*************************************************************************
+// 32-bit call-/swaptrick ("naive")
+**************************************************************************/
+
+#define CTSW32(f, cond1, cond2, addvalue, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 5; \
+    do { \
+        if (cond1) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b) + (addvalue)); \
+            f->calls++; \
+            b += 4 - 1; \
+        } \
+        else if (cond2) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b)); \
+            f->calls++; \
+            b += 4 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+
+// filter
+static int f_ctsw32_e8_e9(Filter *f)
+{
+    CTSW32(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le32, set_be32)
+}
+
+static int f_ctsw32_e9_e8(Filter *f)
+{
+    CTSW32(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le32, set_be32)
+}
+
+
+// unfilter
+static int u_ctsw32_e8_e9(Filter *f)
+{
+    CTSW32(f, (*b == 0xe8), (*b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
+}
+
+static int u_ctsw32_e9_e8(Filter *f)
+{
+    CTSW32(f, (*b == 0xe9), (*b == 0xe8), 0 - a - f->addvalue, get_be32, set_le32)
+}
+
+
+// scan
+static int s_ctsw32_e8_e9(Filter *f)
+{
+    CTSW32(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
+}
+
+static int s_ctsw32_e9_e8(Filter *f)
+{
+    CTSW32(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
+}
+
+
+#undef CTSW32
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,75 @@
+/* getcto.h -- calltrick util
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+static int getcto(Filter *f, const unsigned char *buf, const int n=256)
+{
+    int ic = n;
+
+    if (f->preferred_ctos)
+    {
+        for (const int *pc = f->preferred_ctos; *pc >= 0; pc++)
+        {
+            if (*pc < n && buf[*pc] == 0)
+            {
+                ic = *pc;
+                break;
+            }
+        }
+    }
+
+#if 0
+    // just a test to see if certain ctos would improve compression
+    if (ic >= n)
+        for (ic = 0; ic < n; ic += 16)
+            if (buf[ic] == 0)
+                break;
+#endif
+    if (ic >= n)
+        for (ic = 0; ic < n; ic++)
+            if (buf[ic] == 0)
+                break;
+
+    if (ic >= n)
+        //throwCantPack("call trick problem");
+        return -1;
+
+    f->cto = (unsigned char) ic;
+    return ic;
+}
+
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,155 @@
+/* ppcbxx.h -- PowerPC Branch trick
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2004-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+// filter / scan
+**************************************************************************/
+
+#define W_CTO 4  /* width of cto; must match stub/ppc_bxx.S */
+
+static int F(Filter *f)
+{
+#ifdef U
+    // filter
+    upx_byte *b = f->buf;
+    const unsigned addvalue = f->addvalue;
+#else
+    // scan
+    const upx_byte *b = f->buf;
+#endif
+    const unsigned size  = umin(f->buf_len, -(~0u<<(32 - (6+ W_CTO))));
+    const unsigned size4 = size -4;
+
+    unsigned ic;
+    unsigned calls = 0, noncalls = 0;
+    unsigned lastnoncall = size, lastcall = 0;
+
+    // find 26-2-W_CTO bits of displacements that contain no targets
+    {
+        unsigned char buf[256];
+        unsigned short wbuf[256];
+        const size_t WW = (size_t)0 - (~(size_t)0) << W_CTO; // ???
+        memset(wbuf, 0, sizeof(wbuf));
+        memset(buf     , 0,       WW);
+        memset(buf + WW, 1, 256 - WW);
+
+        for (ic = 0; ic<=size4; ic+=4) if (COND(b,ic)) {
+            unsigned const off = (int)(get_be32(b+ic)<<6) >>6;
+            if (size <= (off & (~0u<<2))+ic) {
+                buf[(~(~0u<<W_CTO)) & (off>>(26 - W_CTO))] |= 1;
+                ++wbuf[0xff&(off>>18)];
+            }
+        }
+
+        if (getcto(f, buf) < 0) {
+            if (0!=W_CTO)  // FIXME: what is this ???
+                return -1;
+            f->cto = 0;
+        }
+    }
+    const unsigned char cto8 = f->cto;
+#ifdef U
+    const unsigned cto = (unsigned)f->cto << (24+2 - W_CTO);
+#endif
+
+    for (ic = 0; ic<=size4; ic+=4) if (COND(b,ic)) {
+        unsigned const word = get_be32(b+ic);
+        unsigned const off = (int)(word<<6) >>6;
+        unsigned const jc = (off & (~0u<<2))+ic;
+        // try to detect 'real' calls only
+        if (jc < size) {
+#ifdef U
+            set_be32(b+ic,(0xfc000003&word) | (jc+addvalue+cto));
+#endif
+            calls++;
+            lastcall = ic;
+        }
+        else {
+            assert(0==W_CTO  // FIXME: what is this ???
+            || (~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) != cto8);  // this should not happen
+            lastnoncall = ic;
+            noncalls++;
+        }
+    }
+
+    f->calls = calls;
+    f->noncalls = noncalls;
+    f->lastcall = lastcall;
+
+#if 0
+    printf("\ncalls=%d noncalls=%d text_size=%x calltrickoffset=%x\n",
+        calls,noncalls,size,cto8);
+#endif
+    return 0;
+}
+
+
+/*************************************************************************
+// unfilter
+**************************************************************************/
+
+#ifdef U
+static int U(Filter *f)
+{
+    upx_byte *b = f->buf;
+    const unsigned size4 = umin(f->buf_len - 4, -(~0u<<(32 - (6+ W_CTO))));
+    const unsigned addvalue = f->addvalue;
+
+    unsigned ic;
+
+   for (ic = 0; ic<=size4; ic+=4) if (COND(b,ic)) {
+        unsigned const word = get_be32(b+ic);
+        if ((~(~0u<<W_CTO) & (word>>(24+2 - W_CTO))) == f->cto) {
+            unsigned const jc = word & (~(~0u<<(26 - W_CTO)) & (~0u<<2));
+            set_be32(b+ic, (0xfc000003&word)|(0x03fffffc&(jc-ic-addvalue)));
+            f->calls++;
+            f->lastcall = ic;
+        }
+        else {
+            f->noncalls++;
+        }
+    }
+    return 0;
+}
+#endif
+
+
+#undef F
+#undef U
+
+#undef W_CTO
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,87 @@
+/* sub.hh -- simple delta filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#define SUB(f, N, T, get, set) \
+    upx_byte *b = f->buf; \
+    unsigned l = f->buf_len / sizeof(T); \
+    int i; \
+    T d[N]; \
+    \
+    i = N - 1; do d[i] = 0; while (--i >= 0); \
+    \
+    i = N - 1; \
+    do { \
+        T delta = (T) (get(b) - d[i]); \
+        set(b, delta); \
+        d[i] = (T) (d[i] + delta); \
+        b += sizeof(T); \
+        if (--i < 0) \
+            i = N - 1; \
+    } while (--l > 0); \
+    f->calls = (f->buf_len / sizeof(T)) - N; \
+    assert((int)f->calls > 0); \
+    return 0;
+
+
+#define ADD(f, N, T, get, set) \
+    upx_byte *b = f->buf; \
+    unsigned l = f->buf_len / sizeof(T); \
+    int i; \
+    T d[N]; \
+    \
+    i = N - 1; do d[i] = 0; while (--i >= 0); \
+    \
+    i = N - 1; \
+    do { \
+        d[i] = (T) (d[i] + get(b)); \
+        set(b, d[i]); \
+        b += sizeof(T); \
+        if (--i < 0) \
+            i = N - 1; \
+    } while (--l > 0); \
+    f->calls = (f->buf_len / sizeof(T)) - N; \
+    assert((int)f->calls > 0); \
+    return 0;
+
+
+#define SCAN(f, N, T, get, set) \
+    f->calls = (f->buf_len / sizeof(T)) - N; \
+    assert((int)f->calls > 0); \
+    return 0;
+
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,122 @@
+/* sub16.h -- simple delta filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#include "sub.hh"
+
+#define SUB16(f, N)     SUB(f, N, unsigned short, get_le16, set_le16)
+#define ADD16(f, N)     ADD(f, N, unsigned short, get_le16, set_le16)
+#define SCAN16(f, N)    SCAN(f, N, unsigned short, get_le16, set_le16)
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+// filter
+static int f_sub16_1(Filter *f)
+{
+    SUB16(f, 1)
+}
+
+static int f_sub16_2(Filter *f)
+{
+    SUB16(f, 2)
+}
+
+static int f_sub16_3(Filter *f)
+{
+    SUB16(f, 3)
+}
+
+static int f_sub16_4(Filter *f)
+{
+    SUB16(f, 4)
+}
+
+
+// unfilter
+static int u_sub16_1(Filter *f)
+{
+    ADD16(f, 1)
+}
+
+static int u_sub16_2(Filter *f)
+{
+    ADD16(f, 2)
+}
+
+static int u_sub16_3(Filter *f)
+{
+    ADD16(f, 3)
+}
+
+static int u_sub16_4(Filter *f)
+{
+    ADD16(f, 4)
+}
+
+
+// scan
+static int s_sub16_1(Filter *f)
+{
+    SCAN16(f, 1)
+}
+
+static int s_sub16_2(Filter *f)
+{
+    SCAN16(f, 2)
+}
+
+static int s_sub16_3(Filter *f)
+{
+    SCAN16(f, 3)
+}
+
+static int s_sub16_4(Filter *f)
+{
+    SCAN16(f, 4)
+}
+
+
+#undef SUB
+#undef ADD
+#undef SCAN
+#undef SUB16
+#undef ADD16
+#undef SCAN16
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,122 @@
+/* sub32.h -- simple delta filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#include "sub.hh"
+
+#define SUB32(f, N)     SUB(f, N, unsigned int, get_le32, set_le32)
+#define ADD32(f, N)     ADD(f, N, unsigned int, get_le32, set_le32)
+#define SCAN32(f, N)    SCAN(f, N, unsigned int, get_le32, set_le32)
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+// filter
+static int f_sub32_1(Filter *f)
+{
+    SUB32(f, 1)
+}
+
+static int f_sub32_2(Filter *f)
+{
+    SUB32(f, 2)
+}
+
+static int f_sub32_3(Filter *f)
+{
+    SUB32(f, 3)
+}
+
+static int f_sub32_4(Filter *f)
+{
+    SUB32(f, 4)
+}
+
+
+// unfilter
+static int u_sub32_1(Filter *f)
+{
+    ADD32(f, 1)
+}
+
+static int u_sub32_2(Filter *f)
+{
+    ADD32(f, 2)
+}
+
+static int u_sub32_3(Filter *f)
+{
+    ADD32(f, 3)
+}
+
+static int u_sub32_4(Filter *f)
+{
+    ADD32(f, 4)
+}
+
+
+// scan
+static int s_sub32_1(Filter *f)
+{
+    SCAN32(f, 1)
+}
+
+static int s_sub32_2(Filter *f)
+{
+    SCAN32(f, 2)
+}
+
+static int s_sub32_3(Filter *f)
+{
+    SCAN32(f, 3)
+}
+
+static int s_sub32_4(Filter *f)
+{
+    SCAN32(f, 4)
+}
+
+
+#undef SUB
+#undef ADD
+#undef SCAN
+#undef SUB32
+#undef ADD32
+#undef SCAN32
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,122 @@
+/* sub8.h -- simple delta filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#include "sub.hh"
+
+#define SUB8(f, N)      SUB(f, N, unsigned char, get_8, set_8)
+#define ADD8(f, N)      ADD(f, N, unsigned char, get_8, set_8)
+#define SCAN8(f, N)     SCAN(f, N, unsigned char, get_8, set_8)
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+// filter
+static int f_sub8_1(Filter *f)
+{
+    SUB8(f, 1)
+}
+
+static int f_sub8_2(Filter *f)
+{
+    SUB8(f, 2)
+}
+
+static int f_sub8_3(Filter *f)
+{
+    SUB8(f, 3)
+}
+
+static int f_sub8_4(Filter *f)
+{
+    SUB8(f, 4)
+}
+
+
+// unfilter
+static int u_sub8_1(Filter *f)
+{
+    ADD8(f, 1)
+}
+
+static int u_sub8_2(Filter *f)
+{
+    ADD8(f, 2)
+}
+
+static int u_sub8_3(Filter *f)
+{
+    ADD8(f, 3)
+}
+
+static int u_sub8_4(Filter *f)
+{
+    ADD8(f, 4)
+}
+
+
+// scan
+static int s_sub8_1(Filter *f)
+{
+    SCAN8(f, 1)
+}
+
+static int s_sub8_2(Filter *f)
+{
+    SCAN8(f, 2)
+}
+
+static int s_sub8_3(Filter *f)
+{
+    SCAN8(f, 3)
+}
+
+static int s_sub8_4(Filter *f)
+{
+    SCAN8(f, 4)
+}
+
+
+#undef SUB
+#undef ADD
+#undef SCAN
+#undef SUB8
+#undef ADD8
+#undef SCAN8
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -0,0 +1,188 @@
+/* sw.h -- swaptrick filter
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+
+/*************************************************************************
+// 16-bit swaptrick ("naive")
+**************************************************************************/
+
+#define SW16(f, cond, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 3; \
+    do { \
+        if (cond) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b)); \
+            f->calls++; \
+            b += 2 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 2; \
+    return 0;
+
+
+// filter
+static int f_sw16_e8(Filter *f)
+{
+    SW16(f, (*b == 0xe8), get_le16, set_be16)
+}
+
+static int f_sw16_e9(Filter *f)
+{
+    SW16(f, (*b == 0xe9), get_le16, set_be16)
+}
+
+static int f_sw16_e8e9(Filter *f)
+{
+    SW16(f, (*b == 0xe8 || *b == 0xe9), get_le16, set_be16)
+}
+
+
+// unfilter
+static int u_sw16_e8(Filter *f)
+{
+    SW16(f, (*b == 0xe8), get_be16, set_le16)
+}
+
+static int u_sw16_e9(Filter *f)
+{
+    SW16(f, (*b == 0xe9), get_be16, set_le16)
+}
+
+static int u_sw16_e8e9(Filter *f)
+{
+    SW16(f, (*b == 0xe8 || *b == 0xe9), get_be16, set_le16)
+}
+
+
+// scan
+static int s_sw16_e8(Filter *f)
+{
+    SW16(f, (*b == 0xe8), get_le16, set_dummy)
+}
+
+static int s_sw16_e9(Filter *f)
+{
+    SW16(f, (*b == 0xe9), get_le16, set_dummy)
+}
+
+static int s_sw16_e8e9(Filter *f)
+{
+    SW16(f, (*b == 0xe8 || *b == 0xe9), get_le16, set_dummy)
+}
+
+
+#undef SW16
+
+
+
+
+/*************************************************************************
+// 32-bit swaptrick ("naive")
+**************************************************************************/
+
+#define SW32(f, cond, get, set) \
+    upx_byte *b = f->buf; \
+    upx_byte *b_end = b + f->buf_len - 5; \
+    do { \
+        if (cond) \
+        { \
+            b += 1; \
+            unsigned a = (unsigned) (b - f->buf); \
+            f->lastcall = a; \
+            set(b, get(b)); \
+            f->calls++; \
+            b += 4 - 1; \
+        } \
+    } while (++b < b_end); \
+    if (f->lastcall) f->lastcall += 4; \
+    return 0;
+
+
+// filter
+static int f_sw32_e8(Filter *f)
+{
+    SW32(f, (*b == 0xe8), get_le32, set_be32)
+}
+
+static int f_sw32_e9(Filter *f)
+{
+    SW32(f, (*b == 0xe9), get_le32, set_be32)
+}
+
+static int f_sw32_e8e9(Filter *f)
+{
+    SW32(f, (*b == 0xe8 || *b == 0xe9), get_le32, set_be32)
+}
+
+
+// unfilter
+static int u_sw32_e8(Filter *f)
+{
+    SW32(f, (*b == 0xe8), get_be32, set_le32)
+}
+
+static int u_sw32_e9(Filter *f)
+{
+    SW32(f, (*b == 0xe9), get_be32, set_le32)
+}
+
+static int u_sw32_e8e9(Filter *f)
+{
+    SW32(f, (*b == 0xe8 || *b == 0xe9), get_be32, set_le32)
+}
+
+
+// scan
+static int s_sw32_e8(Filter *f)
+{
+    SW32(f, (*b == 0xe8), get_le32, set_dummy)
+}
+
+static int s_sw32_e9(Filter *f)
+{
+    SW32(f, (*b == 0xe9), get_le32, set_dummy)
+}
+
+static int s_sw32_e8e9(Filter *f)
+{
+    SW32(f, (*b == 0xe8 || *b == 0xe9), get_le32, set_dummy)
+}
+
+
+#undef SW32
+
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,385 +21,147 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


 #include "conf.h"
 #include "filter.h"

+static unsigned
+umin(unsigned const a, unsigned const b)
+{
+    return (a<=b) ? a : b;
+}
+

 #define set_dummy(p, v)     ((void)0)
+#define get_8(p)            (*(p))
+#define set_8(p, v)         (*(p) = (v))


 /*************************************************************************
-// 16-bit calltrick ("naive")
+// util
 **************************************************************************/

-#define CT16(f, cond, addvalue, get, set) \
-    upx_byte *b = f->buf; \
-    upx_byte *b_end = b + f->buf_len - 3; \
-    do { \
-        if (cond) \
-        { \
-            b += 1; \
-            unsigned a = (unsigned) (b - f->buf); \
-            f->lastcall = a; \
-            set(b, get(b) + (addvalue)); \
-            f->calls++; \
-            b += 2 - 1; \
-        } \
-    } while (++b < b_end); \
-    if (f->lastcall) f->lastcall += 2; \
-    return 0;
-
-
-
-// filter: e8, e9, e8e9
-static int f_ct16_e8(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_le16)
-}
-
-static int f_ct16_e9(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_le16)
-}
-
-static int f_ct16_e8e9(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_le16)
-}
-
-
-// unfilter: e8, e9, e8e9
-static int u_ct16_e8(Filter *f)
-{
-    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_le16)
-}
-
-static int u_ct16_e9(Filter *f)
-{
-    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
-}
-
-static int u_ct16_e8e9(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
-}
-
-
-// scan: e8, e9, e8e9
-static int s_ct16_e8(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
-}
-
-static int s_ct16_e9(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
-}
-
-static int s_ct16_e8e9(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
-}
-
-
-// filter: e8, e9, e8e9 with bswap le->be
-static int f_ct16_e8_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_be16)
-}
-
-static int f_ct16_e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_be16)
-}
-
-static int f_ct16_e8e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_be16)
-}
-
-
-// unfilter: e8, e9, e8e9 with bswap le->be
-static int u_ct16_e8_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_be16, set_le16)
-}
-
-static int u_ct16_e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
-}
-
-static int u_ct16_e8e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
-}
-
-
-// scan: e8, e9, e8e9 with bswap le->be
-static int s_ct16_e8_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_dummy)
-}
-
-static int s_ct16_e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_dummy)
-}
-
-static int s_ct16_e8e9_bswap_le(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_dummy)
-}
-
-
-// filter: e8, e9, e8e9 with bswap be->le
-static int f_ct16_e8_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_le16)
-}
-
-static int f_ct16_e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_le16)
-}
-
-static int f_ct16_e8e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_le16)
-}
-
-
-// unfilter: e8, e9, e8e9 with bswap be->le
-static int u_ct16_e8_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_be16)
-}
-
-static int u_ct16_e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
-}
-
-static int u_ct16_e8e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
-}
-
-
-// scan: e8, e9, e8e9 with bswap be->le
-static int s_ct16_e8_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
-}
-
-static int s_ct16_e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
-}
-
-static int s_ct16_e8e9_bswap_be(Filter *f)
-{
-    CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
-}
-
-
-#undef CT16
+#include "filter/getcto.h"


 /*************************************************************************
-// 32-bit calltrick ("naive")
+// simple filters: calltrick / swaptrick / delta / ...
 **************************************************************************/

-#define CT32(f, cond, addvalue, get, set) \
-    upx_byte *b = f->buf; \
-    upx_byte *b_end = b + f->buf_len - 5; \
-    do { \
-        if (cond) \
-        { \
-            b += 1; \
-            unsigned a = (unsigned) (b - f->buf); \
-            f->lastcall = a; \
-            set(b, get(b) + (addvalue)); \
-            f->calls++; \
-            b += 4 - 1; \
-        } \
-    } while (++b < b_end); \
-    if (f->lastcall) f->lastcall += 4; \
-    return 0;
+#include "filter/ct.h"
+#include "filter/sw.h"
+#include "filter/ctsw.h"

-
-// filter: e8, e9, e8e9
-static int f_ct32_e8(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_le32)
-}
-
-static int f_ct32_e9(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_le32)
-}
-
-static int f_ct32_e8e9(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_le32)
-}
-
-
-// unfilter: e8, e9, e8e9
-static int u_ct32_e8(Filter *f)
-{
-    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_le32)
-}
-
-static int u_ct32_e9(Filter *f)
-{
-    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
-}
-
-static int u_ct32_e8e9(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
-}
-
-
-// scan: e8, e9, e8e9
-static int s_ct32_e8(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
-}
-
-static int s_ct32_e9(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
-}
-
-static int s_ct32_e8e9(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
-}
-
-
-// filter: e8, e9, e8e9 with bswap le->be
-static int f_ct32_e8_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_be32)
-}
-
-static int f_ct32_e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_be32)
-}
-
-static int f_ct32_e8e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_be32)
-}
-
-
-// unfilter: e8, e9, e8e9 with bswap le->be
-static int u_ct32_e8_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_be32, set_le32)
-}
-
-static int u_ct32_e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
-}
-
-static int u_ct32_e8e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
-}
-
-
-// scan: e8, e9, e8e9 with bswap le->be
-static int s_ct32_e8_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_dummy)
-}
-
-static int s_ct32_e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_dummy)
-}
-
-static int s_ct32_e8e9_bswap_le(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_dummy)
-}
-
-
-// filter: e8, e9, e8e9 with bswap be->le
-static int f_ct32_e8_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_le32)
-}
-
-static int f_ct32_e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_le32)
-}
-
-static int f_ct32_e8e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_le32)
-}
-
-
-// unfilter: e8, e9, e8e9 with bswap be->le
-static int u_ct32_e8_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_be32)
-}
-
-static int u_ct32_e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
-}
-
-static int u_ct32_e8e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
-}
-
-
-// scan: e8, e9, e8e9 with bswap be->le
-static int s_ct32_e8_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
-}
-
-static int s_ct32_e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
-}
-
-static int s_ct32_e8e9_bswap_be(Filter *f)
-{
-    CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
-}
-
-
-#undef CT32
-
-#undef set_dummy
+#include "filter/sub8.h"
+#include "filter/sub16.h"
+#include "filter/sub32.h"


 /*************************************************************************
-// 32-bit calltrick with cto ("clever")
-//
-// This version is more sophisticated because it only
-// tries to change actual calls and/or jumps.
+// cto calltrick
 **************************************************************************/

-#include "fcto_ml.ch"
+#define COND(b,x)               (b[x] == 0xe8)
+#define F                       f_cto32_e8_bswap_le
+#define U                       u_cto32_e8_bswap_le
+#include "filter/cto.h"
+#define F                       s_cto32_e8_bswap_le
+#include "filter/cto.h"
+#undef COND
+
+#define COND(b,x)               (b[x] == 0xe9)
+#define F                       f_cto32_e9_bswap_le
+#define U                       u_cto32_e9_bswap_le
+#include "filter/cto.h"
+#define F                       s_cto32_e9_bswap_le
+#include "filter/cto.h"
+#undef COND
+
+#define COND(b,x)               (b[x] == 0xe8 || b[x] == 0xe9)
+#define F                       f_cto32_e8e9_bswap_le
+#define U                       u_cto32_e8e9_bswap_le
+#include "filter/cto.h"
+#define F                       s_cto32_e8e9_bswap_le
+#include "filter/cto.h"
+#undef COND
+
+
+/*************************************************************************
+// cto calltrick with jmp
+**************************************************************************/
+
+#define COND(b,x,lastcall) (b[x] == 0xe8 || b[x] == 0xe9)
+#define F                       f_ctoj32_e8e9_bswap_le
+#define U                       u_ctoj32_e8e9_bswap_le
+#include "filter/ctoj.h"
+#define F                       s_ctoj32_e8e9_bswap_le
+#include "filter/ctoj.h"
+#undef COND
+
+
+/*************************************************************************
+// cto calltrick with jmp, optional jcc
+**************************************************************************/
+
+#define COND1(b,x)     (b[x] == 0xe8 || b[x] == 0xe9)
+#define COND2(b,x,lc)  (lc!=(x) && 0xf==b[(x)-1] && 0x80<=b[x] && b[x]<=0x8f)
+#define  COND(b,x,lc,id) (COND1(b,x) || ((9<=(0xf&(id))) && COND2(b,x,lc)))
+#define F                       f_ctok32_e8e9_bswap_le
+#define U                       u_ctok32_e8e9_bswap_le
+#include "filter/ctok.h"
+#define F                       s_ctok32_e8e9_bswap_le
+#include "filter/ctok.h"
+#undef COND
+#undef COND2
+#undef COND1
+
+
+/*************************************************************************
+// cto calltrick with jmp and jcc and relative renumbering
+**************************************************************************/
+
+#define COND_CALL(which,b,x) ((which = 0), b[x] == 0xe8)
+#define COND_JMP( which,b,x) ((which = 1), b[x] == 0xe9)
+#define COND_JCC( which,b,lastcall,x,y,z) ((which = 2), \
+         (lastcall!=(x) && 0xf==b[y] && 0x80<=b[z] && b[z]<=0x8f))
+#define COND1(which,b,x) (COND_CALL(which,b,x) || COND_JMP(which,b,x))
+#define COND2(which,b,lastcall,x,y,z) COND_JCC(which,b,lastcall,x,y,z)
+
+#define CONDF(which,b,x,lastcall) \
+    (COND1(which,b,x) || COND2(which,b,lastcall,x,(x)-1, x   ))
+#define CONDU(which,b,x,lastcall) \
+    (COND1(which,b,x) || COND2(which,b,lastcall,x, x   ,(x)-1))
+
+#define F                       f_ctojr32_e8e9_bswap_le
+#define U                       u_ctojr32_e8e9_bswap_le
+#include "filter/ctojr.h"
+#define F                       s_ctojr32_e8e9_bswap_le
+#include "filter/ctojr.h"
+
+#undef CONDU
+#undef CONDF
+#undef COND2
+#undef COND1
+#undef COND_JCC
+#undef COND_JMP
+#undef COND_CALL
+
+
+/*************************************************************************
+// PowerPC branch [incl. call] trick
+**************************************************************************/
+
+#define COND(b,x) (18==(get_be32(b+x)>>26))
+#define F                       f_ppcbxx
+#define U                       u_ppcbxx
+#include "filter/ppcbxx.h"
+#define F                       s_ppcbxx
+#include "filter/ppcbxx.h"
+#undef COND


 /*************************************************************************
@@ -409,8 +171,9 @@ static int s_ct32_e8e9_bswap_be(Filter *f)
 const FilterImp::FilterEntry FilterImp::filters[] = {
    // no filter
    { 0x00, 0,          0, NULL, NULL, NULL },
+
    // 16-bit calltrick
-    { 0x01, 4,          0, f_ct16_e8, u_ct16_e8, s_ct16_e8,},
+    { 0x01, 4,          0, f_ct16_e8, u_ct16_e8, s_ct16_e8 },
    { 0x02, 4,          0, f_ct16_e9, u_ct16_e9, s_ct16_e9 },
    { 0x03, 4,          0, f_ct16_e8e9, u_ct16_e8e9, s_ct16_e8e9 },
    { 0x04, 4,          0, f_ct16_e8_bswap_le, u_ct16_e8_bswap_le, s_ct16_e8_bswap_le },
@@ -419,6 +182,16 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
    { 0x07, 4,          0, f_ct16_e8_bswap_be, u_ct16_e8_bswap_be, s_ct16_e8_bswap_be },
    { 0x08, 4,          0, f_ct16_e9_bswap_be, u_ct16_e9_bswap_be, s_ct16_e9_bswap_be },
    { 0x09, 4,          0, f_ct16_e8e9_bswap_be, u_ct16_e8e9_bswap_be, s_ct16_e8e9_bswap_be },
+
+    // 16-bit swaptrick
+    { 0x0a, 4,          0, f_sw16_e8, u_sw16_e8, s_sw16_e8 },
+    { 0x0b, 4,          0, f_sw16_e9, u_sw16_e9, s_sw16_e9 },
+    { 0x0c, 4,          0, f_sw16_e8e9, u_sw16_e8e9, s_sw16_e8e9 },
+
+    // 16-bit call-/swaptrick
+    { 0x0d, 4,          0, f_ctsw16_e8_e9, u_ctsw16_e8_e9, s_ctsw16_e8_e9 },
+    { 0x0e, 4,          0, f_ctsw16_e9_e8, u_ctsw16_e9_e8, s_ctsw16_e9_e8 },
+
    // 32-bit calltrick
    { 0x11, 6,          0, f_ct32_e8, u_ct32_e8, s_ct32_e8 },
    { 0x12, 6,          0, f_ct32_e9, u_ct32_e9, s_ct32_e9 },
@@ -429,21 +202,63 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
    { 0x17, 6,          0, f_ct32_e8_bswap_be, u_ct32_e8_bswap_be, s_ct32_e8_bswap_be },
    { 0x18, 6,          0, f_ct32_e9_bswap_be, u_ct32_e9_bswap_be, s_ct32_e9_bswap_be },
    { 0x19, 6,          0, f_ct32_e8e9_bswap_be, u_ct32_e8e9_bswap_be, s_ct32_e8e9_bswap_be },
+
+    // 32-bit swaptrick
+    { 0x1a, 6,          0, f_sw32_e8, u_sw32_e8, s_sw32_e8 },
+    { 0x1b, 6,          0, f_sw32_e9, u_sw32_e9, s_sw32_e9 },
+    { 0x1c, 6,          0, f_sw32_e8e9, u_sw32_e8e9, s_sw32_e8e9 },
+
+    // 32-bit call-/swaptrick
+    { 0x1d, 6,          0, f_ctsw32_e8_e9, u_ctsw32_e8_e9, s_ctsw32_e8_e9 },
+    { 0x1e, 6,          0, f_ctsw32_e9_e8, u_ctsw32_e9_e8, s_ctsw32_e9_e8 },
+
    // 32-bit cto calltrick
-    { 0x21, 6, 0x00ffffff, f_cto32_e8, u_cto32_e8, s_cto32_e8 },
-    { 0x22, 6, 0x00ffffff, f_cto32_e9, u_cto32_e9, s_cto32_e9 },
-    { 0x23, 6, 0x00ffffff, f_cto32_e8e9, u_cto32_e8e9, s_cto32_e8e9 },
    { 0x24, 6, 0x00ffffff, f_cto32_e8_bswap_le, u_cto32_e8_bswap_le, s_cto32_e8_bswap_le },
    { 0x25, 6, 0x00ffffff, f_cto32_e9_bswap_le, u_cto32_e9_bswap_le, s_cto32_e9_bswap_le },
    { 0x26, 6, 0x00ffffff, f_cto32_e8e9_bswap_le, u_cto32_e8e9_bswap_le, s_cto32_e8e9_bswap_le },
-    { 0x27, 6, 0x00ffffff, f_cto32_e8_bswap_be, u_cto32_e8_bswap_be, s_cto32_e8_bswap_be },
-    { 0x28, 6, 0x00ffffff, f_cto32_e9_bswap_be, u_cto32_e9_bswap_be, s_cto32_e9_bswap_be },
-    { 0x29, 6, 0x00ffffff, f_cto32_e8e9_bswap_be, u_cto32_e8e9_bswap_be, s_cto32_e8e9_bswap_be },
-    // 32-bit cto calltrick + jmp
-    { 0x36, 6, 0x00ffffff, f_ctjo32_e8e9_bswap_le, u_ctjo32_e8e9_bswap_le, s_ctjo32_e8e9_bswap_le },
+
+    // 32-bit cto calltrick with jmp
+    { 0x36, 6, 0x00ffffff, f_ctoj32_e8e9_bswap_le, u_ctoj32_e8e9_bswap_le, s_ctoj32_e8e9_bswap_le },
+
+    // 32-bit calltrick with jmp, optional jcc; runtime can unfilter more than one block
+    { 0x46, 6, 0x00ffffff, f_ctok32_e8e9_bswap_le, u_ctok32_e8e9_bswap_le, s_ctok32_e8e9_bswap_le },
+    { 0x49, 6, 0x00ffffff, f_ctok32_e8e9_bswap_le, u_ctok32_e8e9_bswap_le, s_ctok32_e8e9_bswap_le },
+
+    // 24-bit calltrick for arm
+    { 0x50, 8, 0x01ffffff, f_ct24arm_le, u_ct24arm_le, s_ct24arm_le },
+    { 0x51, 8, 0x01ffffff, f_ct24arm_be, u_ct24arm_be, s_ct24arm_be },
+
+    // 32-bit cto calltrick with jmp and jcc(swap 0x0f/0x8Y) and relative renumbering
+    { 0x80, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x81, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x82, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x83, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x84, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x85, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x86, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+    { 0x87, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
+
+    // simple delta filter
+    { 0x90, 2,          0, f_sub8_1, u_sub8_1, s_sub8_1 },
+    { 0x91, 3,          0, f_sub8_2, u_sub8_2, s_sub8_2 },
+    { 0x92, 4,          0, f_sub8_3, u_sub8_3, s_sub8_3 },
+    { 0x93, 5,          0, f_sub8_4, u_sub8_4, s_sub8_4 },
+
+    { 0xa0,99,          0, f_sub16_1, u_sub16_1, s_sub16_1 },
+    { 0xa1,99,          0, f_sub16_2, u_sub16_2, s_sub16_2 },
+    { 0xa2,99,          0, f_sub16_3, u_sub16_3, s_sub16_3 },
+    { 0xa3,99,          0, f_sub16_4, u_sub16_4, s_sub16_4 },
+
+    { 0xb0,99,          0, f_sub32_1, u_sub32_1, s_sub32_1 },
+    { 0xb1,99,          0, f_sub32_2, u_sub32_2, s_sub32_2 },
+    { 0xb2,99,          0, f_sub32_3, u_sub32_3, s_sub32_3 },
+    { 0xb3,99,          0, f_sub32_4, u_sub32_4, s_sub32_4 },
+
+    // PowerPC branch+call trick
+    { 0xd0, 8,          0, f_ppcbxx, u_ppcbxx, s_ppcbxx },
 };

-const int FilterImp::n_filters = HIGH(filters);
+const int FilterImp::n_filters = TABLESIZE(filters);


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,12 +21,13 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


 #include "conf.h"
+#include "compress.h"


 /*************************************************************************
@@ -44,13 +45,26 @@ void show_head(void)
        return;
    head_done = 1;

+#define V(x)    (strcmp(UPX_VERSION_STRING, UPX_VERSION_STRING4) ? UPX_VERSION_STRING : UPX_VERSION_STRING x)
    fg = con_fg(f,FG_GREEN);
    con_fprintf(f,
-                "                     Ultimate Packer for eXecutables\n"
-                "               Copyright (C) 1996, 1997, 1998, 1999, 2000\n"
-                "UPX v%-12sMarkus F.X.J. Oberhumer & Laszlo Molnar%21s\n\n",
-                UPX_VERSION_STRING, UPX_VERSION_DATE);
+                "                       Ultimate Packer for eXecutables\n"
+                "    Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006\n"
+                "UPX %-10s  Markus Oberhumer, Laszlo Molnar & John Reiser  %14s\n\n",
+#if (ACC_OS_DOS16 || ACC_OS_DOS32)
+                V("d"),
+#elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+                V("w"),
+#elif 0 && defined(__linux__)
+                V("l"),
+#else
+                UPX_VERSION_STRING,
+#endif
+                UPX_VERSION_DATE);
    fg = con_fg(f,fg);
+#undef V
+
+    UNUSED(fg);
 }


@@ -62,7 +76,7 @@ void show_usage(void)
 {
    FILE *f = con_term;

-    con_fprintf(f,"Usage: %s [-123456788dlthVL] [-qvfk] [-o file] %sfile..\n", progname,
+    con_fprintf(f,"Usage: %s [-123456789dlthVL] [-qvfk] [-o file] %sfile..\n", progname,
 #if defined(__DJGPP__) || defined(__EMX__)
                "[@]");
 #else
@@ -75,7 +89,7 @@ void show_usage(void)
 //
 **************************************************************************/

-void show_help(int x)
+void show_help(int x/*verbose*/)
 {
    FILE *f = con_term;
    int fg;
@@ -92,7 +106,7 @@ void show_help(int x)
                "  -d     decompress                        -l    list compressed file\n"
                "  -t     test compressed file              -V    display version number\n"
                "  -h     give %s help                    -L    display software license\n%s",
-                x == 0 ? "" : "  --best compress best (can be very slow for big files)\n",
+                x == 0 ? "" : "  --best compress best (can be slow for big files)\n",
                x == 0 ? "more" : "this", x == 0 ? "" : "\n");

    fg = con_fg(f,FG_YELLOW);
@@ -101,7 +115,6 @@ void show_help(int x)

    con_fprintf(f,
                "  -q     be quiet                          -v    be verbose\n"
-                //"  -oFILE write output to `FILE'            -c    write output to stdout\n"
                "  -oFILE write output to `FILE'\n"
                //"  -f     force overwrite of output files and compression of suspicious files\n"
                "  -f     force compression of suspicious files\n"
@@ -128,20 +141,30 @@ void show_help(int x)
        fg = con_fg(f,fg);
        con_fprintf(f,
                    "  --overlay=copy      copy any extra data attached to the file [default]\n"
-                    "  --overlay=strip     strip any extra data attached to the file [dangerous]\n"
+                    "  --overlay=strip     strip any extra data attached to the file [DANGEROUS]\n"
                    "  --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");
@@ -149,12 +172,48 @@ void show_help(int x)
        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);
+        con_fprintf(f,"Options for linux/386\n");
+        fg = con_fg(f,fg);
+        con_fprintf(f,
+                    "  --script             use /usr/local/lib/upx/upx[bd] as decompressor\n"
+                    "  --script=/path/upxX  use path/upxX as decompressor\n"
+                    "\n");
+#endif
+        fg = con_fg(f,FG_YELLOW);
+        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"
+                    "  --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");
@@ -172,40 +231,49 @@ void show_help(int x)
                    "  --compress-icons=1      compress all but the first icon\n"
                    "  --compress-icons=2      compress all but the first icon directory [default]\n"
                    "  --compress-resources=0  do not compress any resources at all\n"
+                    "  --keep-resource=list    do not compress resources specified by list\n"
                    "  --strip-relocs=0        do not strip relocations\n"
                    "  --strip-relocs=1        strip relocations [default]\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);
-        con_fprintf(f,"Options for linux/386\n");
-        fg = con_fg(f,fg);
-        con_fprintf(f,
-                    "  --script             use /usr/local/lib/upx/upx[bd] as decompressor\n"
-                    "  --script=/path/upxX  use path/upxX as decompressor\n"
-                    "\n");
-#endif
    }

    con_fprintf(f,
-                "  file.. executables to (de)compress\n"
-                "\n"
-                "This version supports:\n    "
-                "atari/tos, "
-                "bvmlinuz/386, "
-                "djgpp2/coff, "
-                "dos/com, "
-                "dos/exe, "
-                "dos/sys,\n    "
-                "linux/386, "
-                "linux/elf386, "
-                "linux/sh386, "
-                "rtm32/pe, "
-                "tmt/adam, "
-                "vmlinuz/386,\n    "
-                "watcom/le, "
-                "win32/pe"
-                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.tsx.org\n"
-                //"\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details type `upx -L'.\n"
+                "file..   executables to (de)compress\n"
+                "\n");
+    fg = con_fg(f,FG_YELLOW);
+    con_fprintf(f,"This version supports:\n");
+    fg = con_fg(f,fg);
+    con_fprintf(f,"   "
+// TODO:
+// support for mach/ppc32
+// support for linux elf/ppc32
+// support for linux elf/amd64
+                " arm/pe,"
+                " atari/tos,"
+                " bvmlinuz/386,"
+                " djgpp2/coff,"
+                " dos/com,"
+                " dos/exe,"
+                " dos/sys,"
+                "\n   "
+                //" elks/8086,"
+                " linux/amd64,"
+                " linux/i386,"
+                " linux/ppc32,"
+                " mach/ppc32,"
+                " ps1/exe,"
+                " rtm32/pe,"
+                "\n   "
+                " tmt/adam,"
+                " vmlinux/386,"
+                " vmlinuz/386,"
+                " watcom/le,"
+                //" win16/ne,"
+                " win32/pe"
+                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details visit http://upx.sf.net\n"
+//                "\n\nUPX comes with ABSOLUTELY NO WARRANTY; for details type `upx -L'.\n"
                "");


@@ -221,6 +289,8 @@ void show_help(int x)
                "\n");
    fg = con_fg(f,fg);
 #endif
+
+    UNUSED(fg);
 }


@@ -234,7 +304,7 @@ void show_license(void)

    show_head();

-con_fprintf(f,
+    con_fprintf(f,
        "   This program may be used freely, and you are welcome to\n"
        "   redistribute it under certain conditions.\n"
        "\n"
@@ -249,17 +319,19 @@ con_fprintf(f,
        "\n"
    );
    int fg = con_fg(f,FG_CYAN);
-con_fprintf(f,
-        "        http://upx.tsx.org\n"
-        "        http://wildsau.idv.uni-linz.ac.at/mfx/upx.html\n"
+    con_fprintf(f,
+        "        http://upx.sourceforge.net\n"
+        "        http://www.oberhumer.com/opensource/upx/\n"
    );
    (void)con_fg(f,FG_ORANGE);
-con_fprintf(f,
+    con_fprintf(f,
        "\n"
-        "   Markus F.X.J. Oberhumer                   Laszlo Molnar\n"
-        "   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu\n"
+        "   Markus F.X.J. Oberhumer              Laszlo Molnar\n"
+        "   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>\n"
    );
    fg = con_fg(f,fg);
+
+    UNUSED(fg);
 }


@@ -269,20 +341,43 @@ con_fprintf(f,

 void show_version(int x)
 {
-    FILE *f = stdout;
+    FILE *fp = stdout;
+    const char *v;
    UNUSED(x);
+    UNUSED(v);

-    fprintf(f,"upx %s\n",UPX_VERSION_STRING);
+    fprintf(fp, "upx %s\n", UPX_VERSION_STRING);
 #if defined(WITH_NRV)
-    fprintf(f,"NRV data compression library %s\n", nrv_version_string());
+    v = upx_nrv_version_string();
+    if (v != NULL && v[0])
+        fprintf(fp, "NRV data compression library %s\n", v);
 #endif
 #if defined(WITH_UCL)
-    fprintf(f,"UCL data compression library %s\n", ucl_version_string());
+    v = upx_ucl_version_string();
+    if (v != NULL && v[0])
+        fprintf(fp, "UCL data compression library %s\n", v);
 #endif
-    fprintf(f,"Copyright (C) 1996,1997,1998,1999,2000 Markus Franz Xaver Johannes Oberhumer\n");
-    fprintf(f,"Copyright (C) 1996,1997,1998,1999,2000 Laszlo Molnar\n");
-    fprintf(f,"Copyright (C) 2000 John F. Reiser\n");
-    fprintf(f,"UPX comes with ABSOLUTELY NO WARRANTY; for details type `%s -L'.\n", progname);
+#if defined(WITH_ZLIB)
+    v = upx_zlib_version_string();
+    if (v != NULL && v[0])
+        fprintf(fp, "zlib data compression library %s\n", v);
+#endif
+#if defined(WITH_LZMA)
+    v = upx_lzma_version_string();
+    if (v != NULL && v[0])
+        fprintf(fp, "LZMA SDK version %s\n", v);
+#endif
+    fprintf(fp, "Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer\n");
+    fprintf(fp, "Copyright (C) 1996-2006 Laszlo Molnar\n");
+    fprintf(fp, "Copyright (C) 2000-2006 John F. Reiser\n");
+    fprintf(fp, "Copyright (C) 2002-2006 Jens Medoch\n");
+#if defined(WITH_ZLIB)
+    fprintf(fp, "Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler\n");
+#endif
+#if defined(WITH_LZMA)
+    fprintf(fp, "Copyright (C) 1999-2006 Igor Pavlov\n");
+#endif
+    fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type `%s -L'.\n", progname);
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -32,8 +32,13 @@
 #include "lefile.h"


-LeFile::LeFile(InputFile *f) : fif(f)
+LeFile::LeFile(InputFile *f) :
+    fif(f), fof(NULL),
+    le_offset(0), exe_offset(0)
 {
+    COMPILE_TIME_ASSERT(sizeof(le_header_t) == 196);
+    COMPILE_TIME_ASSERT(sizeof(le_object_table_entry_t) == 24);
+    COMPILE_TIME_ASSERT(sizeof(le_pagemap_entry_t) == 4);
    memset(&ih,0,sizeof ih);
    memset(&oh,0,sizeof oh);
    iobject_table = oobject_table = NULL;
@@ -43,7 +48,6 @@ LeFile::LeFile(InputFile *f) : fif(f)
    ifixups = ofixups = NULL;
    inonres_names = ononres_names = NULL;
    ientries = oentries = NULL;
-    le_offset = exe_offset = 0;
 }


@@ -168,6 +172,18 @@ void LeFile::writeFixups()
 }


+unsigned LeFile::getImageSize() const
+{
+    unsigned n = 0;
+    if (ih.memory_pages > 0)
+    {
+        n = (ih.memory_pages - 1) * ih.memory_page_size;
+        n += ih.bytes_on_last_page;
+    }
+    return n;
+}
+
+
 void LeFile::readImage()
 {
    soimage = pages*mps;
@@ -295,7 +311,8 @@ void LeFile::writeFile(OutputFile *f, bool le)

 void LeFile::countFixups(unsigned *counts) const
 {
-    memset(counts,0,sizeof(unsigned)*(objects+2));
+    const unsigned o = objects;
+    memset(counts,0,sizeof(unsigned)*(o+2));
    // counts[0..objects-1] - # of 32-bit offset relocations in for that objects
    // counts[objects]      - # of selector fixups
    // counts[objects+1]    - # of self-relative fixups
@@ -311,7 +328,7 @@ void LeFile::countFixups(unsigned *counts) const
        switch (*fix)
        {
            case 2:       // selector fixup
-                counts[objects] += 9;
+                counts[o] += 9;
                fix += 5;
                break;
            case 0x12:    // alias selector
@@ -320,7 +337,7 @@ void LeFile::countFixups(unsigned *counts) const
                fix += (fix[1] & 0x10) ? 9 : 7;
                break;
            case 6:       // 16:32 pointer
-                counts[objects] += 9;
+                counts[o] += 9;
            case 7:       // 32-bit offset
                counts[fix[4]-1] += 4;
                fix += (fix[1] & 0x10) ? 9 : 7;
@@ -332,15 +349,15 @@ void LeFile::countFixups(unsigned *counts) const
                fix += ll*2;
                break;
            case 8:       // 32-bit self relative fixup
-                counts[objects+1] += 4;
+                counts[o+1] += 4;
                fix += (fix[1] & 0x10) ? 9 : 7;
                break;
            default:
                throwCantPack("unsupported fixup record");
        }
    }
-    counts[objects]++; // extra space for 'ret'
-    counts[objects+1] += 4; // extra space for 0xFFFFFFFF
+    counts[o]++; // extra space for 'ret'
+    counts[o+1] += 4; // extra space for 0xFFFFFFFF
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -117,7 +117,8 @@ protected:
        LE16  device_id;
        LE16  ddk_version;
 #endif
-    };
+    }
+    __attribute_packed;

    struct le_object_table_entry_t
    {
@@ -127,15 +128,17 @@ protected:
        LE32  pagemap_index;
        LE32  npages;
        LE32  reserved;
-    };
+    }
+    __attribute_packed;

    struct le_pagemap_entry_t
    {
-        upx_byte  h;
-        upx_byte  m;
-        upx_byte  l;
-        upx_byte  type;              // 0x00-legal;0x40-iterated;0x80-invalid;0xC0-zeroed
-    };
+        unsigned char h;
+        unsigned char m;
+        unsigned char l;
+        unsigned char type;  // 0x00-legal;0x40-iterated;0x80-invalid;0xC0-zeroed
+    }
+    __attribute_packed;

    virtual void readObjectTable();
    virtual void writeObjectTable();
@@ -178,6 +181,7 @@ protected:
    //virtual void decodeImage(){encodeImage();}

    void countFixups(unsigned *) const;
+    unsigned getImageSize() const;

    InputFile *fif;
    OutputFile *fof;
@@ -215,8 +219,8 @@ protected:

 private:
    // disable copy and assignment
-    LeFile(LeFile const &); // {}
-    LeFile& operator= (LeFile const &); // { return *this; }
+    LeFile(const LeFile &); // {}
+    LeFile& operator= (const LeFile &); // { return *this; }
 };


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,184 +21,814 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


 #include "conf.h"
 #include "linker.h"

-
-struct Linker::section
+static unsigned hex(unsigned char c)
 {
-    int  istart;
-    int  ostart;
-    int  len;
-    char name[8];
-};
+    return (c & 0xf) + (c > '9' ? 9 : 0);
+}

-struct Linker::jump
+static bool update_capacity(unsigned size, unsigned *capacity)
 {
-    int  pos;
-    int  len;
-    char tsect[8];
-    int  toffs;
-};
+    if (size < *capacity)
+        return false;
+    if (*capacity == 0)
+        *capacity = 16;
+    while (size >= *capacity)
+        *capacity *= 2;
+    return true;
+}


-Linker::Linker(const void *pdata, int plen, int pinfo)
+/*************************************************************************
+// Section
+**************************************************************************/
+
+ElfLinker::Section::Section(const char *n, const void *i, unsigned s, unsigned a) :
+    name(NULL), output(NULL), size(s), offset(0), p2align(a), next(NULL)
 {
-    iloader = new char[(ilen = plen) + 4096];
-    memcpy(iloader,pdata,plen);
-    oloader = new char[plen];
-    olen = 0;
-    align_hack = 0;
-    info = pinfo;
-    njumps = nsections = frozen = 0;
-    jumps = new jump[200];
-    sections = new section[200];
+    name = strdup(n);
+    assert(name != NULL);
+    input = malloc(s + 1);
+    assert(input != NULL);
+    memcpy(input, i, s);
+    ((char *)input)[s] = 0;
+}

-    char *p = iloader + info;
-    while (get_le32(p) != (unsigned)(-1))
+ElfLinker::Section::~Section()
+{
+    free(name);
+    free(input);
+}
+
+
+/*************************************************************************
+// Symbol
+**************************************************************************/
+
+ElfLinker::Symbol::Symbol(const char *n, Section *s, unsigned o) :
+    name(NULL), section(s), offset(o)
+{
+    name = strdup(n);
+    assert(name != NULL);
+    assert(section != NULL);
+}
+
+ElfLinker::Symbol::~Symbol()
+{
+    free(name);
+}
+
+
+/*************************************************************************
+// Relocation
+**************************************************************************/
+
+ElfLinker::Relocation::Relocation(const Section *s, unsigned o, const char *t,
+                                  const Symbol *v, unsigned a) :
+    section(s), offset(o), type(t), value(v), add(a)
+{
+    assert(section != NULL);
+}
+
+
+/*************************************************************************
+// ElfLinker
+**************************************************************************/
+
+ElfLinker::ElfLinker() :
+    bele(&N_BELE_RTP::le_policy),
+    input(NULL), output(NULL), head(NULL), tail(NULL),
+    sections(NULL), symbols(NULL), relocations(NULL),
+    nsections(0), nsections_capacity(0),
+    nsymbols(0), nsymbols_capacity(0),
+    nrelocations(0), nrelocations_capacity(0),
+    reloc_done(false)
+{
+}
+
+ElfLinker::~ElfLinker()
+{
+    delete [] input;
+    delete [] output;
+
+    unsigned ic;
+    for (ic = 0; ic < nsections; ic++)
+        delete sections[ic];
+    free(sections);
+    for (ic = 0; ic < nsymbols; ic++)
+        delete symbols[ic];
+    free(symbols);
+    for (ic = 0; ic < nrelocations; ic++)
+        delete relocations[ic];
+    free(relocations);
+}
+
+void ElfLinker::init(const void *pdata_v, int plen)
+{
+    const upx_byte *pdata = (const upx_byte *) pdata_v;
+    if (plen >= 16 && memcmp(pdata, "UPX#", 4) == 0)
    {
-        if (get_le32(p))
+        // decompress pre-compressed stub-loader
+        int method;
+        unsigned u_len, c_len;
+        if (pdata[4])
        {
-            memcpy(sections[nsections].name,p,8);
-            sections[nsections].istart = get_le32(p+8);
-            sections[nsections++].ostart = -1;
-            p += 12;
-            assert(nsections < 200);
+            method = pdata[4];
+            u_len = get_le16(pdata + 5);
+            c_len = get_le16(pdata + 7);
+            pdata += 9;
+            assert(9 + c_len == (unsigned) plen);
        }
        else
        {
-            int l;
-            for (l = get_le32(p+4) - 1; iloader[l] == 0; l--)
-                ;
-
-            jumps[njumps].pos = l+1;
-            jumps[njumps].len = get_le32(p+4)-jumps[njumps].pos;
-            memcpy(jumps[njumps].tsect,p+8,8);
-            jumps[njumps++].toffs = get_le32(p+16);
-            p += 20;
-            assert(njumps < 200);
+            method = pdata[5];
+            u_len = get_le32(pdata + 6);
+            c_len = get_le32(pdata + 10);
+            pdata += 14;
+            assert(14 + c_len == (unsigned) plen);
        }
+        assert((unsigned) plen < u_len);
+        inputlen = u_len;
+        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)
+            throwBadLoader();
    }
-
-    int ic;
-    for (ic = 0; ic < nsections - 1; ic++)
-        sections[ic].len = sections[ic+1].istart - sections[ic].istart;
-    sections[ic].len = 0;
-}
-
-
-Linker::~Linker()
-{
-    delete [] iloader;
-    delete [] oloader;
-    delete [] jumps;
-    delete [] sections;
-}
-
-
-void Linker::addSection(const char *sect)
-{
-    int ic;
-    while (*sect)
+    else
    {
-        if (*sect == '+') // alignment
+        inputlen = plen;
+        input = new upx_byte[inputlen + 1];
+        memcpy(input, pdata, inputlen);
+    }
+    input[inputlen] = 0; // NUL terminate
+
+    output = new upx_byte[inputlen];
+    outputlen = 0;
+
+    int pos = find(input, inputlen, "Sections:", 9);
+    assert(pos != -1);
+    char *psections = (char *) input + pos;
+
+    char *psymbols = strstr(psections, "SYMBOL TABLE:");
+    assert(psymbols != NULL);
+
+    char *prelocs = strstr(psymbols, "RELOCATION RECORDS FOR");
+    assert(prelocs != NULL);
+
+    preprocessSections(psections, psymbols);
+    preprocessSymbols(psymbols, prelocs);
+    preprocessRelocations(prelocs, (char*) input + inputlen);
+    addLoader("*UND*");
+}
+
+void ElfLinker::preprocessSections(char *start, const char *end)
+{
+    nsections = 0;
+    while (start < end)
+    {
+        char name[1024];
+        unsigned offset, size, align;
+
+        char *nextl = strchr(start, '\n');
+        assert(nextl != NULL);
+
+        if (sscanf(start, "%*d %1023s %x %*d %*d %x 2**%d",
+                   name, &size, &offset, &align) == 4)
        {
-            if (sect[1] == '0')
-                align_hack = olen;
-            else
+            char *n = strstr(start, name);
+            n[strlen(name)] = 0;
+            addSection(n, input + offset, size, align);
+
+            //printf("section %s preprocessed\n", n);
+        }
+        start = nextl + 1;
+    }
+    addSection("*ABS*", NULL, 0, 0);
+    addSection("*UND*", NULL, 0, 0);
+}
+
+void ElfLinker::preprocessSymbols(char *start, const char *end)
+{
+    nsymbols = 0;
+    while (start < end)
+    {
+        char section[1024];
+        char symbol[1024];
+        unsigned value, offset;
+
+        char *nextl = strchr(start, '\n');
+        assert(nextl != NULL);
+
+        if (sscanf(start, "%x g *ABS* %x %1023s",
+                        &value, &offset, symbol) == 3)
+        {
+            char *s = strstr(start, symbol);
+            s[strlen(symbol)] = 0;
+            addSymbol(s, "*ABS*", value);
+            assert(offset == 0);
+        }
+        else if (sscanf(start, "%x%*8c %1023s %*x %1023s",
+                   &offset, section, symbol) == 3)
+        {
+            char *s = strstr(start, symbol);
+            s[strlen(symbol)] = 0;
+            if (strcmp(section, "*UND*") == 0)
+                offset = 0xdeaddead;
+            assert(strcmp(section, "*ABS*") != 0);
+            addSymbol(s, section, offset);
+        }
+
+        start = nextl + 1;
+    }
+}
+
+void ElfLinker::preprocessRelocations(char *start, const char *end)
+{
+    char sect[1024];
+    Section *section = NULL;
+
+    nrelocations = 0;
+    while (start < end)
+    {
+        if (sscanf(start, "RELOCATION RECORDS FOR [%[^]]", sect) == 1)
+            section = findSection(sect);
+
+        unsigned offset;
+        char type[100];
+        char symbol[1024];
+
+        char *nextl = strchr(start, '\n');
+        assert(nextl != NULL);
+
+        if (sscanf(start, "%x %99s %1023s",
+                   &offset, type, symbol) == 3)
+        {
+            char *t = strstr(start, type);
+            t[strlen(type)] = 0;
+
+            unsigned add = 0;
+            if (char *p = strstr(symbol, "+0x"))
            {
-                ic = (sect[1] & 0xf) + (sect[1] > '9' ? 9 : 0);
-                ic = (ic + (sect[2] & 0xf) + (sect[2] > '9' ? 9 : 0)
-                      - (olen - align_hack) % ic) % ic;
-                memset(oloader+olen,sect[3] == 'C' ? 0x90 : 0,ic);
-                olen += ic;
+                *p = 0;  // terminate the symbol name
+                p += 3;
+
+                if (strlen(p) == 16) {
+                    // skip 8 leading chars if sign of char 9 matches
+                    if (memcmp(p, "000000000", 9))
+                        p += 8;
+                    else if (memcmp(p, "fffffffff", 9))
+                        p += 8;
+                }
+                assert(strlen(p) == 8);
+                char *endptr = NULL;
+                unsigned long ul = strtoul(p, &endptr, 16);
+                add = (unsigned) ul;
+                assert(add == ul);
+                assert(endptr && *endptr == '\0');
+            }
+
+            addRelocation(section->name, offset, t, symbol, add);
+            //printf("relocation %s %s %x %d preprocessed\n", section->name, symbol, offset, add);
+        }
+
+        start = nextl + 1;
+    }
+}
+
+ElfLinker::Section *ElfLinker::findSection(const char *name, bool fatal) const
+{
+    for (unsigned ic = 0; ic < nsections; ic++)
+        if (strcmp(sections[ic]->name, name) == 0)
+            return sections[ic];
+    if (fatal)
+    {
+        printf("unknown section %s\n", name);
+        abort();
+    }
+    return NULL;
+}
+
+ElfLinker::Symbol *ElfLinker::findSymbol(const char *name, bool fatal) const
+{
+    for (unsigned ic = 0; ic < nsymbols; ic++)
+        if (strcmp(symbols[ic]->name, name) == 0)
+            return symbols[ic];
+    if (fatal)
+    {
+        printf("unknown symbol %s\n", name);
+        abort();
+    }
+    return NULL;
+}
+
+ElfLinker::Section *ElfLinker::addSection(const char *sname, const void *sdata, int slen, unsigned p2align)
+{
+    //printf("addSection: %s len=%d align=%d\n", sname, slen, p2align);
+    if (update_capacity(nsections, &nsections_capacity))
+        sections = static_cast<Section **>(realloc(sections, nsections_capacity * sizeof(Section *)));
+    assert(sections);
+    assert(sname); assert(sname[0]); assert(sname[strlen(sname)-1] != ':');
+    assert(findSection(sname, false) == NULL);
+    Section *sec = new Section(sname, sdata, slen, p2align);
+    sections[nsections++] = sec;
+    return sec;
+}
+
+ElfLinker::Symbol *ElfLinker::addSymbol(const char *name, const char *section,
+                                        unsigned offset)
+{
+    //printf("addSymbol: %s %s 0x%x\n", name, section, offset);
+    if (update_capacity(nsymbols, &nsymbols_capacity))
+        symbols = static_cast<Symbol **>(realloc(symbols, nsymbols_capacity * sizeof(Symbol *)));
+    assert(symbols != NULL);
+    assert(name); assert(name[0]); assert(name[strlen(name)-1] != ':');
+    assert(findSymbol(name, false) == NULL);
+    Symbol *sym = new Symbol(name, findSection(section), offset);
+    symbols[nsymbols++] = sym;
+    return sym;
+}
+
+ElfLinker::Relocation *ElfLinker::addRelocation(const char *section, unsigned off,
+                                                const char *type, const char *symbol,
+                                                unsigned add)
+{
+    if (update_capacity(nrelocations, &nrelocations_capacity))
+        relocations = static_cast<Relocation **>(realloc(relocations, (nrelocations_capacity) * sizeof(Relocation *)));
+    assert(relocations != NULL);
+    Relocation *rel = new Relocation(findSection(section), off,
+                                     type, findSymbol(symbol), add);
+    relocations[nrelocations++] = rel;
+    return rel;
+}
+
+void ElfLinker::setLoaderAlignOffset(int phase)
+{
+    //assert(phase & 0);
+    printf("\nFIXME: ElfLinker::setLoaderAlignOffset %d\n", phase);
+}
+
+int ElfLinker::addLoader(const char *sname)
+{
+    assert(sname != NULL);
+    if (!sname[0])
+        return outputlen;
+
+    char *begin = strdup(sname);
+    char *end = begin + strlen(begin);
+    for (char *sect = begin; sect < end; )
+    {
+        for (char *tokend = sect; *tokend; tokend++)
+            if (*tokend == ' ' || *tokend == ',')
+            {
+                *tokend = 0;
+                break;
+            }
+
+        if (sect[0] == '+') // alignment
+        {
+            assert(tail);
+            unsigned l = (hex(sect[2]) - tail->offset - tail->size) % hex(sect[1]);
+            if (l)
+            {
+                if (sect[3] == 'D')
+                    alignData(l);
+                else
+                    alignCode(l);
+                tail->size += l;
            }
        }
        else
        {
-            for (ic = 0; ic < nsections; ic++)
-                if (memcmp(sect,sections[ic].name,8) == 0)
-                {
-                    memcpy(oloader+olen,iloader+sections[ic].istart,sections[ic].len);
-                    sections[ic].ostart = olen;
-                    olen += sections[ic].len;
-                    break;
+            Section *section = findSection(sect);
+            if (section->p2align) {
+                assert(tail);
+                assert(tail != section);
+                unsigned const v = ~0u << section->p2align;
+                if (unsigned const l = ~v & -(tail->offset + tail->size)) {
+                    alignCode(l);
+                    tail->size += l;
                }
-            //printf("%8.8s",section);
-            assert(ic!=nsections);
+            }
+            memcpy(output + outputlen, section->input, section->size);
+            section->output = output + outputlen;
+            //printf("section added: 0x%04x %3d %s\n", outputlen, section->size, section->name);
+            outputlen += section->size;
+
+            if (head)
+            {
+                tail->next = section;
+                section->offset = tail->offset + tail->size;
+            }
+            else
+                head = section;
+            tail = section;
        }
-        sect += 8;
+        sect += strlen(sect) + 1;
    }
+    free(begin);
+    return outputlen;
 }

-
-void Linker::addSection(const char *sname, const void *sdata, unsigned len)
+int ElfLinker::getSection(const char *sname, int *slen) const
 {
-    // add a new section - can be used for adding stuff like ident or header
-    memcpy(sections[nsections].name,sname,8);
-    sections[nsections].istart = ilen;
-    sections[nsections].len = len;
-    sections[nsections++].ostart = olen;
-    assert(nsections < 200);
-    memcpy(iloader+ilen,sdata,len);
-    ilen += len;
+    const Section *section = findSection(sname);
+    if (slen)
+        *slen = section->size;
+    return section->output - output;
 }

-
-const char *Linker::getLoader(int *llen)
+int ElfLinker::getSectionSize(const char *sname) const
 {
-    if (!frozen)
+    const Section *section = findSection(sname);
+    return section->size;
+}
+
+upx_byte *ElfLinker::getLoader(int *llen) const
+{
+    if (llen)
+        *llen = outputlen;
+    return output;
+}
+
+void ElfLinker::relocate()
+{
+    assert(!reloc_done);
+    reloc_done = true;
+    for (unsigned ic = 0; ic < nrelocations; ic++)
    {
-        int ic,jc,kc;
-        for (ic = 0; ic < njumps; ic++)
+        const Relocation *rel = relocations[ic];
+        unsigned value;
+
+        if (rel->section->output == NULL)
+            continue;
+        if (strcmp(rel->value->section->name, "*ABS*") == 0)
        {
-            for (jc = 0; jc < nsections-1; jc++)
-                if (jumps[ic].pos >= sections[jc].istart
-                    && jumps[ic].pos < sections[jc+1].istart)
-                    break;
-            assert(jc!=nsections-1);
-            if (sections[jc].ostart < 0)
-                continue;
-
-            for (kc = 0; kc < nsections-1; kc++)
-                if (memcmp(jumps[ic].tsect,sections[kc].name,8) == 0)
-                    break;
-            assert(kc!=nsections-1);
-
-            int offs = sections[kc].ostart+jumps[ic].toffs -
-                (jumps[ic].pos+jumps[ic].len -
-                 sections[jc].istart+sections[jc].ostart);
-
-            if (jumps[ic].len == 1)
-                assert(-128 <= offs && offs <= 127);
-
-            set_le32(&offs,offs);
-            memcpy(oloader+sections[jc].ostart+jumps[ic].pos-sections[jc].istart,&offs,jumps[ic].len);
+            value = rel->value->offset;
        }
-        frozen=1;
+        else if (strcmp(rel->value->section->name, "*UND*") == 0 &&
+                 rel->value->offset == 0xdeaddead)
+        {
+            printf("undefined symbol '%s' referenced\n", rel->value->name);
+            abort();
+        }
+        else if (rel->value->section->output == NULL)
+        {
+            printf("can not apply reloc '%s:%x' without section '%s'\n",
+                   rel->section->name, rel->offset,
+                   rel->value->section->name);
+            abort();
+        }
+        else
+        {
+            value = rel->value->section->offset +
+                    rel->value->offset + rel->add;
+        }
+        upx_byte *location = rel->section->output + rel->offset;
+        //printf("%-28s %-28s %-10s 0x%08x 0x%08x\n", rel->section->name, rel->value->name, rel->type, value, value - rel->section->offset - rel->offset);
+        //printf("  %d %d %d %d %d : %d\n", value, rel->value->section->offset, rel->value->offset, rel->offset, rel->add, *location);
+        relocate1(rel, location, value, rel->type);
    }
-    if (llen) *llen = olen;
-    return oloader;
+}
+
+void ElfLinker::defineSymbol(const char *name, unsigned value)
+{
+    Symbol *symbol = findSymbol(name);
+    if (strcmp(symbol->section->name, "*ABS*") == 0)
+    {
+        printf("defineSymbol: symbol '%s' is *ABS*\n", name);
+        abort();
+    }
+    else if (strcmp(symbol->section->name, "*UND*") == 0) // for undefined symbols
+        symbol->offset = value;
+    else if (strcmp(symbol->section->name, name) == 0) // for sections
+    {
+        for (Section *section = symbol->section; section; section = section->next)
+        {
+            assert(section->offset < value);
+            section->offset = value;
+            value += section->size;
+        }
+    }
+    else
+    {
+        printf("defineSymbol: symbol '%s' already defined\n", name);
+        abort();
+    }
+}
+
+// debugging support
+void ElfLinker::dumpSymbol(const Symbol *symbol, unsigned flags, FILE *fp) const
+{
+    if ((flags & 1) && symbol->section->output == NULL)
+        return;
+    fprintf(fp, "%-28s 0x%08x | %-28s 0x%08x\n",
+            symbol->name, symbol->offset, symbol->section->name, symbol->section->offset);
+}
+void ElfLinker::dumpSymbols(unsigned flags, FILE *fp) const
+{
+    if (fp == NULL)
+        fp = stdout;
+    if ((flags & 2) == 0)
+    {
+        // default: dump symbols in used section order
+        for (const Section *section = head; section; section = section->next)
+        {
+            fprintf(fp, "%-42s%-28s 0x%08x\n", "", section->name, section->offset);
+            for (unsigned ic = 0; ic < nsymbols; ic++)
+            {
+                const Symbol *symbol = symbols[ic];
+                if (symbol->section == section && strcmp(symbol->name, section->name) != 0)
+                    dumpSymbol(symbol, flags, fp);
+            }
+        }
+    }
+    else
+    {
+        // dump all symbols
+        for (unsigned ic = 0; ic < nsymbols; ic++)
+            dumpSymbol(symbols[ic], flags, fp);
+    }
+}
+
+unsigned ElfLinker::getSymbolOffset(const char *name) const
+{
+    const Symbol *symbol = findSymbol(name);
+    if (symbol->section->output == NULL)
+        return 0xdeaddead;
+    return symbol->section->offset + symbol->offset;
+}
+
+void ElfLinker::alignWithByte(unsigned len, unsigned char b)
+{
+    memset(output + outputlen, b, len);
+    outputlen += len;
+}
+
+void ElfLinker::relocate1(const Relocation *rel, upx_byte *,
+                          unsigned, const char *)
+{
+    printf("unknown relocation type '%s\n", rel->type);
+    abort();
 }


-int Linker::getSection(const char *name, int *slen) const
+/*************************************************************************
+// ElfLinker arch subclasses
+// FIXME: add more displacment overflow checks
+**************************************************************************/
+
+#if 0 // FIXME
+static void check8(const Relocation *rel, const upx_byte *location, int v, int d)
 {
-    if (!frozen)
-        return -1;
-    for (int ic = 0; ic < nsections; ic++)
-        if (memcmp(name,sections[ic].name,8) == 0)
+    if (v < -128 || v > 127) {
+        printf("value out of range (%d) in reloc %s:%x\n",
+               v, rel->section->name, rel->offset);
+        abort();
+    }
+    if (d < -128 || d > 127) {
+        printf("displacement target out of range (%d) in reloc %s:%x\n",
+               v, rel->section->name, rel->offset);
+        abort();
+    }
+}
+#endif
+
+
+void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location,
+                               unsigned value, const char *type)
+{
+    if (strncmp(type, "R_X86_64_", 9))
+        return super::relocate1(rel, location, value, type);
+    type += 9;
+
+    if (strncmp(type, "PC", 2) == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        type += 2;
+    }
+
+    if (strcmp(type, "8") == 0)
+    {
+        int displ = (signed char) *location + (int) value;
+        if (displ < -128 || displ > 127)
        {
-            if (slen)
-                *slen = sections[ic].len;
-            return sections[ic].ostart;
+            printf("target out of range (%d) in reloc %s:%x\n",
+                   displ, rel->section->name, rel->offset);
+            abort();
        }
-    return -1;
+        *location += value;
+    }
+    else if (strcmp(type, "16") == 0)
+        set_le16(location, get_le16(location) + value);
+    else if (strcmp(type, "32") == 0)
+        set_le32(location, get_le32(location) + value);
+    else
+        super::relocate1(rel, location, value, type);
+}
+
+
+void ElfLinkerArmBE::relocate1(const Relocation *rel, upx_byte *location,
+                               unsigned value, const char *type)
+{
+    if (strcmp(type, "R_ARM_PC24") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        set_be24(1+ location, get_be24(1+ location) + value / 4);
+    }
+    else if (strcmp(type, "R_ARM_ABS32") == 0)
+    {
+        set_be32(location, get_be32(location) + value);
+    }
+    else if (strcmp(type, "R_ARM_THM_CALL") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        value += ((get_be16(location) & 0x7ff) << 12);
+        value += (get_be16(location + 2) & 0x7ff) << 1;
+
+        set_be16(location, 0xf000 + ((value >> 12) & 0x7ff));
+        set_be16(location + 2, 0xf800 + ((value >> 1)  & 0x7ff));
+
+        //(b, 0xF000 + ((v - 1) / 2) * 0x10000);
+        //set_be32(location, get_be32(location) + value / 4);
+    }
+    else
+        super::relocate1(rel, location, value, type);
+}
+
+
+void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location,
+                               unsigned value, const char *type)
+{
+    if (strcmp(type, "R_ARM_PC24") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        set_le24(location, get_le24(location) + value / 4);
+    }
+    else if (strcmp(type, "R_ARM_ABS32") == 0)
+    {
+        set_le32(location, get_le32(location) + value);
+    }
+    else if (strcmp(type, "R_ARM_THM_CALL") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        value += ((get_le16(location) & 0x7ff) << 12);
+        value += (get_le16(location + 2) & 0x7ff) << 1;
+
+        set_le16(location, 0xf000 + ((value >> 12) & 0x7ff));
+        set_le16(location + 2, 0xf800 + ((value >> 1)  & 0x7ff));
+
+        //(b, 0xF000 + ((v - 1) / 2) * 0x10000);
+        //set_le32(location, get_le32(location) + value / 4);
+    }
+    else
+        super::relocate1(rel, location, value, type);
+}
+
+
+void ElfLinkerM68k::alignCode(unsigned len)
+{
+    assert((len & 1) == 0);
+    assert((outputlen & 1) == 0);
+    for (unsigned i = 0; i < len; i += 2)
+        set_be16(output + outputlen + i, 0x4e71); // "nop"
+    outputlen += len;
+}
+
+void ElfLinkerM68k::relocate1(const Relocation *rel, upx_byte *location,
+                              unsigned value, const char *type)
+{
+    if (strncmp(type, "R_68K_", 6))
+        return super::relocate1(rel, location, value, type);
+    type += 6;
+
+    if (strncmp(type, "PC", 2) == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        type += 2;
+    }
+    if (strcmp(type, "8") == 0) {
+        *location += value;
+    }
+    else if (strcmp(type, "16") == 0) {
+        set_be16(location, get_be16(location) + value);
+    }
+    else if (strcmp(type, "32") == 0) {
+        set_be32(location, get_be32(location) + value);
+    }
+    else
+        super::relocate1(rel, location, value, type);
+}
+
+
+void ElfLinkerMipsLE::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_le16(location, get_le16(location) + MIPS_HI(value));
+    else if (strcmp(type, "R_MIPS_LO16") == 0)
+        set_le16(location, get_le16(location) + MIPS_LO(value));
+    else if (strcmp(type, "R_MIPS_PC16") == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        set_le16(location, get_le16(location) + MIPS_PC16(value));
+    }
+    else if (strcmp(type, "R_MIPS_26") == 0)
+        set_le32(location, get_le32(location) + MIPS_PC26(value));
+    else if (strcmp(type, "R_MIPS_32") == 0)
+        set_le32(location, get_le32(location) + value);
+    else
+        super::relocate1(rel, location, value, type);
+
+#undef MIPS_HI
+#undef MIPS_LO
+#undef MIPS_PC16
+#undef MIPS_PC26
+}
+
+
+void ElfLinkerPpc32::relocate1(const Relocation *rel, upx_byte *location,
+                               unsigned value, const char *type)
+{
+    if (strncmp(type, "R_PPC_", 6))
+        return super::relocate1(rel, location, value, type);
+    type += 6;
+
+    if (strncmp(type, "REL", 3) == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        type += 3;
+    }
+
+    // FIXME: more relocs
+
+    // Note that original (*location).displ is ignored.
+    if (strcmp(type, "24") == 0) {
+        if (3& value) {
+            printf("unaligned word diplacement");
+            abort();
+        }
+        // FIXME: displacment overflow?
+        set_be32(location, (0xfc000003 & get_be32(location)) +
+            (0x03fffffc & value));
+    }
+    else if (strcmp(type, "14") == 0) {
+        if (3& value) {
+            printf("unaligned word diplacement");
+            abort();
+        }
+        // FIXME: displacment overflow?
+        set_be32(location, (0xffff0003 & get_be32(location)) +
+            (0x0000fffc & value));
+    }
+    else
+        super::relocate1(rel, location, value, type);
+}
+
+
+void ElfLinkerX86::relocate1(const Relocation *rel, upx_byte *location,
+                             unsigned value, const char *type)
+{
+    if (strncmp(type, "R_386_", 6))
+        return super::relocate1(rel, location, value, type);
+    type += 6;
+
+    bool range_check = false;
+    if (strncmp(type, "PC", 2) == 0)
+    {
+        value -= rel->section->offset + rel->offset;
+        type += 2;
+        range_check = true;
+    }
+
+    if (strcmp(type, "8") == 0)
+    {
+        int displ = (signed char) *location + (int) value;
+        if (range_check && (displ < -128 || displ > 127)) {
+            printf("target out of range (%d) in reloc %s:%x\n",
+                   displ, rel->section->name, rel->offset);
+            abort();
+        }
+        *location += value;
+    }
+    else if (strcmp(type, "16") == 0)
+        set_le16(location, get_le16(location) + value);
+    else if (strcmp(type, "32") == 0)
+        set_le32(location, get_le32(location) + value);
+    else
+        super::relocate1(rel, location, value, type);
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -30,34 +30,192 @@
 #define __UPX_LINKER_H


-class Linker
+/*************************************************************************
+// ElfLinker
+**************************************************************************/
+
+class ElfLinker : private nocopy
 {
+    friend class Packer;
 public:
-    Linker(const void *pdata, int plen, int pinfo);
-    ~Linker();
-    void addSection(const char *sect);
-    void addSection(const char *sname, const void *sdata, unsigned len);
-    const char *getLoader(int *llen);
-    int getSection(const char *name, int *slen) const;
+    const N_BELE_RTP::AbstractPolicy *bele;
+protected:
+    struct      Section;
+    struct      Symbol;
+    struct      Relocation;

-private:
-    struct section;
-    struct jump;
+    upx_byte    *input;
+    int         inputlen;
+    upx_byte    *output;
+    int         outputlen;

-    char     *iloader, *oloader;
-    int      ilen, olen;
-    int      info;
-    jump     *jumps;
-    int      njumps;
-    section  *sections;
-    int      nsections;
-    int      frozen;
-    int      align_hack;
+    Section     *head;
+    Section     *tail;

-private:
-    // disable copy and assignment
-    Linker(Linker const &); // {}
-    Linker& operator= (Linker const &); // { return *this; }
+    Section     **sections;
+    Symbol      **symbols;
+    Relocation  **relocations;
+
+    unsigned    nsections;
+    unsigned    nsections_capacity;
+    unsigned    nsymbols;
+    unsigned    nsymbols_capacity;
+    unsigned    nrelocations;
+    unsigned    nrelocations_capacity;
+
+    bool        reloc_done;
+
+protected:
+    void preprocessSections(char *start, const char *end);
+    void preprocessSymbols(char *start, const char *end);
+    void preprocessRelocations(char *start, const char *end);
+    Section *findSection(const char *name, bool fatal=true) const;
+    Symbol *findSymbol(const char *name, bool fatal=true) const;
+
+    Symbol *addSymbol(const char *name, const char *section, unsigned offset);
+    Relocation *addRelocation(const char *section, unsigned off, const char *type,
+                              const char *symbol, unsigned add);
+
+public:
+    ElfLinker();
+    virtual ~ElfLinker();
+
+    virtual void init(const void *pdata, int plen);
+    virtual void setLoaderAlignOffset(int phase);
+    virtual int addLoader(const char *sname);
+    virtual Section *addSection(const char *sname, const void *sdata, int slen, unsigned p2align);
+    virtual int getSection(const char *sname, int *slen=NULL) const;
+    virtual int getSectionSize(const char *sname) const;
+    virtual upx_byte *getLoader(int *llen=NULL) const;
+    virtual void defineSymbol(const char *name, unsigned value);
+    virtual unsigned getSymbolOffset(const char *) const;
+
+    virtual void dumpSymbol(const Symbol *, unsigned flags, FILE *fp) const;
+    virtual void dumpSymbols(unsigned flags=0, FILE *fp=NULL) const;
+
+    void alignWithByte(unsigned len, unsigned char b);
+    virtual void alignCode(unsigned len) { alignWithByte(len, 0); }
+    virtual void alignData(unsigned len) { alignWithByte(len, 0); }
+
+protected:
+    virtual void relocate();
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+struct ElfLinker::Section : private nocopy
+{
+    char *name;
+    void *input;
+    upx_byte *output;
+    unsigned size;
+    unsigned offset;
+    unsigned p2align;   // log2
+    Section *next;
+
+    Section(const char *n, const void *i, unsigned s, unsigned a=0);
+    ~Section();
+};
+
+
+struct ElfLinker::Symbol : private nocopy
+{
+    char *name;
+    Section *section;
+    unsigned offset;
+
+    Symbol(const char *n, Section *s, unsigned o);
+    ~Symbol();
+};
+
+
+struct ElfLinker::Relocation : private nocopy
+{
+    const Section *section;
+    unsigned offset;
+    const char *type;
+    const Symbol *value;
+    unsigned add;           // used in .rela relocations
+
+    Relocation(const Section *s, unsigned o, const char *t,
+               const Symbol *v, unsigned a);
+};
+
+
+/*************************************************************************
+// ElfLinker arch subclasses
+**************************************************************************/
+
+class ElfLinkerAMD64 : public ElfLinker
+{
+    typedef ElfLinker super;
+protected:
+    virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerArmBE : public ElfLinker
+{
+    typedef ElfLinker super;
+public:
+    ElfLinkerArmBE() { bele = &N_BELE_RTP::be_policy; }
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerArmLE : public ElfLinker
+{
+    typedef ElfLinker super;
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerM68k : public ElfLinker
+{
+    typedef ElfLinker super;
+public:
+    ElfLinkerM68k() { bele = &N_BELE_RTP::be_policy; }
+protected:
+    virtual void alignCode(unsigned len);
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerMipsLE : public ElfLinker
+{
+    typedef ElfLinker super;
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerPpc32 : public ElfLinker
+{
+    typedef ElfLinker super;
+public:
+    ElfLinkerPpc32() { bele = &N_BELE_RTP::be_policy; }
+protected:
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
+};
+
+
+class ElfLinkerX86 : public ElfLinker
+{
+    typedef ElfLinker super;
+protected:
+    virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
+    virtual void relocate1(const Relocation *, upx_byte *location,
+                           unsigned value, const char *type);
 };


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -34,84 +34,183 @@
 //
 **************************************************************************/

-MemBuffer::MemBuffer(unsigned size) :
-    ptr(NULL), alloc_ptr(NULL), alloc_size(0)
+static int use_mcheck = -1;
+
+static int mcheck_init()
 {
-    if (size > 0)
-        alloc(size, 0);
+    if (use_mcheck < 0)
+    {
+        use_mcheck = 1;
+#if defined(WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
+        if (RUNNING_ON_VALGRIND)
+        {
+            //fprintf(stderr, "upx: detected RUNNING_ON_VALGRIND\n");
+            use_mcheck = 0;
+        }
+#endif
+    }
+    return use_mcheck;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+MemBuffer::MemBuffer() :
+    b(NULL), b_size(0)
+{
+    if (use_mcheck < 0)
+        mcheck_init();
+}
+
+MemBuffer::MemBuffer(unsigned size) :
+    b(NULL), b_size(0)
+{
+    alloc(size);
 }


 MemBuffer::~MemBuffer()
 {
-    this->free();
+    this->dealloc();
+}
+
+void MemBuffer::dealloc()
+{
+    if (b)
+    {
+        checkState();
+        if (use_mcheck)
+        {
+            // remove magic constants
+            set_be32(b - 8, 0);
+            set_be32(b - 4, 0);
+            set_be32(b + b_size, 0);
+            set_be32(b + b_size + 4, 0);
+            //
+            ::free(b - 16);
+        }
+        else
+            ::free(b);
+        b = NULL;
+        b_size = 0;
+    }
+    else
+        assert(b_size == 0);
 }


-void MemBuffer::free()
+unsigned MemBuffer::getSizeForCompression(unsigned uncompressed_size, unsigned extra)
 {
-    if (alloc_ptr)
-        ::free(alloc_ptr);
-    alloc_ptr = ptr = NULL;
-    alloc_size = 0;
+    assert((int)uncompressed_size > 0);
+    assert((int)extra >= 0);
+    unsigned size = uncompressed_size + uncompressed_size/8 + 256 + extra;
+    return size;
 }

-
-unsigned MemBuffer::getSize() const
+unsigned MemBuffer::getSizeForUncompression(unsigned uncompressed_size, unsigned extra)
 {
-    if (!alloc_ptr)
-        return 0;
-    unsigned size = alloc_size - (ptr - alloc_ptr);
-    assert((int)size > 0);
+    assert((int)uncompressed_size > 0);
+    assert((int)extra >= 0);
+    unsigned size = uncompressed_size + extra;
+//    size += 512;   // 512 safety bytes
+    // INFO: 3 bytes are the allowed overrun for the i386 asm_fast decompressors
+#if (ACC_ARCH_I386)
+    size += 3;
+#endif
    return size;
 }


-void MemBuffer::alloc(unsigned size, unsigned base_offset)
+void MemBuffer::allocForCompression(unsigned uncompressed_size, unsigned extra)
 {
-#if 0
-    this->free();
-#else
-    // don't automaticlly free a used buffer
-#endif
-    assert(alloc_ptr == NULL);
-    assert((int)size > 0);
-    size = base_offset + size;
-    alloc_ptr = (unsigned char *) malloc(size);
-    if (!alloc_ptr)
+    unsigned size = getSizeForCompression(uncompressed_size, extra);
+    alloc(size);
+}
+
+
+void MemBuffer::allocForUncompression(unsigned uncompressed_size, unsigned extra)
+{
+    unsigned size = getSizeForUncompression(uncompressed_size, extra);
+    alloc(size);
+}
+
+
+void MemBuffer::fill(unsigned off, unsigned len, int value)
+{
+    checkState();
+    assert((int)off >= 0);
+    assert((int)len >= 0);
+    assert(off <= b_size);
+    assert(len <= b_size);
+    assert(off + len <= b_size);
+    if (len > 0)
+        memset(b + off, value, len);
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+#define PTR(p)      ((unsigned) ((acc_uintptr_t)(p) & 0xffffffff))
+#define MAGIC1(p)   (PTR(p) ^ 0xfefdbeeb)
+#define MAGIC2(p)   (PTR(p) ^ 0xfefdbeeb ^ 0x80024001)
+
+unsigned MemBuffer::global_alloc_counter = 0;
+
+
+void MemBuffer::checkState() const
+{
+    if (!b)
+        throwInternalError("block not allocated");
+    if (use_mcheck)
    {
-        throwCantPack("out of memory");
-        //exit(1);
+        if (get_be32(b - 4) != MAGIC1(b))
+            throwInternalError("memory clobbered before allocated block 1");
+        if (get_be32(b - 8) != b_size)
+            throwInternalError("memory clobbered before allocated block 2");
+        if (get_be32(b + b_size) != MAGIC2(b))
+            throwInternalError("memory clobbered past end of allocated block");
    }
-    alloc_size = size;
-    ptr = alloc_ptr + base_offset;
+    assert((int)b_size > 0);
 }


 void MemBuffer::alloc(unsigned size)
 {
-    alloc(size, 0);
-}
+    if (use_mcheck < 0)
+        mcheck_init();

-
-void MemBuffer::allocForCompression(unsigned uncompressed_size)
-{
-    // Idea:
-    //   We allocate the buffer at an offset of 4096 so
-    //   that we could do an in-place decompression for
-    //   verifying our overlap_overhead at the end
-    //   of packing.
+    // NOTE: we don't automatically free a used buffer
+    assert(b == NULL);
+    assert(b_size == 0);
    //
-    // See Packer::verifyOverlappingDecompression().
+    assert((int)size > 0);
+    unsigned total = use_mcheck ? size + 32 : size;
+    assert((int)total > 0);
+    unsigned char *p = (unsigned char *) malloc(total);
+    if (!p)
+    {
+        //throw bad_alloc();
+        throw OutOfMemoryException("out of memory");
+        //exit(1);
+    }
+    b_size = size;
+    if (use_mcheck)
+    {
+        b = p + 16;
+        // store magic constants to detect buffer overruns
+        set_be32(b - 8, b_size);
+        set_be32(b - 4, MAGIC1(b));
+        set_be32(b + b_size, MAGIC2(b));
+        set_be32(b + b_size + 4, global_alloc_counter++);
+    }
+    else
+        b = p ;

-    alloc(uncompressed_size + uncompressed_size/8 + 256, MAX_OVERLAP_OVERHEAD);
-}
-
-
-void MemBuffer::allocForUncompression(unsigned uncompressed_size)
-{
-    //alloc(uncompressed_size + 3 + 512, 0);  // 512 safety bytes
-    alloc(uncompressed_size + 3, 0);  // 3 bytes for asm_fast decompresion
+    //fill(0, b_size, (rand() & 0xff) | 1); // debug
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -37,43 +37,46 @@
 class MemBuffer
 {
 public:
-    MemBuffer(unsigned size=0);
+    MemBuffer();
+    explicit MemBuffer(unsigned size);
    ~MemBuffer();

+    static unsigned getSizeForCompression(unsigned uncompressed_size, unsigned extra=0);
+    static unsigned getSizeForUncompression(unsigned uncompressed_size, unsigned extra=0);
+
    void alloc(unsigned size);
-    void allocForCompression(unsigned uncompressed_size);
-    void allocForUncompression(unsigned uncompressed_size);
+    void allocForCompression(unsigned uncompressed_size, unsigned extra=0);
+    void allocForUncompression(unsigned uncompressed_size, unsigned extra=0);

-    void free();
+    void dealloc();

-    const unsigned char *getBuf()     const { return ptr; }
-    unsigned getSize() const ;
+    void checkState() const;

-    operator       unsigned char * ()       { return ptr; }
-    //operator const unsigned char * () const { return ptr; }
+    unsigned getSize() const { return b_size; }

-    enum { MAX_OVERLAP_OVERHEAD = 4096 };
+    operator       unsigned char * ()       { return b; }
+    //operator const unsigned char * () const { return b; }
+          void *getVoidPtr()                { return (void *) b; }
+    const void *getVoidPtr() const          { return (const void *) b; }
+
+    void fill(unsigned off, unsigned len, int value);
+    void clear(unsigned off, unsigned len)  { fill(off, len, 0); }
+    void clear()                            { fill(0, b_size, 0); }

 private:
-    void alloc(unsigned size, unsigned base_offset);
+    unsigned char *b;
+    unsigned b_size;

-    unsigned char *ptr;
-    unsigned char *alloc_ptr;
-    unsigned alloc_size;
+    static unsigned global_alloc_counter;

-private:
    // disable copy and assignment
-    MemBuffer(MemBuffer const &); // {}
-    MemBuffer& operator= (MemBuffer const &); // { return *this; }
+    MemBuffer(const MemBuffer &); // {}
+    MemBuffer& operator= (const MemBuffer &); // { return *this; }

    // disable dynamic allocation
-    static void *operator new (size_t); // {}
-    static void *operator new[] (size_t); // {}
-    //static void operator delete (void *) {}
-    //static void operator delete[] (void *) {}
+    DISABLE_NEW_DELETE
 };

-
 #endif /* already included */


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 */


@@ -66,14 +66,13 @@ void printClearLine(FILE *f)
 static void pr_print(bool c, const char *msg)
 {
    if (c && !opt->to_stdout)
-        con_fprintf(stderr,msg);
+        con_fprintf(stderr, "%s", msg);
    else
-        fprintf(stderr,msg);
+        fprintf(stderr, "%s", msg);
 }

 static void pr_error(const char *iname, const char *msg, bool is_warning)
 {
-    set_ec(EXIT_ERROR);
    fflush(stdout); fflush(stderr);
    char buf[1024];
    buf[0] = 0;
@@ -89,7 +88,7 @@ static void pr_error(const char *iname, const char *msg, bool is_warning)
    // This hack is needed, otherwise error messages may get lost
    // when the cursor is not yet at the bottom of the screen.
    // At least I can use some colors then...
-    bool c = isatty(STDERR_FILENO) ? 1 : 0;
+    bool c = acc_isatty(STDERR_FILENO) ? 1 : 0;

    int fg = con_fg(stderr,FG_BRTRED);
    upx_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),"%s: ", progname);
@@ -104,23 +103,35 @@ static void pr_error(const char *iname, const char *msg, bool is_warning)
    fg = con_fg(stderr,fg);

    UNUSED(is_warning);
+    UNUSED(fg);
 }


 void printErr(const char *iname, const Throwable *e)
 {
    char buf[1024];
+    size_t l;

-    upx_snprintf(buf, sizeof(buf), "%s", prettyName(typeid(*e)));
-    if (e->getMsg())
-        upx_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),": %s", e->getMsg());
-    if (e->getErrno())
-        upx_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),": %s", strerror(e->getErrno()));
+    upx_snprintf(buf, sizeof(buf), "%s", prettyName(typeid(*e).name()));
+    l = strlen(buf);
+    if (l < sizeof(buf) && e->getMsg())
+        upx_snprintf(buf+l, sizeof(buf)-l, ": %s", e->getMsg());
+    l = strlen(buf);
+    if (l < sizeof(buf) && e->getErrno()) {
+        upx_snprintf(buf+l, sizeof(buf)-l, ": %s", strerror(e->getErrno()));
+#if 1
+        // some compilers (e.g. Borland C++) put a trailing '\n'
+        // into strerror() result
+        l = strlen(buf);
+        while (l-- > 0 && (buf[l] == '\n' || buf[l] == ' '))
+            buf[l] = 0;
+#endif
+    }
    pr_error(iname,buf,e->isWarning());
 }


-void printErr(const char *iname, const char *format, ...)
+void __acc_cdecl_va printErr(const char *iname, const char *format, ...)
 {
    va_list args;
    char buf[1024];
@@ -133,7 +144,7 @@ void printErr(const char *iname, const char *format, ...)
 }


-void printWarn(const char *iname, const char *format, ...)
+void __acc_cdecl_va printWarn(const char *iname, const char *format, ...)
 {
    va_list args;
    char buf[1024];
@@ -146,7 +157,7 @@ void printWarn(const char *iname, const char *format, ...)
 }


-void printUnhandledException(const char *iname, const exception *e)
+void printUnhandledException(const char *iname, const std::exception *e)
 {
    if (e)
        printErr(iname,"unhandled exception: %s\n", prettyName(e->what()));
@@ -190,7 +201,7 @@ void infoHeader()
    info_header = 0;
 }

-void infoHeader(const char *format, ...)
+void __acc_cdecl_va infoHeader(const char *format, ...)
 {
    if (opt->info_mode <= 0)
        return;
@@ -204,7 +215,7 @@ void infoHeader(const char *format, ...)
 }


-void info(const char *format, ...)
+void __acc_cdecl_va info(const char *format, ...)
 {
    if (opt->info_mode <= 0)
        return;
@@ -219,7 +230,7 @@ void info(const char *format, ...)
 }


-void infoWarning(const char *format, ...)
+void __acc_cdecl_va infoWarning(const char *format, ...)
 {
    if (opt->info_mode <= 0)
    {
@@ -21,11 +21,22 @@
   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */


-#include "tailor.h"
+
+#undef PROGNAME
+#if 0
 #ifndef EOF
 #include <stdio.h>
 #include <string.h>
 #endif
+#define PROGNAME(x)     (x)
+#else
+#include "conf.h"
+static const char *my_progname(const char *argv0)
+{
+    return progname ? progname : argv0;
+}
+#define PROGNAME(x)     my_progname(x)
+#endif


 /* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
@@ -54,8 +65,6 @@
 #define optind                  mfx_optind
 #define opterr                  mfx_opterr
 #define optopt                  mfx_optopt
-#define my_index                strchr
-#define my_strlen               strlen
 #undef BAD_OPTION

 /* For communication from `getopt' to the caller.
@@ -167,7 +176,7 @@ static int last_nonopt;

 static void exchange (char **argv)
 {
-  char *temp, **first, **last;
+  char *temp; char **first, **last;

  /* Reverse all the elements [first_nonopt, optind) */
  first = &argv[first_nonopt];
@@ -382,15 +391,10 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
      int indfound = 0;
      int needexact = 0;

-#if defined(DOSISH)
      /* allow `--option#value' because you cannout assign a '='
         to an environment variable under DOS command.com */
      while (*s && *s != '=' && * s != '#')
        s++;
-#else
-      while (*s && *s != '=')
-        s++;
-#endif

      /* Test all options for either exact match or abbreviated matches.  */
      for (p = longopts, option_index = 0; p->name;
@@ -399,7 +403,7 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
          {
            if (p->has_arg & 0x10)
              needexact = 1;
-            if ((unsigned) (s - nextchar) == my_strlen (p->name))
+            if ((unsigned) (s - nextchar) == strlen (p->name))
              {
                /* Exact match found.  */
                pfound = p;
@@ -423,8 +427,8 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
        {
          if (opterr)
            fprintf (stderr, "%s: unrecognized option `%s'\n",
-                     argv[0], argv[optind]);
-          nextchar += my_strlen (nextchar);
+                     PROGNAME(argv[0]), argv[optind]);
+          nextchar += strlen (nextchar);
          optind++;
          return BAD_OPTION;
        }
@@ -432,8 +436,8 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
        {
          if (opterr)
            fprintf (stderr, "%s: option `%s' is ambiguous\n",
-                     argv[0], argv[optind]);
-          nextchar += my_strlen (nextchar);
+                     PROGNAME(argv[0]), argv[optind]);
+          nextchar += strlen (nextchar);
          optind++;
          return BAD_OPTION;
        }
@@ -459,14 +463,14 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
                        /* --option */
                        fprintf (stderr,
                                 "%s: option `--%s' doesn't allow an argument\n",
-                                 argv[0], pfound->name);
+                                 PROGNAME(argv[0]), pfound->name);
                      else
                        /* +option or -option */
                        fprintf (stderr,
                             "%s: option `%c%s' doesn't allow an argument\n",
-                             argv[0], argv[optind - 1][0], pfound->name);
+                             PROGNAME(argv[0]), argv[optind - 1][0], pfound->name);
                    }
-                  nextchar += my_strlen (nextchar);
+                  nextchar += strlen (nextchar);
                  return BAD_OPTION;
                }
            }
@@ -482,13 +486,13 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
                {
                  if (opterr)
                    fprintf (stderr, "%s: option `--%s%s' requires an argument\n",
-                             argv[0], pfound->name,
+                             PROGNAME(argv[0]), pfound->name,
                             (pfound->has_arg & 0x20) ? "=" : "");
-                  nextchar += my_strlen (nextchar);
+                  nextchar += strlen (nextchar);
                  return optstring[0] == ':' ? ':' : BAD_OPTION;
                }
            }
-          nextchar += my_strlen (nextchar);
+          nextchar += strlen (nextchar);
          if (longind != NULL)
            *longind = option_index;
          if (pfound->flag)
@@ -506,31 +510,31 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
 #ifdef GETOPT_COMPAT
          || argv[optind][0] == '+'
 #endif                          /* GETOPT_COMPAT */
-          || my_index (optstring, *nextchar) == NULL)
+          || strchr (optstring, *nextchar) == NULL)
        {
          if (opterr)
            {
              if (argv[optind][1] == '-')
                /* --option */
                fprintf (stderr, "%s: unrecognized option `--%s'\n",
-                         argv[0], nextchar);
+                         PROGNAME(argv[0]), nextchar);
              else
                /* +option or -option */
                fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-                         argv[0], argv[optind][0], nextchar);
+                         PROGNAME(argv[0]), argv[optind][0], nextchar);
            }
          nextchar = empty_string;
          optind++;
          return BAD_OPTION;
        }
-        ambig = ambig;
+        (void) &ambig;  /* UNUSED */
    }

  /* Look at and handle the next option-character.  */

  {
    char c = *nextchar++;
-    const char *temp = my_index (optstring, c);
+    const char *temp = strchr (optstring, c);

    /* Increment `optind' when we start to process its last character.  */
    if (*nextchar == '\0')
@@ -543,12 +547,12 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
 #if 0
            if (c < 040 || c >= 0177)
              fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-                       argv[0], c);
+                       PROGNAME(argv[0]), c);
            else
-              fprintf (stderr, "%s: unrecognized option `-%c'\n", argv[0], c);
+              fprintf (stderr, "%s: unrecognized option `-%c'\n", PROGNAME(argv[0]), c);
 #else
            /* 1003.2 specifies the format of this message.  */
-            fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
+            fprintf (stderr, "%s: illegal option -- %c\n", PROGNAME(argv[0]), c);
 #endif
          }
        optopt = c;
@@ -584,11 +588,11 @@ static int _getopt_internal (int argc, char **argv, const char *optstring,
                  {
 #if 0
                    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-                             argv[0], c);
+                             PROGNAME(argv[0]), c);
 #else
                    /* 1003.2 specifies the format of this message.  */
                    fprintf (stderr, "%s: option requires an argument -- %c\n",
-                             argv[0], c);
+                             PROGNAME(argv[0]), c);
 #endif
                  }
                optopt = c;
@@ -694,3 +698,9 @@ main (argc, argv)
 }

 #endif /* TEST */
+
+
+/*
+vi:ts=4:et:nowrap
+*/
+
@@ -19,7 +19,7 @@
 #define __MFX_GETOPT_H 1

 #ifdef __cplusplus
-//extern "C" {
+/* extern "C" { */
 #endif

 /* For communication from `getopt' to the caller.
@@ -96,7 +96,7 @@ int mfx_getopt_long(int argc, char **argv, const char *shortopts,
                    const struct mfx_option *longopts, int *longind);

 #ifdef __cplusplus
-//}
+/* } */
 #endif

-#endif /* _GETOPT_H */
+#endif /* __MFX_GETOPT_H */
@@ -0,0 +1,160 @@
+/* options.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_OPTIONS_H
+#define __UPX_OPTIONS_H
+
+
+/*************************************************************************
+// globals
+**************************************************************************/
+
+// options - command
+enum {
+    CMD_NONE,
+    CMD_COMPRESS, CMD_DECOMPRESS, CMD_TEST, CMD_LIST, CMD_FILEINFO,
+    CMD_HELP, CMD_LICENSE, CMD_VERSION
+};
+
+
+struct options_t {
+    int cmd;
+
+    // compression options
+    int method;
+    int level;              // compression level 1..10
+    int filter;             // preferred filter from Packer::getFilters()
+    bool all_methods;       // try all available compression methods ?
+    bool all_methods_use_lzma;
+    bool all_filters;       // try all available filters ?
+    bool no_filter;         // force no filter
+    bool exact;             // user requires byte-identical decompression
+
+    // other options
+    int backup;
+    int console;
+    int force;
+    int info_mode;
+    bool ignorewarn;
+    bool no_env;
+    bool no_progress;
+    const char *output_name;
+    int small;
+    int verbose;
+    bool to_stdout;
+
+    // debug options
+    struct {
+        int debug_level;
+        bool disable_random_id;         // for Packer::getRandomId()
+        const char *dump_stub_loader;
+        char fake_stub_version[4+1];    // for internal debugging
+        char fake_stub_year[4+1];       // for internal debugging
+    } debug;
+
+    // overlay handling
+    enum {
+        SKIP_OVERLAY      = 0,
+        COPY_OVERLAY      = 1,
+        STRIP_OVERLAY     = 2
+    };
+    int overlay;
+
+    // compression runtime parameters - see struct XXX_compress_config_t
+    struct crp_t {
+        lzma_compress_config_t  crp_lzma;
+        ucl_compress_config_t   crp_ucl;
+        zlib_compress_config_t  crp_zlib;
+        void reset() { crp_lzma.reset(); crp_ucl.reset(); crp_zlib.reset(); }
+    };
+    crp_t crp;
+
+    // CPU
+    enum {
+        CPU_DEFAULT = 0,
+        CPU_8086    = 1,
+        CPU_286     = 2,
+        CPU_386     = 3,
+        CPU_486     = 4,
+        CPU_586     = 5,
+        CPU_686     = 6
+    };
+    int cpu;
+
+    // options for various executable formats
+    struct {
+        bool split_segments;
+    } atari_tos;
+    struct {
+        bool coff;
+    } djgpp2_coff;
+    struct {
+        bool force_stub;
+        bool no_reloc;
+    } dos_exe;
+    struct {
+        bool boot_only;
+        bool no_align;
+        bool do_8bit;
+        bool do_8mb;
+    } ps1_exe;
+    struct {
+        unsigned blocksize;
+        bool force_execve;          // force the linux/386 execve format
+        bool is_ptinterp;           // is PT_INTERP, so don't adjust auxv_t
+        bool use_ptinterp;          // use PT_INTERP /opt/upx/run
+        bool make_ptinterp;         // make PT_INTERP [ignore current file!]
+        unsigned char osabi0;       // replacement if 0==.e_ident[EI_OSABI]
+        enum { SCRIPT_MAX = 32 };
+        const char *script_name;
+    } o_unix;
+    struct {
+        bool le;
+    } watcom_le;
+    struct {
+        int compress_exports;
+        int compress_icons;
+        int compress_resources;
+        signed char compress_rt[25];    // 25 == RT_LAST
+        int strip_relocs;
+        const char *keep_resource;
+    } win32_pe;
+
+    void reset();
+};
+
+extern struct options_t *opt;
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,72 @@
+/* p_armpe.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
+ */
+
+
+#ifndef __UPX_P_ARMPE_H
+#define __UPX_P_ARMPE_H
+
+/*************************************************************************
+// arm/pe
+**************************************************************************/
+
+class PackArmPe : public PeFile
+{
+    typedef PeFile super;
+
+public:
+    PackArmPe(InputFile *f);
+    virtual ~PackArmPe();
+    virtual int getFormat() const { return UPX_F_WINCE_ARM_PE; }
+    virtual const char *getName() const { return "arm/pe"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+
+    virtual void pack(OutputFile *fo);
+
+    virtual bool canPack();
+    virtual int canUnpack();
+
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual Linker* newLinker() const;
+
+    virtual unsigned processImports();
+    virtual void processImports(unsigned, unsigned);
+    virtual void rebuildImports(upx_byte *&);
+
+    virtual void processTls(Interval *);
+
+    bool use_thumb_stub;
+};
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -31,11 +31,10 @@
 #include "filter.h"
 #include "packer.h"
 #include "p_com.h"
+#include "linker.h"

 static const
-#include "stub/l_com.h"
-
-#define STACKSIZE 0x60
+#include "stub/i086-dos16.com.h"

 //#define TESTING

@@ -44,22 +43,27 @@ static const
 //
 **************************************************************************/

-int PackCom::getCompressionMethod() const
+const int *PackCom::getCompressionMethods(int method, int level) const
 {
-    if (M_IS_NRV2B(opt->method))
-        return M_NRV2B_LE16;
+    static const int m_nrv2b[] = { M_NRV2B_LE16, -1 };
+    if (M_IS_NRV2B(method))
+        return m_nrv2b;
 #if 0
    // NOT IMPLEMENTED
-    if (M_IS_NRV2D(opt->method))
-        return M_NRV2D_LE16;
+    static const int m_nrv2d[] = { M_NRV2D_LE16, -1 };
+    if (M_IS_NRV2D(method))
+        return m_nrv2d;
 #endif
-    return M_NRV2B_LE16;
+    UNUSED(level);
+    return m_nrv2b;
 }


 const int *PackCom::getFilters() const
 {
-    static const int filters[] = { 0x06, 0x03, 0x04, 0x01, 0x05, 0x02, -1 };
+    static const int filters[] = {
+        0x06, 0x03, 0x04, 0x01, 0x05, 0x02,
+    -1 };
    return filters;
 }

@@ -72,14 +76,13 @@ bool PackCom::canPack()
 {
    unsigned char buf[128];

-    fi->readx(buf,128);
+    fi->readx(buf, sizeof(buf));
    if (memcmp(buf,"MZ",2) == 0 || memcmp(buf,"ZM",2) == 0 // .exe
        || memcmp (buf,"\xff\xff\xff\xff",4) == 0) // .sys
        return false;
    if (!fn_has_ext(fi->getName(),"com"))
        return false;
-    if (find_le32(buf,128,UPX_MAGIC_LE32) >= 0)
-        throwAlreadyPacked();
+    checkAlreadyPacked(buf, sizeof(buf));
    if (file_size < 1024)
        throwCantPack("file is too small");
    if (file_size > 0xFF00)
@@ -94,34 +97,33 @@ bool PackCom::canPack()

 void PackCom::patchLoader(OutputFile *fo,
                          upx_byte *loader, int lsize,
-                          unsigned calls, unsigned overlapoh)
+                          unsigned calls)
 {
-    const int filter_id = ph.filter;
    const int e_len = getLoaderSectionStart("COMCUTPO");
    const int d_len = lsize - e_len;
-    assert(e_len > 0 && e_len < 256);
+    assert(e_len > 0 && e_len < 128);
    assert(d_len > 0 && d_len < 256);

-    const unsigned upper_end = ph.u_len + overlapoh + d_len + 0x100;
-    if (upper_end + STACKSIZE > 0xfffe)
-        throwNotCompressible();
+    const unsigned upper_end = ph.u_len + ph.overlap_overhead + d_len + 0x100;
+    unsigned stacksize = 0x60;
+    if (upper_end + stacksize > 0xfffe)
+        stacksize = 0x56;
+    if (upper_end + stacksize > 0xfffe)
+        throwCantPack("file is too big for dos/com");

-    if (filter_id)
-    {
-        assert(calls > 0);
-        patch_le16(loader,lsize,"CT",calls);
-    }
+    linker->defineSymbol("calltrick_calls", calls);
+    linker->defineSymbol("sp_limit", upper_end + stacksize);
+    linker->defineSymbol("bytes_to_copy", ph.c_len + lsize);
+    linker->defineSymbol("copy_source", ph.c_len + lsize + 0x100);
+    linker->defineSymbol("copy_destination", upper_end);
+    linker->defineSymbol("neg_e_len", 0 - e_len);
+    linker->defineSymbol("NRV2B160", ph.u_len + ph.overlap_overhead);

+    relocateLoader();
+    loader = getLoader();
+
+    // some day we could use the relocation stuff for patchPackHeader too
    patchPackHeader(loader,e_len);
-
-    // NOTE: Depends on: decompr_start == cutpoint+1 !!!
-    patch_le16(loader,e_len,"JM",upper_end - 0xff - d_len - getLoaderSection("UPX1HEAD"));
-    loader[getLoaderSection("COMSUBSI") - 1] = (upx_byte) -e_len;
-    patch_le16(loader,e_len,"DI",upper_end);
-    patch_le16(loader,e_len,"SI",ph.c_len + lsize + 0x100);
-    patch_le16(loader,e_len,"CX",ph.c_len + lsize);
-    patch_le16(loader,e_len,"SP",upper_end + STACKSIZE);
-
    // write loader + compressed file
    fo->write(loader,e_len);            // entry
    fo->write(obuf,ph.c_len);
@@ -134,22 +136,25 @@ void PackCom::patchLoader(OutputFile *fo,
 }


-int PackCom::buildLoader(const Filter *ft)
+void PackCom::buildLoader(const Filter *ft)
 {
-    const int filter_id = ft->id;
-    initLoader(nrv2b_loader,sizeof(nrv2b_loader));
-    addLoader("COMMAIN1""COMSUBSI",
-              filter_id ? "COMCALLT" : "",
-              "COMMAIN2""UPX1HEAD""COMCUTPO""NRV2B160",
-              filter_id ? "NRVDDONE" : "NRVDRETU",
+    initLoader(stub_i086_dos16_com, sizeof(stub_i086_dos16_com));
+    addLoader("COMMAIN1",
+              ph.first_offset_found == 1 ? "COMSBBBP" : "",
+              "COMPSHDI",
+              ft->id ? "COMCALLT" : "",
+              "COMMAIN2,UPX1HEAD,COMCUTPO,NRV2B160",
+              ft->id ? "NRVDDONE" : "NRVDRETU",
              "NRVDECO1",
              ph.max_offset_found <= 0xd00 ? "NRVLED00" : "NRVGTD00",
-              "NRVDECO2""NRV2B169",
+              "NRVDECO2",
              NULL
             );
-    if (filter_id)
-        addFilter16(filter_id);
-    return getLoaderSize();
+    if (ft->id)
+    {
+        assert(ft->calls > 0);
+        addFilter16(ft->id);
+    }
 }


@@ -161,7 +166,7 @@ void PackCom::addFilter16(int filter_id)
    if (filter_id % 3 == 0)
        addLoader("CALLTR16",
                  filter_id < 4 ? "CT16SUB0" : "",
-                  filter_id < 4 ? "" : (opt->cpu == opt->CPU_8086 ? "CT16I086" : "CT16I286""CT16SUB0"),
+                  filter_id < 4 ? "" : (opt->cpu == opt->CPU_8086 ? "CT16I086" : "CT16I286,CT16SUB0"),
                  "CALLTRI2",
                  getFormat() == UPX_F_DOS_COM ? "CORETURN" : "",
                  NULL
@@ -171,7 +176,7 @@ void PackCom::addFilter16(int filter_id)
                  "CALLTRI5",
                  getFormat() == UPX_F_DOS_COM ? "CT16JEND" : "CT16JUL2",
                  filter_id < 4 ? "CT16SUB1" : "",
-                  filter_id < 4 ? "" : (opt->cpu == opt->CPU_8086 ? "CT16I087" : "CT16I287""CT16SUB1"),
+                  filter_id < 4 ? "" : (opt->cpu == opt->CPU_8086 ? "CT16I087" : "CT16I287,CT16SUB1"),
                  "CALLTRI6",
                  NULL
                 );
@@ -192,35 +197,22 @@ void PackCom::pack(OutputFile *fo)

    // prepare packheader
    ph.u_len = file_size;
-    ph.filter = 0;
    // prepare filter
-    Filter ft(opt->level);
+    Filter ft(ph.level);
    ft.addvalue = getCallTrickOffset();
-    // prepare other settings
+    // compress
    const unsigned overlap_range = ph.u_len < 0xFE00 - ft.addvalue ? 32 : 0;
-    unsigned overlapoh;
-
-    int strategy = -1;      // try the first working filter
-    if (opt->filter >= 0 && isValidFilter(opt->filter))
-        // try opt->filter or 0 if that fails
-        strategy = -2;
-    else if (opt->all_filters || opt->level > 9)
-        // choose best from all available filters
-        strategy = 0;
-    else if (opt->level == 9)
-        // choose best from the first 4 filters
-        strategy = 4;
-    compressWithFilters(&ft, &overlapoh, overlap_range, strategy);
+    compressWithFilters(&ft, overlap_range);

    const int lsize = getLoaderSize();
    MemBuffer loader(lsize);
    memcpy(loader,getLoader(),lsize);

    const unsigned calls = ft.id % 3 ? ft.lastcall - 2 * ft.calls : ft.calls;
-    patchLoader(fo, loader, lsize, calls, overlapoh);
+    patchLoader(fo, loader, lsize, calls);

    // verify
-    verifyOverlappingDecompression(&obuf, overlapoh);
+    verifyOverlappingDecompression();

    // finally check the compression ratio
    if (!checkFinalCompressionRatio(fo))
@@ -274,6 +266,12 @@ void PackCom::unpack(OutputFile *fo)
 }


+Linker* PackCom::newLinker() const
+{
+    return new ElfLinkerX86();
+}
+
+
 /*
 vi:ts=4:et
 */
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -38,11 +38,11 @@ class PackCom : public Packer
 {
    typedef Packer super;
 public:
-    PackCom(InputFile *f) : super(f) { }
-    virtual int getVersion() const { return 11; }
+    PackCom(InputFile *f) : super(f) { bele = &N_BELE_RTP::le_policy; }
+    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_COM; }
    virtual const char *getName() const { return "dos/com"; }
-    virtual int getCompressionMethod() const;
+    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;

    virtual void pack(OutputFile *fo);
@@ -52,11 +52,12 @@ public:
    virtual int canUnpack();

 protected:
-    virtual const unsigned getCallTrickOffset() const { return 0x100; }
+    virtual unsigned getCallTrickOffset() const { return 0x100; }
+    virtual Linker* newLinker() const;

 protected:
-    virtual int buildLoader(const Filter *ft);
-    virtual void patchLoader(OutputFile *fo, upx_byte *, int, unsigned, unsigned);
+    virtual void buildLoader(const Filter *ft);
+    virtual void patchLoader(OutputFile *fo, upx_byte *, int, unsigned);
    virtual void addFilter16(int filter_id);
 };

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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,21 +21,22 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */

+
 #include "conf.h"
 #include "file.h"
 #include "filter.h"
 #include "packer.h"
 #include "p_djgpp2.h"
+#include "linker.h"

 static const
-#include "stub/stubify.h"
-
+#include "stub/i386-dos32.djgpp2.h"
 static const
-#include "stub/l_djgpp2.h"
+#include "stub/i386-dos32.djgpp2-stubify.h"


 /*************************************************************************
@@ -45,47 +46,70 @@ static const
 PackDjgpp2::PackDjgpp2(InputFile *f) :
    super(f), coff_offset(0)
 {
-    assert(sizeof(coff_hdr) == 0xa8);
-    assert(sizeof(stubify_stub) == 2048);
+    bele = &N_BELE_RTP::le_policy;
+    COMPILE_TIME_ASSERT(sizeof(external_scnhdr_t) == 40);
+    COMPILE_TIME_ASSERT(sizeof(coff_header_t) == 0xa8);
+    COMPILE_TIME_ASSERT_ALIGNOF(external_scnhdr_t, char)
+    COMPILE_TIME_ASSERT_ALIGNOF(coff_header_t, char)
+    COMPILE_TIME_ASSERT(sizeof(stub_i386_dos32_djgpp2_stubify) == 2048);
+    COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_ADLER32 == 0xbf689ba8)
+    COMPILE_TIME_ASSERT(STUB_I386_DOS32_DJGPP2_STUBIFY_CRC32   == 0x2ae982b2)
+    //printf("0x%08x\n", upx_adler32(stubify_stub, sizeof(stubify_stub)));
+    //assert(upx_adler32(stubify_stub, sizeof(stubify_stub)) == STUBIFY_STUB_ADLER32);
 }


-int PackDjgpp2::getCompressionMethod() const
+const int *PackDjgpp2::getCompressionMethods(int method, int level) const
 {
-    if (M_IS_NRV2B(opt->method))
-        return M_NRV2B_LE32;
-    if (M_IS_NRV2D(opt->method))
-        return M_NRV2D_LE32;
-    return opt->level > 1 && file_size >= 512*1024 ? M_NRV2D_LE32 : M_NRV2B_LE32;
+    return Packer::getDefaultCompressionMethods_le32(method, level);
 }

+
 const int *PackDjgpp2::getFilters() const
 {
-    static const int filters[] = { 0x26, 0x24, 0x11, 0x14, 0x13, 0x16,
-                                   0x25, 0x15, 0x12, -1 };
+    static const int filters[] = {
+        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x15, 0x12,
+    -1 };
    return filters;
 }


-int PackDjgpp2::buildLoader(const Filter *ft)
+unsigned PackDjgpp2::findOverlapOverhead(const upx_bytep buf,
+                                         unsigned range,
+                                         unsigned upper_limit) const
+{
+    unsigned o = super::findOverlapOverhead(buf, range, upper_limit);
+    o = (o + 0x3ff) &~ 0x1ff;
+    return o;
+}
+
+
+Linker* PackDjgpp2::newLinker() const
+{
+    return new ElfLinkerX86;
+}
+
+
+void PackDjgpp2::buildLoader(const Filter *ft)
 {
    // prepare loader
-    initLoader(nrv_loader,sizeof(nrv_loader));
-    addLoader("IDENTSTR""DJ2MAIN1",
+    initLoader(stub_i386_dos32_djgpp2, sizeof(stub_i386_dos32_djgpp2));
+    addLoader("IDENTSTR,DJ2MAIN1",
              ft->id ? "DJCALLT1" : "",
              "DJ2MAIN2",
-              getDecompressor(),
+              ph.method == M_LZMA ? "LZMA_INIT_STACK" : "",
+              getDecompressorSections(),
+              ph.method == M_LZMA ? "LZMA_DONE_STACK" : "",
              "DJ2BSS00",
              NULL
             );
    if (ft->id)
    {
        assert(ft->calls > 0);
-        addLoader("DJCALLT2",NULL);
+        addLoader("DJCALLT2", NULL);
        addFilter32(ft->id);
    }
-    addLoader("DJRETURN+40DXXXXUPX1HEAD",NULL);
-    return getLoaderSize();
+    addLoader("DJRETURN,+40C,UPX1HEAD", NULL);
 }


@@ -95,18 +119,18 @@ int PackDjgpp2::buildLoader(const Filter *ft)

 void PackDjgpp2::handleStub(OutputFile *fo)
 {
-    if (fo && !opt->djgpp2.coff)
+    if (fo && !opt->djgpp2_coff.coff)
    {
        if (coff_offset > 0)
        {
            // copy stub from exe
-            Packer::handleStub(fi,fo,coff_offset);
+            Packer::handleStub(fi, fo, coff_offset);
        }
        else
        {
            // "stubify" stub
-            info("Adding stub: %ld bytes", (long)sizeof(stubify_stub));
-            fo->write(stubify_stub,sizeof(stubify_stub));
+            info("Adding stub: %ld bytes", (long)sizeof(stub_i386_dos32_djgpp2_stubify));
+            fo->write(stub_i386_dos32_djgpp2_stubify, sizeof(stub_i386_dos32_djgpp2_stubify));
        }
    }
 }
@@ -118,16 +142,16 @@ static bool is_dlm(InputFile *fi, long coff_offset)
    long off;

    try {
-        fi->seek(coff_offset,SEEK_SET);
-        fi->readx(buf,4);
+        fi->seek(coff_offset, SEEK_SET);
+        fi->readx(buf, 4);
        off = get_le32(buf);
        if (off < 0 || off > coff_offset + 4)
            return false;
-        fi->seek(off,SEEK_SET);
-        fi->readx(buf,4);
-        if (memcmp(buf,"DLMF",4) == 0)
+        fi->seek(off, SEEK_SET);
+        fi->readx(buf, 4);
+        if (memcmp(buf, "DLMF", 4) == 0)
            return true;
-    } catch (IOException&) {
+    } catch (const IOException&) {
    }
    return false;
 }
@@ -136,65 +160,67 @@ static bool is_dlm(InputFile *fi, long coff_offset)
 static void handle_allegropak(InputFile *fi, OutputFile *fo)
 {
    unsigned char buf[0x4000];
-    unsigned pfsize=0, ic;
+    int pfsize = 0;

    try {
-        fi->seek(-8,SEEK_END);
-        fi->readx(buf,8);
-        if (memcmp(buf,"slh+",4) != 0)
+        fi->seek(-8, SEEK_END);
+        fi->readx(buf, 8);
+        if (memcmp(buf, "slh+", 4) != 0)
            return;
-        pfsize = get_be32(buf+4);
-        fi->seek(-(off_t)pfsize,SEEK_END);
-    } catch (IOException&) {
+        pfsize = get_be32_signed(buf+4);
+        if (pfsize <= 8 || (off_t) pfsize >= (off_t) fi->st.st_size)
+            return;
+        fi->seek(-pfsize, SEEK_END);
+    } catch (const IOException&) {
        return;
    }
-    while (pfsize)
+    while (pfsize > 0)
    {
-        ic = pfsize < sizeof(buf) ? pfsize : sizeof(buf);
-        fi->readx(buf,ic);
-        fo->write(buf,ic);
-        pfsize -= ic;
+        const int len = UPX_MIN(pfsize, (int)sizeof(buf));
+        fi->readx(buf, len);
+        fo->write(buf, len);
+        pfsize -= len;
    }
 }


-bool PackDjgpp2::readFileHeader()
+int PackDjgpp2::readFileHeader()
 {
    unsigned char hdr[0x1c];
    unsigned char magic[8];

-    fi->seek(0,SEEK_SET);
-    fi->readx(hdr,sizeof(hdr));
+    fi->seek(0, SEEK_SET);
+    fi->readx(hdr, sizeof(hdr));
    if (get_le16(hdr) == 0x5a4d)        // MZ exe signature, stubbed?
    {
        coff_offset = 512 * get_le16(hdr+4);
        if (get_le16(hdr+2) != 0)
            coff_offset += get_le16(hdr+2) - 512;
-        fi->seek(512,SEEK_SET);
-        fi->readx(magic,8);
-        if (memcmp("go32stub",magic,8) != 0)
-            return false;               // not V2 image
-        fi->seek(coff_offset,SEEK_SET);
-        if (fi->read(&coff_hdr,sizeof(coff_hdr)) != sizeof(coff_hdr))
+        fi->seek(512, SEEK_SET);
+        fi->readx(magic, 8);
+        if (memcmp("go32stub", magic, 8) != 0)
+            return 0;                   // not V2 image
+        fi->seek(coff_offset, SEEK_SET);
+        if (fi->read(&coff_hdr, sizeof(coff_hdr)) != sizeof(coff_hdr))
            throwCantPack("skipping djgpp symlink");
    }
    else
    {
-        fi->seek(coff_offset,SEEK_SET);
-        fi->readx(&coff_hdr,0xa8);
+        fi->seek(coff_offset, SEEK_SET);
+        fi->readx(&coff_hdr, 0xa8);
    }
    if (coff_hdr.f_magic != 0x014c)    // I386MAGIC
-        return false;
+        return 0;
    if ((coff_hdr.f_flags & 2) == 0)   // F_EXEC - COFF executable
-        return false;
+        return 0;
    if (coff_hdr.a_magic != 0413)      // ZMAGIC - demand load format
-        return false;
+        return 0;
    // FIXME: check for Linux etc.

    text = coff_hdr.sh;
    data = text + 1;
    bss  = data + 1;
-    return true;
+    return UPX_F_DJGPP2_COFF;
 }


@@ -204,10 +230,33 @@ void PackDjgpp2::stripDebug()
    coff_hdr.f_symptr = 0;
    coff_hdr.f_nsyms = 0;
    coff_hdr.f_flags = 0x10f;   // 0x100: "32 bit machine: LSB first"
-    memset(text->misc,0,12);
+    memset(text->misc, 0, 12);
 }


+static bool defineFilterSymbols(Linker *linker, const Filter *ft)
+{
+    if (ft->id == 0)
+        return false;
+    assert(ft->calls > 0);
+
+    linker->defineSymbol("filter_cto", ft->cto);
+    linker->defineSymbol("filter_length",
+                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
+                         ft->lastcall - ft->calls * 4);
+
+#if 0
+    if (0x80==(ft->id & 0xF0)) {
+        int const mru = ph.n_mru ? 1+ ph.n_mru : 0;
+        if (mru && mru!=256) {
+            unsigned const is_pwr2 = (0==((mru -1) & mru));
+            //patch_le32(0x80 + (char *)loader, lsize - 0x80, "NMRU", mru - is_pwr2);
+        }
+    }
+#endif
+    return true;
+}
+
 /*************************************************************************
 //
 **************************************************************************/
@@ -216,7 +265,7 @@ bool PackDjgpp2::canPack()
 {
    if (!readFileHeader())
        return false;
-    if (is_dlm(fi,coff_offset))
+    if (is_dlm(fi, coff_offset))
        throwCantPack("can't handle DLM");

    if (opt->force == 0)
@@ -253,102 +302,85 @@ void PackDjgpp2::pack(OutputFile *fo)
    // read file
    const unsigned size = text->size + data->size;
    const unsigned tpos = text->scnptr;
-    const unsigned usize = size + (tpos & 0x1ff);
-    const unsigned hdrsize = 20 + 28 + (40 * coff_hdr.f_nscns);
+    const unsigned hdrsize = 20 + 28 + sizeof(external_scnhdr_t) * coff_hdr.f_nscns;
+    const unsigned usize = size + hdrsize;
    if (hdrsize < sizeof(coff_hdr) || hdrsize > tpos)
        throwCantPack("coff header error");

    ibuf.alloc(usize);
    obuf.allocForCompression(usize);

-    fi->seek(coff_offset,SEEK_SET);
-    fi->readx(ibuf,hdrsize);             // orig. coff header
-    memset(ibuf + hdrsize, 0, tpos - hdrsize);
-    fi->seek(coff_offset+tpos,SEEK_SET);
-    fi->readx(ibuf + (tpos & 0x1ff),size);
-
-#if 0
-    // filter
-    Filter ft(opt->level);
-    tryFilters(&ft, ibuf, usize - data->size, text->vaddr & ~0x1ff);
-
-    // compress
-    ph.filter = ft.id;
-    ph.filter_cto = ft.cto;
-    ph.u_len = usize;
-    if (!compress(ibuf,obuf))
-        throwNotCompressible();
-
-    unsigned overlapoh = findOverlapOverhead(obuf,ibuf,512);
-    overlapoh = (overlapoh + 0x3ff) & ~0x1ff;
-
-    // verify filter
-    ft.verifyUnfilter();
-#else
-    // new version using compressWithFilters()
+    fi->seek(coff_offset, SEEK_SET);
+    fi->readx(ibuf, hdrsize);             // orig. coff header
+    fi->seek(coff_offset + tpos, SEEK_SET);
+    fi->readx(ibuf + hdrsize, size);

    // prepare packheader
    ph.u_len = usize;
-    ph.filter = 0;
    // prepare filter
-    Filter ft(opt->level);
+    Filter ft(ph.level);
    ft.buf_len = usize - data->size;
-    ft.addvalue = text->vaddr & ~0x1ff;
-    // prepare other settings
-    const unsigned overlap_range = 512;
-    unsigned overlapoh;
-
-    int strategy = -1;      // try the first working filter
-    if (opt->filter >= 0 && isValidFilter(opt->filter))
-        // try opt->filter or 0 if that fails
-        strategy = -2;
-    else if (opt->all_filters)
-        // choose best from all available filters
-        strategy = 0;
-    compressWithFilters(&ft, &overlapoh, overlap_range, strategy);
-    overlapoh = (overlapoh + 0x3ff) & ~0x1ff;
-#endif
+    ft.addvalue = text->vaddr - hdrsize;
+    // 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
+    compressWithFilters(&ft, 512, 0, NULL, &cconf);

    // patch coff header #2
    const unsigned lsize = getLoaderSize();
+    assert(lsize % 4 == 0);
    text->size = lsize;                   // new size of .text
    data->size = ph.c_len;                // new size of .data

-    if (bss->size < overlapoh)            // give it a .bss
-        bss->size = overlapoh;
+    unsigned stack = 1024 + ph.overlap_overhead + getDecompressorWrkmemSize();
+    stack = ALIGN_UP(stack, 16);
+    if (bss->size < stack)  // give it a .bss
+        bss->size = stack;

    text->scnptr = sizeof(coff_hdr);
    data->scnptr = text->scnptr + text->size;
-    data->vaddr = bss->vaddr + ((data->scnptr + data->size) & 0x1ff) - data->size + overlapoh - 0x200;
+    data->vaddr = bss->vaddr + ((data->scnptr + data->size) & 0x1ff) - data->size + ph.overlap_overhead - 0x200;
    coff_hdr.f_nscns = 3;

-    // prepare loader
-    MemBuffer loader(lsize);
-    memcpy(loader,getLoader(),lsize);
-
-    // patch loader
-    patchPackHeader(loader,lsize);
-    patch_le32(loader,lsize,"ENTR",coff_hdr.a_entry);
-    patchFilter32(loader, lsize, &ft);
-    patch_le32(loader,lsize,"BSSL",overlapoh/4);
+    linker->defineSymbol("original_entry", coff_hdr.a_entry);
+    linker->defineSymbol("length_of_bss", ph.overlap_overhead / 4);
+    defineDecompressorSymbols();
    assert(bss->vaddr == ((size + 0x1ff) &~ 0x1ff) + (text->vaddr &~ 0x1ff));
-    patch_le32(loader,lsize,"OUTP",text->vaddr &~ 0x1ff);
-    patch_le32(loader,lsize,"INPP",data->vaddr);
+    linker->defineSymbol("stack_for_lzma", bss->vaddr + bss->size);
+    linker->defineSymbol("start_of_uncompressed", text->vaddr - hdrsize);
+    linker->defineSymbol("start_of_compressed", data->vaddr);
+    defineFilterSymbols(linker, &ft);
+
+    // we should not overwrite our decompressor during unpacking
+    // the original coff header (which is put just before the
+    // beginning of the original .text section)
+    assert(text->vaddr > hdrsize + lsize + sizeof(coff_hdr));

    // patch coff header #3
    text->vaddr = sizeof(coff_hdr);
    coff_hdr.a_entry = sizeof(coff_hdr) + getLoaderSection("DJ2MAIN1");
-    bss->vaddr += overlapoh;
-    bss->size -= overlapoh;
+    bss->vaddr += ph.overlap_overhead;
+    bss->size -= ph.overlap_overhead;

    // because of a feature (bug?) in stub.asm we need some padding
-    memcpy(obuf+data->size,"UPX",3);
-    data->size = ALIGN_UP(data->size,4);
+    memcpy(obuf+data->size, "UPX", 3);
+    data->size = ALIGN_UP(data->size, 4);
+
+    linker->defineSymbol("DJ2MAIN1", coff_hdr.a_entry);
+    relocateLoader();
+
+    // prepare loader
+    MemBuffer loader(lsize);
+    memcpy(loader, getLoader(), lsize);
+    patchPackHeader(loader, lsize);

    // write coff header, loader and compressed file
-    fo->write(&coff_hdr,sizeof(coff_hdr));
-    fo->write(loader,lsize);
-    fo->write(obuf,data->size);
+    fo->write(&coff_hdr, sizeof(coff_hdr));
+    fo->write(loader, lsize);
+    if (opt->debug.dump_stub_loader)
+        OutputFile::dump(opt->debug.dump_stub_loader, loader, lsize);
+    fo->write(obuf, data->size);
 #if 0
    printf("%-13s: coff hdr   : %8ld bytes\n", getName(), (long) sizeof(coff_hdr));
    printf("%-13s: loader     : %8ld bytes\n", getName(), (long) lsize);
@@ -356,11 +388,11 @@ void PackDjgpp2::pack(OutputFile *fo)
 #endif

    // verify
-    verifyOverlappingDecompression(&obuf, overlapoh);
+    verifyOverlappingDecompression();

    // handle overlay
    // FIXME: only Allegro pakfiles are supported
-    handle_allegropak(fi,fo);
+    handle_allegropak(fi, fo);

    // finally check the compression ratio
    if (!checkFinalCompressionRatio(fo))
@@ -376,10 +408,10 @@ int PackDjgpp2::canUnpack()
 {
    if (!readFileHeader())
        return false;
-    if (is_dlm(fi,coff_offset))
+    if (is_dlm(fi, coff_offset))
        throwCantUnpack("can't handle DLM");
    fi->seek(coff_offset, SEEK_SET);
-    return readPackHeader(1024) ? 1 : -1;
+    return readPackHeader(4096) ? 1 : -1;
 }


@@ -394,19 +426,30 @@ void PackDjgpp2::unpack(OutputFile *fo)
    ibuf.alloc(ph.c_len);
    obuf.allocForUncompression(ph.u_len);

-    fi->seek(coff_offset + ph.buf_offset + ph.getPackHeaderSize(),SEEK_SET);
-    fi->readx(ibuf,ph.c_len);
+    fi->seek(coff_offset + ph.buf_offset + ph.getPackHeaderSize(), SEEK_SET);
+    fi->readx(ibuf, ph.c_len);

    // decompress
-    decompress(ibuf,obuf);
+    decompress(ibuf, obuf);
+
+    coff_header_t *chdr = (coff_header_t*) obuf.getVoidPtr();
+    text = chdr->sh;
+    data = text + 1;
+
+    const unsigned hdrsize = 20 + 28
+        + sizeof(external_scnhdr_t) * chdr->f_nscns;
+
+    unsigned addvalue;
+    if (ph.version >= 14)
+        addvalue = text->vaddr - hdrsize;
+    else
+        addvalue = text->vaddr &~ 0x1ff; // for old versions

    // unfilter
    if (ph.filter)
    {
-        memcpy(&coff_hdr,obuf,sizeof(coff_hdr));
-
        Filter ft(ph.level);
-        ft.init(ph.filter, text->vaddr &~ 0x1ff);
+        ft.init(ph.filter, addvalue);
        ft.cto = (unsigned char) ph.filter_cto;
        if (ph.version < 11)
        {
@@ -417,18 +460,34 @@ void PackDjgpp2::unpack(OutputFile *fo)
        ft.unfilter(obuf, ph.u_len - data->size);
    }

-    // fixup for the aligning bug in strip 2.8+
-    text = ((coff_header_t*) (unsigned char *) obuf)->sh;
-    data = text + 1;
-    text->scnptr &= 0x1ff;
-    data->scnptr = text->scnptr + text->size;
-
-    // write decompressed file
-    if (fo)
+    if (ph.version < 14)
    {
-        fo->write(obuf,ph.u_len);
-        handle_allegropak(fi,fo);
+        // fixup for the aligning bug in strip 2.8+
+        text->scnptr &= 0x1ff;
+        data->scnptr = text->scnptr + text->size;
+        // write decompressed file
+        if (fo)
+            fo->write(obuf, ph.u_len);
    }
+    else
+    {
+        // write the header
+        // some padding might be required between the end
+        // of the header and the start of the .text section
+
+        const unsigned padding = text->scnptr - hdrsize;
+        ibuf.clear(0, padding);
+
+        if (fo)
+        {
+            fo->write(obuf, hdrsize);
+            fo->write(ibuf, padding);
+            fo->write(obuf + hdrsize, ph.u_len - hdrsize);
+        }
+    }
+
+    if (fo)
+        handle_allegropak(fi, fo);
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -40,10 +40,10 @@ class PackDjgpp2 : public Packer

 public:
    PackDjgpp2(InputFile *f);
-    virtual int getVersion() const { return 11; }
+    virtual int getVersion() const { return 14; }
    virtual int getFormat() const { return UPX_F_DJGPP2_COFF; }
    virtual const char *getName() const { return "djgpp2/coff"; }
-    virtual int getCompressionMethod() const;
+    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;

    virtual void pack(OutputFile *fo);
@@ -53,8 +53,14 @@ public:
    virtual int canUnpack();

 protected:
-    virtual int buildLoader(const Filter *ft);
    virtual void handleStub(OutputFile *fo);
+    virtual int readFileHeader();
+
+    virtual unsigned findOverlapOverhead(const upx_bytep buf,
+                                         unsigned range = 0,
+                                         unsigned upper_limit = ~0u) const;
+    virtual void buildLoader(const Filter *ft);
+    virtual Linker* newLinker() const;

    long coff_offset;

@@ -66,7 +72,8 @@ protected:
        LE32    scnptr;
        char    misc[12]; // relptr, lnnoptr, nreloc, nlnno
        char    __[4];    // flags
-    };
+    }
+    __attribute_packed;

    struct coff_header_t
    {
@@ -90,11 +97,12 @@ protected:

        // section headers
        external_scnhdr_t sh[3];
-    } coff_hdr;
+    }
+    __attribute_packed;

+    coff_header_t coff_hdr;
    external_scnhdr_t *text,*data,*bss;

-    bool readFileHeader();
    void stripDebug();
 };

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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -34,50 +34,376 @@
 // Some ELF type definitinons
 **************************************************************************/

+namespace N_Elf {
+
 // The ELF file header. This appears at the start of every ELF file.
-struct Elf_LE32_Ehdr
+template <class Word, class Addr, class Off, class Half>
+struct Ehdr
 {
    unsigned char e_ident[16];  /* Magic number and other info */
-    LE16 e_type;                /* Object file type */
-    LE16 e_machine;             /* Architecture */
-    LE32 e_version;             /* Object file version */
-    LE32 e_entry;               /* Entry point virtual address */
-    LE32 e_phoff;               /* Program header table file offset */
-    LE32 e_shoff;               /* Section header table file offset */
-    LE32 e_flags;               /* Processor-specific flags */
-    LE16 e_ehsize;              /* ELF header size in bytes */
-    LE16 e_phentsize;           /* Program header table entry size */
-    LE16 e_phnum;               /* Program header table entry count */
-    LE16 e_shentsize;           /* Section header table entry size */
-    LE16 e_shnum;               /* Section header table entry count */
-    LE16 e_shstrndx;            /* Section header string table index */
-};
+    Half e_type;                /* Object file type */
+    Half e_machine;             /* Architecture */
+    Word e_version;             /* Object file version */
+    Addr e_entry;               /* Entry point virtual address */
+    Off  e_phoff;               /* Program header table file offset */
+    Off  e_shoff;               /* Section header table file offset */
+    Word e_flags;               /* Processor-specific flags */
+    Half e_ehsize;              /* ELF header size in bytes */
+    Half e_phentsize;           /* Program header table entry size */
+    Half e_phnum;               /* Program header table entry count */
+    Half e_shentsize;           /* Section header table entry size */
+    Half e_shnum;               /* Section header table entry count */
+    Half e_shstrndx;            /* Section header string table index */

+    enum { // e_ident[]
+        EI_CLASS      = 4,
+        EI_DATA       = 5,      /* Data encoding */
+        EI_VERSION    = 6,
+        EI_OSABI      = 7,
+        EI_ABIVERSION = 8,
+    };
+    enum { // e_ident[EI_CLASS]
+        ELFCLASS32 = 1,         /* 32-bit objects */
+        ELFCLASS64 = 2,         /* 64-bit objects */
+    };
+    enum { // e_ident[EI_DATA]
+        ELFDATA2LSB = 1,        /* 2's complement, little endian */
+        ELFDATA2MSB = 2         /* 2's complement, big endian */
+    };
+    enum { // e_ident[EI_OSABI]
+        ELFOSABI_NONE = 0,
+        ELFOSABI_NETBSD = 2,
+        ELFOSABI_LINUX = 3,
+        ELFOSABI_FREEBSD = 9,
+        ELFOSABI_OPENBSD = 12,
+        ELFOSABI_ARM = 97
+    };
+    enum { // e_type
+        ET_NONE = 0,            /* No file type */
+        ET_REL  = 1,            /* Relocatable file */
+        ET_EXEC = 2,            /* Executable file */
+        ET_DYN  = 3,            /* Shared object file */
+        ET_CORE = 4,            /* Core file */
+    };
+    enum { // e_machine
+        EM_386    = 3,
+        EM_PPC    = 20,
+        EM_PPC64  = 21,
+        EM_ARM    = 40,
+        EM_X86_64 = 62,
+    };
+    enum { // e_version
+        EV_CURRENT = 1,
+    };
+}
+__attribute_packed;
+
+
+template <class Word, class Addr>
+struct Dyn
+{
+    Word d_tag;
+    Addr d_val;
+
+    enum { // d_tag
+        DT_NULL     =  0,       /* End flag */
+        DT_NEEDED   =  1,       /* Name of needed library */
+        DT_HASH     =  4,       /* Hash table of symbol names */
+        DT_STRTAB   =  5,       /* String table */
+        DT_SYMTAB   =  6,       /* Symbol table */
+        DT_STRSZ    = 10,       /* Sizeof string table */
+    };
+}
+__attribute_packed;
+
+} // namespace N_Elf
+
+
+namespace N_Elf32 {

 // Program segment header.
-struct Elf_LE32_Phdr
+template <class Word, class Addr, class Off>
+struct Phdr
 {
-    LE32 p_type;                /* Segment type */
-    LE32 p_offset;              /* Segment file offset */
-    LE32 p_vaddr;               /* Segment virtual address */
-    LE32 p_paddr;               /* Segment physical address */
-    LE32 p_filesz;              /* Segment size in file */
-    LE32 p_memsz;               /* Segment size in memory */
-    LE32 p_flags;               /* Segment flags */
-    LE32 p_align;               /* Segment alignment */
-};
+    Word p_type;                /* Segment type */
+    Off  p_offset;              /* Segment file offset */
+    Addr p_vaddr;               /* Segment virtual address */
+    Addr p_paddr;               /* Segment physical address */
+    Word p_filesz;              /* Segment size in file */
+    Word p_memsz;               /* Segment size in memory */
+    Word p_flags;               /* Segment flags */
+    Word p_align;               /* Segment alignment */
+
+    enum { // p_type
+        PT_LOAD    = 1,         /* Loadable program segment */
+        PT_DYNAMIC = 2,         /* Dynamic linking information */
+        PT_INTERP  = 3,         /* Name of program interpreter */
+        PT_NOTE    = 4,         /* Auxiliary information (esp. OpenBSD) */
+        PT_PHDR    = 6,         /* Entry for header table itself */
+    };
+
+    enum { // p_flags
+        PF_X = 1,               /* Segment is executable */
+        PF_W = 2,               /* Segment is writable */
+        PF_R = 4,               /* Segment is readable */
+    };
+}
+__attribute_packed;
+
+template <class Word, class Addr, class Off>
+struct Shdr
+{
+    Word sh_name;               /* Section name (string tbl index) */
+    Word sh_type;               /* Section type */
+    Word sh_flags;              /* Section flags */
+    Addr sh_addr;               /* Section virtual addr at execution */
+    Off  sh_offset;             /* Section file offset */
+    Word sh_size;               /* Section size in bytes */
+    Word sh_link;               /* Link to another section */
+    Word sh_info;               /* Additional section information */
+    Word sh_addralign;          /* Section alignment */
+    Word sh_entsize;            /* Entry size if section holds table */
+
+    enum { // sh_type
+        SHT_NULL = 0,           /* Section header table entry unused */
+        SHT_PROGBITS = 1,       /* Program data */
+        SHT_SYMTAB = 2,         /* Symbol table */
+        SHT_STRTAB = 3,         /* String table */
+        SHT_RELA = 4,           /* Relocation entries with addends */
+        SHT_HASH = 5,           /* Symbol hash table */
+        SHT_DYNAMIC = 6,        /* Dynamic linking information */
+        SHT_NOTE = 7,           /* Notes */
+        SHT_NOBITS = 8,         /* Program space with no data (bss) */
+        SHT_REL = 9,            /* Relocation entries, no addends */
+        SHT_SHLIB = 10,         /* Reserved */
+        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
+            /* 12, 13  hole */
+        SHT_INIT_ARRAY = 14,    /* Array of constructors */
+        SHT_FINI_ARRAY = 15,    /* Array of destructors */
+        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
+        SHT_GROUP = 17,         /* Section group */
+        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
+        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
+    };
+
+    enum { // sh_flags
+        SHF_WRITE      = (1 << 0),  /* Writable */
+        SHF_ALLOC      = (1 << 1),  /* Occupies memory during execution */
+        SHF_EXECINSTR  = (1 << 2),  /* Executable */
+        SHF_MERGE      = (1 << 4),  /* Might be merged */
+        SHF_STRINGS    = (1 << 5),  /* Contains nul-terminated strings */
+        SHF_INFO_LINK  = (1 << 6),  /* `sh_info' contains SHT index */
+        SHF_LINK_ORDER = (1 << 7),  /* Preserve order after combining */
+    };
+}
+__attribute_packed;
+
+template <class TT16, class TT32>
+struct Sym
+{
+    TT32 st_name;               /* symbol name (index into string table) */
+    TT32 st_value;              /* symbol value */
+    TT32 st_size;               /* symbol size */
+    unsigned char st_info;      /* symbol type and binding */
+    unsigned char st_other;     /* symbol visibility */
+    TT16 st_shndx;              /* section index */
+
+    unsigned int st_bind(unsigned int x) const { return 0xf & (x>>4); }
+    unsigned int st_type(unsigned int x) const { return 0xf &  x    ; }
+    unsigned char St_info(unsigned bind, unsigned type) const { return (bind<<4) + (0xf & type); }
+
+    enum { // st_bind (high 4 bits of st_info)
+        STB_LOCAL   =   0,      /* Local symbol */
+        STB_GLOBAL  =   1,      /* Global symbol */
+        STB_WEAK    =   2,      /* Weak symbol */
+    };
+
+    enum { // st_type (low 4 bits of st_info)
+        STT_NOTYPE  =   0,      /* Symbol type is unspecified */
+        STT_OBJECT  =   1,      /* Symbol is a data object */
+        STT_FUNC    =   2,      /* Symbol is a code object */
+        STT_SECTION =   3,      /* Symbol associated with a section */
+        STT_FILE    =   4,      /* Symbol's name is file name */
+        STT_COMMON  =   5,      /* Symbol is a common data object */
+        STT_TLS     =   6,      /* Symbol is thread-local data object*/
+    };
+
+    enum { // st_other (visibility)
+        STV_DEFAULT  =  0,      /* Default symbol visibility rules */
+        STV_INTERNAL =  1,      /* Processor specific hidden class */
+        STV_HIDDEN   =  2,      /* Sym unavailable in other modules */
+        STV_PROTECTED=  3,      /* Not preemptible, not exported */
+    };
+
+    enum { // st_shndx
+        SHN_UNDEF   =   0,      /* Undefined section */
+        SHN_ABS     =   0xfff1, /* Associated symbol is absolute */
+        SHN_COMMON  =   0xfff2, /* Associated symbol is common */
+    };
+}
+__attribute_packed;
+
+} // namespace N_Elf32


-// Values for p_type
-#define PT_LOAD     1           /* Loadable program segment */
+namespace N_Elf64 {
+
+// Program segment header.
+template <class Word, class Xword, class Addr, class Off>
+struct Phdr
+{
+    Word  p_type;               /* Segment type */
+    Word  p_flags;              /* Segment flags */
+    Off   p_offset;             /* Segment file offset */
+    Addr  p_vaddr;              /* Segment virtual address */
+    Addr  p_paddr;              /* Segment physical address */
+    Xword p_filesz;             /* Segment size in file */
+    Xword p_memsz;              /* Segment size in memory */
+    Xword p_align;              /* Segment alignment */
+
+    enum { // p_type
+        PT_LOAD    = 1,         /* Loadable program segment */
+        PT_DYNAMIC = 2,         /* Dynamic linking information */
+        PT_INTERP  = 3,         /* Name of program interpreter */
+        PT_PHDR    = 6,         /* Entry for header table itself */
+    };
+
+    enum { // p_flags
+        PF_X = 1,               /* Segment is executable */
+        PF_W = 2,               /* Segment is writable */
+        PF_R = 4,               /* Segment is readable */
+    };
+}
+__attribute_packed;
+
+template <class Word, class Xword, class Addr, class Off>
+struct Shdr
+{
+    Word  sh_name;              /* Section name (string tbl index) */
+    Word  sh_type;              /* Section type */
+    Xword sh_flags;             /* Section flags */
+    Addr  sh_addr;              /* Section virtual addr at execution */
+    Off   sh_offset;            /* Section file offset */
+    Xword sh_size;              /* Section size in bytes */
+    Word  sh_link;              /* Link to another section */
+    Word  sh_info;              /* Additional section information */
+    Xword sh_addralign;         /* Section alignment */
+    Xword sh_entsize;           /* Entry size if section holds table */
+
+    enum { // sh_type
+        SHT_NULL = 0,           /* Section header table entry unused */
+        SHT_PROGBITS = 1,       /* Program data */
+        SHT_SYMTAB = 2,         /* Symbol table */
+        SHT_STRTAB = 3,         /* String table */
+        SHT_RELA = 4,           /* Relocation entries with addends */
+        SHT_HASH = 5,           /* Symbol hash table */
+        SHT_DYNAMIC = 6,        /* Dynamic linking information */
+        SHT_NOTE = 7,           /* Notes */
+        SHT_NOBITS = 8,         /* Program space with no data (bss) */
+        SHT_REL = 9,            /* Relocation entries, no addends */
+        SHT_SHLIB = 10,         /* Reserved */
+        SHT_DYNSYM = 11,        /* Dynamic linker symbol table */
+            /* 12, 13  hole */
+        SHT_INIT_ARRAY = 14,    /* Array of constructors */
+        SHT_FINI_ARRAY = 15,    /* Array of destructors */
+        SHT_PREINIT_ARRAY = 16, /* Array of pre-constructors */
+        SHT_GROUP = 17,         /* Section group */
+        SHT_SYMTAB_SHNDX = 18,  /* Extended section indeces */
+        SHT_GNU_LIBLIST = 0x6ffffff7,   /* Prelink library list */
+    };
+}
+__attribute_packed;
+
+} // namespace N_Elf64
+
+
+/*************************************************************************
+// now for the actual types
+**************************************************************************/
+
+#define P N_BELE_CTP::HostPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf32_Ehdr;
+typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf32_Phdr;
+typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf32_Shdr;
+typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf32_Dyn;
+typedef N_Elf32::Sym <P::U16,P::U32>               Elf32_Sym;
+#undef P
+
+#define P N_BELE_CTP::BEPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_BE32_Ehdr;
+typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_BE32_Phdr;
+typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_BE32_Shdr;
+typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_BE32_Dyn;
+typedef N_Elf32::Sym <P::U16,P::U32>               Elf_BE32_Sym;
+#undef P
+
+#define P N_BELE_CTP::LEPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U32,P::U32,P::U16> Elf_LE32_Ehdr;
+typedef N_Elf32::Phdr<P::U32,P::U32,P::U32>        Elf_LE32_Phdr;
+typedef N_Elf32::Shdr<P::U32,P::U32,P::U32>        Elf_LE32_Shdr;
+typedef N_Elf  ::Dyn <P::U32,P::U32>               Elf_LE32_Dyn;
+typedef N_Elf32::Sym <P::U16,P::U32>               Elf_LE32_Sym;
+#undef P
+
+#define P N_BELE_CTP::HostPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf64_Ehdr;
+typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf64_Phdr;
+typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf64_Shdr;
+typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf64_Dyn;
+#undef P
+
+#define P N_BELE_CTP::BEPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_BE64_Ehdr;
+typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Phdr;
+typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_BE64_Shdr;
+typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_BE64_Dyn;
+#undef P
+
+#define P N_BELE_CTP::LEPolicy
+typedef N_Elf  ::Ehdr<P::U32,P::U64,P::U64,P::U16> Elf_LE64_Ehdr;
+typedef N_Elf64::Phdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Phdr;
+typedef N_Elf64::Shdr<P::U32,P::U64,P::U64,P::U64> Elf_LE64_Shdr;
+typedef N_Elf  ::Dyn <P::U64,P::U64>               Elf_LE64_Dyn;
+#undef P
+
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Ehdr)    == 52)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Phdr)    == 32)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Shdr)    == 40)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Dyn)     ==  8)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf32_Sym)     == 16)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Ehdr) == 52)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Phdr) == 32)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Shdr) == 40)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Dyn)  ==  8)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE32_Sym)  == 16)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Ehdr) == 52)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Phdr) == 32)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Shdr) == 40)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Dyn)  ==  8)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE32_Sym)  == 16)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Ehdr)    == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Phdr)    == 56)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Shdr)    == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf64_Dyn)     == 16)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Ehdr) == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Phdr) == 56)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Shdr) == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_BE64_Dyn)  == 16)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Ehdr) == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Phdr) == 56)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Shdr) == 64)
+ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(Elf_LE64_Dyn)  == 16)

-// Values for p_flags
-#define PF_X        (1 << 0)    /* Segment is executable */
-#define PF_W        (1 << 1)    /* Segment is writable */
-#define PF_R        (1 << 2)    /* Segment is readable */

 #endif /* already included */

+
 /*
 vi:ts=4:et
 */
@@ -0,0 +1,179 @@
+/* p_elks.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
+ */
+
+
+#include "conf.h"
+
+#if 0
+
+#include "file.h"
+#include "filter.h"
+#include "packer.h"
+#include "p_vmlinz.h"
+
+// FIXME
+static const
+#include "stub/l_vmlinz.h"
+
+// from elks-0.0.83/Documentation/boot.txt
+static const unsigned kernel_entry = 0x100000;
+static const unsigned stack_during_uncompression = 0x90000;
+static const unsigned zimage_offset = 0x1000;
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+const int *PackElks8086::getCompressionMethods(int method, int level) const
+{
+    return Packer::getDefaultCompressionMethods_8(method, level);
+}
+
+
+const int *PackElks8086::getFilters() const
+{
+    return NULL;
+}
+
+
+/*************************************************************************
+// common util routines
+**************************************************************************/
+
+int PackElks8086::decompressKernel()
+{
+    // not used
+    return 0;
+}
+
+
+void PackElks8086::readKernel()
+{
+    int klen = file_size - setup_size;
+    fi->seek(0, SEEK_SET);
+
+    setup_buf.alloc(setup_size);
+    fi->readx(setup_buf, setup_size);
+
+    ibuf.alloc(klen);
+    fi->readx(ibuf, klen);
+
+    obuf.allocForCompression(klen);
+
+    ph.u_len = klen;
+    ph.filter = 0;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void PackElks8086::buildLoader(const Filter *ft)
+{
+    // prepare loader
+    initLoader(nrv_loader, sizeof(nrv_loader));
+    // FIXME
+    UNUSED(ft);
+}
+
+
+void PackElks8086::pack(OutputFile *fo)
+{
+    readKernel();
+
+    // prepare filter
+    Filter ft(ph.level);
+    ft.buf_len = ph.u_len;
+    ft.addvalue = kernel_entry;
+    // compress
+    compressWithFilters(&ft, overlap_range);
+
+    const unsigned lsize = getLoaderSize();
+    MemBuffer loader(lsize);
+    memcpy(loader, getLoader(), lsize);
+
+    patchPackHeader(loader, lsize);
+#if 0
+    // FIXME
+    defineFilterSymbols();
+    defineDecompressorSymbols();
+    //patch_le32(loader, lsize, "ESI1", zimage_offset + lsize);
+    //patch_le32(loader, lsize, "KEIP", kernel_entry);
+    //patch_le32(loader, lsize, "STAK", stack_during_uncompression);
+#endif
+
+    boot_sect_t * const bs = (boot_sect_t *) ((unsigned char *) setup_buf);
+    bs->sys_size = ALIGN_UP(lsize + ph.c_len, 16) / 16;
+
+    fo->write(setup_buf, setup_buf.getSize());
+    fo->write(loader, lsize);
+    fo->write(obuf, ph.c_len);
+#if 0
+    printf("%-13s: setup        : %8ld bytes\n", getName(), (long) setup_buf.getSize());
+    printf("%-13s: loader       : %8ld bytes\n", getName(), (long) lsize);
+    printf("%-13s: compressed   : %8ld bytes\n", getName(), (long) ph.c_len);
+#endif
+
+    // finally check the compression ratio
+    if (!checkFinalCompressionRatio(fo))
+        throwNotCompressible();
+}
+
+
+/*************************************************************************
+// unpack
+**************************************************************************/
+
+int PackElks8086::canUnpack()
+{
+    if (readFileHeader() != getFormat())
+        return false;
+    fi->seek(setup_size, SEEK_SET);
+    return readPackHeader(1024) ? 1 : -1;
+}
+
+
+void PackElks8086::unpack(OutputFile *)
+{
+    // no uncompression support for this format yet
+
+    // FIXME: but we could write the uncompressed "Image" image
+
+    throwCantUnpack("build a new kernel instead :-)");
+}
+
+
+#endif /* if 0 */
+
+
+/*
+vi:ts=4:et
+*/
+
+
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -31,14 +31,17 @@
 #include "filter.h"
 #include "packer.h"
 #include "p_exe.h"
+#include "linker.h"

 static const
-#include "stub/l_exe.h"
+#include "stub/i086-dos16.exe.h"

 #define RSFCRI          4096    // Reserved Space For Compressed Relocation Info
 #define MAXMATCH        0x2000
 #define MAXRELOCS       (0x8000-MAXMATCH)

+#define DI_LIMIT        0xff00  // see the assembly why
+

 /*************************************************************************
 //
@@ -47,18 +50,28 @@ static const
 PackExe::PackExe(InputFile *f) :
    super(f)
 {
-    assert(sizeof(exe_header_t) == 32);
+    bele = &N_BELE_RTP::le_policy;
+    COMPILE_TIME_ASSERT(sizeof(exe_header_t) == 32);
    ih_exesize = ih_imagesize = ih_overlay = 0;
 }


-int PackExe::getCompressionMethod() const
+const int *PackExe::getCompressionMethods(int method, int level) const
 {
-    if (M_IS_NRV2B(opt->method))
-        return M_NRV2B_8;
-    if (M_IS_NRV2D(opt->method))
-        return M_NRV2D_8;
-    return opt->level > 1 && ih_imagesize >= 300000 ? M_NRV2D_8 : M_NRV2B_8;
+    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, M_END };
+    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, M_NRV2E_8, M_END };
+    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_NRV2D_8, M_END };
+
+    bool small = ih_imagesize <= 256*1024;
+    if (M_IS_NRV2B(method))
+        return m_nrv2b;
+    if (M_IS_NRV2D(method))
+        return m_nrv2d;
+    if (M_IS_NRV2E(method))
+        return m_nrv2e;
+    if (level == 1 || small)
+        return m_nrv2b;
+    return m_nrv2e;
 }


@@ -68,16 +81,128 @@ const int *PackExe::getFilters() const
 }


+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)
+        flag |= USEJUMP;
+    if (ih.relocs == 0)
+        flag |= NORELOC;
+
+    memset(&oh,0,sizeof(oh));
+    oh.ident = 'M' + 'Z' * 256;
+    oh.headsize16 = 2;
+
+    oh.sp = ih.sp > 0x200 ? (unsigned) ih.sp : 0x200;
+
+    unsigned destpara = (ph.u_len + ph.overlap_overhead - ph.c_len + 31) / 16;
+    oh.ss = ph.c_len/16 + destpara;
+    if (ih.ss*16 + ih.sp < 0x100000 && ih.ss > oh.ss && ih.sp > 0x200)
+        oh.ss = ih.ss;
+    if (oh.ss*16 + 0x50 < ih.ss*16 + ih.sp
+        && oh.ss*16 + 0x200 > ih.ss*16 + ih.sp)
+        oh.ss += 0x20;
+
+    if (oh.ss != ih.ss)
+        flag |= SS;
+    if (oh.sp != ih.sp)
+        flag |= SP;
+    return flag;
+#undef oh
+}
+
+
+void PackExe::buildLoader(const Filter *)
+{
+    struct exe_header_t tmp_oh;
+    int flag = fillExeHeader(&tmp_oh);
+
+    // prepare loader
+    initLoader(stub_i086_dos16_exe, sizeof(stub_i086_dos16_exe));
+    if (device_driver)
+        addLoader("DEVICEENTRY", NULL);
+    addLoader("EXEENTRY",
+              device_driver ? "DEVICESUB" : "EXESUB",
+              "JNCDOCOPY",
+              relocsize ? "EXERELPU" : "",
+              "EXEMAIN4,+G5DXXXX,UPX1HEAD,EXECUTPO",
+              NULL
+             );
+    if (ph.method == M_NRV2B_8)
+        addLoader("NRV2B16S",               // decompressor
+                  ph.u_len > DI_LIMIT ? "N2B64K01" : "",
+                  "NRV2BEX1",
+                  opt->cpu == opt->CPU_8086 ? "N2BX8601" : "N2B28601",
+                  "NRV2BEX2",
+                  opt->cpu == opt->CPU_8086 ? "N2BX8602" : "N2B28602",
+                  "NRV2BEX3",
+                  ph.c_len > 0xffff ? "N2B64K02" : "",
+                  "NRV2BEX9",
+                  NULL
+                 );
+    else if (ph.method == M_NRV2D_8)
+        addLoader("NRV2D16S",
+                  ph.u_len > DI_LIMIT ? "N2D64K01" : "",
+                  "NRV2DEX1",
+                  opt->cpu == opt->CPU_8086 ? "N2DX8601" : "N2D28601",
+                  "NRV2DEX2",
+                  opt->cpu == opt->CPU_8086 ? "N2DX8602" : "N2D28602",
+                  "NRV2DEX3",
+                  ph.c_len > 0xffff ? "N2D64K02" : "",
+                  "NRV2DEX9",
+                  NULL
+                 );
+    else if (ph.method == M_NRV2E_8)
+        addLoader("NRV2E16S",
+                  ph.u_len > DI_LIMIT ? "N2E64K01" : "",
+                  "NRV2EEX1",
+                  opt->cpu == opt->CPU_8086 ? "N2EX8601" : "N2E28601",
+                  "NRV2EEX2",
+                  opt->cpu == opt->CPU_8086 ? "N2EX8602" : "N2E28602",
+                  "NRV2EEX3",
+                  ph.c_len > 0xffff ? "N2E64K02" : "",
+                  "NRV2EEX9",
+                  NULL
+                 );
+    else
+        throwInternalError("unknown compression method");
+    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
+                 );
+}
+
+
 /*************************************************************************
 //
 **************************************************************************/

-bool PackExe::readFileHeader()
+int PackExe::readFileHeader()
 {
    ih_exesize = ih_imagesize = ih_overlay = 0;
    fi->readx(&ih,sizeof(ih));
    if (ih.ident != 'M' + 'Z'*256 && ih.ident != 'Z' + 'M'*256)
-        return false;
+        return 0;
    ih_exesize = ih.m512 + ih.p512*512 - (ih.m512 ? 512 : 0);
    ih_imagesize = ih_exesize - ih.headsize16*16;
    ih_overlay = file_size - ih_exesize;
@@ -88,7 +213,7 @@ bool PackExe::readFileHeader()
 #if 0
    printf("dos/exe header: %d %d %d\n", ih_exesize, ih_imagesize, ih_overlay);
 #endif
-    return true;
+    return UPX_F_DOS_EXE;
 }


@@ -105,7 +230,7 @@ bool PackExe::canPack()
    fi->readx(&offs,sizeof (offs));
    if (ih.relocoffs >= 0x40 && offs)
    {
-        if (opt->dos.force_stub)
+        if (opt->dos_exe.force_stub)
            opt->overlay = opt->COPY_OVERLAY;
        else
            throwCantPack("can't pack new-exe");
@@ -123,7 +248,10 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
                         const upx_byte *relocs, const unsigned nrelocs,
                         upx_byte *crel, bool *has_9a)
 {
-    upx_byte *crel_save = crel;
+    if (opt->exact)
+        throwCantPackExact();
+
+    upx_byte * const crel_save = crel;
    unsigned i;
    unsigned seg_high = 0;
 #if 0
@@ -185,7 +313,9 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
        {
            addr = get_le32(relocs+4*i);
            //printf ("%x\n",es*16+di);
-            if (addr - es*16 > 0xfffe)
+            if ((addr - es*16 > 0xfffe)
+                || (i == nrelocs - 1 && addr - es * 16 > 0xff00)
+               )
            {
                // segment change
                t = 1+(0xffff-di)/254;
@@ -230,7 +360,7 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
    set_le16 (crel_save+2,seg_high);

    //OutputFile::dump("x.rel", crel_save, crel - crel_save);
-    return crel - crel_save;
+    return (unsigned) (crel - crel_save);
 }


@@ -241,35 +371,27 @@ unsigned optimize_relocs(upx_byte *b, const unsigned size,
 void PackExe::pack(OutputFile *fo)
 {
    unsigned ic;
-    unsigned char flag = 0;

-    unsigned char extra_info[32];
-    unsigned eisize = 0;
-
-    //
-    const unsigned exesize = ih_exesize;
-    const unsigned imagesize = ih_imagesize;
-    const unsigned overlay = ih_overlay;
    if (ih.relocs > MAXRELOCS)
        throwCantPack("too many relocations");
-    checkOverlay(overlay);
+    checkOverlay(ih_overlay);

    // alloc buffers
-    unsigned relocsize = RSFCRI + 4*ih.relocs;
-
-    ibuf.alloc(imagesize+16+relocsize+2);
-    obuf.allocForCompression(imagesize+16+relocsize+2);
+    relocsize = RSFCRI + 4*ih.relocs;
+    ibuf.alloc(ih_imagesize+16+relocsize+2);
+    obuf.allocForCompression(ih_imagesize+16+relocsize+2);

    // read image
    fi->seek(ih.headsize16*16,SEEK_SET);
-    fi->readx(ibuf,imagesize);
+    fi->readx(ibuf,ih_imagesize);

-    if (find_le32(ibuf, UPX_MIN(imagesize, 127u), UPX_MAGIC_LE32) >= 0)
-        throwAlreadyPacked();
+    checkAlreadyPacked(ibuf, UPX_MIN(ih_imagesize, 127u));
+
+    device_driver = get_le32(ibuf) == 0xffffffffu;

    // relocations
    has_9a = false;
-    upx_byte *w = ibuf + imagesize;
+    upx_byte *w = ibuf + ih_imagesize;
    if (ih.relocs)
    {
        upx_byte *wr = w + RSFCRI;
@@ -283,7 +405,7 @@ void PackExe::pack(OutputFile *fo)
            set_le32(wr+4*ic, (jc>>16)*16+(jc&0xffff));
        }
        qsort(wr,ih.relocs,4,le32_compare);
-        relocsize = optimize_relocs(ibuf, imagesize, wr, ih.relocs, w, &has_9a);
+        relocsize = optimize_relocs(ibuf, ih_imagesize, wr, ih.relocs, w, &has_9a);
        set_le16(w+relocsize, relocsize+2);
        relocsize += 2;
        if (relocsize > MAXRELOCS)
@@ -298,121 +420,40 @@ void PackExe::pack(OutputFile *fo)
    }
    else
    {
-        flag |= NORELOC;
        relocsize = 0;
    }

-    ph.u_len = imagesize + relocsize;
-    if (!compress(ibuf,obuf,0,MAXMATCH))
-        throwNotCompressible();
-    const unsigned overlapoh = findOverlapOverhead(obuf,32);
-
+    // prepare packheader
+    ph.u_len = ih_imagesize + relocsize;
+    // prepare filter
+    Filter ft(ph.level);
+    // compress (max_match = 8192)
+    upx_compress_config_t cconf; cconf.reset();
+    cconf.conf_ucl.max_match = MAXMATCH;
+    compressWithFilters(&ft, 32, 0, NULL, &cconf);
    if (ph.max_run_found + ph.max_match_found > 0x8000)
        throwCantPack("decompressor limit exceeded, send a bugreport");
+
 #ifdef TESTING
-    if (opt->debug)
+    if (opt->debug.debug_level)
    {
-        printf("image+relocs %d -> %d\n",imagesize+relocsize,ph.c_len);
+        printf("image+relocs %d -> %d\n",ih_imagesize+relocsize,ph.c_len);
        printf("offsets: %d - %d\nmatches: %d - %d\nruns: %d - %d\n",
               0/*ph.min_offset_found*/,ph.max_offset_found,
               0/*ph.min_match_found*/,ph.max_match_found,
               0/*ph.min_run_found*/,ph.max_run_found);
    }
 #endif
-    const unsigned packedsize = ph.c_len;

-    if (!opt->dos.no_reloc)
-        flag |= USEJUMP;
+    int flag = fillExeHeader(&oh);

-    // fill new exe header
-    memset(&oh,0,sizeof(oh));
-    oh.ident = 'M' + 'Z' * 256;
-
-    unsigned destpara = (ph.u_len+overlapoh-packedsize+31)/16;
-
-    oh.ss = packedsize/16 + destpara;
-    if (ih.ss*16 + ih.sp < 0x100000 && ih.ss > oh.ss && ih.sp > 0x200)
-        oh.ss = ih.ss;
-    oh.sp = ih.sp > 0x200 ? ih.sp : 0x200;
-    if (oh.ss*16u + 0x50 < ih.ss*16u + ih.sp
-        && oh.ss*16u + 0x200 > ih.ss*16u + ih.sp)
-        oh.ss += 0x20;
-
-    destpara = oh.ss - packedsize/16;
-    if (oh.ss != ih.ss)
-    {
-        set_le16(extra_info+eisize,ih.ss);
-        eisize += 2;
-        flag |= SS;
-    }
-    if (oh.sp != ih.sp)
-    {
-        set_le16(extra_info+eisize,ih.sp);
-        eisize += 2;
-        flag |= SP;
-    }
-
-#define DI_LIMIT 0xff00  // see the assembly why
-    // prepare loader
-    initLoader(nrv_loader,sizeof(nrv_loader));
-    addLoader("EXEENTRY",
-              relocsize ? "EXERELPU" : "",
-              "EXEMAIN4""+G5DXXXX""UPX1HEAD""EXECUTPO",
-              NULL
-             );
-    if (ph.method == M_NRV2B_8)
-        addLoader("NRV2B16S",               // decompressor
-                  ph.u_len > DI_LIMIT ? "NDIGT64K" : "",
-                  "NRV2BEX1",
-                  opt->cpu == opt->CPU_8086 ? "N2BX8601" : "N2B28601",
-                  "NRV2BEX2",
-                  opt->cpu == opt->CPU_8086 ? "N2BX8602" : "N2B28602",
-                  "NRV2BEX3",
-                  packedsize > 0xffff ? "NSIGT64K" : "",
-                  "NRV2BEX9""NRV2B16E",
-                  NULL
-                 );
-    else if (ph.method == M_NRV2D_8)
-        addLoader("NRV2D16S",
-                  ph.u_len > DI_LIMIT ? "NDIGT64D" : "",
-                  "NRV2DEX1",
-                  opt->cpu == opt->CPU_8086 ? "N2DX8601" : "N2D28601",
-                  "NRV2DEX2",
-                  opt->cpu == opt->CPU_8086 ? "N2DX8602" : "N2D28602",
-                  "NRV2DEX3",
-                  packedsize > 0xffff ? "NSIGT64D" : "",
-                  "NRV2DEX9""NRV2D16E",
-                  NULL
-                 );
-    else
-        throwInternalError("unknown compression method");
-    addLoader("EXEMAIN5", NULL);
-    if (relocsize)
-        addLoader(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? "EXENOADJ" : "EXEADJUS",
-                  "EXERELO1",
-                  has_9a ? "EXEREL9A" : "",
-                  "EXERELO2",
-                  exesize > 0xFE00 ? "EXEREBIG" : "",
-                  "EXERELO3",
-                  NULL
-                 );
-    addLoader("EXEMAIN8",
-              (flag & SS) ? "EXESTACK" : "",
-              (flag & SP) ? "EXESTASP" : "",
-              (flag & USEJUMP) ? "EXEJUMPF" : "",
-              NULL
-             );
-    if (!(flag & USEJUMP))
-        addLoader(ih.cs ? "EXERCSPO" : "",
-                  "EXERETIP",
-                  NULL
-                 );
    const unsigned lsize = getLoaderSize();
    MemBuffer loader(lsize);
    memcpy(loader,getLoader(),lsize);
    //OutputFile::dump("xxloader.dat", loader, lsize);

    // patch loader
+    const unsigned packedsize = ph.c_len;
    const unsigned e_len = getLoaderSectionStart("EXECUTPO");
    const unsigned d_len = lsize - e_len;
    assert((e_len&15) == 0);
@@ -420,17 +461,29 @@ void PackExe::pack(OutputFile *fo)
    const unsigned copysize = (1+packedsize+d_len) & ~1;
    const unsigned firstcopy = copysize%0x10000 ? copysize%0x10000 : 0x10000;

-    oh.headsize16 = 2;
-    oh.ip = 0;
-
-    ic = ih.min*16+imagesize;
+    // set oh.min & oh.max
+    ic = ih.min*16 + ih_imagesize;
    if (ic < oh.ss*16u + oh.sp)
        ic = oh.ss*16u + oh.sp;
-
    oh.min = (ic - (packedsize + lsize)) / 16;
-    ic = ((unsigned) oh.min) + (ih.max - ih.min);
+    ic = oh.min + (ih.max - ih.min);
    oh.max = ic < 0xffff && ih.max != 0xffff ? ic : 0xffff;

+    // set extra info
+    unsigned char extra_info[9];
+    unsigned eisize = 0;
+    if (oh.ss != ih.ss)
+    {
+        set_le16(extra_info+eisize,ih.ss);
+        eisize += 2;
+        assert((flag & SS) != 0);   // set in fillExeHeader()
+    }
+    if (oh.sp != ih.sp)
+    {
+        set_le16(extra_info+eisize,ih.sp);
+        eisize += 2;
+        assert((flag & SP) != 0);   // set in fillExeHeader()
+    }
    if (ih.min != oh.min)
    {
        set_le16(extra_info+eisize,ih.min);
@@ -443,57 +496,63 @@ void PackExe::pack(OutputFile *fo)
        eisize += 2;
        flag |= MAXMEM;
    }
+    extra_info[eisize++] = (unsigned char) flag;

+    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);
+    linker->defineSymbol("bx_magic", 0x7FFF + 0x10 * ((packedsize & 15) + 1));
+    linker->defineSymbol("decompressor_entry", (packedsize & 15) + 1);
+
+    // patch loader
    if (flag & USEJUMP)
    {
        // I use a relocation entry to set the original cs
-        unsigned n = find_le32(loader,lsize,get_le32("IPCS"));
-        patch_le32(loader,lsize,get_le32("IPCS"), ih.cs*0x10000 + ih.ip);
+        unsigned n = getLoaderSectionStart("EXEJUMPF") + 1;
        n += packedsize + 2;
        oh.relocs = 1;
-        oh.firstreloc = (n&0xf) + ((n>>4)<<16);
+        oh.firstreloc = (n & 0xf) + ((n >> 4) << 16);
    }
    else
    {
-        patch_le16(loader,lsize,"IP",ih.ip);
-        if (ih.cs)
-            patch_le16(loader,lsize,"CS",ih.cs);
        oh.relocs = 0;
-        oh.firstreloc = ih.cs*0x10000 + ih.ip;
+        oh.firstreloc = ih.cs * 0x10000 + ih.ip;
    }
-    oh.relocoffs = offsetof(exe_header_t, firstreloc);

-    if (flag & SP)
-        patch_le16(loader,lsize,"SP",ih.sp);
-    if (flag & SS)
-        patch_le16(loader,lsize,"SS",ih.ss);
-    if (relocsize)
-        patch_le16(loader,lsize,"RS",(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? 0 : MAXRELOCS) - relocsize);
+    // g++ 3.1 does not like the following line...
+//    oh.relocoffs = offsetof(exe_header_t, firstreloc);
+    oh.relocoffs = ptr_diff(&oh.firstreloc, &oh);

-    patchPackHeader(loader,e_len);
+    linker->defineSymbol("destination_segment", oh.ss - ph.c_len / 16 - e_len / 16);
+    linker->defineSymbol("source_segment", e_len / 16 + (copysize - firstcopy) / 16);
+    linker->defineSymbol("copy_offset", firstcopy - 2);
+    linker->defineSymbol("words_to_copy",firstcopy / 2);

-    patch_le16(loader,e_len,"BX",0x800F + 0x10*((packedsize&15)+1) - 0x10);
-    patch_le16(loader,e_len,"BP",(packedsize&15)+1);
+    linker->defineSymbol("exe_stack_sp", oh.sp);
+    linker->defineSymbol("exe_stack_ss", oh.ss);
+    linker->defineSymbol("interrupt", get_le16(ibuf + 8));
+    linker->defineSymbol("attribute", get_le16(ibuf + 4));
+    linker->defineSymbol("orig_strategy", get_le16(ibuf + 6));

-    patch_le16(loader,e_len,"ES",destpara-e_len/16);
-    patch_le16(loader,e_len,"DS",e_len/16+(copysize-firstcopy)/16);
-    patch_le16(loader,e_len,"SI",firstcopy-2);
-    patch_le16(loader,e_len,"CX",firstcopy/2);
-
-    // finish --stub support
-    //if (ih.relocoffs >= 0x40 && memcmp(&ih.relocoffs,">TIPPACH",8))
-    //    throwCantPack("FIXME");
-
-    extra_info[eisize++] = flag;
    const unsigned outputlen = sizeof(oh)+lsize+packedsize+eisize;
    oh.m512 = outputlen & 511;
    oh.p512 = (outputlen + 511) >> 9;

-//fprintf(stderr,"\ne_len=%x d_len=%x clen=%x oo=%x ulen=%x destp=%x copys=%x images=%x",e_len,d_len,packedsize,overlapoh,ph.u_len,destpara,copysize,imagesize);
+    oh.ip = device_driver ? getLoaderSection("EXEENTRY") - 2 : 0;
+
+    relocateLoader();
+    memcpy(loader, getLoader(), lsize);
+    patchPackHeader(loader,e_len);
+
+//fprintf(stderr,"\ne_len=%x d_len=%x c_len=%x oo=%x ulen=%x destp=%x copys=%x images=%x",e_len,d_len,packedsize,ph.overlap_overhead,ph.u_len,destpara,copysize,ih_imagesize);

    // write header + write loader + compressed file
 #ifdef TESTING
-    if (opt->debug)
+    if (opt->debug.debug_level)
        printf("\n%d %d %d %d\n",(int)sizeof(oh),e_len,packedsize,d_len);
 #endif
    fo->write(&oh,sizeof(oh));
@@ -511,10 +570,10 @@ void PackExe::pack(OutputFile *fo)
 #endif

    // verify
-    verifyOverlappingDecompression(&obuf, overlapoh);
+    verifyOverlappingDecompression();

    // copy the overlay
-    copyOverlay(fo, overlay, &obuf);
+    copyOverlay(fo, ih_overlay, &obuf);
 //fprintf (stderr,"%x %x\n",relocsize,ph.u_len);

    // finally check the compression ratio
@@ -533,7 +592,7 @@ int PackExe::canUnpack()
        return false;
    const off_t off = ih.headsize16 * 16;
    fi->seek(off, SEEK_SET);
-    bool b = readPackHeader(128);
+    bool b = readPackHeader(256);
    return b && (off + (off_t) ph.c_len <= file_size);
 }

@@ -548,23 +607,22 @@ void PackExe::unpack(OutputFile *fo)
    obuf.allocForUncompression(ph.u_len);

    // read the file
-    unsigned imagesize = ih_imagesize;
-    const unsigned overlay = ih_overlay;
-
    fi->seek(ih.headsize16*16,SEEK_SET);
-    fi->readx(ibuf,imagesize);
+    fi->readx(ibuf,ih_imagesize);

    // get compressed data offset
    unsigned e_len = ph.buf_offset + ph.getPackHeaderSize();
-    if (imagesize <= e_len + ph.c_len)
+    if (ih_imagesize <= e_len + ph.c_len)
        throwCantUnpack("file damaged");

-    checkOverlay(overlay);
+    checkOverlay(ih_overlay);

    // decompress
    decompress(ibuf+e_len,obuf);

-    const unsigned char flag = ibuf[imagesize-1];
+    unsigned imagesize = ih_imagesize;
+    imagesize--;
+    const unsigned char flag = ibuf[imagesize];

    unsigned relocn = 0;
    upx_byte *relocs = obuf + ph.u_len;
@@ -574,12 +632,11 @@ void PackExe::unpack(OutputFile *fo)
    {
        relocs -= get_le16(obuf+ph.u_len-2);
        ph.u_len -= 2;
-        upx_byte *p;

        wrkmem.alloc(4*MAXRELOCS);
-        unsigned es = 0,ones = get_le16(relocs);
-        unsigned seghi = get_le16(relocs+2);
-        p = relocs + 4;
+        unsigned es = 0, ones = get_le16(relocs);
+        const unsigned seghi = get_le16(relocs+2);
+        const upx_byte *p = relocs + 4;

        while (ones)
        {
@@ -597,10 +654,10 @@ void PackExe::unpack(OutputFile *fo)
                dorel = true;
                if (*p == 0)
                {
-                    upx_byte *q;
+                    const upx_byte *q;
                    for (q = obuf+es*16+di; !(*q == 0x9a && get_le16(q+3) <= seghi); q++)
                        ;
-                    di = q - (obuf+es*16) + 3;
+                    di = ptr_diff(q, obuf+es*16) + 3;
                }
                else if (*p == 1)
                {
@@ -614,35 +671,38 @@ void PackExe::unpack(OutputFile *fo)
            }
        }
    }
+
    // fill new exe header
    memset(&oh,0,sizeof(oh));
    oh.ident = 'M' + 'Z'*256;

-    oh.relocs = relocn;
-    while (relocn&3)
-        set_le32(wrkmem+4*relocn++,0);
+    if (relocn)
+    {
+        oh.relocs = relocn;
+        while (relocn & 3)
+            set_le32(wrkmem+4*relocn++,0);
+    }

-    unsigned outputlen = sizeof(oh)+relocn*4+relocs-obuf;
+    unsigned outputlen = ptr_diff(relocs, obuf) + sizeof(oh) + relocn*4;
    oh.m512 = outputlen & 511;
    oh.p512 = (outputlen + 511) >> 9;
    oh.headsize16 = 2+relocn/4;

-    imagesize--;
    oh.max = ih.max;
    oh.min = ih.min;
    oh.sp = ih.sp;
    oh.ss = ih.ss;

    if (flag & MAXMEM)
-        imagesize -= 2, oh.max = get_le16(ibuf+imagesize);
+        { imagesize -= 2; oh.max = get_le16(ibuf+imagesize); }
    if (flag & MINMEM)
-        imagesize -= 2, oh.min = get_le16(ibuf+imagesize);
+        { imagesize -= 2; oh.min = get_le16(ibuf+imagesize); }
    if (flag & SP)
-        imagesize -= 2, oh.sp = get_le16(ibuf+imagesize);
+        { imagesize -= 2; oh.sp = get_le16(ibuf+imagesize); }
    if (flag & SS)
-        imagesize -= 2, oh.ss = get_le16(ibuf+imagesize);
+        { imagesize -= 2; oh.ss = get_le16(ibuf+imagesize); }

-    unsigned ip = (flag & USEJUMP) ? get_le32(ibuf+imagesize-4) : ih.firstreloc;
+    unsigned ip = (flag & USEJUMP) ? get_le32(ibuf+imagesize-4) : (unsigned) ih.firstreloc;
    oh.ip = ip & 0xffff;
    oh.cs = ip >> 16;

@@ -653,11 +713,18 @@ void PackExe::unpack(OutputFile *fo)

    // write header + relocations + uncompressed file
    fo->write(&oh,sizeof(oh));
-    fo->write(wrkmem,relocn*4);
-    fo->write(obuf,relocs-obuf);
+    if (relocn)
+        fo->write(wrkmem,relocn*4);
+    fo->write(obuf, ptr_diff(relocs, obuf));

    // copy the overlay
-    copyOverlay(fo, overlay, &obuf);
+    copyOverlay(fo, ih_overlay, &obuf);
+}
+
+
+Linker* PackExe::newLinker() const
+{
+    return new ElfLinkerX86();
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -39,10 +39,10 @@ class PackExe : public Packer
    typedef Packer super;
 public:
    PackExe(InputFile *f);
-    virtual int getVersion() const { return 11; }
+    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_EXE; }
    virtual const char *getName() const { return "dos/exe"; }
-    virtual int getCompressionMethod() const;
+    virtual const int *getCompressionMethods(int method, int level) const;
    virtual const int *getFilters() const;

    virtual void pack(OutputFile *fo);
@@ -63,7 +63,13 @@ public:
    }

 protected:
-    virtual bool readFileHeader(void);
+    struct exe_header_t;
+
+    virtual int readFileHeader(void);
+
+    virtual int fillExeHeader(struct exe_header_t *) const;
+    virtual void buildLoader(const Filter *ft);
+    virtual Linker* newLinker() const;

    struct exe_header_t
    {
@@ -82,13 +88,18 @@ protected:
        LE16 relocoffs;
        char __[2];             // overlnum
        LE32 firstreloc;
-    } ih, oh;
+    }
+    __attribute_packed;
+
+    exe_header_t ih, oh;

    unsigned ih_exesize;
    unsigned ih_imagesize;
    unsigned ih_overlay;
+    unsigned relocsize;

    bool has_9a;
+    bool device_driver;

    enum {
        NORELOC = 1,
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -22,11 +22,11 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>

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


@@ -34,50 +34,395 @@
 #define __UPX_P_LX_ELF_H


+class PackLinuxElf : public PackUnix
+{
+    typedef PackUnix super;
+public:
+    PackLinuxElf(InputFile *f);
+    virtual ~PackLinuxElf();
+    /*virtual void buildLoader(const Filter *);*/
+    virtual bool canUnpackVersion(int version) const { return (version >= 11); }
+
+protected:
+    virtual const int *getCompressionMethods(int method, int level) const;
+
+    // All other virtual functions in this class must be pure virtual
+    // because they depend on Elf32 or Elf64 data structures, which differ.
+
+    virtual void pack1(OutputFile *, Filter &) = 0;  // generate executable header
+    virtual void pack2(OutputFile *, Filter &) = 0;  // append compressed data
+    virtual void pack3(OutputFile *, Filter &) = 0;  // append loader
+    //virtual void pack4(OutputFile *, Filter &) = 0;  // append pack header
+
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    ) = 0;
+    virtual void defineSymbols(Filter const *);
+    virtual void addStubEntrySections(Filter const *);
+    virtual void unpack(OutputFile *fo) = 0;
+
+protected:
+    char       *file_image;       // if ET_DYN investigation
+    char const *dynstr;   // from DT_STRTAB
+
+    unsigned sz_phdrs;  // sizeof Phdr[]
+    unsigned sz_elf_hdrs;  // all Elf headers
+    unsigned sz_pack2;  // after pack2(), before loader
+
+    unsigned short e_machine;
+    unsigned char ei_class;
+    unsigned char ei_data;
+    unsigned char ei_osabi;
+    char const *osabi_note;
+};
+
+class PackLinuxElf32 : public PackLinuxElf
+{
+    typedef PackLinuxElf super;
+public:
+    PackLinuxElf32(InputFile *f);
+    virtual ~PackLinuxElf32();
+protected:
+    virtual int checkEhdr(Elf32_Ehdr const *ehdr) const;
+    virtual bool canPack();
+
+    // These ARM routines are essentially common to big/little endian,
+    // but the class hierarchy splits after this class.
+    virtual void ARM_defineSymbols(Filter const *ft);
+    virtual void ARM_updateLoader(OutputFile *);
+
+    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 pack4(OutputFile *, Filter &);  // append pack header
+    virtual void unpack(OutputFile *fo);
+
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    );
+    virtual void buildLinuxLoader(
+        upx_byte const *const proto,  // assembly-only sections
+        unsigned const szproto,
+        upx_byte const *const fold,  // linked assembly + C section
+        unsigned const szfold,
+        Filter const *ft
+    );
+    virtual off_t getbrk(const Elf32_Phdr *phdr, int e_phnum) const;
+    virtual void patchLoader();
+    virtual void updateLoader(OutputFile *fo);
+    virtual unsigned find_LOAD_gap(Elf32_Phdr const *const phdri, unsigned const k,
+        unsigned const e_phnum);
+    virtual off_t getbase(const Elf32_Phdr *phdr, int e_phnum) const;
+
+    static unsigned elf_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;
+
+protected:
+    Elf32_Ehdr  ehdri; // from input file
+    Elf32_Phdr *phdri; // for  input file
+
+    Elf32_Dyn    const *dynseg;   // from PT_DYNAMIC
+    unsigned int const *hashtab;  // from DT_HASH
+    Elf32_Sym    const *dynsym;   // from DT_SYMTAB
+
+    struct cprElfHdr1 {
+        Elf32_Ehdr ehdr;
+        Elf32_Phdr phdr[1];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr2 {
+        Elf32_Ehdr ehdr;
+        Elf32_Phdr phdr[2];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr3 {
+        Elf32_Ehdr ehdr;
+        Elf32_Phdr phdr[3];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    cprElfHdr3 elfout;
+
+    struct Elf32_Note {
+        unsigned namesz;  // 8
+        unsigned descsz;  // 4
+        unsigned type;    // 1
+        char text[0x18 - 4*4];  // "OpenBSD"
+        unsigned end;     // 0
+    } elfnote;
+};
+
+
+class PackLinuxElf64 : public PackLinuxElf
+{
+    typedef PackLinuxElf super;
+public:
+    PackLinuxElf64(InputFile *f);
+    virtual ~PackLinuxElf64();
+    /*virtual void buildLoader(const Filter *);*/
+
+protected:
+    virtual int checkEhdr(Elf64_Ehdr const *ehdr) const;
+
+    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 pack4(OutputFile *, Filter &);  // append pack header
+    virtual void unpack(OutputFile *fo);
+
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    );
+    virtual void buildLinuxLoader(
+        upx_byte const *const proto,  // assembly-only sections
+        unsigned const szproto,
+        upx_byte const *const fold,  // linked assembly + C section
+        unsigned const szfold,
+        Filter const *ft
+    );
+    virtual off_t getbrk(const Elf64_Phdr *phdr, int e_phnum) const;
+    virtual void patchLoader();
+    virtual void updateLoader(OutputFile *fo);
+    virtual unsigned find_LOAD_gap(Elf64_Phdr const *const phdri, unsigned const k,
+        unsigned const e_phnum);
+
+protected:
+    Elf64_Ehdr  ehdri; // from input file
+    Elf64_Phdr *phdri; // for  input file
+
+    struct cprElfHdr1 {
+        Elf64_Ehdr ehdr;
+        Elf64_Phdr phdr[1];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr2 {
+        Elf64_Ehdr ehdr;
+        Elf64_Phdr phdr[2];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr3 {
+        Elf64_Ehdr ehdr;
+        Elf64_Phdr phdr[3];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    cprElfHdr3 elfout;
+};
+
+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
+{
+    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
+{
+    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
+**************************************************************************/
+
+class PackLinuxElf64amd : public PackLinuxElf64Le
+{
+    typedef PackLinuxElf64Le super;
+public:
+    PackLinuxElf64amd(InputFile *f);
+    virtual ~PackLinuxElf64amd();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF64_AMD; }
+    virtual const char *getName() const { return "linux/ElfAMD"; }
+    virtual const int *getFilters() const;
+    virtual bool canPack();
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    //virtual void pack3(OutputFile *, Filter &);  // append loader
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+    virtual void defineSymbols(Filter const *);
+};
+
+/*************************************************************************
+// linux/elf32ppc
+**************************************************************************/
+
+class PackLinuxElf32ppc : public PackLinuxElf32Be
+{
+    typedef PackLinuxElf32Be super;
+public:
+    PackLinuxElf32ppc(InputFile *f);
+    virtual ~PackLinuxElf32ppc();
+    virtual int getFormat() const { return UPX_F_LINUX_ELFPPC32; }
+    virtual const char *getName() const { return "linux/ElfPPC"; }
+    virtual const int *getFilters() const;
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual Linker* newLinker() const;
+};
+
 /*************************************************************************
 // linux/elf386
 **************************************************************************/

-class PackLinuxI386elf : public PackLinuxI386
+class PackLinuxElf32x86 : public PackLinuxElf32Le
 {
-    typedef PackLinuxI386 super;
+    typedef PackLinuxElf32Le super;
 public:
-    PackLinuxI386elf(InputFile *f);
-    virtual ~PackLinuxI386elf();
-    virtual int getVersion() const { return 11; }
+    PackLinuxElf32x86(InputFile *f);
+    virtual ~PackLinuxElf32x86();
    virtual int getFormat() const { return UPX_F_LINUX_ELF_i386; }
    virtual const char *getName() const { return "linux/elf386"; }
-    virtual const int *getFilters() const { return NULL; }
+    virtual const int *getFilters() const;

-    virtual void pack(OutputFile *fo);
    virtual void unpack(OutputFile *fo);

-    virtual bool canPack();
-    virtual bool canUnpackVersion(int version) const
-        { return (version >= 11); }
-
 protected:
-    struct Extent {
-        off_t offset;
-        off_t size;
-    };
-    virtual void packExtent(Extent const &x, OutputFile *fo,
-        unsigned &total_in, unsigned &total_out);
-    virtual void unpackExtent(unsigned wanted, OutputFile *fo,
-        unsigned &total_in, unsigned &total_out,
-        unsigned &c_adler, unsigned &u_adler);
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header

-protected:
-    virtual const upx_byte *getLoader() const;
-    virtual int getLoaderSize() const;
-
-    virtual void patchLoader();
-    virtual void updateLoader(OutputFile *);
-
-    Elf_LE32_Ehdr  ehdri; // from input file
-    Elf_LE32_Phdr *phdri; // for  input file
+    virtual void buildLoader(const Filter *);
+    virtual void addStubEntrySections(Filter const *);
+    virtual Linker* newLinker() const;
+    virtual void defineSymbols(Filter const *);
 };

+class PackBSDElf32x86 : public PackLinuxElf32x86
+{
+    typedef PackLinuxElf32x86 super;
+public:
+    PackBSDElf32x86(InputFile *f);
+    virtual ~PackBSDElf32x86();
+    virtual int getFormat() const { return UPX_F_BSD_ELF_i386; }
+    virtual const char *getName() const { return "BSD/elf386"; }
+
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+
+    virtual void buildLoader(const Filter *);
+};
+
+class PackFreeBSDElf32x86 : public PackBSDElf32x86
+{
+    typedef PackBSDElf32x86 super;
+public:
+    PackFreeBSDElf32x86(InputFile *f);
+    virtual ~PackFreeBSDElf32x86();
+};
+
+class PackNetBSDElf32x86 : public PackBSDElf32x86
+{
+    typedef PackBSDElf32x86 super;
+public:
+    PackNetBSDElf32x86(InputFile *f);
+    virtual ~PackNetBSDElf32x86();
+};
+
+class PackOpenBSDElf32x86 : public PackBSDElf32x86
+{
+    typedef PackBSDElf32x86 super;
+public:
+    PackOpenBSDElf32x86(InputFile *f);
+    virtual ~PackOpenBSDElf32x86();
+
+protected:
+    virtual void buildLoader(const Filter *ft);
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    );
+};
+
+/*************************************************************************
+// linux/elfarm
+**************************************************************************/
+
+class PackLinuxElf32armLe : public PackLinuxElf32Le
+{
+    typedef PackLinuxElf32Le super;
+public:
+    PackLinuxElf32armLe(InputFile *f);
+    virtual ~PackLinuxElf32armLe();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMLE; }
+    virtual const char *getName() const { return "linux/armLE"; }
+    virtual const int *getFilters() const;
+
+protected:
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual Linker* newLinker() const;
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual void updateLoader(OutputFile *);
+    virtual void defineSymbols(Filter const *);
+};
+
+class PackLinuxElf32armBe : public PackLinuxElf32Be
+{
+    typedef PackLinuxElf32Be super;
+public:
+    PackLinuxElf32armBe(InputFile *f);
+    virtual ~PackLinuxElf32armBe();
+    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMBE; }
+    virtual const char *getName() const { return "linux/armBE"; }
+    virtual const int *getFilters() const;
+
+protected:
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual Linker* newLinker() const;
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void buildLoader(const Filter *);
+    virtual void updateLoader(OutputFile *);
+    virtual void defineSymbols(Filter const *);
+};

 #endif /*} already included */

@@ -0,0 +1,618 @@
+/* p_lx_exc.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2001-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+
+#include "file.h"
+#include "filter.h"
+#include "linker.h"
+#include "packer.h"
+#include "p_elf.h"
+#include "p_unix.h"
+#include "p_lx_exc.h"
+
+#define PT_LOAD     Elf32_Phdr::PT_LOAD
+#define PT_DYNAMIC  Elf32_Phdr::PT_DYNAMIC
+#if 0 // UNUSED
+#define DT_NULL     Elf32_Dyn::DT_NULL
+#define DT_NEEDED   Elf32_Dyn::DT_NEEDED
+#define DT_STRTAB   Elf32_Dyn::DT_STRTAB
+#define DT_STRSZ    Elf32_Dyn::DT_STRSZ
+#endif
+
+
+/*************************************************************************
+// linux/386 (generic "execve" format)
+**************************************************************************/
+
+PackLinuxI386::PackLinuxI386(InputFile *f) : super(f),
+    ei_osabi(Elf32_Ehdr::ELFOSABI_LINUX), osabi_note(NULL)
+{
+    bele = &N_BELE_RTP::le_policy;
+}
+
+PackBSDI386::PackBSDI386(InputFile *f) : super(f)
+{
+    // Shell scripts need help specifying the target operating system.
+    // Elf input will override this with .e_ident[EI_OSABI] or PT_NOTE.
+    // [2006-09-27: Today's only runtime stub for shell is for linux.]
+    if (Elf32_Ehdr::ELFOSABI_LINUX==opt->o_unix.osabi0) {
+        // Disallow an incompatibility.
+        ei_osabi = Elf32_Ehdr::ELFOSABI_NONE;
+    }
+    else {
+        ei_osabi = opt->o_unix.osabi0;  // might be ELFOSABI_NONE
+    }
+}
+
+static const
+#include "stub/i386-linux.elf.execve-entry.h"
+static const
+#include "stub/i386-linux.elf.execve-fold.h"
+
+static const
+#include "stub/i386-bsd.elf.execve-entry.h"
+static const
+#include "stub/i386-bsd.elf.execve-fold.h"
+
+
+const int *PackLinuxI386::getCompressionMethods(int method, int level) const
+{
+    return Packer::getDefaultCompressionMethods_le32(method, level);
+}
+
+const int *PackLinuxI386::getFilters() const
+{
+    static const int filters[] = {
+        0x49, 0x46,
+        0x26, 0x24, 0x11, 0x14, 0x13, 0x16, 0x25, 0x15, 0x12,
+#if 0
+// 0x80..0x87 are regarded as "untested".
+        0x83, 0x86, 0x80, 0x84, 0x87, 0x81, 0x82, 0x85,
+        0x24, 0x16, 0x13, 0x14, 0x11, 0x25, 0x15, 0x12,
+#endif
+    -1 };
+    return filters;
+}
+
+static void
+set_stub_brk(Elf_LE32_Phdr *const phdr1, unsigned brka)
+{
+#define PAGE_MASK (~0ul<<12)
+        // linux-2.6.14 binfmt_elf.c: SIGKILL if (0==.p_memsz) on a page boundary
+        unsigned const brkb = brka | ((0==(~PAGE_MASK & brka)) ? 0x20 : 0);
+        phdr1->p_type = PT_LOAD;  // be sure
+        phdr1->p_offset = ~PAGE_MASK & brkb;
+        phdr1->p_vaddr = brkb;
+        phdr1->p_paddr = brkb;
+        phdr1->p_filesz = 0;
+        phdr1->p_memsz =  0;
+        if (0==phdr1->p_flags) {
+            phdr1->p_flags = Elf32_Phdr::PF_R|Elf32_Phdr::PF_W;
+        }
+        if (0==phdr1->p_align) {
+            phdr1->p_align = 0x1000;
+        }
+#undef PAGE_MASK
+}
+
+void
+PackLinuxI386::generateElfHdr(
+    OutputFile *fo,
+    void const *proto,
+    unsigned const brka
+)
+{
+    cprElfHdr2 *const h2 = (cprElfHdr2 *)&elfout;
+    cprElfHdr3 *const h3 = (cprElfHdr3 *)&elfout;
+    memcpy(h3, proto, sizeof(*h3));  // reads beyond, but OK
+
+    assert(h2->ehdr.e_phoff     == sizeof(Elf32_Ehdr));
+    assert(h2->ehdr.e_shoff     == 0);
+    assert(h2->ehdr.e_ehsize    == sizeof(Elf32_Ehdr));
+    assert(h2->ehdr.e_phentsize == sizeof(Elf32_Phdr));
+    assert(h2->ehdr.e_shnum     == 0);
+
+#if 0  //{
+    unsigned identsize;
+    char const *const ident = getIdentstr(&identsize);
+#endif  //}
+    h2->phdr[0].p_filesz = sizeof(*h2);  // + identsize;
+    h2->phdr[0].p_memsz  = h2->phdr[0].p_filesz;
+
+    // Info for OS kernel to set the brk()
+    if (brka) {
+        set_stub_brk(&h2->phdr[1], brka);
+    }
+
+    if (ph.format==UPX_F_LINUX_i386
+    ||  ph.format==UPX_F_LINUX_SH_i386
+    ||  ph.format==UPX_F_BSD_i386
+    ) {
+        // SELinux, PAx, grSecurity demand no PF_W if PF_X.
+        // kernel-2.6.12-2.3.legacy_FC3 has a bug which demands
+        // a PT_LOAD with PF_W, else SIGSEGV when clearing page fragment
+        // on low page of ".bss", which is the high page of .text.
+        // So the minimum number of PT_LOAD is 2.
+        assert(h2->ehdr.e_phnum==2);
+        memset(&h2->linfo, 0, sizeof(h2->linfo));
+        fo->write(h2, sizeof(*h2));
+    }
+    else if (ph.format==UPX_F_LINUX_ELFI_i386) {
+        assert(h3->ehdr.e_phnum==3);
+        memset(&h3->linfo, 0, sizeof(h3->linfo));
+        fo->write(h3, sizeof(*h3));
+    }
+    else {
+        assert(false);  // unknown ph.format, PackUnix::generateElfHdr
+    }
+}
+
+void
+PackLinuxI386::pack1(OutputFile *fo, Filter &)
+{
+    // create a pseudo-unique program id for our paranoid stub
+    progid = getRandomId();
+
+    generateElfHdr(fo, stub_i386_linux_elf_execve_fold, 0);
+}
+
+void
+PackBSDI386::pack1(OutputFile *fo, Filter &)
+{
+    // create a pseudo-unique program id for our paranoid stub
+    progid = getRandomId();
+
+    generateElfHdr(fo, stub_i386_bsd_elf_execve_fold, 0);
+}
+
+void
+PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
+{
+    overlay_offset = sizeof(elfout.ehdr) +
+        (elfout.ehdr.e_phentsize * elfout.ehdr.e_phnum) +
+        sizeof(l_info) +
+        ((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) ;
+    unsigned nw = fo->getBytesWritten();
+    elfout.phdr[0].p_filesz = nw;
+    nw = -(-elfout.phdr[0].p_align & -nw);  // ALIGN_UP
+    super::pack4(fo, ft);  // write PackHeader and overlay_offset
+    set_stub_brk(&elfout.phdr[1], nw + elfout.phdr[0].p_vaddr);
+
+#if 0  // {
+    // /usr/bin/strip from RedHat 8.0 (binutils-2.13.90.0.2-2)
+    // generates a 92-byte [only] output, because the "linking view"
+    // is empty.  This code supplies a "linking view".
+    // However, 'strip' then generates _plausible_ junk that gets
+    // "Illegal instruction"  because 'strip' changes p_hdr[1].p_align,
+    // .p_offset, and .p_vaddr incorrectly.  So the "cure" is worse than
+    // the disease.  It is obvious that a 92-byte file is bad,
+    // but it is not obvious that the changed .p_align is bad.
+    // Also, having a totally empty "linking view" is easier for 'strip'
+    // to fix: just detect that, and do nothing.
+    // So, we don't use this code for now [2003-01-11].
+
+    // Supply a "linking view" that covers everything,
+    // so that 'strip' does not omit everything.
+    Elf_LE32_Shdr shdr;
+    // The section header string table.
+    char const shstrtab[] = "\0.\0.shstrtab";
+
+    unsigned eod = elfout.phdr[0].p_filesz;
+    elfout.ehdr.e_shoff = eod;
+    elfout.ehdr.e_shentsize = sizeof(shdr);
+    elfout.ehdr.e_shnum = 3;
+    elfout.ehdr.e_shstrndx = 2;
+
+    // An empty Elf32_Shdr for space as a null index.
+    memset(&shdr, 0, sizeof(shdr));
+    shdr.sh_type = Elf32_Shdr::SHT_NULL;
+    fo->write(&shdr, sizeof(shdr));
+
+    // Cover all the bits we need at runtime.
+    memset(&shdr, 0, sizeof(shdr));
+    shdr.sh_name = 1;
+    shdr.sh_type = Elf32_Shdr::SHT_PROGBITS;
+    shdr.sh_flags = Elf32_Shdr::SHF_ALLOC;
+    shdr.sh_addr = elfout.phdr[0].p_vaddr;
+    shdr.sh_offset = overlay_offset;
+    shdr.sh_size = eod - overlay_offset;
+    shdr.sh_addralign = 4096;
+    fo->write(&shdr, sizeof(shdr));
+
+    // A section header for the section header string table.
+    memset(&shdr, 0, sizeof(shdr));
+    shdr.sh_name = 3;
+    shdr.sh_type = Elf32_Shdr::SHT_STRTAB;
+    shdr.sh_offset = 3*sizeof(shdr) + eod;
+    shdr.sh_size = sizeof(shstrtab);
+    fo->write(&shdr, sizeof(shdr));
+
+    fo->write(shstrtab, sizeof(shstrtab));
+#endif  // }
+
+
+    // Cannot pre-round .p_memsz.  If .p_filesz < .p_memsz, then kernel
+    // tries to make .bss, which requires PF_W.
+    // But strict SELinux (or PaX, grSecurity) disallows PF_W with PF_X.
+#if 0  /*{*/
+#undef PAGE_MASK
+#define PAGE_MASK (~0u<<12)
+    // pre-calculate for benefit of runtime disappearing act via munmap()
+    elfout.phdr[0].p_memsz =  PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz);
+#undef PAGE_MASK
+#else  /*}{*/
+    elfout.phdr[0].p_memsz =  elfout.phdr[0].p_filesz;
+#endif  /*}*/
+
+    // rewrite Elf header
+    fo->seek(0, SEEK_SET);
+    fo->rewrite(&elfout, overlay_offset);
+}
+
+static unsigned
+umax(unsigned a, unsigned b)
+{
+    if (a <= b) {
+        return b;
+    }
+    return a;
+}
+
+Linker *PackLinuxI386::newLinker() const
+{
+    return new ElfLinkerX86;
+}
+
+void
+PackLinuxI386::buildLinuxLoader(
+    upx_byte const *const proto,
+    unsigned        const szproto,
+    upx_byte const *const fold,
+    unsigned        const szfold,
+    Filter const *ft
+)
+{
+    initLoader(proto, szproto);
+
+    unsigned fold_hdrlen = 0;
+  if (0 < szfold) {
+    cprElfHdr1 const *const hf = (cprElfHdr1 const *)fold;
+    fold_hdrlen = sizeof(hf->ehdr) + hf->ehdr.e_phentsize * hf->ehdr.e_phnum +
+         sizeof(l_info);
+    if (0 == get_le32(fold_hdrlen + fold)) {
+        // inconsistent SIZEOF_HEADERS in *.lds (ld, binutils)
+        fold_hdrlen = umax(0x80, fold_hdrlen);
+    }
+  }
+    // This adds the definition to the "library", to be used later.
+    // NOTE: the stub is NOT compressed!  The savings is not worth it.
+    linker->addSection("FOLDEXEC", fold + fold_hdrlen, szfold - fold_hdrlen, 0);
+
+    n_mru = ft->n_mru;
+
+// Rely on "+80CXXXX" [etc] in getDecompressorSections() packer_c.cpp */
+//    // Here is a quick summary of the format of the output file:
+//    linker->setLoaderAlignOffset(
+//            // Elf32_Edhr
+//        sizeof(elfout.ehdr) +
+//            // Elf32_Phdr: 1 for exec86, 2 for sh86, 3 for elf86
+//        (elfout.ehdr.e_phentsize * elfout.ehdr.e_phnum) +
+//            // checksum UPX! lsize version format
+//        sizeof(l_info) +
+//            // PT_DYNAMIC with DT_NEEDED "forwarded" from original file
+//        ((elfout.ehdr.e_phnum==3) ? (unsigned) elfout.phdr[2].p_memsz : 0) +
+//            // p_progid, p_filesize, p_blocksize
+//        sizeof(p_info) +
+//            // compressed data
+//        b_len + ph.c_len );
+//            // entry to stub
+    addLoader("LEXEC000", NULL);
+
+    if (ft->id) {
+        if (n_mru) {
+            addLoader("LEXEC009", NULL);
+        }
+    }
+    addLoader("LEXEC010", NULL);
+    linker->defineSymbol("filter_cto", ft->cto);
+    linker->defineSymbol("filter_length",
+                         (ft->id & 0xf) % 3 == 0 ? ft->calls :
+                         ft->lastcall - ft->calls * 4);
+    addLoader(getDecompressorSections(), NULL);
+    addLoader("LEXEC015", NULL);
+    if (ft->id) {
+        {  // decompr, unfilter not separate
+            if (0x80==(ft->id & 0xF0)) {
+                addLoader("LEXEC110", NULL);
+                if (n_mru) {
+                    addLoader("LEXEC100", NULL);
+                }
+                // bug in APP: jmp and label must be in same .asx/.asy
+                addLoader("LEXEC016", NULL);
+            }
+        }
+        addFilter32(ft->id);
+        {  // decompr always unfilters
+            addLoader("LEXEC017", NULL);
+        }
+    }
+    else {
+        addLoader("LEXEC017", NULL);
+    }
+
+    addLoader("IDENTSTR", NULL);
+    addLoader("LEXEC020", NULL);
+    addLoader("FOLDEXEC", NULL);
+    if (ph.method == M_LZMA) {
+        const lzma_compress_result_t *res = &ph.compress_result.result_lzma;
+        acc_uint32e_t properties = // lc, lp, pb, dummy
+            (res->lit_context_bits << 0) |
+            (res->lit_pos_bits << 8) |
+            (res->pos_bits << 16);
+        if (linker->bele->isBE()) // big endian - bswap32
+            acc_swab32s(&properties);
+        linker->defineSymbol("lzma_properties", properties);
+        // -2 for properties
+        linker->defineSymbol("lzma_c_len", ph.c_len - 2);
+        linker->defineSymbol("lzma_u_len", ph.u_len);
+        unsigned const stack = getDecompressorWrkmemSize();
+        linker->defineSymbol("lzma_stack_adjust", 0u - stack);
+    }
+    if (0x80==(ft->id & 0xF0)) {
+        int const mru = ft->n_mru ? 1+ ft->n_mru : 0;
+        if (mru && mru!=256) {
+            unsigned const is_pwr2 = (0==((mru -1) & mru));
+            linker->defineSymbol("NMRU", mru - is_pwr2);
+        }
+    }
+    relocateLoader();
+}
+
+void
+PackLinuxI386::buildLoader(Filter const *ft)
+{
+    unsigned const sz_fold = sizeof(stub_i386_linux_elf_execve_fold);
+    MemBuffer buf(sz_fold);
+    memcpy(buf, stub_i386_linux_elf_execve_fold, sz_fold);
+
+    // patch loader
+    // note: we only can use /proc/<pid>/fd when exetype > 0.
+    //   also, we sleep much longer when compressing a script.
+    checkPatch(NULL, 0, 0, 0);  // reset
+    patch_le32(buf,sz_fold,"UPX4",exetype > 0 ? 3 : 15);   // sleep time
+    patch_le32(buf,sz_fold,"UPX3",progid);
+    patch_le32(buf,sz_fold,"UPX2",exetype > 0 ? 0 : 0x7fffffff);
+
+    buildLinuxLoader(
+        stub_i386_linux_elf_execve_entry, sizeof(stub_i386_linux_elf_execve_entry),
+        buf, sz_fold, ft );
+}
+
+void
+PackBSDI386::buildLoader(Filter const *ft)
+{
+    unsigned const sz_fold = sizeof(stub_i386_bsd_elf_execve_fold);
+    MemBuffer buf(sz_fold);
+    memcpy(buf, stub_i386_bsd_elf_execve_fold, sz_fold);
+
+    // patch loader
+    // note: we only can use /proc/<pid>/fd when exetype > 0.
+    //   also, we sleep much longer when compressing a script.
+    checkPatch(NULL, 0, 0, 0);  // reset
+    patch_le32(buf,sz_fold,"UPX4",exetype > 0 ? 3 : 15);   // sleep time
+    patch_le32(buf,sz_fold,"UPX3",progid);
+    patch_le32(buf,sz_fold,"UPX2",exetype > 0 ? 0 : 0x7fffffff);
+
+    buildLinuxLoader(
+        stub_i386_bsd_elf_execve_entry, sizeof(stub_i386_bsd_elf_execve_entry),
+        buf, sz_fold, ft );
+}
+
+// FIXME: getLoaderPrefixSize is unused?
+int PackLinuxI386::getLoaderPrefixSize() const
+{
+    return 116;
+}
+
+
+/*************************************************************************
+// some ELF utitlity functions
+**************************************************************************/
+
+// basic check of an Linux ELF Ehdr
+int PackLinuxI386::checkEhdr(const Elf_LE32_Ehdr *ehdr) const
+{
+    const unsigned char * const buf = ehdr->e_ident;
+
+    if (memcmp(buf, "\x7f\x45\x4c\x46\x01\x01\x01", 7)) // ELF 32-bit LSB
+        return -1;
+
+    // now check the ELF header
+    if (!memcmp(buf+8, "FreeBSD", 7))                  // branded
+        return 1;
+    if (ehdr->e_type != Elf32_Ehdr::ET_EXEC
+    &&  ehdr->e_type != Elf32_Ehdr::ET_DYN )           // executable
+        return 2;
+    if (ehdr->e_machine != Elf32_Ehdr::EM_386)         // Intel 80386
+        return 3;
+    if (ehdr->e_version != Elf32_Ehdr::EV_CURRENT)     // version
+        return 4;
+    if (ehdr->e_phnum < 1)
+        return 5;
+    if (ehdr->e_phentsize != sizeof(Elf32_Phdr))
+        return 6;
+
+    // check for Linux kernels
+    if (ehdr->e_entry == 0xC0100000)                    // uncompressed vmlinux
+        return 1000;
+    if (ehdr->e_entry == 0x00001000)                    // compressed vmlinux
+        return 1001;
+    if (ehdr->e_entry == 0x00100000)                    // compressed bvmlinux
+        return 1002;
+
+    // FIXME: add more checks for kernels
+
+    // FIXME: add special checks for other ELF i386 formats, like
+    //        NetBSD, OpenBSD, Solaris, ....
+
+    // success
+    return 0;
+}
+
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+bool PackLinuxI386::canPack()
+{
+    if (exetype != 0)
+        return super::canPack();
+
+    Elf_LE32_Ehdr ehdr;
+    unsigned char *buf = ehdr.e_ident;
+
+    fi->seek(0, SEEK_SET);
+    fi->readx(&ehdr, sizeof(ehdr));
+    fi->seek(0, SEEK_SET);
+
+    exetype = 0;
+    const unsigned l = get_le32(buf);
+
+    int elf = checkEhdr(&ehdr);
+    if (elf >= 0) {
+        // NOTE: ELF executables are now handled by p_lx_elf.cpp,
+        //   so we only handle them here if force_execve
+        if (elf == 0 && opt->o_unix.force_execve) {
+            exetype = 1;
+
+            unsigned osabi0 = ehdr.e_ident[Elf32_Ehdr::EI_OSABI];
+            switch (osabi0) {
+            case Elf32_Ehdr::ELFOSABI_LINUX:
+            case Elf32_Ehdr::ELFOSABI_FREEBSD:
+            case Elf32_Ehdr::ELFOSABI_NETBSD:
+            case Elf32_Ehdr::ELFOSABI_OPENBSD:
+                ei_osabi = osabi0;  // Proudly declares its osabi in Ehdr.
+                break;
+            default:
+            unsigned const e_phnum = get_native16(&ehdr.e_phnum);
+            if (e_phnum<=(512/sizeof(Elf32_Phdr))) {
+                char buf2[512];
+                fi->seek(get_native32(&ehdr.e_phoff), SEEK_SET);
+                fi->readx(buf2, sizeof(buf2));
+                fi->seek(0, SEEK_SET);
+                Elf32_Phdr const *phdr = (Elf32_Phdr const *)buf2;
+                for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
+                    if (phdr->PT_NOTE == get_native32(&phdr->p_type)) {
+                        unsigned const offset = get_native32(&phdr->p_offset);
+                        struct Elf32_Note note; memset(&note, 0, sizeof(note));
+                        fi->seek(offset, SEEK_SET);
+                        fi->readx(&note, sizeof(note));
+                        fi->seek(0, SEEK_SET);
+                        if (4==get_native32(&note.descsz)
+                        &&  1==get_native32(&note.type)
+                        &&  0==note.end ) {
+                            if (0==strcmp("NetBSD", (char const *)&note.text)) {
+                                ei_osabi = Elf32_Ehdr::ELFOSABI_NETBSD;
+                                break;
+                            }
+                            if (0==strcmp("OpenBSD", (char const *)&note.text)) {
+                                ei_osabi = Elf32_Ehdr::ELFOSABI_OPENBSD;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            }
+        }
+        if (UPX_F_BSD_i386==getFormat()
+        && !(Elf32_Ehdr::ELFOSABI_FREEBSD==ei_osabi
+          || Elf32_Ehdr::ELFOSABI_NETBSD ==ei_osabi
+          || Elf32_Ehdr::ELFOSABI_OPENBSD==ei_osabi )) {
+            return false;
+        }
+    }
+    else if (l == 0x00640107 || l == 0x00640108 || l == 0x0064010b || l == 0x006400cc)
+    {
+        // OMAGIC / NMAGIC / ZMAGIC / QMAGIC
+        exetype = 2;
+        // FIXME: N_TRSIZE, N_DRSIZE
+        // FIXME: check for aout shared libraries
+    }
+    else { // shell scripts and other interpreters
+        if (Elf32_Ehdr::ELFOSABI_LINUX!=ei_osabi) {
+            return false;  // so far, only Linux has runtime stub for shell
+        }
+        else if (!memcmp(buf, "#!/", 3))                    // #!/bin/sh
+            exetype = -1;
+        else if (!memcmp(buf, "#! /", 4))                   // #! /bin/sh
+            exetype = -1;
+        else if (!memcmp(buf, "\xca\xfe\xba\xbe", 4))       // Java bytecode
+            exetype = -2;
+    }
+
+    return super::canPack();
+}
+
+
+void PackLinuxI386::patchLoader() { }
+
+
+void PackLinuxI386::patchLoaderChecksum()
+{
+    unsigned char *const ptr = getLoader();
+    l_info *const lp = (l_info *)(sizeof(elfout.ehdr) +
+        (elfout.ehdr.e_phnum * elfout.ehdr.e_phentsize) + (char *)&elfout );
+    // checksum for loader + p_info
+    lp->l_checksum = 0;
+    lp->l_magic = UPX_ELF_MAGIC;
+    lp->l_lsize = (unsigned short) lsize;
+    lp->l_version = (unsigned char) ph.version;
+    lp->l_format  = (unsigned char) ph.format;
+    // INFO: lp->l_checksum is currently unused
+    lp->l_checksum = upx_adler32(ptr, lsize);
+}
+
+
+void PackLinuxI386::updateLoader(OutputFile *fo)
+{
+    elfout.ehdr.e_entry = fo->getBytesWritten() + elfout.phdr[0].p_vaddr;
+}
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,144 @@
+/* p_lx_exc.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_P_LX_EXC_H
+#define __UPX_P_LX_EXC_H
+
+
+/*************************************************************************
+// linux/386 (generic "execve" format)
+**************************************************************************/
+
+class PackLinuxI386 : public PackUnixLe32
+{
+    typedef PackUnixLe32 super;
+public:
+    PackLinuxI386(InputFile *f);
+    virtual void generateElfHdr(
+        OutputFile *,
+        void const *proto,
+        unsigned const brka
+    );
+    virtual int getFormat() const { return UPX_F_LINUX_i386; }
+    virtual const char *getName() const { return "linux/386"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+    virtual void buildLoader(const Filter *);
+
+    virtual bool canPack();
+
+protected:
+    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 pack4(OutputFile *, Filter &);  // append PackHeader
+
+    // loader util
+    virtual Linker* newLinker() const;
+    virtual int getLoaderPrefixSize() const;
+    virtual void buildLinuxLoader(
+        upx_byte const *const proto,  // assembly-only sections
+        unsigned const szproto,
+        upx_byte const *const fold,  // linked assembly + C section
+        unsigned const szfold,
+        Filter const *ft
+    );
+
+    // patch util
+    virtual void patchLoader();
+    virtual void patchLoaderChecksum();
+    virtual void updateLoader(OutputFile *);
+
+    // ELF util
+    virtual int checkEhdr(const Elf_LE32_Ehdr *ehdr) const;
+
+    enum {
+        UPX_ELF_MAGIC = 0x5850557f          // "\x7fUPX"
+    };
+
+    unsigned n_mru;
+
+    struct cprElfHdr1 {
+        Elf_LE32_Ehdr ehdr;
+        Elf_LE32_Phdr phdr[1];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr2 {
+        Elf_LE32_Ehdr ehdr;
+        Elf_LE32_Phdr phdr[2];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    struct cprElfHdr3 {
+        Elf_LE32_Ehdr ehdr;
+        Elf_LE32_Phdr phdr[3];
+        l_info linfo;
+    }
+    __attribute_packed;
+
+    cprElfHdr3 elfout;
+
+    struct Elf32_Note {
+        unsigned namesz;  // 8
+        unsigned descsz;  // 4
+        unsigned type;    // 1
+        char text[0x18 - 4*4];  // "OpenBSD"
+        unsigned end;     // 0
+    } elfnote;
+
+    unsigned char ei_osabi;
+    char const *osabi_note;
+};
+
+
+class PackBSDI386 : public PackLinuxI386
+{
+    typedef PackLinuxI386 super;
+public:
+    PackBSDI386(InputFile *f);
+    virtual int getFormat() const { return UPX_F_BSD_i386; }
+    virtual const char *getName() const { return "*BSD/386"; }
+
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+
+    virtual void buildLoader(const Filter *);
+};
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,310 @@
+/* p_lx_interp.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2000-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+
+#include "file.h"
+#include "filter.h"
+#include "linker.h"
+#include "packer.h"
+#include "p_elf.h"
+#include "p_unix.h"
+#include "p_lx_exc.h"
+#include "p_lx_elf.h"
+#include "p_lx_interp.h"
+
+#define PT_LOAD     Elf32_Phdr::PT_LOAD
+#define PT_INTERP   Elf32_Phdr::PT_INTERP
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+static const
+#include "stub/i386-linux.elf.interp-entry.h"
+static const
+#include "stub/i386-linux.elf.interp-fold.h"
+
+PackLinuxElf32x86interp::PackLinuxElf32x86interp(InputFile *f) :
+    super(f)
+{
+}
+
+PackLinuxElf32x86interp::~PackLinuxElf32x86interp()
+{
+}
+
+bool PackLinuxElf32x86interp::canPack()
+{
+    if (opt->o_unix.make_ptinterp) {
+        return true;
+    }
+    if (!opt->o_unix.use_ptinterp) {
+        return false;
+    }
+    return super::canPack();
+}
+
+void PackLinuxElf32x86interp::pack1(OutputFile *fo, Filter &)
+{
+    fi->seek(0, SEEK_SET);
+    fi->readx(&ehdri, sizeof(ehdri));
+    assert(ehdri.e_phoff == sizeof(Elf32_Ehdr));  // checked by canPack()
+    sz_phdrs = ehdri.e_phnum * ehdri.e_phentsize;
+
+    phdri = new Elf32_Phdr[(unsigned)ehdri.e_phnum];
+    fi->seek(ehdri.e_phoff, SEEK_SET);
+    fi->readx(phdri, sz_phdrs);
+
+#define E Elf32_Ehdr
+    cprElfHdr3 h3;
+    memset(&h3, 0, sizeof(h3));
+    memcpy(h3.ehdr.e_ident, "\177ELF", 4);
+    h3.ehdr.e_ident[E::EI_CLASS] = E::ELFCLASS32;
+    h3.ehdr.e_ident[E::EI_DATA] = E::ELFDATA2LSB;
+    h3.ehdr.e_ident[E::EI_VERSION] = E::EV_CURRENT;
+    h3.ehdr.e_ident[E::EI_OSABI] = E::ELFOSABI_LINUX;
+    h3.ehdr.e_ident[E::EI_ABIVERSION] = E::EV_CURRENT;
+    h3.ehdr.e_type = E::ET_EXEC;
+    h3.ehdr.e_machine = E::EM_386;
+    h3.ehdr.e_version = 1;
+    h3.ehdr.e_phoff = sizeof(Elf32_Ehdr);
+    h3.ehdr.e_ehsize = sizeof(Elf32_Ehdr);
+    h3.ehdr.e_phentsize = sizeof(Elf32_Phdr);
+    h3.ehdr.e_phnum = 3;
+    h3.phdr[0].p_type = PT_LOAD;
+    h3.phdr[0].p_flags = Elf32_Phdr::PF_X | Elf32_Phdr::PF_R;
+    h3.phdr[0].p_align = 0x1000;
+    h3.phdr[1].p_type = PT_LOAD;
+    h3.phdr[1].p_flags = Elf32_Phdr::PF_W | Elf32_Phdr::PF_R;
+    h3.phdr[1].p_align = 1;
+    h3.phdr[2].p_type = PT_INTERP;
+    h3.phdr[2].p_offset = (char *)&h3.phdr[2].p_vaddr - (char *)&h3;
+    memcpy(&h3.phdr[2].p_vaddr, "/upxrun", h3.phdr[2].p_filesz = 8);
+    h3.phdr[2].p_align = 1;
+
+    if (opt->o_unix.make_ptinterp) { // unusual "once per release"
+        elfout = h3;
+        elfout.ehdr.e_phnum = 1;
+        fo->write(&elfout, elfout.ehdr.e_ehsize + elfout.ehdr.e_phentsize);
+    }
+    else { // usual case
+        generateElfHdr(fo, &h3, getbrk(phdri, ehdri.e_phnum));
+    }
+#undef E
+}
+
+void PackLinuxElf32x86interp::pack2(OutputFile *fo, Filter &ft)
+{
+    if (opt->o_unix.make_ptinterp) {
+        return;  // ignore current input file!
+    }
+    super::pack2(fo, ft);
+}
+
+#undef PAGE_MASK
+#define PAGE_MASK (~0u<<12)
+
+void PackLinuxElf32x86interp::pack3(OutputFile *fo, Filter &/*ft*/)
+{
+    unsigned base = getbase(phdri, ehdri.e_phnum);
+    unsigned sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz);
+    if (base < (0x11000 + sz)) {
+        base =  0x11000 + sz;
+    }
+    if (opt->o_unix.make_ptinterp) {
+        base = 0x10000;
+    }
+    elfout.phdr[0].p_paddr = elfout.phdr[0].p_vaddr = base - sz;
+    if (opt->o_unix.make_ptinterp) {
+        initLoader(stub_i386_linux_elf_interp_entry, sizeof(stub_i386_linux_elf_interp_entry));
+        linker->addSection("FOLDEXEC", stub_i386_linux_elf_interp_fold, sizeof(stub_i386_linux_elf_interp_fold), 0);
+
+        addLoader("LXPTI000", NULL);
+
+        addLoader("LXPTI040", NULL);
+        ph.method = M_NRV2B_LE32; addLoader(getDecompressorSections(), NULL);
+        addLoader("LXPTI090", NULL);
+
+        addLoader("LXPTI041", NULL);
+        ph.method = M_NRV2D_LE32; addLoader(getDecompressorSections(), NULL);
+        addLoader("LXPTI090", NULL);
+
+        addLoader("LXPTI042", NULL);
+        ph.method = M_NRV2E_LE32; addLoader(getDecompressorSections(), NULL);
+        addLoader("LXPTI090", NULL);
+
+        addLoader("LXPTI043", NULL);
+        ph.method = M_CL1B_LE32;  addLoader(getDecompressorSections(), NULL);
+        addLoader("LXPTI090", NULL);
+
+        addLoader("LXPTI091", NULL);
+
+        addLoader("LXPTI140", NULL);
+
+        addLoader("LXUNF002,LXUNF008,LXUNF010", NULL);
+        addFilter32(0x46);
+        addLoader("LXUNF042,LXUNF035", NULL);
+
+        addLoader("LXUNF002,LXUNF008,LXUNF010", NULL);
+        addFilter32(0x49);
+        addLoader("LXUNF042,LXUNF035", NULL);
+
+        addLoader("LXPTI200", NULL);
+        addLoader("FOLDEXEC", NULL);
+        upx_byte const *p = getLoader();
+        lsize = getLoaderSize();
+        updateLoader(fo);
+        fo->write(p, lsize);
+        elfout.phdr[0].p_filesz = fo->getBytesWritten();
+    }
+    else {
+        updateLoader(fo);
+    }
+}
+
+
+void PackLinuxElf32x86interp::unpack(OutputFile *fo)
+{
+#define MAX_INTERP_HDR 512
+    char bufehdr[MAX_INTERP_HDR];
+    Elf32_Ehdr *const ehdr = (Elf32_Ehdr *)bufehdr;
+    Elf32_Phdr const *phdr = (Elf32_Phdr *)(1+ehdr);
+
+    unsigned szb_info = sizeof(b_info);
+    {
+        fi->seek(0, SEEK_SET);
+        fi->readx(bufehdr, MAX_INTERP_HDR);
+        unsigned const e_entry = get_native32(&ehdr->e_entry);
+        if (e_entry < 0x401180) { /* old style, 8-byte b_info */
+            szb_info = 2*sizeof(unsigned);
+        }
+    }
+
+    fi->seek(overlay_offset, SEEK_SET);
+    p_info hbuf;
+    fi->readx(&hbuf, sizeof(hbuf));
+    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
+    blocksize = get_native32(&hbuf.p_blocksize);
+    if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
+        throwCantUnpack("file header corrupted");
+
+    ibuf.alloc(blocksize + OVERHEAD);
+    b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));
+    fi->readx(&bhdr, szb_info);
+    ph.u_len = get_native32(&bhdr.sz_unc);
+    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.filter_cto = bhdr.b_cto8;
+
+    // Uncompress Ehdr and Phdrs.
+    fi->readx(ibuf, ph.c_len);
+    decompress(ibuf, (upx_byte *)ehdr, false);
+
+    unsigned total_in = 0;
+    unsigned total_out = 0;
+    unsigned c_adler = upx_adler32(NULL, 0);
+    unsigned u_adler = upx_adler32(NULL, 0);
+    off_t ptload0hi=0, ptload1lo=0, ptload1sz=0;
+
+    // decompress PT_LOAD
+    bool first_PF_X = true;
+    fi->seek(- (off_t) (szb_info + ph.c_len), SEEK_CUR);
+    for (unsigned j=0; j < ehdr->e_phnum; ++phdr, ++j) {
+        if (PT_LOAD==phdr->p_type) {
+            if (0==ptload0hi) {
+                ptload0hi = phdr->p_filesz + phdr->p_offset;
+            }
+            else if (0==ptload1lo) {
+                ptload1lo = phdr->p_offset;
+                ptload1sz = phdr->p_filesz;
+            }
+            if (fo)
+                fo->seek(phdr->p_offset, SEEK_SET);
+            if (Elf32_Phdr::PF_X & phdr->p_flags) {
+                unpackExtent(phdr->p_filesz, fo, total_in, total_out,
+                    c_adler, u_adler, first_PF_X, szb_info);
+                first_PF_X = false;
+            }
+            else {
+                unpackExtent(phdr->p_filesz, fo, total_in, total_out,
+                    c_adler, u_adler, false, szb_info);
+            }
+        }
+    }
+
+    if (0!=ptload1sz && ptload0hi < ptload1lo) {  // alignment hole?
+        if (fo)
+            fo->seek(ptload0hi, SEEK_SET);
+        unpackExtent(ptload1lo - ptload0hi, fo, total_in, total_out,
+            c_adler, u_adler, false, szb_info);
+    }
+    if (total_out != orig_file_size) {  // non-PT_LOAD stuff
+        if (fo)
+            fo->seek(0, SEEK_END);
+        unpackExtent(orig_file_size - total_out, fo, total_in, total_out,
+            c_adler, u_adler, false, szb_info);
+    }
+
+    // check for end-of-file
+    fi->readx(&bhdr, szb_info);
+    unsigned const sz_unc = ph.u_len = get_native32(&bhdr.sz_unc);
+
+    if (sz_unc == 0) { // uncompressed size 0 -> EOF
+        // note: magic is always stored le32
+        unsigned const sz_cpr = get_le32(&bhdr.sz_cpr);
+        if (sz_cpr != UPX_MAGIC_LE32)  // sz_cpr must be h->magic
+            throwCompressedDataViolation();
+    }
+    else { // extra bytes after end?
+        throwCompressedDataViolation();
+    }
+
+    // update header with totals
+    ph.c_len = total_in;
+    ph.u_len = total_out;
+
+    // all bytes must be written
+    if (total_out != orig_file_size)
+        throwEOFException();
+
+    // finally test the checksums
+    if (ph.c_adler != c_adler || ph.u_adler != u_adler)
+        throwChecksumError();
+#undef MAX_INTERP_HDR
+}
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,67 @@
+/* p_lx_interp.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2000-2006 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.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_P_LX_INTERP_H  //{
+#define __UPX_P_LX_INTERP_H
+
+
+/*************************************************************************
+// linux/interp386
+**************************************************************************/
+
+class PackLinuxElf32x86interp : public PackLinuxElf32x86
+{
+    typedef PackLinuxElf32x86 super;
+public:
+    PackLinuxElf32x86interp(InputFile *f);
+    virtual ~PackLinuxElf32x86interp();
+    virtual int getVersion() const { return 13; }
+    virtual int getFormat() const { return UPX_F_LINUX_ELFI_i386; }
+    virtual const char *getName() const { return "linux/elfi386"; }
+
+    virtual bool canPack();
+    virtual void unpack(OutputFile *fo);
+
+protected:
+    virtual void pack1(OutputFile *, Filter &);  // generate executable header
+    virtual void pack2(OutputFile *, Filter &);  // append compressed data
+    virtual void pack3(OutputFile *, Filter &);  // build loader
+};
+
+
+#endif /*} already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -1,92 +0,0 @@
-/* p_lx_sep.cpp --
-
-   This file is part of the UPX executable compressor.
-
-   Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2000 Laszlo Molnar
-   Copyright (C) 2000 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.
-
-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
-
-   John F. Reiser
-   jreiser@BitWagon.com
- */
-
-
-#include "conf.h"
-
-#include "file.h"
-#include "packer.h"
-#include "p_elf.h"
-#include "p_unix.h"
-#include "p_lx_elf.h"
-#include "p_lx_sep.h"
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-#define SCRIPT_SIZE     (opt->unix.SCRIPT_MAX + sizeof(l_info))
-
-const upx_byte *PackLinuxI386sep::getLoader() const
-{
-    static char script[SCRIPT_SIZE];
-
-    memset(script, 0, sizeof(script));
-    char const *name = opt->unix.script_name;
-    if (0==name) {
-        name = "/usr/local/lib/upxX";
-    }
-    sprintf(script, "#!%s\n", name);
-    if (M_IS_NRV2B(opt->method)) {
-        script[strlen(script)-2] = 'b';
-        return (upx_byte const *)script;
-    }
-    if (M_IS_NRV2D(opt->method)) {
-        script[strlen(script)-2] = 'd';
-        return (upx_byte const *)script;
-    }
-    return NULL;
-}
-
-int PackLinuxI386sep::getLoaderSize() const
-{
-    if (M_IS_NRV2B(opt->method))
-        return SCRIPT_SIZE;
-    if (M_IS_NRV2D(opt->method))
-        return SCRIPT_SIZE;
-    return 0;
-}
-
-int PackLinuxI386sep::getLoaderPrefixSize() const
-{
-    return opt->unix.SCRIPT_MAX;
-}
-
-void PackLinuxI386sep::patchLoader()
-{
-    patchLoaderChecksum();
-}
-
-/*
-vi:ts=4:et
-*/
-
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -22,145 +22,111 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>

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


 #include "conf.h"

 #include "file.h"
+#include "filter.h"
 #include "packer.h"
 #include "p_elf.h"
 #include "p_unix.h"
+#include "p_lx_exc.h"
 #include "p_lx_sh.h"

+#define PT_LOAD     Elf_LE32_Phdr::PT_LOAD
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
 static const
-#include "stub/l_sh_n2b.h"
+#include "stub/i386-linux.elf.shell-entry.h"
 static const
-#include "stub/l_sh_n2d.h"
+#include "stub/i386-linux.elf.shell-fold.h"
+
+
+PackLinuxI386sh::PackLinuxI386sh(InputFile *f) :
+    super(f), o_shname(0), l_shname(0)
+{
+}

 PackLinuxI386sh::~PackLinuxI386sh()
 {
 }

-PackLinuxI386sh::PackLinuxI386sh(InputFile *f)
-    :super(f)
-    ,o_shname(0)
-    ,l_shname(0)
+static unsigned
+umax(unsigned a, unsigned b)
 {
-}
-
-const upx_byte *PackLinuxI386sh::getLoader() const
-{
-    if (M_IS_NRV2B(opt->method))
-        return linux_i386sh_nrv2b_loader;
-    if (M_IS_NRV2D(opt->method))
-        return linux_i386sh_nrv2d_loader;
-    return NULL;
-}
-
-int PackLinuxI386sh::getLoaderSize() const
-{
-    if (0 != lsize) {
-        return lsize;
+    if (a <= b) {
+        return b;
    }
-    if (M_IS_NRV2B(opt->method))
-        return sizeof(linux_i386sh_nrv2b_loader);
-    if (M_IS_NRV2D(opt->method))
-        return sizeof(linux_i386sh_nrv2d_loader);
-    return 0;
+    return a;
 }

-
-static inline off_t max_off_t(off_t a, off_t b)
+void
+PackLinuxI386sh::buildLoader(Filter const *ft)
 {
-    return a > b ? a : b;
-}
+    unsigned const sz_fold = sizeof(stub_i386_linux_elf_shell_fold);
+    MemBuffer buf(sz_fold);
+    memcpy(buf, stub_i386_linux_elf_shell_fold, sz_fold);

-static off_t getbrk(Elf_LE32_Phdr const *phdr, int e_phnum)
-{
-    off_t brka = 0;
-    for (int j = 0; j < e_phnum; ++phdr, ++j) if (PT_LOAD==phdr->p_type) {
-        brka = max_off_t(brka, phdr->p_vaddr + phdr->p_memsz);
+    checkPatch(NULL, 0, 0, 0);  // reset
+    patch_le32(buf,sz_fold,"UPX3",l_shname);
+    patch_le32(buf,sz_fold,"UPX2",o_shname);
+
+    // get fresh filter
+    Filter fold_ft = *ft;
+    fold_ft.init(ft->id, ft->addvalue);
+    int preferred_ctos[2] = {ft->cto, -1};
+    fold_ft.preferred_ctos = preferred_ctos;
+
+    // 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);
+    if (0 == get_le32(fold_hdrlen + buf)) {
+        // inconsistent SIZEOF_HEADERS in *.lds (ld, binutils)
+        fold_hdrlen = umax(0x80, fold_hdrlen);
    }
-    return brka;
+    bool success = fold_ft.filter(buf + fold_hdrlen, sz_fold - fold_hdrlen);
+    UNUSED(success);
+
+    buildLinuxLoader(
+        stub_i386_linux_elf_shell_entry, sizeof(stub_i386_linux_elf_shell_entry),
+        buf, sz_fold, ft );
 }

-
-void PackLinuxI386sh::patchLoader()
-{
-    lsize = getLoaderSize();
-    ehdri = (Elf_LE32_Ehdr *)(void *)loader;
-    Elf_LE32_Phdr *const phdri = (Elf_LE32_Phdr *)(1+ehdri);
-
-    patch_le32(loader,lsize,"UPX3",l_shname);
-    patch_le32(loader,lsize,"UPX2",o_shname);
-
-    // stub/scripts/setfold.pl puts address of 'fold_begin' in phdr[1].p_offset
-    off_t const fold_begin = phdri[1].p_offset;
-    assert(fold_begin > 0);
-    assert(fold_begin < (off_t)lsize);
-    MemBuffer cprLoader(lsize);
-
-    // compress compiled C-code portion of loader
-    upx_compress_config_t conf; memset(&conf, 0xff, sizeof(conf));
-    conf.c_flags = 0;
-    upx_uint result_buffer[16];
-    upx_uint cprLsize;
-    upx_compress(
-        loader + fold_begin, lsize - fold_begin,
-        cprLoader, &cprLsize,
-        0,  // progress_callback_t ??
-        getCompressionMethod(), 9,
-        &conf,
-        result_buffer
-    );
-    set_le32(0+fold_begin+loader, lsize - fold_begin);
-    set_le32(4+fold_begin+loader, cprLsize);
-    memcpy(  8+fold_begin+loader, cprLoader, cprLsize);
-    lsize = 8 + fold_begin + cprLsize;
-    patchVersion(loader,lsize);
-
-    unsigned const brka = getbrk(phdri, ehdri->e_phnum);
-    phdri[1].p_offset =  0xfff&brka;
-    phdri[1].p_vaddr = brka;
-    phdri[1].p_paddr = brka;
-    phdri[1].p_filesz = 0;
-    phdri[1].p_memsz =  0;
-
-    // The beginning of our loader consists of a elf_hdr (52 bytes) and
-    // two sections elf_phdr (2 * 32 byte), so we have 12 free bytes
-    // from offset 116 to the program start at offset 128.
-    assert(ehdri->e_phoff == sizeof(Elf_LE32_Ehdr));
-    assert(ehdri->e_ehsize == sizeof(Elf_LE32_Ehdr));
-    assert(ehdri->e_phentsize == sizeof(Elf_LE32_Phdr));
-    assert(ehdri->e_phnum == 2);
-    assert(ehdri->e_shnum == 0);
-    assert(lsize > 128 && lsize < 4096);
-
-    patchLoaderChecksum();
-}
+void PackLinuxI386sh::patchLoader() { }


 bool PackLinuxI386sh::getShellName(char *buf)
 {
    exetype = -1;
-    l_shname = strcspn(buf, " \t\n\v\f\r");
+    l_shname = (int) strcspn(buf, " \t\n\v\f\r");
    buf[l_shname] = 0;
-    char const *const basename = 1+strrchr(buf, '/');
    static char const *const shname[] = { // known shells that accept "-c" arg
-        "sh", "ash", "bsh", "csh", "ksh", "bash", "tcsh", "pdksh",
-        //"python", // FIXME: does python work ???
+        "ash", "bash", "bsh", "csh", "ksh", "pdksh", "sh", "tcsh", "zsh",
+        "python",
        NULL
    };
-    for (int j=0; 0 != shname[j]; ++j) {
-        if (0==strcmp(shname[j], basename)) {
-            o_shname += 3;  // space for "-c\x00"
-            return super::canPack();
+    const char *bname = strrchr(buf, '/');
+    if (bname == NULL)
+        return false;
+    for (int j = 0; NULL != shname[j]; ++j) {
+        if (0 == strcmp(shname[j], bname + 1)) {
+            bool const s = super::canPack();
+            if (s) {
+                opt->o_unix.blocksize = blocksize = file_size;
+            }
+            return s;
        }
    }
    return false;
@@ -173,9 +139,9 @@ bool PackLinuxI386sh::canPack()
    // only compress i386sh scripts when running under Linux
    char buf[512];

-    fi->readx(buf, 512);
+    fi->readx(buf, sizeof(buf));
    fi->seek(0, SEEK_SET);
-    buf[511] = 0;
+    buf[sizeof(buf) - 1] = 0;
    if (!memcmp(buf, "#!/", 3)) {                       // #!/bin/sh
        o_shname = 2;
        return getShellName(&buf[o_shname]);
@@ -189,32 +155,18 @@ bool PackLinuxI386sh::canPack()
 }


-void PackLinuxI386sh::pack(OutputFile *fo)
+void
+PackLinuxI386sh::pack1(OutputFile *fo, Filter &)
 {
-#define PAGE_MASK (~0<<12)
-    opt->unix.blocksize = blocksize = file_size;
-    PackUnix::pack(fo);
-
-    // update loader
-    Elf_LE32_Phdr *const phdro = (Elf_LE32_Phdr *)(sizeof(Elf_LE32_Ehdr)+loader);
-    off_t const totlen = fo->getBytesWritten();
-    phdro[0].p_filesz = totlen;
-    phdro[0].p_memsz = PAGE_MASK & (~PAGE_MASK + totlen);
-
-    // Try to make brk() work by faking it for exec().
-    unsigned const brka = 0x08048000;
-    phdro[1].p_offset = 0xfff&brka;
-    phdro[1].p_vaddr = brka;
-    phdro[1].p_paddr = brka;
-    phdro[1].p_filesz = 0;
-    phdro[1].p_memsz =  0;
-
-    patchLoaderChecksum();
-    fo->seek(0, SEEK_SET);
-    fo->rewrite(loader, 0x80);
-#undef PAGE_MASK
+    generateElfHdr(fo, stub_i386_linux_elf_shell_fold, 0x08048000);
 }

+void
+PackLinuxI386sh::pack3(OutputFile *fo, Filter &ft)
+{
+    super::pack3(fo,ft);
+    elfout.phdr[0].p_filesz = fo->getBytesWritten();
+}

 /*
 vi:ts=4:et
@@ -2,9 +2,9 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -22,11 +22,11 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>

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


@@ -44,26 +44,25 @@ class PackLinuxI386sh : public PackLinuxI386
 public:
    PackLinuxI386sh(InputFile *f);
    virtual ~PackLinuxI386sh();
-    virtual int getVersion() const { return 11; }
+    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_LINUX_SH_i386; }
    virtual const char *getName() const { return "linux/sh386"; }
    virtual const int *getFilters() const { return NULL; }
+    virtual void buildLoader(const Filter *);
+
+    virtual void pack1(OutputFile *fo, Filter &ft);
+    virtual void pack3(OutputFile *fo, Filter &ft);

    virtual bool canPack();
-    virtual void pack(OutputFile *fo);
    // virtual void unpack(OutputFile *fo) { super::unpack(fo); }
    virtual bool canUnpackVersion(int version) const
        { return (version >= 11); }

 protected:
-    virtual const upx_byte *getLoader() const;
-    virtual int getLoaderSize() const;
    virtual bool getShellName(char *buf);

    virtual void patchLoader();

-    Elf_LE32_Ehdr *ehdri; // from input file
-
    int o_shname;  // offset to name_of_shell
    int l_shname;  // length of name_of_shell
 };
@@ -0,0 +1,467 @@
+/* p_mach.cpp -- pack Mach Object executable
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 2004-2006 John 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 Reiser
+   jreiser@users.sourceforge.net
+ */
+
+
+#include "conf.h"
+
+#include "file.h"
+#include "filter.h"
+#include "linker.h"
+#include "packer.h"
+#include "p_mach.h"
+#include "ui.h"
+
+static const
+#include "stub/powerpc-darwin.macho-entry.h"
+static const
+#include "stub/powerpc-darwin.macho-fold.h"
+
+PackMachPPC32::PackMachPPC32(InputFile *f) :
+    super(f), n_segment(0), rawmseg(0), msegcmd(0)
+{
+}
+
+PackMachPPC32::~PackMachPPC32()
+{
+    delete [] msegcmd;
+    delete [] rawmseg;
+}
+
+const int *PackMachPPC32::getCompressionMethods(int /*method*/, int /*level*/) const
+{
+    // There really is no LE bias in M_NRV2E_LE32.
+    static const int m_nrv2e[] = { M_NRV2E_LE32, -1 };
+    return m_nrv2e;
+}
+
+
+const int *PackMachPPC32::getFilters() const
+{
+    static const int filters[] = { 0xd0, -1 };
+    return filters;
+}
+
+Linker *PackMachPPC32::newLinker() const
+{
+    return new ElfLinkerPpc32;
+}
+
+void
+PackMachPPC32::addStubEntrySections(Filter const *)
+{
+    addLoader("MACOS000", NULL);
+   //addLoader(getDecompressorSections(), NULL);
+    addLoader(
+        ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL"
+        : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL"
+        : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL"
+        : M_IS_LZMA(ph.method)  ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30"
+        : NULL), NULL);
+    addLoader("ELFMAINY,IDENTSTR,+40,ELFMAINZ,FOLDEXEC", NULL);
+}
+
+
+void PackMachPPC32::defineSymbols(Filter const *)
+{
+    // empty
+}
+
+
+void
+PackMachPPC32::buildMachLoader(
+    upx_byte const *const proto,
+    unsigned        const szproto,
+    upx_byte const *const fold,
+    unsigned        const szfold,
+    Filter const *ft
+)
+{
+    initLoader(proto, szproto);
+
+    struct b_info h; memset(&h, 0, sizeof(h));
+    unsigned fold_hdrlen = 0;
+  if (0 < szfold) {
+    h.sz_unc = (szfold < fold_hdrlen) ? 0 : (szfold - fold_hdrlen);
+    h.b_method = (unsigned char) ph.method;
+    h.b_ftid = (unsigned char) ph.filter;
+    h.b_cto8 = (unsigned char) ph.filter_cto;
+  }
+    unsigned char const *const uncLoader = fold_hdrlen + fold;
+
+    unsigned char *const cprLoader = new unsigned char[sizeof(h) + h.sz_unc];
+  if (0 < szfold) {
+    unsigned sz_cpr = 0;
+    int r = upx_compress(uncLoader, h.sz_unc, sizeof(h) + cprLoader, &sz_cpr,
+        NULL, ph.method, 10, NULL, NULL );
+    h.sz_cpr = sz_cpr;
+    if (r != UPX_E_OK || h.sz_cpr >= h.sz_unc)
+        throwInternalError("loader compression failed");
+  }
+    memcpy(cprLoader, &h, sizeof(h));
+
+    // This adds the definition to the "library", to be used later.
+    linker->addSection("FOLDEXEC", cprLoader, sizeof(h) + h.sz_cpr, 0);
+    delete [] cprLoader;
+
+    int const GAP = 128;  // must match stub/l_mac_ppc.S
+    segcmdo.vmsize += h.sz_unc - h.sz_cpr + GAP + 64;
+
+    addStubEntrySections(ft);
+
+    defineSymbols(ft);
+    relocateLoader();
+}
+
+void
+PackMachPPC32::buildLoader(const Filter *ft)
+{
+    buildMachLoader(
+        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()
+{
+    unsigned char *const ptr = getLoader();
+    l_info *const lp = &linfo;
+    // checksum for loader; also some PackHeader info
+    lp->l_checksum = 0;
+    lp->l_magic = UPX_MAGIC_LE32;  // LE32 always
+    lp->l_lsize = (unsigned short) lsize;
+    lp->l_version = (unsigned char) ph.version;
+    lp->l_format  = (unsigned char) ph.format;
+    // INFO: lp->l_checksum is currently unused
+    lp->l_checksum = upx_adler32(ptr, lsize);
+}
+
+static int __acc_cdecl_qsort
+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;
+    unsigned const xa = a->cmd - Mach_segment_command::LC_SEGMENT;
+    unsigned const xb = b->cmd - Mach_segment_command::LC_SEGMENT;
+           if (xa < xb)        return -1;  // LC_SEGMENT first
+           if (xa > xb)        return  1;
+    if (a->vmaddr < b->vmaddr) return -1;  // ascending by .vmaddr
+    if (a->vmaddr > b->vmaddr) return  1;
+                               return  0;
+}
+
+void
+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);
+
+    super::pack4(fo, ft);
+    segcmdo.filesize = fo->getBytesWritten();
+    segcmdo.vmsize += segcmdo.filesize;
+    fo->seek(sizeof(mhdro), SEEK_SET);
+    fo->write(&segcmdo, sizeof(segcmdo));
+    fo->write(&threado, sizeof(threado));
+    fo->write(&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& -len);
+    len += (3& -len) + sizeof(disp);
+    set_be32(&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);
+}
+
+// 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(
+    unsigned const k
+)
+{
+    if (Mach_segment_command::LC_SEGMENT!=msegcmd[k].cmd
+    ||  0==msegcmd[k].filesize ) {
+        return 0;
+    }
+    unsigned const hi = get_native32(&msegcmd[k].fileoff) +
+                        get_native32(&msegcmd[k].filesize);
+    unsigned lo = ph.u_file_size;
+    unsigned j = k;
+    for (;;) { // circular search, optimize for adjacent ascending
+        ++j;
+        if (n_segment==j) {
+            j = 0;
+        }
+        if (k==j) {
+            break;
+        }
+        if (Mach_segment_command::LC_SEGMENT==msegcmd[j].cmd
+        &&  0!=msegcmd[j].filesize ) {
+            unsigned const t = get_native32(&msegcmd[j].fileoff);
+            if ((t - hi) < (lo - hi)) {
+                lo = t;
+                if (hi==lo) {
+                    break;
+                }
+            }
+        }
+    }
+    return lo - hi;
+}
+
+void
+PackMachPPC32::pack2(OutputFile *fo, Filter &ft)  // append compressed body
+{
+    Extent x;
+    unsigned k;
+
+    // count passes, set ptload vars
+    uip->ui_total_passes = 0;
+    for (k = 0; k < n_segment; ++k) {
+        if (Mach_segment_command::LC_SEGMENT==msegcmd[k].cmd
+        &&  0!=msegcmd[k].filesize ) {
+            uip->ui_total_passes++;
+            if (find_SEGMENT_gap(k)) {
+                uip->ui_total_passes++;
+            }
+        }
+    }
+
+    // compress extents
+    unsigned total_in = 0;
+    unsigned total_out = 0;
+
+    unsigned hdr_u_len = mhdri.sizeofcmds;
+
+    uip->ui_pass = 0;
+    ft.addvalue = 0;
+
+    int nx = 0;
+    for (k = 0; k < n_segment; ++k)
+    if (Mach_segment_command::LC_SEGMENT==msegcmd[k].cmd
+    &&  0!=msegcmd[k].filesize ) {
+        x.offset = msegcmd[k].fileoff;
+        x.size   = msegcmd[k].filesize;
+        if (0 == nx) { // 1st LC_SEGMENT must cover Mach_header at 0==fileoffset
+            unsigned const delta = mhdri.sizeofcmds;
+            x.offset    += delta;
+            x.size      -= delta;
+        }
+        packExtent(x, total_in, total_out,
+            ((Mach_segment_command::VM_PROT_EXECUTE & msegcmd[k].initprot)
+                ? &ft : 0 ), fo, hdr_u_len );
+        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) +
+                       get_native32(&msegcmd[k].filesize);
+            packExtent(x, total_in, total_out, 0, fo);
+        }
+    }
+
+    if ((off_t)total_in != file_size)
+        throwEOFException();
+    segcmdo.filesize = fo->getBytesWritten();
+}
+
+#undef PAGE_MASK
+#undef PAGE_SIZE
+#define PAGE_MASK (~0u<<12)
+#define PAGE_SIZE -PAGE_MASK
+void
+PackMachPPC32::pack1(OutputFile *fo, Filter &/*ft*/)  // generate executable header
+{
+    mhdro = mhdri;
+    mhdro.ncmds = 2;
+    mhdro.sizeofcmds = sizeof(segcmdo) + sizeof(threado);
+    mhdro.flags = Mach_header::MH_NOUNDEFS;
+    fo->write(&mhdro, sizeof(mhdro));
+
+    segcmdo.cmd = Mach_segment_command::LC_SEGMENT;
+    segcmdo.cmdsize = sizeof(segcmdo);
+    strncpy((char *)&segcmdo.segname, "__TEXT", sizeof(segcmdo.segname));
+    segcmdo.vmaddr = PAGE_MASK & (~PAGE_MASK +
+        msegcmd[n_segment -1].vmsize + msegcmd[n_segment -1].vmaddr );
+    segcmdo.vmsize = 0;    // adjust later
+    segcmdo.fileoff = 0;
+    segcmdo.filesize = 0;  // adjust later
+    segcmdo.initprot = segcmdo.maxprot =
+        Mach_segment_command::VM_PROT_READ |
+        Mach_segment_command::VM_PROT_WRITE |
+        Mach_segment_command::VM_PROT_EXECUTE;
+    segcmdo.nsects = 0;
+    segcmdo.flags = 0;
+    fo->write(&segcmdo, sizeof(segcmdo));
+
+    threado.cmd = Mach_segment_command::LC_UNIXTHREAD;
+    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));
+    fo->write(&linfo, sizeof(linfo));
+
+    return;
+}
+
+void
+PackMachPPC32::unpack(OutputFile *fo)
+{
+    fi->seek(overlay_offset, SEEK_SET);
+    p_info hbuf;
+    fi->readx(&hbuf, sizeof(hbuf));
+    unsigned orig_file_size = get_native32(&hbuf.p_filesize);
+    blocksize = get_native32(&hbuf.p_blocksize);
+    if (file_size > (off_t)orig_file_size || blocksize > orig_file_size)
+        throwCantUnpack("file header corrupted");
+
+    ibuf.alloc(blocksize + OVERHEAD);
+    b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));
+    fi->readx(&bhdr, sizeof(bhdr));
+    ph.u_len = get_native32(&bhdr.sz_unc);
+    ph.c_len = get_native32(&bhdr.sz_cpr);
+    ph.filter_cto = bhdr.b_cto8;
+
+    // Uncompress Macho headers
+    fi->readx(ibuf, ph.c_len);
+    Mach_header *const mhdr = (Mach_header *)new upx_byte[ph.u_len];
+    decompress(ibuf, (upx_byte *)mhdr, false);
+    unsigned const ncmds = mhdr->ncmds;
+
+    msegcmd = new Mach_segment_command[ncmds];
+    unsigned char *ptr = (unsigned char *)(1+mhdr);
+    for (unsigned j= 0; j < ncmds; ++j) {
+        msegcmd[j] = *(Mach_segment_command *)ptr;
+        ptr += (unsigned) ((Mach_segment_command *)ptr)->cmdsize;
+    }
+
+    // Put LC_SEGMENT together at the beginning, ascending by .vmaddr.
+    qsort(msegcmd, ncmds, sizeof(*msegcmd), compare_segment_command);
+    n_segment = 0;
+    for (unsigned j= 0; j < ncmds; ++j) {
+        n_segment += (Mach_segment_command::LC_SEGMENT==msegcmd[j].cmd);
+    }
+
+    unsigned total_in = 0;
+    unsigned total_out = 0;
+    unsigned c_adler = upx_adler32(NULL, 0);
+    unsigned u_adler = upx_adler32(NULL, 0);
+    Mach_segment_command const *sc = (Mach_segment_command const *)(1+ mhdr);
+    unsigned k;
+
+    fi->seek(- (off_t)(sizeof(bhdr) + ph.c_len), SEEK_CUR);
+    for (
+        k = 0;
+        k < ncmds;
+        (++k), (sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc))
+    ) {
+        if (Mach_segment_command::LC_SEGMENT==sc->cmd
+        &&  0!=sc->filesize ) {
+            unsigned filesize = get_be32(&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) +
+                                   get_native32(&msegcmd[k].filesize);
+            if (fo)
+                fo->seek(where, SEEK_SET);
+            unpackExtent(size, fo, total_in, total_out,
+                c_adler, u_adler, false, sizeof(bhdr));
+        }
+    }
+}
+
+
+bool
+PackMachPPC32::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
+    ||  Mach_header::MH_EXECUTE       !=mhdri.filetype
+    )
+        return false;
+
+    rawmseg = (Mach_segment_command *)new char[mhdri.sizeofcmds];
+    fi->readx(rawmseg, mhdri.sizeofcmds);
+
+    msegcmd = new Mach_segment_command[mhdri.ncmds];
+    unsigned char *ptr = (unsigned char *)rawmseg;
+    for (unsigned j= 0; j < mhdri.ncmds; ++j) {
+        msegcmd[j] = *(Mach_segment_command *)ptr;
+        ptr += (unsigned) ((Mach_segment_command *)ptr)->cmdsize;
+    }
+
+
+    // Put LC_SEGMENT together at the beginning, ascending by .vmaddr.
+    qsort(msegcmd, mhdri.ncmds, sizeof(*msegcmd), compare_segment_command);
+
+    // Check that LC_SEGMENTs form one contiguous chunk of the file.
+    for (unsigned j= 0; j < mhdri.ncmds; ++j) {
+        if (Mach_segment_command::LC_SEGMENT==msegcmd[j].cmd) {
+            if (0xfff & (msegcmd[j].fileoff | msegcmd[j].vmaddr)) {
+                return false;
+            }
+            if (0 < j) {
+                unsigned const sz = ~0xfff
+                                  & (0xfff + msegcmd[j-1].filesize);
+                if ((sz + msegcmd[j-1].fileoff)!=msegcmd[j].fileoff) {
+                    return false;
+                }
+            }
+            ++n_segment;
+            sz_segment = msegcmd[j].filesize + msegcmd[j].fileoff - msegcmd[0].fileoff;
+        }
+    }
+    // set options
+    opt->o_unix.blocksize = file_size;
+    return 0 < n_segment;
+}
+
+/*
+vi:ts=4:et
+*/
@@ -0,0 +1,217 @@
+/* p_mach.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
+ */
+
+
+#ifndef __UPX_P_MACHO_H
+#define __UPX_P_MACHO_H
+
+/*************************************************************************
+// Mach  Mach Object executable
+**************************************************************************/
+
+struct Mach_header {
+    BE32 magic;
+        enum {
+            MH_MAGIC = 0xfeedface
+        };
+    BE32 cputype;
+        enum {
+            CPU_TYPE_POWERPC = 18
+        };
+    BE32 cpysubtype;
+    BE32 filetype;
+        enum {
+            MH_EXECUTE = 2
+        };
+    BE32 ncmds;
+    BE32 sizeofcmds;
+    BE32 flags;
+        enum {
+            MH_NOUNDEFS = 1
+        };
+}
+__attribute_packed;
+
+struct Mach_segment_command {
+    BE32 cmd;
+        enum {
+            LC_SEGMENT       = 0x1,
+            LC_THREAD        = 0x4,
+            LC_UNIXTHREAD    = 0x5,
+            LC_LOAD_DYLINKER = 0xe
+        };
+    BE32 cmdsize;
+    char segname[16];
+    BE32 vmaddr;
+    BE32 vmsize;
+    BE32 fileoff;
+    BE32 filesize;
+    BE32 maxprot;
+        enum {
+            VM_PROT_READ = 1,
+            VM_PROT_WRITE = 2,
+            VM_PROT_EXECUTE = 4
+        };
+    BE32 initprot;
+    BE32 nsects;
+    BE32 flags;
+}
+__attribute_packed;
+
+struct Mach_section {
+    char sectname[16];
+    char segname[16];
+    BE32 addr;   /* memory address */
+    BE32 size;   /* size in bytes */
+    BE32 offset; /* file offset */
+    BE32 align;  /* power of 2 */
+    BE32 reloff; /* file offset of relocation entries */
+    BE32 nreloc; /* number of relocation entries */
+    BE32 flags;  /* section type and attributes */
+        enum {
+            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
+        };
+    BE32 reserved1;
+    BE32 reserved2;
+
+}
+__attribute_packed;
+
+struct Mach_ppc_thread_state {
+    BE32 srr0;      /* Instruction address register (PC; entry addr) */
+    BE32 srr1;      /* Machine state register (supervisor) */
+    BE32  r0, r1, r2, r3, r4, r5, r6, r7;
+    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 */
+    BE32 xer;       /* User's integer exception register */
+    BE32 lr;        /* Link register */
+    BE32 ctr;       /* Count register */
+    BE32 mq;        /* MQ register (601 only) */
+
+    BE32 vrsave;    /* Vector Save Register */
+};
+
+struct Mach_thread_command {
+    BE32 cmd;            /* LC_THREAD or  LC_UNIXTHREAD */
+    BE32 cmdsize;        /* total size of this command */
+    BE32 flavor;
+        enum {
+            PPC_THREAD_STATE = 1
+        };
+    BE32 count;          /* sizeof(following_thread_state)/4 */
+        enum {
+            PPC_THREAD_STATE_COUNT = sizeof(struct Mach_ppc_thread_state)/4
+        };
+    struct Mach_ppc_thread_state state;
+}
+__attribute_packed;
+
+
+#include "p_unix.h"
+
+
+class PackMachPPC32 : public PackUnixBe32
+{
+    typedef PackUnixBe32 super;
+public:
+    PackMachPPC32(InputFile *f);
+    virtual ~PackMachPPC32();
+    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 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 pack4(OutputFile *, Filter &);  // append PackHeader
+
+    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 *);
+    virtual void buildMachLoader(
+        upx_byte const *const proto,
+        unsigned        const szproto,
+        upx_byte const *const fold,
+        unsigned        const szfold,
+        Filter const *ft );
+    virtual void defineSymbols(Filter const *);
+    virtual void addStubEntrySections(Filter const *);
+
+    unsigned  n_segment;
+    unsigned sz_segment;
+    unsigned sz_mach_headers;
+    Mach_segment_command *rawmseg;  // as input, with sections
+    Mach_segment_command *msegcmd;  // LC_SEGMENT first, without sections
+    Mach_header mhdri;
+
+    Mach_header mhdro;
+    Mach_segment_command segcmdo;
+    Mach_thread_command threado;
+    struct l_info linfo;
+};
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
+
@@ -0,0 +1,726 @@
+/* p_ps1.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2002-2006 Jens Medoch
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   Jens Medoch
+   <jssg@users.sourceforge.net>
+ */
+
+
+#include "conf.h"
+#include "file.h"
+#include "filter.h"
+#include "packer.h"
+#include "p_ps1.h"
+#include "linker.h"
+
+static const
+#include "stub/mipsel.r3000-ps1.h"
+
+#define CD_SEC          2048
+#define PS_HDR_SIZE     CD_SEC
+#define PS_RAM_SIZE     ram_size
+#define PS_MIN_SIZE     (PS_HDR_SIZE*3)
+#define PS_MAX_SIZE     ((PS_RAM_SIZE*95) / 100)
+#define PS_STACK_SIZE   (PS_RAM_SIZE / 256)
+
+#define SZ_IH_BKUP      (10 * sizeof(LE32))
+#define HD_CODE_OFS     (sizeof(ps1_exe_t) + sz_cbh)
+
+#define K0_BS           (0x80000000)
+#define K1_BS           (0xa0000000)
+#define EXE_BS          (ih.epc & K0_BS)
+#define FIX_PSVR        (K1_BS - EXE_BS) + (PS_HDR_SIZE - HD_CODE_OFS)
+
+// lui / addiu
+#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)
+
+
+/*************************************************************************
+// ps1 exe looks like this:
+// 1. <header>  2048 bytes
+// 2. <body>    plain binary
+//
+// header:  contains the ps1_exe_t structure 188 bytes at offset zero
+//          rest is filled with zeros to reach the required
+//          cd mode 2 data sector size of 2048 bytes
+// body:    contains the binary data / code of the executable
+//          reqiures: executable code must be aligned to 4
+//                    must be aligned to 2048 to run from a CD
+//          optional: not aligned to 2048 (for console run only)
+**************************************************************************/
+
+PackPs1::PackPs1(InputFile *f) :
+    super(f),
+    isCon(!opt->ps1_exe.boot_only), is32Bit(!opt->ps1_exe.do_8bit),
+    buildPart2(0), foundBss(0), sa_cnt(0), overlap(0), sz_lunc(0), sz_lcpr(0),
+    pad_code(0), bss_start(0), bss_end(0)
+{
+    bele = &N_BELE_RTP::le_policy;
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_t) == 136);
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_hb_t) == 44);
+    COMPILE_TIME_ASSERT(sizeof(ps1_exe_chb_t) == 5);
+
+    COMPILE_TIME_ASSERT(PS_HDR_SIZE > sizeof(ps1_exe_t));
+    COMPILE_TIME_ASSERT(SZ_IH_BKUP == 40);
+#if 0 // 1 || defined(WITH_NRV)
+    COMPILE_TIME_ASSERT(sizeof(nrv_loader) == 14812);
+    COMPILE_TIME_ASSERT(NRV_BOOT_LOADER_CRC32 == 0x0);
+#endif
+    fdata_size = file_size - PS_HDR_SIZE;
+    ram_size = !opt->ps1_exe.do_8mb ? 0x200000 : 0x800000;
+}
+
+const int *PackPs1::getCompressionMethods(int method, int level) const
+{
+    if (is32Bit)
+        return Packer::getDefaultCompressionMethods_le32(method, level);
+    else
+        return Packer::getDefaultCompressionMethods_8(method, level);
+}
+
+const int *PackPs1::getFilters() const
+{
+    return NULL;
+}
+
+Linker* PackPs1::newLinker() const
+{
+    return new ElfLinkerMipsLE;
+}
+
+
+/*************************************************************************
+// util
+//   readFileHeader() reads ih and checks for illegal values
+//   checkFileHeader() checks ih for legal but unsupported values
+**************************************************************************/
+
+int PackPs1::readFileHeader()
+{
+    fi->seek(0, SEEK_SET);
+    fi->readx(&ih, sizeof(ih));
+    if (memcmp(&ih.id, "PS-X EXE", 8) != 0 &&
+        memcmp(&ih.id, "EXE X-SP", 8) != 0)
+        return 0;
+    if (ih.text != 0 || ih.data != 0)
+        return 0;
+    return UPX_F_PS1_EXE;
+}
+
+bool PackPs1::readBkupHeader()
+{
+    fi->seek(sizeof(ps1_exe_t)+8, SEEK_SET);
+    fi->readx(&bh, sizeof(bh));
+
+    if (bh.ih_csum != upx_adler32(&bh, SZ_IH_BKUP))
+    {
+        unsigned char buf[sizeof(bh)];
+        fi->seek(sizeof(ps1_exe_t), SEEK_SET);
+        fi->readx(buf, sizeof(bh));
+        if (!getBkupHeader(buf, (unsigned char *)&bh))
+            return false;
+    }
+    return true;
+}
+
+#define INIT_BH_BKUP(p, l)  {(p)->id = '1'; (p)->len = l;}
+#define ADLER16(a)          ((a) >> 16 ^ ((a) & 0xffff))
+
+void PackPs1::putBkupHeader(const unsigned char *src, unsigned char *dst, unsigned *len)
+{
+    unsigned sz_cbh = MemBuffer::getSizeForCompression(SZ_IH_BKUP);
+
+    if (src && dst)
+    {
+        unsigned char *cpr_bh = new unsigned char[sz_cbh];
+
+        memset(cpr_bh, 0, sizeof(bh));
+        ps1_exe_chb_t * p = (ps1_exe_chb_t * )cpr_bh;
+
+        int r = upx_compress(src, SZ_IH_BKUP,
+                             &p->ih_bkup, &sz_cbh, NULL, M_NRV2E_8, 10, NULL, NULL );
+        if (r != UPX_E_OK || sz_cbh >= SZ_IH_BKUP)
+            throwInternalError("header compression failed");
+        INIT_BH_BKUP(p, sz_cbh);
+        *len = ALIGN_UP(sz_cbh + sizeof(ps1_exe_chb_t) - 1, 4);
+        p->ih_csum = ADLER16(upx_adler32(&ih.epc, SZ_IH_BKUP));
+        memcpy(dst, cpr_bh, SZ_IH_BKUP);
+        delete [] cpr_bh;
+    }
+    else
+        throwInternalError("header compression failed");
+}
+
+#define ADLER16_HI(a, b)    ((((a) & 0xffff) ^ (b)) << 16)
+#define ADLER16_LO(a, b)    (((a) >> 16) ^ (b))
+#define RE_ADLER16(a, b)    (ADLER16_HI(a,b) | ADLER16_LO(a,b))
+
+bool PackPs1::getBkupHeader(unsigned char *p, unsigned char *dst)
+{
+    ps1_exe_chb_t *src = (ps1_exe_chb_t*)p;
+
+    if (src && (src->id == '1' && src->len < SZ_IH_BKUP) && dst)
+    {
+        unsigned char *unc_bh = new unsigned char[MemBuffer::getSizeForUncompression(SZ_IH_BKUP)];
+
+        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_OK || sz_bh != SZ_IH_BKUP)
+            throwInternalError("header decompression failed");
+        unsigned ad = upx_adler32(unc_bh, SZ_IH_BKUP);
+        unsigned ch = src->ih_csum;
+        if (ad != RE_ADLER16(ad,ch))
+            throwInternalError("backup header damaged");
+        memcpy(dst, unc_bh, SZ_IH_BKUP);
+        delete [] unc_bh;
+    }
+    else
+        return false;
+    return true;
+}
+
+bool PackPs1::checkFileHeader()
+{
+    if (fdata_size != ih.tx_len || (ih.tx_len & 3))
+    {
+        if (!opt->force)
+            throwCantPack("file size entry damaged (try --force)");
+        else
+        {
+            opt->info_mode += !opt->info_mode ? 1 : 0;
+            infoWarning("fixing damaged header, keeping backup file");
+            opt->backup = 1;
+            ih.tx_len = fdata_size;
+        }
+    }
+    if (!opt->force &&
+       (ih.da_ptr != 0 || ih.da_len != 0 ||
+        ih.bs_ptr != 0 || ih.bs_len != 0))
+    {
+        infoWarning("unsupported header field entry");
+        return false;
+    }
+    if (ih.is_ptr < (EXE_BS | (PS_RAM_SIZE - PS_STACK_SIZE)))
+    {
+        if (!opt->force)
+            return false;
+        else
+            infoWarning("%s: stack pointer offset low", fi->getName());
+    }
+    return true;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+bool PackPs1::canPack()
+{
+    unsigned char buf[PS_HDR_SIZE - sizeof(ps1_exe_t)];
+
+    if (!readFileHeader())
+        return false;
+
+    fi->readx(buf, sizeof(buf));
+    checkAlreadyPacked(buf, sizeof(buf));
+
+    for (unsigned i = 0; i < sizeof(buf); i++)
+        if (buf[i] != 0)
+            if (!opt->force)
+                throwCantPack("unknown data in header (try --force)");
+            else
+            {
+                opt->info_mode += !opt->info_mode ? 1 : 0;
+                infoWarning("clearing header, keeping backup file");
+                opt->backup = 1;
+                break;
+            }
+    if (!checkFileHeader())
+        throwCantPack("unsupported header flags (try --force)");
+    if (!opt->force && file_size < PS_MIN_SIZE)
+        throwCantPack("file is too small (try --force)");
+    if (!opt->force && file_size > (off_t) PS_MAX_SIZE)
+        throwCantPack("file is too big (try --force)");
+    return true;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void PackPs1::buildLoader(const Filter *)
+{
+    const char *method = NULL;
+
+    if (ph.method == M_NRV2B_8)
+        method = isCon ? "nrv2b.small,8bit.sub,nrv.done" :
+                    "nrv2b.8bit,nrv.done";
+    else if (ph.method == M_NRV2D_8)
+        method = isCon ? "nrv2d.small,8bit.sub,nrv.done" :
+                    "nrv2d.8bit,nrv.done";
+    else if (ph.method == M_NRV2E_8)
+        method = isCon ? "nrv2e.small,8bit.sub,nrv.done" :
+                    "nrv2e.8bit,nrv.done";
+    else if (ph.method == M_NRV2B_LE32)
+        method = isCon ? "nrv2b.small,32bit.sub,nrv.done" :
+                    "nrv2b.32bit,nrv.done";
+    else if (ph.method == M_NRV2D_LE32)
+        method = isCon ? "nrv2d.small,32bit.sub,nrv.done" :
+                    "nrv2d.32bit,nrv.done";
+    else if (ph.method == M_NRV2E_LE32)
+        method = isCon ? "nrv2e.small,32bit.sub,nrv.done" :
+                    "nrv2e.32bit,nrv.done";
+    else if (ph.method == M_LZMA)
+        method = "nrv2b.small,8bit.sub,nrv.done,lzma.prep";
+    else
+        throwInternalError("unknown compression method");
+
+    unsigned sa_tmp = sa_cnt;
+    if (ph.overlap_overhead > sa_cnt)
+    {
+        if (!opt->force)
+        {
+            infoWarning("not in-place decompressible");
+            throwCantPack("packed data overlap (try --force)");
+        }
+        else
+            sa_tmp += overlap = ALIGN_UP((ph.overlap_overhead - sa_tmp),4);
+    }
+
+    foundBss = findBssSection();
+
+    if (ph.method == M_LZMA && !buildPart2)
+    {
+        initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1));
+        addLoader("decompressor.start",
+                  isCon ? "LZMA_DEC20" : "LZMA_DEC10", "lzma.init", NULL);
+        addLoader(sa_tmp > (0x10000 << 2) ? "memset.long" : "memset.short",
+                  !foundBss ? "con.exit" : "bss.exit", NULL);
+    }
+    else
+    {
+        if (ph.method == M_LZMA && buildPart2)
+        {
+            sz_lcpr = MemBuffer::getSizeForCompression(sz_lunc);
+            unsigned char *cprLoader = new unsigned char[sz_lcpr];
+            int r = upx_compress(getLoader(), sz_lunc, cprLoader, &sz_lcpr,
+                                 NULL, M_NRV2B_8, 10, NULL, NULL );
+            if (r != UPX_E_OK || sz_lcpr >= sz_lunc)
+                throwInternalError("loader compression failed");
+            initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1),
+                      (ph.method != M_LZMA || isCon) ? 0 : 1);
+            linker->addSection("lzma.exec", cprLoader, sz_lcpr, 0);
+            delete [] cprLoader;
+        }
+        else
+            initLoader(stub_mipsel_r3000_ps1, sizeof(stub_mipsel_r3000_ps1));
+
+        pad_code = ALIGN_GAP((ph.c_len + (isCon ? sz_lcpr : 0)), 4);
+        assert(pad_code < 4);
+        static const unsigned char pad_buffer[4] = { 0, 0, 0, 0 };
+        linker->addSection("pad.code", pad_buffer, pad_code, 0);
+
+        if (isCon)
+        {
+            if (ph.method == M_LZMA)
+                addLoader(!foundBss ? "con.start" : "bss.con.start",
+                          method,
+                          ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
+                          "con.entry", "pad.code", "lzma.exec", NULL);
+            else
+                addLoader(!foundBss ? "con.start" : "bss.con.start", "con.mcpy",
+                          ph.c_len & 3 ? "con.padcd" : "",
+                          ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
+                          "con.entry", method,
+                          sa_cnt ? sa_cnt > (0x10000 << 2) ? "memset.long" : "memset.short" : "",
+                          !foundBss ? "con.exit" : "bss.exit",
+                          "pad.code", NULL);
+        }
+        else
+        {
+            if (ph.method == M_LZMA)
+                addLoader("cdb.start.lzma", "pad.code", "cdb.entry.lzma", method, "cdb.lzma.cpr",
+                          ih.tx_ptr & 0xffff ?  "dec.ptr" : "dec.ptr.hi",
+                          "lzma.exec", NULL);
+            else
+                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",
+                          "pad.code", NULL);
+        }
+        addLoader("UPX1HEAD", "IDENTSTR", NULL);
+    }
+}
+
+#define OPTYPE(x)     (((x) >> 13) & 0x7)
+#define OPCODE(x)     (((x) >> 10) & 0x7)
+#define REG1(x)       (((x) >> 5) & 0x1f)
+#define REG2(x)       ((x) & 0x1f)
+
+#define MIPS_IMM(a,b) (((a) - (((b) & 0x8000) >> 15) << 16) | (b))
+
+// Type
+#define REGIMM  1
+#define STORE   5
+// Op
+#define LUI     7
+#define ADDIU   1
+#define SW      3
+
+#define IS_LUI(a)     ((OPTYPE(a) == REGIMM && OPCODE(a) == LUI))
+#define IS_ADDIU(a)   ((OPTYPE(a) == REGIMM && OPCODE(a) == ADDIU))
+#define IS_SW_ZERO(a) ((OPTYPE(a) == STORE && OPCODE(a) == SW) && REG2(a) == 0)
+
+#define BSS_CHK_LIMIT (18)
+
+bool PackPs1::findBssSection()
+{
+    unsigned char reg;
+    LE32 *p1 = (LE32 *)(ibuf + (ih.epc - ih.tx_ptr));
+
+    if ((ih.epc - ih.tx_ptr + (BSS_CHK_LIMIT * 4)) > fdata_size)
+        return false;
+
+    // check 18 opcodes for sw zero,0(x)
+    for (signed i = BSS_CHK_LIMIT; i >= 0; i--)
+    {
+        unsigned short op = p1[i] >> 16;
+        if (IS_SW_ZERO(op))
+        {
+            // found! get reg (x) for bss_start
+            reg = REG1(op);
+            for (; i >= 0; i--)
+            {
+                bss_nfo *p = (bss_nfo *)&p1[i];
+                unsigned short op1 = p->op1, op2 = p->op2;
+
+                // check for la (x),bss_start
+                if ((IS_LUI(op1) && REG2(op1) == reg) &&
+                    (IS_ADDIU(op2) && REG1(op2) == reg))
+                {
+                    op1 = p->op3, op2 = p->op4;
+
+                    // check for la (y),bss_end
+                    if (IS_LUI(op1) && IS_ADDIU(op2))
+                    {
+                        // bss section info found!
+                        bss_start = MIPS_IMM(p->hi1, p->lo1);
+                        bss_end = MIPS_IMM(p->hi2, p->lo2);
+
+                        if (0 < ALIGN_DOWN(bss_end - bss_start, 4) )
+                        {
+                            unsigned wkmem_sz = (ph.method == M_LZMA) ? 32768 : 800;
+                            unsigned end_offs = ih.tx_ptr + fdata_size + overlap;
+                            if (bss_end > (end_offs + wkmem_sz))
+                                return (isCon || (!isCon && (ph.method == M_LZMA)));
+                            else
+                                return false;
+                        }
+                    }
+                    else
+                        return false;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void PackPs1::pack(OutputFile *fo)
+{
+    ibuf.alloc(fdata_size);
+    obuf.allocForCompression(fdata_size);
+    const upx_byte *p_scan = ibuf + fdata_size;
+
+    // read file
+    fi->seek(PS_HDR_SIZE,SEEK_SET);
+    fi->readx(ibuf,fdata_size);
+
+    // scan EOF for 2048 bytes sector alignment
+    // the removed space will secure in-place decompression
+    while (!(*--p_scan)) { if (sa_cnt++ > (0x10000 << 5) || sa_cnt >= fdata_size - 1024) break; }
+
+    if (sa_cnt > (0x10000 << 2))
+        sa_cnt = ALIGN_DOWN(sa_cnt,32);
+    else
+        sa_cnt = ALIGN_DOWN(sa_cnt,4);
+
+    // prepare packheader
+    ph.u_len = (fdata_size - sa_cnt);
+    ph.filter = 0;
+    Filter ft(ph.level);
+
+    // 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
+    compressWithFilters(&ft, sa_cnt, 0, NULL, &cconf);
+
+    if (overlap)
+    {
+        opt->info_mode += !opt->info_mode ? 1 : 0;
+        infoWarning("overlap - relocating load address (+%d bytes)", overlap);
+        sa_cnt += overlap;
+    }
+
+/*
+    if (bss_start && bss_end && !foundBss)
+        infoWarning("%s: .bss section too small - use stack", fi->getName());
+*/
+
+    unsigned lzma_init = 0;
+
+    if (ph.method == M_LZMA)
+    {
+        sz_lunc = getLoaderSize();
+
+        lzma_init = 0u - (sz_lunc - linker->getSymbolOffset("lzma.init"));
+        defineDecompressorSymbols();
+        linker->defineSymbol("entry", ih.epc);
+        linker->defineSymbol("SC",
+                             sa_cnt > (0x10000 << 2) ? sa_cnt >> 5 : sa_cnt >> 2);
+        relocateLoader();
+
+        buildPart2 = true;
+        buildLoader(&ft);
+    }
+
+    memcpy(&oh, &ih, sizeof(ih));
+
+    unsigned sz_cbh;
+    putBkupHeader((const unsigned char *)&ih.epc, (unsigned char *)&bh, &sz_cbh);
+
+    if (ih.is_ptr < (EXE_BS | (PS_RAM_SIZE - PS_STACK_SIZE)))
+        oh.is_ptr = (EXE_BS | (PS_RAM_SIZE - 16));
+
+    if (ih.da_ptr != 0 || ih.da_len != 0 ||
+        ih.bs_ptr != 0 || ih.bs_len != 0)
+        oh.da_ptr = oh.da_len =
+        oh.bs_ptr = oh.bs_len = 0;
+
+    const int lsize = getLoaderSize();
+
+    unsigned filelen = ALIGN_UP(ih.tx_len, 4);
+
+    const unsigned decomp_data_start = ih.tx_ptr;
+    const unsigned comp_data_start = (decomp_data_start + filelen + overlap) - ph.c_len;
+
+    const int h_len = lsize - getLoaderSectionStart("UPX1HEAD");
+    int d_len = 0;
+    int e_len = 0;
+
+    if (isCon)
+    {
+        e_len = lsize - h_len;
+        d_len = e_len - getLoaderSectionStart("con.entry");
+    }
+    else
+    {
+        d_len = (lsize - h_len) - getLoaderSectionStart((ph.method == M_LZMA) ? "cdb.entry.lzma" : "cdb.entry");
+        e_len = (lsize - d_len) - h_len;
+    }
+
+    linker->defineSymbol("entry", ih.epc);
+    linker->defineSymbol("SC", MIPS_LO(sa_cnt > (0x10000 << 2) ?
+                                       sa_cnt >> 5 : sa_cnt >> 2));
+    linker->defineSymbol("DECO", decomp_data_start);
+    linker->defineSymbol("ldr_sz", (ph.method == M_LZMA ? sz_lunc + 16 : (d_len-pad_code)));
+
+    if (foundBss)
+        if (ph.method == M_LZMA)
+            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;
+    oh.epc = oh.tx_ptr = entry;
+    oh.tx_len = ph.c_len + e_len;
+
+    unsigned pad = 0;
+
+    if (!opt->ps1_exe.no_align)
+    {
+        pad = oh.tx_len;
+        oh.tx_len = ALIGN_UP(oh.tx_len, CD_SEC);
+        pad = oh.tx_len - pad;
+        oh.tx_ptr -= pad;
+    }
+
+    ibuf.clear(0,fdata_size);
+    upx_bytep paddata = ibuf;
+
+    if (ph.method == M_LZMA)
+    {
+        linker->defineSymbol("lzma_init_off", lzma_init);
+        linker->defineSymbol("gb_e", linker->getSymbolOffset("gb8_e"));
+    }
+    else
+        if (isCon)
+            linker->defineSymbol("gb_e", linker->getSymbolOffset(is32Bit ? "gb32_e" : "gb8_e"));
+
+    if (isCon)
+    {
+        linker->defineSymbol("PAD", pad_code);
+        if (ph.method == M_LZMA)
+            linker->defineSymbol("DCRT", (entry + getLoaderSectionStart("lzma.exec")));
+        else
+            linker->defineSymbol("DCRT", (entry + (e_len - d_len)));
+    }
+    else
+    {
+        linker->defineSymbol("PSVR", FIX_PSVR);
+        linker->defineSymbol("CPDO", comp_data_start);
+        if (ph.method == M_LZMA)
+            linker->defineSymbol("lzma_cpr", getLoaderSectionStart("lzma.exec")
+                                             - getLoaderSectionStart("cdb.entry.lzma"));
+    }
+
+    relocateLoader();
+    //linker->dumpSymbols();
+    MemBuffer loader(lsize);
+    assert(lsize == getLoaderSize());
+    memcpy(loader, getLoader(), lsize);
+    patchPackHeader(loader, lsize);
+
+    if (!isCon && ph.method == M_LZMA && (HD_CODE_OFS + d_len + h_len) > CD_SEC)
+        throwInternalError("lzma --boot-only loader > 2048");
+
+    // ps1_exe_t structure
+    fo->write(&oh, sizeof(oh));
+    fo->write(&bh, sz_cbh);
+    // decompressor
+    fo->write(loader + e_len, isCon ? h_len : (d_len + h_len));
+
+    // header size is 2048 bytes + sector alignment
+    fo->write(paddata, (pad + PS_HDR_SIZE) - fo->getBytesWritten());
+    // entry
+    fo->write(loader, e_len);
+    // compressed body
+    fo->write(obuf, ph.c_len);
+
+    verifyOverlappingDecompression();
+    if (!checkFinalCompressionRatio(fo))
+        throwNotCompressible();
+
+#if 0
+    printf("%-13s: uncompressed  : %8ld bytes\n", getName(), (long) ph.u_len);
+    printf("%-13s: compressed    : %8ld bytes\n", getName(), (long) ph.c_len);
+    printf("%-13s: decompressor  : %8ld bytes\n", getName(), (long) lsize - h_len - pad_code);
+    printf("%-13s: header comp   : %8ld bytes\n", getName(), (long) sz_cbh);
+    printf("%-13s: overlap       : %8ld bytes\n", getName(), (long) overlap);
+    printf("%-13s: load address  : %08X bytes\n", getName(), (unsigned int) oh.tx_ptr);
+    printf("%-13s: code entry    : %08X bytes\n", getName(), (unsigned int) oh.epc);
+    printf("%-13s: bbs start     : %08X bytes\n", getName(), (unsigned int) bss_start);
+    printf("%-13s: bbs end       : %08X bytes\n", getName(), (unsigned int) bss_end);
+    printf("%-13s: eof in mem IF : %08X bytes\n", getName(), (unsigned int) ih.tx_ptr + ih.tx_len);
+    printf("%-13s: eof in mem OF : %08X bytes\n", getName(), (unsigned int) oh.tx_ptr + oh.tx_len);
+    unsigned char i = 0;
+    if (isCon) { if (foundBss) i = 1; }
+    else { i = 2; if (ph.method == M_LZMA) { if (!foundBss) i = 3; else i = 4; } }
+    const char *loader_method[] = { "con/stack", "con/bss", "cdb", "cdb/stack", "cdb/bss" };
+    char method_name[32+1]; set_method_name(method_name, sizeof(method_name), ph.method, ph.level);
+    printf("%-13s: methods       : %s, %s\n", getName(), method_name, loader_method[i]);
+#endif
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int PackPs1::canUnpack()
+{
+    if (!readFileHeader())
+        return false;
+    if (!readPackHeader(CD_SEC))
+        return false;
+    // check header as set by packer
+    if (!readBkupHeader() || ph.c_len >= fdata_size)
+        throwCantUnpack("header damaged");
+    // generic check
+    if (!checkFileHeader())
+        throwCantUnpack("unsupported header flags");
+    return true;
+}
+
+
+/*************************************************************************
+//
+**************************************************************************/
+
+void PackPs1::unpack(OutputFile *fo)
+{
+    // restore orig exec hdr
+    memcpy(&oh, &ih, sizeof(ih));
+    memcpy(&oh.epc, &bh, SZ_IH_BKUP);
+
+    // check for removed sector alignment
+    assert(oh.tx_len >= ph.u_len);
+    const unsigned pad = oh.tx_len - ph.u_len;
+
+    ibuf.alloc(fdata_size > PS_HDR_SIZE ? fdata_size : PS_HDR_SIZE);
+    obuf.allocForUncompression(ph.u_len, pad);
+
+    fi->seek(PS_HDR_SIZE, SEEK_SET);
+    fi->readx(ibuf, fdata_size);
+
+    // decompress
+    decompress(ibuf + (fdata_size - ph.c_len), obuf);
+
+    // write decompressed file
+    if (fo)
+    {
+        // write header
+        fo->write(&oh, sizeof(oh));
+        // align the ps exe header (mode 2 sector data size)
+        ibuf.clear();
+        fo->write(ibuf, PS_HDR_SIZE - fo->getBytesWritten());
+        // write uncompressed data + pad
+        obuf.clear(ph.u_len, pad);
+        fo->write(obuf, ph.u_len + pad);
+    }
+}
+
+
+/*
+vi:ts=4:et:nowrap
+*/
@@ -0,0 +1,143 @@
+/* p_ps1.h --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2006 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2006 Laszlo Molnar
+   Copyright (C) 2002-2006 Jens Medoch
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer              Laszlo Molnar
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   Jens Medoch
+   <jssg@users.sourceforge.net>
+ */
+
+
+#ifndef __UPX_P_PS1_H
+#define __UPX_P_PS1_H
+
+
+/*************************************************************************
+// ps1/exe
+**************************************************************************/
+
+class PackPs1 : public Packer
+{
+    typedef Packer super;
+public:
+    PackPs1(InputFile *f);
+    virtual int getVersion() const { return 13; }
+    virtual int getFormat() const { return UPX_F_PS1_EXE; }
+    virtual const char *getName() const { return "ps1/exe"; }
+    virtual const int *getCompressionMethods(int method, int level) const;
+    virtual const int *getFilters() const;
+
+    virtual void pack(OutputFile *fo);
+    virtual void unpack(OutputFile *fo);
+
+    virtual bool canPack();
+    virtual int canUnpack();
+
+protected:
+    virtual void putBkupHeader(const unsigned char *src, unsigned char *dst, unsigned *len);
+    virtual bool getBkupHeader(unsigned char *src, unsigned char * dst);
+    virtual bool readBkupHeader();
+    virtual void buildLoader(const Filter *ft);
+    virtual bool findBssSection();
+    virtual Linker* newLinker() const;
+
+    virtual int readFileHeader();
+    virtual bool checkFileHeader();
+
+    struct ps1_exe_t
+    {
+        // ident string
+        char id[8];
+        // is NULL
+        LE32 text;
+        // is NULL
+        LE32 data;
+        // initial program counter
+        LE32 epc;
+        // initial gp register value
+        LE32 gp;
+        // load offset of binary data
+        LE32 tx_ptr, tx_len;
+        LE32 da_ptr, da_len;
+        LE32 bs_ptr, bs_len;
+        // initial stack params
+        LE32 is_ptr, is_len;
+        // saved regs on execution
+        LE32 sp, fp, gp0, ra, k0;
+        // origin Jap/USA/Europe
+        char origin[60];
+        // backup of the original header (epc - is_len)
+        // id & the upx header ...
+    }
+    __attribute_packed;
+
+    // for unpack
+    struct ps1_exe_hb_t
+    {
+        LE32 ih_bkup[10];
+        // plus checksum for the backup
+        LE32 ih_csum;
+    }
+    __attribute_packed;
+
+    struct ps1_exe_chb_t
+    {
+        unsigned char id;
+        unsigned char len;
+        LE16          ih_csum;
+        unsigned char ih_bkup;
+    }
+    __attribute_packed;
+
+    typedef struct bss_nfo
+    {
+        LE16    hi1, op1, lo1, op2;
+        LE16    hi2, op3, lo2, op4;
+    }
+    __attribute_packed;
+
+    ps1_exe_t ih, oh;
+    ps1_exe_hb_t bh;
+
+    bool isCon;
+    bool is32Bit;
+    bool buildPart2;
+    bool foundBss;
+    unsigned ram_size;
+    unsigned sa_cnt, overlap;
+    unsigned sz_lunc, sz_lcpr;
+    unsigned pad_code;
+    unsigned bss_start, bss_end;
+    // filesize-PS_HDR_SIZE
+    unsigned fdata_size;
+};
+
+
+#endif /* already included */
+
+
+/*
+vi:ts=4:et
+*/
@@ -2,8 +2,8 @@

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -32,9 +32,10 @@
 #include "packer.h"
 #include "p_com.h"
 #include "p_sys.h"
+#include "linker.h"

 static const
-#include "stub/l_sys.h"
+#include "stub/i086-dos16.sys.h"


 /*************************************************************************
@@ -45,13 +46,12 @@ bool PackSys::canPack()
 {
    unsigned char buf[128];

-    fi->readx(buf,128);
+    fi->readx(buf, sizeof(buf));
    if (memcmp (buf,"\xff\xff\xff\xff",4) != 0)
        return false;
    if (!fn_has_ext(fi->getName(),"sys"))
        return false;
-    if (find_le32(buf,128,UPX_MAGIC_LE32) >= 0)
-        throwAlreadyPacked();
+    checkAlreadyPacked(buf, sizeof(buf));
    if (file_size < 1024)
        throwCantPack("file is too small");
    if (file_size > 0x10000)
@@ -66,36 +66,33 @@ bool PackSys::canPack()

 void PackSys::patchLoader(OutputFile *fo,
                          upx_byte *loader, int lsize,
-                          unsigned calls, unsigned overlapoh)
+                          unsigned calls)
 {
-    const int filter_id = ph.filter;
    const int e_len = getLoaderSectionStart("SYSCUTPO");
    const int d_len = lsize - e_len;
-    assert(e_len > 0 && e_len < 256);
+    assert(e_len > 0 && e_len < 128);
    assert(d_len > 0 && d_len < 256);

-    if (ph.u_len + d_len + overlapoh > 0xfffe)
+    if (ph.u_len + d_len + ph.overlap_overhead > 0xfffe)
        throwNotCompressible();

-    memcpy(loader,ibuf,6);              // copy from orig. header
-    memcpy(loader+8,ibuf+8,2);          // opendos wants this word too
+    // use some fields of the original file
+    linker->defineSymbol("attribute", get_le16(ibuf + 4));
+    linker->defineSymbol("interrupt", get_le16(ibuf + 8));

-    unsigned copy_to = ph.u_len + d_len + overlapoh;
+    unsigned copy_to = ph.u_len + d_len + ph.overlap_overhead;
+
+    linker->defineSymbol("calltrick_calls", calls);
+    linker->defineSymbol("copy_source", ph.c_len + lsize - 1);
+    linker->defineSymbol("copy_destination", copy_to);
+    linker->defineSymbol("neg_e_len", 0 - e_len);
+    linker->defineSymbol("NRV2B160", ph.u_len + ph.overlap_overhead + 1);
+    linker->defineSymbol("original_strategy", get_le16(ibuf + 6));
+
+    relocateLoader();
+    loader = getLoader();

-    patch_le16(loader,lsize,"JO",get_le16(ibuf+6)-copy_to-1);
-    if (filter_id)
-    {
-        assert(calls > 0);
-        patch_le16(loader,lsize,"CT",calls);
-    }
    patchPackHeader(loader,e_len);
-
-    const unsigned jmp_pos = find_le16(loader,e_len,get_le16("JM"));
-    patch_le16(loader,e_len,"JM",ph.u_len+overlapoh+2-jmp_pos-2);
-    loader[getLoaderSection("SYSSUBSI") - 1] = (upx_byte) -e_len;
-    patch_le16(loader,e_len,"DI",copy_to);
-    patch_le16(loader,e_len,"SI",ph.c_len+e_len+d_len-1);
-
    // write loader + compressed file
    fo->write(loader,e_len);            // entry
    fo->write(obuf,ph.c_len);
@@ -103,27 +100,29 @@ void PackSys::patchLoader(OutputFile *fo,
 }


-int PackSys::buildLoader(const Filter *ft)
+void PackSys::buildLoader(const Filter *ft)
 {
-    const int filter_id = ft->id;
-    initLoader(nrv2b_loader,sizeof(nrv2b_loader));
+    initLoader(stub_i086_dos16_sys, sizeof(stub_i086_dos16_sys));
    addLoader("SYSMAIN1",
              opt->cpu == opt->CPU_8086 ? "SYSI0861" : "SYSI2861",
-              "SYSMAIN2""SYSSUBSI",
-              filter_id ? "SYSCALLT" : "",
-              "SYSMAIN3""UPX1HEAD""SYSCUTPO""NRV2B160""NRVDDONE""NRVDECO1",
+              "SYSMAIN2",
+              ph.first_offset_found == 1 ? "SYSSBBBP" : "",
+              ft->id ? "SYSCALLT" : "",
+              "SYSMAIN3,UPX1HEAD,SYSCUTPO,NRV2B160,NRVDDONE,NRVDECO1",
              ph.max_offset_found <= 0xd00 ? "NRVLED00" : "NRVGTD00",
-              "NRVDECO2""NRV2B169",
+              "NRVDECO2",
              NULL
             );
-    if (filter_id)
-        addFilter16(filter_id);
+    if (ft->id)
+    {
+        assert(ft->calls > 0);
+        addFilter16(ft->id);
+    }
    addLoader("SYSMAIN5",
              opt->cpu == opt->CPU_8086 ? "SYSI0862" : "SYSI2862",
              "SYSJUMP1",
              NULL
             );
-    return getLoaderSize();
 }


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

   This file is part of the UPX executable compressor.

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

   UPX and the UCL library are free software; you can redistribute them
@@ -21,8 +21,8 @@
   If not, write to the Free Software Foundation, Inc.,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   Markus F.X.J. Oberhumer                   Laszlo Molnar
-   markus.oberhumer@jk.uni-linz.ac.at        ml1050@cdata.tvnet.hu
+   Markus F.X.J. Oberhumer   Laszlo Molnar
+   markus@oberhumer.com      ml1050@users.sourceforge.net
 */


@@ -39,18 +39,18 @@ class PackSys : public PackCom
    typedef PackCom super;
 public:
    PackSys(InputFile *f) : super(f) { }
-    virtual int getVersion() const { return 11; }
+    virtual int getVersion() const { return 13; }
    virtual int getFormat() const { return UPX_F_DOS_SYS; }
    virtual const char *getName() const { return "dos/sys"; }

    virtual bool canPack();

 protected:
-    virtual const unsigned getCallTrickOffset() const { return 0; }
+    virtual unsigned getCallTrickOffset() const { return 0; }

 protected:
-    virtual int buildLoader(const Filter *ft);
-    virtual void patchLoader(OutputFile *fo, upx_byte *, int, unsigned, unsigned);
+    virtual void buildLoader(const Filter *ft);
+    virtual void patchLoader(OutputFile *fo, upx_byte *, int, unsigned);
 };


--- a/Show More
+++ b/Show More