mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

dos/exe: better minsp approximation

Browse Source
This commit is contained in:
László Molnár 2007-02-26 12:54:49 +01:00
parent fece0d73e7
commit 753ce45310
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/p_exe.cpp
View File

@ -57,6 +57,7 @@ PackExe::PackExe(InputFile *f) :
// disable lzma for "--brute" unless explicitly given "--lzma" // disable lzma for "--brute" unless explicitly given "--lzma"
if (opt->all_methods_use_lzma && !opt->method_lzma_seen) if (opt->all_methods_use_lzma && !opt->method_lzma_seen)
opt->all_methods_use_lzma = false; opt->all_methods_use_lzma = false;
stack_for_lzma = 0;
} }
@ -89,7 +90,7 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
unsigned minsp = 0x200; unsigned minsp = 0x200;
if (M_IS_LZMA(ph.method)) if (M_IS_LZMA(ph.method))
minsp = getDecompressorWrkmemSize() + 0x1500; // FIXME ??? minsp = stack_for_lzma;
assert(minsp < 0xff00); assert(minsp < 0xff00);
oh.sp = ih.sp > minsp ? (unsigned) ih.sp : minsp; oh.sp = ih.sp > minsp ? (unsigned) ih.sp : minsp;
@ -104,7 +105,7 @@ int PackExe::fillExeHeader(struct exe_header_t *eh) const
if (oh.ss != ih.ss) if (oh.ss != ih.ss)
flag |= SS; flag |= SS;
if (oh.sp != ih.sp) if (oh.sp != ih.sp || M_IS_LZMA(ph.method))
flag |= SP; flag |= SP;
return flag; return flag;
#undef oh #undef oh
@ -157,6 +158,7 @@ void PackExe::buildLoader(const Filter *)
ph.u_len > 0xffff ? "LZMA_DEC31" : "", ph.u_len > 0xffff ? "LZMA_DEC31" : "",
NULL NULL
); );
addLoaderEpilogue(flag); addLoaderEpilogue(flag);
defineDecompressorSymbols(); defineDecompressorSymbols();
relocateLoader(); relocateLoader();
@ -181,6 +183,13 @@ void PackExe::buildLoader(const Filter *)
linker->addSection("COMPRESSED_LZMA", compressed_lzma, c_len_lzma, 0); linker->addSection("COMPRESSED_LZMA", compressed_lzma, c_len_lzma, 0);
addLoader("LZMAENTRY,NRV2B160,NRVDDONE,NRVDECO1,NRVGTD00,NRVDECO2", addLoader("LZMAENTRY,NRV2B160,NRVDDONE,NRVDECO1,NRVGTD00,NRVDECO2",
NULL); NULL);
// Lzma decompression code starts at ss:0x10, and its size is
// lsize bytes. It also needs getDecompressorWrkmemSize() bytes
// during uncompression. It also uses some stack, so 0x100
// more bytes are allocated
stack_for_lzma = getDecompressorWrkmemSize() + lsize + 0x100;
stack_for_lzma = stack_for_lzma & ~0xf;
} }
else if (device_driver) else if (device_driver)
addLoader("DEVICEENTRY,DEVICEENTRY2", NULL); addLoader("DEVICEENTRY,DEVICEENTRY2", NULL);

2
src/p_exe.h
View File

@ -111,6 +111,8 @@ protected:
MINMEM = 16, MINMEM = 16,
MAXMEM = 32 MAXMEM = 32
}; };
unsigned stack_for_lzma; // stack size required for lzma
}; };