Update tests

Author: boriel

tests/functional/opt2_ifbor2.asm

@@ -44,11 +44,13 @@ _x:
 	inc sp
 	ld a, (ix-1)
 	or 1
-	jp z, __LABEL1
+	jp z, _x__leave
 	inc (ix-1)
-__LABEL1:
 _x__leave:
 	ld sp, ix
 	pop ix
 	ret
+#line 8
+	;; --- end of user code ---
+#line 9
 	END

tests/functional/opt2_recurse_filter2.asm

@@ -72,10 +72,12 @@ __LABEL3:
 	push af
 	call _MultiKeys
 	or a
-	jp z, __LABEL5
+	jp z, _mainRoom__leave
 	xor a
 	ld (2), a
-__LABEL5:
 _mainRoom__leave:
 	ret
+#line 26
+	;; --- end of user code ---
+#line 27
 	END

tests/functional/opt3_atohl_a.asm

@@ -29,7 +29,7 @@ __MAIN_PROGRAM__:
 	ld a, (_i)
 	push af
 	ld hl, (_dw1)
-	call _putTile10x8Box
+	call _putTile10x8Box__leave
 	ld bc, 0
 __END_PROGRAM:
 	di
@@ -47,4 +47,7 @@ __CALL_BACK__:
 _putTile10x8Box:
 _putTile10x8Box__leave:
 	ret
+#line 8
+	;; --- end of user code ---
+#line 9
 	END

tests/functional/opt3_einar.asm

@@ -55,13 +55,12 @@ _x2:
 	xor a
 	call __PRINTSTR
 	call PRINT_EOL
-	jp __LABEL1
+	jp _x2__leave
 __LABEL0:
 	ld hl, __LABEL3
 	xor a
 	call __PRINTSTR
 	call PRINT_EOL
-__LABEL1:
 _x2__leave:
 	ld sp, ix
 	pop ix
@@ -75,6 +74,9 @@ __LABEL3:
 	DEFW 0002h
 	DEFB 4Fh
 	DEFB 4Bh
+#line 14
+	;; --- end of user code ---
+#line 15
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/print.asm"
 ; vim:ts=4:sw=4:et:
 ; vim:ts=4:sw=4:et:
@@ -1007,7 +1009,7 @@ __PRINT_TABLE:    ; Jump table for 0 .. 22 codes
 	        DW __PRINT_AT     ; 22 AT
 	        DW __PRINT_TAB    ; 23 TAB
 	        ENDP
-#line 53 "opt3_einar.bas"
+#line 55 "opt3_einar.bas"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/printstr.asm"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/free.asm"
 ; vim: ts=4:et:sw=4:
@@ -1312,5 +1314,5 @@ __PRINT_STR:
 	        ld d, a ; Saves a FLAG
 	        jp __PRINT_STR_LOOP
 			ENDP
-#line 54 "opt3_einar.bas"
+#line 56 "opt3_einar.bas"
 	END

tests/functional/opt3_gogogoto.asm

@@ -18,7 +18,11 @@ ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
 	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
 ZXBASIC_USER_DATA_END:
 __MAIN_PROGRAM__:
-	jp __LABEL__10
+__LABEL__10:
+__LABEL__20:
+	jp __LABEL__20
+__LABEL__30:
+	jp __LABEL__20
 __END_PROGRAM:
 	di
 	ld hl, (__CALL_BACK__)
@@ -32,9 +36,7 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-__LABEL__10:
-__LABEL__20:
-	jp __LABEL__10
-__LABEL__30:
-	jp __LABEL__10
+#line 11
+	;; --- end of user code ---
+#line 12
 	END

tests/functional/opt3_lcd_o3_crash.asm

@@ -46,14 +46,17 @@ _Drawscreen:
 	inc sp
 	ld (ix-1), 0
 	jp __LABEL0
-__LABEL3:
+__LABEL4:
 	inc (ix-1)
 __LABEL0:
 	ld a, 21
 	cp (ix-1)
-	jp nc, __LABEL3
+	jp nc, __LABEL4
 _Drawscreen__leave:
 	ld sp, ix
 	pop ix
 	ret
+#line 19
+	;; --- end of user code ---
+#line 20
 	END

tests/functional/opt3_tolosob.asm

