Merge pull request #390 from boriel/bugfix/save_data

Bugfix/save data

Author: boriel

arch/zx48k/backend/__init__.py

@@ -112,7 +112,9 @@
 START_LABEL = '__START_PROGRAM'
 END_LABEL = '__END_PROGRAM'
 CALL_BACK = '__CALL_BACK__'
-
+MAIN_LABEL = '__MAIN_PROGRAM__'
+DATA_LABEL = 'ZXBASIC_USER_DATA'
+DATA_END_LABEL = 'ZXBASIC_USER_DATA_END'
 
 # Whether to use the FunctionExit scheme
 FLAG_use_function_exit = False
@@ -2230,13 +2232,23 @@ def __str__(self):
 # -------------------------
 def emit_start():
     output = list()
+    heap_init = ['%s:' % DATA_LABEL]
     output.append('org %s' % OPTIONS.org.value)
 
     if REQUIRES.intersection(MEMINITS) or '__MEM_INIT' in INITS:
-        output.append('; Defines HEAP SIZE\n' + OPTIONS.heap_size_label.value + ' EQU ' + str(OPTIONS.heap_size.value))
+        heap_init.append('; Defines HEAP SIZE\n' + OPTIONS.heap_size_label.value + ' EQU ' +
+                         str(OPTIONS.heap_size.value))
+        heap_init.append(OPTIONS.heap_start_label.value + ':')
+        heap_init.append('DEFS %s' % str(OPTIONS.heap_size.value))
+
+    heap_init.append('; Defines USER DATA Length in bytes\n' +
+                     'ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA')
+    heap_init.append('.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN')
+    heap_init.append('.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA')
 
     output.append('%s:' % START_LABEL)
     if OPTIONS.headerless.value:
+        output.extend(heap_init)
         return output
 
     output.append('di')
@@ -2253,6 +2265,9 @@ def emit_start():
     for x in sorted(INITS):
         output.append('call %s' % x)
 
+    output.append('jp %s' % MAIN_LABEL)
+    output.extend(heap_init)
+
     return output
 
 
@@ -2265,7 +2280,7 @@ def convertToBool():
 
     REQUIRES.add('strictbool.asm')
 
-    result = []
+    result = list()
     result.append('pop af')
     result.append('call __NORMALIZE_BOOLEAN')
     result.append('push af')
@@ -2281,14 +2296,16 @@ def emit_end():
     output = []
     output.extend(AT_END)
 
-    if REQUIRES.intersection(MEMINITS) or '__MEM_INIT' in INITS:
-        output.append(OPTIONS.heap_start_label.value + ':')
-        output.append('; Defines DATA END\n' + 'ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP + ZXBASIC_HEAP_SIZE')
-    else:
-        output.append('; Defines DATA END --> HEAP size is 0\n' + 'ZXBASIC_USER_DATA_END:')
-
-    output.append('; Defines USER DATA Length in bytes\n' +
-                  'ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA')
+    # if REQUIRES.intersection(MEMINITS) or '__MEM_INIT' in INITS:
+    #     output.append(OPTIONS.heap_start_label.value + ':')
+    #     output.append('; Defines DATA END\n' + 'ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP + ZXBASIC_HEAP_SIZE')
+    # else:
+    #     output.append('; Defines DATA END --> HEAP size is 0\n' + 'ZXBASIC_USER_DATA_END:')
+    #
+    # output.append('; Defines USER DATA Length in bytes\n' +
+    #               'ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA')
+    # output.append('.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN')
+    # output.append('.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA')
 
     if OPTIONS.autorun.value:
         output.append('END %s' % START_LABEL)

arch/zx48k/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

arch/zx48k/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__

libzxbc/zxb.py

@@ -348,9 +348,9 @@ def main(args=None, emitter=None):
         return 1  # Exit with errors
 
     tmp = [x for x in backend.emit(backend.MEMORY, optimize=False) if x.strip()[0] != '#']
-    asm_output += tmp
-    asm_output = backend.emit_start() + asm_output
-    asm_output += backend.emit_end()
+    asm_output = backend.emit_start() + tmp \
+                                      + ['%s:' % backend.DATA_END_LABEL, '%s:' % backend.MAIN_LABEL] \
+                                      + asm_output + backend.emit_end()
 
     if options.asm:  # Only output assembler file
         with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file:

