mirror of
https://github.com/upx/upx
synced 2025-10-05 19:20:23 +08:00
Filter for lru recoding of "call trick" destinations.
filteri.cpp filter/ctjor.h committer: jreiser <jreiser> 978670287 +0000
This commit is contained in:
John Reiser
parent
38ab492030
commit
5b97d3ee09
273
src/filter/ctjor.h
Normal file
273
src/filter/ctjor.h
Normal file
|
|
@ -0,0 +1,273 @@
|
||||||
|
/* ctjo.h -- filter CTO implementation
|
||||||
|
|
||||||
|
This file is part of the UPX executable compressor.
|
||||||
|
|
||||||
|
Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer
|
||||||
|
Copyright (C) 1996-2001 Laszlo Molnar
|
||||||
|
Copyright (C) 2000-2001 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 John F. Reiser
|
||||||
|
markus@oberhumer.com ml1050@cdata.tvnet.hu jreiser@BitWagon.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
//
|
||||||
|
**************************************************************************/
|
||||||
|
#ifdef U //{
|
||||||
|
static int const N_LRU = 1024; // does not have to be a power of 2
|
||||||
|
static unsigned lru[N_LRU];
|
||||||
|
static int hand;
|
||||||
|
#endif //}
|
||||||
|
|
||||||
|
static int F(Filter *f)
|
||||||
|
{
|
||||||
|
#ifdef U
|
||||||
|
// filter
|
||||||
|
upx_byte *b = f->buf;
|
||||||
|
const unsigned addvalue = f->addvalue;
|
||||||
|
hand = 0;
|
||||||
|
memset(&lru[0], 0, sizeof(lru));
|
||||||
|
#else
|
||||||
|
// scan
|
||||||
|
const upx_byte *b = f->buf;
|
||||||
|
#endif
|
||||||
|
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;
|
||||||
|
|
||||||
|
// FIXME: We must fit into 8MB because we steal one bit.
|
||||||
|
// 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 (CONDF(b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
|
||||||
|
{
|
||||||
|
buf[b[ic+1]] |= 1;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
{
|
||||||
|
int i = size - 6;
|
||||||
|
do {
|
||||||
|
if (CONDF(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");
|
||||||
|
return -1;
|
||||||
|
cto8 = (unsigned char) ic;
|
||||||
|
}
|
||||||
|
cto = (unsigned)cto8 << 24;
|
||||||
|
|
||||||
|
for (ic = 0; ic < size - 5; ic++)
|
||||||
|
{
|
||||||
|
if (!CONDF(b,ic,lastcall))
|
||||||
|
continue;
|
||||||
|
jc = get_le32(b+ic+1)+ic+1;
|
||||||
|
// try to detect 'real' calls only
|
||||||
|
if (jc < size)
|
||||||
|
{
|
||||||
|
#ifdef U
|
||||||
|
if (COND2(b,lastcall,ic,ic-1,ic)) { // 6-byte Jcc <disp32>
|
||||||
|
// Prefix 0x0f is constant, but opcode condition 0x80..0x8f
|
||||||
|
// varies. Because we store the destination (or its lru 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;
|
||||||
|
}
|
||||||
|
jc += addvalue;
|
||||||
|
// FIXME [?]: Extend to 8 bytes if "ADD ESP, byte 4*n" follows CALL.
|
||||||
|
// This will require two related cto's (consecutive, or otherwise).
|
||||||
|
{
|
||||||
|
// Recode the destination: narrower lru indices
|
||||||
|
// should compress better than wider addresses.
|
||||||
|
int k;
|
||||||
|
for (k = 0; k < N_LRU; ++k) {
|
||||||
|
int kh = hand + k;
|
||||||
|
if (N_LRU <= kh) {
|
||||||
|
kh -= N_LRU;
|
||||||
|
}
|
||||||
|
if (lru[kh] == jc) { // destination was seen recently
|
||||||
|
set_be32(b+ic+1,((k<<1)|0)+cto);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (k == N_LRU) { // loop failed; jc is not in lru[]
|
||||||
|
set_be32(b+ic+1,((jc<<1)|1)+cto);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Adaptively remember recent destinations.
|
||||||
|
if (0 > --hand) {
|
||||||
|
hand = N_LRU -1;
|
||||||
|
}
|
||||||
|
lru[hand] = jc;
|
||||||
|
#endif
|
||||||
|
if (ic - lastnoncall < 5)
|
||||||
|
{
|
||||||
|
// check the last 4 bytes before this call
|
||||||
|
for (kc = 4; kc; kc--)
|
||||||
|
if (CONDF(b,ic-kc,lastcall) && b[ic-kc+1] == cto8)
|
||||||
|
break;
|
||||||
|
if (kc)
|
||||||
|
{
|
||||||
|
#ifdef U
|
||||||
|
// restore original
|
||||||
|
if (COND2(b,lastcall,ic,ic,ic-1)) {
|
||||||
|
// 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->cto = cto8;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#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;
|
||||||
|
|
||||||
|
unsigned ic, jc;
|
||||||
|
|
||||||
|
hand = 0;
|
||||||
|
for (ic = 0; ic < size5; ic++)
|
||||||
|
if (CONDU(b,ic,lastcall))
|
||||||
|
{
|
||||||
|
jc = get_be32(b+ic+1) - cto;
|
||||||
|
if (b[ic+1] == f->cto)
|
||||||
|
{
|
||||||
|
if (1&jc) { // 1st time at this destination
|
||||||
|
jc = (jc >> 1) - addvalue;
|
||||||
|
}
|
||||||
|
else { // not 1st time at this destination
|
||||||
|
jc = (jc >> 1) - addvalue;
|
||||||
|
int kh = jc + hand;
|
||||||
|
if (N_LRU <= kh) {
|
||||||
|
kh -= N_LRU;
|
||||||
|
}
|
||||||
|
jc = lru[kh];
|
||||||
|
}
|
||||||
|
if (0 > --hand) {
|
||||||
|
hand = N_LRU -1;
|
||||||
|
}
|
||||||
|
lru[hand] = jc;
|
||||||
|
set_le32(b+ic+1,jc-ic-1);
|
||||||
|
|
||||||
|
if (COND2(b,lastcall,ic,ic,ic-1)) {
|
||||||
|
// Unswap prefix and opcode for 6-byte Jcc <disp32>
|
||||||
|
unsigned char const t =
|
||||||
|
b[ic-1];
|
||||||
|
b[ic-1] = b[ic];
|
||||||
|
b[ic] = t;
|
||||||
|
}
|
||||||
|
f->calls++;
|
||||||
|
ic += 4;
|
||||||
|
f->lastcall = lastcall = ic+1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
f->noncalls++;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#undef F
|
||||||
|
#undef U
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
vi:ts=4:et:nowrap
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
@ -86,6 +86,28 @@
|
||||||
#undef COND
|
#undef COND
|
||||||
|
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
//
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
#define COND1(b,x) (b[x] == 0xe8 || b[x] == 0xe9)
|
||||||
|
#define COND2(b,lastcall,x,y,z) \
|
||||||
|
(lastcall!=(x) && 0xf==b[y] && 0x80<=b[z] && b[z]<=0x8f)
|
||||||
|
|
||||||
|
#define CONDF(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x,(x)-1, x ))
|
||||||
|
#define CONDU(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x, x ,(x)-1))
|
||||||
|
|
||||||
|
#define F f_ctjor32_e8e9_bswap_le
|
||||||
|
#define U u_ctjor32_e8e9_bswap_le
|
||||||
|
#include "filter/ctjor.h"
|
||||||
|
#define F s_ctjor32_e8e9_bswap_le
|
||||||
|
#include "filter/ctjor.h"
|
||||||
|
#undef CONDU
|
||||||
|
#undef CONDF
|
||||||
|
#undef COND2
|
||||||
|
#undef COND1
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
// database for use in class Filter
|
// database for use in class Filter
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
@ -133,6 +155,9 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
|
||||||
{ 0x26, 6, 0x00ffffff, f_cto32_e8e9_bswap_le, u_cto32_e8e9_bswap_le, s_cto32_e8e9_bswap_le },
|
{ 0x26, 6, 0x00ffffff, f_cto32_e8e9_bswap_le, u_cto32_e8e9_bswap_le, s_cto32_e8e9_bswap_le },
|
||||||
// 32-bit cto calltrick + jmp
|
// 32-bit cto calltrick + jmp
|
||||||
{ 0x36, 6, 0x00ffffff, f_ctjo32_e8e9_bswap_le, u_ctjo32_e8e9_bswap_le, s_ctjo32_e8e9_bswap_le },
|
{ 0x36, 6, 0x00ffffff, f_ctjo32_e8e9_bswap_le, u_ctjo32_e8e9_bswap_le, s_ctjo32_e8e9_bswap_le },
|
||||||
|
|
||||||
|
// 32-bit ctor calltrick with relative renumbering + jmp
|
||||||
|
{ 0x80, 8, 0x00ffffff, f_ctjor32_e8e9_bswap_le, u_ctjor32_e8e9_bswap_le, s_ctjor32_e8e9_bswap_le },
|
||||||
};
|
};
|
||||||
|
|
||||||
const int FilterImp::n_filters = HIGH(filters);
|
const int FilterImp::n_filters = HIGH(filters);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user