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

Renamed ctjo to ctoj, and ctjor to ctojr.

Browse Source 
committer: mfx <mfx> 978792885 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2001-01-06 14:54:45 +00:00
parent daa0fe353b
commit dfc8a0d548
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filter/ctjo.h → src/filter/ctoj.h
View File

@ -1,4 +1,4 @@
/* ctjo.h -- filter CTO implementation /* ctoj.h -- filter CTO implementation
This file is part of the UPX executable compressor. This file is part of the UPX executable compressor.

2
src/filter/ctjor.h → src/filter/ctojr.h
View File

@ -1,4 +1,4 @@
/* ctjor.h -- filter CTO implementation; renumber destinations MRU /* ctojr.h -- filter CTO implementation; renumber destinations MRU
This file is part of the UPX executable compressor. This file is part of the UPX executable compressor.

24
src/filteri.cpp
View File

@ -81,11 +81,11 @@
#define COND(b,x,lastcall) \ #define COND(b,x,lastcall) \
(b[x] == 0xe8 || b[x] == 0xe9 \ (b[x] == 0xe8 || b[x] == 0xe9 \
|| (lastcall!=(x) && 0xf==b[(x)-1] && 0x80<=b[x] && b[x]<=0x8f) ) || (lastcall!=(x) && 0xf==b[(x)-1] && 0x80<=b[x] && b[x]<=0x8f) )
#define F f_ctjo32_e8e9_bswap_le #define F f_ctoj32_e8e9_bswap_le
#define U u_ctjo32_e8e9_bswap_le #define U u_ctoj32_e8e9_bswap_le
#include "filter/ctjo.h" #include "filter/ctoj.h"
#define F s_ctjo32_e8e9_bswap_le #define F s_ctoj32_e8e9_bswap_le
#include "filter/ctjo.h" #include "filter/ctoj.h"
#undef COND #undef COND
@ -100,11 +100,11 @@
#define CONDF(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x,(x)-1, x )) #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 CONDU(b,x,lastcall) (COND1(b,x) || COND2(b,lastcall,x, x ,(x)-1))
#define F f_ctjor32_e8e9_bswap_le #define F f_ctojr32_e8e9_bswap_le
#define U u_ctjor32_e8e9_bswap_le #define U u_ctojr32_e8e9_bswap_le
#include "filter/ctjor.h" #include "filter/ctojr.h"
#define F s_ctjor32_e8e9_bswap_le #define F s_ctojr32_e8e9_bswap_le
#include "filter/ctjor.h" #include "filter/ctojr.h"
#undef CONDU #undef CONDU
#undef CONDF #undef CONDF
#undef COND2 #undef COND2
@ -157,10 +157,10 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
{ 0x25, 6, 0x00ffffff, f_cto32_e9_bswap_le, u_cto32_e9_bswap_le, s_cto32_e9_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 }, { 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_ctoj32_e8e9_bswap_le, u_ctoj32_e8e9_bswap_le, s_ctoj32_e8e9_bswap_le },
// 32-bit ctor calltrick with relative renumbering + jmp // 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 }, { 0x80, 8, 0x00ffffff, f_ctojr32_e8e9_bswap_le, u_ctojr32_e8e9_bswap_le, s_ctojr32_e8e9_bswap_le },
}; };
const int FilterImp::n_filters = HIGH(filters); const int FilterImp::n_filters = HIGH(filters);