Update zxnext library with the fixed in zx48k

They're the same at this moment

Author: boriel

src/arch/zxnext/library-asm/load.asm

@@ -1,4 +1,3 @@
-#include once <alloc.asm>
 #include once <free.asm>
 
 #ifndef HIDE_LOAD_MSG
@@ -26,12 +25,14 @@ LOAD_CODE:
     LOCAL LOAD_END
     LOCAL VR_CONTROL, VR_CONT_1, VR_CONT_2
     LOCAL MEM0
+    LOCAL TMP_SP
 
 MEM0  EQU 5C92h ; Temporary memory buffer
 HEAD1 EQU MEM0 + 8 ; Uses CALC Mem for temporary storage
                ; Must skip first 8 bytes used by
                ; PRINT routine
 TMP_HEADER EQU HEAD1 + 17 ; Temporary HEADER2 pointer storage
+TMP_SP EQU TMP_HEADER + 2 ; Temporary SP storage
 
 #ifdef __ENABLE_BREAK__
 LD_BYTES EQU 0556h ; ROM Routine LD-BYTES
@@ -59,6 +60,8 @@ __LOAD_CODE: ; INLINE version
     ld (ix + 13), e
     ld (ix + 14), d ; Store address in bytes
 
+    push hl  ; String ptr to be freed later
+
     ld a, h
     or l
     ld b, h
@@ -99,15 +102,15 @@ LOAD_CONT:
     ldir     ; Copy String block NAME in header
 
 LOAD_CONT2:
-    ld bc, 17; 2nd Header
-    call __MEM_ALLOC
+    pop hl   ; String ptr
+    call MEM_FREE
 
-    ld a, h
-    or l
-    jr nz, LOAD_CONT3; there's memory
-
-    ld a, ERROR_OutOfMemory
-    jp __ERROR
+    ld hl, 0
+    add hl, sp
+    ld (TMP_SP), hl
+    ld bc, -18
+    add hl, sp
+    ld sp, hl
 
 LOAD_CONT3:
     ld (TMP_HEADER), hl
@@ -239,9 +242,10 @@ LOAD_ERROR:
     ld (ERR_NR), a
 
 LOAD_END:
+    ld hl, (TMP_SP)
+    ld sp, hl               ; Recovers stack
     pop ix                  ; Recovers stack frame pointer
-    ld hl, (TMP_HEADER)     ; Recovers tmp_header pointer
-    jp MEM_FREE             ; Returns via FREE_MEM, freeing tmp header
+    ret
 
 #ifndef __ENABLE_BREAK__
     LOCAL LD_BYTES_RET

src/arch/zxnext/library-asm/print.asm

@@ -179,11 +179,8 @@ INVERSE_MODE:   ; 00 -> NOP -> INVERSE 0
         ld hl, (MAXX)
         ld a, e
         dec l            ; l = MAXX
-        cp l            ; Lower than max?
-        jp c, __PRINT_CONT; Nothing to do
-        call __PRINT_EOL1
-        exx            ; counteracts __PRINT_EOL1 exx
-        jp __PRINT_CONT2
+        cp l             ; Lower than max?
+        jp nc, __PRINT_EOL1
 
 __PRINT_CONT:
         call __SAVE_S_POSN
@@ -218,7 +215,7 @@ __PRINT_EOL2:
 
 __PRINT_AT1_END:
         ld hl, (MAXY)
-        cp h
+        cp l
         jr c, __PRINT_EOL_END    ; Carry if (MAXY) < d
 #ifndef DISABLE_SCROLL
         ld hl, __TVFLAGS
@@ -459,7 +456,11 @@ CONTINUE:
         ld b, a
 LOOP:
         ld a, ' '
+        push bc
+        exx
         call __PRINTCHAR
+        exx
+        pop bc
         djnz LOOP
         ret
         ENDP

src/arch/zxnext/library-asm/random.asm

@@ -29,8 +29,8 @@ TAKE_FRAMES:
 FRAMES EQU    23672
     ENDP
 
-RANDOM_SEED_HIGH EQU RAND+6    ; RANDOM seed, 16 higher bits
-RANDOM_SEED_LOW     EQU 23670  ; RANDOM seed, 16 lower bits
+RANDOM_SEED_HIGH EQU RAND+6 ; RANDOM seed, 16 higher bits
+RANDOM_SEED_LOW  EQU 23670  ; RANDOM seed, 16 lower bits
 
 
 RAND:
@@ -54,18 +54,17 @@ RAND_LOOP:
     rra             ; t = t ^ (t >> 1) ^ w
     xor d
     xor e
-    ld  h,l         ; y = z
-    ld  l,a         ; w = t
-    ld  (RANDOM_SEED_HIGH),hl
+    ld  d,l         ; y = z
+    ld  e,a         ; w = t
+    ld  (RANDOM_SEED_HIGH),de
     push af
     djnz RAND_LOOP
-    pop af
-    pop af
-    ld d, a
+    pop de
     pop af
     ld e, a
+    pop hl
     pop af
-    ld h, a
+    ld l, a
     ret
     ENDP
 
@@ -89,7 +88,7 @@ RND:
     ; We already have a random 32 bit mantissa in ED CB
     ; From 0001h to FFFFh
 
-    ld l, 81h	; Exponent
+    ld l, 81h    ; Exponent
     ; At this point we have [0 .. 1) FP number;
 
     ; Now we must shift mantissa left until highest bit goes into carry

src/arch/zxnext/library-asm/save.asm

@@ -4,6 +4,7 @@
 ; YYY and ZZZ are 16 bit on top of the stack.
 
 #include once <error.asm>
+#include once <free.asm>
 
 SAVE_CODE:
 
@@ -14,16 +15,20 @@ SAVE_CODE:
     LOCAL ROM_SAVE
     LOCAL __ERR_EMPTY
     LOCAL SAVE_STOP
+    LOCAL STR_PTR
+    LOCAL SAVE_EMPTY_ERROR
 
 #ifdef __ENABLE_BREAK__
     ROM_SAVE EQU 0970h
 #endif
     MEMBOT EQU 23698 ; Use the CALC mem to store header
+    STR_PTR EQU MEMBOT + 17
 
     pop hl   ; Return address
     pop bc     ; data length in bytes
     pop de   ; address start
     ex (sp), hl ; CALLE => now hl = String
+    ld (STR_PTR), hl
 
 ; This function will call the ROM SAVE CODE Routine
 ; Parameters in the stack are HL => String with SAVE name
@@ -34,7 +39,7 @@ SAVE_CODE:
 __SAVE_CODE: ; INLINE version
     ld a, b
     or c
-    ret z    ; Return if block length == 0
+    jr z, SAVE_EMPTY_ERROR    ; Return if block length == 0
     
     push ix
     ld a, h
@@ -79,6 +84,8 @@ __ERR_EMPTY:
 SAVE_CONT:
     ld de, MEMBOT + 1
     ldir     ; Copy String block NAME
+    ld hl, (STR_PTR)
+    call MEM_FREE
     ld l, (ix + 13)
     ld h, (ix + 14)    ; Restores start of bytes    
 
@@ -97,8 +104,15 @@ NO_INT:
     pop ix
     ret
 
+SAVE_EMPTY_ERROR:
+    ld a, ERROR_InvalidArg
+
 SAVE_STOP:
     pop ix
+    push af
+    ld hl, (STR_PTR)
+    call MEM_FREE
+    pop af
     jp __STOP
 
 #ifndef __ENABLE_BREAK__