Skip to content

Commit 2cc0bb7

Browse files
borielboriel
committed
tests: update tests
1 parent 954f04a commit 2cc0bb7

28 files changed

+3663
-3663
lines changed

‎src/lib/arch/zx48k/runtime/mem/alloc.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
; They will be added automatically if needed.
6767

6868
#include once <error.asm>
69-
#include once <heapinit.asm>
69+
#include once <mem/heapinit.asm>
7070

7171

7272
; ---------------------------------------------------------------------

‎src/lib/arch/zx48k/runtime/mem/free.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
; An init directive is useful for initialization routines.
6666
; They will be added automatically if needed.
6767

68-
#include once <heapinit.asm>
68+
#include once <mem/heapinit.asm>
6969

7070
; ---------------------------------------------------------------------
7171
; MEM_FREE

‎src/lib/arch/zx48k/stdlib/memcopy.bas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ sub fastcall MemSet(dest as uinteger, value as ubyte, length as uinteger)
122122
end sub
123123

124124

125-
#require "memcopy.asm"
125+
#require "mem/memcopy.asm"
126126

127127
#pragma pop(case_insensitive)
128128

‎src/lib/arch/zxnext/runtime/mem/alloc.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
; They will be added automatically if needed.
6767

6868
#include once <error.asm>
69-
#include once <heapinit.asm>
69+
#include once <mem/heapinit.asm>
7070

7171

7272
; ---------------------------------------------------------------------

‎src/lib/arch/zxnext/runtime/mem/free.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
; An init directive is useful for initialization routines.
6666
; They will be added automatically if needed.
6767

68-
#include once <heapinit.asm>
68+
#include once <mem/heapinit.asm>
6969

7070
; ---------------------------------------------------------------------
7171
; MEM_FREE

‎src/lib/arch/zxnext/stdlib/memcopy.bas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ sub fastcall MemSet(dest as uinteger, value as ubyte, length as uinteger)
122122
end sub
123123

124124

125-
#require "memcopy.asm"
125+
#require "mem/memcopy.asm"
126126

127127
#pragma pop(case_insensitive)
128128

