Update array routine to use new scheme

 * Also includes ARRAY_PTR routine to use a ref (ptr) to an array.
 * Also update the ARRAY_FREE_FAST routine (simpler) to free
   array of strings.

Author: boriel

library-asm/array.asm

@@ -22,13 +22,26 @@
 #include once <error.asm>
 #endif
 
+__ARRAY_PTR:   ;; computes an array offset from a pointer
+    ld c, (hl)
+    inc hl
+    ld h, (hl)
+    ld l, c
+
 __ARRAY:
 	PROC
 
 	LOCAL LOOP
 	LOCAL ARRAY_END
 	LOCAL RET_ADDRESS ; Stores return address
+	LOCAL TMP_ARR_PTR ; Stores pointer temporarily
 
+    ld e, (hl)
+    inc hl
+    ld d, (hl)
+    inc hl
+    ld (TMP_ARR_PTR), hl
+    ex de, hl
 	ex (sp), hl	; Return address in HL, array address in the stack
 	ld (RET_ADDRESS + 1), hl ; Stores it for later
 
@@ -78,8 +91,6 @@ LOOP:
 
 ARRAY_END:
 	ld a, (hl)
-	inc hl
-	push hl
 	exx
 
 #ifdef __BIG_ARRAY__
@@ -98,7 +109,12 @@ ARRAY_SIZE_LOOP:
 
 #endif
 
-	pop de
+    ex de, hl
+	ld hl, (TMP_ARR_PTR)
+	ld a, (hl)
+	inc hl
+	ld h, (hl)
+	ld l, a
 	add hl, de  ; Adds element start
 
 RET_ADDRESS:
@@ -125,5 +141,8 @@ __FNMUL2:
     djnz __FNMUL2
     ret
 
+TMP_ARR_PTR:
+    DW 0  ; temporary storage for pointer to tables
+
 	ENDP
 	

library-asm/arrayfree.asm

@@ -13,7 +13,7 @@ __ARRAY_FREE:
 	pop hl		; (ret address)
 	ex (sp), hl	; Callee -> HL = Number of elements
 	
-	ex de, hl	
+	ex de, hl
 
 __ARRAY_FREE_FAST:	; Fastcall entry: DE = Number of elements
 	ld a, h
@@ -23,15 +23,6 @@ __ARRAY_FREE_FAST:	; Fastcall entry: DE = Number of elements
 	ld b, d
 	ld c, e
 
-	ld e, (hl)
-	inc hl
-	ld d, (hl)
-	inc hl		; DE = Number of dimensions
-	ex de, hl
-	add hl, hl	; HL = HL * 2
-	add hl, de
-	inc hl		; HL now points to the element start
-
 __ARRAY_LOOP:
 	ld e, (hl)
 	inc hl