Merge pull request #35 from rainers/fix_build_vs2019

fix building with ml.exe that comes with VS 2019
DigitalMars · Jul 8, 2021 · 493de15 · 493de15
2 parents 80f67c5 + 01e7838
commit 493de15
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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$