Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Big merge of my working tree: Added options `--all-methods', new

Browse Source 
Packer::getCompressionMethods(), improved Packer::compressWithFilters().

committer: mfx <mfx> 978449945 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2001-01-02 15:39:05 +00:00
parent 1084d86063
commit aa540f85fa
124 changed files with 796 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_elks.cpp
+9 -16
View File
@@ -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-2001 Markus Franz Xaver Johannes Oberhumer
Copyright (C) 1996-2001 Laszlo Molnar
All Rights Reserved.
UPX and the UCL library are free software; you can redistribute them
@@ -49,13 +49,13 @@ static const unsigned zimage_offset = 0x1000;
//
**************************************************************************/
int PackElks8086::getCompressionMethod() const
const int *PackElks8086::getCompressionMethods(int method, int level) const
{
if (M_IS_NRV2B(opt->method))
if (M_IS_NRV2B(method))
return M_NRV2B_8;
if (M_IS_NRV2D(opt->method))
if (M_IS_NRV2D(method))
return M_NRV2D_8;
return opt->level > 1 ? M_NRV2D_8 : M_NRV2B_8;
return level > 1 ? M_NRV2D_8 : M_NRV2B_8;
}
@@ -113,18 +113,11 @@ void PackElks8086::pack(OutputFile *fo)
readKernel();
// prepare filter
Filter ft(opt->level);
Filter ft(ph.level);
ft.buf_len = ph.u_len;
ft.addvalue = kernel_entry;
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, overlap_range, strategy);
// compress
compressWithFilters(&ft, overlap_range);
const unsigned lsize = getLoaderSize();
MemBuffer loader(lsize);