From f340b6a1a655688aed697b795735aced05acf131 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Fri, 24 May 2019 21:45:17 +0200 Subject: [PATCH] Update array access Do some little optimizations for the ARRAY access routine. Also changes test root for #line directives --- library-asm/array.asm | 29 +-------------- tests/functional/27.asm | 4 +-- tests/functional/28.asm | 4 +-- tests/functional/29.asm | 4 +-- tests/functional/46.asm | 39 ++++---------------- tests/functional/47.asm | 39 ++++---------------- tests/functional/48.asm | 4 +-- tests/functional/49.asm | 4 +-- tests/functional/55.asm | 39 ++++---------------- tests/functional/addstr.asm | 4 +-- tests/functional/aloadstr0.asm | 4 +-- tests/functional/aloadstr1.asm | 43 +++++----------------- tests/functional/arden2.asm | 4 +-- tests/functional/array03.asm | 39 ++++---------------- tests/functional/array06.asm | 39 ++++---------------- tests/functional/array07.asm | 43 +++++----------------- tests/functional/array08.asm | 43 +++++----------------- tests/functional/array09.asm | 43 +++++----------------- tests/functional/array10.asm | 39 ++++---------------- tests/functional/array12.asm | 43 +++++----------------- tests/functional/arrbase1.asm | 43 +++++----------------- tests/functional/arrcheck.asm | 39 ++++---------------- tests/functional/astore16.asm | 43 +++++----------------- tests/functional/attr.asm | 6 ++-- tests/functional/chr.asm | 4 +-- tests/functional/chr0.asm | 4 +-- tests/functional/chr1.asm | 4 +-- tests/functional/code00.asm | 10 +++--- tests/functional/code01.asm | 10 +++--- tests/functional/code02.asm | 10 +++--- tests/functional/codecrash2.asm | 4 +-- tests/functional/codecrash3.asm | 4 +-- tests/functional/codecrash4.asm | 4 +-- tests/functional/coercion3.asm | 6 ++-- tests/functional/einarattr.asm | 4 +-- tests/functional/einarshift.asm | 4 +-- tests/functional/emptystrparam.asm | 4 +-- tests/functional/fact.asm | 4 +-- tests/functional/fastcall0.asm | 20 +++++------ tests/functional/file_macro.asm | 4 +-- tests/functional/for0.asm | 4 +-- tests/functional/id_substr_eq_expr.asm | 4 +-- tests/functional/ifelse1.asm | 4 +-- tests/functional/ifwhilex.asm | 4 +-- tests/functional/inkey.asm | 8 ++--- tests/functional/inktemp.asm | 6 ++-- tests/functional/label_sent2.asm | 6 ++-- tests/functional/label_sent3.asm | 6 ++-- tests/functional/label_sent4.asm | 6 ++-- tests/functional/label_sent5.asm | 6 ++-- tests/functional/lcd3.asm | 8 ++--- tests/functional/lcd7.asm | 8 ++--- tests/functional/lcd8.asm | 8 ++--- tests/functional/lcd9.asm | 8 ++--- tests/functional/let_array_substr.asm | 43 +++++----------------- tests/functional/let_array_substr1.asm | 43 +++++----------------- tests/functional/let_array_substr10.asm | 4 +-- tests/functional/let_array_substr11.asm | 4 +-- tests/functional/let_array_substr12.asm | 4 +-- tests/functional/let_array_substr13.asm | 4 +-- tests/functional/let_array_substr2.asm | 4 +-- tests/functional/let_array_substr3.asm | 4 +-- tests/functional/let_array_substr5.asm | 43 +++++----------------- tests/functional/let_array_substr7.asm | 4 +-- tests/functional/let_array_substr9.asm | 4 +-- tests/functional/letarrstr_substr0.asm | 4 +-- tests/functional/letarrstr_substr1.asm | 4 +-- tests/functional/llc.asm | 4 +-- tests/functional/load02.asm | 10 +++--- tests/functional/load03.asm | 10 +++--- tests/functional/loadstr.asm | 4 +-- tests/functional/loadu16ii.asm | 4 +-- tests/functional/ltee1.asm | 8 ++--- tests/functional/ltee10.asm | 39 ++++---------------- tests/functional/ltee3.asm | 4 +-- tests/functional/ltee5.asm | 4 +-- tests/functional/ltee6.asm | 43 +++++----------------- tests/functional/ltee7.asm | 43 +++++----------------- tests/functional/lvalsubstr_nolet.asm | 4 +-- tests/functional/mcleod2.asm | 4 +-- tests/functional/memcpytest.asm | 4 +-- tests/functional/ongoto.asm | 4 +-- tests/functional/opt2_pstr.asm | 4 +-- tests/functional/opt2_snake_es.asm | 39 ++++---------------- tests/functional/opt3_OPT27wws2.asm | 39 ++++---------------- tests/functional/opt3_data2.asm | 47 ++++++------------------- tests/functional/opt3_einar.asm | 4 +-- tests/functional/optconst.asm | 4 +-- tests/functional/param0.asm | 8 ++--- tests/functional/param1.asm | 8 ++--- tests/functional/param2.asm | 8 ++--- tests/functional/parambyref1.asm | 4 +-- tests/functional/paramstr3.asm | 4 +-- tests/functional/paramstr4.asm | 4 +-- tests/functional/paramstr5.asm | 4 +-- tests/functional/prepro00.out | 4 +-- tests/functional/prepro01.out | 4 +-- tests/functional/prepro30.out | 4 +-- tests/functional/prepro71.out | 4 +-- tests/functional/prepro73.out | 8 ++--- tests/functional/prepro74.out | 4 +-- tests/functional/print.asm | 8 ++--- tests/functional/print_arrstr.asm | 8 ++--- tests/functional/read.asm | 4 +-- tests/functional/read10.asm | 8 ++--- tests/functional/read12.asm | 8 ++--- tests/functional/read4.asm | 4 +-- tests/functional/read5.asm | 8 ++--- tests/functional/read8.asm | 8 ++--- tests/functional/read9.asm | 47 ++++++------------------- tests/functional/readbug.asm | 4 +-- tests/functional/readokdown.asm | 8 ++--- tests/functional/readokup.asm | 8 ++--- tests/functional/save01.asm | 4 +-- tests/functional/save02.asm | 4 +-- tests/functional/save03.asm | 4 +-- tests/functional/sigilfunc.asm | 4 +-- tests/functional/simple.asm | 4 +-- tests/functional/slice0.asm | 4 +-- tests/functional/slice2.asm | 4 +-- tests/functional/spfill.asm | 20 +++++------ tests/functional/storecstr.asm | 4 +-- tests/functional/storestr0.asm | 4 +-- tests/functional/storestr1.asm | 4 +-- tests/functional/storestr2.asm | 4 +-- tests/functional/str0.asm | 8 ++--- tests/functional/str00.asm | 4 +-- tests/functional/str01.asm | 4 +-- tests/functional/str02.asm | 4 +-- tests/functional/str1.asm | 4 +-- tests/functional/stradd.asm | 4 +-- tests/functional/strbase.asm | 4 +-- tests/functional/strbase2.asm | 8 ++--- tests/functional/string_substr.asm | 4 +-- tests/functional/stringfunc.asm | 4 +-- tests/functional/stringparam.asm | 8 ++--- tests/functional/strlocal0.asm | 8 ++--- tests/functional/strparam0.asm | 8 ++--- tests/functional/strparam1.asm | 4 +-- tests/functional/strparam2.asm | 8 ++--- tests/functional/strparam3.asm | 8 ++--- tests/functional/strsigil.asm | 4 +-- tests/functional/subrec.asm | 4 +-- tests/functional/substr_empty.asm | 4 +-- tests/functional/substr_empty2.asm | 4 +-- tests/functional/substr_expr.asm | 4 +-- tests/functional/substr_expr2.asm | 4 +-- tests/functional/substrlval.asm | 4 +-- tests/functional/test.py | 2 +- tests/functional/usr0.asm | 4 +-- tests/functional/valcrash2.asm | 4 +-- 151 files changed, 516 insertions(+), 1191 deletions(-) diff --git a/library-asm/array.asm b/library-asm/array.asm index b2d185e6f..8563e8ae3 100644 --- a/library-asm/array.asm +++ b/library-asm/array.asm @@ -73,7 +73,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -99,35 +98,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: #endif pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -137,10 +114,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/27.asm b/tests/functional/27.asm index 3d5df1b75..9a2d5ac29 100644 --- a/tests/functional/27.asm +++ b/tests/functional/27.asm @@ -405,9 +405,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/28.asm b/tests/functional/28.asm index e17addba6..43a8e3d8b 100644 --- a/tests/functional/28.asm +++ b/tests/functional/28.asm @@ -408,9 +408,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/29.asm b/tests/functional/29.asm index c5fd3f431..ba6d25a15 100644 --- a/tests/functional/29.asm +++ b/tests/functional/29.asm @@ -327,9 +327,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/46.asm b/tests/functional/46.asm index 067123bf1..961e5d961 100644 --- a/tests/functional/46.asm +++ b/tests/functional/46.asm @@ -97,7 +97,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -120,10 +120,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -141,7 +141,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -153,7 +152,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -164,35 +163,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -202,10 +179,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/47.asm b/tests/functional/47.asm index 029a34a03..f534c48a2 100644 --- a/tests/functional/47.asm +++ b/tests/functional/47.asm @@ -124,7 +124,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -147,10 +147,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -168,7 +168,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -180,7 +179,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -191,35 +190,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -229,10 +206,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/48.asm b/tests/functional/48.asm index 456f911eb..3d35bcdc8 100644 --- a/tests/functional/48.asm +++ b/tests/functional/48.asm @@ -416,9 +416,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/49.asm b/tests/functional/49.asm index 269a0a7a0..dd154b34e 100644 --- a/tests/functional/49.asm +++ b/tests/functional/49.asm @@ -416,9 +416,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/55.asm b/tests/functional/55.asm index 579c7a474..fcbe9aaf0 100644 --- a/tests/functional/55.asm +++ b/tests/functional/55.asm @@ -92,7 +92,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -115,10 +115,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -136,7 +136,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -148,7 +147,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -159,35 +158,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -197,10 +174,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/addstr.asm b/tests/functional/addstr.asm index 31a516b5c..11af73218 100644 --- a/tests/functional/addstr.asm +++ b/tests/functional/addstr.asm @@ -576,9 +576,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/aloadstr0.asm b/tests/functional/aloadstr0.asm index 459b05325..2936efa48 100644 --- a/tests/functional/aloadstr0.asm +++ b/tests/functional/aloadstr0.asm @@ -313,9 +313,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/aloadstr1.asm b/tests/functional/aloadstr1.asm index c3108ca73..76449c9bc 100644 --- a/tests/functional/aloadstr1.asm +++ b/tests/functional/aloadstr1.asm @@ -95,7 +95,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -118,10 +118,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -139,7 +139,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -151,7 +150,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -162,35 +161,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -200,10 +177,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -497,9 +470,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/arden2.asm b/tests/functional/arden2.asm index 3347e2ee3..ae94cbff6 100644 --- a/tests/functional/arden2.asm +++ b/tests/functional/arden2.asm @@ -321,9 +321,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/array03.asm b/tests/functional/array03.asm index 5d9a5255c..b7f6634ae 100644 --- a/tests/functional/array03.asm +++ b/tests/functional/array03.asm @@ -90,7 +90,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -113,10 +113,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -134,7 +134,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -146,7 +145,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -157,35 +156,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -195,10 +172,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/array06.asm b/tests/functional/array06.asm index 7cc224e75..c08c3faa3 100644 --- a/tests/functional/array06.asm +++ b/tests/functional/array06.asm @@ -90,7 +90,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -113,10 +113,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -134,7 +134,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -146,7 +145,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -157,35 +156,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -195,10 +172,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/array07.asm b/tests/functional/array07.asm index 250d2019a..789dfaf85 100644 --- a/tests/functional/array07.asm +++ b/tests/functional/array07.asm @@ -113,7 +113,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -136,10 +136,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -157,7 +157,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -169,7 +168,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -180,35 +179,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -218,10 +195,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -792,9 +765,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/array08.asm b/tests/functional/array08.asm index 70ab668d1..22cc477dc 100644 --- a/tests/functional/array08.asm +++ b/tests/functional/array08.asm @@ -91,7 +91,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -114,10 +114,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -135,7 +135,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -147,7 +146,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -158,35 +157,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -196,10 +173,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -578,9 +551,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/array09.asm b/tests/functional/array09.asm index 872b1ca24..df200eafc 100644 --- a/tests/functional/array09.asm +++ b/tests/functional/array09.asm @@ -91,7 +91,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -114,10 +114,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -135,7 +135,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -147,7 +146,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -158,35 +157,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -196,10 +173,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -578,9 +551,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/array10.asm b/tests/functional/array10.asm index 2f4914aa1..1c0a1cbfc 100644 --- a/tests/functional/array10.asm +++ b/tests/functional/array10.asm @@ -123,7 +123,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -146,10 +146,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -167,7 +167,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -179,7 +178,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -190,35 +189,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -228,10 +205,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/array12.asm b/tests/functional/array12.asm index 21e525edb..e9d1286a2 100644 --- a/tests/functional/array12.asm +++ b/tests/functional/array12.asm @@ -93,7 +93,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -116,10 +116,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -137,7 +137,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -149,7 +148,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -160,35 +159,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -198,10 +175,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -580,9 +553,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/arrbase1.asm b/tests/functional/arrbase1.asm index d8f8f7511..4330d2404 100644 --- a/tests/functional/arrbase1.asm +++ b/tests/functional/arrbase1.asm @@ -115,7 +115,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -138,10 +138,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -159,7 +159,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -171,7 +170,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -182,35 +181,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -220,10 +197,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -541,9 +514,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/arrcheck.asm b/tests/functional/arrcheck.asm index d25aa7028..c53fed74d 100644 --- a/tests/functional/arrcheck.asm +++ b/tests/functional/arrcheck.asm @@ -152,7 +152,7 @@ __STOP: ld (ERR_NR), a ret #line 23 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -177,7 +177,7 @@ __ARRAY: LOOP: pop de -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack @@ -187,7 +187,7 @@ LOOP: ld a, ERROR_SubscriptWrong jp c, __ERROR ex de, hl -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -205,7 +205,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -217,7 +216,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -228,35 +227,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -266,10 +243,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/astore16.asm b/tests/functional/astore16.asm index 7e32d394f..413a4164e 100644 --- a/tests/functional/astore16.asm +++ b/tests/functional/astore16.asm @@ -117,7 +117,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -140,10 +140,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -161,7 +161,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -173,7 +172,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -184,35 +183,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -222,10 +199,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -630,7 +603,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -689,7 +662,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/attr.asm b/tests/functional/attr.asm index be7ace991..802453e84 100644 --- a/tests/functional/attr.asm +++ b/tests/functional/attr.asm @@ -47,7 +47,7 @@ __CALL_BACK__: ; Parameter: BOLD flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -85,9 +85,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/chr.asm b/tests/functional/chr.asm index 8ddc2e7fc..55bd64cc6 100644 --- a/tests/functional/chr.asm +++ b/tests/functional/chr.asm @@ -325,9 +325,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/chr0.asm b/tests/functional/chr0.asm index 837a5f066..5f4762226 100644 --- a/tests/functional/chr0.asm +++ b/tests/functional/chr0.asm @@ -324,9 +324,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/chr1.asm b/tests/functional/chr1.asm index d61ccd10e..261cf53f8 100644 --- a/tests/functional/chr1.asm +++ b/tests/functional/chr1.asm @@ -401,9 +401,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/code00.asm b/tests/functional/code00.asm index 9bf872888..30d38b1a5 100644 --- a/tests/functional/code00.asm +++ b/tests/functional/code00.asm @@ -321,9 +321,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -937,7 +937,7 @@ BRIGHT_TMP: ; Parameter: OVER flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -963,9 +963,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/code01.asm b/tests/functional/code01.asm index 7ddf577fc..e222bd7c4 100644 --- a/tests/functional/code01.asm +++ b/tests/functional/code01.asm @@ -321,9 +321,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -937,7 +937,7 @@ BRIGHT_TMP: ; Parameter: OVER flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -963,9 +963,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/code02.asm b/tests/functional/code02.asm index aed0e5c00..2419c5561 100644 --- a/tests/functional/code02.asm +++ b/tests/functional/code02.asm @@ -321,9 +321,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -937,7 +937,7 @@ BRIGHT_TMP: ; Parameter: OVER flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -963,9 +963,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/codecrash2.asm b/tests/functional/codecrash2.asm index 8a801cc18..9cb418592 100644 --- a/tests/functional/codecrash2.asm +++ b/tests/functional/codecrash2.asm @@ -543,9 +543,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/codecrash3.asm b/tests/functional/codecrash3.asm index 26c9d06f6..7dd005c06 100644 --- a/tests/functional/codecrash3.asm +++ b/tests/functional/codecrash3.asm @@ -546,9 +546,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/codecrash4.asm b/tests/functional/codecrash4.asm index fb0180821..69ec09296 100644 --- a/tests/functional/codecrash4.asm +++ b/tests/functional/codecrash4.asm @@ -556,9 +556,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/coercion3.asm b/tests/functional/coercion3.asm index 3ec8ae802..2c419ec56 100644 --- a/tests/functional/coercion3.asm +++ b/tests/functional/coercion3.asm @@ -40,7 +40,7 @@ __CALL_BACK__: DEFW 0 #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -78,9 +78,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/einarattr.asm b/tests/functional/einarattr.asm index f922747ad..b9507d4a0 100644 --- a/tests/functional/einarattr.asm +++ b/tests/functional/einarattr.asm @@ -1156,7 +1156,7 @@ __PRINT_TABLE: ; Jump table for 0 .. 22 codes #line 3 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1215,7 +1215,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/einarshift.asm b/tests/functional/einarshift.asm index b0ef88c2a..0fa0acd52 100644 --- a/tests/functional/einarshift.asm +++ b/tests/functional/einarshift.asm @@ -431,7 +431,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -490,7 +490,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/emptystrparam.asm b/tests/functional/emptystrparam.asm index 7b8e6c447..2b480f841 100644 --- a/tests/functional/emptystrparam.asm +++ b/tests/functional/emptystrparam.asm @@ -525,9 +525,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/fact.asm b/tests/functional/fact.asm index 019da33aa..84fa57bd5 100644 --- a/tests/functional/fact.asm +++ b/tests/functional/fact.asm @@ -606,7 +606,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -665,7 +665,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/fastcall0.asm b/tests/functional/fastcall0.asm index eb207b1c5..86fea6d26 100644 --- a/tests/functional/fastcall0.asm +++ b/tests/functional/fastcall0.asm @@ -65,7 +65,7 @@ _SPFill: call SPPFill_start pop ix ret -#line 1 "/zbasic/library-asm/SP/PixelUp.asm" +#line 1 "/zxbasic/library-asm/SP/PixelUp.asm" SP.PixelUp: ld a,h dec h @@ -86,8 +86,8 @@ _SPFill: ld h,a cp $40 ret -#line 31 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/PixelDown.asm" +#line 31 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/PixelDown.asm" SP.PixelDown: inc h ld a,h @@ -109,8 +109,8 @@ _SPFill: cp $58 ccf ret -#line 32 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/CharLeft.asm" +#line 32 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/CharLeft.asm" SP.CharLeft: ld a,l dec l @@ -121,8 +121,8 @@ _SPFill: ld h,a cp $40 ret -#line 33 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/CharRight.asm" +#line 33 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/CharRight.asm" SP.CharRight: inc l ret nz @@ -132,8 +132,8 @@ _SPFill: cp $58 ccf ret -#line 34 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/GetScrnAddr.asm" +#line 34 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/GetScrnAddr.asm" SPGetScrnAddr: and $07 or $40 @@ -165,7 +165,7 @@ norotate: or l ld e,a ret -#line 35 "/zbasic/library/SP/Fill.bas" +#line 35 "/zxbasic/library/SP/Fill.bas" SPPFill_IXBuffer: DEFB 0,0 SPPFill_start: diff --git a/tests/functional/file_macro.asm b/tests/functional/file_macro.asm index c2cedd31e..15389f64f 100644 --- a/tests/functional/file_macro.asm +++ b/tests/functional/file_macro.asm @@ -412,9 +412,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/for0.asm b/tests/functional/for0.asm index 688a20f20..55b020979 100644 --- a/tests/functional/for0.asm +++ b/tests/functional/for0.asm @@ -475,7 +475,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -534,7 +534,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/id_substr_eq_expr.asm b/tests/functional/id_substr_eq_expr.asm index 835be8f16..0bcdf1a62 100644 --- a/tests/functional/id_substr_eq_expr.asm +++ b/tests/functional/id_substr_eq_expr.asm @@ -679,9 +679,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/ifelse1.asm b/tests/functional/ifelse1.asm index 265e04c24..c9eb5f9e6 100644 --- a/tests/functional/ifelse1.asm +++ b/tests/functional/ifelse1.asm @@ -444,7 +444,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -503,7 +503,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ifwhilex.asm b/tests/functional/ifwhilex.asm index beb0b45d3..8022997d3 100644 --- a/tests/functional/ifwhilex.asm +++ b/tests/functional/ifwhilex.asm @@ -463,7 +463,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -522,7 +522,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/inkey.asm b/tests/functional/inkey.asm index 6cd501edf..d697df198 100644 --- a/tests/functional/inkey.asm +++ b/tests/functional/inkey.asm @@ -326,9 +326,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -807,7 +807,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -866,7 +866,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/inktemp.asm b/tests/functional/inktemp.asm index 5ea6ec43a..30af04616 100644 --- a/tests/functional/inktemp.asm +++ b/tests/functional/inktemp.asm @@ -595,7 +595,7 @@ __CIRCLE_PLOT: #line 43 "inktemp.bas" #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -621,9 +621,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/label_sent2.asm b/tests/functional/label_sent2.asm index c0d2945ca..fe256403a 100644 --- a/tests/functional/label_sent2.asm +++ b/tests/functional/label_sent2.asm @@ -45,7 +45,7 @@ __CALL_BACK__: #line 25 "label_sent2.bas" #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -83,9 +83,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/label_sent3.asm b/tests/functional/label_sent3.asm index f99800431..931afed3a 100644 --- a/tests/functional/label_sent3.asm +++ b/tests/functional/label_sent3.asm @@ -45,7 +45,7 @@ __CALL_BACK__: #line 25 "label_sent3.bas" #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -83,9 +83,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/label_sent4.asm b/tests/functional/label_sent4.asm index 31e0d2a92..18fbed36b 100644 --- a/tests/functional/label_sent4.asm +++ b/tests/functional/label_sent4.asm @@ -45,7 +45,7 @@ __CALL_BACK__: #line 25 "label_sent4.bas" #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -83,9 +83,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/label_sent5.asm b/tests/functional/label_sent5.asm index 5e0ea078d..c04ad05c5 100644 --- a/tests/functional/label_sent5.asm +++ b/tests/functional/label_sent5.asm @@ -45,7 +45,7 @@ __CALL_BACK__: #line 25 "label_sent5.bas" #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" #line 1 "const.asm" @@ -83,9 +83,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd3.asm b/tests/functional/lcd3.asm index b640fa61a..c70c44a4f 100644 --- a/tests/functional/lcd3.asm +++ b/tests/functional/lcd3.asm @@ -823,9 +823,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1292,7 +1292,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1351,7 +1351,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd7.asm b/tests/functional/lcd7.asm index 5f2087956..3b1087c67 100644 --- a/tests/functional/lcd7.asm +++ b/tests/functional/lcd7.asm @@ -555,9 +555,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1029,7 +1029,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1088,7 +1088,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd8.asm b/tests/functional/lcd8.asm index ac3d4b638..09180966e 100644 --- a/tests/functional/lcd8.asm +++ b/tests/functional/lcd8.asm @@ -557,9 +557,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1031,7 +1031,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1090,7 +1090,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd9.asm b/tests/functional/lcd9.asm index 261dc4ea4..94c6760e8 100644 --- a/tests/functional/lcd9.asm +++ b/tests/functional/lcd9.asm @@ -545,9 +545,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1019,7 +1019,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1078,7 +1078,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/let_array_substr.asm b/tests/functional/let_array_substr.asm index 5e901bdf5..ee2fee0cc 100644 --- a/tests/functional/let_array_substr.asm +++ b/tests/functional/let_array_substr.asm @@ -128,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -151,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -172,7 +172,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -184,7 +183,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -195,35 +194,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -233,10 +210,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -883,9 +856,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr1.asm b/tests/functional/let_array_substr1.asm index 51d2f2a12..c889bc5e8 100644 --- a/tests/functional/let_array_substr1.asm +++ b/tests/functional/let_array_substr1.asm @@ -128,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -151,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -172,7 +172,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -184,7 +183,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -195,35 +194,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -233,10 +210,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -883,9 +856,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr10.asm b/tests/functional/let_array_substr10.asm index 90f7d9324..7de96a8d4 100644 --- a/tests/functional/let_array_substr10.asm +++ b/tests/functional/let_array_substr10.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr11.asm b/tests/functional/let_array_substr11.asm index 0e6446632..7bed879e7 100644 --- a/tests/functional/let_array_substr11.asm +++ b/tests/functional/let_array_substr11.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr12.asm b/tests/functional/let_array_substr12.asm index 5b00a4f0c..db994746e 100644 --- a/tests/functional/let_array_substr12.asm +++ b/tests/functional/let_array_substr12.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr13.asm b/tests/functional/let_array_substr13.asm index f7acb8ec1..2cd59a4fa 100644 --- a/tests/functional/let_array_substr13.asm +++ b/tests/functional/let_array_substr13.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr2.asm b/tests/functional/let_array_substr2.asm index a56992a56..35c884543 100644 --- a/tests/functional/let_array_substr2.asm +++ b/tests/functional/let_array_substr2.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr3.asm b/tests/functional/let_array_substr3.asm index deae0c2c8..d23420b83 100644 --- a/tests/functional/let_array_substr3.asm +++ b/tests/functional/let_array_substr3.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr5.asm b/tests/functional/let_array_substr5.asm index 106f71a2d..880f3e1cf 100644 --- a/tests/functional/let_array_substr5.asm +++ b/tests/functional/let_array_substr5.asm @@ -128,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -151,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -172,7 +172,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -184,7 +183,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -195,35 +194,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -233,10 +210,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -883,9 +856,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr7.asm b/tests/functional/let_array_substr7.asm index 485b9a171..b16e3cd65 100644 --- a/tests/functional/let_array_substr7.asm +++ b/tests/functional/let_array_substr7.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/let_array_substr9.asm b/tests/functional/let_array_substr9.asm index b88ffabcf..8b932ed0c 100644 --- a/tests/functional/let_array_substr9.asm +++ b/tests/functional/let_array_substr9.asm @@ -694,9 +694,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/letarrstr_substr0.asm b/tests/functional/letarrstr_substr0.asm index a57d4b768..1e8ca5782 100644 --- a/tests/functional/letarrstr_substr0.asm +++ b/tests/functional/letarrstr_substr0.asm @@ -320,9 +320,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/letarrstr_substr1.asm b/tests/functional/letarrstr_substr1.asm index 68d5dc612..9d7c5d1c4 100644 --- a/tests/functional/letarrstr_substr1.asm +++ b/tests/functional/letarrstr_substr1.asm @@ -320,9 +320,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/llc.asm b/tests/functional/llc.asm index 9fabc0832..2f170205e 100644 --- a/tests/functional/llc.asm +++ b/tests/functional/llc.asm @@ -675,9 +675,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/load02.asm b/tests/functional/load02.asm index 5a6113e2d..61ef80414 100644 --- a/tests/functional/load02.asm +++ b/tests/functional/load02.asm @@ -326,9 +326,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -942,7 +942,7 @@ BRIGHT_TMP: ; Parameter: OVER flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -968,9 +968,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/load03.asm b/tests/functional/load03.asm index aa5d21d53..151294b49 100644 --- a/tests/functional/load03.asm +++ b/tests/functional/load03.asm @@ -325,9 +325,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -941,7 +941,7 @@ BRIGHT_TMP: ; Parameter: OVER flag in bit 0 of A register #line 1 "copy_attr.asm" -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -967,9 +967,9 @@ COPY_ATTR: __SET_ATTR_MODE: ; Another entry to set print modes. A contains (P_FLAG) -#line 63 "/zbasic/library-asm/copy_attr.asm" +#line 63 "/zxbasic/library-asm/copy_attr.asm" ret -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/loadstr.asm b/tests/functional/loadstr.asm index 10a0749ac..7df39b853 100644 --- a/tests/functional/loadstr.asm +++ b/tests/functional/loadstr.asm @@ -407,9 +407,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/loadu16ii.asm b/tests/functional/loadu16ii.asm index a3a1a40cd..3d6321eab 100644 --- a/tests/functional/loadu16ii.asm +++ b/tests/functional/loadu16ii.asm @@ -477,7 +477,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -536,7 +536,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ltee1.asm b/tests/functional/ltee1.asm index 3b3cd3ac6..d2e2a99d4 100644 --- a/tests/functional/ltee1.asm +++ b/tests/functional/ltee1.asm @@ -571,9 +571,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1045,7 +1045,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1104,7 +1104,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ltee10.asm b/tests/functional/ltee10.asm index 290ce1d18..76d6da264 100644 --- a/tests/functional/ltee10.asm +++ b/tests/functional/ltee10.asm @@ -112,7 +112,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -135,10 +135,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -156,7 +156,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -168,7 +167,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -179,35 +178,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -217,10 +194,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/ltee3.asm b/tests/functional/ltee3.asm index 5adb17765..73fdf9809 100644 --- a/tests/functional/ltee3.asm +++ b/tests/functional/ltee3.asm @@ -533,9 +533,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/ltee5.asm b/tests/functional/ltee5.asm index 2e2930aa2..0413875d7 100644 --- a/tests/functional/ltee5.asm +++ b/tests/functional/ltee5.asm @@ -637,9 +637,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/ltee6.asm b/tests/functional/ltee6.asm index 3cb36e1ea..8317454e2 100644 --- a/tests/functional/ltee6.asm +++ b/tests/functional/ltee6.asm @@ -101,7 +101,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -124,10 +124,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -145,7 +145,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -157,7 +156,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -168,35 +167,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -206,10 +183,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -588,9 +561,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/ltee7.asm b/tests/functional/ltee7.asm index 1e3a9d14e..6c5456622 100644 --- a/tests/functional/ltee7.asm +++ b/tests/functional/ltee7.asm @@ -139,7 +139,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -162,10 +162,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -183,7 +183,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -195,7 +194,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -206,35 +205,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -244,10 +221,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -889,9 +862,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/lvalsubstr_nolet.asm b/tests/functional/lvalsubstr_nolet.asm index 461c7cdb7..d90c193ec 100644 --- a/tests/functional/lvalsubstr_nolet.asm +++ b/tests/functional/lvalsubstr_nolet.asm @@ -675,9 +675,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/mcleod2.asm b/tests/functional/mcleod2.asm index 7bf2201f2..7e1167f52 100644 --- a/tests/functional/mcleod2.asm +++ b/tests/functional/mcleod2.asm @@ -398,9 +398,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/memcpytest.asm b/tests/functional/memcpytest.asm index 29a39f636..806be77ad 100644 --- a/tests/functional/memcpytest.asm +++ b/tests/functional/memcpytest.asm @@ -569,7 +569,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -628,7 +628,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ongoto.asm b/tests/functional/ongoto.asm index 7ee0a1673..ee9a921d5 100644 --- a/tests/functional/ongoto.asm +++ b/tests/functional/ongoto.asm @@ -563,7 +563,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -622,7 +622,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/opt2_pstr.asm b/tests/functional/opt2_pstr.asm index e777dc067..2005ea182 100644 --- a/tests/functional/opt2_pstr.asm +++ b/tests/functional/opt2_pstr.asm @@ -530,9 +530,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/opt2_snake_es.asm b/tests/functional/opt2_snake_es.asm index b9d19e006..5cded10f4 100644 --- a/tests/functional/opt2_snake_es.asm +++ b/tests/functional/opt2_snake_es.asm @@ -98,7 +98,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -121,10 +121,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -142,7 +142,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -154,7 +153,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -165,35 +164,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -203,10 +180,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/opt3_OPT27wws2.asm b/tests/functional/opt3_OPT27wws2.asm index 88b1e1726..36790f92d 100644 --- a/tests/functional/opt3_OPT27wws2.asm +++ b/tests/functional/opt3_OPT27wws2.asm @@ -99,7 +99,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -122,10 +122,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -143,7 +143,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -155,7 +154,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -166,35 +165,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -204,10 +181,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST diff --git a/tests/functional/opt3_data2.asm b/tests/functional/opt3_data2.asm index c1599285e..0635a3802 100644 --- a/tests/functional/opt3_data2.asm +++ b/tests/functional/opt3_data2.asm @@ -165,7 +165,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -188,10 +188,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -209,7 +209,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -221,7 +220,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -232,35 +231,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -270,10 +247,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -732,7 +705,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -791,7 +764,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1946,9 +1919,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/opt3_einar.asm b/tests/functional/opt3_einar.asm index 2b27f45c0..829a3e2ed 100644 --- a/tests/functional/opt3_einar.asm +++ b/tests/functional/opt3_einar.asm @@ -455,7 +455,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -514,7 +514,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/optconst.asm b/tests/functional/optconst.asm index 831551846..f629a5ea3 100644 --- a/tests/functional/optconst.asm +++ b/tests/functional/optconst.asm @@ -445,7 +445,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -504,7 +504,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/param0.asm b/tests/functional/param0.asm index c7ae54466..6cee3f887 100644 --- a/tests/functional/param0.asm +++ b/tests/functional/param0.asm @@ -539,9 +539,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1008,7 +1008,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1067,7 +1067,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/param1.asm b/tests/functional/param1.asm index ab0bd4bc7..01439b315 100644 --- a/tests/functional/param1.asm +++ b/tests/functional/param1.asm @@ -455,7 +455,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -514,7 +514,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1816,9 +1816,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/param2.asm b/tests/functional/param2.asm index 538199dec..c71954e4d 100644 --- a/tests/functional/param2.asm +++ b/tests/functional/param2.asm @@ -539,9 +539,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1008,7 +1008,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1067,7 +1067,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/parambyref1.asm b/tests/functional/parambyref1.asm index 8c80a400a..0feb77d1b 100644 --- a/tests/functional/parambyref1.asm +++ b/tests/functional/parambyref1.asm @@ -458,7 +458,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -517,7 +517,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/paramstr3.asm b/tests/functional/paramstr3.asm index f6db6e5f9..3c639040e 100644 --- a/tests/functional/paramstr3.asm +++ b/tests/functional/paramstr3.asm @@ -523,9 +523,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/paramstr4.asm b/tests/functional/paramstr4.asm index f888f50a6..b2fe9efe3 100644 --- a/tests/functional/paramstr4.asm +++ b/tests/functional/paramstr4.asm @@ -547,9 +547,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/paramstr5.asm b/tests/functional/paramstr5.asm index e97f02a32..4839c0830 100644 --- a/tests/functional/paramstr5.asm +++ b/tests/functional/paramstr5.asm @@ -547,9 +547,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/prepro00.out b/tests/functional/prepro00.out index e24f48a23..14b102805 100644 --- a/tests/functional/prepro00.out +++ b/tests/functional/prepro00.out @@ -1,5 +1,5 @@ #line 1 "prepro00.bi" -#line 1 "/zbasic/library/attr.bas" +#line 1 "/zxbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/zbasic/library/attr.bas" +#line 119 "/zxbasic/library/attr.bas" #line 2 "prepro00.bi" PRINT "HELLO" diff --git a/tests/functional/prepro01.out b/tests/functional/prepro01.out index c0603499f..9e9f224e7 100644 --- a/tests/functional/prepro01.out +++ b/tests/functional/prepro01.out @@ -1,5 +1,5 @@ #line 1 "prepro01.bi" -#line 1 "/zbasic/library/attr.bas" +#line 1 "/zxbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/zbasic/library/attr.bas" +#line 119 "/zxbasic/library/attr.bas" #line 2 "prepro01.bi" diff --git a/tests/functional/prepro30.out b/tests/functional/prepro30.out index 914235e94..0a790d932 100644 --- a/tests/functional/prepro30.out +++ b/tests/functional/prepro30.out @@ -1,5 +1,5 @@ #line 1 "prepro30.bi" -#line 1 "/zbasic/library/attr.bas" +#line 1 "/zxbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/zbasic/library/attr.bas" +#line 119 "/zxbasic/library/attr.bas" #line 2 "prepro30.bi" diff --git a/tests/functional/prepro71.out b/tests/functional/prepro71.out index 1bb8f16c6..d47278e9c 100644 --- a/tests/functional/prepro71.out +++ b/tests/functional/prepro71.out @@ -1,5 +1,5 @@ #line 1 "prepro71.bi" -#line 1 "/zbasic/library/alloc.bas" +#line 1 "/zxbasic/library/alloc.bas" @@ -196,7 +196,7 @@ end function #require "free.asm" #require "realloc.asm" -#line 198 "/zbasic/library/alloc.bas" +#line 198 "/zxbasic/library/alloc.bas" #line 2 "prepro71.bi" diff --git a/tests/functional/prepro73.out b/tests/functional/prepro73.out index 2fac6ffe9..cebee6bb2 100644 --- a/tests/functional/prepro73.out +++ b/tests/functional/prepro73.out @@ -1,5 +1,5 @@ #line 1 "prepro73.bi" -#line 1 "/zbasic/library/pos.bas" +#line 1 "/zxbasic/library/pos.bas" @@ -41,14 +41,14 @@ end function #require "sposn.asm" -#line 43 "/zbasic/library/pos.bas" +#line 43 "/zxbasic/library/pos.bas" #line 2 "prepro73.bi" #line 1 "prepro73.bi" -#line 1 "/zbasic/library/pos.bas" +#line 1 "/zxbasic/library/pos.bas" @@ -58,7 +58,7 @@ end function -#line 43 "/zbasic/library/pos.bas" +#line 43 "/zxbasic/library/pos.bas" #line 2 "prepro73.bi" diff --git a/tests/functional/prepro74.out b/tests/functional/prepro74.out index dd100af52..ec4a5d1a3 100644 --- a/tests/functional/prepro74.out +++ b/tests/functional/prepro74.out @@ -1,5 +1,5 @@ #line 1 "prepro74.bi" -#line 1 "/zbasic/library/pos.bas" +#line 1 "/zxbasic/library/pos.bas" @@ -41,7 +41,7 @@ end function #require "sposn.asm" -#line 43 "/zbasic/library/pos.bas" +#line 43 "/zxbasic/library/pos.bas" #line 2 "prepro74.bi" diff --git a/tests/functional/print.asm b/tests/functional/print.asm index 666429bbd..06b533f9d 100644 --- a/tests/functional/print.asm +++ b/tests/functional/print.asm @@ -454,7 +454,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -513,7 +513,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2259,9 +2259,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/print_arrstr.asm b/tests/functional/print_arrstr.asm index 5083addd3..cb7d533cd 100644 --- a/tests/functional/print_arrstr.asm +++ b/tests/functional/print_arrstr.asm @@ -329,9 +329,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -798,7 +798,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -857,7 +857,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/read.asm b/tests/functional/read.asm index 9bda53581..bfc39abaa 100644 --- a/tests/functional/read.asm +++ b/tests/functional/read.asm @@ -340,9 +340,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/read10.asm b/tests/functional/read10.asm index 478cdd9d6..0e8cab32f 100644 --- a/tests/functional/read10.asm +++ b/tests/functional/read10.asm @@ -672,7 +672,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -731,7 +731,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2061,9 +2061,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/read12.asm b/tests/functional/read12.asm index 4b0773a37..2b21f4f35 100644 --- a/tests/functional/read12.asm +++ b/tests/functional/read12.asm @@ -344,9 +344,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -813,7 +813,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -872,7 +872,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/read4.asm b/tests/functional/read4.asm index da99a421e..491104a1c 100644 --- a/tests/functional/read4.asm +++ b/tests/functional/read4.asm @@ -383,9 +383,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/read5.asm b/tests/functional/read5.asm index fb3b0e28d..28f257449 100644 --- a/tests/functional/read5.asm +++ b/tests/functional/read5.asm @@ -620,7 +620,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -679,7 +679,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1959,9 +1959,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/read8.asm b/tests/functional/read8.asm index 0fbfd6ef8..5bf864035 100644 --- a/tests/functional/read8.asm +++ b/tests/functional/read8.asm @@ -611,7 +611,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -670,7 +670,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1950,9 +1950,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/read9.asm b/tests/functional/read9.asm index ad72209b0..02e4fd5c8 100644 --- a/tests/functional/read9.asm +++ b/tests/functional/read9.asm @@ -187,7 +187,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/zbasic/library-asm/array.asm" +#line 24 "/zxbasic/library-asm/array.asm" __ARRAY: PROC @@ -210,10 +210,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/zbasic/library-asm/array.asm" +#line 49 "/zxbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/zbasic/library-asm/array.asm" +#line 59 "/zxbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -231,7 +231,6 @@ LOOP: exx pop de ; DE = Max bound Number (i-th dimension) - ;call __MUL16_FAST ; HL *= DE call __FNMUL jp LOOP @@ -243,7 +242,7 @@ ARRAY_END: push de exx -#line 92 "/zbasic/library-asm/array.asm" +#line 91 "/zxbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -254,35 +253,13 @@ ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP - ;; Even faster - ;pop bc - - ;ld d, h - ;ld e, l - - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, hl - ;dec c - ;dec c - ;jp z, __ARRAY_FIN - - ;add hl, de - ;__ARRAY_FIN: -#line 123 "/zbasic/library-asm/array.asm" +#line 102 "/zxbasic/library-asm/array.asm" pop de add hl, de ; Adds element start RET_ADDRESS: - ld de, 0 - push de - ret ; HL = (Start of Elements + Offset) + jp 0 ;; Performs a faster multiply for little 16bit numbs LOCAL __FNMUL, __FNMUL2 @@ -292,10 +269,6 @@ __FNMUL: or d jp nz, __MUL16_FAST - or e - ex de, hl - ret z - cp 33 jp nc, __MUL16_FAST @@ -836,7 +809,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -895,7 +868,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2175,9 +2148,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/readbug.asm b/tests/functional/readbug.asm index d2192d970..bcea83f7d 100644 --- a/tests/functional/readbug.asm +++ b/tests/functional/readbug.asm @@ -338,9 +338,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/readokdown.asm b/tests/functional/readokdown.asm index 1f4655ac1..bde18288e 100644 --- a/tests/functional/readokdown.asm +++ b/tests/functional/readokdown.asm @@ -495,7 +495,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -554,7 +554,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2509,9 +2509,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/readokup.asm b/tests/functional/readokup.asm index 47ef28a72..15aaa7db1 100644 --- a/tests/functional/readokup.asm +++ b/tests/functional/readokup.asm @@ -494,7 +494,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -553,7 +553,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2508,9 +2508,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/save01.asm b/tests/functional/save01.asm index 02295f6f6..1252eaa12 100644 --- a/tests/functional/save01.asm +++ b/tests/functional/save01.asm @@ -326,9 +326,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/save02.asm b/tests/functional/save02.asm index 94e8f298c..df31d8d94 100644 --- a/tests/functional/save02.asm +++ b/tests/functional/save02.asm @@ -323,9 +323,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/save03.asm b/tests/functional/save03.asm index e6a3869b5..8875b7393 100644 --- a/tests/functional/save03.asm +++ b/tests/functional/save03.asm @@ -322,9 +322,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/sigilfunc.asm b/tests/functional/sigilfunc.asm index defea5a94..2d80b9465 100644 --- a/tests/functional/sigilfunc.asm +++ b/tests/functional/sigilfunc.asm @@ -324,9 +324,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/simple.asm b/tests/functional/simple.asm index 9b1fd586c..875a70b1a 100644 --- a/tests/functional/simple.asm +++ b/tests/functional/simple.asm @@ -437,7 +437,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -496,7 +496,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/slice0.asm b/tests/functional/slice0.asm index c104cca81..5c528611c 100644 --- a/tests/functional/slice0.asm +++ b/tests/functional/slice0.asm @@ -587,9 +587,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/slice2.asm b/tests/functional/slice2.asm index 3c52278e7..7b7714f1d 100644 --- a/tests/functional/slice2.asm +++ b/tests/functional/slice2.asm @@ -677,9 +677,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/spfill.asm b/tests/functional/spfill.asm index 3392676a1..6fbc15be0 100644 --- a/tests/functional/spfill.asm +++ b/tests/functional/spfill.asm @@ -65,7 +65,7 @@ _SPFill: call SPPFill_start pop ix ret -#line 1 "/zbasic/library-asm/SP/PixelUp.asm" +#line 1 "/zxbasic/library-asm/SP/PixelUp.asm" SP.PixelUp: ld a,h dec h @@ -86,8 +86,8 @@ _SPFill: ld h,a cp $40 ret -#line 31 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/PixelDown.asm" +#line 31 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/PixelDown.asm" SP.PixelDown: inc h ld a,h @@ -109,8 +109,8 @@ _SPFill: cp $58 ccf ret -#line 32 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/CharLeft.asm" +#line 32 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/CharLeft.asm" SP.CharLeft: ld a,l dec l @@ -121,8 +121,8 @@ _SPFill: ld h,a cp $40 ret -#line 33 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/CharRight.asm" +#line 33 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/CharRight.asm" SP.CharRight: inc l ret nz @@ -132,8 +132,8 @@ _SPFill: cp $58 ccf ret -#line 34 "/zbasic/library/SP/Fill.bas" -#line 1 "/zbasic/library-asm/SP/GetScrnAddr.asm" +#line 34 "/zxbasic/library/SP/Fill.bas" +#line 1 "/zxbasic/library-asm/SP/GetScrnAddr.asm" SPGetScrnAddr: and $07 or $40 @@ -165,7 +165,7 @@ norotate: or l ld e,a ret -#line 35 "/zbasic/library/SP/Fill.bas" +#line 35 "/zxbasic/library/SP/Fill.bas" SPPFill_IXBuffer: DEFB 0,0 SPPFill_start: diff --git a/tests/functional/storecstr.asm b/tests/functional/storecstr.asm index b8f50c667..3e72ea5d4 100644 --- a/tests/functional/storecstr.asm +++ b/tests/functional/storecstr.asm @@ -403,9 +403,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/storestr0.asm b/tests/functional/storestr0.asm index 98a9be305..f88e9cf1a 100644 --- a/tests/functional/storestr0.asm +++ b/tests/functional/storestr0.asm @@ -396,9 +396,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/storestr1.asm b/tests/functional/storestr1.asm index a222197b5..4f98f2665 100644 --- a/tests/functional/storestr1.asm +++ b/tests/functional/storestr1.asm @@ -633,9 +633,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/storestr2.asm b/tests/functional/storestr2.asm index d633e7cbb..f8beef17a 100644 --- a/tests/functional/storestr2.asm +++ b/tests/functional/storestr2.asm @@ -546,9 +546,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/str0.asm b/tests/functional/str0.asm index a141b0f48..0f4136a90 100644 --- a/tests/functional/str0.asm +++ b/tests/functional/str0.asm @@ -785,7 +785,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -844,7 +844,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1749,9 +1749,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/str00.asm b/tests/functional/str00.asm index 5196941f9..de4a938f8 100644 --- a/tests/functional/str00.asm +++ b/tests/functional/str00.asm @@ -400,9 +400,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/str01.asm b/tests/functional/str01.asm index f3bb67684..f0a5528f6 100644 --- a/tests/functional/str01.asm +++ b/tests/functional/str01.asm @@ -554,9 +554,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/str02.asm b/tests/functional/str02.asm index 9fbdaa39a..52ec8a7b4 100644 --- a/tests/functional/str02.asm +++ b/tests/functional/str02.asm @@ -328,9 +328,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/str1.asm b/tests/functional/str1.asm index c2974c41d..5a06c50ba 100644 --- a/tests/functional/str1.asm +++ b/tests/functional/str1.asm @@ -399,9 +399,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/stradd.asm b/tests/functional/stradd.asm index 6420c3d4f..6e780e049 100644 --- a/tests/functional/stradd.asm +++ b/tests/functional/stradd.asm @@ -417,9 +417,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/strbase.asm b/tests/functional/strbase.asm index e7517f319..11ac48b3c 100644 --- a/tests/functional/strbase.asm +++ b/tests/functional/strbase.asm @@ -695,9 +695,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/strbase2.asm b/tests/functional/strbase2.asm index 39cce623f..7a3c4661d 100644 --- a/tests/functional/strbase2.asm +++ b/tests/functional/strbase2.asm @@ -704,9 +704,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1178,7 +1178,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1237,7 +1237,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/string_substr.asm b/tests/functional/string_substr.asm index bd7a3576c..26a529a8e 100644 --- a/tests/functional/string_substr.asm +++ b/tests/functional/string_substr.asm @@ -598,9 +598,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/stringfunc.asm b/tests/functional/stringfunc.asm index 3cb12399e..55ac3cca8 100644 --- a/tests/functional/stringfunc.asm +++ b/tests/functional/stringfunc.asm @@ -520,9 +520,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/stringparam.asm b/tests/functional/stringparam.asm index 62a26f143..7123f5ac5 100644 --- a/tests/functional/stringparam.asm +++ b/tests/functional/stringparam.asm @@ -536,9 +536,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1010,7 +1010,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1069,7 +1069,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strlocal0.asm b/tests/functional/strlocal0.asm index a643c30d4..3748fb5c4 100644 --- a/tests/functional/strlocal0.asm +++ b/tests/functional/strlocal0.asm @@ -783,7 +783,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -842,7 +842,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1834,9 +1834,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/strparam0.asm b/tests/functional/strparam0.asm index 85a84ba21..05e729598 100644 --- a/tests/functional/strparam0.asm +++ b/tests/functional/strparam0.asm @@ -566,9 +566,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1040,7 +1040,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1099,7 +1099,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strparam1.asm b/tests/functional/strparam1.asm index 5c5870e1c..e3d8eed10 100644 --- a/tests/functional/strparam1.asm +++ b/tests/functional/strparam1.asm @@ -356,9 +356,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/strparam2.asm b/tests/functional/strparam2.asm index 096b381b3..e1d245899 100644 --- a/tests/functional/strparam2.asm +++ b/tests/functional/strparam2.asm @@ -477,7 +477,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -536,7 +536,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1838,9 +1838,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/strparam3.asm b/tests/functional/strparam3.asm index 2cdbb27e0..ca3656d06 100644 --- a/tests/functional/strparam3.asm +++ b/tests/functional/strparam3.asm @@ -560,9 +560,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1034,7 +1034,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -1093,7 +1093,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strsigil.asm b/tests/functional/strsigil.asm index 46c72e8dd..5b189238e 100644 --- a/tests/functional/strsigil.asm +++ b/tests/functional/strsigil.asm @@ -717,9 +717,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/subrec.asm b/tests/functional/subrec.asm index 44a753cb7..05f06794c 100644 --- a/tests/functional/subrec.asm +++ b/tests/functional/subrec.asm @@ -617,7 +617,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -676,7 +676,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/substr_empty.asm b/tests/functional/substr_empty.asm index 5e0b6328c..3f7fbcbeb 100644 --- a/tests/functional/substr_empty.asm +++ b/tests/functional/substr_empty.asm @@ -396,9 +396,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/substr_empty2.asm b/tests/functional/substr_empty2.asm index 59a23d8b4..c57b62f8b 100644 --- a/tests/functional/substr_empty2.asm +++ b/tests/functional/substr_empty2.asm @@ -404,9 +404,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/substr_expr.asm b/tests/functional/substr_expr.asm index 15b349470..a8dd4290f 100644 --- a/tests/functional/substr_expr.asm +++ b/tests/functional/substr_expr.asm @@ -557,9 +557,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/substr_expr2.asm b/tests/functional/substr_expr2.asm index 83d5a3a66..48b67c24c 100644 --- a/tests/functional/substr_expr2.asm +++ b/tests/functional/substr_expr2.asm @@ -599,9 +599,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/substrlval.asm b/tests/functional/substrlval.asm index ce7d49daf..5e700f23f 100644 --- a/tests/functional/substrlval.asm +++ b/tests/functional/substrlval.asm @@ -689,9 +689,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl diff --git a/tests/functional/test.py b/tests/functional/test.py index 646ca0dbc..7c767d5c3 100755 --- a/tests/functional/test.py +++ b/tests/functional/test.py @@ -26,7 +26,7 @@ ZXBASM = os.path.join(ZXBASIC_ROOT, 'zxbasm.py') ZXBPP = os.path.join(ZXBASIC_ROOT, 'zxbpp.py') -_original_root = "/zbasic" +_original_root = "/zxbasic" sys.path.append(ZXBASIC_ROOT) # TODO: consider moving test.py to another place to avoid this diff --git a/tests/functional/usr0.asm b/tests/functional/usr0.asm index 0ebca9234..8465e7643 100644 --- a/tests/functional/usr0.asm +++ b/tests/functional/usr0.asm @@ -428,7 +428,7 @@ BRIGHT_TMP: -#line 4 "/zbasic/library-asm/copy_attr.asm" +#line 4 "/zxbasic/library-asm/copy_attr.asm" @@ -487,7 +487,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/zbasic/library-asm/copy_attr.asm" +#line 65 "/zxbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/valcrash2.asm b/tests/functional/valcrash2.asm index 9cd54e984..706791f68 100644 --- a/tests/functional/valcrash2.asm +++ b/tests/functional/valcrash2.asm @@ -330,9 +330,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 111 "/zbasic/library-asm/alloc.asm" +#line 111 "/zxbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/zbasic/library-asm/alloc.asm" +#line 113 "/zxbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl