Bugfix: fix debug array check not working

The flag --debug-array emited wrong code.
The Array calculation routine has been optimized (a little) and
now does the check correctly.

Also de translator was not correctly emiting the IC.

Author: boriel

arch/zx48k/translator.py

@@ -460,6 +460,11 @@ def visit_ARGLIST(self, node):
         for i in range(len(node) - 1, -1, -1):  # visit in reverse order
             yield node[i]
 
+            if isinstance(node.parent, symbols.ARRAYACCESS) and OPTIONS.arrayCheck.value:
+                upper = node.parent.entry.bounds[i].upper
+                lower = node.parent.entry.bounds[i].lower
+                self.emit('paramu16', upper - lower)
+
     def visit_ARGUMENT(self, node):
         if not node.byref:
             suffix = self.TSUFFIX(node.type_)
@@ -499,11 +504,6 @@ def visit_ARRAYLOAD(self, node):
         if node.offset is None:
             yield node.args
 
-            if OPTIONS.arrayCheck.value:
-                upper = node.entry.bounds[0].upper
-                lower = node.entry.bounds[0].lower
-                self.emit('paramu16', upper - lower)
-
             if scope == SCOPE.global_:
                 self.emit('aload' + self.TSUFFIX(node.type_), node.entry.t, node.entry.mangled)
             elif scope == SCOPE.parameter:
@@ -647,9 +647,6 @@ def visit_LETARRAYSUBSTR(self, node):
     def visit_ARRAYACCESS(self, node):
         yield node.arglist
 
-        if OPTIONS.arrayCheck.value:
-            self.emit('param' + self.TSUFFIX(gl.BOUND_TYPE), len(node.entry.bounds))
-
     def visit_STRSLICE(self, node):
         yield node.string
         if node.string.token == 'STRING' or \

library-asm/array.asm

@@ -42,11 +42,10 @@ __ARRAY:
 		
 	ld hl, 0	; BC = Offset "accumulator"
 
+LOOP:
 #ifdef __CHECK_ARRAY_BOUNDARY__
     pop de
 #endif
-
-LOOP:
 	pop bc		; Get next index (Ai) from the stack
 
 #ifdef __CHECK_ARRAY_BOUNDARY__
@@ -74,15 +73,8 @@ LOOP:
 	exx
 	pop de				; DE = Max bound Number (i-th dimension)
 
-#ifdef __CHECK_ARRAY_BOUNDARY__
-    push de
-#endif
 	;call __MUL16_FAST	; HL *= DE
     call __FNMUL
-#ifdef __CHECK_ARRAY_BOUNDARY__
-    pop de
-    dec de
-#endif
 	jp LOOP
 	
 ARRAY_END: