Initial NRV2E support. Pretty much untested.

committer: mfx <mfx> 1031841557 +0000

src/filter/ct.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/cto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/ctoj.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/filter/ctojr.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/filter/ctok.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/filter/ctsw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/getcto.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/sub.hh

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/sub16.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/sub32.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/sub8.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/filter/sw.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
  */
 
 

src/mem.cpp

@@ -79,6 +79,7 @@ void MemBuffer::alloc(unsigned size, unsigned base_offset)
     alloc_ptr = (unsigned char *) malloc(size);
     if (!alloc_ptr)
     {
+        //throw bad_alloc();
         throwCantPack("out of memory");
         //exit(1);
     }

src/p_djgpp2.cpp

@@ -58,16 +58,7 @@ PackDjgpp2::PackDjgpp2(InputFile *f) :
 
 const int *PackDjgpp2::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || file_size <= 512*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_elks.cpp

@@ -51,11 +51,7 @@ static const unsigned zimage_offset = 0x1000;
 
 const int *PackElks8086::getCompressionMethods(int method, int level) const
 {
-    if (M_IS_NRV2B(method))
+    return Packer::getDefaultCompressionMethods_8(method, level);
-        return M_NRV2B_8;
-    if (M_IS_NRV2D(method))
-        return M_NRV2D_8;
-    return level > 1 ? M_NRV2D_8 : M_NRV2B_8;
 }
 
 

src/p_exe.cpp

@@ -56,16 +56,8 @@ PackExe::PackExe(InputFile *f) :
 
 const int *PackExe::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, -1 };
+    bool small = ih_imagesize <= 256*1024;
-    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, -1 };
+    return Packer::getDefaultCompressionMethods_8(method, level, small);
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || ih_imagesize <= 256*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_lx_exc.cpp

@@ -57,16 +57,7 @@ static const
 
 const int *PackLinuxI386::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || file_size <= 512*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 const int *PackLinuxI386::getFilters() const

src/p_psx.cpp

@@ -62,17 +62,7 @@ PackPsx::PackPsx(InputFile *f) :
 
 const int *PackPsx::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || file_size-PS_HDR_SIZE < 512*1024)
-        return m_nrv2b;
-    return m_nrv2d;
-
 }
 
 const int *PackPsx::getFilters() const

src/p_tmt.cpp

@@ -50,16 +50,7 @@ PackTmt::PackTmt(InputFile *f) : super(f)
 
 const int *PackTmt::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || file_size <= 512*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_tos.cpp

@@ -64,19 +64,8 @@ PackTos::PackTos(InputFile *f) :
 
 const int *PackTos::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, -1 };
+    bool small = ih.fh_text + ih.fh_data <= 256*1024;
-    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, -1 };
+    return Packer::getDefaultCompressionMethods_8(method, level, small);
-    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (M_IS_NRV2E(opt->method))
-        return m_nrv2e;
-    if (level == 1 || ih.fh_text + ih.fh_data <= 256*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_vmlinz.cpp

@@ -58,16 +58,7 @@ PackVmlinuzI386::PackVmlinuzI386(InputFile *f) :
 
 const int *PackVmlinuzI386::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_w16ne.cpp

@@ -45,16 +45,8 @@ PackW16Ne::PackW16Ne(InputFile *f) :
 
 const int *PackW16Ne::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, -1 };
+    bool small = false;
-    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, -1 };
+    return Packer::getDefaultCompressionMethods_8(method, level, small);
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_w32pe.cpp

@@ -123,16 +123,8 @@ PackW32Pe::~PackW32Pe()
 
 const int *PackW32Pe::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    bool small = ih.codesize + ih.datasize <= 256*1024;
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level, small);
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || ih.codesize + ih.datasize <= 256*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/p_wcle.cpp

