From ae8a6428f18390066d98601351d66c988e365cb0 Mon Sep 17 00:00:00 2001 From: Michael Kamprath Date: Sat, 27 Apr 2024 09:03:49 -0700 Subject: [PATCH] updated for minimal 64x4 bug fix --- examples/slu4-minimal-64x4/README.md | 1 - examples/slu4-minimal-64x4/slu4-minimal-64x4.yaml | 13 ------------- examples/slu4-minimal-64x4/software/primes.min64x4 | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/examples/slu4-minimal-64x4/README.md b/examples/slu4-minimal-64x4/README.md index 78e45f1..3ecb74a 100644 --- a/examples/slu4-minimal-64x4/README.md +++ b/examples/slu4-minimal-64x4/README.md @@ -53,7 +53,6 @@ The following instruction macros have been added in the ISA configuration file f | `mqq` | zero page address | zero page address | Copies a 4 byte long at the first zero page address to the 4 bytes at the second zero page address | | `mll` | abs address | abs address | Copies a 4 byte long at the first absolute address to the 4 bytes at the second absolute address | | `miq` | immediate | zero page address | Copies an immediate 4-byte long to a zero page long | -| `inq_` | zero page address | - | Increments a 4 byte long at a zero page address. Fixes the bug with the built-in `INQ` instruction as of v1.1.0 of the Minimal 64x4 OS. | ### Assembly Syntax **BespokeASM**'s syntax is close to the syntax that Carsten used for the Minimal 64x4's assembly language. However, there are some differences: diff --git a/examples/slu4-minimal-64x4/slu4-minimal-64x4.yaml b/examples/slu4-minimal-64x4/slu4-minimal-64x4.yaml index 2ffc26b..102c335 100644 --- a/examples/slu4-minimal-64x4/slu4-minimal-64x4.yaml +++ b/examples/slu4-minimal-64x4/slu4-minimal-64x4.yaml @@ -3016,16 +3016,3 @@ macros: instructions: - "miv @ARG(0) & $0000FFFF ,@ARG(1)+0" - "miv (@ARG(0) & $FFFF0000) >> 16,@ARG(1)+2" - inq_: - # increment zero-page long. This macro exists because the built-in instruction INQ has a bug. - - operands: - count: 1 - operand_sets: - list: - - zero_page - instructions: - - "inv @ARG(0)+0" - - "ldi 0" - - "ac.z @ARG(0)+2" - - "ldi 0" - - "ac.z @ARG(0)+3" diff --git a/examples/slu4-minimal-64x4/software/primes.min64x4 b/examples/slu4-minimal-64x4/software/primes.min64x4 index 2047708..e6a2551 100644 --- a/examples/slu4-minimal-64x4/software/primes.min64x4 +++ b/examples/slu4-minimal-64x4/software/primes.min64x4 @@ -27,7 +27,7 @@ start: phsptr is_prime_str jps _PrintPtr pls2 ; jps _WaitInput .increment_n: - inq_ _n_value + inq _n_value jpa .n_loop is_prime_str: .cstr " is prime!\n"