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

Better ctok32 fix.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2007-04-02 18:57:42 +02:00
parent b2ad4dc9a0
commit 2d87aa0753
7 changed files with 2631 additions and 2631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/i386-dos32.tmt.h
+1288 -1288
View File
File diff suppressed because it is too large Load Diff
src/stub/i386-dos32.watcom.le.h
+1312 -1312
View File
File diff suppressed because it is too large Load Diff
src/stub/src/arch/i386/macros.S
+6 -2
View File
@@ -301,8 +301,8 @@ ctend:
section ctok32.00 section ctok32.00
.ifnc \addvalue, 0 .ifnc \addvalue, 0
.ifnc \addvalue, esi .ifc \addvalue, edi
mov esi, \addvalue mov esi, edi
.endif .endif
.endif .endif
jmps ckstart jmps ckstart
@@ -335,7 +335,11 @@ ckmark:
sub eax, edi sub eax, edi
.ifnc \addvalue, 0 .ifnc \addvalue, 0
.ifc \addvalue, edi
add eax, esi add eax, esi
.else
add eax, \addvalue
.endif
.endif .endif
mov [edi], eax mov [edi], eax
add edi, 4 add edi, 4
src/stub/src/i386-dos32.tmt.S
-2
View File
@@ -88,9 +88,7 @@ section TMTCALT2
section ctok32.00 section ctok32.00
mov ecx, offset filter_length mov ecx, offset filter_length
push esi
ctok32 ebp, (offset filter_cto) ctok32 ebp, (offset filter_cto)
pop esi
// ============= // =============
// ============= RELOCATION // ============= RELOCATION
src/stub/src/i386-dos32.watcom.le.S
-2
View File
@@ -98,9 +98,7 @@ section WCCTTNUL
section ctok32.00 section ctok32.00
mov ecx, offset filter_length mov ecx, offset filter_length
push esi
ctok32 ebp, (offset filter_cto) ctok32 ebp, (offset filter_cto)
pop esi
// ============= // =============
// ============= RELOCATION // ============= RELOCATION
src/stub/tmp/i386-dos32.tmt.bin.dump
+12 -12
View File
@@ -90,17 +90,17 @@ Idx Name Size VMA LMA File off Algn Flags
85 CTBROR11 00000002 00000000 00000000 0000196f 2**0 CONTENTS, READONLY 85 CTBROR11 00000002 00000000 00000000 0000196f 2**0 CONTENTS, READONLY
86 CTBSWA11 00000005 00000000 00000000 00001971 2**0 CONTENTS, READONLY 86 CTBSWA11 00000005 00000000 00000000 00001971 2**0 CONTENTS, READONLY
87 CALLTR13 00000007 00000000 00000000 00001976 2**0 CONTENTS, RELOC, READONLY 87 CALLTR13 00000007 00000000 00000000 00001976 2**0 CONTENTS, RELOC, READONLY
88 ctok32.00 0000000f 00000000 00000000 0000197d 2**0 CONTENTS, RELOC, READONLY 88 ctok32.00 0000000c 00000000 00000000 0000197d 2**0 CONTENTS, RELOC, READONLY
89 ctok32.10 0000000e 00000000 00000000 0000198c 2**0 CONTENTS, RELOC, READONLY 89 ctok32.10 0000000e 00000000 00000000 00001989 2**0 CONTENTS, RELOC, READONLY
90 ctok32.20 00000022 00000000 00000000 0000199a 2**0 CONTENTS, RELOC, READONLY 90 ctok32.20 00000022 00000000 00000000 00001997 2**0 CONTENTS, RELOC, READONLY
91 ctok32.30 00000007 00000000 00000000 000019bc 2**0 CONTENTS, RELOC, READONLY 91 ctok32.30 00000007 00000000 00000000 000019b9 2**0 CONTENTS, RELOC, READONLY
92 ctok32.40 00000006 00000000 00000000 000019c3 2**0 CONTENTS, RELOC, READONLY 92 ctok32.40 00000005 00000000 00000000 000019c0 2**0 CONTENTS, RELOC, READONLY
93 TMTRELOC 00000003 00000000 00000000 000019c9 2**0 CONTENTS, READONLY 93 TMTRELOC 00000003 00000000 00000000 000019c5 2**0 CONTENTS, READONLY
94 RELOC320 00000029 00000000 00000000 000019cc 2**0 CONTENTS, RELOC, READONLY 94 RELOC320 00000029 00000000 00000000 000019c8 2**0 CONTENTS, RELOC, READONLY
95 REL32BIG 00000009 00000000 00000000 000019f5 2**0 CONTENTS, RELOC, READONLY 95 REL32BIG 00000009 00000000 00000000 000019f1 2**0 CONTENTS, RELOC, READONLY
96 RELOC32J 00000002 00000000 00000000 000019fe 2**0 CONTENTS, RELOC, READONLY 96 RELOC32J 00000002 00000000 00000000 000019fa 2**0 CONTENTS, RELOC, READONLY
97 REL32END 00000000 00000000 00000000 00001a00 2**0 CONTENTS, READONLY 97 REL32END 00000000 00000000 00000000 000019fc 2**0 CONTENTS, READONLY
98 TMTJUMP1 00000005 00000000 00000000 00001a00 2**0 CONTENTS, RELOC, READONLY 98 TMTJUMP1 00000005 00000000 00000000 000019fc 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE: SYMBOL TABLE:
00000000 l d TMTCUTPO 00000000 TMTCUTPO 00000000 l d TMTCUTPO 00000000 TMTCUTPO
00000000 l d N2BSMA10 00000000 N2BSMA10 00000000 l d N2BSMA10 00000000 N2BSMA10
@@ -423,7 +423,7 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [ctok32.00]: RELOCATION RECORDS FOR [ctok32.00]:
OFFSET TYPE VALUE OFFSET TYPE VALUE
00000001 R_386_32 filter_length 00000001 R_386_32 filter_length
00000009 R_386_PC8 ctok32.20 00000006 R_386_PC8 ctok32.20
RELOCATION RECORDS FOR [ctok32.10]: RELOCATION RECORDS FOR [ctok32.10]:
OFFSET TYPE VALUE OFFSET TYPE VALUE
src/stub/tmp/i386-dos32.watcom.le.bin.dump
+13 -13
View File
@@ -89,18 +89,18 @@ Idx Name Size VMA LMA File off Algn Flags
84 CTBROR11 00000002 00000000 00000000 00001983 2**0 CONTENTS, READONLY 84 CTBROR11 00000002 00000000 00000000 00001983 2**0 CONTENTS, READONLY
85 CTBSWA11 00000005 00000000 00000000 00001985 2**0 CONTENTS, READONLY 85 CTBSWA11 00000005 00000000 00000000 00001985 2**0 CONTENTS, READONLY
86 CALLTR13 00000007 00000000 00000000 0000198a 2**0 CONTENTS, RELOC, READONLY 86 CALLTR13 00000007 00000000 00000000 0000198a 2**0 CONTENTS, RELOC, READONLY
87 ctok32.00 0000000f 00000000 00000000 00001991 2**0 CONTENTS, RELOC, READONLY 87 ctok32.00 0000000c 00000000 00000000 00001991 2**0 CONTENTS, RELOC, READONLY
88 ctok32.10 0000000e 00000000 00000000 000019a0 2**0 CONTENTS, RELOC, READONLY 88 ctok32.10 0000000e 00000000 00000000 0000199d 2**0 CONTENTS, RELOC, READONLY
89 ctok32.20 00000022 00000000 00000000 000019ae 2**0 CONTENTS, RELOC, READONLY 89 ctok32.20 00000022 00000000 00000000 000019ab 2**0 CONTENTS, RELOC, READONLY
90 ctok32.30 00000007 00000000 00000000 000019d0 2**0 CONTENTS, RELOC, READONLY 90 ctok32.30 00000007 00000000 00000000 000019cd 2**0 CONTENTS, RELOC, READONLY
91 ctok32.40 00000006 00000000 00000000 000019d7 2**0 CONTENTS, RELOC, READONLY 91 ctok32.40 00000005 00000000 00000000 000019d4 2**0 CONTENTS, RELOC, READONLY
92 WCRELOC1 00000003 00000000 00000000 000019dd 2**0 CONTENTS, READONLY 92 WCRELOC1 00000003 00000000 00000000 000019d9 2**0 CONTENTS, READONLY
93 RELOC320 00000029 00000000 00000000 000019e0 2**0 CONTENTS, RELOC, READONLY 93 RELOC320 00000029 00000000 00000000 000019dc 2**0 CONTENTS, RELOC, READONLY
94 REL32BIG 00000009 00000000 00000000 00001a09 2**0 CONTENTS, RELOC, READONLY 94 REL32BIG 00000009 00000000 00000000 00001a05 2**0 CONTENTS, RELOC, READONLY
95 RELOC32J 00000002 00000000 00000000 00001a12 2**0 CONTENTS, RELOC, READONLY 95 RELOC32J 00000002 00000000 00000000 00001a0e 2**0 CONTENTS, RELOC, READONLY
96 REL32END 00000000 00000000 00000000 00001a14 2**0 CONTENTS, READONLY 96 REL32END 00000000 00000000 00000000 00001a10 2**0 CONTENTS, READONLY
97 WCRELSEL 00000002 00000000 00000000 00001a14 2**0 CONTENTS, READONLY 97 WCRELSEL 00000002 00000000 00000000 00001a10 2**0 CONTENTS, READONLY
98 WCLEMAI4 00000015 00000000 00000000 00001a16 2**0 CONTENTS, RELOC, READONLY 98 WCLEMAI4 00000015 00000000 00000000 00001a12 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE: SYMBOL TABLE:
00000000 l d WCLECUTP 00000000 WCLECUTP 00000000 l d WCLECUTP 00000000 WCLECUTP
00000000 l d N2BSMA10 00000000 N2BSMA10 00000000 l d N2BSMA10 00000000 N2BSMA10
@@ -431,7 +431,7 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [ctok32.00]: RELOCATION RECORDS FOR [ctok32.00]:
OFFSET TYPE VALUE OFFSET TYPE VALUE
00000001 R_386_32 filter_length 00000001 R_386_32 filter_length
00000009 R_386_PC8 ctok32.20 00000006 R_386_PC8 ctok32.20
RELOCATION RECORDS FOR [ctok32.10]: RELOCATION RECORDS FOR [ctok32.10]:
OFFSET TYPE VALUE OFFSET TYPE VALUE