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

Added explicit word' and dword' to several jumps.

Browse Source 
committer: mfx <mfx> 968832694 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2000-09-13 08:11:34 +00:00
parent 3fb744b7e9
commit 31c9420613
12 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/Makefile
+2
View File
@@ -55,6 +55,8 @@ vpath %.ash $(UCL_M68K)
# // tools # // tools
# ************************************************************************/ # ************************************************************************/
NASM = /usr/topics/src/nasm-20000911/nasm -O0 -w+macro-params -w+orphan-labels
NASM = /usr/topics/src/nasm-20000911/nasm -O2 -w+macro-params -w+orphan-labels
NASM = nasm -w+macro-params -w+orphan-labels NASM = nasm -w+macro-params -w+orphan-labels
APP = perl -w scripts/app.pl APP = perl -w scripts/app.pl
src/stub/l_com.asm
+2 -1
View File
@@ -28,6 +28,7 @@
%define COM 1 %define COM 1
%define CJT16 1 %define CJT16 1
%define jmps jmp short %define jmps jmp short
%define jmpl jmp word
%include "macros.ash" %include "macros.ash"
BITS 16 BITS 16
@@ -62,7 +63,7 @@ mem_ok:
%ifdef __COMCALLT__ %ifdef __COMCALLT__
push di push di
%endif; __COMMAIN2__ %endif; __COMMAIN2__
jmp .1+'JM' jmpl .1+'JM'
.1: .1:
%include "header.ash" %include "header.ash"
src/stub/l_djgpp2.asm
+1
View File
@@ -26,6 +26,7 @@
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
%include "macros.ash" %include "macros.ash"
BITS 32 BITS 32
src/stub/l_exe.asm
+1
View File
@@ -27,6 +27,7 @@
%define EXE %define EXE
%define jmps jmp short %define jmps jmp short
%define jmpl jmp word
BITS 16 BITS 16
ORG 0 ORG 0
src/stub/l_lx_elf86.asm
+1
View File
@@ -34,6 +34,7 @@
SECTION .text SECTION .text
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
; defines for ident.ash and n2b_d32.ash ; defines for ident.ash and n2b_d32.ash
%ifdef SMALL %ifdef SMALL
src/stub/l_lx_exec86.asm
+1
View File
@@ -34,6 +34,7 @@
SECTION .text SECTION .text
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
; defines for ident.ash and n2b_d32.ash ; defines for ident.ash and n2b_d32.ash
%ifdef SMALL %ifdef SMALL
src/stub/l_lx_sep86.asm
+1
View File
@@ -34,6 +34,7 @@
SECTION .text SECTION .text
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
; defines for ident.ash and n2b_d32.ash ; defines for ident.ash and n2b_d32.ash
%ifdef SMALL %ifdef SMALL
src/stub/l_lx_sh86.asm
+1
View File
@@ -34,6 +34,7 @@
SECTION .text SECTION .text
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
; defines for ident.ash and n2b_d32.ash ; defines for ident.ash and n2b_d32.ash
%ifdef SMALL %ifdef SMALL
src/stub/l_sys.asm
+3 -2
View File
@@ -29,6 +29,7 @@
%define COM 0 %define COM 0
%define CJT16 1 %define CJT16 1
%define jmps jmp short %define jmps jmp short
%define jmpl jmp word
%include "macros.ash" %include "macros.ash"
BITS 16 BITS 16
@@ -80,7 +81,7 @@ strategy:
%ifdef __SYSCALLT__ %ifdef __SYSCALLT__
push di push di
%endif; __SYSMAIN3__ %endif; __SYSMAIN3__
jmp .1+'JM' ; jump to the decompressor jmpl .1+'JM' ; jump to the decompressor
.1: .1:
%include "header.ash" %include "header.ash"
@@ -113,7 +114,7 @@ cutpoint:
pop bx pop bx
pop ax pop ax
%endif; __SYSJUMP1__ %endif; __SYSJUMP1__
jmp eof+'JO' jmpl eof+'JO'
eof: eof:
; __SYSTHEND__ ; __SYSTHEND__
section .data section .data
src/stub/l_tmt.asm
+3 -2
View File
@@ -26,6 +26,7 @@
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
%include "macros.ash" %include "macros.ash"
BITS 32 BITS 32
@@ -56,7 +57,7 @@ start:
%ifdef __TMTCALT1__ %ifdef __TMTCALT1__
push edi push edi
%endif; __TMTMAIN2__ %endif; __TMTMAIN2__
jmp .1 + 'JMPD' jmpl .1 + 'JMPD'
.1: .1:
%include "header.ash" %include "header.ash"
@@ -93,7 +94,7 @@ cutpoint:
; ============= ; =============
; __TMTJUMP1__ ; __TMTJUMP1__
jmp .1+'JMPO' jmpl .1+'JMPO'
.1: .1:
eof: eof:
; __TMTHEEND__ ; __TMTHEEND__
src/stub/l_w32pe.asm
+2 -1
View File
@@ -26,6 +26,7 @@
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
%define jnzn jnz near %define jnzn jnz near
%define jbn jb near %define jbn jb near
%include "macros.ash" %include "macros.ash"
@@ -204,7 +205,7 @@ reloc_end_jmp:
inc eax inc eax
retn 0x0C retn 0x0C
%else; __PEDOJUMP__ %else; __PEDOJUMP__
jmp .1+'JMPO' jmpl .1+'JMPO'
.1: .1:
%endif; __PEDUMMY3__ %endif; __PEDUMMY3__
src/stub/l_wcle.asm
+3 -2
View File
@@ -26,6 +26,7 @@
%define jmps jmp short %define jmps jmp short
%define jmpl jmp dword
%include "macros.ash" %include "macros.ash"
BITS 32 BITS 32
@@ -64,7 +65,7 @@ start:
pop edi pop edi
or ebp, byte -1 or ebp, byte -1
push edi push edi
jmp .1 + 'JMPD' jmpl .1 + 'JMPD'
.1: .1:
%include "header.ash" %include "header.ash"
@@ -124,7 +125,7 @@ cutpoint:
pop es pop es
lea esp, [ebp + 'ESP0'] lea esp, [ebp + 'ESP0']
jmp .1+'JMPO' jmpl .1+'JMPO'
.1: .1:
; ============= ; =============