mirror of
https://github.com/upx/upx
synced 2025-09-28 19:06:07 +08:00
Added explicit word' and
dword' to several jumps.
committer: mfx <mfx> 968832694 +0000
This commit is contained in:
parent
3fb744b7e9
commit
31c9420613
|
@ -55,6 +55,8 @@ vpath %.ash $(UCL_M68K)
|
|||
# // 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
|
||||
|
||||
APP = perl -w scripts/app.pl
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
%define COM 1
|
||||
%define CJT16 1
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp word
|
||||
%include "macros.ash"
|
||||
|
||||
BITS 16
|
||||
|
@ -62,7 +63,7 @@ mem_ok:
|
|||
%ifdef __COMCALLT__
|
||||
push di
|
||||
%endif; __COMMAIN2__
|
||||
jmp .1+'JM'
|
||||
jmpl .1+'JM'
|
||||
.1:
|
||||
%include "header.ash"
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
%include "macros.ash"
|
||||
|
||||
BITS 32
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
%define EXE
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp word
|
||||
|
||||
BITS 16
|
||||
ORG 0
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
SECTION .text
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
|
||||
; defines for ident.ash and n2b_d32.ash
|
||||
%ifdef SMALL
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
SECTION .text
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
|
||||
; defines for ident.ash and n2b_d32.ash
|
||||
%ifdef SMALL
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
SECTION .text
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
|
||||
; defines for ident.ash and n2b_d32.ash
|
||||
%ifdef SMALL
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
SECTION .text
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
|
||||
; defines for ident.ash and n2b_d32.ash
|
||||
%ifdef SMALL
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
%define COM 0
|
||||
%define CJT16 1
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp word
|
||||
%include "macros.ash"
|
||||
|
||||
BITS 16
|
||||
|
@ -80,7 +81,7 @@ strategy:
|
|||
%ifdef __SYSCALLT__
|
||||
push di
|
||||
%endif; __SYSMAIN3__
|
||||
jmp .1+'JM' ; jump to the decompressor
|
||||
jmpl .1+'JM' ; jump to the decompressor
|
||||
.1:
|
||||
%include "header.ash"
|
||||
|
||||
|
@ -113,7 +114,7 @@ cutpoint:
|
|||
pop bx
|
||||
pop ax
|
||||
%endif; __SYSJUMP1__
|
||||
jmp eof+'JO'
|
||||
jmpl eof+'JO'
|
||||
eof:
|
||||
; __SYSTHEND__
|
||||
section .data
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
%include "macros.ash"
|
||||
|
||||
BITS 32
|
||||
|
@ -56,7 +57,7 @@ start:
|
|||
%ifdef __TMTCALT1__
|
||||
push edi
|
||||
%endif; __TMTMAIN2__
|
||||
jmp .1 + 'JMPD'
|
||||
jmpl .1 + 'JMPD'
|
||||
.1:
|
||||
%include "header.ash"
|
||||
|
||||
|
@ -93,7 +94,7 @@ cutpoint:
|
|||
|
||||
; =============
|
||||
; __TMTJUMP1__
|
||||
jmp .1+'JMPO'
|
||||
jmpl .1+'JMPO'
|
||||
.1:
|
||||
eof:
|
||||
; __TMTHEEND__
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
%define jnzn jnz near
|
||||
%define jbn jb near
|
||||
%include "macros.ash"
|
||||
|
@ -204,7 +205,7 @@ reloc_end_jmp:
|
|||
inc eax
|
||||
retn 0x0C
|
||||
%else; __PEDOJUMP__
|
||||
jmp .1+'JMPO'
|
||||
jmpl .1+'JMPO'
|
||||
.1:
|
||||
%endif; __PEDUMMY3__
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
|
||||
%define jmps jmp short
|
||||
%define jmpl jmp dword
|
||||
%include "macros.ash"
|
||||
|
||||
BITS 32
|
||||
|
@ -64,7 +65,7 @@ start:
|
|||
pop edi
|
||||
or ebp, byte -1
|
||||
push edi
|
||||
jmp .1 + 'JMPD'
|
||||
jmpl .1 + 'JMPD'
|
||||
.1:
|
||||
%include "header.ash"
|
||||
|
||||
|
@ -124,7 +125,7 @@ cutpoint:
|
|||
pop es
|
||||
lea esp, [ebp + 'ESP0']
|
||||
|
||||
jmp .1+'JMPO'
|
||||
jmpl .1+'JMPO'
|
||||
.1:
|
||||
|
||||
; =============
|
||||
|
|
Loading…
Reference in New Issue
Block a user