@@ -38,11 +38,10 @@ __LABEL__inicio:
 	inc hl
 	ld a, (hl)
 	sub 12
-	jp nz, __LABEL5
+	jp nz, __LABEL3
 	ld a, 3
 	ld (_sobando), a
 	jp __LABEL__inicio
-__LABEL5:
 __LABEL3:
 	ld a, (_sobando)
 	or a
@@ -59,10 +58,6 @@ __LABEL3:
 	ld a, 1
 	ld (_sobando), a
 __LABEL__pontolosobando:
-__LABEL11:
-__LABEL9:
-__LABEL7:
-__LABEL1:
 	jp __LABEL__inicio
 __END_PROGRAM:
 	di
@@ -77,13 +72,16 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-#line 1 "eq16.asm"
+#line 27
+	;; --- end of user code ---
+#line 28
+#line 1 "/zxbasic/src/arch/zx48k/library-asm/eq16.asm"
 __EQ16:	; Test if 16bit values HL == DE
 		; Returns result in A: 0 = False, FF = True
 			xor a	; Reset carry flag
 			sbc hl, de
 			ret nz
 			inc a
 			ret
-#line 55 "opt3_tolosob.bas"
+#line 53 "opt3_tolosob.bas"
 	END

tests/functional/opt3_xorxor.asm

@@ -24,14 +24,13 @@ _paso:
 	DEFB 00
 ZXBASIC_USER_DATA_END:
 __MAIN_PROGRAM__:
-__LABEL0:
 __LABEL__looproom:
 	xor a
 	ld (_push), a
 	ld (_suck), a
 	ld a, 4
 	ld (_paso), a
-	jp __LABEL0
+	jp __LABEL__looproom
 __END_PROGRAM:
 	di
 	ld hl, (__CALL_BACK__)
@@ -45,4 +44,7 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
+#line 15
+	;; --- end of user code ---
+#line 16
 	END

tests/functional/opt4_053opt.asm

@@ -46,13 +46,8 @@ __MAIN_PROGRAM__:
 	call __ABS8
 	ld h, 20
 	call __LTI8
-	or a
-	jp nz, __LABEL__enddispara
-__LABEL7:
-__LABEL5:
-__LABEL3:
-__LABEL1:
-	jp __LABEL__enddispara
+__LABEL__enddispara:
+	ld bc, 0
 __END_PROGRAM:
 	di
 	ld hl, (__CALL_BACK__)
@@ -66,20 +61,20 @@ __END_PROGRAM:
 	ret
 __CALL_BACK__:
 	DEFW 0
-__LABEL__enddispara:
-	ld bc, 0
-	jp __END_PROGRAM
-#line 1 "abs8.asm"
+#line 30
+	;; --- end of user code ---
+#line 31
+#line 1 "/zxbasic/src/arch/zx48k/library-asm/abs8.asm"
 	; Returns absolute value for 8 bit signed integer
 	;
 __ABS8:
 		or a
 		ret p
 		neg
 		ret
-#line 49 "opt4_053opt.bas"
-#line 1 "lti8.asm"
-#line 1 "lei8.asm"
+#line 44 "opt4_053opt.bas"
+#line 1 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm"
+#line 1 "/zxbasic/src/arch/zx48k/library-asm/lei8.asm"
 __LEI8: ; Signed <= comparison for 8bit int
 	        ; A <= H (registers)
 	    PROC
@@ -99,6 +94,6 @@ checkParity:
 	    inc a       ; True
 	    ret
 	    ENDP
-#line 2 "lti8.asm"
-#line 50 "opt4_053opt.bas"
+#line 2 "/zxbasic/src/arch/zx48k/library-asm/lti8.asm"
+#line 45 "opt4_053opt.bas"
 	END

tests/functional/opt4_atohl_a.asm

@@ -28,7 +28,7 @@ __MAIN_PROGRAM__:
 	push af
 	ld a, (_i)
 	push af
-	call _putTile10x8Box
+	call _putTile10x8Box__leave
 	ld bc, 0
 __END_PROGRAM:
 	di
@@ -46,4 +46,7 @@ __CALL_BACK__:
 _putTile10x8Box:
 _putTile10x8Box__leave:
 	ret
+#line 8
+	;; --- end of user code ---
+#line 9
 	END