From 31c9420613ea528c998aa6e7b13c36734a6cc04f Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 13 Sep 2000 08:11:34 +0000 Subject: [PATCH] Added explicit `word' and `dword' to several jumps. committer: mfx 968832694 +0000 --- src/stub/Makefile | 2 ++ src/stub/l_com.asm | 3 ++- src/stub/l_djgpp2.asm | 1 + src/stub/l_exe.asm | 1 + src/stub/l_lx_elf86.asm | 1 + src/stub/l_lx_exec86.asm | 1 + src/stub/l_lx_sep86.asm | 1 + src/stub/l_lx_sh86.asm | 1 + src/stub/l_sys.asm | 5 +++-- src/stub/l_tmt.asm | 5 +++-- src/stub/l_w32pe.asm | 3 ++- src/stub/l_wcle.asm | 5 +++-- 12 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/stub/Makefile b/src/stub/Makefile index e80d73f3..1a8d0f22 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -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 diff --git a/src/stub/l_com.asm b/src/stub/l_com.asm index ddb36599..e5a9b9d1 100644 --- a/src/stub/l_com.asm +++ b/src/stub/l_com.asm @@ -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" diff --git a/src/stub/l_djgpp2.asm b/src/stub/l_djgpp2.asm index 734e1113..8d697577 100644 --- a/src/stub/l_djgpp2.asm +++ b/src/stub/l_djgpp2.asm @@ -26,6 +26,7 @@ %define jmps jmp short +%define jmpl jmp dword %include "macros.ash" BITS 32 diff --git a/src/stub/l_exe.asm b/src/stub/l_exe.asm index 7bc41a3f..2ba775ea 100644 --- a/src/stub/l_exe.asm +++ b/src/stub/l_exe.asm @@ -27,6 +27,7 @@ %define EXE %define jmps jmp short +%define jmpl jmp word BITS 16 ORG 0 diff --git a/src/stub/l_lx_elf86.asm b/src/stub/l_lx_elf86.asm index d37d92fe..d0f968ea 100644 --- a/src/stub/l_lx_elf86.asm +++ b/src/stub/l_lx_elf86.asm @@ -34,6 +34,7 @@ SECTION .text %define jmps jmp short +%define jmpl jmp dword ; 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 fb106876..0a841806 100644 --- a/src/stub/l_lx_exec86.asm +++ b/src/stub/l_lx_exec86.asm @@ -34,6 +34,7 @@ SECTION .text %define jmps jmp short +%define jmpl jmp dword ; 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 a7d1ff6d..be190009 100644 --- a/src/stub/l_lx_sep86.asm +++ b/src/stub/l_lx_sep86.asm @@ -34,6 +34,7 @@ SECTION .text %define jmps jmp short +%define jmpl jmp dword ; 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 9a78510a..11173047 100644 --- a/src/stub/l_lx_sh86.asm +++ b/src/stub/l_lx_sh86.asm @@ -34,6 +34,7 @@ SECTION .text %define jmps jmp short +%define jmpl jmp dword ; 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 7f2bfefc..eeb3c2f2 100644 --- a/src/stub/l_sys.asm +++ b/src/stub/l_sys.asm @@ -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 diff --git a/src/stub/l_tmt.asm b/src/stub/l_tmt.asm index 317a8558..3cd0fd6b 100644 --- a/src/stub/l_tmt.asm +++ b/src/stub/l_tmt.asm @@ -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__ diff --git a/src/stub/l_w32pe.asm b/src/stub/l_w32pe.asm index 53750ff6..0e8e1ed6 100644 --- a/src/stub/l_w32pe.asm +++ b/src/stub/l_w32pe.asm @@ -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__ diff --git a/src/stub/l_wcle.asm b/src/stub/l_wcle.asm index 68cdd246..8af73b33 100644 --- a/src/stub/l_wcle.asm +++ b/src/stub/l_wcle.asm @@ -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: ; =============