Updates traslation of LBound and UBound

This will suit the new array scheme.

Author: boriel

arch/zx48k/translator.py

@@ -1092,6 +1092,17 @@ def visit_ARRAYDECL(self, node):
             if self.O_LEVEL > 1:
                 return
 
+        bound_ptrs = []  # Bound tables pointers (empty if not used)
+        lbound_label = entry.mangled + '.__LBOUND__'
+        ubound_label = entry.mangled + '.__UBOUND__'
+
+        if entry.lbound_used or entry.ubound_used:
+            bound_ptrs = ['0', '0']  # NULL by default
+            if entry.lbound_used:
+                bound_ptrs[0] = lbound_label
+            if entry.ubound_used:
+                bound_ptrs[1] = ubound_label
+
         data_label = entry.data_label
         idx_table_label = backend.tmp_label()
         l = ['%04X' % (len(node.bounds) - 1)]  # Number of dimensions - 1
@@ -1118,21 +1129,23 @@ def visit_ARRAYDECL(self, node):
 
         if entry.addr:
             self.ic_varx(entry.data_ptr_label, gl.PTR_TYPE, [self.traverse_const(entry.addr)])
+            if bound_ptrs:
+                self.ic_data(gl.PTR_TYPE, bound_ptrs)
         else:
             self.ic_varx(entry.data_ptr_label, gl.PTR_TYPE, [data_label])
+            if bound_ptrs:
+                self.ic_data(gl.PTR_TYPE, bound_ptrs)
             self.ic_vard(data_label, arr_data)
 
         self.ic_vard(idx_table_label, l)
 
         if entry.lbound_used:
-            l = ['%04X' % len(node.bounds)] + \
-                ['%04X' % bound.lower for bound in node.bounds]
-            self.ic_vard('__LBOUND__.' + entry.mangled, l)
+            l = ['%04X' % bound.lower for bound in node.bounds]
+            self.ic_vard(lbound_label, l)
 
         if entry.ubound_used:
-            l = ['%04X' % len(node.bounds)] + \
-                ['%04X' % bound.upper for bound in node.bounds]
-            self.ic_vard('__UBOUND__.' + entry.mangled, l)
+            l = ['%04X' % bound.upper for bound in node.bounds]
+            self.ic_vard(ubound_label, l)
 
 
 class UnaryOpTranslator(TranslatorVisitor):
@@ -1284,19 +1297,29 @@ def visit_SQR(self, node):
     # endregion
 
     def visit_LBOUND(self, node):
-        entry = node.operands[0]
-        self.ic_param(gl.BOUND_TYPE, '#__LBOUND__.' + entry.mangled)
         yield node.operands[1]
-        self.ic_fparam(gl.BOUND_TYPE, optemps.new_t())
-        self.ic_call('__BOUND', self.TYPE(gl.BOUND_TYPE).size)
+        self.ic_param(gl.BOUND_TYPE, node.operands[1].mangled)
+        entry = node.operands[0]
+        if entry.scope == SCOPE.global_:
+            self.ic_fparam(gl.PTR_TYPE, '#{}'.format(entry.mangled))
+        elif entry.scope == SCOPE.parameter:
+            self.ic_fparam(entry.t, entry.offset)
+        elif entry.scope == SCOPE.local:
+            self.ic_fparam(entry.t, -entry.offset)
+        self.ic_call('__LBOUND', self.TYPE(gl.BOUND_TYPE).size)
         backend.REQUIRES.add('bound.asm')
 
     def visit_UBOUND(self, node):
-        entry = node.operands[0]
-        self.ic_param(gl.BOUND_TYPE, '#__UBOUND__.' + entry.mangled)
         yield node.operands[1]
-        self.ic_fparam(gl.BOUND_TYPE, optemps.new_t())
-        self.ic_call('__BOUND', self.TYPE(gl.BOUND_TYPE).size)
+        self.ic_param(gl.BOUND_TYPE, node.operands[1].mangled)
+        entry = node.operands[0]
+        if entry.scope == SCOPE.global_:
+            self.ic_fparam(gl.PTR_TYPE, '#{}'.format(entry.mangled))
+        elif entry.scope == SCOPE.parameter:
+            self.ic_fparam(entry.t, entry.offset)
+        elif entry.scope == SCOPE.local:
+            self.ic_fparam(entry.t, -entry.offset)
+        self.ic_call('__UBOUND', self.TYPE(gl.BOUND_TYPE).size)
         backend.REQUIRES.add('bound.asm')
 
     def visit_USR_STR(self, node):