@@ -68,16 +68,7 @@ static const
 
 const int *PackWcle::getCompressionMethods(int method, int level) const
 {
-    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+    return Packer::getDefaultCompressionMethods_LE32(method, level);
-    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, -1 };
-
-    if (M_IS_NRV2B(method))
-        return m_nrv2b;
-    if (M_IS_NRV2D(method))
-        return m_nrv2d;
-    if (level == 1 || file_size <= 512*1024)
-        return m_nrv2b;
-    return m_nrv2d;
 }
 
 

src/packer.cpp

@@ -671,12 +671,6 @@ void Packer::checkAlreadyPacked(void *b, int blen)
 }
 
 
-bool Packer::isValidCompressionMethod(int method)
-{
-    return (method >= M_NRV2B_LE32 && method <= M_NRV2D_LE16);
-}
-
-
 /*************************************************************************
 // patch util for loader
 **************************************************************************/
@@ -917,6 +911,56 @@ unsigned Packer::unoptimizeReloc32(upx_byte **in, upx_byte *image,
 }
 
 
+/*************************************************************************
+// compression method util [static]
+**************************************************************************/
+
+bool Packer::isValidCompressionMethod(int method)
+{
+    return (method >= M_NRV2B_LE32 && method <= M_NRV2D_LE16);
+}
+
+
+const int *Packer::getDefaultCompressionMethods_8(int method, int level, int small) const
+{
+    static const int m_nrv2b[] = { M_NRV2B_8, M_NRV2D_8, M_NRV2E_8, -1 };
+    static const int m_nrv2d[] = { M_NRV2D_8, M_NRV2B_8, M_NRV2E_8, -1 };
+    static const int m_nrv2e[] = { M_NRV2E_8, M_NRV2B_8, M_NRV2D_8, -1 };
+
+    if (small < 0)
+        small = file_size <= 512*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_nrv2d;
+}
+
+
+const int *Packer::getDefaultCompressionMethods_LE32(int method, int level, int small) const
+{
+    static const int m_nrv2b[] = { M_NRV2B_LE32, M_NRV2D_LE32, M_NRV2E_LE32, -1 };
+    static const int m_nrv2d[] = { M_NRV2D_LE32, M_NRV2B_LE32, M_NRV2E_LE32, -1 };
+    static const int m_nrv2e[] = { M_NRV2E_LE32, M_NRV2B_LE32, M_NRV2D_LE32, -1 };
+
+    if (small < 0)
+        small = file_size <= 512*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_nrv2d;
+}
+
+
 /*************************************************************************
 // loader util
 **************************************************************************/
@@ -1034,26 +1078,33 @@ const char *Packer::getDecompressor() const
         "N2BSMA10""N2BDEC10""N2BSMA20""N2BDEC20""N2BSMA30"
         "N2BDEC30""N2BSMA40""N2BSMA50""N2BDEC50""N2BSMA60"
         "N2BDEC60";
-
     static const char nrv2b_le32_fast[] =
         "N2BFAS10""+80CXXXX""N2BFAS11""N2BDEC10""N2BFAS20"
         "N2BDEC20""N2BFAS30""N2BDEC30""N2BFAS40""N2BFAS50"
         "N2BDEC50""N2BFAS60""+40CXXXX""N2BFAS61""N2BDEC60";
-
     static const char nrv2d_le32_small[] =
         "N2DSMA10""N2DDEC10""N2DSMA20""N2DDEC20""N2DSMA30"
         "N2DDEC30""N2DSMA40""N2DSMA50""N2DDEC50""N2DSMA60"
         "N2DDEC60";
-
     static const char nrv2d_le32_fast[] =
         "N2DFAS10""+80CXXXX""N2DFAS11""N2DDEC10""N2DFAS20"
         "N2DDEC20""N2DFAS30""N2DDEC30""N2DFAS40""N2DFAS50"
         "N2DDEC50""N2DFAS60""+40CXXXX""N2DFAS61""N2DDEC60";
