Merged in bugfix/asm_label_lost (pull request #176)

Bugfix/asm label lost

Approved-by: Jose Rodriguez <boriel@gmail.com>

Author: boriel

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 1.8.6
+current_version = 1.8.7
 files = version.py
 

ChangeLog

@@ -1,3 +1,11 @@
+================================================================
+Changes from Version 1.8.6 to 1.8.7
+! Bugfix: do not remove ASM blocks (optimize)
+
+================================================================
+Changes from Version 1.8.5 to 1.8.6
+! Bugfix: END instruction was not returning result. Fixed.
+
 ================================================================
 Changes from Version 1.8.4 to 1.8.5
 ! Bugfix: crash on bad array declaration

arch/zx48k/backend/__init__.py

@@ -2716,7 +2716,8 @@ def output_join(output, new_chunk):
             # <any inst>
             # Into:
             # jp XXX
-            if OPT31 and i1 == 'jp' and not condition(output[-1]) and i2 is not None and i2[-1] != ':':
+            if OPT31 and i1 == 'jp' and not condition(output[-1]) and i2 is not None and \
+                    i2[-1] != ':' and new_chunk[0] not in ASMS:
                 new_chunk.pop(0)
                 changed = True
                 continue

tests/functional/opt1_nolabel.asm

@@ -0,0 +1,43 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+#line 1
+		ld hl, mygod
+#line 2
+	jp __LABEL__finish
+mygod:
+		nop
+#line 9
+__LABEL__finish:
+	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:
+	; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END EQU ZXBASIC_MEM_HEAP
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/opt1_nolabel.bas

@@ -0,0 +1,14 @@
+
+ASM
+ld hl, mygod
+END ASM
+
+GOTO finish
+
+ASM
+mygod:
+nop
+END ASM
+
+finish:
+

version.py

@@ -1 +1 @@
-VERSION = '1.8.6'
+VERSION = '1.8.7'