Merge pull request #14 from markdryan/markdryan/v11

Updates for the v11 release

Author: markdryan

.gitignore

@@ -23,13 +23,15 @@ SAIMPORT.X
 SAEXPORT.X
 SAMAKE
 SAMAKE.X
+SAMAC
 build.sh
 compile.sh
 !build/48/specasm/
 !bas/48/*.TAP
 !bas/128/*.TAP
 !bas/*.TAP
 build/48/specasm/release/
+build/128/specasm/release/
 !build/next/specasm/
 !build/128/specasm/
 build/next/specasm/release/
@@ -40,3 +42,4 @@ build/next/unit/tests/
 examples/hello/hello
 examples/hello/hello.x
 .DS_Store
+.vscode

README.md

@@ -1,19 +1,22 @@
 # Specasm
 
-Specasm is a Z80 assembler designed to run on the 48k and 128k ZX Spectrum and the ZX Spectrum Next.  It requires an SD card solution running ESXDOS 0.87 or greater to function on the 48Kb and 128Kb ZX Spectrum.  For detailed information about how Specasm works, please see the [documentation](https://github.com/markdryan/specasm/blob/master/docs/specasm.md).  To get started, carry on reading.
+Specasm is a Z80 assembler designed to run on the 48k and 128k ZX Spectrums and the ZX Spectrum Next.  It requires an SD card solution running ESXDOS 0.87 or greater to function on the 48Kb and 128Kb ZX Spectrum.  For detailed information about how Specasm works, please see the [documentation](https://github.com/markdryan/specasm/blob/master/docs/specasm.md).  To get started, carry on reading.
 
 ## Getting Started
 
 [Download](https://github.com/markdryan/specasm/releases) the latest release of Specasm appropriate for your Spectrum and unzip the contents of the file into the root directory of your SD card.
 
 > [!TIP]
-> There are three different Zip files available, specasm48.zip for the 48kb, specasm128.zip for the 128kb Spectrum, and specasmnext.zip for the ZX Spectrum Next.  You must download the appropriate version for your machine.
+> There are two different Zip files available, specasm.zip for the 48kb and 128kb Spectrums, and specasmnext.zip for the ZX Spectrum Next.  The specasm.zip file contains separate binaries and install scripts for both the 48kb and 128kb versions.  You must download the appropriate version for your machine.
 
-You should now have a folder in your root directory called SPECASM.  It should look something like this if you downloaded specasm48.zip
+You should now have a folder in your root directory called SPECASM.  It should look something like this if you downloaded specasm.zip
 
 ![Installing](/docs/install.png)
 
-Now navigate to the INSTALL.BAS file, which is a BASIC program, and press **ENTER** to execute it.  On the 48kb or 128kb Spectrum this will use ESXDOS's **.launcher** command to set up some command line short cuts for the tap files in the SPECASM directory.  It will also copy some executables to the /bin folder.  On the ZX Spectrum Next it will copy the various executable programs that compose Specasm to the /dot folder.
+To install Specasm you need to run a short BASIC program.  Run INST48.BAS when installing on a 48kb Spectrum, INST128.BAS when installing on a 128kb Spectrum and INSTALL.BAS when running on the Next.  Navigate to the appropriate install file and press **ENTER** to execute it.  On the 48kb or 128kb Spectrum this will use ESXDOS's **.launcher** command to set up some command line short cuts for the tap files in the SPECASM directory.  It will also copy some executables to the /bin folder.  On the ZX Spectrum Next it will copy the various executable programs that compose Specasm to the /dot folder.
+
+> [!TIP]
+> Note on previous releases of Specasm, there were separate zip files just for the 48kb and the 128kb Spectrums and users ran a BASIC script called INSTALL.BAS to install Specasm on these machines.  From release v11 onwards, the zip files for the 48kb and 128kb Spectrums have been combined and you must run INST48.BAS or INST128.BAS to install the correct version.  If you run the wrong install program by mistake just run REMOVE.BAS to uninstall Specasm and then execute the correct installer.
 
 ## Reinstalling Specasm
 

asm/sald128/sald128.s

@@ -8,6 +8,7 @@ dw calib
 dw bank0
 dw bank4
 dw bank6
+dw bank3
 dw bank1
 
 .calib
@@ -32,8 +33,10 @@ dw bank1
   align 4
 .bank128
 db 16,20,22,17
+db 19	
 .bankPlus2a
 db 16,17,19,20
+db 22
 
 .bank0
   ld c, 0
@@ -44,10 +47,12 @@ db 16,17,19,20
 .bank6
   ld c, 2
   jr switchBank
+.bank3
+  ld c, 4
+  jr switchBank
 .bank1
   ld c, 3
 
-
 .switchBank
   ld a, (=cpuid)
   cp 126

bas/128/INST128.BAS

@@ -58,6 +58,9 @@ editor_buffers.o: editor_buffers.c editor_buffers.h line.h \
   error.h
 scratch.o: scratch.c scratch.h line.h error.h
 analysis_banked.o: analysis.c state.h state_base.h line_common.h line.h error.h strings.h
+doc_banked.o: doc.c doc.h editor.h error.h line.h line_common.h peer.h peer_zx.h scratch.h util_print_zx.h
+descra2l_banked.o: descra2l.c descra2l.h
+descrm2z_banked.o: descrm2z.c descrm2z.h
 
 %.o: %.c
 	zcc $(CFLAGS) -o $@ -c $<

bas/128/specld.tap

@@ -37,6 +37,15 @@ editor_extra_banked.o: editor_extra.c
 analysis_banked.o: analysis.c
 	$(CC) $(CFLAGS) -DSPECASM_128_BANKED -o $@ --codesegBANK_6 --constsegBANK_6 --datasegBANK_6 -c $<
 
+doc_banked.o: doc.c
+	$(CC) $(CFLAGS) -DSPECASM_128_BANKED -o $@ --codesegBANK_3 --constsegBANK_3 --datasegBANK_3 -c $<
+
+descra2l_banked.o: descra2l.c
+	$(CC) $(CFLAGS) -DSPECASM_128_BANKED -o $@ --codesegBANK_3 --constsegBANK_3 --datasegBANK_3 -c $<
+
+descrm2z_banked.o: descrm2z.c
+	$(CC) $(CFLAGS) -DSPECASM_128_BANKED -o $@ --codesegBANK_3 --constsegBANK_3 --datasegBANK_3 -c $<
+
 clipboard.o: clipboard.c
 	$(CC) $(CFLAGS) -DSPECASM_128_BANKED -o $@ -c $<
 
@@ -67,7 +76,10 @@ SPECASM = \
 	ld_parse_banked.o \
 	editor_banked.o \
 	editor_extra_banked.o \
-	analysis_banked.o
+	analysis_banked.o \
+	doc_banked.o \
+	descra2l_banked.o \
+	descrm2z_banked.o
 
 specasm_bare.tap: $(SPECASM)
 	$(CC) $(CFLAGS) -zorg=32768 -m -startup=31 -o $@ $^ -pragma-include:zpragma.inc $(CZFLAGS)
@@ -80,8 +92,9 @@ specasm.tap: specasm_bare.tap sald128/sald128
 	z88dk-appmake +zx -b specasm_bare_BANK_0.bin -o bank0.tap --org 49152 --noloader
 	z88dk-appmake +zx -b specasm_bare_BANK_4.bin -o bank4.tap --org 49152 --noloader
 	z88dk-appmake +zx -b specasm_bare_BANK_6.bin -o bank6.tap --org 49152 --noloader
+	z88dk-appmake +zx -b specasm_bare_BANK_3.bin -o bank3.tap --org 49152 --noloader
 	z88dk-appmake +zx -b sald128/sald128 -o sald128.tap --org 32768 --noloader
-	cat ../../../bas/128/specld.tap sald128.tap bank0.tap bank4.tap bank6.tap specasm_bare.tap > specasm.tap
+	cat ../../../bas/128/specld.tap sald128.tap bank0.tap bank4.tap bank6.tap bank3.tap specasm_bare.tap > sa128.tap
 
 clean:
 	- rm -rf specasm *.zip -rf unitzx sald128
@@ -91,12 +104,15 @@ clean:
 release:
 	- rm -rf release
 	mkdir -p release/specasm
-	cp specasm.tap release/specasm
+	cp sa128.tap release/specasm
 	cp ../../48/specasm/salink.tap release/specasm
+	cp ../../48/specasm/specasm.tap release/specasm
+	cp ../../48/specasm/SAMAC_CODE.bin release/specasm/SAMAC
 	cp ../../../COPYING release/specasm
 	sed 's/```//g' ../../../docs/specasm.md > release/specasm/specasm.txt
 	cp ../../48/specasm/SAMAKE ../../48/specasm/SAIMPORT ../../48/specasm/SAEXPORT ../../48/specasm/*.X release/specasm
-	cp ../../../bas/48/INSTALL.BAS release/specasm
+	cp ../../../bas/128/INST128.BAS release/specasm
+	cp ../../../bas/48/INST48.BAS release/specasm
 	cp ../../../bas/48/REMOVE.BAS release/specasm
 	../../../buildlib.sh `realpath release` 128 specasm
-	cd release && zip -r specasm128.zip specasm
+	cd release && zip -r specasm.zip specasm

bas/48/INSTALL.BAS bas/48/INST48.BASbas/48/INSTALL.BAS renamed to bas/48/INST48.BAS

@@ -54,6 +54,7 @@ queued_files.o: queued_files.c peer.h error.h peer_zx.h \
 editor_buffers.o: editor_buffers.c editor_buffers.h line.h \
   error.h
 scratch.o: scratch.c scratch.h line.h error.h
+samac.o: samac.c error.h line.h scratch.h state.h state_base.h strings.h
 
 %.o: %.c
 	zcc $(CFLAGS) -o $@ -c $<