+    static const char nrv2e_le32_small[] =
+        "N2ESMA10""N2EDEC10""N2ESMA20""N2EDEC20""N2ESMA30"
+        "N2EDEC30""N2ESMA40""N2ESMA50""N2EDEC50""N2ESMA60"
+        "N2EDEC60";
+    static const char nrv2e_le32_fast[] =
+        "N2EFAS10""+80CXXXX""N2EFAS11""N2EDEC10""N2EFAS20"
+        "N2EDEC20""N2EFAS30""N2EDEC30""N2EFAS40""N2EFAS50"
+        "N2EDEC50""N2EFAS60""+40CXXXX""N2EFAS61""N2EDEC60";
 
     if (ph.method == M_NRV2B_LE32)
         return opt->small ? nrv2b_le32_small : nrv2b_le32_fast;
     if (ph.method == M_NRV2D_LE32)
         return opt->small ? nrv2d_le32_small : nrv2d_le32_fast;
+    if (ph.method == M_NRV2E_LE32)
+        return opt->small ? nrv2e_le32_small : nrv2e_le32_fast;
     throwInternalError("bad decompressor");
     return NULL;
 }

src/packer.h

@@ -240,10 +240,11 @@ protected:
     virtual unsigned unoptimizeReloc32(upx_byte **in,upx_byte *image,MemBuffer *out,int bs);
 
     // compression method util
+    const int *getDefaultCompressionMethods_8(int method, int level, int small=-1) const;
+    const int *getDefaultCompressionMethods_LE32(int method, int level, int small=-1) const;
 public:
     static bool isValidCompressionMethod(int method);
 
-
 protected:
     InputFile *fi;
     off_t file_size;        // will get set by constructor

src/stub/fold_elf86.asm

@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -20,9 +20,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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
+;
+
+
+                BITS    32
+                SECTION .text
 
 %define PAGE_SIZE ( 1<<12)
 %define szElf32_Ehdr 0x34

src/stub/fold_exec86.asm

@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -20,9 +20,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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
+;
+
+
+                BITS    32
+                SECTION .text
 
 ;; control just falls through, after this part and compiled C code
 ;; are uncompressed.

src/stub/fold_sh86.asm

@@ -2,9 +2,9 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
 ;
 
 

src/stub/header.ash

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 

src/stub/l_com.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 

src/stub/l_djgpp2.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 
@@ -57,6 +57,7 @@ start:
 
 %include      "n2b_d32.ash"
 %include      "n2d_d32.ash"
+%include      "n2e_d32.ash"
 
 ; =============
 

src/stub/l_lx_elf.c

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_elf86.asm

@@ -2,9 +2,9 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
 ;
 
 

src/stub/l_lx_elf86.lds

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -20,8 +20,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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_exec86.asm

@@ -2,9 +2,9 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
 ;
 
 

src/stub/l_lx_exec86.lds

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -20,8 +20,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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_sep.c

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_sep86.asm

@@ -2,9 +2,9 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
 ;
 
 

src/stub/l_lx_sep86.lds

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -20,8 +20,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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_sh.c

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2001 Laszlo Molnar
+   Copyright (C) 1996-2002 Laszlo Molnar
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_lx_sh86.asm

@@ -2,9 +2,9 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
-;  Copyright (C) 2000-2001 John F. Reiser
+;  Copyright (C) 2000-2002 John F. Reiser
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+;
+;  John F. Reiser
+;  <jreiser@users.sourceforge.net>
 ;
 
 

src/stub/l_lx_sh86.lds

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 2000-2001 John F. Reiser
+   Copyright (C) 2000-2002 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -20,8 +20,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           John F. Reiser
+   Markus F.X.J. Oberhumer              Laszlo Molnar
-   markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+   <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+
+   John F. Reiser
+   <jreiser@users.sourceforge.net>
  */
 
 

src/stub/l_psx.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;
 ;  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
@@ -21,7 +21,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 ;  psOne r3k v1.2 by ssg
 

