From 400489aa55c4499cccc0bfb5bc4e9824e3f1d3ed Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 18 Sep 2000 10:47:54 +0000 Subject: [PATCH] Use "jmp near". committer: mfx 969274074 +0000 --- src/stub/l_com.asm | 4 ++-- src/stub/l_djgpp2.asm | 2 +- src/stub/l_exe.asm | 2 +- src/stub/l_lx_elf86.asm | 2 +- src/stub/l_lx_exec86.asm | 2 +- src/stub/l_lx_sep86.asm | 2 +- src/stub/l_lx_sh86.asm | 2 +- src/stub/l_sys.asm | 6 +++--- src/stub/l_tmt.asm | 6 +++--- src/stub/l_w32pe.asm | 4 ++-- src/stub/l_wcle.asm | 6 +++--- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/stub/l_com.asm b/src/stub/l_com.asm index e5a9b9d1..40aae76b 100644 --- a/src/stub/l_com.asm +++ b/src/stub/l_com.asm @@ -28,7 +28,7 @@ %define COM 1 %define CJT16 1 %define jmps jmp short -%define jmpl jmp word +%define jmpn jmp near %include "macros.ash" BITS 16 @@ -63,7 +63,7 @@ mem_ok: %ifdef __COMCALLT__ push di %endif; __COMMAIN2__ - jmpl .1+'JM' + jmpn .1+'JM' .1: %include "header.ash" diff --git a/src/stub/l_djgpp2.asm b/src/stub/l_djgpp2.asm index 8d697577..aa8625da 100644 --- a/src/stub/l_djgpp2.asm +++ b/src/stub/l_djgpp2.asm @@ -26,7 +26,7 @@ %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near %include "macros.ash" BITS 32 diff --git a/src/stub/l_exe.asm b/src/stub/l_exe.asm index 2ba775ea..bba73bb0 100644 --- a/src/stub/l_exe.asm +++ b/src/stub/l_exe.asm @@ -27,7 +27,7 @@ %define EXE %define jmps jmp short -%define jmpl jmp word +%define jmpn jmp near BITS 16 ORG 0 diff --git a/src/stub/l_lx_elf86.asm b/src/stub/l_lx_elf86.asm index d0f968ea..dffa36e9 100644 --- a/src/stub/l_lx_elf86.asm +++ b/src/stub/l_lx_elf86.asm @@ -34,7 +34,7 @@ SECTION .text %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near ; defines for ident.ash and n2b_d32.ash %ifdef SMALL diff --git a/src/stub/l_lx_exec86.asm b/src/stub/l_lx_exec86.asm index 0a841806..235183e4 100644 --- a/src/stub/l_lx_exec86.asm +++ b/src/stub/l_lx_exec86.asm @@ -34,7 +34,7 @@ SECTION .text %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near ; defines for ident.ash and n2b_d32.ash %ifdef SMALL diff --git a/src/stub/l_lx_sep86.asm b/src/stub/l_lx_sep86.asm index be190009..d66aa403 100644 --- a/src/stub/l_lx_sep86.asm +++ b/src/stub/l_lx_sep86.asm @@ -34,7 +34,7 @@ SECTION .text %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near ; defines for ident.ash and n2b_d32.ash %ifdef SMALL diff --git a/src/stub/l_lx_sh86.asm b/src/stub/l_lx_sh86.asm index 11173047..7e0047be 100644 --- a/src/stub/l_lx_sh86.asm +++ b/src/stub/l_lx_sh86.asm @@ -34,7 +34,7 @@ SECTION .text %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near ; defines for ident.ash and n2b_d32.ash %ifdef SMALL diff --git a/src/stub/l_sys.asm b/src/stub/l_sys.asm index eeb3c2f2..4511c670 100644 --- a/src/stub/l_sys.asm +++ b/src/stub/l_sys.asm @@ -29,7 +29,7 @@ %define COM 0 %define CJT16 1 %define jmps jmp short -%define jmpl jmp word +%define jmpn jmp near %include "macros.ash" BITS 16 @@ -81,7 +81,7 @@ strategy: %ifdef __SYSCALLT__ push di %endif; __SYSMAIN3__ - jmpl .1+'JM' ; jump to the decompressor + jmpn .1+'JM' ; jump to the decompressor .1: %include "header.ash" @@ -114,7 +114,7 @@ cutpoint: pop bx pop ax %endif; __SYSJUMP1__ - jmpl eof+'JO' + jmpn eof+'JO' eof: ; __SYSTHEND__ section .data diff --git a/src/stub/l_tmt.asm b/src/stub/l_tmt.asm index 3cd0fd6b..709769a0 100644 --- a/src/stub/l_tmt.asm +++ b/src/stub/l_tmt.asm @@ -26,7 +26,7 @@ %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near %include "macros.ash" BITS 32 @@ -57,7 +57,7 @@ start: %ifdef __TMTCALT1__ push edi %endif; __TMTMAIN2__ - jmpl .1 + 'JMPD' + jmpn .1+'JMPD' .1: %include "header.ash" @@ -94,7 +94,7 @@ cutpoint: ; ============= ; __TMTJUMP1__ - jmpl .1+'JMPO' + jmpn .1+'JMPO' .1: eof: ; __TMTHEEND__ diff --git a/src/stub/l_w32pe.asm b/src/stub/l_w32pe.asm index 0e8e1ed6..734e7d6d 100644 --- a/src/stub/l_w32pe.asm +++ b/src/stub/l_w32pe.asm @@ -26,7 +26,7 @@ %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near %define jnzn jnz near %define jbn jb near %include "macros.ash" @@ -205,7 +205,7 @@ reloc_end_jmp: inc eax retn 0x0C %else; __PEDOJUMP__ - jmpl .1+'JMPO' + jmpn .1+'JMPO' .1: %endif; __PEDUMMY3__ diff --git a/src/stub/l_wcle.asm b/src/stub/l_wcle.asm index 8af73b33..b6f215bc 100644 --- a/src/stub/l_wcle.asm +++ b/src/stub/l_wcle.asm @@ -26,7 +26,7 @@ %define jmps jmp short -%define jmpl jmp dword +%define jmpn jmp near %include "macros.ash" BITS 32 @@ -65,7 +65,7 @@ start: pop edi or ebp, byte -1 push edi - jmpl .1 + 'JMPD' + jmpn .1+'JMPD' .1: %include "header.ash" @@ -125,7 +125,7 @@ cutpoint: pop es lea esp, [ebp + 'ESP0'] - jmpl .1+'JMPO' + jmpn .1+'JMPO' .1: ; =============