Moves HEAP and vars to the beginning

This makes load / save of program longer because now includes
the heap, but it also allows SAVE "" DATA and LOAD "" DATA
to work properly on different programs providing both the
saver and the loader have the same org and the same variables
declared in the same order and with the same type.

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,22 @@ 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 +2264,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 +2279,7 @@ def convertToBool():
 
     REQUIRES.add('strictbool.asm')
 
-    result = []
+    result = list()
     result.append('pop af')
     result.append('call __NORMALIZE_BOOLEAN')
     result.append('push af')
@@ -2281,16 +2295,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')
-    output.append('.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN')
-    output.append('.__LABEL__.ZXBASIC_USER_DATA EQU 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)

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_: