Update to newest Boriel BASIC

.devcontainer/Dockerfile

@@ -3,25 +3,47 @@
 FROM ubuntu:24.04 AS build
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
+	autoconf \
+	automake \
 	build-essential \
+	fpc \
 	make \
+	python3-pip \
+	unzip \
 	&& rm -rf /var/lib/apt/lists/*
 
 ADD https://github.com/z00m128/sjasmplus.git#v1.21.0 /sjasmplus
-RUN cd /sjasmplus && make && make install
+RUN cd /sjasmplus && make -j8 && make install
 ADD https://boarstone.mcphail.uk/mcphail/spectrum_remload.git /ttttt
 RUN cd /ttttt && make ttttt
 ADD https://github.com/einar-saukas/ZX0.git /zx0
 RUN cd /zx0/src/ \
 	&& gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \
 	&& gcc -O2 -o dzx0 dzx0.c
-ADD https://www.boriel.com/files/zxb/zxbasic-1.18.1-linux64.tar.gz .
+ADD https://www.boriel.com/files/zxb/zxbasic-1.18.4-linux64.tar.gz .
 RUN tar xf zxbasic*
+ADD https://github.com/Mastodon-/inpaws.git /inpaws
+RUN cd /inpaws/ \
+	&& make -j8
+RUN python3 -m pip install --break-system-packages skoolkit
+ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey
+RUN cd /hdfmonkey/ \
+	&& autoheader \
+	&& aclocal \
+	&& autoconf \
+	&& automake -a \
+	&& ./configure \
+	&& make -j16 \
+	&& make install
+ADD https://github.com/pleumann/pasta80.git#v0.96 /opt/pasta80
+RUN cd /opt/pasta80 \
+	&& fpc pasta
 
-FROM build AS z88dk
+FROM ubuntu:24.04 AS z88dk
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	bison \
+	build-essential \
 	ca-certificates \
 	ccache \
 	cpanminus \
@@ -44,6 +66,7 @@ RUN apt-get update \
 	libxml2-dev \
 	libyaml-perl \
 	m4 \
+	make \
 	perl \
 	pkg-config \
 	ragel \
@@ -54,11 +77,11 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 ENV Z88DK_PATH="/opt/z88dk"
 RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
-	&& git clone --depth 1 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
+	&& git clone --depth 1 --branch v2.4 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
 	&& cd ${Z88DK_PATH} \ 
 	&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
 	&& chmod 777 build.sh \
-	&& BUILD_SDCC=1 BUILD_SDCC_HTTP=1 ./build.sh \
+	&& BUILD_SDCC=1 BUILD_SDCC_HTTP=1 MAKE_CONCURRENCY=-j8 ./build.sh \
 	&& make install-clean bins-clean 
 
 FROM ubuntu:24.04
@@ -67,6 +90,7 @@ RUN apt-get update \
 	ca-certificates \
 	fuse-emulator-utils \
 	git \
+	m4 \
 	make \
 	openssh-client \
 	pasmo \
@@ -83,11 +107,13 @@ COPY --from=build /zxbasic/zxbasm.py /opt/zxbasic/zxbasm
 COPY --from=build /zxbasic/zxbc.py /opt/zxbasic/zxbc
 COPY --from=build /zxbasic/zxbpp.py /opt/zxbasic/zxbpp
 COPY --from=build /zxbasic/src /opt/zxbasic/src
-COPY --from=z88dk /opt/z88dk/bin /opt/z88dk/bin
-COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib
-COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include
-ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic"
+COPY --from=build /zxbasic/tools /opt/zxbasic/tools
+COPY --from=build /inpaws/inpaws /bin/inpaws
+COPY --from=build /usr/local/bin/ /usr/local/bin/
+COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/
+COPY --from=build /usr/local/bin/hdfmonkey /bin/hdfmonkey
+COPY --from=build /opt/pasta80 /opt/pasta80
+COPY --from=z88dk /opt/z88dk/ /opt/z88dk/
+ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools:/opt/pasta80"
 ENV ZCCCFG="/opt/z88dk/lib/config"
 USER ubuntu
-RUN echo "PATH=$PATH:/opt/z88dk/bin:/opt/zxbasic" >> ~/.profile
-RUN echo "export ZCCCFG=/opt/z88dk/lib/config/" >> ~/.profile

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 	"name": "ZX Spectrum dev tools",
 	//"build": { "dockerfile": "Dockerfile" },
 	// The Dockerfile takes an age to build due to z88dk, so pull from prebuilt:
-	"image": "boarstone.mcphail.uk/mcphail/speccydev:stable",
+	"image": "boarstone.mcphail.uk/mcphail/speccydev:v4.0",
 	"remoteUser": "ubuntu",
 	"runArgs": [
 		"--network=host"

.gitignore

@@ -1,4 +1,8 @@
 .tmp/
 *.tap
 *.sna
-*.sld
+*.sld
+*.tzx
+*.block
+*.zx0
+*.bin

LICENCE

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

Makefile

@@ -1,14 +1,35 @@
-myprog.sna myprog.tap myprog.sld: main.asm loader.asm print.asm
-	sjasmplus --sld=myprog.sld --fullpath main.asm
+speccydev.tzx: speccydev.tap
+	tapeconv speccydev.tap speccydev.tzx
+
+speccydev.tap: sjasm.tap loader.tap boriel.zx0.block
+	cat loader.tap sjasm.tap boriel.zx0.block > speccydev.tap
+
+myprog.sna sjasm.tap myprog.sld: speccydev.asm dzx0_standard.asm boriel.zx0
+	sjasmplus --sld=myprog.sld --fullpath speccydev.asm
+
+loader.tap: loader.bas
+	zmakebas -a 30 -n SpeccyDev -o loader.tap loader.bas
+
+boriel.bin: boriel.zxb
+	zxbc -S 40000 -o boriel.bin boriel.zxb
+
+boriel.zx0: boriel.bin
+	zx0 -f boriel.bin boriel.zx0
+
+boriel.zx0.block: boriel.zx0
+	ttttt boriel.zx0 data
 
 clean:
 	rm -f *.tap
 	rm -f *.sna
 	rm -f *.sld
+	rm -f *.block
+	rm -f *.tzx
+	rm -f *.bin
+	rm -f *.zx0
 	rm -rf .tmp/
 
-start_new_project:
-	make clean
+start_new_project: clean
 	rm -rf .git
 	git init -b main
 	git add .devcontainer/ .vscode/ .gitignore

README.md

@@ -1,15 +1,15 @@
-# Development tools for the ZX Spectrum
+# Development tools for the ZX Spectrum v4.0
 
 The Dockerfile is the basis of the devcontainer and can be changed to add or remove tools. It will take a long time to build locally, so by default the devcontainer will pull a prebuilt version. Edit `.devcontainer/devcontainer.json` if you would rather build your own.
 
 The devcontainer contains:
-- pasmo (assembler)
-- sjasmplus (assembler)
-- z80asm (assembler)
-- z80dasm (disassembler)
-- zmakebas (creates BASIC programs)
-- z88dk (C compiler and other utilities including assembler)
-- utilities from the FUSE emulator:
+- pasmo version 0.5.3 (assembler)
+- sjasmplus version 1.21.0 (assembler)
+- z80asm version 1.8 (assembler)
+- z80dasm version 1.1.6 (disassembler)
+- zmakebas version 1.2b (creates BASIC programs)
+- z88dk version 2.4 (C compiler and other utilities including assembler)
+- utilities from the FUSE emulator version 1.4.3:
     - audio2tape
     - createhdf
     - fmfconv
@@ -29,15 +29,110 @@ The devcontainer contains:
     - tzxlist
 - zx0 (binary compressor)
 - dzx0 (binary decompressor)
-- ZX BASIC (aka Boriel BASIC)
+- ZX BASIC (aka Boriel BASIC) version 1.18.4
     - zxbc (BASIC compiler)
     - zxbasm (assembler)
     - zxbpp (preprocessor)
+    - various tools including nextcreator.py to build .nex files
 - ttttt (converts binaries into .tap blocks)
+- inpaws version 1.0.2 (interactive fiction compiler/extractor for Gilsoft's PAW)
+- skoolkit version 9.6 (tools for creating browseable disassemblies of Spectrum games)
+    - sna2ctl.py
+    - sna2skool.py
+    - skool2html.py
+    - skool2asm.py
+    - skool2ctl.py
+    - skool2bin.py
+    - tap2sna.py
+    - snapinfo.py
+    - trace.py
+    - rzxplay.py
+    - tapinfo.py
+    - rzxinfo.py
+    - bin2tap.py
+    - bin2sna.py
+    - snapmod.py
+    - sna2img.py
+- pasta80 version 0.96 (PASCAL compiler)
+- hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next)
 - git (version control)
 - make (build control)
 
-Build the example project by running `make` from the terminal or the VSCode extension.
+Several useful VSCode extentsions will be installed, including a Z80 assembly language server, Z80 and C debugger, Makefile support, BASIC syntax highlighter and more.
+
+Thanks to the many authors of these wonderful tools and extensions; to think what we could have made with these in 1985!
+
+## Breaking changes from v3.x
+
+Boriel BASIC (zxbasic) has been updated. There have been further bug fixes to array referencing which may break old code reliant on previous behaviour.
+
+## New additions from v2.x
+
+The `pasta80` PASCAL compiler has been added. Example code is in `/opt/pasta80/examples`. Invoke the compiler by running `pasta`. A fun feature is that it can run in an IDE mode with vscode integration by running `pasta --ide`!
+
+`hdfmonkey` is a useful tool for manipulating the sdcard images needed for the Spectrum Next and its emulators.
+
+## Install
+
+This devcontainer should work in Windows, Linux and MacOS. It is recommended to install:
+- git, then configure user name and email address
+- docker, or alternative like podman
+- (Windows only, optional) Windows Subsystem for Linux, version 2
+- Microsoft's vscode
+- the "Dev Containers" extension (from Microsoft) within vscode
+
+Make sure docker (or your alternative) is running before trying to use the devcontainer.
+
+## Usage
+
+![A terminal window running the commands outlined below](res/speccydev.gif)
+
+Open a terminal and navigate to the directory which will contain your Spectrum projects. Run `git clone https://github.com/mcphail/speccydev.git your_project_name` and enter that directory. Start vscode by running `code .` inside the directory.
+
+If you have installed the Dev Containers extension correctly, a popup will offer to reload the project within a devcontainer. Go ahead and allow this. The first time you use this devcontainer, it may take a few minutes to download and start. It should open more quickly on subsequent use.
+
+Open the bottom bar in vscode to expose the terminal or select "Terminal -> New Terminal" from the menu bar. Try running some Linux commands like `ls -lh` or `date`. Build the example project by running `make` from the terminal or the VSCode extension. Experiment with editing some of the source files and running `make` again. Experiment with some of the assemblers, compilers and other tools mentioned above. The `Makefile` contains example usage of tools like sjasmplus, zmakebas, Boriel's BASIC and the FUSE utilities.
+
+When you are ready to start your own project, run `make start_new_project` to wipe out the example code and start afresh.
+
+## Versions
+
+This `main` branch of this repository will always point to the latest numbered release of the devcontainer image. This image will contain specific, numbered releases of the various tools as documented above. If the devcontainer is updated with non-breaking changes, the minor version number will be incremented. This gives reassurance that, say, a v1.7 devcontainer will contain tools which can compile programs made with a v1.2 devcontainer without issue.
+
+If there is a breaking change in the tools, the major version number will be incremented. So a v2.0 devcontainer may not build projects made in a v1.7 devcontainer correctly. Please ensure all your collaborators are using appropriate devcontainer versions.
+
+## Debugging
+
+Debug in the built in simulator or in CSpect externally (example CSpect invocation on Windows would be `CSpect.exe -w2 -debug -remote`). The simulator is set up to expect a binary called `myprog.sna` and a map file called `myprog.sld` but this can be configured in the `.vscode/launch.json` file.
 
-Debug in the built in simulator or in CSpect externally (example CSpect invocation on Windows would be `CSpect.exe -w2 -debug -remote`).
 *Note: to use CSpect debugging from a Linux host you will have to edit the file `.vscode/launch.json` to change the `"hostname"` parameter to `"localhost"`*
+
+## Licences
+
+pamso - copyright Julián Albo and released under the GPL
+
+sjasmplus - copyright aprisobal and released under BSD 3-clause
+
+z80asm - copyright Bas Wijnen and released under GPL v3 or later
+
+z80dasm - copyright Jan Panteltje and Tomaz Solc and released under GPL v2
+
+zmakebas - placed under Public Domain by Russell Marks
+
+z88dk - copyright the z88dk authors and released under the Clarified Artistic License
+
+FUSE utilities - copyright Philip Kendall and contributors and released under GPL v2
+
+zx0 and dzx0 - copyright Einar Saukas and released under BSD 3-clause
+
+Boriel BASIC - copyleft Jose Rodriguez-Rosa and released under AGPL v3 and portions under MIT
+
+ttttt - placed under Public Domain by Neil McPhail
+
+inpaws - copyright "Mastodon" and released under GPL v3
+
+skoolkit - copyright Richard Dymond and Philip M Anderson and released under GPL v3 or later
+
+hdfmonkey - copyright Matt Westcott and released under GPL v3
+
+PASTA/80 - copyright Jörg Pleumann and released under GPL v3 with linking exception

boriel.zxb

@@ -0,0 +1,5 @@
+10 CLS
+20 FOR i = 0 TO 23
+30 PRINT "ZX Spectrum Rules OK!"
+40 NEXT i
+50 PAUSE 0

dzx0_standard.asm

@@ -0,0 +1,61 @@
+; -----------------------------------------------------------------------------
+; ZX0 decoder by Einar Saukas & Urusergi
+; "Standard" version (68 bytes only)
+; -----------------------------------------------------------------------------
+; Parameters:
+;   HL: source address (compressed data)
+;   DE: destination address (decompressing)
+; -----------------------------------------------------------------------------
+
+dzx0_standard:
+        ld      bc, $ffff               ; preserve default offset 1
+        push    bc
+        inc     bc
+        ld      a, $80
+dzx0s_literals:
+        call    dzx0s_elias             ; obtain length
+        ldir                            ; copy literals
+        add     a, a                    ; copy from last offset or new offset?
+        jr      c, dzx0s_new_offset
+        call    dzx0s_elias             ; obtain length
+dzx0s_copy:
+        ex      (sp), hl                ; preserve source, restore offset
+        push    hl                      ; preserve offset
+        add     hl, de                  ; calculate destination - offset
+        ldir                            ; copy from offset
+        pop     hl                      ; restore offset
+        ex      (sp), hl                ; preserve offset, restore source
+        add     a, a                    ; copy from literals or new offset?
+        jr      nc, dzx0s_literals
+dzx0s_new_offset:
+        pop     bc                      ; discard last offset
+        ld      c, $fe                  ; prepare negative offset
+        call    dzx0s_elias_loop        ; obtain offset MSB
+        inc     c
+        ret     z                       ; check end marker
+        ld      b, c
+        ld      c, (hl)                 ; obtain offset LSB
+        inc     hl
+        rr      b                       ; last offset bit becomes first length bit
+        rr      c
+        push    bc                      ; preserve new offset
+        ld      bc, 1                   ; obtain length
+        call    nc, dzx0s_elias_backtrack
+        inc     bc
+        jr      dzx0s_copy
+dzx0s_elias:
+        inc     c                       ; interlaced Elias gamma coding
+dzx0s_elias_loop:
+        add     a, a
+        jr      nz, dzx0s_elias_skip
+        ld      a, (hl)                 ; load another group of 8 bits
+        inc     hl
+        rla
+dzx0s_elias_skip:
+        ret     c
+dzx0s_elias_backtrack:
+        add     a, a
+        rl      c
+        rl      b
+        jr      dzx0s_elias_loop
+; -----------------------------------------------------------------------------

loader.asm

@@ -1,25 +0,0 @@
-    MODULE basic_loader
-    ORG #5c00
-basic_start:
-    db 0, 0     ; line number
-    dw line_length
-line_start:
-    db #fd, '0', #0e, 0, 0  ; CLEAR
-    dw code_start_addr - 1
-    db 0, ':'
-    db #ef, '"'             ; LOAD "
-    db "code"
-    db '"', #af, ':'        ; name"CODE
-    db #f5, #c0             ; PRINT USR
-    db '0', #0e, 0, 0
-    dw code_run_addr
-    db 0, #0d
-
-line_length EQU $ - line_start
-basic_length EQU $ - basic_start
-
-    EMPTYTAP "myprog.tap"
-    SAVETAP "myprog.tap", BASIC, "myprog", basic_start, basic_length, 0
-    SAVETAP "myprog.tap", CODE, "code", code_start_addr, code_length
-
-    ENDMODULE

loader.bas

@@ -0,0 +1,5 @@
+10 REM This file was created
+20 REM          using zmakebas
+30 CLEAR 32767
+40 LOAD ""CODE
+50 RANDOMIZE USR 32768

main.asm

@@ -1,22 +0,0 @@
-code_start_addr EQU #8000
-    ORG code_start_addr
-
-    MODULE main
-@code_run_addr:
-    ld a, 57
-    ld bc, 64
-    ld hl, 0
-    call print_string
-    db "Hello, world!", 0
-    ret
-
-    ENDMODULE
-
-    INCLUDE print.asm
-
-code_length EQU $ - code_start_addr
-
-    DEVICE ZXSPECTRUM48
-    SLDOPT COMMENT WPMEM, LOGPOINT, ASSERTION
-    SAVESNA "myprog.sna", code_run_addr
-    INCLUDE loader.asm

print.asm

@@ -1,180 +0,0 @@
-ink_black EQU 0
-ink_blue EQU 1
-ink_red EQU 2
-ink_magenta EQU 3
-ink_green EQU 4
-ink_cyan EQU 5
-ink_yellow EQU 6
-ink_white EQU 7
-black EQU ink_black
-blue EQU ink_blue
-red EQU ink_red
-magenta EQU ink_magenta
-green EQU ink_green
-cyan EQU ink_cyan
-yellow EQU ink_yellow
-white EQU ink_white
-paper_black EQU 0
-paper_blue EQU 8
-paper_red EQU 16
-paper_magenta EQU 24
-paper_green EQU 32
-paper_cyan EQU 40
-paper_yellow EQU 48
-paper_white EQU 56
-bright EQU 64
-flash EQU 128
-attr_list_end EQU flash | bright | ink_black | paper_black
-
-    MODULE print
-bm_start EQU #4000
-attr_area EQU #5800
-bm_len EQU 6144
-attr_len EQU 768
-CHARS EQU #5c36
-char_posn:
-    dw #4000
-
-        MODULE print_string
-; Set HL to be row and column and follow the call with a null-terminated string
-; All registers preserved
-; char_posn will have been moved to after string, but HL will still have coordinates of string start
-@print_string:
-    call set_char_posn
-    ex (sp), hl
-    push af
-loop:
-    ld a, (hl)
-    inc hl
-    or a
-    jr z, exit
-    call print_char
-    jr loop
-exit:
-    pop af
-    ex (sp), hl
-    ret
-        ENDMODULE
-
-        MODULE print_char
-; Prints the single character from the A register
-; All registers preserved
-; char_posn will point to next square
-@print_char:
-    push hl
-    push de
-    push af
-    ld h, 0
-    ld l, a
-    add hl, hl
-    add hl, hl
-    add hl, hl
-    ld d, h
-    ld e, l
-    ld hl, (print.CHARS)
-    add hl, de
-    ld d, h
-    ld e, l
-    ld hl, (print.char_posn)
-    push bc
-    ld b, 8
-loop:
-    ld a, (de)
-    ld (hl), a
-    inc h
-    inc de
-    djnz loop
-    ld hl, (print.char_posn)
-    inc l
-    jr nz, update_char_posn
-    ld a, #50
-    cp h
-    jr nz, next_third
-    ld hl, print.bm_start
-    jr update_char_posn
-next_third:
-    ld a, 8
-    add a, h
-    ld h, a
-update_char_posn:
-    ld (print.char_posn), hl
-    pop bc
-    pop af
-    pop de
-    pop hl
-    ret
-        ENDMODULE
-
-        MODULE set_char_posn
-; Pass row and column, in that order, in HL
-@set_char_posn:
-    push hl
-    push af
-    ld a, h
-    ; check for top third
-    ld h, %01000000
-    sub 8
-    jr c, set_column
-    ; check for middle third
-    ld h, %01001000
-    sub 8
-    jr c, set_column
-    ; must be bottom third
-    ld h, %01010000
-    sub 8
-set_column:
-    ; restore the row offset of the third and shift it into upper 3 bits of L
-    add a, 8
-    sla a
-    sla a
-    sla a
-    sla a
-    sla a
-    or l
-    ld l, a
-    ld (print.char_posn), hl
-    pop af
-    pop hl
-    ret
-        ENDMODULE
-
-        MODULE set_attributes
-; Row and column in HL
-; db list of attributes follows call
-; terminate with attr_list_end byte (bright flashing black on black)
-@set_attributes:
-        ex de, hl
-        ex (sp), hl
-        push de
-        push hl
-        ld h, 0
-        ld l, d
-        ld d, h
-        add hl, hl
-        add hl, hl
-        add hl, hl
-        add hl, hl
-        add hl, hl
-        add hl, de
-        ld de, print.attr_area
-        add hl, de
-        pop de
-        ex de, hl
-        push af
-loop:
-        ld a, (hl)
-        inc hl
-        cp attr_list_end
-        jr z, exit
-        ld (de), a
-        inc de
-        jr loop
-exit:
-        pop af
-        pop de
-        ex (sp), hl
-        ex de, hl
-        ret
-        ENDMODULE
-
-    ENDMODULE

speccydev.asm

@@ -0,0 +1,36 @@
+code_start_addr EQU #8000
+    org code_start_addr
+
+    ; headerless load
+    scf
+    ld a, #ff
+    ld de, boriel_size
+    ld ix, compressed_boriel
+    call #0556
+
+decompress:
+    ld hl, compressed_boriel
+    ld de, uncompressed_boriel
+    call dzx0.dzx0_standard
+
+    call uncompressed_boriel
+    ret
+
+    MODULE dzx0
+    INCLUDE "dzx0_standard.asm"
+    ENDMODULE
+
+code_length EQU $ - code_start_addr
+
+compressed_boriel:
+    INCBIN "boriel.zx0"
+boriel_size EQU $ - compressed_boriel
+
+uncompressed_boriel EQU 40000
+
+
+    DEVICE ZXSPECTRUM48
+    SLDOPT COMMENT WPMEM, LOGPOINT, ASSERTION
+    SAVESNA "myprog.sna", decompress
+    EMPTYTAP "sjasm.tap"
+    SAVETAP "sjasm.tap", CODE, "sjasm", code_start_addr, code_length