Clean up asm with O4 or higher

Simplifies the asm if O4 or higher is used.

Author: boriel

arch/zx48k/optimizer/__init__.py

@@ -186,6 +186,7 @@ def optimize(initial_memory):
     if OPTIONS.optimization.value <= 2:  # if -O2 or lower, do nothing and return
         return '\n'.join(x for x in initial_memory if not RE_PRAGMA.match(x))
 
+    basicblock.BasicBlock.clean_asm_args = OPTIONS.optimization.value > 3
     bb = basicblock.BasicBlock(initial_memory)
     cleanup_local_labels(bb)
     initialize_memory(bb)

arch/zx48k/optimizer/basicblock.py

@@ -22,6 +22,7 @@ class BasicBlock(object):
     """ A Class describing a basic block
     """
     __UNIQUE_ID = 0
+    clean_asm_args = False
 
     def __init__(self, memory):
         """ Initializes the internal array of instructions.
@@ -84,7 +85,11 @@ def code(self):
     def code(self, value):
         assert isinstance(value, (list, tuple))
         assert all(isinstance(x, str) for x in value)
-        self.mem = [MemCell(asm, i) for i, asm in enumerate(value)]
+        if self.clean_asm_args:
+            self.mem = [MemCell(helpers.simplify_asm_args(asm), i) for i, asm in enumerate(value)]
+        else:
+            self.mem = [MemCell(asm, i) for i, asm in enumerate(value)]
+
         self._bytes = None
         self._sizeof = None
         self._max_tstates = None

tests/arch/zx48k/optimizer/test_basicblock.py

@@ -148,3 +148,12 @@ def test_long_block(self):
         self.assertFalse(blks[1] in blks[2].goes_to)
         self.assertFalse(blks[1] in blks[3].goes_to)
         self.assertFalse(blks[5].goes_to)  # empty
+
+    def test_basic_block_clean_ld_hl(self):
+        code = """
+        ld hl, (30001 - 1)
+        """
+        basicblock.BasicBlock.clean_asm_args = True
+        self.blk.code = [x for x in code.split('\n') if x.strip()]
+        self.assertEqual(1, len(self.blk))
+        self.assertEqual(['ld hl, (30000)'], self.blk.code)

tests/functional/opt4_053opt.asm

@@ -0,0 +1,108 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	ld a, (_sail)
+	dec a
+	jp nz, __LABEL__enddispara
+	ld a, (_subeEgg)
+	or a
+	jp nz, __LABEL__enddispara
+	ld a, (40011)
+	ld hl, (40042)
+	cp h
+	jp nc, __LABEL__enddispara
+	ld a, (40044)
+	ld hl, (40011)
+	sub h
+	call __ABS8
+	ld h, 16
+	call __LTI8
+	or a
+	jp z, __LABEL__enddispara
+	ld a, (40011)
+	ld hl, (40042)
+	sub h
+	call __ABS8
+	ld h, 20
+	call __LTI8
+	or a
+	jp nz, __LABEL__enddispara
+__LABEL7:
+__LABEL5:
+__LABEL3:
+__LABEL1:
+	jp __LABEL__enddispara
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	pop iy
+	pop ix
+	exx
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+__LABEL__enddispara:
+	ld bc, 0
+	jp __END_PROGRAM
+#line 1 "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"
+
+__LEI8: ; Signed <= comparison for 8bit int
+	        ; A <= H (registers)
+	    PROC
+	    LOCAL checkParity
+	    sub h
+	    jr nz, __LTI
+	    inc a
+	    ret
+
+__LTI8:  ; Test 8 bit values A < H
+	    sub h
+
+__LTI:   ; Generic signed comparison
+	    jp po, checkParity
+	    xor 0x80
+checkParity:
+	    ld a, 0     ; False
+	    ret p
+	    inc a       ; True
+	    ret
+	    ENDP
+#line 2 "lti8.asm"
+#line 50 "opt4_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 USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/opt4_053opt.bas

@@ -0,0 +1,29 @@
+
+#define tablaSprites 40000
+
+#define toloX (tablaSprites+11)
+#define toloY (tablaSprites+12)
+#define eggX (tablaSprites+32+11)
+#define eggY (tablaSprites+32+12)
+
+
+DIM subeEgg, sail as UByte
+
+
+
+if sail=1 then
+	if subeEgg=0 then
+		if peek(toloX)<peek(eggX) then
+			if abs(cast(byte,peek(eggY)-peek(toloY)))<16 then
+				if abs(cast(byte,peek(toloX)-peek(eggX)))<20 then'24
+					goto enddispara
+				end if
+			end if
+		end if
+	end if
+end if
+
+goto enddispara
+END
+enddispara:
+