Bugfix: Do not use undef label

When not using the HEAP, ZX Basic should not
refer to any label using it. Fixed.
This just defined the ZX_BASIC User data END area as
an in-place label declaration.

Author: boriel

arch/zx48k/backend/__init__.py

@@ -2229,7 +2229,7 @@ def emit_end():
         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 EQU ZXBASIC_MEM_HEAP')
+        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')

tests/functional/00.asm

@@ -26,12 +26,11 @@ __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 EQU ZXBASIC_MEM_HEAP
+; 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

@@ -26,12 +26,11 @@ __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 EQU ZXBASIC_MEM_HEAP
+; 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

@@ -26,12 +26,11 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-
 ZXBASIC_USER_DATA:
 _a:
 	DEFB 00
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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

@@ -26,12 +26,11 @@ __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 EQU ZXBASIC_MEM_HEAP
+; 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/05.asm

@@ -46,8 +46,8 @@ _a.__DATA__:
 __LABEL0:
 	DEFW 0000h
 	DEFB 01h
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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/053opt.asm

@@ -65,20 +65,16 @@ __LABEL__enddispara:
 	ld c, l
 	jp __END_PROGRAM
 #line 1 "abs8.asm"
-
 	; Returns absolute value for 8 bit signed integer
 	;
 __ABS8:
 		or a
 		ret p
 		neg
 		ret
-
 #line 56 "053opt.bas"
 #line 1 "lti8.asm"
-
 #line 1 "lei8.asm"
-
 __LEI8: ; Signed <= comparison for 8bit int
 	        ; A <= H (registers)
 	    PROC
@@ -87,10 +83,8 @@ __LEI8: ; Signed <= comparison for 8bit int
 	    jr nz, __LTI
 	    inc a
 	    ret
-
 __LTI8:  ; Test 8 bit values A < H
 	    sub h
-
 __LTI:   ; Generic signed comparison
 	    jp po, checkParity
 	    xor 0x80
@@ -102,14 +96,13 @@ checkParity:
 	    ENDP
 #line 2 "lti8.asm"
 #line 57 "053opt.bas"
-
 ZXBASIC_USER_DATA:
 _subeEgg:
 	DEFB 00
 _sail:
 	DEFB 00
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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/06.asm

@@ -41,8 +41,8 @@ _a.__DATA__:
 __LABEL0:
 	DEFW 0000h
 	DEFB 02h
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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/07.asm

@@ -60,8 +60,8 @@ __LABEL0:
 	DEFW 0001h
 	DEFW 0004h
 	DEFB 02h
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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/08.asm

@@ -26,12 +26,11 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-
 ZXBASIC_USER_DATA:
 _x:
 	DEFB 05h
-	; Defines DATA END --> HEAP size is 0
-ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+; 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