‎tests/functional/arch/zx48k/local_float_array0.asm‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ ARRAY_SIZE_LOOP:
251251
pop namespace
252252
#line 67 "arch/zx48k/local_float_array0.bas"
253253
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm"
254-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/calloc.asm"
254+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/calloc.asm"
255255
; vim: ts=4:et:sw=4:
256256
; Copyleft (K) by Jose M. Rodriguez de la Rosa
257257
; (a.k.a. Boriel)
@@ -262,7 +262,7 @@ ARRAY_SIZE_LOOP:
262262
; closed source programs).
263263
;
264264
; Please read the MIT license on the internet
265-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
265+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
266266
; vim: ts=4:et:sw=4:
267267
; Copyleft (K) by Jose M. Rodriguez de la Rosa
268268
; (a.k.a. Boriel)
@@ -356,8 +356,8 @@ __STOP:
356356
ld (ERR_NR), a
357357
ret
358358
pop namespace
359-
#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
360-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm"
359+
#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
360+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/heapinit.asm"
361361
; vim: ts=4:et:sw=4:
362362
; Copyleft (K) by Jose M. Rodriguez de la Rosa
363363
; (a.k.a. Boriel)
@@ -464,7 +464,7 @@ __MEM_INIT2:
464464
ret
465465
ENDP
466466
pop namespace
467-
#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
467+
#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
468468
; ---------------------------------------------------------------------
469469
; MEM_ALLOC
470470
; Allocates a block of memory in the heap.
@@ -495,9 +495,9 @@ __MEM_START:
495495
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
496496
ld a, h ; HL = NULL (No memory available?)
497497
or l
498-
#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
498+
#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
499499
ret z ; NULL
500-
#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
500+
#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
501501
; HL = Pointer to Free block
502502
ld e, (hl)
503503
inc hl
@@ -562,7 +562,7 @@ __MEM_SUBTRACT:
562562
ret
563563
ENDP
564564
pop namespace
565-
#line 13 "/zxbasic/src/lib/arch/zx48k/runtime/calloc.asm"
565+
#line 13 "/zxbasic/src/lib/arch/zx48k/runtime/mem/calloc.asm"
566566
; ---------------------------------------------------------------------
567567
; MEM_CALLOC
568568
; Allocates a block of memory in the heap, and clears it filling it
@@ -663,7 +663,35 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY:
663663
#line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm"
664664
pop namespace
665665
#line 68 "arch/zx48k/local_float_array0.bas"
666-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm"
666+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm"
667+
; __FASTCALL__ routine which
668+
; loads a 40 bits floating point into A ED CB
669+
; stored at position pointed by POINTER HL
670+
;A DE, BC <-- ((HL))
671+
push namespace core
672+
__ILOADF:
673+
ld a, (hl)
674+
inc hl
675+
ld h, (hl)
676+
ld l, a
677+
; __FASTCALL__ routine which
678+
; loads a 40 bits floating point into A ED CB
679+
; stored at position pointed by POINTER HL
680+
;A DE, BC <-- (HL)
681+
__LOADF: ; Loads a 40 bits FP number from address pointed by HL
682+
ld a, (hl)
683+
inc hl
684+
ld e, (hl)
685+
inc hl
686+
ld d, (hl)
687+
inc hl
688+
ld c, (hl)
689+
inc hl
690+
ld b, (hl)
691+
ret
692+
pop namespace
693+
#line 69 "arch/zx48k/local_float_array0.bas"
694+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/free.asm"
667695
; vim: ts=4:et:sw=4:
668696
; Copyleft (K) by Jose M. Rodriguez de la Rosa
669697
; (a.k.a. Boriel)
@@ -821,34 +849,6 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
821849
ret
822850
ENDP
823851
pop namespace
824-
#line 69 "arch/zx48k/local_float_array0.bas"
825-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm"
826-
; __FASTCALL__ routine which
827-
; loads a 40 bits floating point into A ED CB
828-
; stored at position pointed by POINTER HL
829-
;A DE, BC <-- ((HL))
830-
push namespace core
831-
__ILOADF:
832-
ld a, (hl)
833-
inc hl
834-
ld h, (hl)
835-
ld l, a
836-
; __FASTCALL__ routine which
837-
; loads a 40 bits floating point into A ED CB
838-
; stored at position pointed by POINTER HL
839-
;A DE, BC <-- (HL)
840-
__LOADF: ; Loads a 40 bits FP number from address pointed by HL
841-
ld a, (hl)
842-
inc hl
843-
ld e, (hl)
844-
inc hl
845-
ld d, (hl)
846-
inc hl
847-
ld c, (hl)
848-
inc hl
849-
ld b, (hl)
850-
ret
851-
pop namespace
852852
#line 70 "arch/zx48k/local_float_array0.bas"
853853
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm"
854854
push namespace core

‎tests/functional/arch/zx48k/local_float_array1.asm‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ _test__leave:
7474
ret
7575
;; --- end of user code ---
7676
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm"
77-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/calloc.asm"
77+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/calloc.asm"
7878
; vim: ts=4:et:sw=4:
7979
; Copyleft (K) by Jose M. Rodriguez de la Rosa
8080
; (a.k.a. Boriel)
@@ -85,7 +85,7 @@ _test__leave:
8585
; closed source programs).
8686
;
8787
; Please read the MIT license on the internet
88-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
88+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
8989
; vim: ts=4:et:sw=4:
9090
; Copyleft (K) by Jose M. Rodriguez de la Rosa
9191
; (a.k.a. Boriel)
@@ -179,8 +179,8 @@ __STOP:
179179
ld (ERR_NR), a
180180
ret
181181
pop namespace
182-
#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
183-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/heapinit.asm"
182+
#line 69 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
183+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/heapinit.asm"
184184
; vim: ts=4:et:sw=4:
185185
; Copyleft (K) by Jose M. Rodriguez de la Rosa
186186
; (a.k.a. Boriel)
@@ -287,7 +287,7 @@ __MEM_INIT2:
287287
ret
288288
ENDP
289289
pop namespace
290-
#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
290+
#line 70 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
291291
; ---------------------------------------------------------------------
292292
; MEM_ALLOC
293293
; Allocates a block of memory in the heap.
@@ -318,9 +318,9 @@ __MEM_START:
318318
__MEM_LOOP: ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
319319
ld a, h ; HL = NULL (No memory available?)
320320
or l
321-
#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
321+
#line 113 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
322322
ret z ; NULL
323-
#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/alloc.asm"
323+
#line 115 "/zxbasic/src/lib/arch/zx48k/runtime/mem/alloc.asm"
324324
; HL = Pointer to Free block
325325
ld e, (hl)
326326
inc hl
@@ -385,7 +385,7 @@ __MEM_SUBTRACT:
385385
ret
386386
ENDP
387387
pop namespace
388-
#line 13 "/zxbasic/src/lib/arch/zx48k/runtime/calloc.asm"
388+
#line 13 "/zxbasic/src/lib/arch/zx48k/runtime/mem/calloc.asm"
389389
; ---------------------------------------------------------------------
390390
; MEM_CALLOC
391391
; Allocates a block of memory in the heap, and clears it filling it
@@ -486,7 +486,35 @@ __ALLOC_INITIALIZED_LOCAL_ARRAY:
486486
#line 142 "/zxbasic/src/lib/arch/zx48k/runtime/array/arrayalloc.asm"
487487
pop namespace
488488
#line 50 "arch/zx48k/local_float_array1.bas"
489-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/free.asm"
489+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm"
490+
; __FASTCALL__ routine which
491+
; loads a 40 bits floating point into A ED CB
492+
; stored at position pointed by POINTER HL
493+
;A DE, BC <-- ((HL))
494+
push namespace core
495+
__ILOADF:
496+
ld a, (hl)
497+
inc hl
498+
ld h, (hl)
499+
ld l, a
500+
; __FASTCALL__ routine which
501+
; loads a 40 bits floating point into A ED CB
502+
; stored at position pointed by POINTER HL
503+
;A DE, BC <-- (HL)
504+
__LOADF: ; Loads a 40 bits FP number from address pointed by HL
505+
ld a, (hl)
506+
inc hl
507+
ld e, (hl)
508+
inc hl
509+
ld d, (hl)
510+
inc hl
511+
ld c, (hl)
512+
inc hl
513+
ld b, (hl)
514+
ret
515+
pop namespace
516+
#line 51 "arch/zx48k/local_float_array1.bas"
517+
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/mem/free.asm"
490518
; vim: ts=4:et:sw=4:
491519
; Copyleft (K) by Jose M. Rodriguez de la Rosa
492520
; (a.k.a. Boriel)
@@ -644,34 +672,6 @@ __MEM_BLOCK_JOIN: ; Joins current block (pointed by HL) with next one (pointed
644672
ret
645673
ENDP
646674
pop namespace
647-
#line 51 "arch/zx48k/local_float_array1.bas"
648-
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/iloadf.asm"
649-
; __FASTCALL__ routine which
650-
; loads a 40 bits floating point into A ED CB
651-
; stored at position pointed by POINTER HL
652-
;A DE, BC <-- ((HL))
653-
push namespace core
654-
__ILOADF:
655-
ld a, (hl)
656-
inc hl
657-
ld h, (hl)
658-
ld l, a
659-
; __FASTCALL__ routine which
660-
; loads a 40 bits floating point into A ED CB
661-
; stored at position pointed by POINTER HL
662-
;A DE, BC <-- (HL)
663-
__LOADF: ; Loads a 40 bits FP number from address pointed by HL
664-
ld a, (hl)
665-
inc hl
666-
ld e, (hl)
667-
inc hl
668-
ld d, (hl)
669-
inc hl
670-
ld c, (hl)
671-
inc hl
672-
ld b, (hl)
673-
ret
674-
pop namespace
675675
#line 52 "arch/zx48k/local_float_array1.bas"
676676
#line 1 "/zxbasic/src/lib/arch/zx48k/runtime/storef.asm"
677677
push namespace core

0 commit comments

Comments
 (0)