libzxbc/zxbparser.py

@@ -499,7 +499,7 @@ def p_start(p):
     """
     global ast, data_ast
 
-    user_data = make_label('.ZXBASIC_USER_DATA', 0)
+    make_label('.ZXBASIC_USER_DATA', 0)
     make_label('.ZXBASIC_USER_DATA_LEN', 0)
 
     if PRINT_IS_USED:
@@ -532,7 +532,7 @@ def p_start(p):
     if not api.check.check_pending_calls():
         return
 
-    data_ast = make_sentence('BLOCK', user_data)
+    data_ast = make_sentence('BLOCK')
 
     # Appends variable declarations at the end.
     for var in SYMBOL_TABLE.vars_:
@@ -2209,10 +2209,10 @@ def p_save_data(p):
         else:
             length = make_number(entry.type_.size, lineno=p.lineno(4))
     else:
-        access = SYMBOL_TABLE.access_id('.ZXBASIC_USER_DATA', p.lineno(3))
+        access = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA', p.lineno(3), 0)
         start = make_unary(p.lineno(3), 'ADDRESS', access, type_=TYPE.uinteger)
 
-        access = SYMBOL_TABLE.access_id('.ZXBASIC_USER_DATA_LEN', p.lineno(3))
+        access = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA_LEN', p.lineno(3), 0)
         length = make_unary(p.lineno(3), 'ADDRESS', access, type_=TYPE.uinteger)
 
     p[0] = make_sentence(p[1], p[2], start, length)
@@ -2278,10 +2278,10 @@ def p_load_data(p):
         else:
             length = make_number(entry.type_.size, lineno=p.lineno(4))
     else:
-        entry = SYMBOL_TABLE.access_id('.ZXBASIC_USER_DATA', p.lineno(3))
+        entry = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA', p.lineno(3), 0)
         start = make_unary(p.lineno(3), 'ADDRESS', entry, type_=TYPE.uinteger)
 
-        entry = SYMBOL_TABLE.access_id('.ZXBASIC_USER_DATA_LEN', p.lineno(3))
+        entry = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA_LEN', p.lineno(3), 0)
         length = make_unary(p.lineno(3), 'ADDRESS', entry, type_=TYPE.uinteger)
 
     p[0] = make_sentence(p[1], p[2], start, length)

tests/functional/00.asm

@@ -10,6 +10,16 @@ __START_PROGRAM:
 	add hl, sp
 	ld (__CALL_BACK__), hl
 	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_a:
+	DEFB 00, 00, 00, 00, 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
 	ld hl, 0
 	ld b, h
 	ld c, l
@@ -26,11 +36,4 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-ZXBASIC_USER_DATA:
-_a:
-	DEFB 00, 00, 00, 00, 00
-; 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/02.asm

@@ -10,6 +10,16 @@ __START_PROGRAM:
 	add hl, sp
 	ld (__CALL_BACK__), hl
 	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_a:
+	DEFB 00, 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
 	ld hl, 0
 	ld b, h
 	ld c, l
@@ -26,11 +36,4 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-ZXBASIC_USER_DATA:
-_a:
-	DEFB 00, 00
-; 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/03.asm

@@ -10,6 +10,16 @@ __START_PROGRAM:
 	add hl, sp
 	ld (__CALL_BACK__), hl
 	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_a:
+	DEFB 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
 	ld hl, 0
 	ld b, h
 	ld c, l
@@ -26,11 +36,4 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-ZXBASIC_USER_DATA:
-_a:
-	DEFB 00
-; 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/04.asm

@@ -10,6 +10,16 @@ __START_PROGRAM:
 	add hl, sp
 	ld (__CALL_BACK__), hl
 	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_a:
+	DEFB 00, 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
 	ld hl, 0
 	ld b, h
 	ld c, l
@@ -26,11 +36,4 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-ZXBASIC_USER_DATA:
-_a:
-	DEFB 00, 00
-; 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