From e6cb4ab37ecbdfea360b87765e992fbc274126e7 Mon Sep 17 00:00:00 2001 From: Neil McPhail Date: Mon, 19 Jan 2026 09:20:37 +0000 Subject: [PATCH] Update boriel basic and sjasmplus to latest --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 2 +- README.md | 16 +++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 27066a0..fa7a057 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ unzip \ && rm -rf /var/lib/apt/lists/* -ADD https://github.com/z00m128/sjasmplus.git#v1.21.0 /sjasmplus +ADD https://github.com/z00m128/sjasmplus.git#v1.21.1 /sjasmplus RUN cd /sjasmplus && make -j8 && make install ADD https://boarstone.mcphail.uk/mcphail/spectrum_remload.git /ttttt RUN cd /ttttt && make ttttt @@ -20,7 +20,7 @@ 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.4-linux64.tar.gz . +ADD https://www.boriel.com/files/zxb/zxbasic-1.18.5-linux64.tar.gz . RUN tar xf zxbasic* ADD https://github.com/Mastodon-/inpaws.git /inpaws RUN cd /inpaws/ \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c2d4bbe..38e6904 100644 --- a/.devcontainer/devcontainer.json +++ b/.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:v4.0", + "image": "boarstone.mcphail.uk/mcphail/speccydev:v5.0", "remoteUser": "ubuntu", "runArgs": [ "--network=host" diff --git a/README.md b/README.md index 864d765..a1331ba 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Development tools for the ZX Spectrum v4.0 +# Development tools for the ZX Spectrum v5.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 version 0.5.3 (assembler) -- sjasmplus version 1.21.0 (assembler) +- sjasmplus version 1.21.1 (assembler) - z80asm version 1.8 (assembler) - z80dasm version 1.1.6 (disassembler) - zmakebas version 1.2b (creates BASIC programs) @@ -29,7 +29,7 @@ The devcontainer contains: - tzxlist - zx0 (binary compressor) - dzx0 (binary decompressor) -- ZX BASIC (aka Boriel BASIC) version 1.18.4 +- ZX BASIC (aka Boriel BASIC) version 1.18.5 - zxbc (BASIC compiler) - zxbasm (assembler) - zxbpp (preprocessor) @@ -62,15 +62,13 @@ Several useful VSCode extentsions will be installed, including a Z80 assembly la 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 +## Breaking changes from v4.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. +Boriel BASIC (zxbasic) has been updated. There have been further bug fixes to array bounds which may break old code reliant on previous behaviour. -## New additions from v2.x +## New additions from v4.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. +`sjasmplus` has been updated with new features. ## Install