From 1d48a4e8c53574d8afb7e453c528b787d07fcd30 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Tue, 21 May 2019 00:52:35 +0200 Subject: [PATCH 1/2] Optimize mul16 Saves 4-t states and 1 byte --- library-asm/mul16.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library-asm/mul16.asm b/library-asm/mul16.asm index d7f7f40d9..aca2749ff 100644 --- a/library-asm/mul16.asm +++ b/library-asm/mul16.asm @@ -32,9 +32,8 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: From 8e65e54b906c10cf74fc38526f2b3f9059ea7da3 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Wed, 22 May 2019 23:58:39 +0200 Subject: [PATCH 2/2] Update test to reflect change Changes zxbasic root to generic /zxbasic in test. Update them to reflect changes in library --- library-asm/mul16.asm | 20 ------------ tests/functional/27.asm | 4 +-- tests/functional/28.asm | 4 +-- tests/functional/29.asm | 4 +-- tests/functional/46.asm | 35 ++++---------------- tests/functional/47.asm | 35 ++++---------------- tests/functional/48.asm | 4 +-- tests/functional/49.asm | 4 +-- tests/functional/55.asm | 35 ++++---------------- tests/functional/addstr.asm | 4 +-- tests/functional/aloadstr0.asm | 4 +-- tests/functional/aloadstr1.asm | 39 ++++++---------------- tests/functional/arden2.asm | 4 +-- tests/functional/array03.asm | 35 ++++---------------- tests/functional/array06.asm | 35 ++++---------------- tests/functional/array07.asm | 39 ++++++---------------- tests/functional/array08.asm | 39 ++++++---------------- tests/functional/array09.asm | 39 ++++++---------------- tests/functional/array10.asm | 35 ++++---------------- tests/functional/array12.asm | 39 ++++++---------------- tests/functional/arrbase1.asm | 39 ++++++---------------- tests/functional/arrcheck.asm | 35 ++++---------------- tests/functional/astore16.asm | 39 ++++++---------------- 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 | 39 ++++++---------------- tests/functional/let_array_substr1.asm | 39 ++++++---------------- 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 | 39 ++++++---------------- 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 | 29 +++-------------- tests/functional/ltee1.asm | 8 ++--- tests/functional/ltee10.asm | 35 ++++---------------- tests/functional/ltee3.asm | 4 +-- tests/functional/ltee5.asm | 4 +-- tests/functional/ltee6.asm | 39 ++++++---------------- tests/functional/ltee7.asm | 39 ++++++---------------- tests/functional/lvalsubstr_nolet.asm | 4 +-- tests/functional/mcleod2.asm | 4 +-- tests/functional/memcpytest.asm | 4 +-- tests/functional/mul16.asm | 25 ++------------ tests/functional/mul16a.asm | 25 ++------------ tests/functional/mul16b.asm | 25 ++------------ tests/functional/ongoto.asm | 4 +-- tests/functional/opt2_pstr.asm | 4 +-- tests/functional/opt2_snake_es.asm | 35 ++++---------------- tests/functional/opt3_OPT27wws2.asm | 35 ++++---------------- tests/functional/opt3_data2.asm | 43 +++++++------------------ 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 | 43 +++++++------------------ 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 +-- 154 files changed, 547 insertions(+), 1155 deletions(-) diff --git a/library-asm/mul16.asm b/library-asm/mul16.asm index aca2749ff..2dbe29e24 100644 --- a/library-asm/mul16.asm +++ b/library-asm/mul16.asm @@ -10,26 +10,6 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand -;; ld c, h -;; ld a, l ; C,A => 1st Operand -;; -;; ld hl, 0 ; Accumulator -;; ld b, 16 -;; -;;__MUL16LOOP: -;; sra c ; C,A >> 1 (Arithmetic) -;; rra -;; -;; jr nc, __MUL16NOADD -;; add hl, de -;; -;;__MUL16NOADD: -;; sla e -;; rl d -;; -;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 ld a, h diff --git a/tests/functional/27.asm b/tests/functional/27.asm index d2a9b4ce9..3d5df1b75 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 178f0e491..e17addba6 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 28215e290..c5fd3f431 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 e3cbf2ca8..067123bf1 100644 --- a/tests/functional/46.asm +++ b/tests/functional/46.asm @@ -75,31 +75,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -118,7 +97,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -141,10 +120,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -174,7 +153,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -205,7 +184,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/47.asm b/tests/functional/47.asm index b4857103f..029a34a03 100644 --- a/tests/functional/47.asm +++ b/tests/functional/47.asm @@ -102,31 +102,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -145,7 +124,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -168,10 +147,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -201,7 +180,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -232,7 +211,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/48.asm b/tests/functional/48.asm index 1c6daa6c1..456f911eb 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 42a6b4f04..269a0a7a0 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 b75d4ec38..579c7a474 100644 --- a/tests/functional/55.asm +++ b/tests/functional/55.asm @@ -70,31 +70,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -113,7 +92,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -136,10 +115,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -169,7 +148,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -200,7 +179,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/addstr.asm b/tests/functional/addstr.asm index 34c350ca2..31a516b5c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 46a9d5c02..459b05325 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 ebacf0849..c3108ca73 100644 --- a/tests/functional/aloadstr1.asm +++ b/tests/functional/aloadstr1.asm @@ -73,31 +73,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -116,7 +95,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -139,10 +118,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -172,7 +151,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -203,7 +182,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -518,9 +497,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7cce41a1c..3347e2ee3 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 ca70f21ce..5d9a5255c 100644 --- a/tests/functional/array03.asm +++ b/tests/functional/array03.asm @@ -68,31 +68,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -111,7 +90,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -134,10 +113,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -167,7 +146,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -198,7 +177,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/array06.asm b/tests/functional/array06.asm index b6fc12f28..7cc224e75 100644 --- a/tests/functional/array06.asm +++ b/tests/functional/array06.asm @@ -68,31 +68,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -111,7 +90,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -134,10 +113,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -167,7 +146,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -198,7 +177,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/array07.asm b/tests/functional/array07.asm index 774a4bc51..250d2019a 100644 --- a/tests/functional/array07.asm +++ b/tests/functional/array07.asm @@ -91,31 +91,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -134,7 +113,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -157,10 +136,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -190,7 +169,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -221,7 +200,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -813,9 +792,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 174c4493e..70ab668d1 100644 --- a/tests/functional/array08.asm +++ b/tests/functional/array08.asm @@ -69,31 +69,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -112,7 +91,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -135,10 +114,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -168,7 +147,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -199,7 +178,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -599,9 +578,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 9dd88c40b..872b1ca24 100644 --- a/tests/functional/array09.asm +++ b/tests/functional/array09.asm @@ -69,31 +69,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -112,7 +91,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -135,10 +114,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -168,7 +147,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -199,7 +178,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -599,9 +578,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 8d6f2b0e0..2f4914aa1 100644 --- a/tests/functional/array10.asm +++ b/tests/functional/array10.asm @@ -101,31 +101,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -144,7 +123,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -167,10 +146,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -200,7 +179,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -231,7 +210,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/array12.asm b/tests/functional/array12.asm index 42a760e67..21e525edb 100644 --- a/tests/functional/array12.asm +++ b/tests/functional/array12.asm @@ -71,31 +71,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -114,7 +93,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -137,10 +116,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -170,7 +149,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -201,7 +180,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -601,9 +580,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 54a14de29..d8f8f7511 100644 --- a/tests/functional/arrbase1.asm +++ b/tests/functional/arrbase1.asm @@ -93,31 +93,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -136,7 +115,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -159,10 +138,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -192,7 +171,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -223,7 +202,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -562,9 +541,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 73f3a7cf0..d25aa7028 100644 --- a/tests/functional/arrcheck.asm +++ b/tests/functional/arrcheck.asm @@ -86,31 +86,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -173,7 +152,7 @@ __STOP: ld (ERR_NR), a ret #line 23 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -198,7 +177,7 @@ __ARRAY: LOOP: pop de -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack @@ -208,7 +187,7 @@ LOOP: ld a, ERROR_SubscriptWrong jp c, __ERROR ex de, hl -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -238,7 +217,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -269,7 +248,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/astore16.asm b/tests/functional/astore16.asm index e58e2a002..7e32d394f 100644 --- a/tests/functional/astore16.asm +++ b/tests/functional/astore16.asm @@ -95,31 +95,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -138,7 +117,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -161,10 +140,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -194,7 +173,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -225,7 +204,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -651,7 +630,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -710,7 +689,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/attr.asm b/tests/functional/attr.asm index 32a2ae44c..be7ace991 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/chr.asm b/tests/functional/chr.asm index 8d3a16584..8ddc2e7fc 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 6dac9c5e8..837a5f066 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 9f3ca5b64..d61ccd10e 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 2676b40cb..9bf872888 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/code01.asm b/tests/functional/code01.asm index a48e19794..7ddf577fc 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/code02.asm b/tests/functional/code02.asm index 974ce7ae0..aed0e5c00 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/codecrash2.asm b/tests/functional/codecrash2.asm index 3114dcf54..8a801cc18 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 e70a29837..26c9d06f6 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 1778fa842..fb0180821 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 2cd583dcc..3ec8ae802 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/einarattr.asm b/tests/functional/einarattr.asm index 924849860..f922747ad 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1215,7 +1215,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/einarshift.asm b/tests/functional/einarshift.asm index 0f0763e5b..b0ef88c2a 100644 --- a/tests/functional/einarshift.asm +++ b/tests/functional/einarshift.asm @@ -431,7 +431,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -490,7 +490,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/emptystrparam.asm b/tests/functional/emptystrparam.asm index 49cd5e90e..7b8e6c447 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 e8f6cb459..019da33aa 100644 --- a/tests/functional/fact.asm +++ b/tests/functional/fact.asm @@ -606,7 +606,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -665,7 +665,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/fastcall0.asm b/tests/functional/fastcall0.asm index c3868a262..eb207b1c5 100644 --- a/tests/functional/fastcall0.asm +++ b/tests/functional/fastcall0.asm @@ -65,7 +65,7 @@ _SPFill: call SPPFill_start pop ix ret -#line 1 "/src/zxb/trunk/library-asm/SP/PixelUp.asm" +#line 1 "/zbasic/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 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/PixelDown.asm" +#line 31 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/PixelDown.asm" SP.PixelDown: inc h ld a,h @@ -109,8 +109,8 @@ _SPFill: cp $58 ccf ret -#line 32 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/CharLeft.asm" +#line 32 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/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 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/CharRight.asm" +#line 33 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/CharRight.asm" SP.CharRight: inc l ret nz @@ -132,8 +132,8 @@ _SPFill: cp $58 ccf ret -#line 34 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/GetScrnAddr.asm" +#line 34 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/GetScrnAddr.asm" SPGetScrnAddr: and $07 or $40 @@ -165,7 +165,7 @@ norotate: or l ld e,a ret -#line 35 "/src/zxb/trunk/library/SP/Fill.bas" +#line 35 "/zbasic/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 943dd8e4a..c2cedd31e 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 71a8dd874..688a20f20 100644 --- a/tests/functional/for0.asm +++ b/tests/functional/for0.asm @@ -475,7 +475,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -534,7 +534,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 0467871a9..835be8f16 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 83e9c82a3..265e04c24 100644 --- a/tests/functional/ifelse1.asm +++ b/tests/functional/ifelse1.asm @@ -444,7 +444,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -503,7 +503,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ifwhilex.asm b/tests/functional/ifwhilex.asm index ab671d7f0..beb0b45d3 100644 --- a/tests/functional/ifwhilex.asm +++ b/tests/functional/ifwhilex.asm @@ -463,7 +463,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -522,7 +522,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/inkey.asm b/tests/functional/inkey.asm index d5c82ef7e..6cd501edf 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -807,7 +807,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -866,7 +866,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/inktemp.asm b/tests/functional/inktemp.asm index 6b0409cc3..5ea6ec43a 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 d44a692bd..c0d2945ca 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 1793698f7..f99800431 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 022387cbb..31e0d2a92 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 474f9b417..5e0ea078d 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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd3.asm b/tests/functional/lcd3.asm index 63bcd0052..b640fa61a 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1292,7 +1292,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1351,7 +1351,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd7.asm b/tests/functional/lcd7.asm index e6be91d78..5f2087956 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1029,7 +1029,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1088,7 +1088,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd8.asm b/tests/functional/lcd8.asm index 376673e67..ac3d4b638 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1031,7 +1031,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1090,7 +1090,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/lcd9.asm b/tests/functional/lcd9.asm index 0acd2cf82..261dc4ea4 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1019,7 +1019,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1078,7 +1078,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 8e3fdb996..5e901bdf5 100644 --- a/tests/functional/let_array_substr.asm +++ b/tests/functional/let_array_substr.asm @@ -106,31 +106,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -149,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -172,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -205,7 +184,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -236,7 +215,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -904,9 +883,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a8df9e06d..51d2f2a12 100644 --- a/tests/functional/let_array_substr1.asm +++ b/tests/functional/let_array_substr1.asm @@ -106,31 +106,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -149,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -172,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -205,7 +184,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -236,7 +215,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -904,9 +883,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 385dfdd1c..90f7d9324 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 bff978cf8..0e6446632 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7a02d0a5e..5b00a4f0c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 cc97b2105..f7acb8ec1 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7e8e0221b..a56992a56 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7dbc87a87..deae0c2c8 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a3a06a424..106f71a2d 100644 --- a/tests/functional/let_array_substr5.asm +++ b/tests/functional/let_array_substr5.asm @@ -106,31 +106,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -149,7 +128,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -172,10 +151,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -205,7 +184,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -236,7 +215,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -904,9 +883,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a9d9b8ba7..485b9a171 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 0f5de0dba..b88ffabcf 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7ec334680..a57d4b768 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 4ef0ce8b3..68d5dc612 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 9dd8bbde6..9fabc0832 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a6b0567e2..5a6113e2d 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/load03.asm b/tests/functional/load03.asm index 3d72806ff..aa5d21d53 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/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 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 63 "/zbasic/library-asm/copy_attr.asm" ret -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/loadstr.asm b/tests/functional/loadstr.asm index 2613f8616..10a0749ac 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 cd128440f..a3a1a40cd 100644 --- a/tests/functional/loadu16ii.asm +++ b/tests/functional/loadu16ii.asm @@ -66,31 +66,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -498,7 +477,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -557,7 +536,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ltee1.asm b/tests/functional/ltee1.asm index 1cdfef204..3b3cd3ac6 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1045,7 +1045,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1104,7 +1104,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/ltee10.asm b/tests/functional/ltee10.asm index e9315333a..290ce1d18 100644 --- a/tests/functional/ltee10.asm +++ b/tests/functional/ltee10.asm @@ -90,31 +90,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -133,7 +112,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -156,10 +135,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -189,7 +168,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -220,7 +199,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/ltee3.asm b/tests/functional/ltee3.asm index d5d54226f..5adb17765 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 3444c55ff..2e2930aa2 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 74c44c58d..3cb36e1ea 100644 --- a/tests/functional/ltee6.asm +++ b/tests/functional/ltee6.asm @@ -79,31 +79,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -122,7 +101,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -145,10 +124,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -178,7 +157,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -209,7 +188,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -609,9 +588,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a48906068..1e3a9d14e 100644 --- a/tests/functional/ltee7.asm +++ b/tests/functional/ltee7.asm @@ -117,31 +117,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -160,7 +139,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -183,10 +162,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -216,7 +195,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -247,7 +226,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -910,9 +889,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 c0fe1dacd..461c7cdb7 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 dd0f78606..7bf2201f2 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 d915e78ea..29a39f636 100644 --- a/tests/functional/memcpytest.asm +++ b/tests/functional/memcpytest.asm @@ -569,7 +569,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -628,7 +628,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/mul16.asm b/tests/functional/mul16.asm index e96f2153e..95b6c0ad5 100644 --- a/tests/functional/mul16.asm +++ b/tests/functional/mul16.asm @@ -52,31 +52,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: diff --git a/tests/functional/mul16a.asm b/tests/functional/mul16a.asm index fb02a40c4..0969b80fa 100644 --- a/tests/functional/mul16a.asm +++ b/tests/functional/mul16a.asm @@ -47,31 +47,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: diff --git a/tests/functional/mul16b.asm b/tests/functional/mul16b.asm index e47df00d6..151c00e08 100644 --- a/tests/functional/mul16b.asm +++ b/tests/functional/mul16b.asm @@ -53,31 +53,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: diff --git a/tests/functional/ongoto.asm b/tests/functional/ongoto.asm index 5f7fede01..7ee0a1673 100644 --- a/tests/functional/ongoto.asm +++ b/tests/functional/ongoto.asm @@ -563,7 +563,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -622,7 +622,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 eb4aa26ec..e777dc067 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 d403db9fc..b9d19e006 100644 --- a/tests/functional/opt2_snake_es.asm +++ b/tests/functional/opt2_snake_es.asm @@ -76,31 +76,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -119,7 +98,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -142,10 +121,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -175,7 +154,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -206,7 +185,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/opt3_OPT27wws2.asm b/tests/functional/opt3_OPT27wws2.asm index d80751e05..88b1e1726 100644 --- a/tests/functional/opt3_OPT27wws2.asm +++ b/tests/functional/opt3_OPT27wws2.asm @@ -77,31 +77,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -120,7 +99,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -143,10 +122,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -176,7 +155,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -207,7 +186,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start diff --git a/tests/functional/opt3_data2.asm b/tests/functional/opt3_data2.asm index e4faf8d3e..c1599285e 100644 --- a/tests/functional/opt3_data2.asm +++ b/tests/functional/opt3_data2.asm @@ -143,31 +143,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -186,7 +165,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -209,10 +188,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -242,7 +221,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -273,7 +252,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -753,7 +732,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -812,7 +791,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -1967,9 +1946,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 29b68f628..2b27f45c0 100644 --- a/tests/functional/opt3_einar.asm +++ b/tests/functional/opt3_einar.asm @@ -455,7 +455,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -514,7 +514,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/optconst.asm b/tests/functional/optconst.asm index 8f03f0574..831551846 100644 --- a/tests/functional/optconst.asm +++ b/tests/functional/optconst.asm @@ -445,7 +445,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -504,7 +504,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/param0.asm b/tests/functional/param0.asm index b2044fcea..c7ae54466 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1008,7 +1008,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1067,7 +1067,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/param1.asm b/tests/functional/param1.asm index de0b4cdfc..ab0bd4bc7 100644 --- a/tests/functional/param1.asm +++ b/tests/functional/param1.asm @@ -455,7 +455,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -514,7 +514,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 803c5b425..538199dec 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1008,7 +1008,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1067,7 +1067,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/parambyref1.asm b/tests/functional/parambyref1.asm index 8c18dbfef..8c80a400a 100644 --- a/tests/functional/parambyref1.asm +++ b/tests/functional/parambyref1.asm @@ -458,7 +458,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -517,7 +517,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/paramstr3.asm b/tests/functional/paramstr3.asm index 6443400fd..f6db6e5f9 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 fd58a8f0b..f888f50a6 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 5eb06698b..e97f02a32 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 8c3dc2129..e24f48a23 100644 --- a/tests/functional/prepro00.out +++ b/tests/functional/prepro00.out @@ -1,5 +1,5 @@ #line 1 "prepro00.bi" -#line 1 "/src/zxb/trunk/library/attr.bas" +#line 1 "/zbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/src/zxb/trunk/library/attr.bas" +#line 119 "/zbasic/library/attr.bas" #line 2 "prepro00.bi" PRINT "HELLO" diff --git a/tests/functional/prepro01.out b/tests/functional/prepro01.out index b4e23e1ea..c0603499f 100644 --- a/tests/functional/prepro01.out +++ b/tests/functional/prepro01.out @@ -1,5 +1,5 @@ #line 1 "prepro01.bi" -#line 1 "/src/zxb/trunk/library/attr.bas" +#line 1 "/zbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/src/zxb/trunk/library/attr.bas" +#line 119 "/zbasic/library/attr.bas" #line 2 "prepro01.bi" diff --git a/tests/functional/prepro30.out b/tests/functional/prepro30.out index 9bb0ba74e..914235e94 100644 --- a/tests/functional/prepro30.out +++ b/tests/functional/prepro30.out @@ -1,5 +1,5 @@ #line 1 "prepro30.bi" -#line 1 "/src/zxb/trunk/library/attr.bas" +#line 1 "/zbasic/library/attr.bas" @@ -117,7 +117,7 @@ end function #require "in_screen.asm" -#line 119 "/src/zxb/trunk/library/attr.bas" +#line 119 "/zbasic/library/attr.bas" #line 2 "prepro30.bi" diff --git a/tests/functional/prepro71.out b/tests/functional/prepro71.out index cd20bf26d..1bb8f16c6 100644 --- a/tests/functional/prepro71.out +++ b/tests/functional/prepro71.out @@ -1,5 +1,5 @@ #line 1 "prepro71.bi" -#line 1 "/src/zxb/trunk/library/alloc.bas" +#line 1 "/zbasic/library/alloc.bas" @@ -196,7 +196,7 @@ end function #require "free.asm" #require "realloc.asm" -#line 198 "/src/zxb/trunk/library/alloc.bas" +#line 198 "/zbasic/library/alloc.bas" #line 2 "prepro71.bi" diff --git a/tests/functional/prepro73.out b/tests/functional/prepro73.out index 802529748..2fac6ffe9 100644 --- a/tests/functional/prepro73.out +++ b/tests/functional/prepro73.out @@ -1,5 +1,5 @@ #line 1 "prepro73.bi" -#line 1 "/src/zxb/trunk/library/pos.bas" +#line 1 "/zbasic/library/pos.bas" @@ -41,14 +41,14 @@ end function #require "sposn.asm" -#line 43 "/src/zxb/trunk/library/pos.bas" +#line 43 "/zbasic/library/pos.bas" #line 2 "prepro73.bi" #line 1 "prepro73.bi" -#line 1 "/src/zxb/trunk/library/pos.bas" +#line 1 "/zbasic/library/pos.bas" @@ -58,7 +58,7 @@ end function -#line 43 "/src/zxb/trunk/library/pos.bas" +#line 43 "/zbasic/library/pos.bas" #line 2 "prepro73.bi" diff --git a/tests/functional/prepro74.out b/tests/functional/prepro74.out index 5c67a4d1e..dd100af52 100644 --- a/tests/functional/prepro74.out +++ b/tests/functional/prepro74.out @@ -1,5 +1,5 @@ #line 1 "prepro74.bi" -#line 1 "/src/zxb/trunk/library/pos.bas" +#line 1 "/zbasic/library/pos.bas" @@ -41,7 +41,7 @@ end function #require "sposn.asm" -#line 43 "/src/zxb/trunk/library/pos.bas" +#line 43 "/zbasic/library/pos.bas" #line 2 "prepro74.bi" diff --git a/tests/functional/print.asm b/tests/functional/print.asm index 646cb6207..666429bbd 100644 --- a/tests/functional/print.asm +++ b/tests/functional/print.asm @@ -454,7 +454,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -513,7 +513,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 3188b0e3b..5083addd3 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -798,7 +798,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -857,7 +857,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/read.asm b/tests/functional/read.asm index 2801f7635..9bda53581 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 1fdf82c2f..478cdd9d6 100644 --- a/tests/functional/read10.asm +++ b/tests/functional/read10.asm @@ -672,7 +672,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -731,7 +731,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 bc7dcec06..4b0773a37 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -813,7 +813,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -872,7 +872,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/read4.asm b/tests/functional/read4.asm index b1627a0bb..da99a421e 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 892746522..fb3b0e28d 100644 --- a/tests/functional/read5.asm +++ b/tests/functional/read5.asm @@ -620,7 +620,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -679,7 +679,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 594b0a64e..0fbfd6ef8 100644 --- a/tests/functional/read8.asm +++ b/tests/functional/read8.asm @@ -611,7 +611,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -670,7 +670,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 33d9d79f1..ad72209b0 100644 --- a/tests/functional/read9.asm +++ b/tests/functional/read9.asm @@ -165,31 +165,10 @@ __MUL16: ; Mutiplies HL with the last value stored into de stack pop hl ; Return address ex (sp), hl ; CALLEE caller convention -;;__MUL16_FAST: ; __FASTCALL ENTRY: HL = 1st operand, DE = 2nd Operand - ;; ld c, h - ;; ld a, l ; C,A => 1st Operand - ;; - ;; ld hl, 0 ; Accumulator - ;; ld b, 16 - ;; -;;__MUL16LOOP: - ;; sra c ; C,A >> 1 (Arithmetic) - ;; rra - ;; - ;; jr nc, __MUL16NOADD - ;; add hl, de - ;; -;;__MUL16NOADD: - ;; sla e - ;; rl d - ;; - ;; djnz __MUL16LOOP - __MUL16_FAST: ld b, 16 - ld a, d - ld c, e - ex de, hl + ld a, h + ld c, l ld hl, 0 __MUL16LOOP: @@ -208,7 +187,7 @@ __MUL16NOADD: #line 20 "array.asm" -#line 24 "/src/zxb/trunk/library-asm/array.asm" +#line 24 "/zbasic/library-asm/array.asm" __ARRAY: PROC @@ -231,10 +210,10 @@ __ARRAY: ld hl, 0 ; BC = Offset "accumulator" LOOP: -#line 49 "/src/zxb/trunk/library-asm/array.asm" +#line 49 "/zbasic/library-asm/array.asm" pop bc ; Get next index (Ai) from the stack -#line 59 "/src/zxb/trunk/library-asm/array.asm" +#line 59 "/zbasic/library-asm/array.asm" add hl, bc ; Adds current index @@ -264,7 +243,7 @@ ARRAY_END: push de exx -#line 92 "/src/zxb/trunk/library-asm/array.asm" +#line 92 "/zbasic/library-asm/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl @@ -295,7 +274,7 @@ ARRAY_SIZE_LOOP: ;add hl, de ;__ARRAY_FIN: -#line 123 "/src/zxb/trunk/library-asm/array.asm" +#line 123 "/zbasic/library-asm/array.asm" pop de add hl, de ; Adds element start @@ -857,7 +836,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -916,7 +895,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) @@ -2196,9 +2175,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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a5db5f532..d2192d970 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 d8b9104a6..1f4655ac1 100644 --- a/tests/functional/readokdown.asm +++ b/tests/functional/readokdown.asm @@ -495,7 +495,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -554,7 +554,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 bcf5210eb..47ef28a72 100644 --- a/tests/functional/readokup.asm +++ b/tests/functional/readokup.asm @@ -494,7 +494,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -553,7 +553,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 089346e10..02295f6f6 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 4dd1c6d79..94e8f298c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 302a785b7..e6a3869b5 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 debffd0e0..defea5a94 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 a12061486..9b1fd586c 100644 --- a/tests/functional/simple.asm +++ b/tests/functional/simple.asm @@ -437,7 +437,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -496,7 +496,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/slice0.asm b/tests/functional/slice0.asm index 138bb5cdc..c104cca81 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 253cdd1e1..3c52278e7 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 d0479ee16..3392676a1 100644 --- a/tests/functional/spfill.asm +++ b/tests/functional/spfill.asm @@ -65,7 +65,7 @@ _SPFill: call SPPFill_start pop ix ret -#line 1 "/src/zxb/trunk/library-asm/SP/PixelUp.asm" +#line 1 "/zbasic/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 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/PixelDown.asm" +#line 31 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/PixelDown.asm" SP.PixelDown: inc h ld a,h @@ -109,8 +109,8 @@ _SPFill: cp $58 ccf ret -#line 32 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/CharLeft.asm" +#line 32 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/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 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/CharRight.asm" +#line 33 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/CharRight.asm" SP.CharRight: inc l ret nz @@ -132,8 +132,8 @@ _SPFill: cp $58 ccf ret -#line 34 "/src/zxb/trunk/library/SP/Fill.bas" -#line 1 "/src/zxb/trunk/library-asm/SP/GetScrnAddr.asm" +#line 34 "/zbasic/library/SP/Fill.bas" +#line 1 "/zbasic/library-asm/SP/GetScrnAddr.asm" SPGetScrnAddr: and $07 or $40 @@ -165,7 +165,7 @@ norotate: or l ld e,a ret -#line 35 "/src/zxb/trunk/library/SP/Fill.bas" +#line 35 "/zbasic/library/SP/Fill.bas" SPPFill_IXBuffer: DEFB 0,0 SPPFill_start: diff --git a/tests/functional/storecstr.asm b/tests/functional/storecstr.asm index c3343987c..b8f50c667 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 02473c296..98a9be305 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 05c8899e9..a222197b5 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 acc935bd7..d633e7cbb 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 6eecc2541..a141b0f48 100644 --- a/tests/functional/str0.asm +++ b/tests/functional/str0.asm @@ -785,7 +785,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -844,7 +844,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 76145f3c5..5196941f9 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 ee41e42c8..f3bb67684 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 cca21b52b..9fbdaa39a 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 b9eb10408..c2974c41d 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 741c93483..6420c3d4f 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 cca27feea..e7517f319 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 bcd7b318e..39cce623f 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1178,7 +1178,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1237,7 +1237,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 a3d5cc5bb..bd7a3576c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 692afd682..3cb12399e 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 5fdad7ca1..62a26f143 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1010,7 +1010,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1069,7 +1069,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strlocal0.asm b/tests/functional/strlocal0.asm index 927771f2b..a643c30d4 100644 --- a/tests/functional/strlocal0.asm +++ b/tests/functional/strlocal0.asm @@ -783,7 +783,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -842,7 +842,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 77c5c0427..85a84ba21 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1040,7 +1040,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1099,7 +1099,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strparam1.asm b/tests/functional/strparam1.asm index 1f35397a7..5c5870e1c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 f7029e893..096b381b3 100644 --- a/tests/functional/strparam2.asm +++ b/tests/functional/strparam2.asm @@ -477,7 +477,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -536,7 +536,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7f73e0c2e..2cdbb27e0 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -1034,7 +1034,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -1093,7 +1093,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/strsigil.asm b/tests/functional/strsigil.asm index bf24b92e0..46c72e8dd 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 b74ba3f40..44a753cb7 100644 --- a/tests/functional/subrec.asm +++ b/tests/functional/subrec.asm @@ -617,7 +617,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -676,7 +676,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/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 aa668fe9e..5e0b6328c 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 6f7486df2..59a23d8b4 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 3250032d9..15b349470 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 b212d3477..83d5a3a66 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 7697cecf5..ce7d49daf 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/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 84e2359e5..646ca0dbc 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 = "/src/zxb/trunk" +_original_root = "/zbasic" 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 1d0010405..0ebca9234 100644 --- a/tests/functional/usr0.asm +++ b/tests/functional/usr0.asm @@ -428,7 +428,7 @@ BRIGHT_TMP: -#line 4 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 4 "/zbasic/library-asm/copy_attr.asm" @@ -487,7 +487,7 @@ TABLE: and (hl) ; OVER 2 MODE or (hl) ; OVER 3 MODE -#line 65 "/src/zxb/trunk/library-asm/copy_attr.asm" +#line 65 "/zbasic/library-asm/copy_attr.asm" __REFRESH_TMP: ld a, (hl) diff --git a/tests/functional/valcrash2.asm b/tests/functional/valcrash2.asm index 24b51befd..9cd54e984 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 "/src/zxb/trunk/library-asm/alloc.asm" +#line 111 "/zbasic/library-asm/alloc.asm" ret z ; NULL -#line 113 "/src/zxb/trunk/library-asm/alloc.asm" +#line 113 "/zbasic/library-asm/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl