refact: refactorize zxnext libraries

They must use zx48k ones whenever possible

Author: boriel

src/lib/arch/zx48k/stdlib/SP/Fill.bas

@@ -115,11 +115,6 @@ SPPFill:
    call SPGetScrnAddr	; de = screen address, b = pixel byte
    ex de,hl			; hl = screen address
 
-;    ld b, h
-;    ld c, l
-;    call 22B0h      ; Uses ROM Pixel ADDR
-;    ld b, a
-
    call bytefill	; b = fill byte
    jr c, viable
    pop bc

src/lib/arch/zxnext/runtime/arith/mul16.asm

@@ -1,6 +1,6 @@
     push namespace core
 
-__MUL16:	; Mutiplies HL with the last value stored into de stack
+__MUL16:	; Multiplies HL with the last value stored into de stack
     ; Works for both signed and unsigned
 
     PROC

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

@@ -9,181 +9,4 @@
 ;
 ; Please read the MIT license on the internet
 
-; ----- IMPLEMENTATION NOTES ------
-; The heap is implemented as a linked list of free blocks.
-
-; Each free block contains this info:
-;
-; +----------------+ <-- HEAP START
-; | Size (2 bytes) |
-; |        0       | <-- Size = 0 => DUMMY HEADER BLOCK
-; +----------------+
-; | Next (2 bytes) |---+
-; +----------------+ <-+
-; | Size (2 bytes) |
-; +----------------+
-; | Next (2 bytes) |---+
-; +----------------+   |
-; | <free bytes...>|   | <-- If Size > 4, then this contains (size - 4) bytes
-; | (0 if Size = 4)|   |
-; +----------------+ <-+
-; | Size (2 bytes) |
-; +----------------+
-; | Next (2 bytes) |---+
-; +----------------+   |
-; | <free bytes...>|   |
-; | (0 if Size = 4)|   |
-; +----------------+   |
-;   <Allocated>        | <-- This zone is in use (Already allocated)
-; +----------------+ <-+
-; | Size (2 bytes) |
-; +----------------+
-; | Next (2 bytes) |---+
-; +----------------+   |
-; | <free bytes...>|   |
-; | (0 if Size = 4)|   |
-; +----------------+ <-+
-; | Next (2 bytes) |--> NULL => END OF LIST
-; |    0 = NULL    |
-; +----------------+
-; | <free bytes...>|
-; | (0 if Size = 4)|
-; +----------------+
-
-
-; When a block is FREED, the previous and next pointers are examined to see
-; if we can defragment the heap. If the block to be freed is just next to the
-; previous, or to the next (or both) they will be converted into a single
-; block (so defragmented).
-
-
-;   MEMORY MANAGER
-;
-; This library must be initialized calling __MEM_INIT with
-; HL = BLOCK Start & DE = Length.
-
-; An init directive is useful for initialization routines.
-; They will be added automatically if needed.
-
-#include once <error.asm>
-#include once <mem/heapinit.asm>
-
-
-; ---------------------------------------------------------------------
-; MEM_ALLOC
-;  Allocates a block of memory in the heap.
-;
-; Parameters
-;  BC = Length of requested memory block
-;
-; Returns:
-;  HL = Pointer to the allocated block in memory. Returns 0 (NULL)
-;       if the block could not be allocated (out of memory)
-; ---------------------------------------------------------------------
-
-    push namespace core
-
-MEM_ALLOC:
-__MEM_ALLOC: ; Returns the 1st free block found of the given length (in BC)
-    PROC
-
-    LOCAL __MEM_LOOP
-    LOCAL __MEM_DONE
-    LOCAL __MEM_SUBTRACT
-    LOCAL __MEM_START
-    LOCAL TEMP, TEMP0
-
-TEMP EQU TEMP0 + 1
-
-    ld hl, 0
-    ld (TEMP), hl
-
-__MEM_START:
-    ld hl, ZXBASIC_MEM_HEAP  ; This label point to the heap start
-    inc bc
-    inc bc  ; BC = BC + 2 ; block size needs 2 extra bytes for hidden pointer
-
-__MEM_LOOP:  ; Loads lengh at (HL, HL+). If Lenght >= BC, jump to __MEM_DONE
-    ld a, h ;  HL = NULL (No memory available?)
-    or l
-#ifdef __MEMORY_CHECK__
-    ld a, ERROR_OutOfMemory
-    jp z, __ERROR
-#else
-    ret z ; NULL
-#endif
-    ; HL = Pointer to Free block
-    ld e, (hl)
-    inc hl
-    ld d, (hl)
-    inc hl          ; DE = Block Length
-
-    push hl         ; HL = *pointer to -> next block
-    ex de, hl
-    or a            ; CF = 0
-    sbc hl, bc      ; FREE >= BC (Length)  (HL = BlockLength - Length)
-    jp nc, __MEM_DONE
-    pop hl
-    ld (TEMP), hl
-
-    ex de, hl
-    ld e, (hl)
-    inc hl
-    ld d, (hl)
-    ex de, hl
-    jp __MEM_LOOP
-
-__MEM_DONE:  ; A free block has been found.
-    ; Check if at least 4 bytes remains free (HL >= 4)
-    push hl
-    exx  ; exx to preserve bc
-    pop hl
-    ld bc, 4
-    or a
-    sbc hl, bc
-    exx
-    jp nc, __MEM_SUBTRACT
-    ; At this point...
-    ; less than 4 bytes remains free. So we return this block entirely
-    ; We must link the previous block with the next to this one
-    ; (DE) => Pointer to next block
-    ; (TEMP) => &(previous->next)
-    pop hl     ; Discard current block pointer
-    push de
-    ex de, hl  ; DE = Previous block pointer; (HL) = Next block pointer
-    ld a, (hl)
-    inc hl
-    ld h, (hl)
-    ld l, a    ; HL = (HL)
-    ex de, hl  ; HL = Previous block pointer; DE = Next block pointer
-TEMP0:
-    ld hl, 0   ; Pre-previous block pointer
-
-    ld (hl), e
-    inc hl
-    ld (hl), d ; LINKED
-    pop hl ; Returning block.
-
-    ret
-
-__MEM_SUBTRACT:
-    ; At this point we have to store HL value (Length - BC) into (DE - 2)
-    ex de, hl
-    dec hl
-    ld (hl), d
-    dec hl
-    ld (hl), e ; Store new block length
-
-    add hl, de ; New length + DE => free-block start
-    pop de     ; Remove previous HL off the stack
-
-    ld (hl), c ; Store length on its 1st word
-    inc hl
-    ld (hl), b
-    inc hl     ; Return hl
-    ret
-
-    ENDP
-
-    pop namespace
-
+#include once [arch:zx48k] <mem/alloc.asm>

src/lib/arch/zxnext/stdlib/IM2.bas

@@ -1,122 +1,8 @@
-' ----------------------------------------------------------------
-' This file is released under the MIT License
-'
-' Copyleft (k) 2023
-' by Juan Segura (a.k.a. Duefectu) <http://zx.duefectucorp.com>
-'
-' Mode 2 interrupt handling library
-' ----------------------------------------------------------------
-
-#ifndef __LIBRARY_IM2__
-
-REM Avoid recursive / multiple inclusion
-
-#define __LIBRARY_IM2__
-
-
-' ----------------------------------------------------------------
-' IM2Start configures and initialises the interrupt service.
-' At each interruption the address "callBack" shall be called.
-' When this service is activated, the FRAMES counter and the
-' PAUSE and INKEY$ instructions no longer work correctly.
-' Not working with "INVES +" models
-'
-' Sample of use:
-' IM2Start(@MyIM2Routine)   ' Use @<name>
-' SUB MyIM2Routine()
-'   ' Do something not too complicated
-' END SUB
-'
-' Parameters:
-'     callback (UInteger): Address to jump on every interrupt
-' ----------------------------------------------------------------
-sub IM2Start(callBack AS UInteger)
-ASM
-    PROC
-    LOCAL IM2_Table, IM2_Tick, IM2_Tick_End, IM2_End, IM2_CallBack
-
-    ld [IM2_CallBack],hl
-
-    di              ; Disable interrupts
-    ld hl,IM2_Table-256 ; The end of the IM2 table
-    ld a,h          ; Adjust the value of I at the end of the table
-    ld i,a
-
-    ld hl,IM2_Tick      ; Set IM2_Tick address
-    ld a,l              ; Al final de la tabla
-    ld (IM2_Table-1),a
-    ld a,h
-    ld (IM2_Table),a
-
-    im 2            ; Set interrupt mode to 2
-    ei              ; Enable interrupts
-    jp IM2_End      ; Jump to the end to exit
-
-
-    ; Here you will jump at every interrupt
-IM2_Tick:
-    ; Save all registers
-    push af
-    push hl
-    push bc
-    push de
-    push ix
-    push iy
-    exx
-    ex af, af'
-    push af
-    push hl
-    push bc
-    push de
-
-    ld hl,IM2_Tick_End    ; Set return address
-    push hl
-    ld hl,[IM2_CallBack]  ; Jump to callBack routine
-    jp [hl]
-
-IM2_Tick_End:
-    ; Restore registers
-    pop de
-    pop bc
-    pop hl
-    pop af
-    ex af, af'
-    exx
-    pop iy
-    pop ix
-    pop de
-    pop bc
-    pop hl
-    pop af
-
-    ei              ; Enable interrupts
-    reti            ; Return from interrupt
-
-
-    ; Space for the interrupt vector table
-    ; Must start at an address multiple of 256
-    db 0            ; The first jump value is in $ff
-    ALIGN 256       ; Align to 256
-IM2_Table:
-    db 0            ; The second jump value is $00
-
-IM2_CallBack:       ; CallBack address
-    DW 0
-
-IM2_End:
-    ENDP
-END ASM
-end sub
-
-
-' ----------------------------------------------------------------
-' IM2Stop stops the interrupt service and restores ROM interrupts
-' ----------------------------------------------------------------
-sub IM2Stop()
-ASM
-    di              ; Disable interrupts
-    im 1            ; Set interrupt mode 1 (ROM)
-    ei              ; Enable interrupts
-END ASM
-end sub
-#endif
+' ----------------------------------------------------------------
+' This file is released under the MIT License
+'
+' Copyleft (k) 2008
+' by Jose Rodriguez-Rosa (a.k.a. Boriel) <https://www.boriel.com>
+' ----------------------------------------------------------------
+
+#include once [arch:zx48k] <IM2.bas>