Update MASM to 6.11d

csoren · Apr 8, 2023 · 64b6f4c · 64b6f4c
1 parent 68a3cc3
commit 64b6f4c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -37,17 +37,17 @@ $(GLABIOS_DIR)/_patched: $(GLABIOS_DIR)/GLABIOS.ASM glabios.patch
 	touch $@
 
 $(GLABIOS_DIR)/GLANUXT8.ROM: $(GLABIOS_DIR)/GLABIOS.ASM $(GLABIOS_DIR)/_patched
-	dosbox GBN8.BAT -exit -c "MOUNT D \"masm" -c "PATH D:;Z:"
+	dosbox GBN8.BAT -exit -c "MOUNT D \"masm6" -c "PATH D:;Z:"
 
 $(GLABIOS_DIR)/GLANUXTV.ROM: $(GLABIOS_DIR)/GLABIOS.ASM $(GLABIOS_DIR)/_patched
-	dosbox GBNV.BAT -exit -c "MOUNT D \"masm" -c "PATH D:;Z:"
+	dosbox GBNV.BAT -exit -c "MOUNT D \"masm6" -c "PATH D:;Z:"
 
 $(GLATICK_DIR)/_patched: $(GLATICK_SRC) rtc.patch
 	-patch -r /dev/null -N $(GLATICK_DIR)/RTC.INC rtc.patch
 	touch $@
 
 $(GLATICK_DIR)/GLATICK.ROM: $(GLATICK_SRC) $(GLATICK_DIR)/_patched
-	dosbox TICKMK.BAT -exit -c "MOUNT D \"masm" -c "PATH D:;Z:"
+	dosbox TICKMK.BAT -exit -c "MOUNT D \"masm6" -c "PATH D:;Z:"
 
 $(FLOPPY_BIOS_DIR)/floppy_bios.bin:
 	$(MAKE) -C $(FLOPPY_BIOS_DIR) floppy_bios.bin

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # About
-This repository contains scripts, patches and build recipes for building a custom BIOS for the Monotech NuXT modern PC XT compatible system.
+This repository contains scripts, patches and build recipes for building a custom BIOS from source for the Monotech NuXT modern PC XT compatible system.
 
 It aggregates the [Micro 8088 BIOS](https://github.com/skiselev/8088_bios), [XT-IDE Universal BIOS](https://www.xtideuniversalbios.org/), [GLaBIOS](https://github.com/640-KB/GLaBIOS), [GLaTICK](https://github.com/640-KB/GLaTICK), [Multi-Floppy](https://github.com/skiselev/floppy_bios) and [IBM Cassette BASIC](https://en.wikipedia.org/wiki/IBM_BASIC) in order to build a hybrid BIOS consisting of two separate BIOS implementations.
 

diff --git a/masm/ML.EXE b/masm/ML.EXE
diff --git a/masm/DOSXNT.EXE → masm6/DOSXNT.EXE b/masm/DOSXNT.EXE → masm6/DOSXNT.EXE
diff --git a/masm/LINK.EXE → masm6/LINK.EXE b/masm/LINK.EXE → masm6/LINK.EXE
diff --git a/masm/MASM.EXE → masm6/MASM.EXE b/masm/MASM.EXE → masm6/MASM.EXE
diff --git a/masm/ML.ERR → masm6/ML.ERR b/masm/ML.ERR → masm6/ML.ERR
@@ -235,7 +235,9 @@ reference to forward macro definition
 16 bit segments not allowed with /coff option
 FAR not allowed in flat model comm variables
 invalid .model parameter for flat model
-.ALIAS directive not supported with /coff option
+ALIAS name is empty
+GROUP directive not allowed with /coff option
+.FPO is not compatible with nested procedures
 LEVEL 1
 cannot modify READONLY segment
 N/A
@@ -255,6 +257,9 @@ directive ignored with /coff switch
 /Gc switch incompatible with flat model
 /AT switch incompatible with flat model
 invalid command-line option
+directive ignored without /coff switch
+directive ignored outside a procedure
+LOADDS ignored in flat model
 LEVEL 2
 @@: label defined but not referenced
 expression expected, assume value 0

diff --git a/masm6/ML.EXE b/masm6/ML.EXE
diff --git a/masm/NMAKE.EXE → masm6/NMAKE.EXE b/masm/NMAKE.EXE → masm6/NMAKE.EXE
diff --git a/masm/NMAKER.EXE → masm6/NMAKER.EXE b/masm/NMAKER.EXE → masm6/NMAKER.EXE