Merge pull request #305 from boriel/bugfix/addr_of_local_array_element

Bugfix/addr of local array element

Author: boriel

api/optimize.py

@@ -6,7 +6,7 @@
 import api.errmsg
 from api.errmsg import warning
 import api.check as chk
-from api.constants import TYPE
+from api.constants import TYPE, SCOPE
 import api.global_ as gl
 import symbols
 import types
@@ -85,14 +85,14 @@ def visit_ADDRESS(self, node):
         if node.operand.token != 'ARRAYACCESS':
             if not chk.is_dynamic(node.operand):
                 node = symbols.CONST(node, node.lineno)
-        elif node.operand.offset is not None:  # A constant access. Calculate offset
-            node = symbols.BINARY.make_node('PLUS',
-                                            symbols.UNARY('ADDRESS', node.operand.entry, node.lineno,
-                                                          type_=self.TYPE(gl.PTR_TYPE)),
-                                            symbols.NUMBER(node.operand.offset, lineno=node.operand.lineno,
-                                                           type_=self.TYPE(gl.PTR_TYPE)),
-                                            lineno=node.lineno, func=lambda x, y: x + y
-                                            )
+        elif node.operand.offset is not None:  # A constant access
+            if node.operand.scope == SCOPE.global_:  # Calculate offset if global variable
+                node = symbols.BINARY.make_node(
+                    'PLUS',
+                    symbols.UNARY('ADDRESS', node.operand.entry, node.lineno, type_=self.TYPE(gl.PTR_TYPE)),
+                    symbols.NUMBER(node.operand.offset, lineno=node.operand.lineno, type_=self.TYPE(gl.PTR_TYPE)),
+                    lineno=node.lineno, func=lambda x, y: x + y
+                )
         yield node
 
     def visit_BINARY(self, node):

arch/zx48k/backend/__parray.py

@@ -9,7 +9,7 @@
 # This module contains local array (both parameters and
 # comparation intermediate-code traductions
 # --------------------------------------------------------------
-
+from api import fp
 from .__common import REQUIRES
 from .__float import _fpush
 from .__f16 import f16
@@ -48,19 +48,19 @@ def _paddr(offset):
 
 
 def _paaddr(ins):
-    ''' Loads address of an array element into the stack
-    '''
+    """ Loads address of an array element into the stack
+    """
     output = _paddr(ins.quad[2])
     output.append('push hl')
 
     return output
 
 
 def _paload8(ins):
-    ''' Loads an 8 bit value from a memory address
+    """ Loads an 8 bit value from a memory address
     If 2nd arg. start with '*', it is always treated as
     an indirect value.
-    '''
+    """
     output = _paddr(ins.quad[2])
     output.append('ld a, (hl)')
     output.append('push af')
@@ -69,10 +69,10 @@ def _paload8(ins):
 
 
 def _paload16(ins):
-    ''' Loads a 16 bit value from a memory address
+    """ Loads a 16 bit value from a memory address
     If 2nd arg. start with '*', it is always treated as
     an indirect value.
-    '''
+    """
     output = _paddr(ins.quad[2])
 
     output.append('ld e, (hl)')
@@ -85,10 +85,10 @@ def _paload16(ins):
 
 
 def _paload32(ins):
-    ''' Load a 32 bit value from a memory address
+    """ Loads a 32 bit value from a memory address
     If 2nd arg. start with '*', it is always treated as
     an indirect value.
-    '''
+    """
     output = _paddr(ins.quad[2])
 
     output.append('call __ILOAD32')
@@ -101,10 +101,10 @@ def _paload32(ins):
 
 
 def _paloadf(ins):
-    ''' Loads a floating point value from a memory address.
+    """ Loads a floating point value from a memory address.
     If 2nd arg. start with '*', it is always treated as
     an indirect value.
-    '''
+    """
     output = _paddr(ins.quad[2])
     output.append('call __ILOADF')
     output.extend(_fpush())
@@ -115,8 +115,8 @@ def _paloadf(ins):
 
 
 def _paloadstr(ins):
-    ''' Loads a string value from a memory address.
-    '''
+    """ Loads a string value from a memory address.
+    """
     output = _paddr(ins.quad[2])
 
     output.append('call __ILOADSTR')
@@ -127,11 +127,11 @@ def _paloadstr(ins):
 
 
 def _pastore8(ins):
-    ''' Stores 2º operand content into address of 1st operand.
+    """ Stores 2º operand content into address of 1st operand.
     1st operand is an array element. Dimensions are pushed into the
     stack.
     Use '*' for indirect store on 1st operand (A pointer to an array)
-    '''
+    """
     output = _paddr(ins.quad[1])
 
     value = ins.quad[2]
@@ -157,10 +157,10 @@ def _pastore8(ins):
 
 
 def _pastore16(ins):
-    ''' Stores 2º operand content into address of 1st operand.
+    """ Stores 2º operand content into address of 1st operand.
     store16 a, x =>  *(&a) = x
     Use '*' for indirect store on 1st operand.
-    '''
+    """
     output = _paddr(ins.quad[1])
 
     value = ins.quad[2]
@@ -188,9 +188,9 @@ def _pastore16(ins):
 
 
 def _pastore32(ins):
