diff --git a/src/arch/z80/backend/main.py b/src/arch/z80/backend/main.py index 6b10983b0..2a484713d 100644 --- a/src/arch/z80/backend/main.py +++ b/src/arch/z80/backend/main.py @@ -661,9 +661,7 @@ def emit_prologue() -> list[str]: output.append("exx") output.append("push hl") output.append("exx") - output.append("ld hl, 0") - output.append("add hl, sp") - output.append(f"ld ({common.CALL_BACK}), hl") + output.append(f"ld ({common.CALL_BACK}), sp") output.append("ei") output.extend(f"call {x}" for x in sorted(common.INITS)) diff --git a/src/arch/zxnext/backend/main.py b/src/arch/zxnext/backend/main.py index 16366df8d..21d2f0ddb 100644 --- a/src/arch/zxnext/backend/main.py +++ b/src/arch/zxnext/backend/main.py @@ -75,9 +75,7 @@ def emit_prologue() -> list[str]: output.append("di") output.append("push iy") output.append("ld iy, 0x5C3A ; ZX Spectrum ROM variables address") - output.append("ld hl, 0") - output.append("add hl, sp") - output.append(f"ld ({common.CALL_BACK}), hl") + output.append(f"ld ({common.CALL_BACK}), sp") output.append("ei") output.extend(f"call {x}" for x in sorted(common.INITS)) diff --git a/src/lib/arch/zx48k/runtime/arith/divf.asm b/src/lib/arch/zx48k/runtime/arith/divf.asm index d3b163fe4..5269f3f8c 100644 --- a/src/lib/arch/zx48k/runtime/arith/divf.asm +++ b/src/lib/arch/zx48k/runtime/arith/divf.asm @@ -27,9 +27,7 @@ ERR_SP EQU 23613 ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h diff --git a/src/lib/arch/zx48k/runtime/val.asm b/src/lib/arch/zx48k/runtime/val.asm index 3096db42b..22d9590a1 100644 --- a/src/lib/arch/zx48k/runtime/val.asm +++ b/src/lib/arch/zx48k/runtime/val.asm @@ -59,9 +59,7 @@ SET_MIN EQU 16B0h ;; Now put our error handler on ERR_SP ld hl, __VAL_ERROR push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp call STK_STO_S ; Enter it on the stack diff --git a/src/lib/arch/zxnext/runtime/arith/divf.asm b/src/lib/arch/zxnext/runtime/arith/divf.asm index d3b163fe4..5269f3f8c 100644 --- a/src/lib/arch/zxnext/runtime/arith/divf.asm +++ b/src/lib/arch/zxnext/runtime/arith/divf.asm @@ -27,9 +27,7 @@ ERR_SP EQU 23613 ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h diff --git a/src/lib/arch/zxnext/runtime/val.asm b/src/lib/arch/zxnext/runtime/val.asm index 3096db42b..22d9590a1 100644 --- a/src/lib/arch/zxnext/runtime/val.asm +++ b/src/lib/arch/zxnext/runtime/val.asm @@ -59,9 +59,7 @@ SET_MIN EQU 16B0h ;; Now put our error handler on ERR_SP ld hl, __VAL_ERROR push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp call STK_STO_S ; Enter it on the stack diff --git a/tests/functional/arch/zx48k/00.asm b/tests/functional/arch/zx48k/00.asm index f57f3211d..c13cba6a3 100644 --- a/tests/functional/arch/zx48k/00.asm +++ b/tests/functional/arch/zx48k/00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/02.asm b/tests/functional/arch/zx48k/02.asm index f9ad97b1e..afa91fa17 100644 --- a/tests/functional/arch/zx48k/02.asm +++ b/tests/functional/arch/zx48k/02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/03.asm b/tests/functional/arch/zx48k/03.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/03.asm +++ b/tests/functional/arch/zx48k/03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/04.asm b/tests/functional/arch/zx48k/04.asm index f9ad97b1e..afa91fa17 100644 --- a/tests/functional/arch/zx48k/04.asm +++ b/tests/functional/arch/zx48k/04.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/05.asm b/tests/functional/arch/zx48k/05.asm index 6dde0e7fe..e2120f99a 100644 --- a/tests/functional/arch/zx48k/05.asm +++ b/tests/functional/arch/zx48k/05.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/053opt.asm b/tests/functional/arch/zx48k/053opt.asm index cf2d71f85..ce4ffd104 100644 --- a/tests/functional/arch/zx48k/053opt.asm +++ b/tests/functional/arch/zx48k/053opt.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -77,7 +75,7 @@ _sail: ld c, l jp .core.__END_PROGRAM ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/abs8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/abs8.asm" ; Returns absolute value for 8 bit signed integer ; push namespace core @@ -87,9 +85,9 @@ __ABS8: neg ret pop namespace -#line 55 "053opt.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 55 "arch/zx48k/053opt.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -111,6 +109,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 56 "053opt.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 56 "arch/zx48k/053opt.bas" END diff --git a/tests/functional/arch/zx48k/06.asm b/tests/functional/arch/zx48k/06.asm index 33e4ce8fa..cca792c18 100644 --- a/tests/functional/arch/zx48k/06.asm +++ b/tests/functional/arch/zx48k/06.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/07.asm b/tests/functional/arch/zx48k/07.asm index 6efa2e35a..d5f105316 100644 --- a/tests/functional/arch/zx48k/07.asm +++ b/tests/functional/arch/zx48k/07.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/08.asm b/tests/functional/arch/zx48k/08.asm index 2e9dc2e3f..32f8b96a3 100644 --- a/tests/functional/arch/zx48k/08.asm +++ b/tests/functional/arch/zx48k/08.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/09.asm b/tests/functional/arch/zx48k/09.asm index d911d164a..02e3f8293 100644 --- a/tests/functional/arch/zx48k/09.asm +++ b/tests/functional/arch/zx48k/09.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/10.asm b/tests/functional/arch/zx48k/10.asm index f87750422..f04145962 100644 --- a/tests/functional/arch/zx48k/10.asm +++ b/tests/functional/arch/zx48k/10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/11.asm b/tests/functional/arch/zx48k/11.asm index f12555c7b..c9bfb0261 100644 --- a/tests/functional/arch/zx48k/11.asm +++ b/tests/functional/arch/zx48k/11.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/12.asm b/tests/functional/arch/zx48k/12.asm index 8d504a832..2c893ad5e 100644 --- a/tests/functional/arch/zx48k/12.asm +++ b/tests/functional/arch/zx48k/12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/13.asm b/tests/functional/arch/zx48k/13.asm index c1569df66..991bce5b6 100644 --- a/tests/functional/arch/zx48k/13.asm +++ b/tests/functional/arch/zx48k/13.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/15.asm b/tests/functional/arch/zx48k/15.asm index a992d7df5..60dce67ff 100644 --- a/tests/functional/arch/zx48k/15.asm +++ b/tests/functional/arch/zx48k/15.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/16.asm b/tests/functional/arch/zx48k/16.asm index 8a26e69d2..1f660d110 100644 --- a/tests/functional/arch/zx48k/16.asm +++ b/tests/functional/arch/zx48k/16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/17.asm b/tests/functional/arch/zx48k/17.asm index d45999575..c060d3c7c 100644 --- a/tests/functional/arch/zx48k/17.asm +++ b/tests/functional/arch/zx48k/17.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/18.asm b/tests/functional/arch/zx48k/18.asm index 3978280dc..2e2e30b18 100644 --- a/tests/functional/arch/zx48k/18.asm +++ b/tests/functional/arch/zx48k/18.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/20.asm b/tests/functional/arch/zx48k/20.asm index 5d873861a..1c797cd53 100644 --- a/tests/functional/arch/zx48k/20.asm +++ b/tests/functional/arch/zx48k/20.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/21.asm b/tests/functional/arch/zx48k/21.asm index 320bdd36c..205ebde88 100644 --- a/tests/functional/arch/zx48k/21.asm +++ b/tests/functional/arch/zx48k/21.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,7 +42,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -72,5 +70,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 22 "21.bas" +#line 22 "arch/zx48k/21.bas" END diff --git a/tests/functional/arch/zx48k/22.asm b/tests/functional/arch/zx48k/22.asm index 6b2aedfd9..bdec6ec85 100644 --- a/tests/functional/arch/zx48k/22.asm +++ b/tests/functional/arch/zx48k/22.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/25.asm b/tests/functional/arch/zx48k/25.asm index 2a1d38399..e32bc03c7 100644 --- a/tests/functional/arch/zx48k/25.asm +++ b/tests/functional/arch/zx48k/25.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/26.asm b/tests/functional/arch/zx48k/26.asm index f0488db54..c06641ac1 100644 --- a/tests/functional/arch/zx48k/26.asm +++ b/tests/functional/arch/zx48k/26.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/27.asm b/tests/functional/arch/zx48k/27.asm index a6d129155..65bc2e0ee 100644 --- a/tests/functional/arch/zx48k/27.asm +++ b/tests/functional/arch/zx48k/27.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/28.asm b/tests/functional/arch/zx48k/28.asm index a49e50935..94d9c28b8 100644 --- a/tests/functional/arch/zx48k/28.asm +++ b/tests/functional/arch/zx48k/28.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/29.asm b/tests/functional/arch/zx48k/29.asm index d90bf709c..869d5a537 100644 --- a/tests/functional/arch/zx48k/29.asm +++ b/tests/functional/arch/zx48k/29.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/30.asm b/tests/functional/arch/zx48k/30.asm index 32ccf6bba..c34c7a627 100644 --- a/tests/functional/arch/zx48k/30.asm +++ b/tests/functional/arch/zx48k/30.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/31.asm b/tests/functional/arch/zx48k/31.asm index 7a5e11ebd..d0022d85f 100644 --- a/tests/functional/arch/zx48k/31.asm +++ b/tests/functional/arch/zx48k/31.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -53,8 +51,8 @@ _test__leave: pop ix ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -93,7 +91,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -111,8 +109,8 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 33 "31.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 33 "arch/zx48k/31.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -139,8 +137,8 @@ __FP_PUSH_REV: exx ret pop namespace -#line 34 "31.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 34 "arch/zx48k/31.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -168,5 +166,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 35 "31.bas" +#line 35 "arch/zx48k/31.bas" END diff --git a/tests/functional/arch/zx48k/32.asm b/tests/functional/arch/zx48k/32.asm index 76488a3b6..384e3d993 100644 --- a/tests/functional/arch/zx48k/32.asm +++ b/tests/functional/arch/zx48k/32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/33.asm b/tests/functional/arch/zx48k/33.asm index 05d2e4517..1e01c57f7 100644 --- a/tests/functional/arch/zx48k/33.asm +++ b/tests/functional/arch/zx48k/33.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/34.asm b/tests/functional/arch/zx48k/34.asm index e3f113797..00f9eafd2 100644 --- a/tests/functional/arch/zx48k/34.asm +++ b/tests/functional/arch/zx48k/34.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,8 +48,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -76,7 +74,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -146,5 +144,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 32 "34.bas" +#line 32 "arch/zx48k/34.bas" END diff --git a/tests/functional/arch/zx48k/35.asm b/tests/functional/arch/zx48k/35.asm index f8ca2ccfa..6371f5b9e 100644 --- a/tests/functional/arch/zx48k/35.asm +++ b/tests/functional/arch/zx48k/35.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -63,8 +61,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -103,7 +101,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -121,13 +119,13 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 45 "35.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 45 "arch/zx48k/35.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -154,7 +152,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -162,9 +160,9 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 46 "35.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 46 "arch/zx48k/35.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -189,7 +187,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -259,5 +257,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 47 "35.bas" +#line 47 "arch/zx48k/35.bas" END diff --git a/tests/functional/arch/zx48k/36.asm b/tests/functional/arch/zx48k/36.asm index e07a46b8b..e4c991016 100644 --- a/tests/functional/arch/zx48k/36.asm +++ b/tests/functional/arch/zx48k/36.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,8 +64,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -106,7 +104,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -124,13 +122,13 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 48 "36.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 48 "arch/zx48k/36.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -157,7 +155,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -165,9 +163,9 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 49 "36.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 49 "arch/zx48k/36.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -192,7 +190,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -262,5 +260,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 50 "36.bas" +#line 50 "arch/zx48k/36.bas" END diff --git a/tests/functional/arch/zx48k/37.asm b/tests/functional/arch/zx48k/37.asm index 3cd86d789..df1b1db74 100644 --- a/tests/functional/arch/zx48k/37.asm +++ b/tests/functional/arch/zx48k/37.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,8 +64,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -106,7 +104,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -124,13 +122,13 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 48 "37.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 48 "arch/zx48k/37.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -157,7 +155,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -165,9 +163,9 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 49 "37.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 49 "arch/zx48k/37.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -192,7 +190,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -262,5 +260,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 50 "37.bas" +#line 50 "arch/zx48k/37.bas" END diff --git a/tests/functional/arch/zx48k/38.asm b/tests/functional/arch/zx48k/38.asm index a0365173b..8944ec335 100644 --- a/tests/functional/arch/zx48k/38.asm +++ b/tests/functional/arch/zx48k/38.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,8 +64,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -106,7 +104,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -124,13 +122,13 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 48 "38.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 48 "arch/zx48k/38.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -157,7 +155,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -165,9 +163,9 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 49 "38.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 49 "arch/zx48k/38.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -192,7 +190,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -262,5 +260,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 50 "38.bas" +#line 50 "arch/zx48k/38.bas" END diff --git a/tests/functional/arch/zx48k/39.asm b/tests/functional/arch/zx48k/39.asm index fa752867b..c2a002010 100644 --- a/tests/functional/arch/zx48k/39.asm +++ b/tests/functional/arch/zx48k/39.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -64,8 +62,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -90,7 +88,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -160,7 +158,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 46 "39.bas" +#line 46 "arch/zx48k/39.bas" .LABEL.__LABEL0: DEFB 02h END diff --git a/tests/functional/arch/zx48k/40.asm b/tests/functional/arch/zx48k/40.asm index 81a072002..fc593dcfb 100644 --- a/tests/functional/arch/zx48k/40.asm +++ b/tests/functional/arch/zx48k/40.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/41.asm b/tests/functional/arch/zx48k/41.asm index c9290e081..2f523b974 100644 --- a/tests/functional/arch/zx48k/41.asm +++ b/tests/functional/arch/zx48k/41.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/42.asm b/tests/functional/arch/zx48k/42.asm index 4163e75a4..97b2662f3 100644 --- a/tests/functional/arch/zx48k/42.asm +++ b/tests/functional/arch/zx48k/42.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/43.asm b/tests/functional/arch/zx48k/43.asm index de3cb1dfa..589dfaab8 100644 --- a/tests/functional/arch/zx48k/43.asm +++ b/tests/functional/arch/zx48k/43.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/44.asm b/tests/functional/arch/zx48k/44.asm index 436356f0e..22d5496e6 100644 --- a/tests/functional/arch/zx48k/44.asm +++ b/tests/functional/arch/zx48k/44.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/45.asm b/tests/functional/arch/zx48k/45.asm index e8429cc3f..a075350af 100644 --- a/tests/functional/arch/zx48k/45.asm +++ b/tests/functional/arch/zx48k/45.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/46.asm b/tests/functional/arch/zx48k/46.asm index 862bae95e..529d55bf9 100644 --- a/tests/functional/arch/zx48k/46.asm +++ b/tests/functional/arch/zx48k/46.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -77,7 +75,7 @@ _b.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -138,8 +136,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -168,7 +166,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -196,7 +194,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -215,7 +213,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -223,7 +221,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/47.asm b/tests/functional/arch/zx48k/47.asm index 7fd67d70f..ae095034a 100644 --- a/tests/functional/arch/zx48k/47.asm +++ b/tests/functional/arch/zx48k/47.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/48.asm b/tests/functional/arch/zx48k/48.asm index af64b09a3..ec5b3eba6 100644 --- a/tests/functional/arch/zx48k/48.asm +++ b/tests/functional/arch/zx48k/48.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/49.asm b/tests/functional/arch/zx48k/49.asm index dd6aa5bd3..a31218d2f 100644 --- a/tests/functional/arch/zx48k/49.asm +++ b/tests/functional/arch/zx48k/49.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/52.asm b/tests/functional/arch/zx48k/52.asm index 5f25cb65b..c8a38fe10 100644 --- a/tests/functional/arch/zx48k/52.asm +++ b/tests/functional/arch/zx48k/52.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/54.asm b/tests/functional/arch/zx48k/54.asm index d2a055dac..4f233df04 100644 --- a/tests/functional/arch/zx48k/54.asm +++ b/tests/functional/arch/zx48k/54.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/55.asm b/tests/functional/arch/zx48k/55.asm index 933d8998d..9412c14fc 100644 --- a/tests/functional/arch/zx48k/55.asm +++ b/tests/functional/arch/zx48k/55.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -70,7 +68,7 @@ _b.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -131,8 +129,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -161,7 +159,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -189,7 +187,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -208,7 +206,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -216,7 +214,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/60.asm b/tests/functional/arch/zx48k/60.asm index d0f85a4b7..5d207c0a4 100644 --- a/tests/functional/arch/zx48k/60.asm +++ b/tests/functional/arch/zx48k/60.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/61.asm b/tests/functional/arch/zx48k/61.asm index d0f85a4b7..5d207c0a4 100644 --- a/tests/functional/arch/zx48k/61.asm +++ b/tests/functional/arch/zx48k/61.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/63.asm b/tests/functional/arch/zx48k/63.asm index 236ccb222..6888c0a3b 100644 --- a/tests/functional/arch/zx48k/63.asm +++ b/tests/functional/arch/zx48k/63.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/64.asm b/tests/functional/arch/zx48k/64.asm index eab591034..b1593bbf8 100644 --- a/tests/functional/arch/zx48k/64.asm +++ b/tests/functional/arch/zx48k/64.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/65.asm b/tests/functional/arch/zx48k/65.asm index f7264ba6e..67386b15f 100644 --- a/tests/functional/arch/zx48k/65.asm +++ b/tests/functional/arch/zx48k/65.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/66.asm b/tests/functional/arch/zx48k/66.asm index bef49d887..695038b74 100644 --- a/tests/functional/arch/zx48k/66.asm +++ b/tests/functional/arch/zx48k/66.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/70.asm b/tests/functional/arch/zx48k/70.asm index 0eeac293f..9517b77a7 100644 --- a/tests/functional/arch/zx48k/70.asm +++ b/tests/functional/arch/zx48k/70.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/abs.asm b/tests/functional/arch/zx48k/abs.asm index d5501d89a..2fe17ac83 100644 --- a/tests/functional/arch/zx48k/abs.asm +++ b/tests/functional/arch/zx48k/abs.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/abs16.asm b/tests/functional/arch/zx48k/abs16.asm index d6e69f358..531eb6317 100644 --- a/tests/functional/arch/zx48k/abs16.asm +++ b/tests/functional/arch/zx48k/abs16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -42,10 +40,10 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/abs16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/abs16.asm" ; 16 bit signed integer abs value ; HL = value -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -61,6 +59,6 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/abs16.asm" -#line 20 "abs16.bas" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/abs16.asm" +#line 20 "arch/zx48k/abs16.bas" END diff --git a/tests/functional/arch/zx48k/abs32.asm b/tests/functional/arch/zx48k/abs32.asm index a239cf73e..8309bdcb9 100644 --- a/tests/functional/arch/zx48k/abs32.asm +++ b/tests/functional/arch/zx48k/abs32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,10 +42,10 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/abs32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/abs32.asm" ; 16 bit signed integer abs value ; HL = value -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -72,6 +70,6 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/abs32.asm" -#line 22 "abs32.bas" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/abs32.asm" +#line 22 "arch/zx48k/abs32.bas" END diff --git a/tests/functional/arch/zx48k/add16.asm b/tests/functional/arch/zx48k/add16.asm index 4578d38df..90802bba1 100644 --- a/tests/functional/arch/zx48k/add16.asm +++ b/tests/functional/arch/zx48k/add16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add16a.asm b/tests/functional/arch/zx48k/add16a.asm index cbf765a35..04a9093bd 100644 --- a/tests/functional/arch/zx48k/add16a.asm +++ b/tests/functional/arch/zx48k/add16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add16b.asm b/tests/functional/arch/zx48k/add16b.asm index 3f16d74ed..1d3253d80 100644 --- a/tests/functional/arch/zx48k/add16b.asm +++ b/tests/functional/arch/zx48k/add16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add32.asm b/tests/functional/arch/zx48k/add32.asm index 1b0bb4b6d..679e8b84d 100644 --- a/tests/functional/arch/zx48k/add32.asm +++ b/tests/functional/arch/zx48k/add32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add32a.asm b/tests/functional/arch/zx48k/add32a.asm index 1ff3e21c6..7ff54a0b7 100644 --- a/tests/functional/arch/zx48k/add32a.asm +++ b/tests/functional/arch/zx48k/add32a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add32b.asm b/tests/functional/arch/zx48k/add32b.asm index bf1645f1e..377098f31 100644 --- a/tests/functional/arch/zx48k/add32b.asm +++ b/tests/functional/arch/zx48k/add32b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add8.asm b/tests/functional/arch/zx48k/add8.asm index 8790b8201..1387e464e 100644 --- a/tests/functional/arch/zx48k/add8.asm +++ b/tests/functional/arch/zx48k/add8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add8a.asm b/tests/functional/arch/zx48k/add8a.asm index e9307b0fc..131c0ed28 100644 --- a/tests/functional/arch/zx48k/add8a.asm +++ b/tests/functional/arch/zx48k/add8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/add8b.asm b/tests/functional/arch/zx48k/add8b.asm index 4fac32786..a8e590620 100644 --- a/tests/functional/arch/zx48k/add8b.asm +++ b/tests/functional/arch/zx48k/add8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/addf.asm b/tests/functional/arch/zx48k/addf.asm index 74852efb3..d9e7f0ade 100644 --- a/tests/functional/arch/zx48k/addf.asm +++ b/tests/functional/arch/zx48k/addf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/addf16.asm b/tests/functional/arch/zx48k/addf16.asm index 36bbf857b..dc2d67159 100644 --- a/tests/functional/arch/zx48k/addf16.asm +++ b/tests/functional/arch/zx48k/addf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/addf16a.asm b/tests/functional/arch/zx48k/addf16a.asm index 1ff3e21c6..7ff54a0b7 100644 --- a/tests/functional/arch/zx48k/addf16a.asm +++ b/tests/functional/arch/zx48k/addf16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/addf16b.asm b/tests/functional/arch/zx48k/addf16b.asm index 9a8467b18..dfd1a202e 100644 --- a/tests/functional/arch/zx48k/addf16b.asm +++ b/tests/functional/arch/zx48k/addf16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/addstr.asm b/tests/functional/arch/zx48k/addstr.asm index f54d48d30..13ed42393 100644 --- a/tests/functional/arch/zx48k/addstr.asm +++ b/tests/functional/arch/zx48k/addstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -79,14 +77,14 @@ _b: DEFW 0001h DEFB 31h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -146,7 +144,7 @@ _b: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -253,7 +251,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -352,7 +350,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -379,9 +377,9 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 52 "addstr.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 52 "arch/zx48k/addstr.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -441,7 +439,7 @@ __STORE_STR2: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -475,7 +473,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -506,9 +504,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -573,8 +571,8 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -589,7 +587,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -685,5 +683,5 @@ __STRCATEND: ret ENDP pop namespace -#line 53 "addstr.bas" +#line 53 "arch/zx48k/addstr.bas" END diff --git a/tests/functional/arch/zx48k/aloadstr0.asm b/tests/functional/arch/zx48k/aloadstr0.asm index a192f8894..394860f36 100644 --- a/tests/functional/arch/zx48k/aloadstr0.asm +++ b/tests/functional/arch/zx48k/aloadstr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/aloadstr1.asm b/tests/functional/arch/zx48k/aloadstr1.asm index c30274925..a34911751 100644 --- a/tests/functional/arch/zx48k/aloadstr1.asm +++ b/tests/functional/arch/zx48k/aloadstr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -266,7 +264,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -327,8 +325,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -357,7 +355,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -385,7 +383,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -404,7 +402,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -412,7 +410,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/and16.asm b/tests/functional/arch/zx48k/and16.asm index b14ea39ec..1f6cf3c90 100644 --- a/tests/functional/arch/zx48k/and16.asm +++ b/tests/functional/arch/zx48k/and16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/and32.asm b/tests/functional/arch/zx48k/and32.asm index 6be51625f..47751641e 100644 --- a/tests/functional/arch/zx48k/and32.asm +++ b/tests/functional/arch/zx48k/and32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/and8.asm b/tests/functional/arch/zx48k/and8.asm index cfa95d399..b2742152e 100644 --- a/tests/functional/arch/zx48k/and8.asm +++ b/tests/functional/arch/zx48k/and8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/andf.asm b/tests/functional/arch/zx48k/andf.asm index 3f7431c52..d797d06a1 100644 --- a/tests/functional/arch/zx48k/andf.asm +++ b/tests/functional/arch/zx48k/andf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arden2.asm b/tests/functional/arch/zx48k/arden2.asm index 03e2e306f..543771b9e 100644 --- a/tests/functional/arch/zx48k/arden2.asm +++ b/tests/functional/arch/zx48k/arden2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -59,10 +57,10 @@ _result: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/chr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/chr.asm" ; CHR$(x, y, x) returns the string CHR$(x) + CHR$(y) + CHR$(z) ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -122,7 +120,7 @@ _result: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -156,8 +154,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -264,7 +262,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -295,9 +293,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -362,7 +360,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/chr.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/chr.asm" push namespace core CHR: ; Returns HL = Pointer to STRING (NULL if no memory) ; Requires alloc.asm for dynamic memory heap. @@ -416,8 +414,8 @@ __CHR_END: ret ENDP pop namespace -#line 32 "arden2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 32 "arch/zx48k/arden2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -575,8 +573,8 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 33 "arden2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 33 "arch/zx48k/arden2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication @@ -609,9 +607,9 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 34 "arden2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 34 "arch/zx48k/arden2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -626,7 +624,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -722,5 +720,5 @@ __STRCATEND: ret ENDP pop namespace -#line 35 "arden2.bas" +#line 35 "arch/zx48k/arden2.bas" END diff --git a/tests/functional/arch/zx48k/arr_addr_global.asm b/tests/functional/arch/zx48k/arr_addr_global.asm index ade2067d9..1595eac57 100644 --- a/tests/functional/arch/zx48k/arr_addr_global.asm +++ b/tests/functional/arch/zx48k/arr_addr_global.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arr_addr_local.asm b/tests/functional/arch/zx48k/arr_addr_local.asm index 6d749c714..0993f37b5 100644 --- a/tests/functional/arch/zx48k/arr_addr_local.asm +++ b/tests/functional/arch/zx48k/arr_addr_local.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arr_addr_param.asm b/tests/functional/arch/zx48k/arr_addr_param.asm index 0140dbcd4..50c335251 100644 --- a/tests/functional/arch/zx48k/arr_addr_param.asm +++ b/tests/functional/arch/zx48k/arr_addr_param.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -83,7 +81,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -144,8 +142,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -174,7 +172,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -202,7 +200,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -221,7 +219,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -229,7 +227,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array00.asm b/tests/functional/arch/zx48k/array00.asm index 5efbb68b0..098f8250a 100644 --- a/tests/functional/arch/zx48k/array00.asm +++ b/tests/functional/arch/zx48k/array00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/array01.asm b/tests/functional/arch/zx48k/array01.asm index ed0e116ce..8c77bfff3 100644 --- a/tests/functional/arch/zx48k/array01.asm +++ b/tests/functional/arch/zx48k/array01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/array02.asm b/tests/functional/arch/zx48k/array02.asm index 9e7bddfef..6453fc32a 100644 --- a/tests/functional/arch/zx48k/array02.asm +++ b/tests/functional/arch/zx48k/array02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/array03.asm b/tests/functional/arch/zx48k/array03.asm index a1eda887c..2adfff20a 100644 --- a/tests/functional/arch/zx48k/array03.asm +++ b/tests/functional/arch/zx48k/array03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,7 +64,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -127,8 +125,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -157,7 +155,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -185,7 +183,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -204,7 +202,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -212,7 +210,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array04.asm b/tests/functional/arch/zx48k/array04.asm index da88ceefe..ca3d13ae3 100644 --- a/tests/functional/arch/zx48k/array04.asm +++ b/tests/functional/arch/zx48k/array04.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/array05.asm b/tests/functional/arch/zx48k/array05.asm index 346cace04..b914b06a4 100644 --- a/tests/functional/arch/zx48k/array05.asm +++ b/tests/functional/arch/zx48k/array05.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/array06.asm b/tests/functional/arch/zx48k/array06.asm index 4a293585a..f5329ba1b 100644 --- a/tests/functional/arch/zx48k/array06.asm +++ b/tests/functional/arch/zx48k/array06.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -77,7 +75,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -138,8 +136,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -168,7 +166,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -196,7 +194,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -215,7 +213,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -223,7 +221,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array07.asm b/tests/functional/arch/zx48k/array07.asm index f5e69b073..76dd14b96 100644 --- a/tests/functional/arch/zx48k/array07.asm +++ b/tests/functional/arch/zx48k/array07.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -102,7 +100,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -163,8 +161,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -193,7 +191,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -221,7 +219,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -240,7 +238,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -248,7 +246,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array08.asm b/tests/functional/arch/zx48k/array08.asm index bec8df8f6..028317f95 100644 --- a/tests/functional/arch/zx48k/array08.asm +++ b/tests/functional/arch/zx48k/array08.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -82,7 +80,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -143,8 +141,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -173,7 +171,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -201,7 +199,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -220,7 +218,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -228,7 +226,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array09.asm b/tests/functional/arch/zx48k/array09.asm index 0002d3277..22cb850a4 100644 --- a/tests/functional/arch/zx48k/array09.asm +++ b/tests/functional/arch/zx48k/array09.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -82,7 +80,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -143,8 +141,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -173,7 +171,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -201,7 +199,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -220,7 +218,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -228,7 +226,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array10.asm b/tests/functional/arch/zx48k/array10.asm index 4213d7404..9c7782eb2 100644 --- a/tests/functional/arch/zx48k/array10.asm +++ b/tests/functional/arch/zx48k/array10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -202,7 +200,7 @@ _y.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -263,8 +261,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -293,7 +291,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -321,7 +319,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -340,7 +338,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -348,7 +346,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array12.asm b/tests/functional/arch/zx48k/array12.asm index ecedf9e4e..db64ab1fa 100644 --- a/tests/functional/arch/zx48k/array12.asm +++ b/tests/functional/arch/zx48k/array12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -305,7 +303,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -366,8 +364,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -396,7 +394,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -424,7 +422,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -443,7 +441,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -451,7 +449,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array_check_param.asm b/tests/functional/arch/zx48k/array_check_param.asm index 1e272e658..4d848d1d8 100644 --- a/tests/functional/arch/zx48k/array_check_param.asm +++ b/tests/functional/arch/zx48k/array_check_param.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -70,7 +68,7 @@ _pickString__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -131,8 +129,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -161,7 +159,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -189,7 +187,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -208,7 +206,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -216,7 +214,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/array_check_warn.asm b/tests/functional/arch/zx48k/array_check_warn.asm index 3b89bb1fb..badd07e46 100644 --- a/tests/functional/arch/zx48k/array_check_warn.asm +++ b/tests/functional/arch/zx48k/array_check_warn.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arraycopy0.asm b/tests/functional/arch/zx48k/arraycopy0.asm index fab7c663d..f7ff2bdf6 100644 --- a/tests/functional/arch/zx48k/arraycopy0.asm +++ b/tests/functional/arch/zx48k/arraycopy0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arraycopy1.asm b/tests/functional/arch/zx48k/arraycopy1.asm index 42b94e82b..b316fec78 100644 --- a/tests/functional/arch/zx48k/arraycopy1.asm +++ b/tests/functional/arch/zx48k/arraycopy1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arraycopy2.asm b/tests/functional/arch/zx48k/arraycopy2.asm index 4f03dcca1..714399783 100644 --- a/tests/functional/arch/zx48k/arraycopy2.asm +++ b/tests/functional/arch/zx48k/arraycopy2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arraycopy3.asm b/tests/functional/arch/zx48k/arraycopy3.asm index 8f12cc7b2..a693777ad 100644 --- a/tests/functional/arch/zx48k/arraycopy3.asm +++ b/tests/functional/arch/zx48k/arraycopy3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arraycopy4.asm b/tests/functional/arch/zx48k/arraycopy4.asm index 89b95e7aa..c0365e6bd 100644 --- a/tests/functional/arch/zx48k/arraycopy4.asm +++ b/tests/functional/arch/zx48k/arraycopy4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arraycopy5.asm b/tests/functional/arch/zx48k/arraycopy5.asm index 36dc9dd88..b70b6c9cd 100644 --- a/tests/functional/arch/zx48k/arraycopy5.asm +++ b/tests/functional/arch/zx48k/arraycopy5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arrbase1.asm b/tests/functional/arch/zx48k/arrbase1.asm index deaa185b3..42bc6b96e 100644 --- a/tests/functional/arch/zx48k/arrbase1.asm +++ b/tests/functional/arch/zx48k/arrbase1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -93,7 +91,7 @@ _c.__LBOUND__: __DATA__END: DEFB 00h ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -154,8 +152,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -184,7 +182,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -212,7 +210,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -231,7 +229,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -239,7 +237,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/arrcheck.asm b/tests/functional/arch/zx48k/arrcheck.asm index 0725717d0..65b49e444 100644 --- a/tests/functional/arch/zx48k/arrcheck.asm +++ b/tests/functional/arch/zx48k/arrcheck.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -138,7 +136,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -199,7 +197,7 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: @@ -234,8 +232,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 23 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 23 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -269,7 +267,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __UBOUND__ PTR ld (UBOUND_PTR), bc -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -313,7 +311,7 @@ LOOP: sbc hl, bc ; HL <- HL - BC - 1 = Ai - UBound(i) - 1 => No Carry if Ai > UBound(i) jp nc, __ERROR pop hl ; Recovers (Ai) - Lbound(Ai) -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -332,7 +330,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -340,7 +338,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/arrconst.asm b/tests/functional/arch/zx48k/arrconst.asm index 264b92f1f..676023759 100644 --- a/tests/functional/arch/zx48k/arrconst.asm +++ b/tests/functional/arch/zx48k/arrconst.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels.asm b/tests/functional/arch/zx48k/arrlabels.asm index d0de6c70c..b07286a96 100644 --- a/tests/functional/arch/zx48k/arrlabels.asm +++ b/tests/functional/arch/zx48k/arrlabels.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels1.asm b/tests/functional/arch/zx48k/arrlabels1.asm index a64dc1fa2..c4ffc044c 100644 --- a/tests/functional/arch/zx48k/arrlabels1.asm +++ b/tests/functional/arch/zx48k/arrlabels1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels10a.asm b/tests/functional/arch/zx48k/arrlabels10a.asm index 4fbd47da6..dc1990e0c 100644 --- a/tests/functional/arch/zx48k/arrlabels10a.asm +++ b/tests/functional/arch/zx48k/arrlabels10a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels10b.asm b/tests/functional/arch/zx48k/arrlabels10b.asm index 88e4644c4..475a63093 100644 --- a/tests/functional/arch/zx48k/arrlabels10b.asm +++ b/tests/functional/arch/zx48k/arrlabels10b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels2.asm b/tests/functional/arch/zx48k/arrlabels2.asm index bf19d2863..298dcbb8d 100644 --- a/tests/functional/arch/zx48k/arrlabels2.asm +++ b/tests/functional/arch/zx48k/arrlabels2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels3.asm b/tests/functional/arch/zx48k/arrlabels3.asm index 935ff2e04..6fef6c8f8 100644 --- a/tests/functional/arch/zx48k/arrlabels3.asm +++ b/tests/functional/arch/zx48k/arrlabels3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels4.asm b/tests/functional/arch/zx48k/arrlabels4.asm index 6193ba4dc..baaa9352b 100644 --- a/tests/functional/arch/zx48k/arrlabels4.asm +++ b/tests/functional/arch/zx48k/arrlabels4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arrlabels5.asm b/tests/functional/arch/zx48k/arrlabels5.asm index a381d8c3e..30c599d28 100644 --- a/tests/functional/arch/zx48k/arrlabels5.asm +++ b/tests/functional/arch/zx48k/arrlabels5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arrlabels6.asm b/tests/functional/arch/zx48k/arrlabels6.asm index 49d898b0e..e1638ed25 100644 --- a/tests/functional/arch/zx48k/arrlabels6.asm +++ b/tests/functional/arch/zx48k/arrlabels6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/arrlabels7.asm b/tests/functional/arch/zx48k/arrlabels7.asm index 46f949ef3..f90ea56b2 100644 --- a/tests/functional/arch/zx48k/arrlabels7.asm +++ b/tests/functional/arch/zx48k/arrlabels7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arrlabels8.asm b/tests/functional/arch/zx48k/arrlabels8.asm index 1b701c0fe..415c7bb55 100644 --- a/tests/functional/arch/zx48k/arrlabels8.asm +++ b/tests/functional/arch/zx48k/arrlabels8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/arrlabels9.asm b/tests/functional/arch/zx48k/arrlabels9.asm index 3c2a60a61..1c6455acf 100644 --- a/tests/functional/arch/zx48k/arrlabels9.asm +++ b/tests/functional/arch/zx48k/arrlabels9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/asm_error_line.asm b/tests/functional/arch/zx48k/asm_error_line.asm index ee03430ad..300ec7040 100644 --- a/tests/functional/arch/zx48k/asm_error_line.asm +++ b/tests/functional/arch/zx48k/asm_error_line.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,12 +18,12 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "asm_error_line.bas" +#line 2 "arch/zx48k/asm_error_line.bas" test: dk 10, 20 -#line 5 "asm_error_line.bas" -#line 7 "asm_error_line.bas" +#line 5 "arch/zx48k/asm_error_line.bas" +#line 6 "arch/zx48k/asm_error_line.bas" dk 10, 20 -#line 9 "asm_error_line.bas" +#line 9 "arch/zx48k/asm_error_line.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/asm_tokens.asm b/tests/functional/arch/zx48k/asm_tokens.asm index 6cb5d8262..4812082b8 100644 --- a/tests/functional/arch/zx48k/asm_tokens.asm +++ b/tests/functional/arch/zx48k/asm_tokens.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,9 +18,9 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "asm_tokens.bas" +#line 1 "arch/zx48k/asm_tokens.bas" ld a, {{macro_value}} -#line 4 "asm_tokens.bas" +#line 4 "arch/zx48k/asm_tokens.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/astore16.asm b/tests/functional/arch/zx48k/astore16.asm index d9d676b4b..f2351a9b0 100644 --- a/tests/functional/arch/zx48k/astore16.asm +++ b/tests/functional/arch/zx48k/astore16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -115,7 +113,7 @@ _obj.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -176,8 +174,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -206,7 +204,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -234,7 +232,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -253,7 +251,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -261,7 +259,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/astore32.asm b/tests/functional/arch/zx48k/astore32.asm index 32c031589..59ef2d565 100644 --- a/tests/functional/arch/zx48k/astore32.asm +++ b/tests/functional/arch/zx48k/astore32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -133,7 +131,7 @@ _main__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -194,8 +192,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -224,7 +222,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -252,7 +250,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -271,7 +269,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -279,7 +277,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/ataddr.asm b/tests/functional/arch/zx48k/ataddr.asm index 70ca8f415..f58ed919e 100644 --- a/tests/functional/arch/zx48k/ataddr.asm +++ b/tests/functional/arch/zx48k/ataddr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/atfunc0.asm b/tests/functional/arch/zx48k/atfunc0.asm index d576e7542..d3c3c3191 100644 --- a/tests/functional/arch/zx48k/atfunc0.asm +++ b/tests/functional/arch/zx48k/atfunc0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/atfunc1.asm b/tests/functional/arch/zx48k/atfunc1.asm index d576e7542..d3c3c3191 100644 --- a/tests/functional/arch/zx48k/atfunc1.asm +++ b/tests/functional/arch/zx48k/atfunc1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/atlabel.asm b/tests/functional/arch/zx48k/atlabel.asm index 593ead914..eeeceb828 100644 --- a/tests/functional/arch/zx48k/atlabel.asm +++ b/tests/functional/arch/zx48k/atlabel.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/atlabel1.asm b/tests/functional/arch/zx48k/atlabel1.asm index fa1336b34..c344fffef 100644 --- a/tests/functional/arch/zx48k/atlabel1.asm +++ b/tests/functional/arch/zx48k/atlabel1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -42,7 +40,7 @@ ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -70,5 +68,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 23 "zx48k/atlabel1.bas" +#line 23 "arch/zx48k/atlabel1.bas" END diff --git a/tests/functional/arch/zx48k/atlabel2.asm b/tests/functional/arch/zx48k/atlabel2.asm index adce5b018..c14c18717 100644 --- a/tests/functional/arch/zx48k/atlabel2.asm +++ b/tests/functional/arch/zx48k/atlabel2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/atlabel3.asm b/tests/functional/arch/zx48k/atlabel3.asm index 63d9b18c3..44917e223 100644 --- a/tests/functional/arch/zx48k/atlabel3.asm +++ b/tests/functional/arch/zx48k/atlabel3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ato3.asm b/tests/functional/arch/zx48k/ato3.asm index 22ad7b859..4ab7d114e 100644 --- a/tests/functional/arch/zx48k/ato3.asm +++ b/tests/functional/arch/zx48k/ato3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/attr.asm b/tests/functional/arch/zx48k/attr.asm index 886616c54..f67a574cb 100644 --- a/tests/functional/arch/zx48k/attr.asm +++ b/tests/functional/arch/zx48k/attr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/attr_in_subs.asm b/tests/functional/arch/zx48k/attr_in_subs.asm index ea4ebbf5f..e622f6597 100644 --- a/tests/functional/arch/zx48k/attr_in_subs.asm +++ b/tests/functional/arch/zx48k/attr_in_subs.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bad_fname_err3.asm b/tests/functional/arch/zx48k/bad_fname_err3.asm index bfda71b38..5e7f65727 100644 --- a/tests/functional/arch/zx48k/bad_fname_err3.asm +++ b/tests/functional/arch/zx48k/bad_fname_err3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bad_pragma.asm b/tests/functional/arch/zx48k/bad_pragma.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/bad_pragma.asm +++ b/tests/functional/arch/zx48k/bad_pragma.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/band16.asm b/tests/functional/arch/zx48k/band16.asm index 8324ff065..59b304cd3 100644 --- a/tests/functional/arch/zx48k/band16.asm +++ b/tests/functional/arch/zx48k/band16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/band16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/band16.asm" ; vim:ts=4:et: ; FASTCALL bitwise and16 version. ; result in hl @@ -86,5 +84,5 @@ __BAND16: ld l, a ret pop namespace -#line 46 "band16.bas" +#line 46 "arch/zx48k/band16.bas" END diff --git a/tests/functional/arch/zx48k/band32.asm b/tests/functional/arch/zx48k/band32.asm index 59eac19f9..70ff12daf 100644 --- a/tests/functional/arch/zx48k/band32.asm +++ b/tests/functional/arch/zx48k/band32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -102,7 +100,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/band32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/band32.asm" ; FASTCALL bitwise and 32 version. ; Performs 32bit and 32bit and returns the bitwise ; result in DE,HL @@ -131,5 +129,5 @@ __BAND32: ld l, c ; HL <- BC ; Always return DE,HL pair regs ret pop namespace -#line 80 "band32.bas" +#line 80 "arch/zx48k/band32.bas" END diff --git a/tests/functional/arch/zx48k/band8.asm b/tests/functional/arch/zx48k/band8.asm index b8f547e68..183f73867 100644 --- a/tests/functional/arch/zx48k/band8.asm +++ b/tests/functional/arch/zx48k/band8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bin00.asm b/tests/functional/arch/zx48k/bin00.asm index e70c07463..c2526e0dc 100644 --- a/tests/functional/arch/zx48k/bin00.asm +++ b/tests/functional/arch/zx48k/bin00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bin01.asm b/tests/functional/arch/zx48k/bin01.asm index 3a30d2248..8087dfe60 100644 --- a/tests/functional/arch/zx48k/bin01.asm +++ b/tests/functional/arch/zx48k/bin01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bin03.asm b/tests/functional/arch/zx48k/bin03.asm index 14f96e80a..10ee2060f 100644 --- a/tests/functional/arch/zx48k/bin03.asm +++ b/tests/functional/arch/zx48k/bin03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bitwise.asm b/tests/functional/arch/zx48k/bitwise.asm index 5332f4cdd..28cba114e 100644 --- a/tests/functional/arch/zx48k/bitwise.asm +++ b/tests/functional/arch/zx48k/bitwise.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bnot16.asm b/tests/functional/arch/zx48k/bnot16.asm index 4f1543ae7..ecc79d58a 100644 --- a/tests/functional/arch/zx48k/bnot16.asm +++ b/tests/functional/arch/zx48k/bnot16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,7 +48,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/bnot16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/bnot16.asm" ; vim:ts=4:et: ; FASTCALL bitwise or 16 version. ; result in HL @@ -68,5 +66,5 @@ __BNOT16: ld l, a ret pop namespace -#line 28 "bnot16.bas" +#line 28 "arch/zx48k/bnot16.bas" END diff --git a/tests/functional/arch/zx48k/bnot32.asm b/tests/functional/arch/zx48k/bnot32.asm index 508da0c7c..24d02583c 100644 --- a/tests/functional/arch/zx48k/bnot32.asm +++ b/tests/functional/arch/zx48k/bnot32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -42,7 +40,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/bnot32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/bnot32.asm" ; vim:ts=4:et: ; FASTCALL bitwise or 32 version. ; result in DE,HL @@ -66,5 +64,5 @@ __BNOT32: ld d, a ret pop namespace -#line 22 "bnot32.bas" +#line 22 "arch/zx48k/bnot32.bas" END diff --git a/tests/functional/arch/zx48k/bnot8.asm b/tests/functional/arch/zx48k/bnot8.asm index 11ffa2d6a..3b99a1db6 100644 --- a/tests/functional/arch/zx48k/bnot8.asm +++ b/tests/functional/arch/zx48k/bnot8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bool_crash.asm b/tests/functional/arch/zx48k/bool_crash.asm index 1b01a4b5f..342deb639 100644 --- a/tests/functional/arch/zx48k/bool_crash.asm +++ b/tests/functional/arch/zx48k/bool_crash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bor16.asm b/tests/functional/arch/zx48k/bor16.asm index 36532f3ca..30600b13a 100644 --- a/tests/functional/arch/zx48k/bor16.asm +++ b/tests/functional/arch/zx48k/bor16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/bor16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/bor16.asm" ; vim:ts=4:et: ; FASTCALL bitwise or 16 version. ; result in HL @@ -86,5 +84,5 @@ __BOR16: ld l, a ret pop namespace -#line 46 "bor16.bas" +#line 46 "arch/zx48k/bor16.bas" END diff --git a/tests/functional/arch/zx48k/bor32.asm b/tests/functional/arch/zx48k/bor32.asm index ea35f50e6..821c0d239 100644 --- a/tests/functional/arch/zx48k/bor32.asm +++ b/tests/functional/arch/zx48k/bor32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -102,7 +100,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/bor32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/bor32.asm" ; FASTCALL bitwise or 32 version. ; Performs 32bit or 32bit and returns the bitwise ; result DE,HL @@ -131,5 +129,5 @@ __BOR32: ld l, c ; HL <- BC ; Always return DE,HL pair regs ret pop namespace -#line 80 "bor32.bas" +#line 80 "arch/zx48k/bor32.bas" END diff --git a/tests/functional/arch/zx48k/bor8.asm b/tests/functional/arch/zx48k/bor8.asm index 889216ab3..221d3b590 100644 --- a/tests/functional/arch/zx48k/bor8.asm +++ b/tests/functional/arch/zx48k/bor8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bound00.asm b/tests/functional/arch/zx48k/bound00.asm index 6e4b84a2a..2e56df2a9 100644 --- a/tests/functional/arch/zx48k/bound00.asm +++ b/tests/functional/arch/zx48k/bound00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bound01.asm b/tests/functional/arch/zx48k/bound01.asm index edf30766c..980501bef 100644 --- a/tests/functional/arch/zx48k/bound01.asm +++ b/tests/functional/arch/zx48k/bound01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bound02.asm b/tests/functional/arch/zx48k/bound02.asm index efc018770..9ea2a3a0c 100644 --- a/tests/functional/arch/zx48k/bound02.asm +++ b/tests/functional/arch/zx48k/bound02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -130,7 +128,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/bound03.asm b/tests/functional/arch/zx48k/bound03.asm index 5e6ce5217..08fbc5d24 100644 --- a/tests/functional/arch/zx48k/bound03.asm +++ b/tests/functional/arch/zx48k/bound03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -133,7 +131,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/bound04.asm b/tests/functional/arch/zx48k/bound04.asm index 104e8a71d..7b319b66b 100644 --- a/tests/functional/arch/zx48k/bound04.asm +++ b/tests/functional/arch/zx48k/bound04.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/break.asm b/tests/functional/arch/zx48k/break.asm index ec5ee325a..653a4f930 100644 --- a/tests/functional/arch/zx48k/break.asm +++ b/tests/functional/arch/zx48k/break.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/break.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/break.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -92,7 +90,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/break.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/break.asm" ; Check if BREAK is pressed ; Return if not. Else Raises ; L BREAK Into Program Error @@ -116,5 +114,5 @@ NO_BREAK: TS_BRK EQU 8020 ENDP pop namespace -#line 37 "zx48k/break.bas" +#line 37 "arch/zx48k/break.bas" END diff --git a/tests/functional/arch/zx48k/break_label0.asm b/tests/functional/arch/zx48k/break_label0.asm index 1499afe97..fbe6c9fad 100644 --- a/tests/functional/arch/zx48k/break_label0.asm +++ b/tests/functional/arch/zx48k/break_label0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -48,8 +46,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/break.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/break.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -83,7 +81,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/break.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/break.asm" ; Check if BREAK is pressed ; Return if not. Else Raises ; L BREAK Into Program Error @@ -107,5 +105,5 @@ NO_BREAK: TS_BRK EQU 8020 ENDP pop namespace -#line 28 "zx48k/break_label0.bas" +#line 28 "arch/zx48k/break_label0.bas" END diff --git a/tests/functional/arch/zx48k/britlion0.asm b/tests/functional/arch/zx48k/britlion0.asm index 5053c86ea..5737ac025 100644 --- a/tests/functional/arch/zx48k/britlion0.asm +++ b/tests/functional/arch/zx48k/britlion0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bxor16.asm b/tests/functional/arch/zx48k/bxor16.asm index ac30abddd..b92400d85 100644 --- a/tests/functional/arch/zx48k/bxor16.asm +++ b/tests/functional/arch/zx48k/bxor16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/bxor16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/bxor16.asm" ; vim:ts=4:et: ; FASTCALL bitwise xor 16 version. ; result in Accumulator (0 False, not 0 True) @@ -86,8 +84,8 @@ __BXOR16: ld l, a ret pop namespace -#line 46 "bxor16.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 46 "arch/zx48k/bxor16.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -103,5 +101,5 @@ __NEGHL: inc hl ret pop namespace -#line 47 "bxor16.bas" +#line 47 "arch/zx48k/bxor16.bas" END diff --git a/tests/functional/arch/zx48k/bxor32.asm b/tests/functional/arch/zx48k/bxor32.asm index 07b206800..b91489205 100644 --- a/tests/functional/arch/zx48k/bxor32.asm +++ b/tests/functional/arch/zx48k/bxor32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/bxor8.asm b/tests/functional/arch/zx48k/bxor8.asm index 8541127b4..c0cd18566 100644 --- a/tests/functional/arch/zx48k/bxor8.asm +++ b/tests/functional/arch/zx48k/bxor8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/byref16.asm b/tests/functional/arch/zx48k/byref16.asm index 0e0691b35..0eefdeeee 100644 --- a/tests/functional/arch/zx48k/byref16.asm +++ b/tests/functional/arch/zx48k/byref16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/istore16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/istore16.asm" push namespace core __PISTORE16: ; stores an integer in hl into address IX + BC; Destroys DE ex de, hl @@ -85,5 +83,5 @@ __ISTORE16: ; Load address at hl, and stores E,D integer at that address ld (hl), d ret pop namespace -#line 48 "byref16.bas" +#line 48 "arch/zx48k/byref16.bas" END diff --git a/tests/functional/arch/zx48k/byref32.asm b/tests/functional/arch/zx48k/byref32.asm index 33976c28a..ec1dffa4e 100644 --- a/tests/functional/arch/zx48k/byref32.asm +++ b/tests/functional/arch/zx48k/byref32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -71,7 +69,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iload32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iload32.asm" ; __FASTCALL__ routine which ; loads a 32 bits integer into DE,HL ; stored at position pointed by POINTER HL @@ -89,9 +87,9 @@ __ILOAD32: ex de, hl ret pop namespace -#line 51 "byref32.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pistore32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/store32.asm" +#line 51 "arch/zx48k/byref32.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pistore32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/store32.asm" push namespace core __PISTORE32: push hl @@ -114,7 +112,7 @@ __STORE32: ; Stores the given integer in DEBC at address HL ld (hl), d ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/pistore32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/pistore32.asm" ; The content of this file has been moved to "store32.asm" -#line 52 "byref32.bas" +#line 52 "arch/zx48k/byref32.bas" END diff --git a/tests/functional/arch/zx48k/byrefbyref.asm b/tests/functional/arch/zx48k/byrefbyref.asm index 5dfa96a3e..19847f5e7 100644 --- a/tests/functional/arch/zx48k/byrefbyref.asm +++ b/tests/functional/arch/zx48k/byrefbyref.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/byreff.asm b/tests/functional/arch/zx48k/byreff.asm index 480ca4894..0ca7b435b 100644 --- a/tests/functional/arch/zx48k/byreff.asm +++ b/tests/functional/arch/zx48k/byreff.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -80,7 +78,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -107,8 +105,8 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 60 "byreff.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 60 "arch/zx48k/byreff.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame @@ -120,8 +118,8 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 61 "byreff.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 61 "arch/zx48k/byreff.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -149,5 +147,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 62 "byreff.bas" +#line 62 "arch/zx48k/byreff.bas" END diff --git a/tests/functional/arch/zx48k/byreff16.asm b/tests/functional/arch/zx48k/byreff16.asm index 0505fc9bc..ec74883a9 100644 --- a/tests/functional/arch/zx48k/byreff16.asm +++ b/tests/functional/arch/zx48k/byreff16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -71,7 +69,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iload32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iload32.asm" ; __FASTCALL__ routine which ; loads a 32 bits integer into DE,HL ; stored at position pointed by POINTER HL @@ -89,9 +87,9 @@ __ILOAD32: ex de, hl ret pop namespace -#line 51 "byreff16.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pistore32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/store32.asm" +#line 51 "arch/zx48k/byreff16.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pistore32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/store32.asm" push namespace core __PISTORE32: push hl @@ -114,7 +112,7 @@ __STORE32: ; Stores the given integer in DEBC at address HL ld (hl), d ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/pistore32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/pistore32.asm" ; The content of this file has been moved to "store32.asm" -#line 52 "byreff16.bas" +#line 52 "arch/zx48k/byreff16.bas" END diff --git a/tests/functional/arch/zx48k/byrefstr.asm b/tests/functional/arch/zx48k/byrefstr.asm index 3b066087e..862dc38a3 100644 --- a/tests/functional/arch/zx48k/byrefstr.asm +++ b/tests/functional/arch/zx48k/byrefstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/byte_neq.asm b/tests/functional/arch/zx48k/byte_neq.asm index 9a1184fd4..fc70d506a 100644 --- a/tests/functional/arch/zx48k/byte_neq.asm +++ b/tests/functional/arch/zx48k/byte_neq.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/byval32.asm b/tests/functional/arch/zx48k/byval32.asm index d69405f31..c2dc68d7b 100644 --- a/tests/functional/arch/zx48k/byval32.asm +++ b/tests/functional/arch/zx48k/byval32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -73,8 +71,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pstore32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/store32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pstore32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/store32.asm" push namespace core __PISTORE32: push hl @@ -97,7 +95,7 @@ __STORE32: ; Stores the given integer in DEBC at address HL ld (hl), d ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/pstore32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/pstore32.asm" ; Stores a 32 bit integer number (DE,HL) at (IX + BC) push namespace core __PSTORE32: @@ -108,5 +106,5 @@ __PSTORE32: pop bc jp __STORE32 pop namespace -#line 53 "byval32.bas" +#line 53 "arch/zx48k/byval32.bas" END diff --git a/tests/functional/arch/zx48k/byvalbyref.asm b/tests/functional/arch/zx48k/byvalbyref.asm index 69ce0cc63..ea0a3bfd9 100644 --- a/tests/functional/arch/zx48k/byvalbyref.asm +++ b/tests/functional/arch/zx48k/byvalbyref.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/castF16toF.asm b/tests/functional/arch/zx48k/castF16toF.asm index e35cda39b..7d8d10537 100644 --- a/tests/functional/arch/zx48k/castF16toF.asm +++ b/tests/functional/arch/zx48k/castF16toF.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -47,8 +45,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/f16tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/f16tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -73,8 +71,8 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/f16tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/f16tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -144,7 +142,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/f16tofreg.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/f16tofreg.asm" push namespace core __F16TOFREG: ; Converts a 16.16 signed fixed point (stored in DEHL) ; to a Floating Point Number returned in (C ED CB) @@ -179,8 +177,8 @@ __F16TOFREG2: ; Converts an unsigned 32 bit integer (DEHL) jp __U32TOFREG_LOOP ; Proceed as an integer ENDP pop namespace -#line 22 "castF16toF.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 22 "arch/zx48k/castF16toF.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -208,5 +206,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 23 "castF16toF.bas" +#line 23 "arch/zx48k/castF16toF.bas" END diff --git a/tests/functional/arch/zx48k/cast_f16_to_param.asm b/tests/functional/arch/zx48k/cast_f16_to_param.asm index 174f47600..46261cdee 100644 --- a/tests/functional/arch/zx48k/cast_f16_to_param.asm +++ b/tests/functional/arch/zx48k/cast_f16_to_param.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/cast_ftoi16.asm b/tests/functional/arch/zx48k/cast_ftoi16.asm index fe3a441d7..90c33e95e 100644 --- a/tests/functional/arch/zx48k/cast_ftoi16.asm +++ b/tests/functional/arch/zx48k/cast_ftoi16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,8 +42,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -70,7 +68,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -142,5 +140,5 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 22 "cast_ftoi16.bas" +#line 22 "arch/zx48k/cast_ftoi16.bas" END diff --git a/tests/functional/arch/zx48k/cast_ftoi32.asm b/tests/functional/arch/zx48k/cast_ftoi32.asm index 05b7a5b6e..ba8fa54b9 100644 --- a/tests/functional/arch/zx48k/cast_ftoi32.asm +++ b/tests/functional/arch/zx48k/cast_ftoi32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -71,7 +69,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -143,5 +141,5 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 23 "cast_ftoi32.bas" +#line 23 "arch/zx48k/cast_ftoi32.bas" END diff --git a/tests/functional/arch/zx48k/cast_ftoi8.asm b/tests/functional/arch/zx48k/cast_ftoi8.asm index b840a283d..a49e48a66 100644 --- a/tests/functional/arch/zx48k/cast_ftoi8.asm +++ b/tests/functional/arch/zx48k/cast_ftoi8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -71,7 +69,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -143,5 +141,5 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 23 "cast_ftoi8.bas" +#line 23 "arch/zx48k/cast_ftoi8.bas" END diff --git a/tests/functional/arch/zx48k/cast_i32tof.asm b/tests/functional/arch/zx48k/cast_i32tof.asm index 6345d9925..dce10096d 100644 --- a/tests/functional/arch/zx48k/cast_i32tof.asm +++ b/tests/functional/arch/zx48k/cast_i32tof.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/cast_i8tof.asm b/tests/functional/arch/zx48k/cast_i8tof.asm index 0acc4ccb7..bb7167a6c 100644 --- a/tests/functional/arch/zx48k/cast_i8tof.asm +++ b/tests/functional/arch/zx48k/cast_i8tof.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -75,7 +73,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -147,8 +145,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 27 "cast_i8tof.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 27 "arch/zx48k/cast_i8tof.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -176,8 +174,8 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 28 "cast_i8tof.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 28 "arch/zx48k/cast_i8tof.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -247,5 +245,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 29 "cast_i8tof.bas" +#line 29 "arch/zx48k/cast_i8tof.bas" END diff --git a/tests/functional/arch/zx48k/cast_u32tof.asm b/tests/functional/arch/zx48k/cast_u32tof.asm index 3be1bf758..67cdbe874 100644 --- a/tests/functional/arch/zx48k/cast_u32tof.asm +++ b/tests/functional/arch/zx48k/cast_u32tof.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/chr.asm b/tests/functional/arch/zx48k/chr.asm index 67cb7ebfc..3265947c2 100644 --- a/tests/functional/arch/zx48k/chr.asm +++ b/tests/functional/arch/zx48k/chr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/chr0.asm b/tests/functional/arch/zx48k/chr0.asm index 675b50700..a07228338 100644 --- a/tests/functional/arch/zx48k/chr0.asm +++ b/tests/functional/arch/zx48k/chr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -59,10 +57,10 @@ _c: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/chr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/chr.asm" ; CHR$(x, y, x) returns the string CHR$(x) + CHR$(y) + CHR$(z) ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -122,7 +120,7 @@ _c: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -156,8 +154,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -264,7 +262,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -295,9 +293,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -362,7 +360,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/chr.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/chr.asm" push namespace core CHR: ; Returns HL = Pointer to STRING (NULL if no memory) ; Requires alloc.asm for dynamic memory heap. @@ -416,15 +414,15 @@ __CHR_END: ret ENDP pop namespace -#line 30 "chr0.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 30 "arch/zx48k/chr0.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -582,7 +580,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -609,5 +607,5 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 31 "chr0.bas" +#line 31 "arch/zx48k/chr0.bas" END diff --git a/tests/functional/arch/zx48k/chr1.asm b/tests/functional/arch/zx48k/chr1.asm index ea7d3fea3..20c92b797 100644 --- a/tests/functional/arch/zx48k/chr1.asm +++ b/tests/functional/arch/zx48k/chr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/circle.asm b/tests/functional/arch/zx48k/circle.asm index 1198ea6a7..677cdf81b 100644 --- a/tests/functional/arch/zx48k/circle.asm +++ b/tests/functional/arch/zx48k/circle.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/co.asm b/tests/functional/arch/zx48k/co.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/co.asm +++ b/tests/functional/arch/zx48k/co.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/code00.asm b/tests/functional/arch/zx48k/code00.asm index 7c837432c..3c9ebd6b9 100644 --- a/tests/functional/arch/zx48k/code00.asm +++ b/tests/functional/arch/zx48k/code00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/code01.asm b/tests/functional/arch/zx48k/code01.asm index 3f4207e25..d7bbb8d04 100644 --- a/tests/functional/arch/zx48k/code01.asm +++ b/tests/functional/arch/zx48k/code01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/code02.asm b/tests/functional/arch/zx48k/code02.asm index f60704267..484642868 100644 --- a/tests/functional/arch/zx48k/code02.asm +++ b/tests/functional/arch/zx48k/code02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/codecrash1.asm b/tests/functional/arch/zx48k/codecrash1.asm index 51e575a92..48480a9a4 100644 --- a/tests/functional/arch/zx48k/codecrash1.asm +++ b/tests/functional/arch/zx48k/codecrash1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -48,9 +46,9 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" ; Returns the ascii code for the given str -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -110,7 +108,7 @@ _b: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -217,7 +215,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -316,7 +314,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" push namespace core __ASC: PROC @@ -343,5 +341,5 @@ __ASC_END: ret ENDP pop namespace -#line 21 "codecrash1.bas" +#line 21 "arch/zx48k/codecrash1.bas" END diff --git a/tests/functional/arch/zx48k/codecrash2.asm b/tests/functional/arch/zx48k/codecrash2.asm index 6f92aae45..69ca08cfe 100644 --- a/tests/functional/arch/zx48k/codecrash2.asm +++ b/tests/functional/arch/zx48k/codecrash2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -50,9 +48,9 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" ; Returns the ascii code for the given str -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -112,7 +110,7 @@ _b: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -219,7 +217,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -318,7 +316,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" push namespace core __ASC: PROC @@ -345,9 +343,9 @@ __ASC_END: ret ENDP pop namespace -#line 23 "codecrash2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 23 "arch/zx48k/codecrash2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -407,7 +405,7 @@ __ASC_END: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -441,7 +439,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -472,9 +470,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -539,8 +537,8 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -555,7 +553,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -651,5 +649,5 @@ __STRCATEND: ret ENDP pop namespace -#line 24 "codecrash2.bas" +#line 24 "arch/zx48k/codecrash2.bas" END diff --git a/tests/functional/arch/zx48k/codecrash3.asm b/tests/functional/arch/zx48k/codecrash3.asm index c94862bb5..89e14d2d8 100644 --- a/tests/functional/arch/zx48k/codecrash3.asm +++ b/tests/functional/arch/zx48k/codecrash3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -46,9 +44,9 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" ; Returns the ascii code for the given str -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -108,7 +106,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -215,7 +213,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -314,7 +312,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" push namespace core __ASC: PROC @@ -341,13 +339,13 @@ __ASC_END: ret ENDP pop namespace -#line 21 "codecrash3.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 21 "arch/zx48k/codecrash3.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" ; INKEY Function ; Returns a string allocated in dynamic memory ; containing the string. ; An empty string otherwise. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -407,7 +405,7 @@ __ASC_END: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -441,7 +439,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -472,9 +470,9 @@ __MEM_START: __MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE ld a, h ; HL = NULL (No memory available?) or l -#line 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -539,7 +537,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" push namespace core INKEY: PROC @@ -584,5 +582,5 @@ __EMPTY_INKEY: KEY_CODE EQU 0333h ENDP pop namespace -#line 22 "codecrash3.bas" +#line 22 "arch/zx48k/codecrash3.bas" END diff --git a/tests/functional/arch/zx48k/codecrash4.asm b/tests/functional/arch/zx48k/codecrash4.asm index a4155e26a..e2861e9f3 100644 --- a/tests/functional/arch/zx48k/codecrash4.asm +++ b/tests/functional/arch/zx48k/codecrash4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -58,9 +56,9 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" ; Returns the ascii code for the given str -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -120,7 +118,7 @@ _b: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -227,7 +225,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -326,7 +324,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" push namespace core __ASC: PROC @@ -353,13 +351,13 @@ __ASC_END: ret ENDP pop namespace -#line 31 "codecrash4.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 31 "arch/zx48k/codecrash4.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" ; INKEY Function ; Returns a string allocated in dynamic memory ; containing the string. ; An empty string otherwise. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -419,7 +417,7 @@ __ASC_END: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -453,7 +451,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -484,9 +482,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -551,7 +549,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" push namespace core INKEY: PROC @@ -596,9 +594,9 @@ __EMPTY_INKEY: KEY_CODE EQU 0333h ENDP pop namespace -#line 32 "codecrash4.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 32 "arch/zx48k/codecrash4.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -613,7 +611,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -709,5 +707,5 @@ __STRCATEND: ret ENDP pop namespace -#line 33 "codecrash4.bas" +#line 33 "arch/zx48k/codecrash4.bas" END diff --git a/tests/functional/arch/zx48k/codecrash5.asm b/tests/functional/arch/zx48k/codecrash5.asm index bcf8e742e..75c60ded4 100644 --- a/tests/functional/arch/zx48k/codecrash5.asm +++ b/tests/functional/arch/zx48k/codecrash5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/coercion1.asm b/tests/functional/arch/zx48k/coercion1.asm index 03fa38611..84f558b43 100644 --- a/tests/functional/arch/zx48k/coercion1.asm +++ b/tests/functional/arch/zx48k/coercion1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -197,9 +195,7 @@ __DIVF: ; Division ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h defb 01h ; EXCHANGE diff --git a/tests/functional/arch/zx48k/coercion3.asm b/tests/functional/arch/zx48k/coercion3.asm index 32fd44b3b..11196d505 100644 --- a/tests/functional/arch/zx48k/coercion3.asm +++ b/tests/functional/arch/zx48k/coercion3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const0.asm b/tests/functional/arch/zx48k/const0.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/const0.asm +++ b/tests/functional/arch/zx48k/const0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const1.asm b/tests/functional/arch/zx48k/const1.asm index 3a30d2248..8087dfe60 100644 --- a/tests/functional/arch/zx48k/const1.asm +++ b/tests/functional/arch/zx48k/const1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const3.asm b/tests/functional/arch/zx48k/const3.asm index fb0b17d57..bd14770f5 100644 --- a/tests/functional/arch/zx48k/const3.asm +++ b/tests/functional/arch/zx48k/const3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const6.asm b/tests/functional/arch/zx48k/const6.asm index 471b9f198..17a406d39 100644 --- a/tests/functional/arch/zx48k/const6.asm +++ b/tests/functional/arch/zx48k/const6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const7.asm b/tests/functional/arch/zx48k/const7.asm index 0e7ab5a58..2f89fb71b 100644 --- a/tests/functional/arch/zx48k/const7.asm +++ b/tests/functional/arch/zx48k/const7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const8.asm b/tests/functional/arch/zx48k/const8.asm index ab7aee11d..dc8f09b4f 100644 --- a/tests/functional/arch/zx48k/const8.asm +++ b/tests/functional/arch/zx48k/const8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const_expr.asm b/tests/functional/arch/zx48k/const_expr.asm index e57ef8bd5..beaba926e 100644 --- a/tests/functional/arch/zx48k/const_expr.asm +++ b/tests/functional/arch/zx48k/const_expr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/const_str.asm b/tests/functional/arch/zx48k/const_str.asm index 20780df05..9dc1a06d3 100644 --- a/tests/functional/arch/zx48k/const_str.asm +++ b/tests/functional/arch/zx48k/const_str.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str1.asm b/tests/functional/arch/zx48k/const_str1.asm index aad2e96a8..d589f233f 100644 --- a/tests/functional/arch/zx48k/const_str1.asm +++ b/tests/functional/arch/zx48k/const_str1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str2.asm b/tests/functional/arch/zx48k/const_str2.asm index ba56a5b0f..8bbc43dfe 100644 --- a/tests/functional/arch/zx48k/const_str2.asm +++ b/tests/functional/arch/zx48k/const_str2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str3.asm b/tests/functional/arch/zx48k/const_str3.asm index f0a6f9313..58642c115 100644 --- a/tests/functional/arch/zx48k/const_str3.asm +++ b/tests/functional/arch/zx48k/const_str3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str4.asm b/tests/functional/arch/zx48k/const_str4.asm index af09bb75a..b64f26ca4 100644 --- a/tests/functional/arch/zx48k/const_str4.asm +++ b/tests/functional/arch/zx48k/const_str4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str5.asm b/tests/functional/arch/zx48k/const_str5.asm index c68b8c4f4..85fe6feef 100644 --- a/tests/functional/arch/zx48k/const_str5.asm +++ b/tests/functional/arch/zx48k/const_str5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/const_str6.asm b/tests/functional/arch/zx48k/const_str6.asm index a5902883a..0e28da587 100644 --- a/tests/functional/arch/zx48k/const_str6.asm +++ b/tests/functional/arch/zx48k/const_str6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/constrig.asm b/tests/functional/arch/zx48k/constrig.asm index 51e41e041..d20fe0dbd 100644 --- a/tests/functional/arch/zx48k/constrig.asm +++ b/tests/functional/arch/zx48k/constrig.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -82,7 +80,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -110,5 +108,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 62 "constrig.bas" +#line 62 "arch/zx48k/constrig.bas" END diff --git a/tests/functional/arch/zx48k/data1.asm b/tests/functional/arch/zx48k/data1.asm index 451fbf26c..d3b7aeecf 100644 --- a/tests/functional/arch/zx48k/data1.asm +++ b/tests/functional/arch/zx48k/data1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/declare0.asm b/tests/functional/arch/zx48k/declare0.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/declare0.asm +++ b/tests/functional/arch/zx48k/declare0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/def_func_inline_for_next.asm b/tests/functional/arch/zx48k/def_func_inline_for_next.asm index 8d83f2a27..9edb821ca 100644 --- a/tests/functional/arch/zx48k/def_func_inline_for_next.asm +++ b/tests/functional/arch/zx48k/def_func_inline_for_next.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/def_func_inline_ok.asm b/tests/functional/arch/zx48k/def_func_inline_ok.asm index 8e80cc560..51b23104d 100644 --- a/tests/functional/arch/zx48k/def_func_inline_ok.asm +++ b/tests/functional/arch/zx48k/def_func_inline_ok.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/defb.asm b/tests/functional/arch/zx48k/defb.asm index 8cd2732e8..9173061a2 100644 --- a/tests/functional/arch/zx48k/defb.asm +++ b/tests/functional/arch/zx48k/defb.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,9 +18,9 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "defb.bas" +#line 1 "arch/zx48k/defb.bas" DEFB "Man(e;@ " -#line 4 "defb.bas" +#line 4 "arch/zx48k/defb.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/define_val.asm b/tests/functional/arch/zx48k/define_val.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/define_val.asm +++ b/tests/functional/arch/zx48k/define_val.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_arr_at_label0.asm b/tests/functional/arch/zx48k/dim_arr_at_label0.asm index 418c8e1bd..1396ea9d8 100644 --- a/tests/functional/arch/zx48k/dim_arr_at_label0.asm +++ b/tests/functional/arch/zx48k/dim_arr_at_label0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_arr_at_label1.asm b/tests/functional/arch/zx48k/dim_arr_at_label1.asm index 12fdae5e3..412409a38 100644 --- a/tests/functional/arch/zx48k/dim_arr_at_label1.asm +++ b/tests/functional/arch/zx48k/dim_arr_at_label1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_arr_at_label2.asm b/tests/functional/arch/zx48k/dim_arr_at_label2.asm index 963ddc5ea..857539b70 100644 --- a/tests/functional/arch/zx48k/dim_arr_at_label2.asm +++ b/tests/functional/arch/zx48k/dim_arr_at_label2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at0.asm b/tests/functional/arch/zx48k/dim_at0.asm index 9cfeda428..9dd7922e7 100644 --- a/tests/functional/arch/zx48k/dim_at0.asm +++ b/tests/functional/arch/zx48k/dim_at0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at_label0.asm b/tests/functional/arch/zx48k/dim_at_label0.asm index 517836913..4c6f28b2e 100644 --- a/tests/functional/arch/zx48k/dim_at_label0.asm +++ b/tests/functional/arch/zx48k/dim_at_label0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at_label1.asm b/tests/functional/arch/zx48k/dim_at_label1.asm index 09016c14f..b331f9214 100644 --- a/tests/functional/arch/zx48k/dim_at_label1.asm +++ b/tests/functional/arch/zx48k/dim_at_label1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at_label2.asm b/tests/functional/arch/zx48k/dim_at_label2.asm index 09016c14f..b331f9214 100644 --- a/tests/functional/arch/zx48k/dim_at_label2.asm +++ b/tests/functional/arch/zx48k/dim_at_label2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at_label3.asm b/tests/functional/arch/zx48k/dim_at_label3.asm index 517836913..4c6f28b2e 100644 --- a/tests/functional/arch/zx48k/dim_at_label3.asm +++ b/tests/functional/arch/zx48k/dim_at_label3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_at_label8.asm b/tests/functional/arch/zx48k/dim_at_label8.asm index 1e8eb8134..ad55308d7 100644 --- a/tests/functional/arch/zx48k/dim_at_label8.asm +++ b/tests/functional/arch/zx48k/dim_at_label8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_const0.asm b/tests/functional/arch/zx48k/dim_const0.asm index c906806bc..7a66e20c1 100644 --- a/tests/functional/arch/zx48k/dim_const0.asm +++ b/tests/functional/arch/zx48k/dim_const0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dim_const_const.asm b/tests/functional/arch/zx48k/dim_const_const.asm index e45427126..3bc59c1e5 100644 --- a/tests/functional/arch/zx48k/dim_const_const.asm +++ b/tests/functional/arch/zx48k/dim_const_const.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst.asm b/tests/functional/arch/zx48k/dimconst.asm index d726f27bd..1e374729b 100644 --- a/tests/functional/arch/zx48k/dimconst.asm +++ b/tests/functional/arch/zx48k/dimconst.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst2.asm b/tests/functional/arch/zx48k/dimconst2.asm index 023a104cd..35971f068 100644 --- a/tests/functional/arch/zx48k/dimconst2.asm +++ b/tests/functional/arch/zx48k/dimconst2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst2c.asm b/tests/functional/arch/zx48k/dimconst2c.asm index b8b30dc2e..bfef403b1 100644 --- a/tests/functional/arch/zx48k/dimconst2c.asm +++ b/tests/functional/arch/zx48k/dimconst2c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst2d.asm b/tests/functional/arch/zx48k/dimconst2d.asm index 9ca700f5b..84a0fc97d 100644 --- a/tests/functional/arch/zx48k/dimconst2d.asm +++ b/tests/functional/arch/zx48k/dimconst2d.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst2e.asm b/tests/functional/arch/zx48k/dimconst2e.asm index 000601625..1c74085f7 100644 --- a/tests/functional/arch/zx48k/dimconst2e.asm +++ b/tests/functional/arch/zx48k/dimconst2e.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst3.asm b/tests/functional/arch/zx48k/dimconst3.asm index eb1e9f347..8cff9cbed 100644 --- a/tests/functional/arch/zx48k/dimconst3.asm +++ b/tests/functional/arch/zx48k/dimconst3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst4.asm b/tests/functional/arch/zx48k/dimconst4.asm index dea42f05b..c67624896 100644 --- a/tests/functional/arch/zx48k/dimconst4.asm +++ b/tests/functional/arch/zx48k/dimconst4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst4b.asm b/tests/functional/arch/zx48k/dimconst4b.asm index eb1e9f347..8cff9cbed 100644 --- a/tests/functional/arch/zx48k/dimconst4b.asm +++ b/tests/functional/arch/zx48k/dimconst4b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst4c.asm b/tests/functional/arch/zx48k/dimconst4c.asm index dec516d94..a0cc29a89 100644 --- a/tests/functional/arch/zx48k/dimconst4c.asm +++ b/tests/functional/arch/zx48k/dimconst4c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst5.asm b/tests/functional/arch/zx48k/dimconst5.asm index 02a3f9565..d74dfa2a2 100644 --- a/tests/functional/arch/zx48k/dimconst5.asm +++ b/tests/functional/arch/zx48k/dimconst5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst6.asm b/tests/functional/arch/zx48k/dimconst6.asm index c61a0262e..7af94ffe3 100644 --- a/tests/functional/arch/zx48k/dimconst6.asm +++ b/tests/functional/arch/zx48k/dimconst6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dimconst7.asm b/tests/functional/arch/zx48k/dimconst7.asm index ec52bafe0..7d03f890f 100644 --- a/tests/functional/arch/zx48k/dimconst7.asm +++ b/tests/functional/arch/zx48k/dimconst7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/div32.asm b/tests/functional/arch/zx48k/div32.asm index 6b2bc4069..24d4470be 100644 --- a/tests/functional/arch/zx48k/div32.asm +++ b/tests/functional/arch/zx48k/div32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -47,9 +45,9 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/negf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/negf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -74,7 +72,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -144,8 +142,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/negf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/negf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -217,8 +215,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/negf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/negf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -257,7 +255,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/negf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/negf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -275,5 +273,5 @@ __NEGF: ; A = -A defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 27 "div32.bas" +#line 27 "arch/zx48k/div32.bas" END diff --git a/tests/functional/arch/zx48k/divf00.asm b/tests/functional/arch/zx48k/divf00.asm index 078651b01..9383aebd7 100644 --- a/tests/functional/arch/zx48k/divf00.asm +++ b/tests/functional/arch/zx48k/divf00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -55,8 +53,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -95,8 +93,8 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -130,7 +128,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -151,9 +149,7 @@ __DIVF: ; Division ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h defb 01h ; EXCHANGE @@ -177,8 +173,8 @@ __DIVBYZERO: ret ENDP pop namespace -#line 25 "divf00.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 25 "arch/zx48k/divf00.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -205,8 +201,8 @@ __FP_PUSH_REV: exx ret pop namespace -#line 26 "divf00.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 26 "arch/zx48k/divf00.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -234,5 +230,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 27 "divf00.bas" +#line 27 "arch/zx48k/divf00.bas" END diff --git a/tests/functional/arch/zx48k/divf01.asm b/tests/functional/arch/zx48k/divf01.asm index 68d19e31c..2029a02ef 100644 --- a/tests/functional/arch/zx48k/divf01.asm +++ b/tests/functional/arch/zx48k/divf01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -59,8 +57,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -99,8 +97,8 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -134,7 +132,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/divf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -155,9 +153,7 @@ __DIVF: ; Division ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h defb 01h ; EXCHANGE @@ -181,8 +177,8 @@ __DIVBYZERO: ret ENDP pop namespace -#line 29 "divf01.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 29 "arch/zx48k/divf01.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -210,5 +206,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 30 "divf01.bas" +#line 30 "arch/zx48k/divf01.bas" END diff --git a/tests/functional/arch/zx48k/divf16.asm b/tests/functional/arch/zx48k/divf16.asm index e4e98a42f..9fac0b4d9 100644 --- a/tests/functional/arch/zx48k/divf16.asm +++ b/tests/functional/arch/zx48k/divf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,9 +104,9 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -133,7 +131,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -246,7 +244,7 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" push namespace core __DIVF16: ; 16.16 Fixed point Division (signed) ; DE.HL = Dividend, Stack Top = Divisor @@ -316,5 +314,5 @@ __ENDF16DIV: ; Put the sign on the result ret z jp __NEG32 ; Negates DEHL and returns from there pop namespace -#line 84 "divf16.bas" +#line 84 "arch/zx48k/divf16.bas" END diff --git a/tests/functional/arch/zx48k/divf16a.asm b/tests/functional/arch/zx48k/divf16a.asm index 8192ccc3c..aad516f89 100644 --- a/tests/functional/arch/zx48k/divf16a.asm +++ b/tests/functional/arch/zx48k/divf16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -51,9 +49,9 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -78,7 +76,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -191,7 +189,7 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" push namespace core __DIVF16: ; 16.16 Fixed point Division (signed) ; DE.HL = Dividend, Stack Top = Divisor @@ -261,5 +259,5 @@ __ENDF16DIV: ; Put the sign on the result ret z jp __NEG32 ; Negates DEHL and returns from there pop namespace -#line 31 "divf16a.bas" +#line 31 "arch/zx48k/divf16a.bas" END diff --git a/tests/functional/arch/zx48k/divf16b.asm b/tests/functional/arch/zx48k/divf16b.asm index 9bc9c9131..87d05965c 100644 --- a/tests/functional/arch/zx48k/divf16b.asm +++ b/tests/functional/arch/zx48k/divf16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,9 +59,9 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -88,7 +86,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -201,7 +199,7 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" push namespace core __DIVF16: ; 16.16 Fixed point Division (signed) ; DE.HL = Dividend, Stack Top = Divisor @@ -271,5 +269,5 @@ __ENDF16DIV: ; Put the sign on the result ret z jp __NEG32 ; Negates DEHL and returns from there pop namespace -#line 41 "divf16b.bas" +#line 41 "arch/zx48k/divf16b.bas" END diff --git a/tests/functional/arch/zx48k/divf16c.asm b/tests/functional/arch/zx48k/divf16c.asm index 6448d4082..112b2e059 100644 --- a/tests/functional/arch/zx48k/divf16c.asm +++ b/tests/functional/arch/zx48k/divf16c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -93,9 +91,9 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -120,7 +118,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -233,7 +231,7 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" push namespace core __DIVF16: ; 16.16 Fixed point Division (signed) ; DE.HL = Dividend, Stack Top = Divisor @@ -303,8 +301,8 @@ __ENDF16DIV: ; Put the sign on the result ret z jp __NEG32 ; Negates DEHL and returns from there pop namespace -#line 63 "divf16c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 63 "arch/zx48k/divf16c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -321,5 +319,5 @@ __SWAP32: push bc ret pop namespace -#line 64 "divf16c.bas" +#line 64 "arch/zx48k/divf16c.bas" END diff --git a/tests/functional/arch/zx48k/divi16a.asm b/tests/functional/arch/zx48k/divi16a.asm index 914b6f252..20254d30f 100644 --- a/tests/functional/arch/zx48k/divi16a.asm +++ b/tests/functional/arch/zx48k/divi16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,10 +41,10 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -62,7 +60,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -135,5 +133,5 @@ __MODI16: ; 16 bit modulus ; de = quotient ret pop namespace -#line 23 "divi16a.bas" +#line 23 "arch/zx48k/divi16a.bas" END diff --git a/tests/functional/arch/zx48k/divi16b.asm b/tests/functional/arch/zx48k/divi16b.asm index 0e6595ef1..85c6cb46c 100644 --- a/tests/functional/arch/zx48k/divi16b.asm +++ b/tests/functional/arch/zx48k/divi16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,10 +48,10 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -69,7 +67,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -142,5 +140,5 @@ __MODI16: ; 16 bit modulus ; de = quotient ret pop namespace -#line 30 "divi16b.bas" +#line 30 "arch/zx48k/divi16b.bas" END diff --git a/tests/functional/arch/zx48k/divi32c.asm b/tests/functional/arch/zx48k/divi32c.asm index c8c053962..1d25cfee0 100644 --- a/tests/functional/arch/zx48k/divi32c.asm +++ b/tests/functional/arch/zx48k/divi32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -96,8 +94,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -122,7 +120,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -235,8 +233,8 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 66 "divi32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 66 "arch/zx48k/divi32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -253,5 +251,5 @@ __SWAP32: push bc ret pop namespace -#line 67 "divi32c.bas" +#line 67 "arch/zx48k/divi32c.bas" END diff --git a/tests/functional/arch/zx48k/divi8.asm b/tests/functional/arch/zx48k/divi8.asm index d154361a9..b0a9e49b3 100644 --- a/tests/functional/arch/zx48k/divi8.asm +++ b/tests/functional/arch/zx48k/divi8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,7 +64,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -131,5 +129,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 44 "divi8.bas" +#line 44 "arch/zx48k/divi8.bas" END diff --git a/tests/functional/arch/zx48k/divi8a.asm b/tests/functional/arch/zx48k/divi8a.asm index 67f705821..97cac2c31 100644 --- a/tests/functional/arch/zx48k/divi8a.asm +++ b/tests/functional/arch/zx48k/divi8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,7 +41,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -108,5 +106,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 23 "divi8a.bas" +#line 23 "arch/zx48k/divi8a.bas" END diff --git a/tests/functional/arch/zx48k/divi8b.asm b/tests/functional/arch/zx48k/divi8b.asm index e664705dc..fb5bb316b 100644 --- a/tests/functional/arch/zx48k/divi8b.asm +++ b/tests/functional/arch/zx48k/divi8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,7 +47,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -114,5 +112,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 29 "divi8b.bas" +#line 29 "arch/zx48k/divi8b.bas" END diff --git a/tests/functional/arch/zx48k/divu16.asm b/tests/functional/arch/zx48k/divu16.asm index a30eac468..cab96c3b7 100644 --- a/tests/functional/arch/zx48k/divu16.asm +++ b/tests/functional/arch/zx48k/divu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -67,10 +65,10 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -86,7 +84,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -159,5 +157,5 @@ __MODI16: ; 16 bit modulus ; de = quotient ret pop namespace -#line 45 "divu16.bas" +#line 45 "arch/zx48k/divu16.bas" END diff --git a/tests/functional/arch/zx48k/divu16a.asm b/tests/functional/arch/zx48k/divu16a.asm index ac6675c68..b9d0c8f99 100644 --- a/tests/functional/arch/zx48k/divu16a.asm +++ b/tests/functional/arch/zx48k/divu16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,10 +41,10 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -62,7 +60,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -135,5 +133,5 @@ __MODI16: ; 16 bit modulus ; de = quotient ret pop namespace -#line 23 "divu16a.bas" +#line 23 "arch/zx48k/divu16a.bas" END diff --git a/tests/functional/arch/zx48k/divu16b.asm b/tests/functional/arch/zx48k/divu16b.asm index a976f9f4c..8073bc035 100644 --- a/tests/functional/arch/zx48k/divu16b.asm +++ b/tests/functional/arch/zx48k/divu16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,10 +48,10 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" ; Negates HL value (16 bit) push namespace core __ABS16: @@ -69,7 +67,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -142,5 +140,5 @@ __MODI16: ; 16 bit modulus ; de = quotient ret pop namespace -#line 30 "divu16b.bas" +#line 30 "arch/zx48k/divu16b.bas" END diff --git a/tests/functional/arch/zx48k/divu32c.asm b/tests/functional/arch/zx48k/divu32c.asm index 6f44449f6..84ecc425e 100644 --- a/tests/functional/arch/zx48k/divu32c.asm +++ b/tests/functional/arch/zx48k/divu32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -96,8 +94,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -122,7 +120,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -235,8 +233,8 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 66 "divu32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 66 "arch/zx48k/divu32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -253,5 +251,5 @@ __SWAP32: push bc ret pop namespace -#line 67 "divu32c.bas" +#line 67 "arch/zx48k/divu32c.bas" END diff --git a/tests/functional/arch/zx48k/divu8.asm b/tests/functional/arch/zx48k/divu8.asm index 9990faf23..462e81d1a 100644 --- a/tests/functional/arch/zx48k/divu8.asm +++ b/tests/functional/arch/zx48k/divu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/divu8a.asm b/tests/functional/arch/zx48k/divu8a.asm index 53115111d..83319617e 100644 --- a/tests/functional/arch/zx48k/divu8a.asm +++ b/tests/functional/arch/zx48k/divu8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,7 +41,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -108,5 +106,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 23 "divu8a.bas" +#line 23 "arch/zx48k/divu8a.bas" END diff --git a/tests/functional/arch/zx48k/divu8b.asm b/tests/functional/arch/zx48k/divu8b.asm index e398f7864..95d8137d6 100644 --- a/tests/functional/arch/zx48k/divu8b.asm +++ b/tests/functional/arch/zx48k/divu8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,7 +47,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -114,5 +112,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 29 "divu8b.bas" +#line 29 "arch/zx48k/divu8b.bas" END diff --git a/tests/functional/arch/zx48k/dollar.asm b/tests/functional/arch/zx48k/dollar.asm index 3ba9d6763..7b7cd07ed 100644 --- a/tests/functional/arch/zx48k/dollar.asm +++ b/tests/functional/arch/zx48k/dollar.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,9 +18,9 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "dollar.bas" +#line 1 "arch/zx48k/dollar.bas" jr $+2 -#line 6 "dollar.bas" +#line 6 "arch/zx48k/dollar.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/doloop.asm b/tests/functional/arch/zx48k/doloop.asm index c6930e35a..3a23ede84 100644 --- a/tests/functional/arch/zx48k/doloop.asm +++ b/tests/functional/arch/zx48k/doloop.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/doloop1.asm b/tests/functional/arch/zx48k/doloop1.asm index b98b53caf..3c71b3177 100644 --- a/tests/functional/arch/zx48k/doloop1.asm +++ b/tests/functional/arch/zx48k/doloop1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/doloop2.asm b/tests/functional/arch/zx48k/doloop2.asm index 1a721740b..2fa363057 100644 --- a/tests/functional/arch/zx48k/doloop2.asm +++ b/tests/functional/arch/zx48k/doloop2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/doloop3.asm b/tests/functional/arch/zx48k/doloop3.asm index e3103390b..910cac3ad 100644 --- a/tests/functional/arch/zx48k/doloop3.asm +++ b/tests/functional/arch/zx48k/doloop3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/doloop4.asm b/tests/functional/arch/zx48k/doloop4.asm index 59f88f459..c0c055751 100644 --- a/tests/functional/arch/zx48k/doloop4.asm +++ b/tests/functional/arch/zx48k/doloop4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dountil1.asm b/tests/functional/arch/zx48k/dountil1.asm index 00bf18fe8..6b5132069 100644 --- a/tests/functional/arch/zx48k/dountil1.asm +++ b/tests/functional/arch/zx48k/dountil1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dountilempty.asm b/tests/functional/arch/zx48k/dountilempty.asm index 0f6e55003..f9c5d0b76 100644 --- a/tests/functional/arch/zx48k/dountilempty.asm +++ b/tests/functional/arch/zx48k/dountilempty.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,8 +44,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -69,6 +67,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 26 "dountilempty.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 26 "arch/zx48k/dountilempty.bas" END diff --git a/tests/functional/arch/zx48k/dountilsplitted.asm b/tests/functional/arch/zx48k/dountilsplitted.asm index dfbeb338c..2517b117d 100644 --- a/tests/functional/arch/zx48k/dountilsplitted.asm +++ b/tests/functional/arch/zx48k/dountilsplitted.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -67,9 +65,9 @@ _M: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -94,7 +92,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -164,8 +162,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -237,8 +235,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -277,7 +275,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -297,8 +295,8 @@ __EQF: ; A = B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 45 "dountilsplitted.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 45 "arch/zx48k/dountilsplitted.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -325,5 +323,5 @@ __FP_PUSH_REV: exx ret pop namespace -#line 46 "dountilsplitted.bas" +#line 46 "arch/zx48k/dountilsplitted.bas" END diff --git a/tests/functional/arch/zx48k/dowhile1.asm b/tests/functional/arch/zx48k/dowhile1.asm index 00bf18fe8..6b5132069 100644 --- a/tests/functional/arch/zx48k/dowhile1.asm +++ b/tests/functional/arch/zx48k/dowhile1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/dowhileempty.asm b/tests/functional/arch/zx48k/dowhileempty.asm index 9524dd347..68876220a 100644 --- a/tests/functional/arch/zx48k/dowhileempty.asm +++ b/tests/functional/arch/zx48k/dowhileempty.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,8 +44,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -69,6 +67,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 26 "dowhileempty.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 26 "arch/zx48k/dowhileempty.bas" END diff --git a/tests/functional/arch/zx48k/dowhilesplitted.asm b/tests/functional/arch/zx48k/dowhilesplitted.asm index d4254bb29..e7cdc1270 100644 --- a/tests/functional/arch/zx48k/dowhilesplitted.asm +++ b/tests/functional/arch/zx48k/dowhilesplitted.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -67,9 +65,9 @@ _M: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -94,7 +92,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -164,8 +162,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -237,8 +235,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -277,7 +275,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -297,8 +295,8 @@ __EQF: ; A = B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 45 "dowhilesplitted.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 45 "arch/zx48k/dowhilesplitted.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -325,5 +323,5 @@ __FP_PUSH_REV: exx ret pop namespace -#line 46 "dowhilesplitted.bas" +#line 46 "arch/zx48k/dowhilesplitted.bas" END diff --git a/tests/functional/arch/zx48k/draw.asm b/tests/functional/arch/zx48k/draw.asm index 77e85d778..1d77804f8 100644 --- a/tests/functional/arch/zx48k/draw.asm +++ b/tests/functional/arch/zx48k/draw.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/draw3.asm b/tests/functional/arch/zx48k/draw3.asm index 61710b9da..bfa4d7d50 100644 --- a/tests/functional/arch/zx48k/draw3.asm +++ b/tests/functional/arch/zx48k/draw3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/einar01.asm b/tests/functional/arch/zx48k/einar01.asm index 08412a27b..31838a16d 100644 --- a/tests/functional/arch/zx48k/einar01.asm +++ b/tests/functional/arch/zx48k/einar01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/einarattr.asm b/tests/functional/arch/zx48k/einarattr.asm index ad6e1f26f..f22cdaafd 100644 --- a/tests/functional/arch/zx48k/einarattr.asm +++ b/tests/functional/arch/zx48k/einarattr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/einarshift.asm b/tests/functional/arch/zx48k/einarshift.asm index 2b7a93d86..1836a783d 100644 --- a/tests/functional/arch/zx48k/einarshift.asm +++ b/tests/functional/arch/zx48k/einarshift.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/elseif.asm b/tests/functional/arch/zx48k/elseif.asm index ef737c086..5c1f6147f 100644 --- a/tests/functional/arch/zx48k/elseif.asm +++ b/tests/functional/arch/zx48k/elseif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/elseif1.asm b/tests/functional/arch/zx48k/elseif1.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/elseif1.asm +++ b/tests/functional/arch/zx48k/elseif1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/elseif2.asm b/tests/functional/arch/zx48k/elseif2.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/elseif2.asm +++ b/tests/functional/arch/zx48k/elseif2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/elseif3.asm b/tests/functional/arch/zx48k/elseif3.asm index ed3e5aec9..d96268d71 100644 --- a/tests/functional/arch/zx48k/elseif3.asm +++ b/tests/functional/arch/zx48k/elseif3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -52,8 +50,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -75,6 +73,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 32 "elseif3.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 32 "arch/zx48k/elseif3.bas" END diff --git a/tests/functional/arch/zx48k/elseif4.asm b/tests/functional/arch/zx48k/elseif4.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/elseif4.asm +++ b/tests/functional/arch/zx48k/elseif4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/elseif5.asm b/tests/functional/arch/zx48k/elseif5.asm index f855b5725..79cd1a2a5 100644 --- a/tests/functional/arch/zx48k/elseif5.asm +++ b/tests/functional/arch/zx48k/elseif5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -80,6 +78,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 37 "elseif5.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 37 "arch/zx48k/elseif5.bas" END diff --git a/tests/functional/arch/zx48k/elseif6.asm b/tests/functional/arch/zx48k/elseif6.asm index 79082fe5b..2d189dbd4 100644 --- a/tests/functional/arch/zx48k/elseif6.asm +++ b/tests/functional/arch/zx48k/elseif6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -68,6 +66,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 25 "elseif6.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 25 "arch/zx48k/elseif6.bas" END diff --git a/tests/functional/arch/zx48k/emptystrparam.asm b/tests/functional/arch/zx48k/emptystrparam.asm index fa8d3a3d3..5172abf9c 100644 --- a/tests/functional/arch/zx48k/emptystrparam.asm +++ b/tests/functional/arch/zx48k/emptystrparam.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -65,7 +63,7 @@ _stringtest__leave: .LABEL.__LABEL0: DEFW 0000h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -125,7 +123,7 @@ _stringtest__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -232,7 +230,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -331,9 +329,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 42 "emptystrparam.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 42 "arch/zx48k/emptystrparam.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -393,7 +391,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -427,7 +425,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -458,9 +456,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -525,7 +523,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -562,5 +560,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 43 "emptystrparam.bas" +#line 43 "arch/zx48k/emptystrparam.bas" END diff --git a/tests/functional/arch/zx48k/end.asm b/tests/functional/arch/zx48k/end.asm index df774528a..d44fce352 100644 --- a/tests/functional/arch/zx48k/end.asm +++ b/tests/functional/arch/zx48k/end.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/endif.asm b/tests/functional/arch/zx48k/endif.asm index 77e82bb64..1ac09c18e 100644 --- a/tests/functional/arch/zx48k/endif.asm +++ b/tests/functional/arch/zx48k/endif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/eq0.asm b/tests/functional/arch/zx48k/eq0.asm index 489d9834f..a559d35bb 100644 --- a/tests/functional/arch/zx48k/eq0.asm +++ b/tests/functional/arch/zx48k/eq0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -48,9 +46,9 @@ _c: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -75,7 +73,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -145,8 +143,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -218,8 +216,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -258,7 +256,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -278,8 +276,8 @@ __EQF: ; A = B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 24 "eq0.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 24 "arch/zx48k/eq0.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -306,5 +304,5 @@ __FP_PUSH_REV: exx ret pop namespace -#line 25 "eq0.bas" +#line 25 "arch/zx48k/eq0.bas" END diff --git a/tests/functional/arch/zx48k/equ16.asm b/tests/functional/arch/zx48k/equ16.asm index 3517b886e..e86a1c01e 100644 --- a/tests/functional/arch/zx48k/equ16.asm +++ b/tests/functional/arch/zx48k/equ16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,7 +44,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eq16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eq16.asm" push namespace core __EQ16: ; Test if 16bit values HL == DE ; Returns result in A: 0 = False, FF = True @@ -56,5 +54,5 @@ __EQ16: ; Test if 16bit values HL == DE inc a ret pop namespace -#line 26 "equ16.bas" +#line 26 "arch/zx48k/equ16.bas" END diff --git a/tests/functional/arch/zx48k/equ32.asm b/tests/functional/arch/zx48k/equ32.asm index 95968cdb4..e06c095f5 100644 --- a/tests/functional/arch/zx48k/equ32.asm +++ b/tests/functional/arch/zx48k/equ32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,7 +55,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eq32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eq32.asm" push namespace core __EQ32: ; Test if 32bit value HLDE equals top of the stack ; Returns result in A: 0 = False, FF = True @@ -82,5 +80,5 @@ __EQ32: ; Test if 32bit value HLDE equals top of the stack xor a ret pop namespace -#line 37 "equ32.bas" +#line 37 "arch/zx48k/equ32.bas" END diff --git a/tests/functional/arch/zx48k/equ8.asm b/tests/functional/arch/zx48k/equ8.asm index 206b29be0..e4d82a587 100644 --- a/tests/functional/arch/zx48k/equ8.asm +++ b/tests/functional/arch/zx48k/equ8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/equf.asm b/tests/functional/arch/zx48k/equf.asm index b379f7cde..6ca6f7986 100644 --- a/tests/functional/arch/zx48k/equf.asm +++ b/tests/functional/arch/zx48k/equf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -113,7 +111,7 @@ __ADDF: ; Addition jp __FPSTACK_POP pop namespace #line 34 "arch/zx48k/equf.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core @@ -210,7 +208,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -283,7 +281,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. diff --git a/tests/functional/arch/zx48k/explicit6.asm b/tests/functional/arch/zx48k/explicit6.asm index 509fffc38..955835e11 100644 --- a/tests/functional/arch/zx48k/explicit6.asm +++ b/tests/functional/arch/zx48k/explicit6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/extra_chars.asm b/tests/functional/arch/zx48k/extra_chars.asm index b2b025283..377e557c7 100644 --- a/tests/functional/arch/zx48k/extra_chars.asm +++ b/tests/functional/arch/zx48k/extra_chars.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,10 +18,10 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "extra_chars.bas" +#line 2 "arch/zx48k/extra_chars.bas" `mylabel: ld a, #0 -#line 6 "extra_chars.bas" +#line 6 "arch/zx48k/extra_chars.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/fact.asm b/tests/functional/arch/zx48k/fact.asm index e585a22cb..2367e493a 100644 --- a/tests/functional/arch/zx48k/fact.asm +++ b/tests/functional/arch/zx48k/fact.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fastcall_str.asm b/tests/functional/arch/zx48k/fastcall_str.asm index 574b91d2c..21e6fcbb3 100644 --- a/tests/functional/arch/zx48k/fastcall_str.asm +++ b/tests/functional/arch/zx48k/fastcall_str.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -44,10 +42,10 @@ ei ret _testsub: -#line 9 "fastcall_str.bas" +#line 8 "arch/zx48k/fastcall_str.bas" pop hl nop -#line 12 "fastcall_str.bas" +#line 12 "arch/zx48k/fastcall_str.bas" _testsub__leave: ret .LABEL.__LABEL0: @@ -59,8 +57,8 @@ _testsub__leave: DEFB 73h DEFB 74h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -120,7 +118,7 @@ _testsub__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -154,8 +152,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -262,7 +260,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -293,9 +291,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -360,7 +358,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -397,5 +395,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 25 "fastcall_str.bas" +#line 25 "arch/zx48k/fastcall_str.bas" END diff --git a/tests/functional/arch/zx48k/file_macro.asm b/tests/functional/arch/zx48k/file_macro.asm index f2d82300e..8688512ed 100644 --- a/tests/functional/arch/zx48k/file_macro.asm +++ b/tests/functional/arch/zx48k/file_macro.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/for0.asm b/tests/functional/arch/zx48k/for0.asm index a9c8693e3..4b20dddb9 100644 --- a/tests/functional/arch/zx48k/for0.asm +++ b/tests/functional/arch/zx48k/for0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/for_const_crash.asm b/tests/functional/arch/zx48k/for_const_crash.asm index 18e97982d..e92249452 100644 --- a/tests/functional/arch/zx48k/for_const_crash.asm +++ b/tests/functional/arch/zx48k/for_const_crash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/for_const_crash1.asm b/tests/functional/arch/zx48k/for_const_crash1.asm index 4ecab1e64..cce7ebc2e 100644 --- a/tests/functional/arch/zx48k/for_const_crash1.asm +++ b/tests/functional/arch/zx48k/for_const_crash1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/forempty.asm b/tests/functional/arch/zx48k/forempty.asm index 17b6ed412..44ece48b4 100644 --- a/tests/functional/arch/zx48k/forempty.asm +++ b/tests/functional/arch/zx48k/forempty.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,8 +48,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -73,6 +71,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 30 "forempty.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 30 "arch/zx48k/forempty.bas" END diff --git a/tests/functional/arch/zx48k/fornext.asm b/tests/functional/arch/zx48k/fornext.asm index aba4597d4..1fb24b867 100644 --- a/tests/functional/arch/zx48k/fornext.asm +++ b/tests/functional/arch/zx48k/fornext.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornext2.asm b/tests/functional/arch/zx48k/fornext2.asm index e12032167..d68729687 100644 --- a/tests/functional/arch/zx48k/fornext2.asm +++ b/tests/functional/arch/zx48k/fornext2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornext3.asm b/tests/functional/arch/zx48k/fornext3.asm index 8d10f5dc3..ac94075f5 100644 --- a/tests/functional/arch/zx48k/fornext3.asm +++ b/tests/functional/arch/zx48k/fornext3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornextopt.asm b/tests/functional/arch/zx48k/fornextopt.asm index 1d24b5df8..6ff6abc17 100644 --- a/tests/functional/arch/zx48k/fornextopt.asm +++ b/tests/functional/arch/zx48k/fornextopt.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornextopt2.asm b/tests/functional/arch/zx48k/fornextopt2.asm index 913104013..493d81a2c 100644 --- a/tests/functional/arch/zx48k/fornextopt2.asm +++ b/tests/functional/arch/zx48k/fornextopt2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornextopt3.asm b/tests/functional/arch/zx48k/fornextopt3.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/fornextopt3.asm +++ b/tests/functional/arch/zx48k/fornextopt3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fornextopt4.asm b/tests/functional/arch/zx48k/fornextopt4.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/fornextopt4.asm +++ b/tests/functional/arch/zx48k/fornextopt4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/forsplitted.asm b/tests/functional/arch/zx48k/forsplitted.asm index f63f646b0..760ae2e90 100644 --- a/tests/functional/arch/zx48k/forsplitted.asm +++ b/tests/functional/arch/zx48k/forsplitted.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/forsplitted0.asm b/tests/functional/arch/zx48k/forsplitted0.asm index ed351d8a8..5d928f3d5 100644 --- a/tests/functional/arch/zx48k/forsplitted0.asm +++ b/tests/functional/arch/zx48k/forsplitted0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -56,8 +54,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -79,6 +77,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 36 "forsplitted0.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 36 "arch/zx48k/forsplitted0.bas" END diff --git a/tests/functional/arch/zx48k/forsplitted1.asm b/tests/functional/arch/zx48k/forsplitted1.asm index bd380b3da..8e38df9b3 100644 --- a/tests/functional/arch/zx48k/forsplitted1.asm +++ b/tests/functional/arch/zx48k/forsplitted1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fp_pow.asm b/tests/functional/arch/zx48k/fp_pow.asm index 95a7d2e4c..f1f158c24 100644 --- a/tests/functional/arch/zx48k/fp_pow.asm +++ b/tests/functional/arch/zx48k/fp_pow.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,7 +43,7 @@ _x: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pow.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/math/pow.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -85,7 +83,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/pow.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/math/pow.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zx48k/fporder.asm b/tests/functional/arch/zx48k/fporder.asm index 632e94734..aa58a24c1 100644 --- a/tests/functional/arch/zx48k/fporder.asm +++ b/tests/functional/arch/zx48k/fporder.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/func0.asm b/tests/functional/arch/zx48k/func0.asm index 8e80cc560..51b23104d 100644 --- a/tests/functional/arch/zx48k/func0.asm +++ b/tests/functional/arch/zx48k/func0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/func_func.asm b/tests/functional/arch/zx48k/func_func.asm index 87ee7bd72..8e9c684f9 100644 --- a/tests/functional/arch/zx48k/func_func.asm +++ b/tests/functional/arch/zx48k/func_func.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/funccall0.asm b/tests/functional/arch/zx48k/funccall0.asm index f02dff72c..85d3cfc6f 100644 --- a/tests/functional/arch/zx48k/funccall0.asm +++ b/tests/functional/arch/zx48k/funccall0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/funccall1.asm b/tests/functional/arch/zx48k/funccall1.asm index 32c099378..696a842de 100644 --- a/tests/functional/arch/zx48k/funccall1.asm +++ b/tests/functional/arch/zx48k/funccall1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/funccall2.asm b/tests/functional/arch/zx48k/funccall2.asm index 905288e0e..b39d26bca 100644 --- a/tests/functional/arch/zx48k/funccall2.asm +++ b/tests/functional/arch/zx48k/funccall2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/funcif.asm b/tests/functional/arch/zx48k/funcif.asm index 8594ec1f0..9fe652ea8 100644 --- a/tests/functional/arch/zx48k/funcif.asm +++ b/tests/functional/arch/zx48k/funcif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -83,8 +81,8 @@ _ScanNear__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -109,7 +107,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -181,5 +179,5 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 61 "funcif.bas" +#line 61 "arch/zx48k/funcif.bas" END diff --git a/tests/functional/arch/zx48k/funcnoparm.asm b/tests/functional/arch/zx48k/funcnoparm.asm index 84fb665a1..e65314be4 100644 --- a/tests/functional/arch/zx48k/funcnoparm.asm +++ b/tests/functional/arch/zx48k/funcnoparm.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/fwd_func_decl.asm b/tests/functional/arch/zx48k/fwd_func_decl.asm index 13265aca9..d3d1e394c 100644 --- a/tests/functional/arch/zx48k/fwd_func_decl.asm +++ b/tests/functional/arch/zx48k/fwd_func_decl.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gef.asm b/tests/functional/arch/zx48k/gef.asm index d6c5b648e..7a2a5470c 100644 --- a/tests/functional/arch/zx48k/gef.asm +++ b/tests/functional/arch/zx48k/gef.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/gef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core @@ -203,7 +201,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/gef.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -276,7 +274,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/gef.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -316,7 +314,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/gef.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gef.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zx48k/gef16.asm b/tests/functional/arch/zx48k/gef16.asm index 14054c701..8a1431ef4 100644 --- a/tests/functional/arch/zx48k/gef16.asm +++ b/tests/functional/arch/zx48k/gef16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gei16.asm b/tests/functional/arch/zx48k/gei16.asm index 1dfcf49fd..f9e936f35 100644 --- a/tests/functional/arch/zx48k/gei16.asm +++ b/tests/functional/arch/zx48k/gei16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -73,7 +71,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lei16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei16.asm" push namespace core __LEI16: PROC diff --git a/tests/functional/arch/zx48k/gei32.asm b/tests/functional/arch/zx48k/gei32.asm index 872433a0a..6020c7d95 100644 --- a/tests/functional/arch/zx48k/gei32.asm +++ b/tests/functional/arch/zx48k/gei32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gei8.asm b/tests/functional/arch/zx48k/gei8.asm index 123e5077f..8d76613a3 100644 --- a/tests/functional/arch/zx48k/gei8.asm +++ b/tests/functional/arch/zx48k/gei8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/geu16.asm b/tests/functional/arch/zx48k/geu16.asm index 526643996..809d37557 100644 --- a/tests/functional/arch/zx48k/geu16.asm +++ b/tests/functional/arch/zx48k/geu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/geu32.asm b/tests/functional/arch/zx48k/geu32.asm index 72a185b5c..34612976c 100644 --- a/tests/functional/arch/zx48k/geu32.asm +++ b/tests/functional/arch/zx48k/geu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/geu8.asm b/tests/functional/arch/zx48k/geu8.asm index 8a7fa2d0f..d25760f0f 100644 --- a/tests/functional/arch/zx48k/geu8.asm +++ b/tests/functional/arch/zx48k/geu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gtf.asm b/tests/functional/arch/zx48k/gtf.asm index 32b2d45d4..093360fd9 100644 --- a/tests/functional/arch/zx48k/gtf.asm +++ b/tests/functional/arch/zx48k/gtf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -93,7 +91,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/gtf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core @@ -190,7 +188,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/gtf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -263,7 +261,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/gtf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -303,7 +301,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/gtf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gtf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zx48k/gtf16.asm b/tests/functional/arch/zx48k/gtf16.asm index 349ada602..5f427cd1e 100644 --- a/tests/functional/arch/zx48k/gtf16.asm +++ b/tests/functional/arch/zx48k/gtf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gti16.asm b/tests/functional/arch/zx48k/gti16.asm index 6e3c9177d..bdbee8e92 100644 --- a/tests/functional/arch/zx48k/gti16.asm +++ b/tests/functional/arch/zx48k/gti16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -73,7 +71,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lti16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti16.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -96,7 +94,7 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/lti16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti16.asm" push namespace core __LTI16: ; Test 8 bit values HL < DE ; Returns result in A: 0 = False, !0 = True diff --git a/tests/functional/arch/zx48k/gti32.asm b/tests/functional/arch/zx48k/gti32.asm index c5f1c778c..23a7a386d 100644 --- a/tests/functional/arch/zx48k/gti32.asm +++ b/tests/functional/arch/zx48k/gti32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gti8.asm b/tests/functional/arch/zx48k/gti8.asm index 0cf5a7451..b02c7c07a 100644 --- a/tests/functional/arch/zx48k/gti8.asm +++ b/tests/functional/arch/zx48k/gti8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -68,6 +66,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 25 "gti8.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 25 "arch/zx48k/gti8.bas" END diff --git a/tests/functional/arch/zx48k/gtu16.asm b/tests/functional/arch/zx48k/gtu16.asm index 5b5f880a9..55d209f30 100644 --- a/tests/functional/arch/zx48k/gtu16.asm +++ b/tests/functional/arch/zx48k/gtu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gtu32.asm b/tests/functional/arch/zx48k/gtu32.asm index fc852db7a..6079e131c 100644 --- a/tests/functional/arch/zx48k/gtu32.asm +++ b/tests/functional/arch/zx48k/gtu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/gtu8.asm b/tests/functional/arch/zx48k/gtu8.asm index 669fcf0d3..15af5ff0f 100644 --- a/tests/functional/arch/zx48k/gtu8.asm +++ b/tests/functional/arch/zx48k/gtu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/haplo06.asm b/tests/functional/arch/zx48k/haplo06.asm index 4ab23d6b1..8c44690c5 100644 --- a/tests/functional/arch/zx48k/haplo06.asm +++ b/tests/functional/arch/zx48k/haplo06.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/haplo0asm.asm b/tests/functional/arch/zx48k/haplo0asm.asm index 979ab05dd..c03c13a60 100644 --- a/tests/functional/arch/zx48k/haplo0asm.asm +++ b/tests/functional/arch/zx48k/haplo0asm.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,7 +18,7 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "haplo0asm.bas" +#line 1 "arch/zx48k/haplo0asm.bas" tablaColor equ 2 tablaColorAlto equ tablaColor >> 8 tablaColorBajo equ tablaColor & 0xFF @@ -31,7 +29,7 @@ tabla4 equ tablaColor ~ 5 ld a, tablaColorAlto ld b, tablaColorBajo -#line 14 "haplo0asm.bas" +#line 14 "arch/zx48k/haplo0asm.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/haplo_out.asm b/tests/functional/arch/zx48k/haplo_out.asm index 8ac1023a5..24d6ce215 100644 --- a/tests/functional/arch/zx48k/haplo_out.asm +++ b/tests/functional/arch/zx48k/haplo_out.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/id_substr_eq_expr.asm b/tests/functional/arch/zx48k/id_substr_eq_expr.asm index f60e0bdec..1e12f96ef 100644 --- a/tests/functional/arch/zx48k/id_substr_eq_expr.asm +++ b/tests/functional/arch/zx48k/id_substr_eq_expr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -59,7 +57,7 @@ _a: DEFB 6Ch DEFB 6Fh ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -68,7 +66,7 @@ _a: ; A Register => 0 if HL is not freed from memory ; => Not 0 if HL must be freed from memory on exit ; TOP -3 B$ address -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -128,7 +126,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -235,7 +233,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -334,7 +332,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 11 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 11 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" push namespace core __LETSUBSTR: PROC @@ -446,5 +444,5 @@ __FREE_STR: ret ENDP pop namespace -#line 34 "id_substr_eq_expr.bas" +#line 34 "arch/zx48k/id_substr_eq_expr.bas" END diff --git a/tests/functional/arch/zx48k/idco.asm b/tests/functional/arch/zx48k/idco.asm index 49d34eda1..b279688e9 100644 --- a/tests/functional/arch/zx48k/idco.asm +++ b/tests/functional/arch/zx48k/idco.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifcoendif.asm b/tests/functional/arch/zx48k/ifcoendif.asm index 66eb206f6..45f779b4a 100644 --- a/tests/functional/arch/zx48k/ifcoendif.asm +++ b/tests/functional/arch/zx48k/ifcoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -68,6 +66,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 25 "ifcoendif.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 25 "arch/zx48k/ifcoendif.bas" END diff --git a/tests/functional/arch/zx48k/ifcoendif1.asm b/tests/functional/arch/zx48k/ifcoendif1.asm index 22ceaa4f4..4de6d4964 100644 --- a/tests/functional/arch/zx48k/ifcoendif1.asm +++ b/tests/functional/arch/zx48k/ifcoendif1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -68,6 +66,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 25 "ifcoendif1.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 25 "arch/zx48k/ifcoendif1.bas" END diff --git a/tests/functional/arch/zx48k/ifcoendif2.asm b/tests/functional/arch/zx48k/ifcoendif2.asm index e854220df..2189b6bc4 100644 --- a/tests/functional/arch/zx48k/ifcoendif2.asm +++ b/tests/functional/arch/zx48k/ifcoendif2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifcrash.asm b/tests/functional/arch/zx48k/ifcrash.asm index 366e8152b..4a3b279f4 100644 --- a/tests/functional/arch/zx48k/ifcrash.asm +++ b/tests/functional/arch/zx48k/ifcrash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -178,7 +176,7 @@ __SUBF: ; Subtraction jp __FPSTACK_POP pop namespace #line 88 "arch/zx48k/ifcrash.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core @@ -275,7 +273,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -348,7 +346,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/eqf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -369,7 +367,7 @@ __EQF: ; A = B jp __FTOU8 ; Convert to 8 bits pop namespace #line 89 "arch/zx48k/ifcrash.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/gtf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/gtf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -389,7 +387,7 @@ __GTF: ; A > B call __FPSTACK_POP jp __FTOU8; Convert to 8 bits pop namespace -#line 91 "arch/zx48k/ifcrash.bas" +#line 90 "arch/zx48k/ifcrash.bas" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last diff --git a/tests/functional/arch/zx48k/ifelse0.asm b/tests/functional/arch/zx48k/ifelse0.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/ifelse0.asm +++ b/tests/functional/arch/zx48k/ifelse0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifelse1.asm b/tests/functional/arch/zx48k/ifelse1.asm index 390787ffb..d3e7bf762 100644 --- a/tests/functional/arch/zx48k/ifelse1.asm +++ b/tests/functional/arch/zx48k/ifelse1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifelse2.asm b/tests/functional/arch/zx48k/ifelse2.asm index f100be93e..6559ef32c 100644 --- a/tests/functional/arch/zx48k/ifelse2.asm +++ b/tests/functional/arch/zx48k/ifelse2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,8 +59,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -84,6 +82,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 41 "ifelse2.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 41 "arch/zx48k/ifelse2.bas" END diff --git a/tests/functional/arch/zx48k/ifelse3.asm b/tests/functional/arch/zx48k/ifelse3.asm index aee020adf..3f9ebab34 100644 --- a/tests/functional/arch/zx48k/ifelse3.asm +++ b/tests/functional/arch/zx48k/ifelse3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -72,6 +70,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 29 "ifelse3.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 29 "arch/zx48k/ifelse3.bas" END diff --git a/tests/functional/arch/zx48k/ifelse4.asm b/tests/functional/arch/zx48k/ifelse4.asm index 909f03784..53eecbc18 100644 --- a/tests/functional/arch/zx48k/ifelse4.asm +++ b/tests/functional/arch/zx48k/ifelse4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -72,6 +70,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 29 "ifelse4.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 29 "arch/zx48k/ifelse4.bas" END diff --git a/tests/functional/arch/zx48k/ifelse5.asm b/tests/functional/arch/zx48k/ifelse5.asm index 2dde00c4c..a4590fa4f 100644 --- a/tests/functional/arch/zx48k/ifelse5.asm +++ b/tests/functional/arch/zx48k/ifelse5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -80,6 +78,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 37 "ifelse5.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 37 "arch/zx48k/ifelse5.bas" END diff --git a/tests/functional/arch/zx48k/ifempty.asm b/tests/functional/arch/zx48k/ifempty.asm index 9dea09437..e683e3f29 100644 --- a/tests/functional/arch/zx48k/ifempty.asm +++ b/tests/functional/arch/zx48k/ifempty.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifempty0.asm b/tests/functional/arch/zx48k/ifempty0.asm index 9dea09437..e683e3f29 100644 --- a/tests/functional/arch/zx48k/ifempty0.asm +++ b/tests/functional/arch/zx48k/ifempty0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifempty1.asm b/tests/functional/arch/zx48k/ifempty1.asm index 9dea09437..e683e3f29 100644 --- a/tests/functional/arch/zx48k/ifempty1.asm +++ b/tests/functional/arch/zx48k/ifempty1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifempty2.asm b/tests/functional/arch/zx48k/ifempty2.asm index 9020a63a1..42aa6a646 100644 --- a/tests/functional/arch/zx48k/ifempty2.asm +++ b/tests/functional/arch/zx48k/ifempty2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,8 +44,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -69,6 +67,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 26 "ifempty2.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 26 "arch/zx48k/ifempty2.bas" END diff --git a/tests/functional/arch/zx48k/ifempty3.asm b/tests/functional/arch/zx48k/ifempty3.asm index 5d44ef567..ca3493d16 100644 --- a/tests/functional/arch/zx48k/ifempty3.asm +++ b/tests/functional/arch/zx48k/ifempty3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -72,6 +70,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 29 "ifempty3.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 29 "arch/zx48k/ifempty3.bas" END diff --git a/tests/functional/arch/zx48k/ifempty4.asm b/tests/functional/arch/zx48k/ifempty4.asm index 9dea09437..e683e3f29 100644 --- a/tests/functional/arch/zx48k/ifempty4.asm +++ b/tests/functional/arch/zx48k/ifempty4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifempty5.asm b/tests/functional/arch/zx48k/ifempty5.asm index 514f3a704..fcc951a11 100644 --- a/tests/functional/arch/zx48k/ifempty5.asm +++ b/tests/functional/arch/zx48k/ifempty5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifempty6.asm b/tests/functional/arch/zx48k/ifempty6.asm index 1abe9d319..c969ab8de 100644 --- a/tests/functional/arch/zx48k/ifempty6.asm +++ b/tests/functional/arch/zx48k/ifempty6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifemptyelse.asm b/tests/functional/arch/zx48k/ifemptyelse.asm index 419e92768..8270dc936 100644 --- a/tests/functional/arch/zx48k/ifemptyelse.asm +++ b/tests/functional/arch/zx48k/ifemptyelse.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifemptylabel1.asm b/tests/functional/arch/zx48k/ifemptylabel1.asm index a4870201b..3813dde91 100644 --- a/tests/functional/arch/zx48k/ifemptylabel1.asm +++ b/tests/functional/arch/zx48k/ifemptylabel1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifemptylabel2.asm b/tests/functional/arch/zx48k/ifemptylabel2.asm index 4511b1caf..bd525cf8e 100644 --- a/tests/functional/arch/zx48k/ifemptylabel2.asm +++ b/tests/functional/arch/zx48k/ifemptylabel2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifemptyprogelse.asm b/tests/functional/arch/zx48k/ifemptyprogelse.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/ifemptyprogelse.asm +++ b/tests/functional/arch/zx48k/ifemptyprogelse.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/iffor.asm b/tests/functional/arch/zx48k/iffor.asm index b85315f32..9a0aa92b9 100644 --- a/tests/functional/arch/zx48k/iffor.asm +++ b/tests/functional/arch/zx48k/iffor.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -80,6 +78,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 37 "iffor.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 37 "arch/zx48k/iffor.bas" END diff --git a/tests/functional/arch/zx48k/iffor1.asm b/tests/functional/arch/zx48k/iffor1.asm index 5a7f2ddcc..d605471b8 100644 --- a/tests/functional/arch/zx48k/iffor1.asm +++ b/tests/functional/arch/zx48k/iffor1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -80,6 +78,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 37 "iffor1.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 37 "arch/zx48k/iffor1.bas" END diff --git a/tests/functional/arch/zx48k/iffor2.asm b/tests/functional/arch/zx48k/iffor2.asm index f5e5759bd..fd443cb18 100644 --- a/tests/functional/arch/zx48k/iffor2.asm +++ b/tests/functional/arch/zx48k/iffor2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -77,8 +75,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -100,6 +98,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 57 "iffor2.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 57 "arch/zx48k/iffor2.bas" END diff --git a/tests/functional/arch/zx48k/ififelseelse1.asm b/tests/functional/arch/zx48k/ififelseelse1.asm index 8b7d79074..c933720fc 100644 --- a/tests/functional/arch/zx48k/ififelseelse1.asm +++ b/tests/functional/arch/zx48k/ififelseelse1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,8 +64,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -89,6 +87,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 46 "ififelseelse1.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 46 "arch/zx48k/ififelseelse1.bas" END diff --git a/tests/functional/arch/zx48k/ififelseelse2.asm b/tests/functional/arch/zx48k/ififelseelse2.asm index 781e45dc8..37e538d32 100644 --- a/tests/functional/arch/zx48k/ififelseelse2.asm +++ b/tests/functional/arch/zx48k/ififelseelse2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,8 +64,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -89,6 +87,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 46 "ififelseelse2.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 46 "arch/zx48k/ififelseelse2.bas" END diff --git a/tests/functional/arch/zx48k/ifline.asm b/tests/functional/arch/zx48k/ifline.asm index 06a6b8d75..d0729fb6f 100644 --- a/tests/functional/arch/zx48k/ifline.asm +++ b/tests/functional/arch/zx48k/ifline.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifthen.asm b/tests/functional/arch/zx48k/ifthen.asm index 6c446874e..01f104b4b 100644 --- a/tests/functional/arch/zx48k/ifthen.asm +++ b/tests/functional/arch/zx48k/ifthen.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -57,8 +55,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -80,6 +78,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 37 "ifthen.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 37 "arch/zx48k/ifthen.bas" END diff --git a/tests/functional/arch/zx48k/ifthencosntcoendif.asm b/tests/functional/arch/zx48k/ifthencosntcoendif.asm index 77e82bb64..1ac09c18e 100644 --- a/tests/functional/arch/zx48k/ifthencosntcoendif.asm +++ b/tests/functional/arch/zx48k/ifthencosntcoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifthenelse.asm b/tests/functional/arch/zx48k/ifthenelse.asm index 54c0e6ce2..d50241315 100644 --- a/tests/functional/arch/zx48k/ifthenelse.asm +++ b/tests/functional/arch/zx48k/ifthenelse.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,8 +63,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -88,6 +86,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 45 "ifthenelse.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 45 "arch/zx48k/ifthenelse.bas" END diff --git a/tests/functional/arch/zx48k/ifthenelseif.asm b/tests/functional/arch/zx48k/ifthenelseif.asm index cfd22e398..292dcc9a5 100644 --- a/tests/functional/arch/zx48k/ifthenelseif.asm +++ b/tests/functional/arch/zx48k/ifthenelseif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -132,8 +130,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -155,6 +153,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 112 "ifthenelseif.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 112 "arch/zx48k/ifthenelseif.bas" END diff --git a/tests/functional/arch/zx48k/ifthenlblsntcoendif.asm b/tests/functional/arch/zx48k/ifthenlblsntcoendif.asm index bafe32e6f..3df60ee56 100644 --- a/tests/functional/arch/zx48k/ifthenlblsntcoendif.asm +++ b/tests/functional/arch/zx48k/ifthenlblsntcoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifthensntcoelsecocoendif.asm b/tests/functional/arch/zx48k/ifthensntcoelsecocoendif.asm index faa3b1ddb..b036c7db2 100644 --- a/tests/functional/arch/zx48k/ifthensntcoelsecocoendif.asm +++ b/tests/functional/arch/zx48k/ifthensntcoelsecocoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -72,6 +70,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 29 "ifthensntcoelsecocoendif.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 29 "arch/zx48k/ifthensntcoelsecocoendif.bas" END diff --git a/tests/functional/arch/zx48k/ifthensntcoelsecoendif.asm b/tests/functional/arch/zx48k/ifthensntcoelsecoendif.asm index 07d99785e..8cfc5fe8e 100644 --- a/tests/functional/arch/zx48k/ifthensntcoelsecoendif.asm +++ b/tests/functional/arch/zx48k/ifthensntcoelsecoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,8 +47,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -72,6 +70,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 29 "ifthensntcoelsecoendif.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 29 "arch/zx48k/ifthensntcoelsecoendif.bas" END diff --git a/tests/functional/arch/zx48k/ifthensntcoelselblco.asm b/tests/functional/arch/zx48k/ifthensntcoelselblco.asm index e2c5d829f..17b39ff82 100644 --- a/tests/functional/arch/zx48k/ifthensntcoelselblco.asm +++ b/tests/functional/arch/zx48k/ifthensntcoelselblco.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifthensntcoelselblcoco.asm b/tests/functional/arch/zx48k/ifthensntcoelselblcoco.asm index e2c5d829f..17b39ff82 100644 --- a/tests/functional/arch/zx48k/ifthensntcoelselblcoco.asm +++ b/tests/functional/arch/zx48k/ifthensntcoelselblcoco.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifthensntcoendif.asm b/tests/functional/arch/zx48k/ifthensntcoendif.asm index 77e82bb64..1ac09c18e 100644 --- a/tests/functional/arch/zx48k/ifthensntcoendif.asm +++ b/tests/functional/arch/zx48k/ifthensntcoendif.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ifwhile.asm b/tests/functional/arch/zx48k/ifwhile.asm index 17506867e..1fee234d5 100644 --- a/tests/functional/arch/zx48k/ifwhile.asm +++ b/tests/functional/arch/zx48k/ifwhile.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -53,8 +51,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -76,6 +74,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 33 "ifwhile.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 33 "arch/zx48k/ifwhile.bas" END diff --git a/tests/functional/arch/zx48k/ifwhile1.asm b/tests/functional/arch/zx48k/ifwhile1.asm index cbf27dc60..e1239a8ad 100644 --- a/tests/functional/arch/zx48k/ifwhile1.asm +++ b/tests/functional/arch/zx48k/ifwhile1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -53,8 +51,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -76,6 +74,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 33 "ifwhile1.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 33 "arch/zx48k/ifwhile1.bas" END diff --git a/tests/functional/arch/zx48k/ifwhilex.asm b/tests/functional/arch/zx48k/ifwhilex.asm index 9916ae102..cf11c0ecd 100644 --- a/tests/functional/arch/zx48k/ifwhilex.asm +++ b/tests/functional/arch/zx48k/ifwhilex.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/in0.asm b/tests/functional/arch/zx48k/in0.asm index 35b8e855c..f895125c5 100644 --- a/tests/functional/arch/zx48k/in0.asm +++ b/tests/functional/arch/zx48k/in0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/init_with_dot.asm b/tests/functional/arch/zx48k/init_with_dot.asm index e1222e871..0970605e6 100644 --- a/tests/functional/arch/zx48k/init_with_dot.asm +++ b/tests/functional/arch/zx48k/init_with_dot.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call A_LABEL.DOT jp .core.__MAIN_PROGRAM__ @@ -21,9 +19,9 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "init_with_dot.bas" +#line 2 "arch/zx48k/init_with_dot.bas" A_LABEL.DOT: -#line 9 "init_with_dot.bas" +#line 9 "arch/zx48k/init_with_dot.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/inkey.asm b/tests/functional/arch/zx48k/inkey.asm index a2cd0de0f..eff49c157 100644 --- a/tests/functional/arch/zx48k/inkey.asm +++ b/tests/functional/arch/zx48k/inkey.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/inktemp.asm b/tests/functional/arch/zx48k/inktemp.asm index 68ef1b4d3..9792df175 100644 --- a/tests/functional/arch/zx48k/inktemp.asm +++ b/tests/functional/arch/zx48k/inktemp.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/keyword_arg0.asm b/tests/functional/arch/zx48k/keyword_arg0.asm index 3170104e7..5c7160628 100644 --- a/tests/functional/arch/zx48k/keyword_arg0.asm +++ b/tests/functional/arch/zx48k/keyword_arg0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/keyword_arg2.asm b/tests/functional/arch/zx48k/keyword_arg2.asm index 0921fe95e..c46021b06 100644 --- a/tests/functional/arch/zx48k/keyword_arg2.asm +++ b/tests/functional/arch/zx48k/keyword_arg2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_decl0.asm b/tests/functional/arch/zx48k/label_decl0.asm index e8b53f627..dc8dbafff 100644 --- a/tests/functional/arch/zx48k/label_decl0.asm +++ b/tests/functional/arch/zx48k/label_decl0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_decl3.asm b/tests/functional/arch/zx48k/label_decl3.asm index 706f30e7e..c10f4c804 100644 --- a/tests/functional/arch/zx48k/label_decl3.asm +++ b/tests/functional/arch/zx48k/label_decl3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -85,5 +83,5 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 31 "label_decl3.bas" +#line 31 "arch/zx48k/label_decl3.bas" END diff --git a/tests/functional/arch/zx48k/label_sent.asm b/tests/functional/arch/zx48k/label_sent.asm index bff7b1b6c..f9f0de0a9 100644 --- a/tests/functional/arch/zx48k/label_sent.asm +++ b/tests/functional/arch/zx48k/label_sent.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_sent1.asm b/tests/functional/arch/zx48k/label_sent1.asm index 5fa22f4c3..39b03b991 100644 --- a/tests/functional/arch/zx48k/label_sent1.asm +++ b/tests/functional/arch/zx48k/label_sent1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -39,12 +37,12 @@ ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/border.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/border.asm" ; __FASTCALL__ Routine to change de border ; Parameter (color) specified in A register push namespace core BORDER EQU 229Bh pop namespace ; Nothing to do! (Directly from the ZX Spectrum ROM) -#line 21 "label_sent1.bas" +#line 21 "arch/zx48k/label_sent1.bas" END diff --git a/tests/functional/arch/zx48k/label_sent2.asm b/tests/functional/arch/zx48k/label_sent2.asm index 9b002d826..a440304e1 100644 --- a/tests/functional/arch/zx48k/label_sent2.asm +++ b/tests/functional/arch/zx48k/label_sent2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_sent3.asm b/tests/functional/arch/zx48k/label_sent3.asm index 4a5607523..7a2aefc60 100644 --- a/tests/functional/arch/zx48k/label_sent3.asm +++ b/tests/functional/arch/zx48k/label_sent3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_sent4.asm b/tests/functional/arch/zx48k/label_sent4.asm index 280069958..ec315bc40 100644 --- a/tests/functional/arch/zx48k/label_sent4.asm +++ b/tests/functional/arch/zx48k/label_sent4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/label_sent5.asm b/tests/functional/arch/zx48k/label_sent5.asm index 279951cd1..c77d89b72 100644 --- a/tests/functional/arch/zx48k/label_sent5.asm +++ b/tests/functional/arch/zx48k/label_sent5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/labeldecl.asm b/tests/functional/arch/zx48k/labeldecl.asm index 0511560bd..18e8ad58f 100644 --- a/tests/functional/arch/zx48k/labeldecl.asm +++ b/tests/functional/arch/zx48k/labeldecl.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/labelsent.asm b/tests/functional/arch/zx48k/labelsent.asm index 70d9e9a2b..d78f299e5 100644 --- a/tests/functional/arch/zx48k/labelsent.asm +++ b/tests/functional/arch/zx48k/labelsent.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -56,8 +54,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -96,7 +94,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -114,8 +112,8 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 34 "labelsent.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 34 "arch/zx48k/labelsent.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -142,8 +140,8 @@ __FP_PUSH_REV: exx ret pop namespace -#line 35 "labelsent.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 35 "arch/zx48k/labelsent.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -171,5 +169,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 36 "labelsent.bas" +#line 36 "arch/zx48k/labelsent.bas" END diff --git a/tests/functional/arch/zx48k/lbound0.asm b/tests/functional/arch/zx48k/lbound0.asm index 438a58fcf..d56c13b49 100644 --- a/tests/functional/arch/zx48k/lbound0.asm +++ b/tests/functional/arch/zx48k/lbound0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lbound1.asm b/tests/functional/arch/zx48k/lbound1.asm index 438a58fcf..d56c13b49 100644 --- a/tests/functional/arch/zx48k/lbound1.asm +++ b/tests/functional/arch/zx48k/lbound1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lbound10.asm b/tests/functional/arch/zx48k/lbound10.asm index f19dda1dc..f4e5954a6 100644 --- a/tests/functional/arch/zx48k/lbound10.asm +++ b/tests/functional/arch/zx48k/lbound10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -520,7 +518,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 80 "arch/zx48k/lbound10.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound11.asm b/tests/functional/arch/zx48k/lbound11.asm index e0dd42f5b..33792028f 100644 --- a/tests/functional/arch/zx48k/lbound11.asm +++ b/tests/functional/arch/zx48k/lbound11.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -536,7 +534,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 96 "arch/zx48k/lbound11.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound12.asm b/tests/functional/arch/zx48k/lbound12.asm index 040c9b770..04098b8bf 100644 --- a/tests/functional/arch/zx48k/lbound12.asm +++ b/tests/functional/arch/zx48k/lbound12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lbound13.asm b/tests/functional/arch/zx48k/lbound13.asm index afea9981e..f0ef80772 100644 --- a/tests/functional/arch/zx48k/lbound13.asm +++ b/tests/functional/arch/zx48k/lbound13.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -288,7 +286,7 @@ ARRAY_SIZE_LOOP: ENDP pop namespace #line 91 "arch/zx48k/lbound13.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound2.asm b/tests/functional/arch/zx48k/lbound2.asm index a130f7f99..97d33b619 100644 --- a/tests/functional/arch/zx48k/lbound2.asm +++ b/tests/functional/arch/zx48k/lbound2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound3.asm b/tests/functional/arch/zx48k/lbound3.asm index fb3e9b45b..dae3a782e 100644 --- a/tests/functional/arch/zx48k/lbound3.asm +++ b/tests/functional/arch/zx48k/lbound3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lbound4.asm b/tests/functional/arch/zx48k/lbound4.asm index e49070bf8..5d8feea85 100644 --- a/tests/functional/arch/zx48k/lbound4.asm +++ b/tests/functional/arch/zx48k/lbound4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound5.asm b/tests/functional/arch/zx48k/lbound5.asm index dda9d7e7c..87a357f50 100644 --- a/tests/functional/arch/zx48k/lbound5.asm +++ b/tests/functional/arch/zx48k/lbound5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound6.asm b/tests/functional/arch/zx48k/lbound6.asm index 6bc8425b6..3f16f9a09 100644 --- a/tests/functional/arch/zx48k/lbound6.asm +++ b/tests/functional/arch/zx48k/lbound6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -504,7 +502,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 64 "arch/zx48k/lbound6.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound7.asm b/tests/functional/arch/zx48k/lbound7.asm index a23425f04..bf4090e66 100644 --- a/tests/functional/arch/zx48k/lbound7.asm +++ b/tests/functional/arch/zx48k/lbound7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -100,7 +98,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound8.asm b/tests/functional/arch/zx48k/lbound8.asm index 4234474aa..ab0673bbc 100644 --- a/tests/functional/arch/zx48k/lbound8.asm +++ b/tests/functional/arch/zx48k/lbound8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -95,7 +93,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lbound9.asm b/tests/functional/arch/zx48k/lbound9.asm index b5c6fe479..ccc0d9543 100644 --- a/tests/functional/arch/zx48k/lbound9.asm +++ b/tests/functional/arch/zx48k/lbound9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -111,7 +109,7 @@ _test1__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/lcd3.asm b/tests/functional/arch/zx48k/lcd3.asm index 87abf78b3..85ee705fb 100644 --- a/tests/functional/arch/zx48k/lcd3.asm +++ b/tests/functional/arch/zx48k/lcd3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lcd5.asm b/tests/functional/arch/zx48k/lcd5.asm index 13daa2019..e7a25dcfa 100644 --- a/tests/functional/arch/zx48k/lcd5.asm +++ b/tests/functional/arch/zx48k/lcd5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lcd6.asm b/tests/functional/arch/zx48k/lcd6.asm index 60da02e78..6479aed77 100644 --- a/tests/functional/arch/zx48k/lcd6.asm +++ b/tests/functional/arch/zx48k/lcd6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lcd7.asm b/tests/functional/arch/zx48k/lcd7.asm index 413539962..44903fc6e 100644 --- a/tests/functional/arch/zx48k/lcd7.asm +++ b/tests/functional/arch/zx48k/lcd7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lcd8.asm b/tests/functional/arch/zx48k/lcd8.asm index f6a82200c..37eeed40e 100644 --- a/tests/functional/arch/zx48k/lcd8.asm +++ b/tests/functional/arch/zx48k/lcd8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lcd9.asm b/tests/functional/arch/zx48k/lcd9.asm index bc10eb0df..620e27d29 100644 --- a/tests/functional/arch/zx48k/lcd9.asm +++ b/tests/functional/arch/zx48k/lcd9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/lcd_crash.asm b/tests/functional/arch/zx48k/lcd_crash.asm index 8cf193b54..dc8f31b93 100644 --- a/tests/functional/arch/zx48k/lcd_crash.asm +++ b/tests/functional/arch/zx48k/lcd_crash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -145,7 +143,7 @@ _settile__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mul8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul8.asm" push namespace core __MUL8: ; Performs 8bit x 8bit multiplication PROC diff --git a/tests/functional/arch/zx48k/lef.asm b/tests/functional/arch/zx48k/lef.asm index 88313f9bb..ff6c53a3c 100644 --- a/tests/functional/arch/zx48k/lef.asm +++ b/tests/functional/arch/zx48k/lef.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lef16.asm b/tests/functional/arch/zx48k/lef16.asm index 0e27ec75a..b77225a20 100644 --- a/tests/functional/arch/zx48k/lef16.asm +++ b/tests/functional/arch/zx48k/lef16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -100,8 +98,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -127,7 +125,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/lei32.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei32.asm" push namespace core __LEI32: ; Test 32 bit values Top of the stack <= HL,DE PROC @@ -157,8 +155,8 @@ checkParity: ret ENDP pop namespace -#line 70 "lef16.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 70 "arch/zx48k/lef16.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -175,5 +173,5 @@ __SWAP32: push bc ret pop namespace -#line 71 "lef16.bas" +#line 71 "arch/zx48k/lef16.bas" END diff --git a/tests/functional/arch/zx48k/lei16.asm b/tests/functional/arch/zx48k/lei16.asm index 1373ec47b..e3e09aac4 100644 --- a/tests/functional/arch/zx48k/lei16.asm +++ b/tests/functional/arch/zx48k/lei16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -80,7 +78,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lei16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei16.asm" push namespace core __LEI16: PROC diff --git a/tests/functional/arch/zx48k/lei32.asm b/tests/functional/arch/zx48k/lei32.asm index fa45e17ff..a2a1da1c6 100644 --- a/tests/functional/arch/zx48k/lei32.asm +++ b/tests/functional/arch/zx48k/lei32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -113,8 +111,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -140,7 +138,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/lei32.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei32.asm" push namespace core __LEI32: ; Test 32 bit values Top of the stack <= HL,DE PROC @@ -170,8 +168,8 @@ checkParity: ret ENDP pop namespace -#line 83 "lei32.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 83 "arch/zx48k/lei32.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -188,5 +186,5 @@ __SWAP32: push bc ret pop namespace -#line 84 "lei32.bas" +#line 84 "arch/zx48k/lei32.bas" END diff --git a/tests/functional/arch/zx48k/lei8.asm b/tests/functional/arch/zx48k/lei8.asm index 84f3e9714..1115eed39 100644 --- a/tests/functional/arch/zx48k/lei8.asm +++ b/tests/functional/arch/zx48k/lei8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -87,5 +85,5 @@ checkParity: ret ENDP pop namespace -#line 41 "lei8.bas" +#line 41 "arch/zx48k/lei8.bas" END diff --git a/tests/functional/arch/zx48k/let0.asm b/tests/functional/arch/zx48k/let0.asm index d52f1e4bc..644aad51a 100644 --- a/tests/functional/arch/zx48k/let0.asm +++ b/tests/functional/arch/zx48k/let0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/let_array_local_const0.asm b/tests/functional/arch/zx48k/let_array_local_const0.asm index 2ba0cb310..edc152cb7 100644 --- a/tests/functional/arch/zx48k/let_array_local_const0.asm +++ b/tests/functional/arch/zx48k/let_array_local_const0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr.asm b/tests/functional/arch/zx48k/let_array_substr.asm index d494edaef..e31d3b3ae 100644 --- a/tests/functional/arch/zx48k/let_array_substr.asm +++ b/tests/functional/arch/zx48k/let_array_substr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -117,7 +115,7 @@ _a.__DATA__: DEFB 4Ch DEFB 4Fh ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -178,8 +176,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -208,7 +206,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -236,7 +234,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -255,7 +253,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -263,7 +261,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/let_array_substr1.asm b/tests/functional/arch/zx48k/let_array_substr1.asm index 56d24349a..b5a56c728 100644 --- a/tests/functional/arch/zx48k/let_array_substr1.asm +++ b/tests/functional/arch/zx48k/let_array_substr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -117,7 +115,7 @@ _a.__DATA__: DEFB 4Ch DEFB 4Fh ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -178,8 +176,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -208,7 +206,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -236,7 +234,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -255,7 +253,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -263,7 +261,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/let_array_substr10.asm b/tests/functional/arch/zx48k/let_array_substr10.asm index fe5e593af..3924a70b4 100644 --- a/tests/functional/arch/zx48k/let_array_substr10.asm +++ b/tests/functional/arch/zx48k/let_array_substr10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr11.asm b/tests/functional/arch/zx48k/let_array_substr11.asm index c05c8916f..e99d615f6 100644 --- a/tests/functional/arch/zx48k/let_array_substr11.asm +++ b/tests/functional/arch/zx48k/let_array_substr11.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr12.asm b/tests/functional/arch/zx48k/let_array_substr12.asm index 8f8e463cb..7ef400c9f 100644 --- a/tests/functional/arch/zx48k/let_array_substr12.asm +++ b/tests/functional/arch/zx48k/let_array_substr12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr13.asm b/tests/functional/arch/zx48k/let_array_substr13.asm index a548c71a4..c9ccb7bd2 100644 --- a/tests/functional/arch/zx48k/let_array_substr13.asm +++ b/tests/functional/arch/zx48k/let_array_substr13.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr2.asm b/tests/functional/arch/zx48k/let_array_substr2.asm index fc8981926..9aad75d2b 100644 --- a/tests/functional/arch/zx48k/let_array_substr2.asm +++ b/tests/functional/arch/zx48k/let_array_substr2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr3.asm b/tests/functional/arch/zx48k/let_array_substr3.asm index f84fe2142..68a549b47 100644 --- a/tests/functional/arch/zx48k/let_array_substr3.asm +++ b/tests/functional/arch/zx48k/let_array_substr3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr5.asm b/tests/functional/arch/zx48k/let_array_substr5.asm index 4122067ef..c750d5ed7 100644 --- a/tests/functional/arch/zx48k/let_array_substr5.asm +++ b/tests/functional/arch/zx48k/let_array_substr5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -117,7 +115,7 @@ _a.__DATA__: DEFB 4Ch DEFB 4Fh ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -178,8 +176,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -208,7 +206,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -236,7 +234,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -255,7 +253,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -263,7 +261,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/let_array_substr7.asm b/tests/functional/arch/zx48k/let_array_substr7.asm index 1651c0018..e5acff608 100644 --- a/tests/functional/arch/zx48k/let_array_substr7.asm +++ b/tests/functional/arch/zx48k/let_array_substr7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_array_substr9.asm b/tests/functional/arch/zx48k/let_array_substr9.asm index 00ff22af3..69757ab5d 100644 --- a/tests/functional/arch/zx48k/let_array_substr9.asm +++ b/tests/functional/arch/zx48k/let_array_substr9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/let_not_bool.asm b/tests/functional/arch/zx48k/let_not_bool.asm index 21f656701..3ea8c480a 100644 --- a/tests/functional/arch/zx48k/let_not_bool.asm +++ b/tests/functional/arch/zx48k/let_not_bool.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/let_uminus_bool.asm b/tests/functional/arch/zx48k/let_uminus_bool.asm index 94a59f760..e7930cdff 100644 --- a/tests/functional/arch/zx48k/let_uminus_bool.asm +++ b/tests/functional/arch/zx48k/let_uminus_bool.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/letarrstr_substr0.asm b/tests/functional/arch/zx48k/letarrstr_substr0.asm index 63e89665c..ddbd29358 100644 --- a/tests/functional/arch/zx48k/letarrstr_substr0.asm +++ b/tests/functional/arch/zx48k/letarrstr_substr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/letarrstr_substr1.asm b/tests/functional/arch/zx48k/letarrstr_substr1.asm index 89743d2d7..25791da92 100644 --- a/tests/functional/arch/zx48k/letarrstr_substr1.asm +++ b/tests/functional/arch/zx48k/letarrstr_substr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/letsubstr_local.asm b/tests/functional/arch/zx48k/letsubstr_local.asm index 8a6d8f0f1..0ee8e3e06 100644 --- a/tests/functional/arch/zx48k/letsubstr_local.asm +++ b/tests/functional/arch/zx48k/letsubstr_local.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -96,7 +94,7 @@ _editStringFN__leave: DEFW 0001h DEFB 69h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -156,7 +154,7 @@ _editStringFN__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -263,7 +261,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -362,8 +360,8 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 71 "letsubstr_local.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 71 "arch/zx48k/letsubstr_local.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -483,9 +481,9 @@ __FREE_STR: ret ENDP pop namespace -#line 72 "letsubstr_local.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 72 "arch/zx48k/letsubstr_local.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -545,7 +543,7 @@ __FREE_STR: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -579,7 +577,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -610,9 +608,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -677,7 +675,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -714,8 +712,8 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 73 "letsubstr_local.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 73 "arch/zx48k/letsubstr_local.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication @@ -748,5 +746,5 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 74 "letsubstr_local.bas" +#line 74 "arch/zx48k/letsubstr_local.bas" END diff --git a/tests/functional/arch/zx48k/letsubstr_param_byref.asm b/tests/functional/arch/zx48k/letsubstr_param_byref.asm index 828f65d2f..4af6b7f6a 100644 --- a/tests/functional/arch/zx48k/letsubstr_param_byref.asm +++ b/tests/functional/arch/zx48k/letsubstr_param_byref.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -102,7 +100,7 @@ _editStringFN__leave: DEFW 0001h DEFB 69h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -162,7 +160,7 @@ _editStringFN__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -269,7 +267,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -368,8 +366,8 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 77 "letsubstr_param_byref.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 77 "arch/zx48k/letsubstr_param_byref.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -489,9 +487,9 @@ __FREE_STR: ret ENDP pop namespace -#line 78 "letsubstr_param_byref.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 78 "arch/zx48k/letsubstr_param_byref.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -551,7 +549,7 @@ __FREE_STR: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -585,7 +583,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -616,9 +614,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -683,7 +681,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -720,8 +718,8 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 79 "letsubstr_param_byref.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 79 "arch/zx48k/letsubstr_param_byref.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication @@ -754,5 +752,5 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 80 "letsubstr_param_byref.bas" +#line 80 "arch/zx48k/letsubstr_param_byref.bas" END diff --git a/tests/functional/arch/zx48k/letsubstr_param_byval.asm b/tests/functional/arch/zx48k/letsubstr_param_byval.asm index 1b652d427..8aba6124f 100644 --- a/tests/functional/arch/zx48k/letsubstr_param_byval.asm +++ b/tests/functional/arch/zx48k/letsubstr_param_byval.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -98,7 +96,7 @@ _editStringFN__leave: DEFW 0001h DEFB 69h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -158,7 +156,7 @@ _editStringFN__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -265,7 +263,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -364,8 +362,8 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 73 "letsubstr_param_byval.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 73 "arch/zx48k/letsubstr_param_byval.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -485,9 +483,9 @@ __FREE_STR: ret ENDP pop namespace -#line 74 "letsubstr_param_byval.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 74 "arch/zx48k/letsubstr_param_byval.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -547,7 +545,7 @@ __FREE_STR: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -581,7 +579,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -612,9 +610,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -679,7 +677,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -716,8 +714,8 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 75 "letsubstr_param_byval.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 75 "arch/zx48k/letsubstr_param_byval.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication @@ -750,5 +748,5 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 76 "letsubstr_param_byval.bas" +#line 76 "arch/zx48k/letsubstr_param_byval.bas" END diff --git a/tests/functional/arch/zx48k/leu16.asm b/tests/functional/arch/zx48k/leu16.asm index a2f7bad97..bb4d92cca 100644 --- a/tests/functional/arch/zx48k/leu16.asm +++ b/tests/functional/arch/zx48k/leu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/leu32.asm b/tests/functional/arch/zx48k/leu32.asm index eca79b558..ac9121371 100644 --- a/tests/functional/arch/zx48k/leu32.asm +++ b/tests/functional/arch/zx48k/leu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/leu8.asm b/tests/functional/arch/zx48k/leu8.asm index 317e38b49..e5a4c2ac6 100644 --- a/tests/functional/arch/zx48k/leu8.asm +++ b/tests/functional/arch/zx48k/leu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/line_macro.asm b/tests/functional/arch/zx48k/line_macro.asm index 0206c071f..c52c08da5 100644 --- a/tests/functional/arch/zx48k/line_macro.asm +++ b/tests/functional/arch/zx48k/line_macro.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/llc.asm b/tests/functional/arch/zx48k/llc.asm index ac3ac8a6c..784f47e6f 100644 --- a/tests/functional/arch/zx48k/llc.asm +++ b/tests/functional/arch/zx48k/llc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -55,7 +53,7 @@ _r: DEFW 0001h DEFB 2Eh ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -64,7 +62,7 @@ _r: ; A Register => 0 if HL is not freed from memory ; => Not 0 if HL must be freed from memory on exit ; TOP -3 B$ address -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -124,7 +122,7 @@ _r: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -231,7 +229,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -330,7 +328,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 11 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 11 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" push namespace core __LETSUBSTR: PROC @@ -442,5 +440,5 @@ __FREE_STR: ret ENDP pop namespace -#line 30 "llc.bas" +#line 30 "arch/zx48k/llc.bas" END diff --git a/tests/functional/arch/zx48k/load02.asm b/tests/functional/arch/zx48k/load02.asm index 318738df6..eac468ac5 100644 --- a/tests/functional/arch/zx48k/load02.asm +++ b/tests/functional/arch/zx48k/load02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/load03.asm b/tests/functional/arch/zx48k/load03.asm index 8fcf7112c..55fbee86a 100644 --- a/tests/functional/arch/zx48k/load03.asm +++ b/tests/functional/arch/zx48k/load03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/loadstr.asm b/tests/functional/arch/zx48k/loadstr.asm index b7975ed40..cc5a1a35f 100644 --- a/tests/functional/arch/zx48k/loadstr.asm +++ b/tests/functional/arch/zx48k/loadstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -970,9 +968,7 @@ VAL: ; Computes VAL(a$) using ROM FP-CALC ;; Now put our error handler on ERR_SP ld hl, __VAL_ERROR push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp call STK_STO_S ; Enter it on the stack ld b, 1Dh ; "VAL" rst 28h ; ROM CALC diff --git a/tests/functional/arch/zx48k/loadu16ii.asm b/tests/functional/arch/zx48k/loadu16ii.asm index e83bb0ac0..1610e4d28 100644 --- a/tests/functional/arch/zx48k/loadu16ii.asm +++ b/tests/functional/arch/zx48k/loadu16ii.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/local_array_with_bounds0.asm b/tests/functional/arch/zx48k/local_array_with_bounds0.asm index 17644f76d..36490cf1d 100644 --- a/tests/functional/arch/zx48k/local_array_with_bounds0.asm +++ b/tests/functional/arch/zx48k/local_array_with_bounds0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -573,7 +571,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 77 "arch/zx48k/local_array_with_bounds0.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/local_array_with_bounds1.asm b/tests/functional/arch/zx48k/local_array_with_bounds1.asm index e46799939..0a8a15854 100644 --- a/tests/functional/arch/zx48k/local_array_with_bounds1.asm +++ b/tests/functional/arch/zx48k/local_array_with_bounds1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -571,7 +569,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 75 "arch/zx48k/local_array_with_bounds1.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/local_float_array0.asm b/tests/functional/arch/zx48k/local_float_array0.asm index 3ea077d48..591a42d62 100644 --- a/tests/functional/arch/zx48k/local_float_array0.asm +++ b/tests/functional/arch/zx48k/local_float_array0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_float_array1.asm b/tests/functional/arch/zx48k/local_float_array1.asm index 9480b8940..8c12cd16a 100644 --- a/tests/functional/arch/zx48k/local_float_array1.asm +++ b/tests/functional/arch/zx48k/local_float_array1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_str_array0.asm b/tests/functional/arch/zx48k/local_str_array0.asm index b05f3ccf8..3a10dd5c3 100644 --- a/tests/functional/arch/zx48k/local_str_array0.asm +++ b/tests/functional/arch/zx48k/local_str_array0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_str_array1.asm b/tests/functional/arch/zx48k/local_str_array1.asm index 03baa8673..774b6e4d1 100644 --- a/tests/functional/arch/zx48k/local_str_array1.asm +++ b/tests/functional/arch/zx48k/local_str_array1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_str_array2.asm b/tests/functional/arch/zx48k/local_str_array2.asm index 795b067d6..c3fdaed7f 100644 --- a/tests/functional/arch/zx48k/local_str_array2.asm +++ b/tests/functional/arch/zx48k/local_str_array2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_str_array3.asm b/tests/functional/arch/zx48k/local_str_array3.asm index cc28ba333..3dd129d4d 100644 --- a/tests/functional/arch/zx48k/local_str_array3.asm +++ b/tests/functional/arch/zx48k/local_str_array3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_u16_array0.asm b/tests/functional/arch/zx48k/local_u16_array0.asm index 4c7030443..5cc467b0d 100644 --- a/tests/functional/arch/zx48k/local_u16_array0.asm +++ b/tests/functional/arch/zx48k/local_u16_array0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_u16_array1.asm b/tests/functional/arch/zx48k/local_u16_array1.asm index b14c44763..0ed211b77 100644 --- a/tests/functional/arch/zx48k/local_u16_array1.asm +++ b/tests/functional/arch/zx48k/local_u16_array1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_u16_array2.asm b/tests/functional/arch/zx48k/local_u16_array2.asm index 3dad2b874..f6526b41c 100644 --- a/tests/functional/arch/zx48k/local_u16_array2.asm +++ b/tests/functional/arch/zx48k/local_u16_array2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/local_u16_array3.asm b/tests/functional/arch/zx48k/local_u16_array3.asm index 8e07d5651..87e44d5f9 100644 --- a/tests/functional/arch/zx48k/local_u16_array3.asm +++ b/tests/functional/arch/zx48k/local_u16_array3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/localbyref.asm b/tests/functional/arch/zx48k/localbyref.asm index b6dcb66d4..35a010ee0 100644 --- a/tests/functional/arch/zx48k/localbyref.asm +++ b/tests/functional/arch/zx48k/localbyref.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltee1.asm b/tests/functional/arch/zx48k/ltee1.asm index b9ddf319c..6ac2afc5a 100644 --- a/tests/functional/arch/zx48k/ltee1.asm +++ b/tests/functional/arch/zx48k/ltee1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/ltee10.asm b/tests/functional/arch/zx48k/ltee10.asm index a7f1ad571..31a169d6c 100644 --- a/tests/functional/arch/zx48k/ltee10.asm +++ b/tests/functional/arch/zx48k/ltee10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/ltee3.asm b/tests/functional/arch/zx48k/ltee3.asm index 35799e73c..cc9993eeb 100644 --- a/tests/functional/arch/zx48k/ltee3.asm +++ b/tests/functional/arch/zx48k/ltee3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -73,7 +71,7 @@ _test__leave: DEFB 6Eh DEFB 67h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -133,7 +131,7 @@ _test__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -240,7 +238,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -339,9 +337,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 50 "ltee3.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 50 "arch/zx48k/ltee3.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -401,7 +399,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -435,7 +433,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -466,9 +464,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -533,7 +531,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -570,5 +568,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 51 "ltee3.bas" +#line 51 "arch/zx48k/ltee3.bas" END diff --git a/tests/functional/arch/zx48k/ltee4.asm b/tests/functional/arch/zx48k/ltee4.asm index 3ec8724db..aa74557fb 100644 --- a/tests/functional/arch/zx48k/ltee4.asm +++ b/tests/functional/arch/zx48k/ltee4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltee5.asm b/tests/functional/arch/zx48k/ltee5.asm index 71110255e..87d61903f 100644 --- a/tests/functional/arch/zx48k/ltee5.asm +++ b/tests/functional/arch/zx48k/ltee5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/ltee6.asm b/tests/functional/arch/zx48k/ltee6.asm index 5d7ba6584..f64004b20 100644 --- a/tests/functional/arch/zx48k/ltee6.asm +++ b/tests/functional/arch/zx48k/ltee6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -80,7 +78,7 @@ _testglobal.__DATA__: DEFB 61h DEFB 6Ch ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -141,8 +139,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -171,7 +169,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -199,7 +197,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -218,7 +216,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -226,7 +224,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/ltee7.asm b/tests/functional/arch/zx48k/ltee7.asm index 22c06d4d9..0fefc0ad0 100644 --- a/tests/functional/arch/zx48k/ltee7.asm +++ b/tests/functional/arch/zx48k/ltee7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/ltee8.asm b/tests/functional/arch/zx48k/ltee8.asm index bb10fb9aa..96b5e4dac 100644 --- a/tests/functional/arch/zx48k/ltee8.asm +++ b/tests/functional/arch/zx48k/ltee8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltee9.asm b/tests/functional/arch/zx48k/ltee9.asm index dbe9697da..f08516af1 100644 --- a/tests/functional/arch/zx48k/ltee9.asm +++ b/tests/functional/arch/zx48k/ltee9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltf.asm b/tests/functional/arch/zx48k/ltf.asm index 926a11bd2..70618ec81 100644 --- a/tests/functional/arch/zx48k/ltf.asm +++ b/tests/functional/arch/zx48k/ltf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltf16.asm b/tests/functional/arch/zx48k/ltf16.asm index 71780c242..f5653ecd1 100644 --- a/tests/functional/arch/zx48k/ltf16.asm +++ b/tests/functional/arch/zx48k/ltf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -100,8 +98,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -127,7 +125,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/lti32.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti32.asm" push namespace core __LTI32: ; Test 32 bit values in Top of the stack < HLDE PROC @@ -149,8 +147,8 @@ checkParity: ret ENDP pop namespace -#line 70 "ltf16.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 70 "arch/zx48k/ltf16.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -167,5 +165,5 @@ __SWAP32: push bc ret pop namespace -#line 71 "ltf16.bas" +#line 71 "arch/zx48k/ltf16.bas" END diff --git a/tests/functional/arch/zx48k/lti16.asm b/tests/functional/arch/zx48k/lti16.asm index 1753b4470..20f1e070c 100644 --- a/tests/functional/arch/zx48k/lti16.asm +++ b/tests/functional/arch/zx48k/lti16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -80,7 +78,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lti16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti16.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -103,7 +101,7 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/lti16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti16.asm" push namespace core __LTI16: ; Test 8 bit values HL < DE ; Returns result in A: 0 = False, !0 = True diff --git a/tests/functional/arch/zx48k/lti32.asm b/tests/functional/arch/zx48k/lti32.asm index 447801182..1191e1c30 100644 --- a/tests/functional/arch/zx48k/lti32.asm +++ b/tests/functional/arch/zx48k/lti32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -113,7 +111,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lti32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti32.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL @@ -140,7 +138,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/lti32.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti32.asm" push namespace core __LTI32: ; Test 32 bit values in Top of the stack < HLDE PROC diff --git a/tests/functional/arch/zx48k/lti8.asm b/tests/functional/arch/zx48k/lti8.asm index bc2740d8a..99ff9e7fd 100644 --- a/tests/functional/arch/zx48k/lti8.asm +++ b/tests/functional/arch/zx48k/lti8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -88,6 +86,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/lti8.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" #line 41 "arch/zx48k/lti8.bas" END diff --git a/tests/functional/arch/zx48k/ltu16.asm b/tests/functional/arch/zx48k/ltu16.asm index f2ab53404..95eae02b5 100644 --- a/tests/functional/arch/zx48k/ltu16.asm +++ b/tests/functional/arch/zx48k/ltu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltu32.asm b/tests/functional/arch/zx48k/ltu32.asm index 88116f19b..2df86da0d 100644 --- a/tests/functional/arch/zx48k/ltu32.asm +++ b/tests/functional/arch/zx48k/ltu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ltu8.asm b/tests/functional/arch/zx48k/ltu8.asm index 48d1266cf..54d28511b 100644 --- a/tests/functional/arch/zx48k/ltu8.asm +++ b/tests/functional/arch/zx48k/ltu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/lvalsubstr_nolet.asm b/tests/functional/arch/zx48k/lvalsubstr_nolet.asm index 0b2718ccc..347d39649 100644 --- a/tests/functional/arch/zx48k/lvalsubstr_nolet.asm +++ b/tests/functional/arch/zx48k/lvalsubstr_nolet.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -55,7 +53,7 @@ _a: DEFW 0001h DEFB 2Eh ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" ; Substring assigment eg. LET a$(p0 TO p1) = "xxxx" ; HL = Start of string ; TOP of the stack -> p1 (16 bit, unsigned) @@ -64,7 +62,7 @@ _a: ; A Register => 0 if HL is not freed from memory ; => Not 0 if HL must be freed from memory on exit ; TOP -3 B$ address -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -124,7 +122,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -231,7 +229,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -330,7 +328,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 11 "/zxbasic/src/arch/zx48k/library-asm/letsubstr.asm" +#line 11 "/zxbasic/src/lib/arch/zx48k/runtime/letsubstr.asm" push namespace core __LETSUBSTR: PROC @@ -442,5 +440,5 @@ __FREE_STR: ret ENDP pop namespace -#line 30 "lvalsubstr_nolet.bas" +#line 30 "arch/zx48k/lvalsubstr_nolet.bas" END diff --git a/tests/functional/arch/zx48k/macro_under.asm b/tests/functional/arch/zx48k/macro_under.asm index 4c0f2d105..13b133c98 100644 --- a/tests/functional/arch/zx48k/macro_under.asm +++ b/tests/functional/arch/zx48k/macro_under.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_acs.asm b/tests/functional/arch/zx48k/math_acs.asm index 12d2b07a0..6de59c13a 100644 --- a/tests/functional/arch/zx48k/math_acs.asm +++ b/tests/functional/arch/zx48k/math_acs.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_asn.asm b/tests/functional/arch/zx48k/math_asn.asm index 927de6d7d..928f06ab5 100644 --- a/tests/functional/arch/zx48k/math_asn.asm +++ b/tests/functional/arch/zx48k/math_asn.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_atn.asm b/tests/functional/arch/zx48k/math_atn.asm index ec1ea7376..c3de5a394 100644 --- a/tests/functional/arch/zx48k/math_atn.asm +++ b/tests/functional/arch/zx48k/math_atn.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_cos.asm b/tests/functional/arch/zx48k/math_cos.asm index f932f4e66..badbf5038 100644 --- a/tests/functional/arch/zx48k/math_cos.asm +++ b/tests/functional/arch/zx48k/math_cos.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_exp.asm b/tests/functional/arch/zx48k/math_exp.asm index 3de1136be..a159f349a 100644 --- a/tests/functional/arch/zx48k/math_exp.asm +++ b/tests/functional/arch/zx48k/math_exp.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_ln.asm b/tests/functional/arch/zx48k/math_ln.asm index 99c1c76ae..5fb680815 100644 --- a/tests/functional/arch/zx48k/math_ln.asm +++ b/tests/functional/arch/zx48k/math_ln.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_sin.asm b/tests/functional/arch/zx48k/math_sin.asm index 382e8b371..a70eea64e 100644 --- a/tests/functional/arch/zx48k/math_sin.asm +++ b/tests/functional/arch/zx48k/math_sin.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_sqr.asm b/tests/functional/arch/zx48k/math_sqr.asm index e9c87b2e2..7b2616248 100644 --- a/tests/functional/arch/zx48k/math_sqr.asm +++ b/tests/functional/arch/zx48k/math_sqr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/math_tan.asm b/tests/functional/arch/zx48k/math_tan.asm index 28e82e5f1..bc6b18562 100644 --- a/tests/functional/arch/zx48k/math_tan.asm +++ b/tests/functional/arch/zx48k/math_tan.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/mcleod.asm b/tests/functional/arch/zx48k/mcleod.asm index 0c3ac54b9..3858282a3 100644 --- a/tests/functional/arch/zx48k/mcleod.asm +++ b/tests/functional/arch/zx48k/mcleod.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/mcleod2.asm b/tests/functional/arch/zx48k/mcleod2.asm index 3b72e8e52..3cc0bf639 100644 --- a/tests/functional/arch/zx48k/mcleod2.asm +++ b/tests/functional/arch/zx48k/mcleod2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/modf.asm b/tests/functional/arch/zx48k/modf.asm index fdc28f64d..cbafb31ee 100644 --- a/tests/functional/arch/zx48k/modf.asm +++ b/tests/functional/arch/zx48k/modf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -45,8 +43,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/modf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/modf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -85,7 +83,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/modf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/modf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -105,8 +103,8 @@ __MODF: ; MODULO defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 25 "zx48k/modf.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 25 "arch/zx48k/modf.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -133,8 +131,8 @@ __FP_PUSH_REV: exx ret pop namespace -#line 26 "zx48k/modf.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 26 "arch/zx48k/modf.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -162,5 +160,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 27 "zx48k/modf.bas" +#line 27 "arch/zx48k/modf.bas" END diff --git a/tests/functional/arch/zx48k/modf16.asm b/tests/functional/arch/zx48k/modf16.asm index dab1355f6..58d8b5294 100644 --- a/tests/functional/arch/zx48k/modf16.asm +++ b/tests/functional/arch/zx48k/modf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/modf16c.asm b/tests/functional/arch/zx48k/modf16c.asm index 49f50750c..2ee63ce42 100644 --- a/tests/functional/arch/zx48k/modf16c.asm +++ b/tests/functional/arch/zx48k/modf16c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -93,11 +91,11 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/modf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/modf16.asm" ; Computes A % B for fixed values -#line 1 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -122,7 +120,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -235,7 +233,7 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/divf16.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/divf16.asm" push namespace core __DIVF16: ; 16.16 Fixed point Division (signed) ; DE.HL = Dividend, Stack Top = Divisor @@ -305,9 +303,9 @@ __ENDF16DIV: ; Put the sign on the result ret z jp __NEG32 ; Negates DEHL and returns from there pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/modf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mulf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/_mul32.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/arith/modf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/_mul32.asm" ; Ripped from: http://www.andreadrian.de/oldcpu/z80_number_cruncher.html#moztocid784223 ; Used with permission. ; Multiplies 32x32 bit integer (DEHL x D'E'H'L') @@ -366,7 +364,7 @@ __LMULSTART: djnz __LMULLOOP ret ; result in h'l'hlb'c'ac pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/mulf16.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf16.asm" push namespace core __MULF16: ; ld a, d ; load sgn into a @@ -401,7 +399,7 @@ __ROUND_FIX: ; rounds a 64bit (32.32) fixed point number to 16.16 jp m, __NEG32 ; if negative, negates it ret pop namespace -#line 5 "/zxbasic/src/arch/zx48k/library-asm/modf16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/modf16.asm" push namespace core __MODF16: ; 16.16 Fixed point Division (signed) @@ -428,8 +426,8 @@ __MODF16: jp __MULF16 ; multiplies and return from there ENDP pop namespace -#line 63 "modf16c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 63 "arch/zx48k/modf16c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -446,5 +444,5 @@ __SWAP32: push bc ret pop namespace -#line 64 "modf16c.bas" +#line 64 "arch/zx48k/modf16c.bas" END diff --git a/tests/functional/arch/zx48k/modi32c.asm b/tests/functional/arch/zx48k/modi32c.asm index 0b3dd5b60..3cd51d0b9 100644 --- a/tests/functional/arch/zx48k/modi32c.asm +++ b/tests/functional/arch/zx48k/modi32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -96,8 +94,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -122,7 +120,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -235,8 +233,8 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 66 "modi32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 66 "arch/zx48k/modi32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -253,5 +251,5 @@ __SWAP32: push bc ret pop namespace -#line 67 "modi32c.bas" +#line 67 "arch/zx48k/modi32c.bas" END diff --git a/tests/functional/arch/zx48k/modi8.asm b/tests/functional/arch/zx48k/modi8.asm index 150f9b3e9..09eb25f2a 100644 --- a/tests/functional/arch/zx48k/modi8.asm +++ b/tests/functional/arch/zx48k/modi8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -130,5 +128,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 43 "modi8.bas" +#line 43 "arch/zx48k/modi8.bas" END diff --git a/tests/functional/arch/zx48k/modi8a.asm b/tests/functional/arch/zx48k/modi8a.asm index 5edc55c5b..644d5b12b 100644 --- a/tests/functional/arch/zx48k/modi8a.asm +++ b/tests/functional/arch/zx48k/modi8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,7 +41,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -108,5 +106,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 23 "modi8a.bas" +#line 23 "arch/zx48k/modi8a.bas" END diff --git a/tests/functional/arch/zx48k/modi8b.asm b/tests/functional/arch/zx48k/modi8b.asm index cb9ce4c8e..6ddb217d7 100644 --- a/tests/functional/arch/zx48k/modi8b.asm +++ b/tests/functional/arch/zx48k/modi8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,7 +47,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -114,5 +112,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 29 "modi8b.bas" +#line 29 "arch/zx48k/modi8b.bas" END diff --git a/tests/functional/arch/zx48k/modu32c.asm b/tests/functional/arch/zx48k/modu32c.asm index da6b75173..ca45e9c69 100644 --- a/tests/functional/arch/zx48k/modu32c.asm +++ b/tests/functional/arch/zx48k/modu32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -96,8 +94,8 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -122,7 +120,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -235,8 +233,8 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 66 "modu32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 66 "arch/zx48k/modu32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -253,5 +251,5 @@ __SWAP32: push bc ret pop namespace -#line 67 "modu32c.bas" +#line 67 "arch/zx48k/modu32c.bas" END diff --git a/tests/functional/arch/zx48k/modu8.asm b/tests/functional/arch/zx48k/modu8.asm index 91822d077..04de0b0bf 100644 --- a/tests/functional/arch/zx48k/modu8.asm +++ b/tests/functional/arch/zx48k/modu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -130,5 +128,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 43 "modu8.bas" +#line 43 "arch/zx48k/modu8.bas" END diff --git a/tests/functional/arch/zx48k/modu8a.asm b/tests/functional/arch/zx48k/modu8a.asm index bd2ed6b3c..546da2851 100644 --- a/tests/functional/arch/zx48k/modu8a.asm +++ b/tests/functional/arch/zx48k/modu8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,7 +41,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -108,5 +106,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 23 "modu8a.bas" +#line 23 "arch/zx48k/modu8a.bas" END diff --git a/tests/functional/arch/zx48k/modu8b.asm b/tests/functional/arch/zx48k/modu8b.asm index a985e629b..4702a5650 100644 --- a/tests/functional/arch/zx48k/modu8b.asm +++ b/tests/functional/arch/zx48k/modu8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -49,7 +47,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division @@ -114,5 +112,5 @@ __MODI8_FAST: ; __FASTCALL__ entry ld a, l ; remainder ret ; a = Modulus pop namespace -#line 29 "modu8b.bas" +#line 29 "arch/zx48k/modu8b.bas" END diff --git a/tests/functional/arch/zx48k/mul16.asm b/tests/functional/arch/zx48k/mul16.asm index 4301a15b7..58856638c 100644 --- a/tests/functional/arch/zx48k/mul16.asm +++ b/tests/functional/arch/zx48k/mul16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -51,7 +49,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -77,5 +75,5 @@ __MUL16NOADD: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 29 "mul16.bas" +#line 29 "arch/zx48k/mul16.bas" END diff --git a/tests/functional/arch/zx48k/mul16a.asm b/tests/functional/arch/zx48k/mul16a.asm index ec28dad99..14d23ec0c 100644 --- a/tests/functional/arch/zx48k/mul16a.asm +++ b/tests/functional/arch/zx48k/mul16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,7 +42,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -70,5 +68,5 @@ __MUL16NOADD: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 24 "mul16a.bas" +#line 24 "arch/zx48k/mul16a.bas" END diff --git a/tests/functional/arch/zx48k/mul16b.asm b/tests/functional/arch/zx48k/mul16b.asm index e1e2e10c7..5a85456a2 100644 --- a/tests/functional/arch/zx48k/mul16b.asm +++ b/tests/functional/arch/zx48k/mul16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,7 +48,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -76,5 +74,5 @@ __MUL16NOADD: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 30 "mul16b.bas" +#line 30 "arch/zx48k/mul16b.bas" END diff --git a/tests/functional/arch/zx48k/mul16c.asm b/tests/functional/arch/zx48k/mul16c.asm index df5a53dd8..de13f1ece 100644 --- a/tests/functional/arch/zx48k/mul16c.asm +++ b/tests/functional/arch/zx48k/mul16c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -41,7 +39,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -67,5 +65,5 @@ __MUL16NOADD: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 21 "mul16c.bas" +#line 21 "arch/zx48k/mul16c.bas" END diff --git a/tests/functional/arch/zx48k/mul8.asm b/tests/functional/arch/zx48k/mul8.asm index ed768ffe3..5abeeb9a0 100644 --- a/tests/functional/arch/zx48k/mul8.asm +++ b/tests/functional/arch/zx48k/mul8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/mul8a.asm b/tests/functional/arch/zx48k/mul8a.asm index cc1ba4e6f..006325503 100644 --- a/tests/functional/arch/zx48k/mul8a.asm +++ b/tests/functional/arch/zx48k/mul8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,7 +42,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul8.asm" push namespace core __MUL8: ; Performs 8bit x 8bit multiplication PROC @@ -90,5 +88,5 @@ __MUL8B: ret ; result = HL ENDP pop namespace -#line 24 "mul8a.bas" +#line 24 "arch/zx48k/mul8a.bas" END diff --git a/tests/functional/arch/zx48k/mul8b.asm b/tests/functional/arch/zx48k/mul8b.asm index fdb09be25..dadb5af44 100644 --- a/tests/functional/arch/zx48k/mul8b.asm +++ b/tests/functional/arch/zx48k/mul8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,7 +48,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul8.asm" push namespace core __MUL8: ; Performs 8bit x 8bit multiplication PROC @@ -96,5 +94,5 @@ __MUL8B: ret ; result = HL ENDP pop namespace -#line 30 "mul8b.bas" +#line 30 "arch/zx48k/mul8b.bas" END diff --git a/tests/functional/arch/zx48k/mulf00.asm b/tests/functional/arch/zx48k/mulf00.asm index e8a4bf1be..32246d150 100644 --- a/tests/functional/arch/zx48k/mulf00.asm +++ b/tests/functional/arch/zx48k/mulf00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -55,8 +53,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mulf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -95,7 +93,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/mulf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -113,8 +111,8 @@ __MULF: ; Multiplication defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 25 "mulf00.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 25 "arch/zx48k/mulf00.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -141,8 +139,8 @@ __FP_PUSH_REV: exx ret pop namespace -#line 26 "mulf00.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 26 "arch/zx48k/mulf00.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -170,5 +168,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 27 "mulf00.bas" +#line 27 "arch/zx48k/mulf00.bas" END diff --git a/tests/functional/arch/zx48k/mulf01.asm b/tests/functional/arch/zx48k/mulf01.asm index 57b66e953..c485192e5 100644 --- a/tests/functional/arch/zx48k/mulf01.asm +++ b/tests/functional/arch/zx48k/mulf01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -59,8 +57,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mulf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -99,7 +97,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/mulf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -117,8 +115,8 @@ __MULF: ; Multiplication defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 29 "mulf01.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 29 "arch/zx48k/mulf01.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -146,5 +144,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 30 "mulf01.bas" +#line 30 "arch/zx48k/mulf01.bas" END diff --git a/tests/functional/arch/zx48k/mulf16.asm b/tests/functional/arch/zx48k/mulf16.asm index 57d1e2341..46585e84d 100644 --- a/tests/functional/arch/zx48k/mulf16.asm +++ b/tests/functional/arch/zx48k/mulf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -191,5 +189,5 @@ __ROUND_FIX: ; rounds a 64bit (32.32) fixed point number to 16.16 jp m, __NEG32 ; if negative, negates it ret pop namespace -#line 48 "mulf16.bas" +#line 48 "arch/zx48k/mulf16.bas" END diff --git a/tests/functional/arch/zx48k/mulf16a.asm b/tests/functional/arch/zx48k/mulf16a.asm index 948ddb4a5..ac02372e7 100644 --- a/tests/functional/arch/zx48k/mulf16a.asm +++ b/tests/functional/arch/zx48k/mulf16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -54,8 +52,8 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mulf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -80,8 +78,8 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/mulf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/_mul32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/_mul32.asm" ; Ripped from: http://www.andreadrian.de/oldcpu/z80_number_cruncher.html#moztocid784223 ; Used with permission. ; Multiplies 32x32 bit integer (DEHL x D'E'H'L') @@ -140,7 +138,7 @@ __LMULSTART: djnz __LMULLOOP ret ; result in h'l'hlb'c'ac pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/mulf16.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mulf16.asm" push namespace core __MULF16: ; ld a, d ; load sgn into a @@ -175,5 +173,5 @@ __ROUND_FIX: ; rounds a 64bit (32.32) fixed point number to 16.16 jp m, __NEG32 ; if negative, negates it ret pop namespace -#line 26 "mulf16a.bas" +#line 26 "arch/zx48k/mulf16a.bas" END diff --git a/tests/functional/arch/zx48k/nef.asm b/tests/functional/arch/zx48k/nef.asm index 035f943d8..7dccf23e5 100644 --- a/tests/functional/arch/zx48k/nef.asm +++ b/tests/functional/arch/zx48k/nef.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/nef16.asm b/tests/functional/arch/zx48k/nef16.asm index 63cc38bcb..54a7e0d34 100644 --- a/tests/functional/arch/zx48k/nef16.asm +++ b/tests/functional/arch/zx48k/nef16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/nei16.asm b/tests/functional/arch/zx48k/nei16.asm index c421dcd60..c451e006a 100644 --- a/tests/functional/arch/zx48k/nei16.asm +++ b/tests/functional/arch/zx48k/nei16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/nei32.asm b/tests/functional/arch/zx48k/nei32.asm index d216efe91..2d0875513 100644 --- a/tests/functional/arch/zx48k/nei32.asm +++ b/tests/functional/arch/zx48k/nei32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/nei8.asm b/tests/functional/arch/zx48k/nei8.asm index 0cf4df17c..97d8a4c64 100644 --- a/tests/functional/arch/zx48k/nei8.asm +++ b/tests/functional/arch/zx48k/nei8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/neu16.asm b/tests/functional/arch/zx48k/neu16.asm index c421dcd60..c451e006a 100644 --- a/tests/functional/arch/zx48k/neu16.asm +++ b/tests/functional/arch/zx48k/neu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/neu32.asm b/tests/functional/arch/zx48k/neu32.asm index e759843d9..5f33c86f6 100644 --- a/tests/functional/arch/zx48k/neu32.asm +++ b/tests/functional/arch/zx48k/neu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/neu8.asm b/tests/functional/arch/zx48k/neu8.asm index 0cf4df17c..97d8a4c64 100644 --- a/tests/functional/arch/zx48k/neu8.asm +++ b/tests/functional/arch/zx48k/neu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/nir.asm b/tests/functional/arch/zx48k/nir.asm index f98398adb..eb5589441 100644 --- a/tests/functional/arch/zx48k/nir.asm +++ b/tests/functional/arch/zx48k/nir.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/noheap.asm b/tests/functional/arch/zx48k/noheap.asm index 3b0fad6b6..0714d7939 100644 --- a/tests/functional/arch/zx48k/noheap.asm +++ b/tests/functional/arch/zx48k/noheap.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -980,7 +978,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi16.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" @@ -999,7 +997,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor diff --git a/tests/functional/arch/zx48k/not16.asm b/tests/functional/arch/zx48k/not16.asm index 43d4624d3..615ec9bf9 100644 --- a/tests/functional/arch/zx48k/not16.asm +++ b/tests/functional/arch/zx48k/not16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/not32.asm b/tests/functional/arch/zx48k/not32.asm index c8cd68010..eac784eab 100644 --- a/tests/functional/arch/zx48k/not32.asm +++ b/tests/functional/arch/zx48k/not32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/not8.asm b/tests/functional/arch/zx48k/not8.asm index 64b8c3a21..c0a4e09ff 100644 --- a/tests/functional/arch/zx48k/not8.asm +++ b/tests/functional/arch/zx48k/not8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/notf.asm b/tests/functional/arch/zx48k/notf.asm index 9896a22ef..3af1bf639 100644 --- a/tests/functional/arch/zx48k/notf.asm +++ b/tests/functional/arch/zx48k/notf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/octal.asm b/tests/functional/arch/zx48k/octal.asm index 1c88be5ff..b4f116b57 100644 --- a/tests/functional/arch/zx48k/octal.asm +++ b/tests/functional/arch/zx48k/octal.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ongosub.asm b/tests/functional/arch/zx48k/ongosub.asm index 372ed123f..07dcf678f 100644 --- a/tests/functional/arch/zx48k/ongosub.asm +++ b/tests/functional/arch/zx48k/ongosub.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ongoto.asm b/tests/functional/arch/zx48k/ongoto.asm index 32d6f1e66..dae9ee64b 100644 --- a/tests/functional/arch/zx48k/ongoto.asm +++ b/tests/functional/arch/zx48k/ongoto.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ongoto_big.asm b/tests/functional/arch/zx48k/ongoto_big.asm index 02d158898..2196cb792 100644 --- a/tests/functional/arch/zx48k/ongoto_big.asm +++ b/tests/functional/arch/zx48k/ongoto_big.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -301,7 +299,7 @@ _a: DEFW .LABEL._1280 DEFW .LABEL._1290 ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ongoto.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ongoto.asm" ; ------------------------------------------------------ ; Implements ON .. GOTO ; ------------------------------------------------------ @@ -332,5 +330,5 @@ __ON_GOTO_START: ld l, a jp (hl) pop namespace -#line 281 "zx48k/ongoto_big.bas" +#line 281 "arch/zx48k/ongoto_big.bas" END diff --git a/tests/functional/arch/zx48k/opt1_arr_at_init.asm b/tests/functional/arch/zx48k/opt1_arr_at_init.asm index 949946c60..c0f77b573 100644 --- a/tests/functional/arch/zx48k/opt1_arr_at_init.asm +++ b/tests/functional/arch/zx48k/opt1_arr_at_init.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_beep_const.asm b/tests/functional/arch/zx48k/opt1_beep_const.asm index df63b1c55..cc0a851e9 100644 --- a/tests/functional/arch/zx48k/opt1_beep_const.asm +++ b/tests/functional/arch/zx48k/opt1_beep_const.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -39,7 +37,7 @@ ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/beeper.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/sound/beeper.asm" ; vim:ts=4:et:sw=4: ; This is a fast beep routine, but needs parameters ; codified in a different way. @@ -56,5 +54,5 @@ __BEEPER: pop ix ret pop namespace -#line 21 "opt1_beep_const.bas" +#line 21 "arch/zx48k/opt1_beep_const.bas" END diff --git a/tests/functional/arch/zx48k/opt1_beep_var.asm b/tests/functional/arch/zx48k/opt1_beep_var.asm index 25f13b097..95896443f 100644 --- a/tests/functional/arch/zx48k/opt1_beep_var.asm +++ b/tests/functional/arch/zx48k/opt1_beep_var.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -51,8 +49,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/beep.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/sound/beep.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -91,7 +89,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/beep.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/io/sound/beep.asm" push namespace core BEEP: ; The beep command, as in BASIC ; Duration in C,ED,LH (float) @@ -108,5 +106,5 @@ BEEP: ; The beep command, as in BASIC pop ix ret pop namespace -#line 27 "opt1_beep_var.bas" +#line 27 "arch/zx48k/opt1_beep_var.bas" END diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at1.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at1.asm index b8e1e5ea7..3c8082363 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at1.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at2.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at2.asm index 11506493a..98865f64e 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at2.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at3.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at3.asm index c1ff6267b..f0da4228f 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at3.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -107,7 +105,7 @@ _b.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -168,8 +166,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -198,7 +196,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -226,7 +224,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -245,7 +243,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -253,7 +251,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at4.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at4.asm index 3d3a2c5b5..48202cb30 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at4.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at5.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at5.asm index 3dce2219c..e1bec02e4 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at5.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy.asm index 2a08c4731..345e80410 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy2.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy2.asm index 8b1f91c92..2269536c2 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy2.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy3.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy3.asm index 60d53479b..e3c2d2173 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy3.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy4.asm b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy4.asm index 18e877937..4b6533620 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_at_copy4.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_at_copy4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_global.asm b/tests/functional/arch/zx48k/opt1_dim_arr_global.asm index cc1bfd132..62b7dd06d 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_global.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_global.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -60,7 +58,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -121,8 +119,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -151,7 +149,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -179,7 +177,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -198,7 +196,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -206,7 +204,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_global2.asm b/tests/functional/arch/zx48k/opt1_dim_arr_global2.asm index 14d162d0f..adabc56ab 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_global2.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_global2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_global3.asm b/tests/functional/arch/zx48k/opt1_dim_arr_global3.asm index c4977abae..681c23bfc 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_global3.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_global3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_global4.asm b/tests/functional/arch/zx48k/opt1_dim_arr_global4.asm index 658501a69..f440ba0ed 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_global4.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_global4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,7 +63,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -126,8 +124,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -156,7 +154,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -184,7 +182,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -203,7 +201,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -211,7 +209,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_local.asm b/tests/functional/arch/zx48k/opt1_dim_arr_local.asm index 214df1700..3fb138568 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_local.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_local.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_local2.asm b/tests/functional/arch/zx48k/opt1_dim_arr_local2.asm index 8a73fb9bf..d920ac0b3 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_local2.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_local2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_local3.asm b/tests/functional/arch/zx48k/opt1_dim_arr_local3.asm index 61a7bf23c..37b87b106 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_local3.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_local3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_arr_local4.asm b/tests/functional/arch/zx48k/opt1_dim_arr_local4.asm index 974bc8f87..84f2d5041 100644 --- a/tests/functional/arch/zx48k/opt1_dim_arr_local4.asm +++ b/tests/functional/arch/zx48k/opt1_dim_arr_local4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/opt1_dim_at_defval.asm b/tests/functional/arch/zx48k/opt1_dim_at_defval.asm index bfd605bfd..2ad46e755 100644 --- a/tests/functional/arch/zx48k/opt1_dim_at_defval.asm +++ b/tests/functional/arch/zx48k/opt1_dim_at_defval.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_endtest.asm b/tests/functional/arch/zx48k/opt1_endtest.asm index 5520a8506..cae19a80b 100644 --- a/tests/functional/arch/zx48k/opt1_endtest.asm +++ b/tests/functional/arch/zx48k/opt1_endtest.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_len.asm b/tests/functional/arch/zx48k/opt1_len.asm index c56ac1ec2..8f15fcdeb 100644 --- a/tests/functional/arch/zx48k/opt1_len.asm +++ b/tests/functional/arch/zx48k/opt1_len.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -49,7 +47,7 @@ _c: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -109,7 +107,7 @@ _c: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -216,7 +214,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -315,13 +313,13 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 24 "opt1_len.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 24 "arch/zx48k/opt1_len.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" ; INKEY Function ; Returns a string allocated in dynamic memory ; containing the string. ; An empty string otherwise. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -381,7 +379,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -415,7 +413,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -446,9 +444,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -513,7 +511,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" push namespace core INKEY: PROC @@ -558,8 +556,8 @@ __EMPTY_INKEY: KEY_CODE EQU 0333h ENDP pop namespace -#line 25 "opt1_len.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 25 "arch/zx48k/opt1_len.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -574,5 +572,5 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 26 "opt1_len.bas" +#line 26 "arch/zx48k/opt1_len.bas" END diff --git a/tests/functional/arch/zx48k/opt1_nolabel.asm b/tests/functional/arch/zx48k/opt1_nolabel.asm index 4268a4299..23dbfb145 100644 --- a/tests/functional/arch/zx48k/opt1_nolabel.asm +++ b/tests/functional/arch/zx48k/opt1_nolabel.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,14 +18,14 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "opt1_nolabel.bas" +#line 2 "arch/zx48k/opt1_nolabel.bas" ld hl, mygod -#line 5 "opt1_nolabel.bas" +#line 5 "arch/zx48k/opt1_nolabel.bas" jp .LABEL._finish -#line 9 "opt1_nolabel.bas" +#line 8 "arch/zx48k/opt1_nolabel.bas" mygod: nop -#line 12 "opt1_nolabel.bas" +#line 12 "arch/zx48k/opt1_nolabel.bas" .LABEL._finish: ld hl, 0 ld b, h diff --git a/tests/functional/arch/zx48k/opt1_shifti16_const.asm b/tests/functional/arch/zx48k/opt1_shifti16_const.asm index b37da0c93..206ff86a7 100644 --- a/tests/functional/arch/zx48k/opt1_shifti16_const.asm +++ b/tests/functional/arch/zx48k/opt1_shifti16_const.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_shiftli16.asm b/tests/functional/arch/zx48k/opt1_shiftli16.asm index 9b521aed8..8cfb0ebf8 100644 --- a/tests/functional/arch/zx48k/opt1_shiftli16.asm +++ b/tests/functional/arch/zx48k/opt1_shiftli16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_shiftu16_const.asm b/tests/functional/arch/zx48k/opt1_shiftu16_const.asm index 5a8b6c78a..207f7dae2 100644 --- a/tests/functional/arch/zx48k/opt1_shiftu16_const.asm +++ b/tests/functional/arch/zx48k/opt1_shiftu16_const.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt1_usr.asm b/tests/functional/arch/zx48k/opt1_usr.asm index 5c4bd6046..14b48b603 100644 --- a/tests/functional/arch/zx48k/opt1_usr.asm +++ b/tests/functional/arch/zx48k/opt1_usr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -43,7 +41,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/usr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/usr.asm" ; Emulates the USR Sinclair BASIC function ; Result value returns in BC ; We use HL for returning values, su we must @@ -51,7 +49,7 @@ _a: ; ; The incoming parameter is HL (Address to JUMP) ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/table_jump.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/table_jump.asm" push namespace core JUMP_HL_PLUS_2A: ; Does JP (HL + A*2) Modifies DE. Modifies A add a, a @@ -67,7 +65,7 @@ JUMP_HL_PLUS_DE: ; Does JP (HL + DE) CALL_HL: jp (hl) pop namespace -#line 10 "/zxbasic/src/arch/zx48k/library-asm/usr.asm" +#line 10 "/zxbasic/src/lib/arch/zx48k/runtime/usr.asm" push namespace core USR: push ix ; must preserve IX @@ -77,5 +75,5 @@ USR: ld l, c ret pop namespace -#line 23 "zx48k/opt1_usr.bas" +#line 23 "arch/zx48k/opt1_usr.bas" END diff --git a/tests/functional/arch/zx48k/opt2_assoc.asm b/tests/functional/arch/zx48k/opt2_assoc.asm index 969c2e677..da27a1ff8 100644 --- a/tests/functional/arch/zx48k/opt2_assoc.asm +++ b/tests/functional/arch/zx48k/opt2_assoc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -63,7 +61,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul8.asm" push namespace core __MUL8: ; Performs 8bit x 8bit multiplication PROC @@ -109,5 +107,5 @@ __MUL8B: ret ; result = HL ENDP pop namespace -#line 43 "zx48k/opt2_assoc.bas" +#line 43 "arch/zx48k/opt2_assoc.bas" END diff --git a/tests/functional/arch/zx48k/opt2_ato4.asm b/tests/functional/arch/zx48k/opt2_ato4.asm index 3c7b5f108..71c9a93ab 100644 --- a/tests/functional/arch/zx48k/opt2_ato4.asm +++ b/tests/functional/arch/zx48k/opt2_ato4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ato5.asm b/tests/functional/arch/zx48k/opt2_ato5.asm index 3c7b5f108..71c9a93ab 100644 --- a/tests/functional/arch/zx48k/opt2_ato5.asm +++ b/tests/functional/arch/zx48k/opt2_ato5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_dim_arr_at1.asm b/tests/functional/arch/zx48k/opt2_dim_arr_at1.asm index db83cee51..c00794dcf 100644 --- a/tests/functional/arch/zx48k/opt2_dim_arr_at1.asm +++ b/tests/functional/arch/zx48k/opt2_dim_arr_at1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_dim_at.asm b/tests/functional/arch/zx48k/opt2_dim_at.asm index c4da77d2c..6f933e59f 100644 --- a/tests/functional/arch/zx48k/opt2_dim_at.asm +++ b/tests/functional/arch/zx48k/opt2_dim_at.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_fastcall_func.asm b/tests/functional/arch/zx48k/opt2_fastcall_func.asm index 50f23a634..4b0d556e0 100644 --- a/tests/functional/arch/zx48k/opt2_fastcall_func.asm +++ b/tests/functional/arch/zx48k/opt2_fastcall_func.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_fastcall_sub.asm b/tests/functional/arch/zx48k/opt2_fastcall_sub.asm index c206235bd..582255531 100644 --- a/tests/functional/arch/zx48k/opt2_fastcall_sub.asm +++ b/tests/functional/arch/zx48k/opt2_fastcall_sub.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_for_funcall.asm b/tests/functional/arch/zx48k/opt2_for_funcall.asm index 91677e9f4..b76bbb3a9 100644 --- a/tests/functional/arch/zx48k/opt2_for_funcall.asm +++ b/tests/functional/arch/zx48k/opt2_for_funcall.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_func_call.asm b/tests/functional/arch/zx48k/opt2_func_call.asm index e2e7be064..b15529baa 100644 --- a/tests/functional/arch/zx48k/opt2_func_call.asm +++ b/tests/functional/arch/zx48k/opt2_func_call.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_global_array.asm b/tests/functional/arch/zx48k/opt2_global_array.asm index 8ebe51a75..72ccbcae3 100644 --- a/tests/functional/arch/zx48k/opt2_global_array.asm +++ b/tests/functional/arch/zx48k/opt2_global_array.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_global_array2.asm b/tests/functional/arch/zx48k/opt2_global_array2.asm index 28555518a..46794c86d 100644 --- a/tests/functional/arch/zx48k/opt2_global_array2.asm +++ b/tests/functional/arch/zx48k/opt2_global_array2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_goto_in_func.asm b/tests/functional/arch/zx48k/opt2_goto_in_func.asm index 20bed2b97..e1b75f294 100644 --- a/tests/functional/arch/zx48k/opt2_goto_in_func.asm +++ b/tests/functional/arch/zx48k/opt2_goto_in_func.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ifband.asm b/tests/functional/arch/zx48k/opt2_ifband.asm index 85e087840..efea01fd0 100644 --- a/tests/functional/arch/zx48k/opt2_ifband.asm +++ b/tests/functional/arch/zx48k/opt2_ifband.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ifbor.asm b/tests/functional/arch/zx48k/opt2_ifbor.asm index 9043450f3..7d08cf917 100644 --- a/tests/functional/arch/zx48k/opt2_ifbor.asm +++ b/tests/functional/arch/zx48k/opt2_ifbor.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ifbor2.asm b/tests/functional/arch/zx48k/opt2_ifbor2.asm index 9a33d8b35..61391bad1 100644 --- a/tests/functional/arch/zx48k/opt2_ifbor2.asm +++ b/tests/functional/arch/zx48k/opt2_ifbor2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ifbyte.asm b/tests/functional/arch/zx48k/opt2_ifbyte.asm index a2c13eec2..5ff73dae2 100644 --- a/tests/functional/arch/zx48k/opt2_ifbyte.asm +++ b/tests/functional/arch/zx48k/opt2_ifbyte.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_ifthen.asm b/tests/functional/arch/zx48k/opt2_ifthen.asm index dcc011cbf..54b6f2441 100644 --- a/tests/functional/arch/zx48k/opt2_ifthen.asm +++ b/tests/functional/arch/zx48k/opt2_ifthen.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_incdec_byte.asm b/tests/functional/arch/zx48k/opt2_incdec_byte.asm index e34681a14..ff2e0bbf5 100644 --- a/tests/functional/arch/zx48k/opt2_incdec_byte.asm +++ b/tests/functional/arch/zx48k/opt2_incdec_byte.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_include_unused.asm b/tests/functional/arch/zx48k/opt2_include_unused.asm index 20bed2b97..e1b75f294 100644 --- a/tests/functional/arch/zx48k/opt2_include_unused.asm +++ b/tests/functional/arch/zx48k/opt2_include_unused.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_infinite_loop.asm b/tests/functional/arch/zx48k/opt2_infinite_loop.asm index deb03027d..f79d3b91a 100644 --- a/tests/functional/arch/zx48k/opt2_infinite_loop.asm +++ b/tests/functional/arch/zx48k/opt2_infinite_loop.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_label_ref_in_func1.asm b/tests/functional/arch/zx48k/opt2_label_ref_in_func1.asm index d480edc83..47ba6010e 100644 --- a/tests/functional/arch/zx48k/opt2_label_ref_in_func1.asm +++ b/tests/functional/arch/zx48k/opt2_label_ref_in_func1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_label_ref_in_func2.asm b/tests/functional/arch/zx48k/opt2_label_ref_in_func2.asm index e13e21d9b..73d2bd936 100644 --- a/tests/functional/arch/zx48k/opt2_label_ref_in_func2.asm +++ b/tests/functional/arch/zx48k/opt2_label_ref_in_func2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_labelinfunc.asm b/tests/functional/arch/zx48k/opt2_labelinfunc.asm index 0cf646911..f5f6d950e 100644 --- a/tests/functional/arch/zx48k/opt2_labelinfunc.asm +++ b/tests/functional/arch/zx48k/opt2_labelinfunc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_labelinfunc3.asm b/tests/functional/arch/zx48k/opt2_labelinfunc3.asm index 0cf646911..f5f6d950e 100644 --- a/tests/functional/arch/zx48k/opt2_labelinfunc3.asm +++ b/tests/functional/arch/zx48k/opt2_labelinfunc3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_labelinfunc4.asm b/tests/functional/arch/zx48k/opt2_labelinfunc4.asm index 8e2e31ddd..08e703084 100644 --- a/tests/functional/arch/zx48k/opt2_labelinfunc4.asm +++ b/tests/functional/arch/zx48k/opt2_labelinfunc4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_labelinfunc5.asm b/tests/functional/arch/zx48k/opt2_labelinfunc5.asm index 8e2e31ddd..08e703084 100644 --- a/tests/functional/arch/zx48k/opt2_labelinfunc5.asm +++ b/tests/functional/arch/zx48k/opt2_labelinfunc5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_letsubstr_not_used.asm b/tests/functional/arch/zx48k/opt2_letsubstr_not_used.asm index 20bed2b97..e1b75f294 100644 --- a/tests/functional/arch/zx48k/opt2_letsubstr_not_used.asm +++ b/tests/functional/arch/zx48k/opt2_letsubstr_not_used.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_localu8.asm b/tests/functional/arch/zx48k/opt2_localu8.asm index 15fca461b..546bab416 100644 --- a/tests/functional/arch/zx48k/opt2_localu8.asm +++ b/tests/functional/arch/zx48k/opt2_localu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_pstr.asm b/tests/functional/arch/zx48k/opt2_pstr.asm index b5c3d1384..3d6bd5873 100644 --- a/tests/functional/arch/zx48k/opt2_pstr.asm +++ b/tests/functional/arch/zx48k/opt2_pstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -70,7 +68,7 @@ _PRINT642__leave: DEFB 61h DEFB 32h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -130,7 +128,7 @@ _PRINT642__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -237,7 +235,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -336,9 +334,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 47 "opt2_pstr.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 47 "arch/zx48k/opt2_pstr.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -398,7 +396,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -432,7 +430,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -463,9 +461,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -530,7 +528,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -567,5 +565,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 48 "opt2_pstr.bas" +#line 48 "arch/zx48k/opt2_pstr.bas" END diff --git a/tests/functional/arch/zx48k/opt2_recurse_filter2.asm b/tests/functional/arch/zx48k/opt2_recurse_filter2.asm index 041461baf..71deee5e9 100644 --- a/tests/functional/arch/zx48k/opt2_recurse_filter2.asm +++ b/tests/functional/arch/zx48k/opt2_recurse_filter2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_snake_es.asm b/tests/functional/arch/zx48k/opt2_snake_es.asm index 0c4ff163c..37765be4e 100644 --- a/tests/functional/arch/zx48k/opt2_snake_es.asm +++ b/tests/functional/arch/zx48k/opt2_snake_es.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -189,7 +187,7 @@ _y.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -250,8 +248,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -280,7 +278,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -308,7 +306,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -327,7 +325,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -335,7 +333,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt2_unused_var.asm b/tests/functional/arch/zx48k/opt2_unused_var.asm index 0f8f13837..b987a9bb8 100644 --- a/tests/functional/arch/zx48k/opt2_unused_var.asm +++ b/tests/functional/arch/zx48k/opt2_unused_var.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _Check: _Check__leave: ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pause.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pause.asm" ; The PAUSE statement (Calling the ROM) push namespace core __PAUSE: @@ -76,5 +74,5 @@ __PAUSE: ld c, l jp 1F3Dh ; PAUSE_1 pop namespace -#line 50 "opt2_unused_var.bas" +#line 50 "arch/zx48k/opt2_unused_var.bas" END diff --git a/tests/functional/arch/zx48k/opt2_unused_var1.asm b/tests/functional/arch/zx48k/opt2_unused_var1.asm index 20bed2b97..e1b75f294 100644 --- a/tests/functional/arch/zx48k/opt2_unused_var1.asm +++ b/tests/functional/arch/zx48k/opt2_unused_var1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt2_while_funcall.asm b/tests/functional/arch/zx48k/opt2_while_funcall.asm index 73ae6f7db..ed2cb3098 100644 --- a/tests/functional/arch/zx48k/opt2_while_funcall.asm +++ b/tests/functional/arch/zx48k/opt2_while_funcall.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_17.asm b/tests/functional/arch/zx48k/opt3_17.asm index c4deeabf8..915a12c72 100644 --- a/tests/functional/arch/zx48k/opt3_17.asm +++ b/tests/functional/arch/zx48k/opt3_17.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_OPT27wws2.asm b/tests/functional/arch/zx48k/opt3_OPT27wws2.asm index 85245db04..4171f785d 100644 --- a/tests/functional/arch/zx48k/opt3_OPT27wws2.asm +++ b/tests/functional/arch/zx48k/opt3_OPT27wws2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -96,7 +94,7 @@ _incyenem.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -157,8 +155,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -187,7 +185,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -215,7 +213,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -234,7 +232,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -242,7 +240,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt3_asmexpr.asm b/tests/functional/arch/zx48k/opt3_asmexpr.asm index 5bcd80f16..f059f2157 100644 --- a/tests/functional/arch/zx48k/opt3_asmexpr.asm +++ b/tests/functional/arch/zx48k/opt3_asmexpr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,9 +18,9 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "opt3_asmexpr.bas" +#line 1 "arch/zx48k/opt3_asmexpr.bas" ld de,56815-(8*41) -#line 4 "opt3_asmexpr.bas" +#line 4 "arch/zx48k/opt3_asmexpr.bas" ld bc, 0 .core.__END_PROGRAM: di diff --git a/tests/functional/arch/zx48k/opt3_ato4.asm b/tests/functional/arch/zx48k/opt3_ato4.asm index abc28a679..f8480b56e 100644 --- a/tests/functional/arch/zx48k/opt3_ato4.asm +++ b/tests/functional/arch/zx48k/opt3_ato4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_atohl_a.asm b/tests/functional/arch/zx48k/opt3_atohl_a.asm index 6c5abdfea..aeb22d669 100644 --- a/tests/functional/arch/zx48k/opt3_atohl_a.asm +++ b/tests/functional/arch/zx48k/opt3_atohl_a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_atolo1.asm b/tests/functional/arch/zx48k/opt3_atolo1.asm index f001292cd..28af61e99 100644 --- a/tests/functional/arch/zx48k/opt3_atolo1.asm +++ b/tests/functional/arch/zx48k/opt3_atolo1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,14 +18,14 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "opt3_atolo1.bas" +#line 1 "arch/zx48k/opt3_atolo1.bas" ld a,(bc) ld h, a inc c ld a, (bc) ld l, a call 0x000 -#line 9 "opt3_atolo1.bas" +#line 9 "arch/zx48k/opt3_atolo1.bas" ld bc, 0 .core.__END_PROGRAM: di diff --git a/tests/functional/arch/zx48k/opt3_atolo4.asm b/tests/functional/arch/zx48k/opt3_atolo4.asm index e82ad927f..e0f4887f6 100644 --- a/tests/functional/arch/zx48k/opt3_atolo4.asm +++ b/tests/functional/arch/zx48k/opt3_atolo4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_atoloinc.asm b/tests/functional/arch/zx48k/opt3_atoloinc.asm index aa9763982..e61846c8b 100644 --- a/tests/functional/arch/zx48k/opt3_atoloinc.asm +++ b/tests/functional/arch/zx48k/opt3_atoloinc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_dark01.asm b/tests/functional/arch/zx48k/opt3_dark01.asm index da459da9b..5d7d8963f 100644 --- a/tests/functional/arch/zx48k/opt3_dark01.asm +++ b/tests/functional/arch/zx48k/opt3_dark01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_data2.asm b/tests/functional/arch/zx48k/opt3_data2.asm index 24c057c59..199fd8bdf 100644 --- a/tests/functional/arch/zx48k/opt3_data2.asm +++ b/tests/functional/arch/zx48k/opt3_data2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -187,7 +185,7 @@ __MUL8B: ENDP pop namespace #line 95 "arch/zx48k/opt3_data2.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -248,8 +246,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -278,7 +276,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -306,7 +304,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -325,7 +323,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -333,7 +331,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/opt3_einar.asm b/tests/functional/arch/zx48k/opt3_einar.asm index 59d7da62e..da8a3c7ef 100644 --- a/tests/functional/arch/zx48k/opt3_einar.asm +++ b/tests/functional/arch/zx48k/opt3_einar.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_einar04.asm b/tests/functional/arch/zx48k/opt3_einar04.asm index db54656dc..ab17c015a 100644 --- a/tests/functional/arch/zx48k/opt3_einar04.asm +++ b/tests/functional/arch/zx48k/opt3_einar04.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -39,11 +37,11 @@ ei ret _test: -#line 5 "opt3_einar04.bas" +#line 4 "arch/zx48k/opt3_einar04.bas" cp 1 jp m,45000 jp 50000 -#line 9 "opt3_einar04.bas" +#line 9 "arch/zx48k/opt3_einar04.bas" _test__leave: ret ;; --- end of user code --- diff --git a/tests/functional/arch/zx48k/opt3_einar05.asm b/tests/functional/arch/zx48k/opt3_einar05.asm index adb107602..7bfd00c92 100644 --- a/tests/functional/arch/zx48k/opt3_einar05.asm +++ b/tests/functional/arch/zx48k/opt3_einar05.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,14 +18,14 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 2 "opt3_einar05.bas" +#line 1 "arch/zx48k/opt3_einar05.bas" call $fc12 di ld a, $fe ld i, a im 2 ei -#line 9 "opt3_einar05.bas" +#line 9 "arch/zx48k/opt3_einar05.bas" ld bc, 0 .core.__END_PROGRAM: di diff --git a/tests/functional/arch/zx48k/opt3_einar06.asm b/tests/functional/arch/zx48k/opt3_einar06.asm index 8ddb2b353..ab6a2a444 100644 --- a/tests/functional/arch/zx48k/opt3_einar06.asm +++ b/tests/functional/arch/zx48k/opt3_einar06.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -34,7 +32,7 @@ ei ret _test: -#line 3 "opt3_einar06.bas" +#line 2 "arch/zx48k/opt3_einar06.bas" ld hl, 56469 ld de, 5 ld (hl), e @@ -42,7 +40,7 @@ _test: ld h, l ld h, 5 inc l -#line 12 "opt3_einar06.bas" +#line 12 "arch/zx48k/opt3_einar06.bas" _test__leave: ret ;; --- end of user code --- diff --git a/tests/functional/arch/zx48k/opt3_endtest.asm b/tests/functional/arch/zx48k/opt3_endtest.asm index 5ab801bbd..9fb0ac924 100644 --- a/tests/functional/arch/zx48k/opt3_endtest.asm +++ b/tests/functional/arch/zx48k/opt3_endtest.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_fixed.asm b/tests/functional/arch/zx48k/opt3_fixed.asm index 390c1f545..856a6ac69 100644 --- a/tests/functional/arch/zx48k/opt3_fixed.asm +++ b/tests/functional/arch/zx48k/opt3_fixed.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_gogogoto.asm b/tests/functional/arch/zx48k/opt3_gogogoto.asm index 17098ecf7..190495285 100644 --- a/tests/functional/arch/zx48k/opt3_gogogoto.asm +++ b/tests/functional/arch/zx48k/opt3_gogogoto.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_gotogosub.asm b/tests/functional/arch/zx48k/opt3_gotogosub.asm index 0ba27e90f..296c54358 100644 --- a/tests/functional/arch/zx48k/opt3_gotogosub.asm +++ b/tests/functional/arch/zx48k/opt3_gotogosub.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_gotogoto.asm b/tests/functional/arch/zx48k/opt3_gotogoto.asm index 0ee4bbadd..7fd9820ae 100644 --- a/tests/functional/arch/zx48k/opt3_gotogoto.asm +++ b/tests/functional/arch/zx48k/opt3_gotogoto.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_haplo01.asm b/tests/functional/arch/zx48k/opt3_haplo01.asm index 355bfe332..b2545bf71 100644 --- a/tests/functional/arch/zx48k/opt3_haplo01.asm +++ b/tests/functional/arch/zx48k/opt3_haplo01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_haplo05.asm b/tests/functional/arch/zx48k/opt3_haplo05.asm index b6ec5be15..20d1fc4c6 100644 --- a/tests/functional/arch/zx48k/opt3_haplo05.asm +++ b/tests/functional/arch/zx48k/opt3_haplo05.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -110,7 +108,7 @@ _dataSprite: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/mul8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/mul8.asm" push namespace core __MUL8: ; Performs 8bit x 8bit multiplication PROC @@ -156,5 +154,5 @@ __MUL8B: ret ; result = HL ENDP pop namespace -#line 90 "zx48k/opt3_haplo05.bas" +#line 90 "arch/zx48k/opt3_haplo05.bas" END diff --git a/tests/functional/arch/zx48k/opt3_haplo06.asm b/tests/functional/arch/zx48k/opt3_haplo06.asm index 1ea369a75..1b64b32f7 100644 --- a/tests/functional/arch/zx48k/opt3_haplo06.asm +++ b/tests/functional/arch/zx48k/opt3_haplo06.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_haplobug.asm b/tests/functional/arch/zx48k/opt3_haplobug.asm index e70651bf3..9ef01d4f2 100644 --- a/tests/functional/arch/zx48k/opt3_haplobug.asm +++ b/tests/functional/arch/zx48k/opt3_haplobug.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_ifgotoelse.asm b/tests/functional/arch/zx48k/opt3_ifgotoelse.asm index fb4cf9666..0ca1457db 100644 --- a/tests/functional/arch/zx48k/opt3_ifgotoelse.asm +++ b/tests/functional/arch/zx48k/opt3_ifgotoelse.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_inout.asm b/tests/functional/arch/zx48k/opt3_inout.asm index d178ddf15..d17049b2b 100644 --- a/tests/functional/arch/zx48k/opt3_inout.asm +++ b/tests/functional/arch/zx48k/opt3_inout.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_lcd5.asm b/tests/functional/arch/zx48k/opt3_lcd5.asm index b79b64ba3..78fdf288e 100644 --- a/tests/functional/arch/zx48k/opt3_lcd5.asm +++ b/tests/functional/arch/zx48k/opt3_lcd5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_lcd6.asm b/tests/functional/arch/zx48k/opt3_lcd6.asm index 1d2442813..ea58e91ba 100644 --- a/tests/functional/arch/zx48k/opt3_lcd6.asm +++ b/tests/functional/arch/zx48k/opt3_lcd6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_lcd_o3_crash.asm b/tests/functional/arch/zx48k/opt3_lcd_o3_crash.asm index 7206b4359..40a7ccf47 100644 --- a/tests/functional/arch/zx48k/opt3_lcd_o3_crash.asm +++ b/tests/functional/arch/zx48k/opt3_lcd_o3_crash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_ldhlhl.asm b/tests/functional/arch/zx48k/opt3_ldhlhl.asm index 77d6fa208..ffc777ce5 100644 --- a/tests/functional/arch/zx48k/opt3_ldhlhl.asm +++ b/tests/functional/arch/zx48k/opt3_ldhlhl.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,10 +18,10 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "opt3_ldhlhl.bas" +#line 2 "arch/zx48k/opt3_ldhlhl.bas" ld hl, 0 ld hl, 0 -#line 6 "opt3_ldhlhl.bas" +#line 6 "arch/zx48k/opt3_ldhlhl.bas" ld bc, 0 .core.__END_PROGRAM: di diff --git a/tests/functional/arch/zx48k/opt3_nextbuild.asm b/tests/functional/arch/zx48k/opt3_nextbuild.asm index a5a207a92..a713ab659 100644 --- a/tests/functional/arch/zx48k/opt3_nextbuild.asm +++ b/tests/functional/arch/zx48k/opt3_nextbuild.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_peek.asm b/tests/functional/arch/zx48k/opt3_peek.asm index 506c616a0..539bf83c1 100644 --- a/tests/functional/arch/zx48k/opt3_peek.asm +++ b/tests/functional/arch/zx48k/opt3_peek.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt3_proc0.asm b/tests/functional/arch/zx48k/opt3_proc0.asm index aa6412648..daf119012 100644 --- a/tests/functional/arch/zx48k/opt3_proc0.asm +++ b/tests/functional/arch/zx48k/opt3_proc0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -34,7 +32,7 @@ ei ret _p: -#line 5 "opt3_proc0.bas" +#line 4 "arch/zx48k/opt3_proc0.bas" PROC CP 22 JR NZ, isNewline @@ -53,7 +51,7 @@ isAt: LOCAL isNewline isNewline: ENDP -#line 33 "opt3_proc0.bas" +#line 33 "arch/zx48k/opt3_proc0.bas" _p__leave: ret ;; --- end of user code --- diff --git a/tests/functional/arch/zx48k/opt3_sp.asm b/tests/functional/arch/zx48k/opt3_sp.asm index 4288719e3..95b7ab739 100644 --- a/tests/functional/arch/zx48k/opt3_sp.asm +++ b/tests/functional/arch/zx48k/opt3_sp.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -86,8 +84,8 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -126,7 +124,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/addf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/addf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -144,13 +142,13 @@ __ADDF: ; Addition defb 38h; ; END CALC jp __FPSTACK_POP pop namespace -#line 68 "opt3_sp.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 68 "arch/zx48k/opt3_sp.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -177,7 +175,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -185,13 +183,13 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 69 "opt3_sp.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pstoref.asm" +#line 69 "arch/zx48k/opt3_sp.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pstoref.asm" ; Stores FP number in A ED CB at location HL+IX ; HL = Offset ; IX = Stack Frame ; A ED CB = FP Number -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -219,7 +217,7 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/pstoref.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/pstoref.asm" ; Stored a float number in A ED CB into the address pointed by IX + HL push namespace core __PSTOREF: @@ -231,9 +229,9 @@ __PSTOREF: pop de jp __STOREF pop namespace -#line 70 "opt3_sp.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 70 "arch/zx48k/opt3_sp.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -258,7 +256,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -328,5 +326,5 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 71 "opt3_sp.bas" +#line 71 "arch/zx48k/opt3_sp.bas" END diff --git a/tests/functional/arch/zx48k/opt3_tolosob.asm b/tests/functional/arch/zx48k/opt3_tolosob.asm index cf14695df..8fcf04a6c 100644 --- a/tests/functional/arch/zx48k/opt3_tolosob.asm +++ b/tests/functional/arch/zx48k/opt3_tolosob.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -62,7 +60,7 @@ _sobando: .LABEL._pontolosobando: jp .LABEL._inicio ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eq16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eq16.asm" push namespace core __EQ16: ; Test if 16bit values HL == DE ; Returns result in A: 0 = False, FF = True @@ -72,5 +70,5 @@ __EQ16: ; Test if 16bit values HL == DE inc a ret pop namespace -#line 38 "opt3_tolosob.bas" +#line 38 "arch/zx48k/opt3_tolosob.bas" END diff --git a/tests/functional/arch/zx48k/opt3_xorxor.asm b/tests/functional/arch/zx48k/opt3_xorxor.asm index efe05ed0e..bbb86e9d4 100644 --- a/tests/functional/arch/zx48k/opt3_xorxor.asm +++ b/tests/functional/arch/zx48k/opt3_xorxor.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_053opt.asm b/tests/functional/arch/zx48k/opt4_053opt.asm index b651aca24..e98204a78 100644 --- a/tests/functional/arch/zx48k/opt4_053opt.asm +++ b/tests/functional/arch/zx48k/opt4_053opt.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -62,7 +60,7 @@ _sail: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/abs8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/abs8.asm" ; Returns absolute value for 8 bit signed integer ; push namespace core @@ -72,9 +70,9 @@ __ABS8: neg ret pop namespace -#line 40 "opt4_053opt.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 40 "arch/zx48k/opt4_053opt.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -96,6 +94,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 41 "opt4_053opt.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 41 "arch/zx48k/opt4_053opt.bas" END diff --git a/tests/functional/arch/zx48k/opt4_atohl_a.asm b/tests/functional/arch/zx48k/opt4_atohl_a.asm index bc8167409..cc13d16dd 100644 --- a/tests/functional/arch/zx48k/opt4_atohl_a.asm +++ b/tests/functional/arch/zx48k/opt4_atohl_a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_block_regs.asm b/tests/functional/arch/zx48k/opt4_block_regs.asm index 600c28a80..3cd172959 100644 --- a/tests/functional/arch/zx48k/opt4_block_regs.asm +++ b/tests/functional/arch/zx48k/opt4_block_regs.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_due0.asm b/tests/functional/arch/zx48k/opt4_due0.asm index 04a68eac0..2fb1356a9 100644 --- a/tests/functional/arch/zx48k/opt4_due0.asm +++ b/tests/functional/arch/zx48k/opt4_due0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_due_0.asm b/tests/functional/arch/zx48k/opt4_due_0.asm index dac1f98b0..d5cdfc580 100644 --- a/tests/functional/arch/zx48k/opt4_due_0.asm +++ b/tests/functional/arch/zx48k/opt4_due_0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_inca.asm b/tests/functional/arch/zx48k/opt4_inca.asm index 08355aa4c..2351194f1 100644 --- a/tests/functional/arch/zx48k/opt4_inca.asm +++ b/tests/functional/arch/zx48k/opt4_inca.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_inout.asm b/tests/functional/arch/zx48k/opt4_inout.asm index 19b427a42..d74623b7e 100644 --- a/tests/functional/arch/zx48k/opt4_inout.asm +++ b/tests/functional/arch/zx48k/opt4_inout.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_keepix.asm b/tests/functional/arch/zx48k/opt4_keepix.asm index ab96b42ee..eeae1a8f6 100644 --- a/tests/functional/arch/zx48k/opt4_keepix.asm +++ b/tests/functional/arch/zx48k/opt4_keepix.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_poke.asm b/tests/functional/arch/zx48k/opt4_poke.asm index 246eea45e..7b5b4e423 100644 --- a/tests/functional/arch/zx48k/opt4_poke.asm +++ b/tests/functional/arch/zx48k/opt4_poke.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/opt4_poke_emook.asm b/tests/functional/arch/zx48k/opt4_poke_emook.asm index f9eff6317..f69a2f586 100644 --- a/tests/functional/arch/zx48k/opt4_poke_emook.asm +++ b/tests/functional/arch/zx48k/opt4_poke_emook.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optconst.asm b/tests/functional/arch/zx48k/optconst.asm index a85fb7a31..62eae837c 100644 --- a/tests/functional/arch/zx48k/optconst.asm +++ b/tests/functional/arch/zx48k/optconst.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optional_param0.asm b/tests/functional/arch/zx48k/optional_param0.asm index 834f4f655..2e7d769d7 100644 --- a/tests/functional/arch/zx48k/optional_param0.asm +++ b/tests/functional/arch/zx48k/optional_param0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optional_param2.asm b/tests/functional/arch/zx48k/optional_param2.asm index 39438e833..6fe05f1a0 100644 --- a/tests/functional/arch/zx48k/optional_param2.asm +++ b/tests/functional/arch/zx48k/optional_param2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optional_param4.asm b/tests/functional/arch/zx48k/optional_param4.asm index eca1be96e..6fc8254ef 100644 --- a/tests/functional/arch/zx48k/optional_param4.asm +++ b/tests/functional/arch/zx48k/optional_param4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -73,7 +71,7 @@ _test__leave: DEFW 0001h DEFB 41h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -133,7 +131,7 @@ _test__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -240,7 +238,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -339,9 +337,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 50 "optional_param4.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 50 "arch/zx48k/optional_param4.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -401,7 +399,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -435,7 +433,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -466,9 +464,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -533,7 +531,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -570,5 +568,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 51 "optional_param4.bas" +#line 51 "arch/zx48k/optional_param4.bas" END diff --git a/tests/functional/arch/zx48k/optional_param5.asm b/tests/functional/arch/zx48k/optional_param5.asm index fa0cdd1a1..61a636f50 100644 --- a/tests/functional/arch/zx48k/optional_param5.asm +++ b/tests/functional/arch/zx48k/optional_param5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optional_param6.asm b/tests/functional/arch/zx48k/optional_param6.asm index fa0cdd1a1..61a636f50 100644 --- a/tests/functional/arch/zx48k/optional_param6.asm +++ b/tests/functional/arch/zx48k/optional_param6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/optspeed.asm b/tests/functional/arch/zx48k/optspeed.asm index 57c37b685..b26a495f3 100644 --- a/tests/functional/arch/zx48k/optspeed.asm +++ b/tests/functional/arch/zx48k/optspeed.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -384,9 +382,9 @@ _choque__leave: pop ix ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lef.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -411,7 +409,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -481,8 +479,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lef.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -554,8 +552,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/lef.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -594,7 +592,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/lef.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lef.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -614,13 +612,13 @@ __LEF: ; A <= B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 360 "optspeed.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 360 "arch/zx48k/optspeed.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" ; Parameter / Local var load ; A => Offset ; IX = Stack Frame ; RESULT: HL => IX + DE -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iloadf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm" ; __FASTCALL__ routine which ; loads a 40 bits floating point into A ED CB ; stored at position pointed by POINTER HL @@ -647,7 +645,7 @@ __LOADF: ; Loads a 40 bits FP number from address pointed by HL ld b, (hl) ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/ploadf.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/ploadf.asm" push namespace core __PLOADF: push ix @@ -655,5 +653,5 @@ __PLOADF: add hl, de jp __LOADF pop namespace -#line 361 "optspeed.bas" +#line 361 "arch/zx48k/optspeed.bas" END diff --git a/tests/functional/arch/zx48k/or16.asm b/tests/functional/arch/zx48k/or16.asm index 60f13ecfd..f945e7291 100644 --- a/tests/functional/arch/zx48k/or16.asm +++ b/tests/functional/arch/zx48k/or16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/or32.asm b/tests/functional/arch/zx48k/or32.asm index 87a90095c..aef21c8eb 100644 --- a/tests/functional/arch/zx48k/or32.asm +++ b/tests/functional/arch/zx48k/or32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/or8.asm b/tests/functional/arch/zx48k/or8.asm index 005dec10c..117801035 100644 --- a/tests/functional/arch/zx48k/or8.asm +++ b/tests/functional/arch/zx48k/or8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/orf.asm b/tests/functional/arch/zx48k/orf.asm index 7e2cd31f2..59907bfdb 100644 --- a/tests/functional/arch/zx48k/orf.asm +++ b/tests/functional/arch/zx48k/orf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/out0.asm b/tests/functional/arch/zx48k/out0.asm index 01d2f94f2..f5726f753 100644 --- a/tests/functional/arch/zx48k/out0.asm +++ b/tests/functional/arch/zx48k/out0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -47,8 +45,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -73,7 +71,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -145,5 +143,5 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 27 "out0.bas" +#line 27 "arch/zx48k/out0.bas" END diff --git a/tests/functional/arch/zx48k/param0.asm b/tests/functional/arch/zx48k/param0.asm index 817588dc6..491ebe69f 100644 --- a/tests/functional/arch/zx48k/param0.asm +++ b/tests/functional/arch/zx48k/param0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/param1.asm b/tests/functional/arch/zx48k/param1.asm index cee3a3c39..fd4f0eaf6 100644 --- a/tests/functional/arch/zx48k/param1.asm +++ b/tests/functional/arch/zx48k/param1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/param2.asm b/tests/functional/arch/zx48k/param2.asm index d2c310d3a..d1284199d 100644 --- a/tests/functional/arch/zx48k/param2.asm +++ b/tests/functional/arch/zx48k/param2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/param_byref_warn.asm b/tests/functional/arch/zx48k/param_byref_warn.asm index 449233994..3118bdca6 100644 --- a/tests/functional/arch/zx48k/param_byref_warn.asm +++ b/tests/functional/arch/zx48k/param_byref_warn.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/parambyref1.asm b/tests/functional/arch/zx48k/parambyref1.asm index f449705ea..625b3c743 100644 --- a/tests/functional/arch/zx48k/parambyref1.asm +++ b/tests/functional/arch/zx48k/parambyref1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/paramint3.asm b/tests/functional/arch/zx48k/paramint3.asm index adeba25c0..5929367e9 100644 --- a/tests/functional/arch/zx48k/paramint3.asm +++ b/tests/functional/arch/zx48k/paramint3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/paramnameclash0.asm b/tests/functional/arch/zx48k/paramnameclash0.asm index 9b8392f78..719aaa0f0 100644 --- a/tests/functional/arch/zx48k/paramnameclash0.asm +++ b/tests/functional/arch/zx48k/paramnameclash0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/params_implicit.asm b/tests/functional/arch/zx48k/params_implicit.asm index 986fb4926..84b1cfb6a 100644 --- a/tests/functional/arch/zx48k/params_implicit.asm +++ b/tests/functional/arch/zx48k/params_implicit.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -54,12 +52,12 @@ _x__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pstoref.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pstoref.asm" ; Stores FP number in A ED CB at location HL+IX ; HL = Offset ; IX = Stack Frame ; A ED CB = FP Number -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -87,7 +85,7 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/pstoref.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/pstoref.asm" ; Stored a float number in A ED CB into the address pointed by IX + HL push namespace core __PSTOREF: @@ -99,5 +97,5 @@ __PSTOREF: pop de jp __STOREF pop namespace -#line 36 "params_implicit.bas" +#line 36 "arch/zx48k/params_implicit.bas" END diff --git a/tests/functional/arch/zx48k/paramstr3.asm b/tests/functional/arch/zx48k/paramstr3.asm index 996270f17..971aa246c 100644 --- a/tests/functional/arch/zx48k/paramstr3.asm +++ b/tests/functional/arch/zx48k/paramstr3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -65,7 +63,7 @@ _p__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -125,7 +123,7 @@ _p__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -232,7 +230,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -331,9 +329,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 40 "paramstr3.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 40 "arch/zx48k/paramstr3.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -393,7 +391,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -427,7 +425,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -458,9 +456,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -525,7 +523,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -562,5 +560,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 41 "paramstr3.bas" +#line 41 "arch/zx48k/paramstr3.bas" END diff --git a/tests/functional/arch/zx48k/paramstr4.asm b/tests/functional/arch/zx48k/paramstr4.asm index 6e47ddb26..b8647326b 100644 --- a/tests/functional/arch/zx48k/paramstr4.asm +++ b/tests/functional/arch/zx48k/paramstr4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -89,7 +87,7 @@ _r__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -149,7 +147,7 @@ _r__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -256,7 +254,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -355,9 +353,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 64 "paramstr4.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 64 "arch/zx48k/paramstr4.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -417,7 +415,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -451,7 +449,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -482,9 +480,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -549,7 +547,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -586,5 +584,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 65 "paramstr4.bas" +#line 65 "arch/zx48k/paramstr4.bas" END diff --git a/tests/functional/arch/zx48k/paramstr5.asm b/tests/functional/arch/zx48k/paramstr5.asm index 9c35a065b..691a70955 100644 --- a/tests/functional/arch/zx48k/paramstr5.asm +++ b/tests/functional/arch/zx48k/paramstr5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -89,7 +87,7 @@ _p_r__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -149,7 +147,7 @@ _p_r__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -256,7 +254,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -355,9 +353,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 64 "paramstr5.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 64 "arch/zx48k/paramstr5.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -417,7 +415,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -451,7 +449,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -482,9 +480,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -549,7 +547,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -586,5 +584,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 65 "paramstr5.bas" +#line 65 "arch/zx48k/paramstr5.bas" END diff --git a/tests/functional/arch/zx48k/pararray0.asm b/tests/functional/arch/zx48k/pararray0.asm index 168766601..ff24cc681 100644 --- a/tests/functional/arch/zx48k/pararray0.asm +++ b/tests/functional/arch/zx48k/pararray0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -93,7 +91,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -154,8 +152,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -184,7 +182,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -212,7 +210,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -231,7 +229,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -239,7 +237,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray1.asm b/tests/functional/arch/zx48k/pararray1.asm index 3bb8f76fa..dd053b935 100644 --- a/tests/functional/arch/zx48k/pararray1.asm +++ b/tests/functional/arch/zx48k/pararray1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -167,8 +165,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -197,7 +195,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -225,7 +223,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -244,7 +242,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -252,7 +250,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray10.asm b/tests/functional/arch/zx48k/pararray10.asm index 148290e1b..a40f136b8 100644 --- a/tests/functional/arch/zx48k/pararray10.asm +++ b/tests/functional/arch/zx48k/pararray10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -123,7 +121,7 @@ _func2__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -184,8 +182,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -214,7 +212,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -242,7 +240,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -261,7 +259,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -269,7 +267,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray11.asm b/tests/functional/arch/zx48k/pararray11.asm index 9e4f9bdc1..656dae80a 100644 --- a/tests/functional/arch/zx48k/pararray11.asm +++ b/tests/functional/arch/zx48k/pararray11.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/pararray5.asm b/tests/functional/arch/zx48k/pararray5.asm index 281b9081f..581458127 100644 --- a/tests/functional/arch/zx48k/pararray5.asm +++ b/tests/functional/arch/zx48k/pararray5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -167,8 +165,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -197,7 +195,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -225,7 +223,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -244,7 +242,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -252,7 +250,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray6.asm b/tests/functional/arch/zx48k/pararray6.asm index 7e7968925..eb8e70cc9 100644 --- a/tests/functional/arch/zx48k/pararray6.asm +++ b/tests/functional/arch/zx48k/pararray6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -109,7 +107,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -170,8 +168,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -200,7 +198,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -228,7 +226,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -247,7 +245,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -255,7 +253,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray7.asm b/tests/functional/arch/zx48k/pararray7.asm index 9744693a8..1c0136255 100644 --- a/tests/functional/arch/zx48k/pararray7.asm +++ b/tests/functional/arch/zx48k/pararray7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -162,7 +160,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -223,8 +221,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -253,7 +251,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -281,7 +279,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -300,7 +298,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -308,7 +306,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray8.asm b/tests/functional/arch/zx48k/pararray8.asm index 728fa7eaf..5a929d817 100644 --- a/tests/functional/arch/zx48k/pararray8.asm +++ b/tests/functional/arch/zx48k/pararray8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -120,7 +118,7 @@ _max__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -181,8 +179,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -211,7 +209,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -239,7 +237,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -258,7 +256,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -266,7 +264,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/pararray9.asm b/tests/functional/arch/zx48k/pararray9.asm index d3bfd0376..c06d4af3e 100644 --- a/tests/functional/arch/zx48k/pararray9.asm +++ b/tests/functional/arch/zx48k/pararray9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -93,7 +91,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -154,8 +152,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -184,7 +182,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -212,7 +210,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -231,7 +229,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -239,7 +237,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/peek_ubyte.asm b/tests/functional/arch/zx48k/peek_ubyte.asm index 373badcfc..cda77a935 100644 --- a/tests/functional/arch/zx48k/peek_ubyte.asm +++ b/tests/functional/arch/zx48k/peek_ubyte.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/peek_uinteger.asm b/tests/functional/arch/zx48k/peek_uinteger.asm index c14f0f723..098dcace1 100644 --- a/tests/functional/arch/zx48k/peek_uinteger.asm +++ b/tests/functional/arch/zx48k/peek_uinteger.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/peek_ulong.asm b/tests/functional/arch/zx48k/peek_ulong.asm index 2f89c35ec..bfd368bcd 100644 --- a/tests/functional/arch/zx48k/peek_ulong.asm +++ b/tests/functional/arch/zx48k/peek_ulong.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -51,7 +49,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/iload32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iload32.asm" ; __FASTCALL__ routine which ; loads a 32 bits integer into DE,HL ; stored at position pointed by POINTER HL @@ -69,5 +67,5 @@ __ILOAD32: ex de, hl ret pop namespace -#line 29 "peek_ulong.bas" +#line 29 "arch/zx48k/peek_ulong.bas" END diff --git a/tests/functional/arch/zx48k/plot.asm b/tests/functional/arch/zx48k/plot.asm index 8fbde2ac3..d6d85fb70 100644 --- a/tests/functional/arch/zx48k/plot.asm +++ b/tests/functional/arch/zx48k/plot.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/poke0.asm b/tests/functional/arch/zx48k/poke0.asm index be391f3f8..43b834d75 100644 --- a/tests/functional/arch/zx48k/poke0.asm +++ b/tests/functional/arch/zx48k/poke0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/poke1.asm b/tests/functional/arch/zx48k/poke1.asm index c2f63ba6f..c22ba0ead 100644 --- a/tests/functional/arch/zx48k/poke1.asm +++ b/tests/functional/arch/zx48k/poke1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/poke2.asm b/tests/functional/arch/zx48k/poke2.asm index be391f3f8..43b834d75 100644 --- a/tests/functional/arch/zx48k/poke2.asm +++ b/tests/functional/arch/zx48k/poke2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/poke7.asm b/tests/functional/arch/zx48k/poke7.asm index 338fd6f45..a98e3138a 100644 --- a/tests/functional/arch/zx48k/poke7.asm +++ b/tests/functional/arch/zx48k/poke7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,7 +44,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/store32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/store32.asm" push namespace core __PISTORE32: push hl @@ -69,5 +67,5 @@ __STORE32: ; Stores the given integer in DEBC at address HL ld (hl), d ret pop namespace -#line 24 "poke7.bas" +#line 24 "arch/zx48k/poke7.bas" END diff --git a/tests/functional/arch/zx48k/pokeref.asm b/tests/functional/arch/zx48k/pokeref.asm index c6b082245..b132ae792 100644 --- a/tests/functional/arch/zx48k/pokeref.asm +++ b/tests/functional/arch/zx48k/pokeref.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/pokeref1.asm b/tests/functional/arch/zx48k/pokeref1.asm index 733ce0631..a058a0082 100644 --- a/tests/functional/arch/zx48k/pokeref1.asm +++ b/tests/functional/arch/zx48k/pokeref1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/pokeref2.asm b/tests/functional/arch/zx48k/pokeref2.asm index 5c5210427..f320343b1 100644 --- a/tests/functional/arch/zx48k/pokeref2.asm +++ b/tests/functional/arch/zx48k/pokeref2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/pooky0.asm b/tests/functional/arch/zx48k/pooky0.asm index 1317776c7..03d13141d 100644 --- a/tests/functional/arch/zx48k/pooky0.asm +++ b/tests/functional/arch/zx48k/pooky0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/print.asm b/tests/functional/arch/zx48k/print.asm index 1df5e4e0c..1464d411f 100644 --- a/tests/functional/arch/zx48k/print.asm +++ b/tests/functional/arch/zx48k/print.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT @@ -1407,7 +1405,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printf16.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/printi16.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" @@ -1426,7 +1424,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor @@ -1600,7 +1598,7 @@ __PRINT_FIX_LOOP: pop namespace #line 62 "arch/zx48k/print.bas" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/printi8.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division diff --git a/tests/functional/arch/zx48k/print42.asm b/tests/functional/arch/zx48k/print42.asm index c97a114ca..2f7070389 100644 --- a/tests/functional/arch/zx48k/print42.asm +++ b/tests/functional/arch/zx48k/print42.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -60,7 +58,7 @@ _print42: push ix ld ix, 0 add ix, sp -#line 23 "/zxbasic/src/arch/zx48k/library/print42.bas" +#line 22 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas" PROC LD A, H OR L @@ -317,9 +315,9 @@ ycoord: ret c ld d, 0 ret -#line 329 "/zxbasic/src/arch/zx48k/library/print42.bas" +#line 329 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas" .LABEL._printAt42Coords: -#line 331 "/zxbasic/src/arch/zx48k/library/print42.bas" +#line 330 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas" LOCAL xycoords xycoords: defb 0 @@ -493,7 +491,7 @@ characters: LOCAL print42end print42end: ENDP -#line 522 "/zxbasic/src/arch/zx48k/library/print42.bas" +#line 522 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas" _print42__leave: ex af, af' exx @@ -510,7 +508,7 @@ _print42__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -570,7 +568,7 @@ _print42__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -677,7 +675,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -776,5 +774,5 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 540 "/zxbasic/src/arch/zx48k/library/print42.bas" +#line 540 "/zxbasic/src/lib/arch/zx48k/stdlib/print42.bas" END diff --git a/tests/functional/arch/zx48k/print64.asm b/tests/functional/arch/zx48k/print64.asm index 47342553e..7a18bb13b 100644 --- a/tests/functional/arch/zx48k/print64.asm +++ b/tests/functional/arch/zx48k/print64.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -60,7 +58,7 @@ _print64: push ix ld ix, 0 add ix, sp -#line 22 "/zxbasic/src/arch/zx48k/library/print64.bas" +#line 21 "/zxbasic/src/lib/arch/zx48k/stdlib/print64.bas" PROC LD L,(IX+4) LD H,(IX+5) @@ -234,9 +232,9 @@ p64_test_Y: ret c ld d, 0 ret -#line 222 "/zxbasic/src/arch/zx48k/library/print64.bas" +#line 222 "/zxbasic/src/lib/arch/zx48k/stdlib/print64.bas" .LABEL._p64coords: -#line 224 "/zxbasic/src/arch/zx48k/library/print64.bas" +#line 223 "/zxbasic/src/lib/arch/zx48k/stdlib/print64.bas" LOCAL p64_coords p64_coords: defb 64 @@ -294,7 +292,7 @@ p64_charset: LOCAL p64_END p64_END: ENDP -#line 284 "/zxbasic/src/arch/zx48k/library/print64.bas" +#line 284 "/zxbasic/src/lib/arch/zx48k/stdlib/print64.bas" _print64__leave: ex af, af' exx @@ -311,7 +309,7 @@ _print64__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -371,7 +369,7 @@ _print64__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -478,7 +476,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -577,5 +575,5 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 302 "/zxbasic/src/arch/zx48k/library/print64.bas" +#line 302 "/zxbasic/src/lib/arch/zx48k/stdlib/print64.bas" END diff --git a/tests/functional/arch/zx48k/print_arrstr.asm b/tests/functional/arch/zx48k/print_arrstr.asm index 2a3958761..564b61ae7 100644 --- a/tests/functional/arch/zx48k/print_arrstr.asm +++ b/tests/functional/arch/zx48k/print_arrstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/print_at.asm b/tests/functional/arch/zx48k/print_at.asm index 87a68ddb1..bac12f018 100644 --- a/tests/functional/arch/zx48k/print_at.asm +++ b/tests/functional/arch/zx48k/print_at.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/print_bool.asm b/tests/functional/arch/zx48k/print_bool.asm index 66c092897..a3562b771 100644 --- a/tests/functional/arch/zx48k/print_bool.asm +++ b/tests/functional/arch/zx48k/print_bool.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/print_comma.asm b/tests/functional/arch/zx48k/print_comma.asm index a38163dcb..cd8372906 100644 --- a/tests/functional/arch/zx48k/print_comma.asm +++ b/tests/functional/arch/zx48k/print_comma.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -983,7 +981,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi8.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division diff --git a/tests/functional/arch/zx48k/print_eol.asm b/tests/functional/arch/zx48k/print_eol.asm index 6985db95a..14839ab78 100644 --- a/tests/functional/arch/zx48k/print_eol.asm +++ b/tests/functional/arch/zx48k/print_eol.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/print_eol_attr.asm b/tests/functional/arch/zx48k/print_eol_attr.asm index 3b742afdf..a399b14f2 100644 --- a/tests/functional/arch/zx48k/print_eol_attr.asm +++ b/tests/functional/arch/zx48k/print_eol_attr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/print_f.asm b/tests/functional/arch/zx48k/print_f.asm index f8a43d849..11f48f2ba 100644 --- a/tests/functional/arch/zx48k/print_f.asm +++ b/tests/functional/arch/zx48k/print_f.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/print_f16.asm b/tests/functional/arch/zx48k/print_f16.asm index e67cf7d27..ee5e2d39e 100644 --- a/tests/functional/arch/zx48k/print_f16.asm +++ b/tests/functional/arch/zx48k/print_f16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -982,7 +980,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printf16.asm" #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/printi16.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" @@ -1001,7 +999,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor diff --git a/tests/functional/arch/zx48k/print_i16.asm b/tests/functional/arch/zx48k/print_i16.asm index 12a2b8a62..5c914f8bf 100644 --- a/tests/functional/arch/zx48k/print_i16.asm +++ b/tests/functional/arch/zx48k/print_i16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -980,7 +978,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi16.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" @@ -999,7 +997,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor diff --git a/tests/functional/arch/zx48k/print_i32.asm b/tests/functional/arch/zx48k/print_i32.asm index 60633bf14..d150b918c 100644 --- a/tests/functional/arch/zx48k/print_i32.asm +++ b/tests/functional/arch/zx48k/print_i32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -1007,7 +1005,7 @@ __NEG32: ; Negates DEHL (Two's complement) ret pop namespace #line 3 "/zxbasic/src/lib/arch/zx48k/runtime/printi32.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division diff --git a/tests/functional/arch/zx48k/print_i8.asm b/tests/functional/arch/zx48k/print_i8.asm index 481206642..a3d9104af 100644 --- a/tests/functional/arch/zx48k/print_i8.asm +++ b/tests/functional/arch/zx48k/print_i8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -980,7 +978,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi8.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division diff --git a/tests/functional/arch/zx48k/print_tab.asm b/tests/functional/arch/zx48k/print_tab.asm index 8ada6b285..77efbc541 100644 --- a/tests/functional/arch/zx48k/print_tab.asm +++ b/tests/functional/arch/zx48k/print_tab.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/print_u16.asm b/tests/functional/arch/zx48k/print_u16.asm index 20c919fa2..0911fb192 100644 --- a/tests/functional/arch/zx48k/print_u16.asm +++ b/tests/functional/arch/zx48k/print_u16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -981,7 +979,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi16.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" ; 16 bit division and modulo functions ; for both signed and unsigned values #line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg16.asm" @@ -1000,7 +998,7 @@ __NEGHL: inc hl ret pop namespace -#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/div16.asm" +#line 5 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div16.asm" push namespace core __DIVU16: ; 16 bit unsigned division ; HL = Dividend, Stack Top = Divisor diff --git a/tests/functional/arch/zx48k/print_u32.asm b/tests/functional/arch/zx48k/print_u32.asm index 21fd745af..1be4bdcca 100644 --- a/tests/functional/arch/zx48k/print_u32.asm +++ b/tests/functional/arch/zx48k/print_u32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -1008,7 +1006,7 @@ __NEG32: ; Negates DEHL (Two's complement) ret pop namespace #line 3 "/zxbasic/src/lib/arch/zx48k/runtime/printi32.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division diff --git a/tests/functional/arch/zx48k/print_u8.asm b/tests/functional/arch/zx48k/print_u8.asm index 24eec3c58..fb7d9006a 100644 --- a/tests/functional/arch/zx48k/print_u8.asm +++ b/tests/functional/arch/zx48k/print_u8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ @@ -981,7 +979,7 @@ __PRINT_MINUS: ; PRINT the MINUS (-) sign. CALLER must preserve registers __PRINT_DIGIT EQU __PRINTCHAR ; PRINTS the char in A register, and puts its attrs pop namespace #line 2 "/zxbasic/src/lib/arch/zx48k/runtime/printi8.asm" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/div8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div8.asm" ; -------------------------------- push namespace core __DIVU8: ; 8 bit unsigned integer division diff --git a/tests/functional/arch/zx48k/randomize.asm b/tests/functional/arch/zx48k/randomize.asm index 4df1eb482..0ee143e86 100644 --- a/tests/functional/arch/zx48k/randomize.asm +++ b/tests/functional/arch/zx48k/randomize.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/read.asm b/tests/functional/arch/zx48k/read.asm index 3fcb17dce..f8a235575 100644 --- a/tests/functional/arch/zx48k/read.asm +++ b/tests/functional/arch/zx48k/read.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/read12.asm b/tests/functional/arch/zx48k/read12.asm index cbd1a4e4f..0210f8a18 100644 --- a/tests/functional/arch/zx48k/read12.asm +++ b/tests/functional/arch/zx48k/read12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/read14.asm b/tests/functional/arch/zx48k/read14.asm index d4d43a497..2261bc6ae 100644 --- a/tests/functional/arch/zx48k/read14.asm +++ b/tests/functional/arch/zx48k/read14.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/read4.asm b/tests/functional/arch/zx48k/read4.asm index a7ebf2aa9..a9e9f7584 100644 --- a/tests/functional/arch/zx48k/read4.asm +++ b/tests/functional/arch/zx48k/read4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/read8.asm b/tests/functional/arch/zx48k/read8.asm index 46943918e..79e6de4d2 100644 --- a/tests/functional/arch/zx48k/read8.asm +++ b/tests/functional/arch/zx48k/read8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/read9.asm b/tests/functional/arch/zx48k/read9.asm index 66c49cd29..cca485469 100644 --- a/tests/functional/arch/zx48k/read9.asm +++ b/tests/functional/arch/zx48k/read9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT @@ -237,7 +235,7 @@ __MULF: ; Multiplication jp __FPSTACK_POP pop namespace #line 116 "arch/zx48k/read9.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -298,8 +296,8 @@ __FMUL16: djnz 1b ret pop namespace -#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -328,7 +326,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -356,7 +354,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -375,7 +373,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -383,7 +381,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zx48k/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zx48k/readokdown.asm b/tests/functional/arch/zx48k/readokdown.asm index 98561df35..126d9e6a7 100644 --- a/tests/functional/arch/zx48k/readokdown.asm +++ b/tests/functional/arch/zx48k/readokdown.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/readokup.asm b/tests/functional/arch/zx48k/readokup.asm index 2da02e334..bbe64032f 100644 --- a/tests/functional/arch/zx48k/readokup.asm +++ b/tests/functional/arch/zx48k/readokup.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/recur0.asm b/tests/functional/arch/zx48k/recur0.asm index 6d68cab35..1c14d32da 100644 --- a/tests/functional/arch/zx48k/recur0.asm +++ b/tests/functional/arch/zx48k/recur0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/recurse_filter.asm b/tests/functional/arch/zx48k/recurse_filter.asm index d290012b0..0f886ce9b 100644 --- a/tests/functional/arch/zx48k/recurse_filter.asm +++ b/tests/functional/arch/zx48k/recurse_filter.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/refconstparam.asm b/tests/functional/arch/zx48k/refconstparam.asm index 637f85e6e..6acb527a9 100644 --- a/tests/functional/arch/zx48k/refconstparam.asm +++ b/tests/functional/arch/zx48k/refconstparam.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/refconstparam2.asm b/tests/functional/arch/zx48k/refconstparam2.asm index 637f85e6e..6acb527a9 100644 --- a/tests/functional/arch/zx48k/refconstparam2.asm +++ b/tests/functional/arch/zx48k/refconstparam2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/refconstparam4.asm b/tests/functional/arch/zx48k/refconstparam4.asm index 0f290f5fd..95945bde5 100644 --- a/tests/functional/arch/zx48k/refconstparam4.asm +++ b/tests/functional/arch/zx48k/refconstparam4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/refconstparam5.asm b/tests/functional/arch/zx48k/refconstparam5.asm index 9589629cb..7c7ac9e57 100644 --- a/tests/functional/arch/zx48k/refconstparam5.asm +++ b/tests/functional/arch/zx48k/refconstparam5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/refconstparam6.asm b/tests/functional/arch/zx48k/refconstparam6.asm index 9589629cb..7c7ac9e57 100644 --- a/tests/functional/arch/zx48k/refconstparam6.asm +++ b/tests/functional/arch/zx48k/refconstparam6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/restore0.asm b/tests/functional/arch/zx48k/restore0.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/restore0.asm +++ b/tests/functional/arch/zx48k/restore0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/restore1.asm b/tests/functional/arch/zx48k/restore1.asm index 9736d1379..2d1cc0da6 100644 --- a/tests/functional/arch/zx48k/restore1.asm +++ b/tests/functional/arch/zx48k/restore1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/restore2.asm b/tests/functional/arch/zx48k/restore2.asm index b39c5dffe..3c3c3fb3f 100644 --- a/tests/functional/arch/zx48k/restore2.asm +++ b/tests/functional/arch/zx48k/restore2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/restore3.asm b/tests/functional/arch/zx48k/restore3.asm index 6c3b98364..4983327fb 100644 --- a/tests/functional/arch/zx48k/restore3.asm +++ b/tests/functional/arch/zx48k/restore3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/rnd.asm b/tests/functional/arch/zx48k/rnd.asm index bdf030c80..cb9652d81 100644 --- a/tests/functional/arch/zx48k/rnd.asm +++ b/tests/functional/arch/zx48k/rnd.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/save.asm b/tests/functional/arch/zx48k/save.asm index 67580cdd7..c8b49f8ff 100644 --- a/tests/functional/arch/zx48k/save.asm +++ b/tests/functional/arch/zx48k/save.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -54,8 +52,8 @@ DEFB 73h DEFB 74h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -115,7 +113,7 @@ ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -149,8 +147,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -257,7 +255,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -288,9 +286,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -355,7 +353,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -392,13 +390,13 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 31 "save.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 31 "arch/zx48k/save.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ; Save code "XXX" at address YYY of length ZZZ ; Parameters in the stack are XXX (16 bit) address of string name ; (only first 12 chars will be taken into account) ; YYY and ZZZ are 16 bit on top of the stack. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -556,7 +554,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 8 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 8 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" push namespace core SAVE_CODE: PROC @@ -567,7 +565,7 @@ SAVE_CODE: LOCAL SAVE_STOP LOCAL STR_PTR LOCAL SAVE_EMPTY_ERROR -#line 26 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 26 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" MEMBOT EQU 23698 ; Use the CALC mem to store header STR_PTR EQU MEMBOT + 17 pop hl ; Return address @@ -699,8 +697,8 @@ SA_CHK_BRK: rra ld a, b ret -#line 183 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 183 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ENDP pop namespace -#line 32 "save.bas" +#line 32 "arch/zx48k/save.bas" END diff --git a/tests/functional/arch/zx48k/save01.asm b/tests/functional/arch/zx48k/save01.asm index 4fab65846..fdaee5ca7 100644 --- a/tests/functional/arch/zx48k/save01.asm +++ b/tests/functional/arch/zx48k/save01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -58,8 +56,8 @@ DEFB 74h DEFB 73h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -119,7 +117,7 @@ ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -153,8 +151,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -261,7 +259,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -292,9 +290,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -359,7 +357,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -396,13 +394,13 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 35 "save01.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 35 "arch/zx48k/save01.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ; Save code "XXX" at address YYY of length ZZZ ; Parameters in the stack are XXX (16 bit) address of string name ; (only first 12 chars will be taken into account) ; YYY and ZZZ are 16 bit on top of the stack. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -560,7 +558,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 8 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 8 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" push namespace core SAVE_CODE: PROC @@ -571,7 +569,7 @@ SAVE_CODE: LOCAL SAVE_STOP LOCAL STR_PTR LOCAL SAVE_EMPTY_ERROR -#line 26 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 26 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" MEMBOT EQU 23698 ; Use the CALC mem to store header STR_PTR EQU MEMBOT + 17 pop hl ; Return address @@ -703,8 +701,8 @@ SA_CHK_BRK: rra ld a, b ret -#line 183 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 183 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ENDP pop namespace -#line 36 "save01.bas" +#line 36 "arch/zx48k/save01.bas" END diff --git a/tests/functional/arch/zx48k/save02.asm b/tests/functional/arch/zx48k/save02.asm index fb36aa84b..7d60c046f 100644 --- a/tests/functional/arch/zx48k/save02.asm +++ b/tests/functional/arch/zx48k/save02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -57,8 +55,8 @@ _variableToSave: DEFB 74h DEFB 31h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -118,7 +116,7 @@ _variableToSave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -152,8 +150,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -260,7 +258,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -291,9 +289,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -358,7 +356,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -395,13 +393,13 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 32 "save02.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 32 "arch/zx48k/save02.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ; Save code "XXX" at address YYY of length ZZZ ; Parameters in the stack are XXX (16 bit) address of string name ; (only first 12 chars will be taken into account) ; YYY and ZZZ are 16 bit on top of the stack. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -559,7 +557,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 8 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 8 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" push namespace core SAVE_CODE: PROC @@ -570,7 +568,7 @@ SAVE_CODE: LOCAL SAVE_STOP LOCAL STR_PTR LOCAL SAVE_EMPTY_ERROR -#line 26 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 26 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" MEMBOT EQU 23698 ; Use the CALC mem to store header STR_PTR EQU MEMBOT + 17 pop hl ; Return address @@ -702,8 +700,8 @@ SA_CHK_BRK: rra ld a, b ret -#line 183 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 183 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ENDP pop namespace -#line 33 "save02.bas" +#line 33 "arch/zx48k/save02.bas" END diff --git a/tests/functional/arch/zx48k/save03.asm b/tests/functional/arch/zx48k/save03.asm index 0594ea497..81dc1a610 100644 --- a/tests/functional/arch/zx48k/save03.asm +++ b/tests/functional/arch/zx48k/save03.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -54,8 +52,8 @@ DEFB 73h DEFB 74h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -115,7 +113,7 @@ ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -149,8 +147,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -257,7 +255,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -288,9 +286,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -355,7 +353,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -392,13 +390,13 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 31 "save03.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 31 "arch/zx48k/save03.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ; Save code "XXX" at address YYY of length ZZZ ; Parameters in the stack are XXX (16 bit) address of string name ; (only first 12 chars will be taken into account) ; YYY and ZZZ are 16 bit on top of the stack. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -556,7 +554,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 8 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 8 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" push namespace core SAVE_CODE: PROC @@ -567,7 +565,7 @@ SAVE_CODE: LOCAL SAVE_STOP LOCAL STR_PTR LOCAL SAVE_EMPTY_ERROR -#line 26 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 26 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" MEMBOT EQU 23698 ; Use the CALC mem to store header STR_PTR EQU MEMBOT + 17 pop hl ; Return address @@ -699,8 +697,8 @@ SA_CHK_BRK: rra ld a, b ret -#line 183 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 183 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ENDP pop namespace -#line 32 "save03.bas" +#line 32 "arch/zx48k/save03.bas" END diff --git a/tests/functional/arch/zx48k/save04.asm b/tests/functional/arch/zx48k/save04.asm index fb15dcf0f..ceda64d4d 100644 --- a/tests/functional/arch/zx48k/save04.asm +++ b/tests/functional/arch/zx48k/save04.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -59,8 +57,8 @@ _length: DEFB 63h DEFB 72h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -120,7 +118,7 @@ _length: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -154,8 +152,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -262,7 +260,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -293,9 +291,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -360,7 +358,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -397,13 +395,13 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 32 "save.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 32 "arch/zx48k/save04.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ; Save code "XXX" at address YYY of length ZZZ ; Parameters in the stack are XXX (16 bit) address of string name ; (only first 12 chars will be taken into account) ; YYY and ZZZ are 16 bit on top of the stack. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -561,7 +559,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 8 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 8 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" push namespace core SAVE_CODE: PROC @@ -572,7 +570,7 @@ SAVE_CODE: LOCAL SAVE_STOP LOCAL STR_PTR LOCAL SAVE_EMPTY_ERROR -#line 26 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 26 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" MEMBOT EQU 23698 ; Use the CALC mem to store header STR_PTR EQU MEMBOT + 17 pop hl ; Return address @@ -704,8 +702,8 @@ SA_CHK_BRK: rra ld a, b ret -#line 183 "/zxbasic/src/arch/zx48k/library-asm/save.asm" +#line 183 "/zxbasic/src/lib/arch/zx48k/runtime/save.asm" ENDP pop namespace -#line 33 "save.bas" +#line 33 "arch/zx48k/save04.bas" END diff --git a/tests/functional/arch/zx48k/sgnf.asm b/tests/functional/arch/zx48k/sgnf.asm index acad19749..2f852f664 100644 --- a/tests/functional/arch/zx48k/sgnf.asm +++ b/tests/functional/arch/zx48k/sgnf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -46,8 +44,8 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgnf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgn.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgnf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgn.asm" ; Returns SGN (SIGN) for 32, 16 and 8 bits signed integers, Fixed and FLOAT push namespace core PROC @@ -82,6 +80,6 @@ __ENDSGN: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/sgnf.asm" -#line 22 "sgnf.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/sgnf.asm" +#line 22 "arch/zx48k/sgnf.bas" END diff --git a/tests/functional/arch/zx48k/sgnf16.asm b/tests/functional/arch/zx48k/sgnf16.asm index d660f61c5..44a493e04 100644 --- a/tests/functional/arch/zx48k/sgnf16.asm +++ b/tests/functional/arch/zx48k/sgnf16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,8 +42,8 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgnf16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgn.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgnf16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgn.asm" ; Returns SGN (SIGN) for 32, 16 and 8 bits signed integers, Fixed and FLOAT push namespace core PROC @@ -80,6 +78,6 @@ __ENDSGN: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/sgnf16.asm" -#line 21 "sgnf16.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/sgnf16.asm" +#line 21 "arch/zx48k/sgnf16.bas" END diff --git a/tests/functional/arch/zx48k/sgni16.asm b/tests/functional/arch/zx48k/sgni16.asm index 257785e68..4f84acec5 100644 --- a/tests/functional/arch/zx48k/sgni16.asm +++ b/tests/functional/arch/zx48k/sgni16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -41,8 +39,8 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgni16.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgn.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgni16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgn.asm" ; Returns SGN (SIGN) for 32, 16 and 8 bits signed integers, Fixed and FLOAT push namespace core PROC @@ -77,6 +75,6 @@ __ENDSGN: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/sgni16.asm" -#line 20 "sgni16.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/sgni16.asm" +#line 20 "arch/zx48k/sgni16.bas" END diff --git a/tests/functional/arch/zx48k/sgni32.asm b/tests/functional/arch/zx48k/sgni32.asm index b36d6dbd6..770cc9d72 100644 --- a/tests/functional/arch/zx48k/sgni32.asm +++ b/tests/functional/arch/zx48k/sgni32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,8 +42,8 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgni32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgn.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgni32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgn.asm" ; Returns SGN (SIGN) for 32, 16 and 8 bits signed integers, Fixed and FLOAT push namespace core PROC @@ -80,6 +78,6 @@ __ENDSGN: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/sgni32.asm" -#line 21 "sgni32.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/sgni32.asm" +#line 21 "arch/zx48k/sgni32.bas" END diff --git a/tests/functional/arch/zx48k/sgni8.asm b/tests/functional/arch/zx48k/sgni8.asm index 4651a31ff..db071c315 100644 --- a/tests/functional/arch/zx48k/sgni8.asm +++ b/tests/functional/arch/zx48k/sgni8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -40,7 +38,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgni8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgni8.asm" ; Returns SGN (SIGN) for 8 bits signed integer push namespace core __SGNI8: @@ -51,5 +49,5 @@ __SGNI8: neg ret pop namespace -#line 20 "sgni8.bas" +#line 20 "arch/zx48k/sgni8.bas" END diff --git a/tests/functional/arch/zx48k/sgnu16.asm b/tests/functional/arch/zx48k/sgnu16.asm index 93a5c5d35..705029ad6 100644 --- a/tests/functional/arch/zx48k/sgnu16.asm +++ b/tests/functional/arch/zx48k/sgnu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -41,7 +39,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgnu16.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgnu16.asm" ; Returns SGN (SIGN) for 16 bits unsigned integer push namespace core __SGNU16: @@ -51,5 +49,5 @@ __SGNU16: ld a, 1 ret pop namespace -#line 20 "sgnu16.bas" +#line 20 "arch/zx48k/sgnu16.bas" END diff --git a/tests/functional/arch/zx48k/sgnu32.asm b/tests/functional/arch/zx48k/sgnu32.asm index afd172212..c28ba42c0 100644 --- a/tests/functional/arch/zx48k/sgnu32.asm +++ b/tests/functional/arch/zx48k/sgnu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,7 +42,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgnu32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgnu32.asm" ; Returns SGN (SIGN) for 32 bits unsigned integer push namespace core __SGNU32: @@ -56,5 +54,5 @@ __SGNU32: ld a, 1 ret pop namespace -#line 21 "sgnu32.bas" +#line 21 "arch/zx48k/sgnu32.bas" END diff --git a/tests/functional/arch/zx48k/sgnu8.asm b/tests/functional/arch/zx48k/sgnu8.asm index 09fc9aedc..b45aa705e 100644 --- a/tests/functional/arch/zx48k/sgnu8.asm +++ b/tests/functional/arch/zx48k/sgnu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -40,7 +38,7 @@ _y: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sgnu8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/sgnu8.asm" ; Returns SGN (SIGN) for 8 bits unsigned integera push namespace core __SGNU8: @@ -49,5 +47,5 @@ __SGNU8: ld a, 1 ret pop namespace -#line 20 "sgnu8.bas" +#line 20 "arch/zx48k/sgnu8.bas" END diff --git a/tests/functional/arch/zx48k/shl_shr_16bit.asm b/tests/functional/arch/zx48k/shl_shr_16bit.asm index fd359bda2..e5db482de 100644 --- a/tests/functional/arch/zx48k/shl_shr_16bit.asm +++ b/tests/functional/arch/zx48k/shl_shr_16bit.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shl_shr_32bit.asm b/tests/functional/arch/zx48k/shl_shr_32bit.asm index 7324cbf9d..5601eece6 100644 --- a/tests/functional/arch/zx48k/shl_shr_32bit.asm +++ b/tests/functional/arch/zx48k/shl_shr_32bit.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -149,7 +147,7 @@ _result: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/shl32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/shl32.asm" push namespace core __SHL32: ; Left Logical Shift 32 bits sla l @@ -158,8 +156,8 @@ __SHL32: ; Left Logical Shift 32 bits rl d ret pop namespace -#line 117 "shl_shr_32bit.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/shra32.asm" +#line 117 "arch/zx48k/shl_shr_32bit.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/shra32.asm" push namespace core __SHRA32: ; Right Arithmetical Shift 32 bits sra d @@ -168,8 +166,8 @@ __SHRA32: ; Right Arithmetical Shift 32 bits rr l ret pop namespace -#line 118 "shl_shr_32bit.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/shrl32.asm" +#line 118 "arch/zx48k/shl_shr_32bit.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/shrl32.asm" push namespace core __SHRL32: ; Right Logical Shift 32 bits srl d @@ -178,5 +176,5 @@ __SHRL32: ; Right Logical Shift 32 bits rr l ret pop namespace -#line 119 "shl_shr_32bit.bas" +#line 119 "arch/zx48k/shl_shr_32bit.bas" END diff --git a/tests/functional/arch/zx48k/shli16.asm b/tests/functional/arch/zx48k/shli16.asm index 79acb3428..97b6f775d 100644 --- a/tests/functional/arch/zx48k/shli16.asm +++ b/tests/functional/arch/zx48k/shli16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shli32.asm b/tests/functional/arch/zx48k/shli32.asm index 5d01b8d7e..c66d889e6 100644 --- a/tests/functional/arch/zx48k/shli32.asm +++ b/tests/functional/arch/zx48k/shli32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/shl32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bitwise/shl32.asm" push namespace core __SHL32: ; Left Logical Shift 32 bits sla l diff --git a/tests/functional/arch/zx48k/shli8.asm b/tests/functional/arch/zx48k/shli8.asm index eaa74c9c3..3470aed65 100644 --- a/tests/functional/arch/zx48k/shli8.asm +++ b/tests/functional/arch/zx48k/shli8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shlu16.asm b/tests/functional/arch/zx48k/shlu16.asm index a0b24dfe3..8b89d20c5 100644 --- a/tests/functional/arch/zx48k/shlu16.asm +++ b/tests/functional/arch/zx48k/shlu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shlu32.asm b/tests/functional/arch/zx48k/shlu32.asm index 8953a9dde..e3b4f749c 100644 --- a/tests/functional/arch/zx48k/shlu32.asm +++ b/tests/functional/arch/zx48k/shlu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shlu8.asm b/tests/functional/arch/zx48k/shlu8.asm index 889d1a3db..9de17aea5 100644 --- a/tests/functional/arch/zx48k/shlu8.asm +++ b/tests/functional/arch/zx48k/shlu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shri16.asm b/tests/functional/arch/zx48k/shri16.asm index 60cf162c9..c6cd1eeda 100644 --- a/tests/functional/arch/zx48k/shri16.asm +++ b/tests/functional/arch/zx48k/shri16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shri32.asm b/tests/functional/arch/zx48k/shri32.asm index a650ae561..502a27a48 100644 --- a/tests/functional/arch/zx48k/shri32.asm +++ b/tests/functional/arch/zx48k/shri32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shri8.asm b/tests/functional/arch/zx48k/shri8.asm index 6e0e12a02..ae94432ce 100644 --- a/tests/functional/arch/zx48k/shri8.asm +++ b/tests/functional/arch/zx48k/shri8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shru16.asm b/tests/functional/arch/zx48k/shru16.asm index d60b0bc80..d917d1016 100644 --- a/tests/functional/arch/zx48k/shru16.asm +++ b/tests/functional/arch/zx48k/shru16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shru32.asm b/tests/functional/arch/zx48k/shru32.asm index 22a7a6f04..26d2a25aa 100644 --- a/tests/functional/arch/zx48k/shru32.asm +++ b/tests/functional/arch/zx48k/shru32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/shru8.asm b/tests/functional/arch/zx48k/shru8.asm index 62c886c78..c88c07a6e 100644 --- a/tests/functional/arch/zx48k/shru8.asm +++ b/tests/functional/arch/zx48k/shru8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sigilfunc.asm b/tests/functional/arch/zx48k/sigilfunc.asm index 30725e60e..97e0698e8 100644 --- a/tests/functional/arch/zx48k/sigilfunc.asm +++ b/tests/functional/arch/zx48k/sigilfunc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -58,8 +56,8 @@ _test__leave: .LABEL.__LABEL0: DEFW 0000h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -119,7 +117,7 @@ _test__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -153,8 +151,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -261,7 +259,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -292,9 +290,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -359,7 +357,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -396,15 +394,15 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 33 "sigilfunc.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 33 "arch/zx48k/sigilfunc.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -562,7 +560,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -589,5 +587,5 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 34 "sigilfunc.bas" +#line 34 "arch/zx48k/sigilfunc.bas" END diff --git a/tests/functional/arch/zx48k/simple.asm b/tests/functional/arch/zx48k/simple.asm index 013cd0763..f3162a1b2 100644 --- a/tests/functional/arch/zx48k/simple.asm +++ b/tests/functional/arch/zx48k/simple.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/sin1.asm b/tests/functional/arch/zx48k/sin1.asm index edfde01f8..24a3d3a6d 100644 --- a/tests/functional/arch/zx48k/sin1.asm +++ b/tests/functional/arch/zx48k/sin1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/slice0.asm b/tests/functional/arch/zx48k/slice0.asm index c0e9f9dcb..42a77db0b 100644 --- a/tests/functional/arch/zx48k/slice0.asm +++ b/tests/functional/arch/zx48k/slice0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -53,14 +51,14 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -120,7 +118,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -227,7 +225,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -326,7 +324,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -353,8 +351,8 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 28 "slice0.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 28 "arch/zx48k/slice0.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" ; String slicing library ; HL = Str pointer ; DE = String start @@ -368,7 +366,7 @@ __STORE_STR2: ; it in dynamic memory if needed). Returns pointer (HL) to resulting ; string. NULL (0) if no memory for padding. ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -383,8 +381,8 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 18 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 18 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -444,7 +442,7 @@ __STRLEN: ; Direct FASTCALL entry ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -478,7 +476,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -509,9 +507,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -576,7 +574,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 19 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 19 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" push namespace core __STRSLICE: ; Callee entry pop hl ; Return ADDRESS @@ -648,5 +646,5 @@ __FREE_ON_EXIT: ret ENDP pop namespace -#line 29 "slice0.bas" +#line 29 "arch/zx48k/slice0.bas" END diff --git a/tests/functional/arch/zx48k/slice2.asm b/tests/functional/arch/zx48k/slice2.asm index b335c11f7..a87da27c9 100644 --- a/tests/functional/arch/zx48k/slice2.asm +++ b/tests/functional/arch/zx48k/slice2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sna_00.sna b/tests/functional/arch/zx48k/sna_00.sna index abe1b1831..fb561f319 100644 Binary files a/tests/functional/arch/zx48k/sna_00.sna and b/tests/functional/arch/zx48k/sna_00.sna differ diff --git a/tests/functional/arch/zx48k/stdlib_alloc.asm b/tests/functional/arch/zx48k/stdlib_alloc.asm index 9205053e5..5bf8a9184 100644 --- a/tests/functional/arch/zx48k/stdlib_alloc.asm +++ b/tests/functional/arch/zx48k/stdlib_alloc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/stdlib_attr.asm b/tests/functional/arch/zx48k/stdlib_attr.asm index 41421e5b1..9419b267c 100644 --- a/tests/functional/arch/zx48k/stdlib_attr.asm +++ b/tests/functional/arch/zx48k/stdlib_attr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_basic.asm b/tests/functional/arch/zx48k/stdlib_basic.asm index 0935e4083..7ee16a8f1 100644 --- a/tests/functional/arch/zx48k/stdlib_basic.asm +++ b/tests/functional/arch/zx48k/stdlib_basic.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_clearbox.asm b/tests/functional/arch/zx48k/stdlib_clearbox.asm index 1e12529b6..1d6548dbf 100644 --- a/tests/functional/arch/zx48k/stdlib_clearbox.asm +++ b/tests/functional/arch/zx48k/stdlib_clearbox.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_csrlin.asm b/tests/functional/arch/zx48k/stdlib_csrlin.asm index ebe10fde1..4d496c287 100644 --- a/tests/functional/arch/zx48k/stdlib_csrlin.asm +++ b/tests/functional/arch/zx48k/stdlib_csrlin.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_hex.asm b/tests/functional/arch/zx48k/stdlib_hex.asm index c1159cff5..0e7be338a 100644 --- a/tests/functional/arch/zx48k/stdlib_hex.asm +++ b/tests/functional/arch/zx48k/stdlib_hex.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/stdlib_memcopy.asm b/tests/functional/arch/zx48k/stdlib_memcopy.asm index 1dbf55ec6..7df976eea 100644 --- a/tests/functional/arch/zx48k/stdlib_memcopy.asm +++ b/tests/functional/arch/zx48k/stdlib_memcopy.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_pos.asm b/tests/functional/arch/zx48k/stdlib_pos.asm index 00628ab79..b75337c6f 100644 --- a/tests/functional/arch/zx48k/stdlib_pos.asm +++ b/tests/functional/arch/zx48k/stdlib_pos.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_putchars.asm b/tests/functional/arch/zx48k/stdlib_putchars.asm index b3eee87ee..4dafaca2a 100644 --- a/tests/functional/arch/zx48k/stdlib_putchars.asm +++ b/tests/functional/arch/zx48k/stdlib_putchars.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_scrbuffer.asm b/tests/functional/arch/zx48k/stdlib_scrbuffer.asm index 13ec9102f..0df2eea3a 100644 --- a/tests/functional/arch/zx48k/stdlib_scrbuffer.asm +++ b/tests/functional/arch/zx48k/stdlib_scrbuffer.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_screen.asm b/tests/functional/arch/zx48k/stdlib_screen.asm index e15d090bd..6be051ab3 100644 --- a/tests/functional/arch/zx48k/stdlib_screen.asm +++ b/tests/functional/arch/zx48k/stdlib_screen.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/stdlib_scroll.asm b/tests/functional/arch/zx48k/stdlib_scroll.asm index eda783104..f7de2f0c5 100644 --- a/tests/functional/arch/zx48k/stdlib_scroll.asm +++ b/tests/functional/arch/zx48k/stdlib_scroll.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stdlib_spectranet.asm b/tests/functional/arch/zx48k/stdlib_spectranet.asm index fe326055d..9d3284eb2 100644 --- a/tests/functional/arch/zx48k/stdlib_spectranet.asm +++ b/tests/functional/arch/zx48k/stdlib_spectranet.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/stdlib_winscroll.asm b/tests/functional/arch/zx48k/stdlib_winscroll.asm index e5948075f..1929d3fa2 100644 --- a/tests/functional/arch/zx48k/stdlib_winscroll.asm +++ b/tests/functional/arch/zx48k/stdlib_winscroll.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/stoperr.asm b/tests/functional/arch/zx48k/stoperr.asm index 4c97ab26d..ccbe042dd 100644 --- a/tests/functional/arch/zx48k/stoperr.asm +++ b/tests/functional/arch/zx48k/stoperr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -39,7 +37,7 @@ ld a, 255 call .core.__ERROR ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -73,5 +71,5 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 21 "stoperr.bas" +#line 21 "arch/zx48k/stoperr.bas" END diff --git a/tests/functional/arch/zx48k/storecstr.asm b/tests/functional/arch/zx48k/storecstr.asm index 95644ca0a..ac022e088 100644 --- a/tests/functional/arch/zx48k/storecstr.asm +++ b/tests/functional/arch/zx48k/storecstr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/storef.asm b/tests/functional/arch/zx48k/storef.asm index 9165facc4..7095c5830 100644 --- a/tests/functional/arch/zx48k/storef.asm +++ b/tests/functional/arch/zx48k/storef.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,7 +42,7 @@ _miny: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -72,5 +70,5 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 22 "storef.bas" +#line 22 "arch/zx48k/storef.bas" END diff --git a/tests/functional/arch/zx48k/storestr0.asm b/tests/functional/arch/zx48k/storestr0.asm index a9b6df862..3ea436842 100644 --- a/tests/functional/arch/zx48k/storestr0.asm +++ b/tests/functional/arch/zx48k/storestr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/storestr1.asm b/tests/functional/arch/zx48k/storestr1.asm index 3d981fb74..dfa56d0fd 100644 --- a/tests/functional/arch/zx48k/storestr1.asm +++ b/tests/functional/arch/zx48k/storestr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/storestr2.asm b/tests/functional/arch/zx48k/storestr2.asm index 4a752dbab..17bbcdb75 100644 --- a/tests/functional/arch/zx48k/storestr2.asm +++ b/tests/functional/arch/zx48k/storestr2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/storeu16.asm b/tests/functional/arch/zx48k/storeu16.asm index bfbcd9bc1..ce4e99ca5 100644 --- a/tests/functional/arch/zx48k/storeu16.asm +++ b/tests/functional/arch/zx48k/storeu16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/storeu32.asm b/tests/functional/arch/zx48k/storeu32.asm index 4e888ace3..132be2bc3 100644 --- a/tests/functional/arch/zx48k/storeu32.asm +++ b/tests/functional/arch/zx48k/storeu32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/storeu8.asm b/tests/functional/arch/zx48k/storeu8.asm index 9570c6e8a..3244abe21 100644 --- a/tests/functional/arch/zx48k/storeu8.asm +++ b/tests/functional/arch/zx48k/storeu8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/str0.asm b/tests/functional/arch/zx48k/str0.asm index c01b083f9..4bfa3071b 100644 --- a/tests/functional/arch/zx48k/str0.asm +++ b/tests/functional/arch/zx48k/str0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/str00.asm b/tests/functional/arch/zx48k/str00.asm index a1f487b7d..db76b83cc 100644 --- a/tests/functional/arch/zx48k/str00.asm +++ b/tests/functional/arch/zx48k/str00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str01.asm b/tests/functional/arch/zx48k/str01.asm index 323b07d42..0f657c1d8 100644 --- a/tests/functional/arch/zx48k/str01.asm +++ b/tests/functional/arch/zx48k/str01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str02.asm b/tests/functional/arch/zx48k/str02.asm index bc7f24dde..9a3df7c14 100644 --- a/tests/functional/arch/zx48k/str02.asm +++ b/tests/functional/arch/zx48k/str02.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str1.asm b/tests/functional/arch/zx48k/str1.asm index 6171d285b..4808ca426 100644 --- a/tests/functional/arch/zx48k/str1.asm +++ b/tests/functional/arch/zx48k/str1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base0.asm b/tests/functional/arch/zx48k/str_base0.asm index b8674d15b..f5fed7e95 100644 --- a/tests/functional/arch/zx48k/str_base0.asm +++ b/tests/functional/arch/zx48k/str_base0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base1.asm b/tests/functional/arch/zx48k/str_base1.asm index 9eba471e1..1dcc60fa7 100644 --- a/tests/functional/arch/zx48k/str_base1.asm +++ b/tests/functional/arch/zx48k/str_base1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base2.asm b/tests/functional/arch/zx48k/str_base2.asm index a4363f829..88817e5f3 100644 --- a/tests/functional/arch/zx48k/str_base2.asm +++ b/tests/functional/arch/zx48k/str_base2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base3.asm b/tests/functional/arch/zx48k/str_base3.asm index 7b87888a3..58f39a5ee 100644 --- a/tests/functional/arch/zx48k/str_base3.asm +++ b/tests/functional/arch/zx48k/str_base3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base4.asm b/tests/functional/arch/zx48k/str_base4.asm index be4466de3..9e64a70b2 100644 --- a/tests/functional/arch/zx48k/str_base4.asm +++ b/tests/functional/arch/zx48k/str_base4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_base5.asm b/tests/functional/arch/zx48k/str_base5.asm index 48277717d..665f4bc2d 100644 --- a/tests/functional/arch/zx48k/str_base5.asm +++ b/tests/functional/arch/zx48k/str_base5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/str_slash.asm b/tests/functional/arch/zx48k/str_slash.asm index a7379b0d5..1c79897ff 100644 --- a/tests/functional/arch/zx48k/str_slash.asm +++ b/tests/functional/arch/zx48k/str_slash.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -81,7 +79,7 @@ _GetFileSize__leave: DEFB 6Eh DEFB 65h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -141,7 +139,7 @@ _GetFileSize__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -248,7 +246,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -347,9 +345,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 58 "str_slash.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 58 "arch/zx48k/str_slash.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -409,7 +407,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -443,7 +441,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -474,9 +472,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -541,7 +539,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -578,5 +576,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 59 "str_slash.bas" +#line 59 "arch/zx48k/str_slash.bas" END diff --git a/tests/functional/arch/zx48k/stradd.asm b/tests/functional/arch/zx48k/stradd.asm index 24f054ed1..ccdffb29b 100644 --- a/tests/functional/arch/zx48k/stradd.asm +++ b/tests/functional/arch/zx48k/stradd.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strbase.asm b/tests/functional/arch/zx48k/strbase.asm index 37b6a4d30..a9ab2de18 100644 --- a/tests/functional/arch/zx48k/strbase.asm +++ b/tests/functional/arch/zx48k/strbase.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strbase2.asm b/tests/functional/arch/zx48k/strbase2.asm index 235d395e7..d161775d1 100644 --- a/tests/functional/arch/zx48k/strbase2.asm +++ b/tests/functional/arch/zx48k/strbase2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/streq00.asm b/tests/functional/arch/zx48k/streq00.asm index b2e962c67..904438eea 100644 --- a/tests/functional/arch/zx48k/streq00.asm +++ b/tests/functional/arch/zx48k/streq00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strge00.asm b/tests/functional/arch/zx48k/strge00.asm index 13eaebc85..4a7ad1f67 100644 --- a/tests/functional/arch/zx48k/strge00.asm +++ b/tests/functional/arch/zx48k/strge00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strgt00.asm b/tests/functional/arch/zx48k/strgt00.asm index c73282dcc..8527061f0 100644 --- a/tests/functional/arch/zx48k/strgt00.asm +++ b/tests/functional/arch/zx48k/strgt00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strict2.asm b/tests/functional/arch/zx48k/strict2.asm index 2a0df1af6..f19f3d420 100644 --- a/tests/functional/arch/zx48k/strict2.asm +++ b/tests/functional/arch/zx48k/strict2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/strict_bool.asm b/tests/functional/arch/zx48k/strict_bool.asm index ba1df01c5..f6fe8ac43 100644 --- a/tests/functional/arch/zx48k/strict_bool.asm +++ b/tests/functional/arch/zx48k/strict_bool.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/string_substr.asm b/tests/functional/arch/zx48k/string_substr.asm index eb04cf79a..46229bfc6 100644 --- a/tests/functional/arch/zx48k/string_substr.asm +++ b/tests/functional/arch/zx48k/string_substr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -66,14 +64,14 @@ _a: DEFB 4Eh DEFB 47h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -133,7 +131,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -240,7 +238,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -339,7 +337,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -366,8 +364,8 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 39 "string_substr.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 39 "arch/zx48k/string_substr.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" ; String slicing library ; HL = Str pointer ; DE = String start @@ -381,7 +379,7 @@ __STORE_STR2: ; it in dynamic memory if needed). Returns pointer (HL) to resulting ; string. NULL (0) if no memory for padding. ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -396,8 +394,8 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 18 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 18 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -457,7 +455,7 @@ __STRLEN: ; Direct FASTCALL entry ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -491,7 +489,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -522,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -589,7 +587,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 19 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 19 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" push namespace core __STRSLICE: ; Callee entry pop hl ; Return ADDRESS @@ -661,5 +659,5 @@ __FREE_ON_EXIT: ret ENDP pop namespace -#line 40 "string_substr.bas" +#line 40 "arch/zx48k/string_substr.bas" END diff --git a/tests/functional/arch/zx48k/stringfunc.asm b/tests/functional/arch/zx48k/stringfunc.asm index feda3a3e3..b820e174d 100644 --- a/tests/functional/arch/zx48k/stringfunc.asm +++ b/tests/functional/arch/zx48k/stringfunc.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -59,7 +57,7 @@ _testStr__leave: DEFB 6Ch DEFB 6Fh ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -119,7 +117,7 @@ _testStr__leave: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -226,7 +224,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -325,9 +323,9 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 36 "stringfunc.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 36 "arch/zx48k/stringfunc.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -387,7 +385,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -421,7 +419,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -452,9 +450,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -519,7 +517,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/loadstr.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/loadstr.asm" ; Loads a string (ptr) from HL ; and duplicates it on dynamic memory again ; Finally, it returns result pointer in HL @@ -556,5 +554,5 @@ __LOADSTR: ; __FASTCALL__ entry pop hl ; Recovers destiny in hl as result ret pop namespace -#line 37 "stringfunc.bas" +#line 37 "arch/zx48k/stringfunc.bas" END diff --git a/tests/functional/arch/zx48k/stringparam.asm b/tests/functional/arch/zx48k/stringparam.asm index 8c172f8c1..4bb9af591 100644 --- a/tests/functional/arch/zx48k/stringparam.asm +++ b/tests/functional/arch/zx48k/stringparam.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/strle00.asm b/tests/functional/arch/zx48k/strle00.asm index a3b4bb994..ba353ce6f 100644 --- a/tests/functional/arch/zx48k/strle00.asm +++ b/tests/functional/arch/zx48k/strle00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strlocal0.asm b/tests/functional/arch/zx48k/strlocal0.asm index 2bb62052b..a331eba81 100644 --- a/tests/functional/arch/zx48k/strlocal0.asm +++ b/tests/functional/arch/zx48k/strlocal0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/strlt00.asm b/tests/functional/arch/zx48k/strlt00.asm index 276662b03..10377f315 100644 --- a/tests/functional/arch/zx48k/strlt00.asm +++ b/tests/functional/arch/zx48k/strlt00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strne00.asm b/tests/functional/arch/zx48k/strne00.asm index cb6c13891..c273348bc 100644 --- a/tests/functional/arch/zx48k/strne00.asm +++ b/tests/functional/arch/zx48k/strne00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strparam0.asm b/tests/functional/arch/zx48k/strparam0.asm index 594bc79b0..cd4f21d90 100644 --- a/tests/functional/arch/zx48k/strparam0.asm +++ b/tests/functional/arch/zx48k/strparam0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/strparam1.asm b/tests/functional/arch/zx48k/strparam1.asm index 54fca5d35..5d0579562 100644 --- a/tests/functional/arch/zx48k/strparam1.asm +++ b/tests/functional/arch/zx48k/strparam1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/strparam2.asm b/tests/functional/arch/zx48k/strparam2.asm index 67db757a0..b74213809 100644 --- a/tests/functional/arch/zx48k/strparam2.asm +++ b/tests/functional/arch/zx48k/strparam2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/strparam3.asm b/tests/functional/arch/zx48k/strparam3.asm index d300252ca..f95282d7e 100644 --- a/tests/functional/arch/zx48k/strparam3.asm +++ b/tests/functional/arch/zx48k/strparam3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zx48k/strsigil.asm b/tests/functional/arch/zx48k/strsigil.asm index c5a153f62..79112b290 100644 --- a/tests/functional/arch/zx48k/strsigil.asm +++ b/tests/functional/arch/zx48k/strsigil.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -63,9 +61,9 @@ _character: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" ; Returns the ascii code for the given str -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -125,7 +123,7 @@ _character: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -232,7 +230,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -331,7 +329,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/asc.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/asc.asm" push namespace core __ASC: PROC @@ -358,9 +356,9 @@ __ASC_END: ret ENDP pop namespace -#line 34 "strsigil.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 34 "arch/zx48k/strsigil.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -385,7 +383,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -457,8 +455,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 35 "strsigil.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 35 "arch/zx48k/strsigil.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" ; String slicing library ; HL = Str pointer ; DE = String start @@ -472,7 +470,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ; it in dynamic memory if needed). Returns pointer (HL) to resulting ; string. NULL (0) if no memory for padding. ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -487,8 +485,8 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 18 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 18 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -548,7 +546,7 @@ __STRLEN: ; Direct FASTCALL entry ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -582,7 +580,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -613,9 +611,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -680,7 +678,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 19 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 19 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" push namespace core __STRSLICE: ; Callee entry pop hl ; Return ADDRESS @@ -752,5 +750,5 @@ __FREE_ON_EXIT: ret ENDP pop namespace -#line 36 "strsigil.bas" +#line 36 "arch/zx48k/strsigil.bas" END diff --git a/tests/functional/arch/zx48k/sub16.asm b/tests/functional/arch/zx48k/sub16.asm index 9104f8fbb..1e1fcb26c 100644 --- a/tests/functional/arch/zx48k/sub16.asm +++ b/tests/functional/arch/zx48k/sub16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sub16a.asm b/tests/functional/arch/zx48k/sub16a.asm index 71b2eaaa9..cacc8b149 100644 --- a/tests/functional/arch/zx48k/sub16a.asm +++ b/tests/functional/arch/zx48k/sub16a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sub16b.asm b/tests/functional/arch/zx48k/sub16b.asm index 2ba23cef8..d08b27b4f 100644 --- a/tests/functional/arch/zx48k/sub16b.asm +++ b/tests/functional/arch/zx48k/sub16b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sub8.asm b/tests/functional/arch/zx48k/sub8.asm index d9660b907..8bbdc64b3 100644 --- a/tests/functional/arch/zx48k/sub8.asm +++ b/tests/functional/arch/zx48k/sub8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sub8a.asm b/tests/functional/arch/zx48k/sub8a.asm index 464f34fcc..f1bfb8e0c 100644 --- a/tests/functional/arch/zx48k/sub8a.asm +++ b/tests/functional/arch/zx48k/sub8a.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/sub8b.asm b/tests/functional/arch/zx48k/sub8b.asm index a8c421d69..8db1c1bbb 100644 --- a/tests/functional/arch/zx48k/sub8b.asm +++ b/tests/functional/arch/zx48k/sub8b.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/subf00.asm b/tests/functional/arch/zx48k/subf00.asm index fb0546ba4..8f885c4c5 100644 --- a/tests/functional/arch/zx48k/subf00.asm +++ b/tests/functional/arch/zx48k/subf00.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/subf01.asm b/tests/functional/arch/zx48k/subf01.asm index 14ccddbf4..1df883633 100644 --- a/tests/functional/arch/zx48k/subf01.asm +++ b/tests/functional/arch/zx48k/subf01.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/subf16c.asm b/tests/functional/arch/zx48k/subf16c.asm index 1696cc018..7c198b539 100644 --- a/tests/functional/arch/zx48k/subf16c.asm +++ b/tests/functional/arch/zx48k/subf16c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -75,7 +73,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -101,8 +99,8 @@ __SUB32: exx ret pop namespace -#line 45 "subf16c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 45 "arch/zx48k/subf16c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -119,5 +117,5 @@ __SWAP32: push bc ret pop namespace -#line 46 "subf16c.bas" +#line 46 "arch/zx48k/subf16c.bas" END diff --git a/tests/functional/arch/zx48k/subi32c.asm b/tests/functional/arch/zx48k/subi32c.asm index 19a2e56ee..e20b6d30a 100644 --- a/tests/functional/arch/zx48k/subi32c.asm +++ b/tests/functional/arch/zx48k/subi32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -84,7 +82,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -110,8 +108,8 @@ __SUB32: exx ret pop namespace -#line 54 "subi32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 54 "arch/zx48k/subi32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -128,5 +126,5 @@ __SWAP32: push bc ret pop namespace -#line 55 "subi32c.bas" +#line 55 "arch/zx48k/subi32c.bas" END diff --git a/tests/functional/arch/zx48k/subparam.asm b/tests/functional/arch/zx48k/subparam.asm index b6f8ff59b..f7fd9d649 100644 --- a/tests/functional/arch/zx48k/subparam.asm +++ b/tests/functional/arch/zx48k/subparam.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/subrec.asm b/tests/functional/arch/zx48k/subrec.asm index 5e74bb355..a21e61db9 100644 --- a/tests/functional/arch/zx48k/subrec.asm +++ b/tests/functional/arch/zx48k/subrec.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/substr_empty.asm b/tests/functional/arch/zx48k/substr_empty.asm index 6eecac692..e0a410f0f 100644 --- a/tests/functional/arch/zx48k/substr_empty.asm +++ b/tests/functional/arch/zx48k/substr_empty.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/substr_empty2.asm b/tests/functional/arch/zx48k/substr_empty2.asm index 03def986b..3fc943695 100644 --- a/tests/functional/arch/zx48k/substr_empty2.asm +++ b/tests/functional/arch/zx48k/substr_empty2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/substr_expr.asm b/tests/functional/arch/zx48k/substr_expr.asm index be81862e5..9c3fc2fc0 100644 --- a/tests/functional/arch/zx48k/substr_expr.asm +++ b/tests/functional/arch/zx48k/substr_expr.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -60,14 +58,14 @@ _a: DEFW 0001h DEFB 2Eh ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -127,7 +125,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -234,7 +232,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -333,7 +331,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -360,9 +358,9 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 33 "substr_expr.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 33 "arch/zx48k/substr_expr.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -422,7 +420,7 @@ __STORE_STR2: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -456,7 +454,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -487,9 +485,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -554,8 +552,8 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -570,7 +568,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -666,8 +664,8 @@ __STRCATEND: ret ENDP pop namespace -#line 34 "substr_expr.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 34 "arch/zx48k/substr_expr.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" ; String slicing library ; HL = Str pointer ; DE = String start @@ -752,5 +750,5 @@ __FREE_ON_EXIT: ret ENDP pop namespace -#line 35 "substr_expr.bas" +#line 35 "arch/zx48k/substr_expr.bas" END diff --git a/tests/functional/arch/zx48k/substr_expr2.asm b/tests/functional/arch/zx48k/substr_expr2.asm index b002b9b91..30555f266 100644 --- a/tests/functional/arch/zx48k/substr_expr2.asm +++ b/tests/functional/arch/zx48k/substr_expr2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -67,14 +65,14 @@ _a: DEFB 4Eh DEFB 47h ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" ; Similar to __STORE_STR, but this one is called when ; the value of B$ if already duplicated onto the stack. ; So we needn't call STRASSING to create a duplication ; HL = address of string memory variable ; DE = address of 2n string. It just copies DE into (HL) ; freeing (HL) previously. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -134,7 +132,7 @@ _a: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -241,7 +239,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; --------------------------------------------------------------------- ; MEM_FREE ; Frees a block of memory @@ -340,7 +338,7 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 9 "/zxbasic/src/arch/zx48k/library-asm/storestr2.asm" +#line 9 "/zxbasic/src/lib/arch/zx48k/runtime/storestr2.asm" push namespace core __PISTORE_STR2: ; Indirect store temporary string at (IX + BC) push ix @@ -367,8 +365,8 @@ __STORE_STR2: dec hl ; HL points to mem address variable. This might be useful in the future. ret pop namespace -#line 40 "substr_expr2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 40 "arch/zx48k/substr_expr2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" ; String slicing library ; HL = Str pointer ; DE = String start @@ -382,7 +380,7 @@ __STORE_STR2: ; it in dynamic memory if needed). Returns pointer (HL) to resulting ; string. NULL (0) if no memory for padding. ; -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -397,8 +395,8 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 18 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 18 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -458,7 +456,7 @@ __STRLEN: ; Direct FASTCALL entry ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -492,7 +490,7 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -523,9 +521,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -590,7 +588,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 19 "/zxbasic/src/arch/zx48k/library-asm/strslice.asm" +#line 19 "/zxbasic/src/lib/arch/zx48k/runtime/strslice.asm" push namespace core __STRSLICE: ; Callee entry pop hl ; Return ADDRESS @@ -662,5 +660,5 @@ __FREE_ON_EXIT: ret ENDP pop namespace -#line 41 "substr_expr2.bas" +#line 41 "arch/zx48k/substr_expr2.bas" END diff --git a/tests/functional/arch/zx48k/substrlval.asm b/tests/functional/arch/zx48k/substrlval.asm index e1d45be52..a18630361 100644 --- a/tests/functional/arch/zx48k/substrlval.asm +++ b/tests/functional/arch/zx48k/substrlval.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/subu32c.asm b/tests/functional/arch/zx48k/subu32c.asm index 7868e7f77..a7f1ad3ec 100644 --- a/tests/functional/arch/zx48k/subu32c.asm +++ b/tests/functional/arch/zx48k/subu32c.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -84,7 +82,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/sub32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL ; Pops operand out of the stack (CALLEE) @@ -110,8 +108,8 @@ __SUB32: exx ret pop namespace -#line 54 "subu32c.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 54 "arch/zx48k/subu32c.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -128,5 +126,5 @@ __SWAP32: push bc ret pop namespace -#line 55 "subu32c.bas" +#line 55 "arch/zx48k/subu32c.bas" END diff --git a/tests/functional/arch/zx48k/swap32.asm b/tests/functional/arch/zx48k/swap32.asm index 0c89c7e59..50fb3f55d 100644 --- a/tests/functional/arch/zx48k/swap32.asm +++ b/tests/functional/arch/zx48k/swap32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,8 +48,8 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -76,7 +74,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/div32.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/arith/div32.asm" ; --------------------------------------------------------- push namespace core __DIVU32: ; 32 bit unsigned division @@ -189,8 +187,8 @@ __MODI32: ; 32bits signed division modulus call __DIVI32START jp __MODU32START pop namespace -#line 27 "swap32.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/swap32.asm" +#line 27 "arch/zx48k/swap32.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/swap32.asm" ; Exchanges current DE HL with the ; ones in the stack push namespace core @@ -207,5 +205,5 @@ __SWAP32: push bc ret pop namespace -#line 28 "swap32.bas" +#line 28 "arch/zx48k/swap32.bas" END diff --git a/tests/functional/arch/zx48k/sys_letarrsubstr0.asm b/tests/functional/arch/zx48k/sys_letarrsubstr0.asm index 1de18ce43..ae3a7ea95 100644 --- a/tests/functional/arch/zx48k/sys_letarrsubstr0.asm +++ b/tests/functional/arch/zx48k/sys_letarrsubstr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sys_letarrsubstr1.asm b/tests/functional/arch/zx48k/sys_letarrsubstr1.asm index 59a4f6b52..344d7e27d 100644 --- a/tests/functional/arch/zx48k/sys_letarrsubstr1.asm +++ b/tests/functional/arch/zx48k/sys_letarrsubstr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sys_letarrsubstr2.asm b/tests/functional/arch/zx48k/sys_letarrsubstr2.asm index 85cab0cd0..dde9a811b 100644 --- a/tests/functional/arch/zx48k/sys_letarrsubstr2.asm +++ b/tests/functional/arch/zx48k/sys_letarrsubstr2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sys_letsubstr0.asm b/tests/functional/arch/zx48k/sys_letsubstr0.asm index c0d85c89b..502fb3779 100644 --- a/tests/functional/arch/zx48k/sys_letsubstr0.asm +++ b/tests/functional/arch/zx48k/sys_letsubstr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sys_letsubstr1.asm b/tests/functional/arch/zx48k/sys_letsubstr1.asm index 54b48d93e..8445a3cbd 100644 --- a/tests/functional/arch/zx48k/sys_letsubstr1.asm +++ b/tests/functional/arch/zx48k/sys_letsubstr1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/sys_letsubstr2.asm b/tests/functional/arch/zx48k/sys_letsubstr2.asm index c5662886f..90ecda815 100644 --- a/tests/functional/arch/zx48k/sys_letsubstr2.asm +++ b/tests/functional/arch/zx48k/sys_letsubstr2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/tap_00.tap b/tests/functional/arch/zx48k/tap_00.tap index b6c56abb9..9de85255f 100644 Binary files a/tests/functional/arch/zx48k/tap_00.tap and b/tests/functional/arch/zx48k/tap_00.tap differ diff --git a/tests/functional/arch/zx48k/tap_01.tap b/tests/functional/arch/zx48k/tap_01.tap index 8960ceec5..77354805c 100644 Binary files a/tests/functional/arch/zx48k/tap_01.tap and b/tests/functional/arch/zx48k/tap_01.tap differ diff --git a/tests/functional/arch/zx48k/tap_incbin.tap b/tests/functional/arch/zx48k/tap_incbin.tap index 533054f06..26ef024a2 100644 Binary files a/tests/functional/arch/zx48k/tap_incbin.tap and b/tests/functional/arch/zx48k/tap_incbin.tap differ diff --git a/tests/functional/arch/zx48k/tzx_00.tzx b/tests/functional/arch/zx48k/tzx_00.tzx index 59123eba1..5ecd10135 100644 Binary files a/tests/functional/arch/zx48k/tzx_00.tzx and b/tests/functional/arch/zx48k/tzx_00.tzx differ diff --git a/tests/functional/arch/zx48k/ubound0.asm b/tests/functional/arch/zx48k/ubound0.asm index 438a58fcf..d56c13b49 100644 --- a/tests/functional/arch/zx48k/ubound0.asm +++ b/tests/functional/arch/zx48k/ubound0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ubound1.asm b/tests/functional/arch/zx48k/ubound1.asm index 438a58fcf..d56c13b49 100644 --- a/tests/functional/arch/zx48k/ubound1.asm +++ b/tests/functional/arch/zx48k/ubound1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ubound10.asm b/tests/functional/arch/zx48k/ubound10.asm index a797b2013..aef8fa808 100644 --- a/tests/functional/arch/zx48k/ubound10.asm +++ b/tests/functional/arch/zx48k/ubound10.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -592,7 +590,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 92 "arch/zx48k/ubound10.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound11.asm b/tests/functional/arch/zx48k/ubound11.asm index 5b0a3ad77..092c223b5 100644 --- a/tests/functional/arch/zx48k/ubound11.asm +++ b/tests/functional/arch/zx48k/ubound11.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -608,7 +606,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 108 "arch/zx48k/ubound11.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound12.asm b/tests/functional/arch/zx48k/ubound12.asm index baf6de58f..b7ec10b9c 100644 --- a/tests/functional/arch/zx48k/ubound12.asm +++ b/tests/functional/arch/zx48k/ubound12.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/ubound2.asm b/tests/functional/arch/zx48k/ubound2.asm index 316b47d9a..0f265b180 100644 --- a/tests/functional/arch/zx48k/ubound2.asm +++ b/tests/functional/arch/zx48k/ubound2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound3.asm b/tests/functional/arch/zx48k/ubound3.asm index 1862e874a..ce0c8049f 100644 --- a/tests/functional/arch/zx48k/ubound3.asm +++ b/tests/functional/arch/zx48k/ubound3.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/ubound4.asm b/tests/functional/arch/zx48k/ubound4.asm index 2bc98f062..21844d5a3 100644 --- a/tests/functional/arch/zx48k/ubound4.asm +++ b/tests/functional/arch/zx48k/ubound4.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound5.asm b/tests/functional/arch/zx48k/ubound5.asm index 5e0993ea5..fcaa38c0e 100644 --- a/tests/functional/arch/zx48k/ubound5.asm +++ b/tests/functional/arch/zx48k/ubound5.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -68,7 +66,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound6.asm b/tests/functional/arch/zx48k/ubound6.asm index dc4fedb48..ea87e5a13 100644 --- a/tests/functional/arch/zx48k/ubound6.asm +++ b/tests/functional/arch/zx48k/ubound6.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -576,7 +574,7 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS: #line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm" pop namespace #line 76 "arch/zx48k/ubound6.bas" -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound7.asm b/tests/functional/arch/zx48k/ubound7.asm index da130b9a4..33965d034 100644 --- a/tests/functional/arch/zx48k/ubound7.asm +++ b/tests/functional/arch/zx48k/ubound7.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -103,7 +101,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound8.asm b/tests/functional/arch/zx48k/ubound8.asm index 9395bcc7a..4272d5aa9 100644 --- a/tests/functional/arch/zx48k/ubound8.asm +++ b/tests/functional/arch/zx48k/ubound8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -98,7 +96,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubound9.asm b/tests/functional/arch/zx48k/ubound9.asm index 5b36fa2a1..c1b594f9c 100644 --- a/tests/functional/arch/zx48k/ubound9.asm +++ b/tests/functional/arch/zx48k/ubound9.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -114,7 +112,7 @@ _test1__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zx48k/ubyteopt.asm b/tests/functional/arch/zx48k/ubyteopt.asm index c1b27353b..2a3c9e9f8 100644 --- a/tests/functional/arch/zx48k/ubyteopt.asm +++ b/tests/functional/arch/zx48k/ubyteopt.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/use_zxnext_asm.asm b/tests/functional/arch/zx48k/use_zxnext_asm.asm index a41b40c85..bfe70980e 100644 --- a/tests/functional/arch/zx48k/use_zxnext_asm.asm +++ b/tests/functional/arch/zx48k/use_zxnext_asm.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -20,7 +18,7 @@ .core.__LABEL__.ZXBASIC_USER_DATA EQU .core.ZXBASIC_USER_DATA .core.ZXBASIC_USER_DATA_END: .core.__MAIN_PROGRAM__: -#line 3 "use_zxnext_asm.bas" +#line 2 "arch/zx48k/use_zxnext_asm.bas" LDIX LDWS LDIRX @@ -50,7 +48,7 @@ BSRF DE,B BRLC DE,B JP (C) -#line 33 "use_zxnext_asm.bas" +#line 33 "arch/zx48k/use_zxnext_asm.bas" ld hl, 0 ld b, h ld c, l diff --git a/tests/functional/arch/zx48k/usr0.asm b/tests/functional/arch/zx48k/usr0.asm index 72f533336..0d5bea53c 100644 --- a/tests/functional/arch/zx48k/usr0.asm +++ b/tests/functional/arch/zx48k/usr0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zx48k/utf-8-bom-bas.asm b/tests/functional/arch/zx48k/utf-8-bom-bas.asm index d53ac71ef..ae238db5c 100644 --- a/tests/functional/arch/zx48k/utf-8-bom-bas.asm +++ b/tests/functional/arch/zx48k/utf-8-bom-bas.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/val_str.asm b/tests/functional/arch/zx48k/val_str.asm index 9cb9e212d..14e20e273 100644 --- a/tests/functional/arch/zx48k/val_str.asm +++ b/tests/functional/arch/zx48k/val_str.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/valcrash1.asm b/tests/functional/arch/zx48k/valcrash1.asm index b33ab4081..2a25e22e3 100644 --- a/tests/functional/arch/zx48k/valcrash1.asm +++ b/tests/functional/arch/zx48k/valcrash1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -960,9 +958,7 @@ VAL: ; Computes VAL(a$) using ROM FP-CALC ;; Now put our error handler on ERR_SP ld hl, __VAL_ERROR push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp call STK_STO_S ; Enter it on the stack ld b, 1Dh ; "VAL" rst 28h ; ROM CALC diff --git a/tests/functional/arch/zx48k/valcrash2.asm b/tests/functional/arch/zx48k/valcrash2.asm index 5fc9cda0b..f88cb5855 100644 --- a/tests/functional/arch/zx48k/valcrash2.asm +++ b/tests/functional/arch/zx48k/valcrash2.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -61,12 +59,12 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" ; INKEY Function ; Returns a string allocated in dynamic memory ; containing the string. ; An empty string otherwise. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -126,7 +124,7 @@ _b: ; HL = BLOCK Start & DE = Length. ; An init directive is useful for initialization routines. ; They will be added automatically if needed. -#line 1 "/zxbasic/src/arch/zx48k/library-asm/error.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/error.asm" ; Simple error control routines ; vim:ts=4:et: push namespace core @@ -160,8 +158,8 @@ __STOP: ld (ERR_NR), a ret pop namespace -#line 69 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/heapinit.asm" +#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -268,7 +266,7 @@ __MEM_INIT2: ret ENDP pop namespace -#line 70 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; --------------------------------------------------------------------- ; MEM_ALLOC ; Allocates a block of memory in the heap. @@ -299,9 +297,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 113 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ret z ; NULL -#line 115 "/zxbasic/src/arch/zx48k/library-asm/alloc.asm" +#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm" ; HL = Pointer to Free block ld e, (hl) inc hl @@ -366,7 +364,7 @@ __MEM_SUBTRACT: ret ENDP pop namespace -#line 7 "/zxbasic/src/arch/zx48k/library-asm/inkey.asm" +#line 7 "/zxbasic/src/lib/arch/zx48k/runtime/io/keyboard/inkey.asm" push namespace core INKEY: PROC @@ -411,8 +409,8 @@ __EMPTY_INKEY: KEY_CODE EQU 0333h ENDP pop namespace -#line 34 "valcrash2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/storef.asm" +#line 34 "arch/zx48k/valcrash2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm" push namespace core __PISTOREF: ; Indect Stores a float (A, E, D, C, B) at location stored in memory, pointed by (IX + HL) push de @@ -440,9 +438,9 @@ __STOREF: ; Stores the given FP number in A EDCB at address HL ld (hl), b ret pop namespace -#line 35 "valcrash2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/strlen.asm" +#line 35 "arch/zx48k/valcrash2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/strlen.asm" ; Returns len if a string ; If a string is NULL, its len is also 0 ; Result returned in HL @@ -457,7 +455,7 @@ __STRLEN: ; Direct FASTCALL entry ld l, a ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/strcat.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/strcat.asm" push namespace core __ADDSTR: ; Implements c$ = a$ + b$ ; hl = &a$, de = &b$ (pointers) @@ -553,9 +551,9 @@ __STRCATEND: ret ENDP pop namespace -#line 36 "valcrash2.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/val.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm" +#line 36 "arch/zx48k/valcrash2.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/val.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -713,8 +711,8 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/val.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/val.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -753,7 +751,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/val.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/val.asm" push namespace core VAL: ; Computes VAL(a$) using ROM FP-CALC ; HL = address of a$ @@ -798,9 +796,7 @@ VAL: ; Computes VAL(a$) using ROM FP-CALC ;; Now put our error handler on ERR_SP ld hl, __VAL_ERROR push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp call STK_STO_S ; Enter it on the stack ld b, 1Dh ; "VAL" rst 28h ; ROM CALC @@ -844,5 +840,5 @@ __RET_ZERO: ; Returns 0 Floating point on error ret ENDP pop namespace -#line 37 "valcrash2.bas" +#line 37 "arch/zx48k/valcrash2.bas" END diff --git a/tests/functional/arch/zx48k/warn_brk.asm b/tests/functional/arch/zx48k/warn_brk.asm index 8dba11b29..2953e7d87 100644 --- a/tests/functional/arch/zx48k/warn_brk.asm +++ b/tests/functional/arch/zx48k/warn_brk.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/warn_lbl.asm b/tests/functional/arch/zx48k/warn_lbl.asm index fce123fa3..221adf00b 100644 --- a/tests/functional/arch/zx48k/warn_lbl.asm +++ b/tests/functional/arch/zx48k/warn_lbl.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/warn_unreach0.asm b/tests/functional/arch/zx48k/warn_unreach0.asm index 7f5729b4a..22974b058 100644 --- a/tests/functional/arch/zx48k/warn_unreach0.asm +++ b/tests/functional/arch/zx48k/warn_unreach0.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/while.asm b/tests/functional/arch/zx48k/while.asm index 07ab01afa..7df45f0a2 100644 --- a/tests/functional/arch/zx48k/while.asm +++ b/tests/functional/arch/zx48k/while.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,9 +48,9 @@ _a: .LABEL.__LABEL3: jp .LABEL._20 ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ltf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/ltf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -77,7 +75,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -147,8 +145,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/ltf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/ltf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -220,8 +218,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/ltf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/ltf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -260,7 +258,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/ltf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/ltf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. @@ -280,8 +278,8 @@ __LTF: ; A < B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 30 "while.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 30 "arch/zx48k/while.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -308,5 +306,5 @@ __FP_PUSH_REV: exx ret pop namespace -#line 31 "while.bas" +#line 31 "arch/zx48k/while.bas" END diff --git a/tests/functional/arch/zx48k/whileempty1.asm b/tests/functional/arch/zx48k/whileempty1.asm index 24156f42b..c0c05cec6 100644 --- a/tests/functional/arch/zx48k/whileempty1.asm +++ b/tests/functional/arch/zx48k/whileempty1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -44,8 +42,8 @@ _i: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) @@ -67,6 +65,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm" -#line 24 "whileempty1.bas" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/lti8.asm" +#line 24 "arch/zx48k/whileempty1.bas" END diff --git a/tests/functional/arch/zx48k/whilefalse.asm b/tests/functional/arch/zx48k/whilefalse.asm index fbfd14aab..83869bb38 100644 --- a/tests/functional/arch/zx48k/whilefalse.asm +++ b/tests/functional/arch/zx48k/whilefalse.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/whilefalse1.asm b/tests/functional/arch/zx48k/whilefalse1.asm index 13385f770..2534f8faf 100644 --- a/tests/functional/arch/zx48k/whilefalse1.asm +++ b/tests/functional/arch/zx48k/whilefalse1.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/whilesplitted.asm b/tests/functional/arch/zx48k/whilesplitted.asm index 4ec54a1a3..e7af7ce82 100644 --- a/tests/functional/arch/zx48k/whilesplitted.asm +++ b/tests/functional/arch/zx48k/whilesplitted.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -65,9 +63,9 @@ _M: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/neg32.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/neg32.asm" push namespace core __ABS32: bit 7, d @@ -92,7 +90,7 @@ __NEG32: ; Negates DEHL (Two's complement) inc de ret pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/u32tofreg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/u32tofreg.asm" push namespace core __I8TOFREG: ld l, a @@ -162,8 +160,8 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/ftou32reg.asm" +#line 2 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) ; Input FP number in A EDCB (A exponent, EDCB mantissa) @@ -235,8 +233,8 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/stackf.asm" +#line 3 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC ; ------------------------------------------------------------- @@ -275,7 +273,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/arch/zx48k/library-asm/eqf.asm" +#line 4 "/zxbasic/src/lib/arch/zx48k/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. @@ -295,8 +293,8 @@ __EQF: ; A = B call __FPSTACK_POP jp __FTOU8 ; Convert to 8 bits pop namespace -#line 43 "whilesplitted.bas" -#line 1 "/zxbasic/src/arch/zx48k/library-asm/pushf.asm" +#line 43 "arch/zx48k/whilesplitted.bas" +#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/pushf.asm" ; Routine to push Float pointed by HL ; Into the stack. Notice that the hl points to the last ; byte of the FP number. @@ -323,5 +321,5 @@ __FP_PUSH_REV: exx ret pop namespace -#line 44 "whilesplitted.bas" +#line 44 "arch/zx48k/whilesplitted.bas" END diff --git a/tests/functional/arch/zx48k/whiletrue.asm b/tests/functional/arch/zx48k/whiletrue.asm index ea250641e..6ab7f74ac 100644 --- a/tests/functional/arch/zx48k/whiletrue.asm +++ b/tests/functional/arch/zx48k/whiletrue.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/xor16.asm b/tests/functional/arch/zx48k/xor16.asm index c10e1ba1c..9431ef33f 100644 --- a/tests/functional/arch/zx48k/xor16.asm +++ b/tests/functional/arch/zx48k/xor16.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/xor32.asm b/tests/functional/arch/zx48k/xor32.asm index 1647e8f05..72e951a6d 100644 --- a/tests/functional/arch/zx48k/xor32.asm +++ b/tests/functional/arch/zx48k/xor32.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/xor8.asm b/tests/functional/arch/zx48k/xor8.asm index 1a2dc1900..3e015e219 100644 --- a/tests/functional/arch/zx48k/xor8.asm +++ b/tests/functional/arch/zx48k/xor8.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/xorf.asm b/tests/functional/arch/zx48k/xorf.asm index 575df3e5e..ed514d9af 100644 --- a/tests/functional/arch/zx48k/xorf.asm +++ b/tests/functional/arch/zx48k/xorf.asm @@ -6,9 +6,7 @@ exx push hl exx - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zx48k/z80_00.z80 b/tests/functional/arch/zx48k/z80_00.z80 index c1733384c..bfae39c21 100644 Binary files a/tests/functional/arch/zx48k/z80_00.z80 and b/tests/functional/arch/zx48k/z80_00.z80 differ diff --git a/tests/functional/arch/zxnext/add16.asm b/tests/functional/arch/zxnext/add16.asm index 504d68d12..86198025e 100644 --- a/tests/functional/arch/zxnext/add16.asm +++ b/tests/functional/arch/zxnext/add16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add16a.asm b/tests/functional/arch/zxnext/add16a.asm index 129931b92..1c37f9ce8 100644 --- a/tests/functional/arch/zxnext/add16a.asm +++ b/tests/functional/arch/zxnext/add16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add16b.asm b/tests/functional/arch/zxnext/add16b.asm index a25368df8..13895a88e 100644 --- a/tests/functional/arch/zxnext/add16b.asm +++ b/tests/functional/arch/zxnext/add16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add32.asm b/tests/functional/arch/zxnext/add32.asm index fcd50b9a9..77076a597 100644 --- a/tests/functional/arch/zxnext/add32.asm +++ b/tests/functional/arch/zxnext/add32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add32a.asm b/tests/functional/arch/zxnext/add32a.asm index d35f33022..015e4c50f 100644 --- a/tests/functional/arch/zxnext/add32a.asm +++ b/tests/functional/arch/zxnext/add32a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add32b.asm b/tests/functional/arch/zxnext/add32b.asm index fd5a2a8a5..2e8c1573b 100644 --- a/tests/functional/arch/zxnext/add32b.asm +++ b/tests/functional/arch/zxnext/add32b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add8.asm b/tests/functional/arch/zxnext/add8.asm index 01ed8bb36..76ca098a3 100644 --- a/tests/functional/arch/zxnext/add8.asm +++ b/tests/functional/arch/zxnext/add8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add8a.asm b/tests/functional/arch/zxnext/add8a.asm index 1e9f3e2f5..890e3e2f5 100644 --- a/tests/functional/arch/zxnext/add8a.asm +++ b/tests/functional/arch/zxnext/add8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/add8b.asm b/tests/functional/arch/zxnext/add8b.asm index fc96cb4e0..e9b788135 100644 --- a/tests/functional/arch/zxnext/add8b.asm +++ b/tests/functional/arch/zxnext/add8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/addf.asm b/tests/functional/arch/zxnext/addf.asm index 8e26e4d59..7095c62f8 100644 --- a/tests/functional/arch/zxnext/addf.asm +++ b/tests/functional/arch/zxnext/addf.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/addf16.asm b/tests/functional/arch/zxnext/addf16.asm index 30849cbae..678e9de78 100644 --- a/tests/functional/arch/zxnext/addf16.asm +++ b/tests/functional/arch/zxnext/addf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/addf16a.asm b/tests/functional/arch/zxnext/addf16a.asm index d35f33022..015e4c50f 100644 --- a/tests/functional/arch/zxnext/addf16a.asm +++ b/tests/functional/arch/zxnext/addf16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/addf16b.asm b/tests/functional/arch/zxnext/addf16b.asm index 6f4cf1ba1..b2edde657 100644 --- a/tests/functional/arch/zxnext/addf16b.asm +++ b/tests/functional/arch/zxnext/addf16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/addstr.asm b/tests/functional/arch/zxnext/addstr.asm index 55be9b303..f89aa6e15 100644 --- a/tests/functional/arch/zxnext/addstr.asm +++ b/tests/functional/arch/zxnext/addstr.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/array00.asm b/tests/functional/arch/zxnext/array00.asm index 702f47984..94858319b 100644 --- a/tests/functional/arch/zxnext/array00.asm +++ b/tests/functional/arch/zxnext/array00.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/array01.asm b/tests/functional/arch/zxnext/array01.asm index d93e4cbc0..076f56b62 100644 --- a/tests/functional/arch/zxnext/array01.asm +++ b/tests/functional/arch/zxnext/array01.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/array02.asm b/tests/functional/arch/zxnext/array02.asm index 08d6ba9b6..57721288e 100644 --- a/tests/functional/arch/zxnext/array02.asm +++ b/tests/functional/arch/zxnext/array02.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/array03.asm b/tests/functional/arch/zxnext/array03.asm index df67f3867..9b6f3cfe8 100644 --- a/tests/functional/arch/zxnext/array03.asm +++ b/tests/functional/arch/zxnext/array03.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -59,7 +57,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -103,8 +101,8 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -133,7 +131,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -161,7 +159,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -180,7 +178,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -188,7 +186,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zxnext/array04.asm b/tests/functional/arch/zxnext/array04.asm index 558e10093..1e60075e4 100644 --- a/tests/functional/arch/zxnext/array04.asm +++ b/tests/functional/arch/zxnext/array04.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/array05.asm b/tests/functional/arch/zxnext/array05.asm index 3587628c6..c19472413 100644 --- a/tests/functional/arch/zxnext/array05.asm +++ b/tests/functional/arch/zxnext/array05.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/array06.asm b/tests/functional/arch/zxnext/array06.asm index a1033631d..3dbc676bf 100644 --- a/tests/functional/arch/zxnext/array06.asm +++ b/tests/functional/arch/zxnext/array06.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -70,7 +68,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -114,8 +112,8 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -144,7 +142,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -172,7 +170,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -191,7 +189,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -199,7 +197,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zxnext/array07.asm b/tests/functional/arch/zxnext/array07.asm index 5a5852b6c..0f18713e0 100644 --- a/tests/functional/arch/zxnext/array07.asm +++ b/tests/functional/arch/zxnext/array07.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -95,7 +93,7 @@ _test__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -139,8 +137,8 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -169,7 +167,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -197,7 +195,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -216,7 +214,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -224,7 +222,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zxnext/array08.asm b/tests/functional/arch/zxnext/array08.asm index 94d890c13..549aab9e6 100644 --- a/tests/functional/arch/zxnext/array08.asm +++ b/tests/functional/arch/zxnext/array08.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -75,7 +73,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -119,8 +117,8 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -149,7 +147,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -177,7 +175,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -196,7 +194,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -204,7 +202,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zxnext/array09.asm b/tests/functional/arch/zxnext/array09.asm index a94cefa08..cb700e325 100644 --- a/tests/functional/arch/zxnext/array09.asm +++ b/tests/functional/arch/zxnext/array09.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ @@ -75,7 +73,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ; vim: ts=4:et:sw=4: ; Copyleft (K) by Jose M. Rodriguez de la Rosa ; (a.k.a. Boriel) @@ -119,8 +117,8 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" -#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 20 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" +#line 24 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" push namespace core __ARRAY_PTR: ;; computes an array offset from a pointer ld c, (hl) @@ -149,7 +147,7 @@ __ARRAY: inc hl ld b, (hl) ; BC <-- Array __LBOUND__ PTR ld (LBOUND_PTR), bc ; Store it for later -#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 66 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ; HL <-- PTR to Dim sizes table, DE <-- dummy ex (sp), hl ; Return address in HL, PTR Dim sizes table onto Stack ld (RET_ADDR), hl ; Stores it for later @@ -177,7 +175,7 @@ LOOP: 1: pop hl ; Get next index (Ai) from the stack sbc hl, bc ; Subtract LBOUND -#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 116 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" add hl, de ; Adds current index exx ; Checks if B'C' = 0 ld a, b ; Which means we must exit (last element is not multiplied by anything) @@ -196,7 +194,7 @@ LOOP: ARRAY_END: ld a, (hl) exx -#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 146 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" LOCAL ARRAY_SIZE_LOOP ex de, hl ld hl, 0 @@ -204,7 +202,7 @@ ARRAY_END: ARRAY_SIZE_LOOP: add hl, de djnz ARRAY_SIZE_LOOP -#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array.asm" +#line 156 "/zxbasic/src/lib/arch/zxnext/runtime/array/array.asm" ex de, hl ld hl, (TMP_ARR_PTR) ld a, (hl) diff --git a/tests/functional/arch/zxnext/arraycopy0.asm b/tests/functional/arch/zxnext/arraycopy0.asm index 547ff3864..a100000a7 100644 --- a/tests/functional/arch/zxnext/arraycopy0.asm +++ b/tests/functional/arch/zxnext/arraycopy0.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/arraycopy1.asm b/tests/functional/arch/zxnext/arraycopy1.asm index f575b2854..b309f1bf9 100644 --- a/tests/functional/arch/zxnext/arraycopy1.asm +++ b/tests/functional/arch/zxnext/arraycopy1.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/arraycopy2.asm b/tests/functional/arch/zxnext/arraycopy2.asm index bedc5370f..986dc51ec 100644 --- a/tests/functional/arch/zxnext/arraycopy2.asm +++ b/tests/functional/arch/zxnext/arraycopy2.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/arraycopy3.asm b/tests/functional/arch/zxnext/arraycopy3.asm index 19b013233..9b260f639 100644 --- a/tests/functional/arch/zxnext/arraycopy3.asm +++ b/tests/functional/arch/zxnext/arraycopy3.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/arraycopy4.asm b/tests/functional/arch/zxnext/arraycopy4.asm index e2e961dcb..2220bfa37 100644 --- a/tests/functional/arch/zxnext/arraycopy4.asm +++ b/tests/functional/arch/zxnext/arraycopy4.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/arraycopy5.asm b/tests/functional/arch/zxnext/arraycopy5.asm index 6ccea1abe..650b2ab99 100644 --- a/tests/functional/arch/zxnext/arraycopy5.asm +++ b/tests/functional/arch/zxnext/arraycopy5.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/bound00.asm b/tests/functional/arch/zxnext/bound00.asm index 38076b560..536b55bbb 100644 --- a/tests/functional/arch/zxnext/bound00.asm +++ b/tests/functional/arch/zxnext/bound00.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/bound01.asm b/tests/functional/arch/zxnext/bound01.asm index 64c6ec4e7..e87636300 100644 --- a/tests/functional/arch/zxnext/bound01.asm +++ b/tests/functional/arch/zxnext/bound01.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/bound02.asm b/tests/functional/arch/zxnext/bound02.asm index d20f4e2f1..76afb9755 100644 --- a/tests/functional/arch/zxnext/bound02.asm +++ b/tests/functional/arch/zxnext/bound02.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -123,7 +121,7 @@ _a.__DATA__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zxnext/bound03.asm b/tests/functional/arch/zxnext/bound03.asm index 4a6e5ee69..60245185f 100644 --- a/tests/functional/arch/zxnext/bound03.asm +++ b/tests/functional/arch/zxnext/bound03.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -126,7 +124,7 @@ _a.__UBOUND__: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bound.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/array/arraybound.asm" ; --------------------------------------------------------- ; Copyleft (k)2011 by Jose Rodriguez (a.k.a. Boriel) ; http://www.boriel.com diff --git a/tests/functional/arch/zxnext/bound04.asm b/tests/functional/arch/zxnext/bound04.asm index a66c84257..0ddc85388 100644 --- a/tests/functional/arch/zxnext/bound04.asm +++ b/tests/functional/arch/zxnext/bound04.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/div32.asm b/tests/functional/arch/zxnext/div32.asm index c0400c71e..f73072b55 100644 --- a/tests/functional/arch/zxnext/div32.asm +++ b/tests/functional/arch/zxnext/div32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divf00.asm b/tests/functional/arch/zxnext/divf00.asm index fc9ddbacf..800f362e2 100644 --- a/tests/functional/arch/zxnext/divf00.asm +++ b/tests/functional/arch/zxnext/divf00.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -144,9 +142,7 @@ __DIVF: ; Division ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h defb 01h ; EXCHANGE diff --git a/tests/functional/arch/zxnext/divf01.asm b/tests/functional/arch/zxnext/divf01.asm index e0b417700..31baaf880 100644 --- a/tests/functional/arch/zxnext/divf01.asm +++ b/tests/functional/arch/zxnext/divf01.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -148,9 +146,7 @@ __DIVF: ; Division ld (TMP), hl ld hl, __DIVBYZERO push hl - ld hl, 0 - add hl, sp - ld (ERR_SP), hl + ld (ERR_SP), sp ; ------------- ROM DIV rst 28h defb 01h ; EXCHANGE diff --git a/tests/functional/arch/zxnext/divf16.asm b/tests/functional/arch/zxnext/divf16.asm index 7340ea501..6b6723e23 100644 --- a/tests/functional/arch/zxnext/divf16.asm +++ b/tests/functional/arch/zxnext/divf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divf16a.asm b/tests/functional/arch/zxnext/divf16a.asm index a4d8adf73..ef662a0dd 100644 --- a/tests/functional/arch/zxnext/divf16a.asm +++ b/tests/functional/arch/zxnext/divf16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divf16b.asm b/tests/functional/arch/zxnext/divf16b.asm index 0e63242a9..d17b750f4 100644 --- a/tests/functional/arch/zxnext/divf16b.asm +++ b/tests/functional/arch/zxnext/divf16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divf16c.asm b/tests/functional/arch/zxnext/divf16c.asm index 043eb4860..18191336f 100644 --- a/tests/functional/arch/zxnext/divf16c.asm +++ b/tests/functional/arch/zxnext/divf16c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi16a.asm b/tests/functional/arch/zxnext/divi16a.asm index bd84b4ef3..ee8c86523 100644 --- a/tests/functional/arch/zxnext/divi16a.asm +++ b/tests/functional/arch/zxnext/divi16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi16b.asm b/tests/functional/arch/zxnext/divi16b.asm index 5ed15c322..8f574f369 100644 --- a/tests/functional/arch/zxnext/divi16b.asm +++ b/tests/functional/arch/zxnext/divi16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi32c.asm b/tests/functional/arch/zxnext/divi32c.asm index e9360bd2a..f6b2fb51d 100644 --- a/tests/functional/arch/zxnext/divi32c.asm +++ b/tests/functional/arch/zxnext/divi32c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi8.asm b/tests/functional/arch/zxnext/divi8.asm index f8a0483e3..9b68aafde 100644 --- a/tests/functional/arch/zxnext/divi8.asm +++ b/tests/functional/arch/zxnext/divi8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi8a.asm b/tests/functional/arch/zxnext/divi8a.asm index 77a1ebba2..1b2fe13d6 100644 --- a/tests/functional/arch/zxnext/divi8a.asm +++ b/tests/functional/arch/zxnext/divi8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divi8b.asm b/tests/functional/arch/zxnext/divi8b.asm index 86c255297..4eac0033a 100644 --- a/tests/functional/arch/zxnext/divi8b.asm +++ b/tests/functional/arch/zxnext/divi8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu16.asm b/tests/functional/arch/zxnext/divu16.asm index fcd52c9fe..5084ee7f8 100644 --- a/tests/functional/arch/zxnext/divu16.asm +++ b/tests/functional/arch/zxnext/divu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu16a.asm b/tests/functional/arch/zxnext/divu16a.asm index 92eb97fe2..b0e494c83 100644 --- a/tests/functional/arch/zxnext/divu16a.asm +++ b/tests/functional/arch/zxnext/divu16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu16b.asm b/tests/functional/arch/zxnext/divu16b.asm index fb758ece6..0945964d4 100644 --- a/tests/functional/arch/zxnext/divu16b.asm +++ b/tests/functional/arch/zxnext/divu16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu32c.asm b/tests/functional/arch/zxnext/divu32c.asm index ff6876254..9a8a31f85 100644 --- a/tests/functional/arch/zxnext/divu32c.asm +++ b/tests/functional/arch/zxnext/divu32c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu8.asm b/tests/functional/arch/zxnext/divu8.asm index 225956ed6..b27a42334 100644 --- a/tests/functional/arch/zxnext/divu8.asm +++ b/tests/functional/arch/zxnext/divu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu8a.asm b/tests/functional/arch/zxnext/divu8a.asm index 6b9739783..bd80b4dba 100644 --- a/tests/functional/arch/zxnext/divu8a.asm +++ b/tests/functional/arch/zxnext/divu8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/divu8b.asm b/tests/functional/arch/zxnext/divu8b.asm index 9d13c2d4b..fc153b041 100644 --- a/tests/functional/arch/zxnext/divu8b.asm +++ b/tests/functional/arch/zxnext/divu8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/equ16.asm b/tests/functional/arch/zxnext/equ16.asm index b317f0513..f907422c1 100644 --- a/tests/functional/arch/zxnext/equ16.asm +++ b/tests/functional/arch/zxnext/equ16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -39,7 +37,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/eq16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/eq16.asm" push namespace core __EQ16: ; Test if 16bit values HL == DE ; Returns result in A: 0 = False, FF = True diff --git a/tests/functional/arch/zxnext/equ32.asm b/tests/functional/arch/zxnext/equ32.asm index 8b687a192..71655f014 100644 --- a/tests/functional/arch/zxnext/equ32.asm +++ b/tests/functional/arch/zxnext/equ32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -50,7 +48,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/eq32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/eq32.asm" push namespace core __EQ32: ; Test if 32bit value HLDE equals top of the stack ; Returns result in A: 0 = False, FF = True diff --git a/tests/functional/arch/zxnext/equ8.asm b/tests/functional/arch/zxnext/equ8.asm index 46522e374..30e1ddb7e 100644 --- a/tests/functional/arch/zxnext/equ8.asm +++ b/tests/functional/arch/zxnext/equ8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/equf.asm b/tests/functional/arch/zxnext/equf.asm index 427f8dcce..f38199460 100644 --- a/tests/functional/arch/zxnext/equf.asm +++ b/tests/functional/arch/zxnext/equf.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ __ADDF: ; Addition jp __FPSTACK_POP pop namespace #line 30 "arch/zxnext/equf.bas" -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/eqf.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/neg32.asm" push namespace core @@ -203,7 +201,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/eqf.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/eqf.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -276,7 +274,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/eqf.asm" +#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/eqf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses C EDHL registers as 1st paramter. diff --git a/tests/functional/arch/zxnext/fact.asm b/tests/functional/arch/zxnext/fact.asm index 53f8ee768..5b1a93ff3 100644 --- a/tests/functional/arch/zxnext/fact.asm +++ b/tests/functional/arch/zxnext/fact.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/fp_pow.asm b/tests/functional/arch/zxnext/fp_pow.asm index 9cbfd742b..9d55ae1d6 100644 --- a/tests/functional/arch/zxnext/fp_pow.asm +++ b/tests/functional/arch/zxnext/fp_pow.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -38,7 +36,7 @@ _x: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/pow.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/math/pow.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -78,7 +76,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/pow.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/math/pow.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zxnext/gef.asm b/tests/functional/arch/zxnext/gef.asm index b267aebd7..986f82c22 100644 --- a/tests/functional/arch/zxnext/gef.asm +++ b/tests/functional/arch/zxnext/gef.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -99,7 +97,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/gef.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/neg32.asm" push namespace core @@ -196,7 +194,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/gef.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -269,7 +267,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/gef.asm" +#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gef.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -309,7 +307,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/lib/arch/zxnext/runtime/gef.asm" +#line 4 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gef.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zxnext/gef16.asm b/tests/functional/arch/zxnext/gef16.asm index ddebc2790..55090532f 100644 --- a/tests/functional/arch/zxnext/gef16.asm +++ b/tests/functional/arch/zxnext/gef16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gei16.asm b/tests/functional/arch/zxnext/gei16.asm index 28524ab63..8dde9d0fe 100644 --- a/tests/functional/arch/zxnext/gei16.asm +++ b/tests/functional/arch/zxnext/gei16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,7 +64,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lei16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei16.asm" push namespace core __LEI16: PROC diff --git a/tests/functional/arch/zxnext/gei32.asm b/tests/functional/arch/zxnext/gei32.asm index 6b8d9bb0b..cf153f38b 100644 --- a/tests/functional/arch/zxnext/gei32.asm +++ b/tests/functional/arch/zxnext/gei32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gei8.asm b/tests/functional/arch/zxnext/gei8.asm index 09d3f158e..991252ec8 100644 --- a/tests/functional/arch/zxnext/gei8.asm +++ b/tests/functional/arch/zxnext/gei8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/geu16.asm b/tests/functional/arch/zxnext/geu16.asm index 5395c35b6..1458c6f89 100644 --- a/tests/functional/arch/zxnext/geu16.asm +++ b/tests/functional/arch/zxnext/geu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/geu32.asm b/tests/functional/arch/zxnext/geu32.asm index 8fdc17539..ce0f8ad1a 100644 --- a/tests/functional/arch/zxnext/geu32.asm +++ b/tests/functional/arch/zxnext/geu32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/geu8.asm b/tests/functional/arch/zxnext/geu8.asm index 9ecf7b623..c1e236ec0 100644 --- a/tests/functional/arch/zxnext/geu8.asm +++ b/tests/functional/arch/zxnext/geu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gtf.asm b/tests/functional/arch/zxnext/gtf.asm index 12fff5687..4abfa4c04 100644 --- a/tests/functional/arch/zxnext/gtf.asm +++ b/tests/functional/arch/zxnext/gtf.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -86,7 +84,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/gtf.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/u32tofreg.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/neg32.asm" push namespace core @@ -183,7 +181,7 @@ __U32TOFREG_END: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/gtf.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/ftou32reg.asm" push namespace core __FTOU32REG: ; Converts a Float to (un)signed 32 bit integer (NOTE: It's ALWAYS 32 bit signed) @@ -256,7 +254,7 @@ __FTOU8: ; Converts float in C ED LH to Unsigned byte in A ld a, l ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/gtf.asm" +#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gtf.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/stackf.asm" ; ------------------------------------------------------------- ; Functions to manage FP-Stack of the ZX Spectrum ROM CALC @@ -296,7 +294,7 @@ __FPSTACK_I16: ; Pushes 16 bits integer in HL into the FP ROM STACK ld b, a jp __FPSTACK_PUSH pop namespace -#line 4 "/zxbasic/src/lib/arch/zxnext/runtime/gtf.asm" +#line 4 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/gtf.asm" ; ------------------------------------------------------------- ; Floating point library using the FP ROM Calculator (ZX 48K) ; All of them uses A EDCB registers as 1st paramter. diff --git a/tests/functional/arch/zxnext/gtf16.asm b/tests/functional/arch/zxnext/gtf16.asm index bea145f4e..798b17d75 100644 --- a/tests/functional/arch/zxnext/gtf16.asm +++ b/tests/functional/arch/zxnext/gtf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gti16.asm b/tests/functional/arch/zxnext/gti16.asm index 9af632812..df9a35e4b 100644 --- a/tests/functional/arch/zxnext/gti16.asm +++ b/tests/functional/arch/zxnext/gti16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -66,7 +64,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lti16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti16.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -89,7 +87,7 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/lti16.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti16.asm" push namespace core __LTI16: ; Test 8 bit values HL < DE ; Returns result in A: 0 = False, !0 = True diff --git a/tests/functional/arch/zxnext/gti32.asm b/tests/functional/arch/zxnext/gti32.asm index c5c11c0c6..3729236b1 100644 --- a/tests/functional/arch/zxnext/gti32.asm +++ b/tests/functional/arch/zxnext/gti32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gti8.asm b/tests/functional/arch/zxnext/gti8.asm index 43eec3e7e..2bd95450b 100644 --- a/tests/functional/arch/zxnext/gti8.asm +++ b/tests/functional/arch/zxnext/gti8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -38,7 +36,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti8.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -61,6 +59,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/lti8.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti8.asm" #line 21 "arch/zxnext/gti8.bas" END diff --git a/tests/functional/arch/zxnext/gtu16.asm b/tests/functional/arch/zxnext/gtu16.asm index b723f52c5..b56680403 100644 --- a/tests/functional/arch/zxnext/gtu16.asm +++ b/tests/functional/arch/zxnext/gtu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gtu32.asm b/tests/functional/arch/zxnext/gtu32.asm index cb6a257fc..bf8f6dac4 100644 --- a/tests/functional/arch/zxnext/gtu32.asm +++ b/tests/functional/arch/zxnext/gtu32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/gtu8.asm b/tests/functional/arch/zxnext/gtu8.asm index 9cd11cabc..4d8615148 100644 --- a/tests/functional/arch/zxnext/gtu8.asm +++ b/tests/functional/arch/zxnext/gtu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/inkey.asm b/tests/functional/arch/zxnext/inkey.asm index 7d92ae0b0..a40b9b34e 100644 --- a/tests/functional/arch/zxnext/inkey.asm +++ b/tests/functional/arch/zxnext/inkey.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/lbound12.asm b/tests/functional/arch/zxnext/lbound12.asm index bd7b8459d..e1f60398b 100644 --- a/tests/functional/arch/zxnext/lbound12.asm +++ b/tests/functional/arch/zxnext/lbound12.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/lef.asm b/tests/functional/arch/zxnext/lef.asm index 954c731bd..ed4011f65 100644 --- a/tests/functional/arch/zxnext/lef.asm +++ b/tests/functional/arch/zxnext/lef.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/lei16.asm b/tests/functional/arch/zxnext/lei16.asm index a9a6d048b..4ff55c462 100644 --- a/tests/functional/arch/zxnext/lei16.asm +++ b/tests/functional/arch/zxnext/lei16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -73,7 +71,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lei16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei16.asm" push namespace core __LEI16: PROC diff --git a/tests/functional/arch/zxnext/lei32.asm b/tests/functional/arch/zxnext/lei32.asm index 46f8255be..c797304f2 100644 --- a/tests/functional/arch/zxnext/lei32.asm +++ b/tests/functional/arch/zxnext/lei32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lei32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei32.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL @@ -133,7 +131,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/lei32.asm" +#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei32.asm" push namespace core __LEI32: ; Test 32 bit values Top of the stack <= HL,DE PROC diff --git a/tests/functional/arch/zxnext/lei8.asm b/tests/functional/arch/zxnext/lei8.asm index 59dbb0659..d1946982b 100644 --- a/tests/functional/arch/zxnext/lei8.asm +++ b/tests/functional/arch/zxnext/lei8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -58,7 +56,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lei8.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int ; A <= H (registers) diff --git a/tests/functional/arch/zxnext/leu8.asm b/tests/functional/arch/zxnext/leu8.asm index f4c9678a8..11f0b5bfb 100644 --- a/tests/functional/arch/zxnext/leu8.asm +++ b/tests/functional/arch/zxnext/leu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ltf.asm b/tests/functional/arch/zxnext/ltf.asm index 62051735a..9579e6f8b 100644 --- a/tests/functional/arch/zxnext/ltf.asm +++ b/tests/functional/arch/zxnext/ltf.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ltf16.asm b/tests/functional/arch/zxnext/ltf16.asm index 1e3c27559..c5cc87d85 100644 --- a/tests/functional/arch/zxnext/ltf16.asm +++ b/tests/functional/arch/zxnext/ltf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/lti16.asm b/tests/functional/arch/zxnext/lti16.asm index 65350349c..c84f86f2d 100644 --- a/tests/functional/arch/zxnext/lti16.asm +++ b/tests/functional/arch/zxnext/lti16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -73,7 +71,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lti16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti16.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -96,7 +94,7 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/lti16.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti16.asm" push namespace core __LTI16: ; Test 8 bit values HL < DE ; Returns result in A: 0 = False, !0 = True diff --git a/tests/functional/arch/zxnext/lti32.asm b/tests/functional/arch/zxnext/lti32.asm index 532646bda..8664b6a11 100644 --- a/tests/functional/arch/zxnext/lti32.asm +++ b/tests/functional/arch/zxnext/lti32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -106,7 +104,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lti32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti32.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/arith/sub32.asm" ; SUB32 ; Perform TOP of the stack - DEHL @@ -133,7 +131,7 @@ __SUB32: exx ret pop namespace -#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/lti32.asm" +#line 3 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti32.asm" push namespace core __LTI32: ; Test 32 bit values in Top of the stack < HLDE PROC diff --git a/tests/functional/arch/zxnext/lti8.asm b/tests/functional/arch/zxnext/lti8.asm index c28f86053..4ac4cfa69 100644 --- a/tests/functional/arch/zxnext/lti8.asm +++ b/tests/functional/arch/zxnext/lti8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -58,7 +56,7 @@ _l: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/lti8.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti8.asm" #line 1 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lei8.asm" push namespace core __LEI8: ; Signed <= comparison for 8bit int @@ -81,6 +79,6 @@ checkParity: ret ENDP pop namespace -#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/lti8.asm" +#line 2 "/zxbasic/src/lib/arch/zxnext/runtime/cmp/lti8.asm" #line 37 "arch/zxnext/lti8.bas" END diff --git a/tests/functional/arch/zxnext/ltu16.asm b/tests/functional/arch/zxnext/ltu16.asm index 323aece6d..a7c99364e 100644 --- a/tests/functional/arch/zxnext/ltu16.asm +++ b/tests/functional/arch/zxnext/ltu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ltu32.asm b/tests/functional/arch/zxnext/ltu32.asm index 0ce158060..62861b6ba 100644 --- a/tests/functional/arch/zxnext/ltu32.asm +++ b/tests/functional/arch/zxnext/ltu32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ltu8.asm b/tests/functional/arch/zxnext/ltu8.asm index 86f2eb562..c2b2b3ddf 100644 --- a/tests/functional/arch/zxnext/ltu8.asm +++ b/tests/functional/arch/zxnext/ltu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_acs.asm b/tests/functional/arch/zxnext/math_acs.asm index b8f383cc3..604bf95ca 100644 --- a/tests/functional/arch/zxnext/math_acs.asm +++ b/tests/functional/arch/zxnext/math_acs.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_asn.asm b/tests/functional/arch/zxnext/math_asn.asm index d12e84233..bed192cad 100644 --- a/tests/functional/arch/zxnext/math_asn.asm +++ b/tests/functional/arch/zxnext/math_asn.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_atn.asm b/tests/functional/arch/zxnext/math_atn.asm index c5ff020f7..8ff1a0d4b 100644 --- a/tests/functional/arch/zxnext/math_atn.asm +++ b/tests/functional/arch/zxnext/math_atn.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_cos.asm b/tests/functional/arch/zxnext/math_cos.asm index 0030d4dd4..73df41178 100644 --- a/tests/functional/arch/zxnext/math_cos.asm +++ b/tests/functional/arch/zxnext/math_cos.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_exp.asm b/tests/functional/arch/zxnext/math_exp.asm index 6666d3f0c..62c36c45c 100644 --- a/tests/functional/arch/zxnext/math_exp.asm +++ b/tests/functional/arch/zxnext/math_exp.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_ln.asm b/tests/functional/arch/zxnext/math_ln.asm index d11c5951c..af73787da 100644 --- a/tests/functional/arch/zxnext/math_ln.asm +++ b/tests/functional/arch/zxnext/math_ln.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_sin.asm b/tests/functional/arch/zxnext/math_sin.asm index 3205b022c..cc8e3ea87 100644 --- a/tests/functional/arch/zxnext/math_sin.asm +++ b/tests/functional/arch/zxnext/math_sin.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_sqr.asm b/tests/functional/arch/zxnext/math_sqr.asm index 1f9d8a871..095fab375 100644 --- a/tests/functional/arch/zxnext/math_sqr.asm +++ b/tests/functional/arch/zxnext/math_sqr.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/math_tan.asm b/tests/functional/arch/zxnext/math_tan.asm index 9acbbc75d..859e9ae9a 100644 --- a/tests/functional/arch/zxnext/math_tan.asm +++ b/tests/functional/arch/zxnext/math_tan.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modf.asm b/tests/functional/arch/zxnext/modf.asm index 98994a2c7..c78b9ea75 100644 --- a/tests/functional/arch/zxnext/modf.asm +++ b/tests/functional/arch/zxnext/modf.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modf16.asm b/tests/functional/arch/zxnext/modf16.asm index a56b2561a..c9154228b 100644 --- a/tests/functional/arch/zxnext/modf16.asm +++ b/tests/functional/arch/zxnext/modf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modf16c.asm b/tests/functional/arch/zxnext/modf16c.asm index b753f795f..51183c80a 100644 --- a/tests/functional/arch/zxnext/modf16c.asm +++ b/tests/functional/arch/zxnext/modf16c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modi32c.asm b/tests/functional/arch/zxnext/modi32c.asm index 0b68bc1aa..501158e1a 100644 --- a/tests/functional/arch/zxnext/modi32c.asm +++ b/tests/functional/arch/zxnext/modi32c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modi8.asm b/tests/functional/arch/zxnext/modi8.asm index b18224a09..390dfdbed 100644 --- a/tests/functional/arch/zxnext/modi8.asm +++ b/tests/functional/arch/zxnext/modi8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modi8a.asm b/tests/functional/arch/zxnext/modi8a.asm index 873ce1b60..c8193f9c7 100644 --- a/tests/functional/arch/zxnext/modi8a.asm +++ b/tests/functional/arch/zxnext/modi8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modi8b.asm b/tests/functional/arch/zxnext/modi8b.asm index 1ccfb2a59..9b682ac45 100644 --- a/tests/functional/arch/zxnext/modi8b.asm +++ b/tests/functional/arch/zxnext/modi8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modu32c.asm b/tests/functional/arch/zxnext/modu32c.asm index 9f3f14a4c..f376e8117 100644 --- a/tests/functional/arch/zxnext/modu32c.asm +++ b/tests/functional/arch/zxnext/modu32c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modu8.asm b/tests/functional/arch/zxnext/modu8.asm index f4e27b810..acf6fd419 100644 --- a/tests/functional/arch/zxnext/modu8.asm +++ b/tests/functional/arch/zxnext/modu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modu8a.asm b/tests/functional/arch/zxnext/modu8a.asm index a2193e96d..01cae54e7 100644 --- a/tests/functional/arch/zxnext/modu8a.asm +++ b/tests/functional/arch/zxnext/modu8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/modu8b.asm b/tests/functional/arch/zxnext/modu8b.asm index ff2872244..cc3112a80 100644 --- a/tests/functional/arch/zxnext/modu8b.asm +++ b/tests/functional/arch/zxnext/modu8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul16.asm b/tests/functional/arch/zxnext/mul16.asm index 922640566..941f4d432 100644 --- a/tests/functional/arch/zxnext/mul16.asm +++ b/tests/functional/arch/zxnext/mul16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul16a.asm b/tests/functional/arch/zxnext/mul16a.asm index 84aa20adb..805eb2686 100644 --- a/tests/functional/arch/zxnext/mul16a.asm +++ b/tests/functional/arch/zxnext/mul16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul16b.asm b/tests/functional/arch/zxnext/mul16b.asm index 8e35b9176..1b7c5aea7 100644 --- a/tests/functional/arch/zxnext/mul16b.asm +++ b/tests/functional/arch/zxnext/mul16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul16c.asm b/tests/functional/arch/zxnext/mul16c.asm index cf07644d6..3cb09d496 100644 --- a/tests/functional/arch/zxnext/mul16c.asm +++ b/tests/functional/arch/zxnext/mul16c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul8.asm b/tests/functional/arch/zxnext/mul8.asm index f311e33a3..ccf2db0e1 100644 --- a/tests/functional/arch/zxnext/mul8.asm +++ b/tests/functional/arch/zxnext/mul8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul8a.asm b/tests/functional/arch/zxnext/mul8a.asm index ab49568e0..beb814252 100644 --- a/tests/functional/arch/zxnext/mul8a.asm +++ b/tests/functional/arch/zxnext/mul8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mul8b.asm b/tests/functional/arch/zxnext/mul8b.asm index ddf1f9e59..a6cd188e5 100644 --- a/tests/functional/arch/zxnext/mul8b.asm +++ b/tests/functional/arch/zxnext/mul8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mulf00.asm b/tests/functional/arch/zxnext/mulf00.asm index fef7656fb..dd3cc7166 100644 --- a/tests/functional/arch/zxnext/mulf00.asm +++ b/tests/functional/arch/zxnext/mulf00.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mulf01.asm b/tests/functional/arch/zxnext/mulf01.asm index 0c16be709..f10d744e4 100644 --- a/tests/functional/arch/zxnext/mulf01.asm +++ b/tests/functional/arch/zxnext/mulf01.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mulf16.asm b/tests/functional/arch/zxnext/mulf16.asm index 484e245ff..af0617336 100644 --- a/tests/functional/arch/zxnext/mulf16.asm +++ b/tests/functional/arch/zxnext/mulf16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mulf16a.asm b/tests/functional/arch/zxnext/mulf16a.asm index a6874b617..a03907b20 100644 --- a/tests/functional/arch/zxnext/mulf16a.asm +++ b/tests/functional/arch/zxnext/mulf16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/muli8.asm b/tests/functional/arch/zxnext/muli8.asm index 8d1a07cd8..e486b06e0 100644 --- a/tests/functional/arch/zxnext/muli8.asm +++ b/tests/functional/arch/zxnext/muli8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/mulu16.asm b/tests/functional/arch/zxnext/mulu16.asm index c8029b9dc..7fa21b93f 100644 --- a/tests/functional/arch/zxnext/mulu16.asm +++ b/tests/functional/arch/zxnext/mulu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -34,7 +32,7 @@ _a: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -62,5 +60,5 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 17 "zxnext/mulu16.bas" +#line 17 "arch/zxnext/mulu16.bas" END diff --git a/tests/functional/arch/zxnext/mulu8.asm b/tests/functional/arch/zxnext/mulu8.asm index 8d1a07cd8..e486b06e0 100644 --- a/tests/functional/arch/zxnext/mulu8.asm +++ b/tests/functional/arch/zxnext/mulu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/nef.asm b/tests/functional/arch/zxnext/nef.asm index 142490f3e..3863529bb 100644 --- a/tests/functional/arch/zxnext/nef.asm +++ b/tests/functional/arch/zxnext/nef.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/nef16.asm b/tests/functional/arch/zxnext/nef16.asm index e7db86298..10da00185 100644 --- a/tests/functional/arch/zxnext/nef16.asm +++ b/tests/functional/arch/zxnext/nef16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/nei16.asm b/tests/functional/arch/zxnext/nei16.asm index e4d62f530..a6e3d98a6 100644 --- a/tests/functional/arch/zxnext/nei16.asm +++ b/tests/functional/arch/zxnext/nei16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/nei32.asm b/tests/functional/arch/zxnext/nei32.asm index 1b5c36f1c..24937d453 100644 --- a/tests/functional/arch/zxnext/nei32.asm +++ b/tests/functional/arch/zxnext/nei32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/nei8.asm b/tests/functional/arch/zxnext/nei8.asm index 1d2ca4656..ed24f61eb 100644 --- a/tests/functional/arch/zxnext/nei8.asm +++ b/tests/functional/arch/zxnext/nei8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/neu16.asm b/tests/functional/arch/zxnext/neu16.asm index e4d62f530..a6e3d98a6 100644 --- a/tests/functional/arch/zxnext/neu16.asm +++ b/tests/functional/arch/zxnext/neu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/neu32.asm b/tests/functional/arch/zxnext/neu32.asm index 4b9de524b..671d73f83 100644 --- a/tests/functional/arch/zxnext/neu32.asm +++ b/tests/functional/arch/zxnext/neu32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/neu8.asm b/tests/functional/arch/zxnext/neu8.asm index 1d2ca4656..ed24f61eb 100644 --- a/tests/functional/arch/zxnext/neu8.asm +++ b/tests/functional/arch/zxnext/neu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/opt1_beep_const.asm b/tests/functional/arch/zxnext/opt1_beep_const.asm index 41c4e2617..18b3cf7cd 100644 --- a/tests/functional/arch/zxnext/opt1_beep_const.asm +++ b/tests/functional/arch/zxnext/opt1_beep_const.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/opt1_beep_var.asm b/tests/functional/arch/zxnext/opt1_beep_var.asm index 2045d029b..708541a68 100644 --- a/tests/functional/arch/zxnext/opt1_beep_var.asm +++ b/tests/functional/arch/zxnext/opt1_beep_var.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/opt2_epilogue.asm b/tests/functional/arch/zxnext/opt2_epilogue.asm index 632cd7034..0ed63264c 100644 --- a/tests/functional/arch/zxnext/opt2_epilogue.asm +++ b/tests/functional/arch/zxnext/opt2_epilogue.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/opt4_mul8.asm b/tests/functional/arch/zxnext/opt4_mul8.asm index f25346ee3..a698591de 100644 --- a/tests/functional/arch/zxnext/opt4_mul8.asm +++ b/tests/functional/arch/zxnext/opt4_mul8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -55,7 +53,7 @@ _printTest__leave: exx ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/mul16.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/arith/mul16.asm" push namespace core __MUL16: ; Mutiplies HL with the last value stored into de stack ; Works for both signed and unsigned @@ -83,5 +81,5 @@ __MUL16_FAST: ret ; Result in hl (16 lower bits) ENDP pop namespace -#line 36 "zxnext/opt4_mul8.bas" +#line 36 "arch/zxnext/opt4_mul8.bas" END diff --git a/tests/functional/arch/zxnext/print_f.asm b/tests/functional/arch/zxnext/print_f.asm index a5faf6e47..bde001494 100644 --- a/tests/functional/arch/zxnext/print_f.asm +++ b/tests/functional/arch/zxnext/print_f.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT call .core.__PRINT_INIT diff --git a/tests/functional/arch/zxnext/print_i16.asm b/tests/functional/arch/zxnext/print_i16.asm index 11bf1e37f..ee0bfbb6d 100644 --- a/tests/functional/arch/zxnext/print_i16.asm +++ b/tests/functional/arch/zxnext/print_i16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/print_i32.asm b/tests/functional/arch/zxnext/print_i32.asm index 5d4e904fc..efc701d22 100644 --- a/tests/functional/arch/zxnext/print_i32.asm +++ b/tests/functional/arch/zxnext/print_i32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/print_i8.asm b/tests/functional/arch/zxnext/print_i8.asm index 683f78e0b..ca2101efd 100644 --- a/tests/functional/arch/zxnext/print_i8.asm +++ b/tests/functional/arch/zxnext/print_i8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/print_u16.asm b/tests/functional/arch/zxnext/print_u16.asm index 47869ad43..305e88269 100644 --- a/tests/functional/arch/zxnext/print_u16.asm +++ b/tests/functional/arch/zxnext/print_u16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/print_u32.asm b/tests/functional/arch/zxnext/print_u32.asm index 81ff53420..3074ebe39 100644 --- a/tests/functional/arch/zxnext/print_u32.asm +++ b/tests/functional/arch/zxnext/print_u32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/print_u8.asm b/tests/functional/arch/zxnext/print_u8.asm index 1d0809d31..f53f3b604 100644 --- a/tests/functional/arch/zxnext/print_u8.asm +++ b/tests/functional/arch/zxnext/print_u8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__PRINT_INIT jp .core.__MAIN_PROGRAM__ diff --git a/tests/functional/arch/zxnext/shli16.asm b/tests/functional/arch/zxnext/shli16.asm index 058318b47..73b4dcb72 100644 --- a/tests/functional/arch/zxnext/shli16.asm +++ b/tests/functional/arch/zxnext/shli16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shli32.asm b/tests/functional/arch/zxnext/shli32.asm index 67f827e46..30d0967b9 100644 --- a/tests/functional/arch/zxnext/shli32.asm +++ b/tests/functional/arch/zxnext/shli32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,7 +59,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/shl32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bitwise/shl32.asm" push namespace core __SHL32: ; Left Logical Shift 32 bits sla l diff --git a/tests/functional/arch/zxnext/shli8.asm b/tests/functional/arch/zxnext/shli8.asm index 50753fcb5..e1c737f65 100644 --- a/tests/functional/arch/zxnext/shli8.asm +++ b/tests/functional/arch/zxnext/shli8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shlu16.asm b/tests/functional/arch/zxnext/shlu16.asm index 058318b47..73b4dcb72 100644 --- a/tests/functional/arch/zxnext/shlu16.asm +++ b/tests/functional/arch/zxnext/shlu16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shlu32.asm b/tests/functional/arch/zxnext/shlu32.asm index 7d9d99b0c..a425d6bdc 100644 --- a/tests/functional/arch/zxnext/shlu32.asm +++ b/tests/functional/arch/zxnext/shlu32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,7 +59,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/shl32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bitwise/shl32.asm" push namespace core __SHL32: ; Left Logical Shift 32 bits sla l diff --git a/tests/functional/arch/zxnext/shlu8.asm b/tests/functional/arch/zxnext/shlu8.asm index 50753fcb5..e1c737f65 100644 --- a/tests/functional/arch/zxnext/shlu8.asm +++ b/tests/functional/arch/zxnext/shlu8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shri16.asm b/tests/functional/arch/zxnext/shri16.asm index 942fd40e7..37226a741 100644 --- a/tests/functional/arch/zxnext/shri16.asm +++ b/tests/functional/arch/zxnext/shri16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shri32.asm b/tests/functional/arch/zxnext/shri32.asm index 6c6ef6e30..fa9196d85 100644 --- a/tests/functional/arch/zxnext/shri32.asm +++ b/tests/functional/arch/zxnext/shri32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,7 +59,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/shra32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bitwise/shra32.asm" push namespace core __SHRA32: ; Right Arithmetical Shift 32 bits sra d diff --git a/tests/functional/arch/zxnext/shri8.asm b/tests/functional/arch/zxnext/shri8.asm index d5c742592..f2d062a7e 100644 --- a/tests/functional/arch/zxnext/shri8.asm +++ b/tests/functional/arch/zxnext/shri8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shru16.asm b/tests/functional/arch/zxnext/shru16.asm index 6b4072f72..3d7041c77 100644 --- a/tests/functional/arch/zxnext/shru16.asm +++ b/tests/functional/arch/zxnext/shru16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/shru32.asm b/tests/functional/arch/zxnext/shru32.asm index fda8b1d2a..37c1a2996 100644 --- a/tests/functional/arch/zxnext/shru32.asm +++ b/tests/functional/arch/zxnext/shru32.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: @@ -61,7 +59,7 @@ _b: ei ret ;; --- end of user code --- -#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/shrl32.asm" +#line 1 "/zxbasic/src/lib/arch/zxnext/runtime/bitwise/shrl32.asm" push namespace core __SHRL32: ; Right Logical Shift 32 bits srl d diff --git a/tests/functional/arch/zxnext/shru8.asm b/tests/functional/arch/zxnext/shru8.asm index 3307d0a22..f8ff1fe24 100644 --- a/tests/functional/arch/zxnext/shru8.asm +++ b/tests/functional/arch/zxnext/shru8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub16.asm b/tests/functional/arch/zxnext/sub16.asm index f6e15c817..a9942eb10 100644 --- a/tests/functional/arch/zxnext/sub16.asm +++ b/tests/functional/arch/zxnext/sub16.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub16a.asm b/tests/functional/arch/zxnext/sub16a.asm index 64ade5ed0..fe1f7fecd 100644 --- a/tests/functional/arch/zxnext/sub16a.asm +++ b/tests/functional/arch/zxnext/sub16a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub16b.asm b/tests/functional/arch/zxnext/sub16b.asm index facef16bd..64b6fafe7 100644 --- a/tests/functional/arch/zxnext/sub16b.asm +++ b/tests/functional/arch/zxnext/sub16b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub8.asm b/tests/functional/arch/zxnext/sub8.asm index 7489771ff..7e2996caf 100644 --- a/tests/functional/arch/zxnext/sub8.asm +++ b/tests/functional/arch/zxnext/sub8.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub8a.asm b/tests/functional/arch/zxnext/sub8a.asm index f01492004..fe66cb13a 100644 --- a/tests/functional/arch/zxnext/sub8a.asm +++ b/tests/functional/arch/zxnext/sub8a.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/sub8b.asm b/tests/functional/arch/zxnext/sub8b.asm index 5f934f4f9..6b6f77a0b 100644 --- a/tests/functional/arch/zxnext/sub8b.asm +++ b/tests/functional/arch/zxnext/sub8b.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/subf00.asm b/tests/functional/arch/zxnext/subf00.asm index 3d3b8575f..94f097455 100644 --- a/tests/functional/arch/zxnext/subf00.asm +++ b/tests/functional/arch/zxnext/subf00.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/subf01.asm b/tests/functional/arch/zxnext/subf01.asm index 7f3d2b01e..0a144d5df 100644 --- a/tests/functional/arch/zxnext/subf01.asm +++ b/tests/functional/arch/zxnext/subf01.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/subf16c.asm b/tests/functional/arch/zxnext/subf16c.asm index 451e6ffd4..b48b19068 100644 --- a/tests/functional/arch/zxnext/subf16c.asm +++ b/tests/functional/arch/zxnext/subf16c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/subi32c.asm b/tests/functional/arch/zxnext/subi32c.asm index 7106b0129..46f18ba50 100644 --- a/tests/functional/arch/zxnext/subi32c.asm +++ b/tests/functional/arch/zxnext/subi32c.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ubound0.asm b/tests/functional/arch/zxnext/ubound0.asm index 65a2084e5..0f6d3ff2c 100644 --- a/tests/functional/arch/zxnext/ubound0.asm +++ b/tests/functional/arch/zxnext/ubound0.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei jp .core.__MAIN_PROGRAM__ .core.__CALL_BACK__: diff --git a/tests/functional/arch/zxnext/ubound12.asm b/tests/functional/arch/zxnext/ubound12.asm index 67f7bc416..a4645f285 100644 --- a/tests/functional/arch/zxnext/ubound12.asm +++ b/tests/functional/arch/zxnext/ubound12.asm @@ -3,9 +3,7 @@ di push iy ld iy, 0x5C3A ; ZX Spectrum ROM variables address - ld hl, 0 - add hl, sp - ld (.core.__CALL_BACK__), hl + ld (.core.__CALL_BACK__), sp ei call .core.__MEM_INIT jp .core.__MAIN_PROGRAM__