src/stub/l_sys.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 

src/stub/l_tmt.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 
@@ -71,6 +71,7 @@ cutpoint:
 
 %include      "n2b_d32.ash"
 %include      "n2d_d32.ash"
+%include      "n2e_d32.ash"
 
 ;       __TMTMAIN5__
                 pop     ebp

src/stub/l_vmlinz.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 

src/stub/l_w32pe.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 
@@ -66,6 +66,7 @@ mpass:
 
 %include      "n2b_d32.ash"
 %include      "n2d_d32.ash"
+%include      "n2e_d32.ash"
 
 ; =============
 

src/stub/l_wcle.asm

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 
@@ -79,6 +79,7 @@ cutpoint:
 
 %include      "n2b_d32.ash"
 %include      "n2d_d32.ash"
+%include      "n2e_d32.ash"
 
 ; =============
 

src/stub/linux.hh

@@ -84,6 +84,7 @@ typedef int nrv_int32;
 typedef unsigned int nrv_uint;
 typedef unsigned int nrv_uint32;
 #define nrv_byte unsigned char
+#define nrv_bytep unsigned char *
 #define nrv_voidp void *
 
 

src/stub/macros.ash

@@ -2,8 +2,8 @@
 ;
 ;  This file is part of the UPX executable compressor.
 ;
-;  Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996-2001 Laszlo Molnar
+;  Copyright (C) 1996-2002 Laszlo Molnar
 ;  All Rights Reserved.
 ;
 ;  UPX and the UCL library are free software; you can redistribute them
@@ -22,7 +22,7 @@
 ;  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ;
 ;  Markus F.X.J. Oberhumer              Laszlo Molnar
-;  markus@oberhumer.com      ml1050@cdata.tvnet.hu
+;  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
 ;
 
 

src/stub/scripts/asl_68k.sh

@@ -1,50 +0,0 @@
-#! /bin/sh
-#
-#  asl_68k.sh --
-#
-#  This file is part of the UPX executable compressor.
-#
-#  Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-#  Copyright (C) 1996-2002 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>
-#
-
-set -e
-
-# wrapper for the ASL cross-assembler (version 1.42bld9)
-#   http://john.ccac.rwth-aachen.de:8000/as/
-#   http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/
-
-file="$1"
-test -f "$file" || exit 1
-
-ofile=`echo "$file" | sed 's/\.[a-z]*$/.o/'`
-
-# convert ' to " in dc.x statements
-perl -p -i -e '
-  s,\x27,",g if m,^\s*dc\.,;
-' "$file"
-
-echo asl -q -xC -U -cpu 68000 -o "$ofile" -L "$file"
-     asl -q -xC -U -cpu 68000 -o "$ofile" -L "$file"
-
-exit 0
-

src/stub/scripts/setfold.pl

@@ -4,7 +4,7 @@
 #
 #  This file is part of the UPX executable compressor.
 #
-#  Copyright (C) 2000-2001 John F. Reiser
+#  Copyright (C) 2000-2002 John F. Reiser
 #  All Rights Reserved.
 #
 #  UPX and the UCL library are free software; you can redistribute them
@@ -22,8 +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           John F. Reiser
+#  Markus F.X.J. Oberhumer              Laszlo Molnar
-#  markus@oberhumer.com      ml1050@cdata.tvnet.hu   jreiser@BitWagon.com
+#  <mfx@users.sourceforge.net>          <ml1050@users.sourceforge.net>
+#
+#  John F. Reiser
+#  <jreiser@users.sourceforge.net>
 #
 
 

src/version.h

@@ -1,4 +1,4 @@
 #define UPX_VERSION_HEX         0x019001        /* 01.90.01 */
 #define UPX_VERSION_STRING      "1.90.1"
 #define UPX_VERSION_STRING4     "1.90"
-#define UPX_VERSION_DATE        "Sep 9th 2002"
+#define UPX_VERSION_DATE        "Sep 12th 2002"