-    ''' Stores 2º operand content into address of 1st operand.
+    """ Stores 2º operand content into address of 1st operand.
     store16 a, x =>  *(&a) = x
-    '''
+    """
     output = _paddr(ins.quad[1])
 
     value = ins.quad[2]
@@ -224,9 +224,9 @@ def _pastore32(ins):
 
 
 def _pastoref16(ins):
-    ''' Stores 2º operand content into address of 1st operand.
+    """ Stores 2º operand content into address of 1st operand.
     storef16 a, x =>  *(&a) = x
-    '''
+    """
     output = _paddr(ins.quad[1])
 
     value = ins.quad[2]
@@ -261,8 +261,8 @@ def _pastoref16(ins):
 
 
 def _pastoref(ins):
-    ''' Stores a floating point value into a memory address.
-    '''
+    """ Stores a floating point value into a memory address.
+    """
     output = _paddr(ins.quad[1])
 
     value = ins.quad[2]
@@ -274,7 +274,7 @@ def _pastoref(ins):
 
     try:
         if indirect:
-            value = int(value) & 0xFFFF  # Inmediate?
+            value = int(value) & 0xFFFF  # Immediate?
             output.append('push hl')
             output.append('ld hl, %i' % value)
             output.append('call __ILOADF')
@@ -284,8 +284,8 @@ def _pastoref(ins):
             output.append('pop hl')     # Recovers pointer
             REQUIRES.add('iloadf.asm')
         else:
-            value = float(value)  # Inmediate?
-            C, DE, HL = fp.immediate_float(value)  # noqa TODO: it will fail
+            value = float(value)  # Immediate?
+            C, DE, HL = fp.immediate_float(value)
             output.append('ld a, %s' % C)
             output.append('ld de, %s' % DE)
             output.append('ld bc, %s' % HL)
@@ -303,11 +303,11 @@ def _pastoref(ins):
 
 
 def _pastorestr(ins):
-    ''' Stores a string value into a memory address.
+    """ Stores a string value into a memory address.
     It copies content of 2nd operand (string), into 1st, reallocating
     dynamic memory for the 1st str. These instruction DOES ALLOW
-    inmediate strings for the 2nd parameter, starting with '#'.
-    '''
+    immediate strings for the 2nd parameter, starting with '#'.
+    """
     output = _paddr(ins.quad[1])
     temporal = False
     value = ins.quad[2]

arch/zx48k/backend/__pload.py

@@ -7,7 +7,7 @@
 # (a.k.a. Boriel, http://www.boriel.com)
 #
 # This module contains parameter load
-# intermediate-code traductions
+# intermediate-code translations
 # --------------------------------------------------------------
 
 
@@ -51,7 +51,7 @@ def _paddr(ins):
 
 def _pload(offset, size):
     """ Generic parameter loading.
-    Emmits output code for setting IX at the right location.
+    Emits output code for setting IX at the right location.
     size = Number of bytes to load:
         1 => 8 bit value
         2 => 16 bit value / string

arch/zx48k/translator.py

@@ -1145,16 +1145,16 @@ def visit_BNOT(self, node):
         self.ic_bnot(node.operand.type_, node.t, node.operand.t)
 
     def visit_ADDRESS(self, node):
-        scope = node.children[0].scope
-        if node.children[0].token == 'ARRAYACCESS':
-            yield node.children[0]
+        scope = node.operand.scope
+        if node.operand.token == 'ARRAYACCESS':
+            yield node.operand
             # Address of an array element.
             if scope == SCOPE.global_:
-                self.ic_aaddr(node.t, node.children[0].entry.mangled)
+                self.ic_aaddr(node.t, node.operand.entry.mangled)
             elif scope == SCOPE.parameter:
-                self.ic_paaddr(node.t, node.children[0].entry.offset)
+                self.ic_paaddr(node.t, '*{}'.format(node.operand.entry.offset))
             elif scope == SCOPE.local:
-                self.ic_paaddr(node.t, -node.children[0].entry.offset)
+                self.ic_paaddr(node.t, -node.operand.entry.offset)
         else:  # It's a scalar variable
             if scope == SCOPE.global_:
                 self.ic_load(node.type_, node.t, '#' + node.operand.t)

tests/functional/arr_addr_global.asm

@@ -0,0 +1,59 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	ld hl, _aglobal.__DATA__
+	ld de, 4
+	add hl, de
+	push hl
+	ld a, 99
+	pop hl
+	ld (hl), a
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+ZXBASIC_USER_DATA:
+_aglobal:
+	DEFW __LABEL0
+_aglobal.__DATA__.__PTR__:
+	DEFW _aglobal.__DATA__
+_aglobal.__DATA__:
+	DEFB 00h
+	DEFB 01h
+	DEFB 02h
+	DEFB 03h
+	DEFB 04h
+	DEFB 05h
+	DEFB 06h
+	DEFB 07h
+	DEFB 08h
+__LABEL0:
+	DEFW 0001h
+	DEFW 0003h
+	DEFB 01h
+; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/arr_addr_global.bas

@@ -0,0 +1,4 @@
+REM test @arr(x, y) for GLOBAL scope
+DIM aglobal(2, 2) as UByte => {{0, 1, 2}, {3, 4, 5}, {6, 7, 8}}
+POKE @aglobal(1, 1), 99
+