From 01e78384e9c65ac7f600e078d04a59ad0e7b1793 Mon Sep 17 00:00:00 2001 From: Rainer Schuetze Date: Sun, 30 Aug 2020 16:48:27 +0200 Subject: [PATCH] fix building with ml.exe that comes with VS 2019 --- common/cmdsubs.asm | 4 ++-- common/lnkinit.asm | 2 +- os2link/src/def.asm | 2 +- parse/hndllibs.asm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/cmdsubs.asm b/common/cmdsubs.asm index 8e633d8..0c99691 100644 --- a/common/cmdsubs.asm +++ b/common/cmdsubs.asm @@ -566,7 +566,7 @@ OPEN_ENVIRONMENT PROC TEST EDI,EDI JZ L99$ - MOV [EBX+ESI].NFN_TEXT,'=' + MOV [ESI+EBX].NFN_TEXT,'=' MOV EDX,ESI ASSUME EDX:PTR NFN_STRUCT @@ -604,7 +604,7 @@ L99$: MOV EAX,[EDX].NFN_TOTAL_LENGTH POPM EBX,EDI,ESI - MOV [EAX+EDX].NFN_TEXT,0 + MOV [EDX+EAX].NFN_TEXT,0 STC RET diff --git a/common/lnkinit.asm b/common/lnkinit.asm index 1e1ddaa..1053c75 100644 --- a/common/lnkinit.asm +++ b/common/lnkinit.asm @@ -1547,7 +1547,7 @@ CHECK_OUTPUT_TYPE PROC ADD EBX,[ESI].NFN_PRIMLEN MOV EAX,DPTR [ESI].NFN_FLAGS MOV ECX,[ESI].NFN_EXTLEN - LEA ESI,[EBX+ESI].NFN_TEXT + LEA ESI,[ESI+EBX].NFN_TEXT ASSUME ESI:NOTHING MOV EBX,0FFH diff --git a/os2link/src/def.asm b/os2link/src/def.asm index 41656a6..a549601 100644 --- a/os2link/src/def.asm +++ b/os2link/src/def.asm @@ -3418,7 +3418,7 @@ YY_MODNAME PROC NEAR MOV ECX,[EAX].NFN_TOTAL_LENGTH MOV EDX,[ESI] ;EXTENSION - MOV DPTR [ECX+EAX].NFN_TEXT,EDX + MOV DPTR [EAX+ECX].NFN_TEXT,EDX ADD ECX,4 MOV [EAX].NFN_TOTAL_LENGTH,ECX diff --git a/parse/hndllibs.asm b/parse/hndllibs.asm index c837a13..fda94cd 100644 --- a/parse/hndllibs.asm +++ b/parse/hndllibs.asm @@ -52,7 +52,7 @@ HANDLE_LIBS PROC MOV [EAX].NFN_PRIMLEN,EDX MOV [EAX].NFN_EXTLEN,EDX - MOV DPTR [ECX+EAX].NFN_TEXT,EDX + MOV DPTR [EAX+ECX].NFN_TEXT,EDX JMP STORE_LIBPATH HANDLE_LIBS ENDP @@ -413,7 +413,7 @@ HANDLE_RCS PROC ADD ECX,EDX - MOV ECX,DPTR [ECX+EAX].NFN_TEXT + MOV ECX,DPTR [EAX+ECX].NFN_TEXT CMP ECX,'SER.' JZ L1$