Merge pull request #216 from boriel/bugfix/optimizer

Bugfix/optimizer

Author: boriel

arch/zx48k/optimizer/cpustate.py

@@ -568,8 +568,12 @@ def execute(self, asm_code):
             return
 
         if i == 'ex':
-            for j in 'af', 'a', 'f':
-                self.regs[j], self.regs["%s'" % j] = self.regs["%s'" % j], self.regs[j]
+            if o == ['de', 'hl']:
+                for a, b in [('de', 'hl'), ('d', 'h'), ('e', 'l')]:
+                    self.regs[a], self.regs[b] = self.regs[b], self.regs[a]
+            else:
+                for j in 'af', 'a', 'f':
+                    self.regs[j], self.regs["%s'" % j] = self.regs["%s'" % j], self.regs[j]
             return
 
         if i == 'xor':

tests/arch/zx48k/optimizer/test_cpustate.py

@@ -337,3 +337,29 @@ def test_xor_a_ld_n_a(self):
         self.assertFalse(helpers.is_unknown8(self.regs['a']))
         self.assertEqual(self.cpu_state.C, 0)
         self.assertEqual(self.cpu_state.Z, 1)
+
+    def test_ex_de_hl(self):
+        code = """
+        ld hl, 0x1234
+        ld de, 0x5678
+        ex de, hl
+        """
+        self._eval(code)
+        self.assertEqual(self.regs['h'], str(0x56))
+        self.assertEqual(self.regs['l'], str(0x78))
+        self.assertEqual(self.regs['d'], str(0x12))
+        self.assertEqual(self.regs['e'], str(0x34))
+
+    def test_ex_de_hl_unkown(self):
+        code = """
+        ld hl, (x)
+        ld de, (y)
+        ex de, hl
+        """
+        self._eval(code)
+        self.assertEqual(self.regs['hl'], self.cpu_state.mem['y'])
+        self.assertEqual(self.regs['de'], self.cpu_state.mem['x'])
+        self.assertEqual(self.regs['h'], helpers.HI16_val(self.cpu_state.mem['y']))
+        self.assertEqual(self.regs['l'], helpers.LO16_val(self.cpu_state.mem['y']))
+        self.assertEqual(self.regs['d'], helpers.HI16_val(self.cpu_state.mem['x']))
+        self.assertEqual(self.regs['e'], helpers.LO16_val(self.cpu_state.mem['x']))

tests/functional/opt3_fixed.asm

@@ -0,0 +1,49 @@
+	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 hl, (_x)
+	ld de, (_x + 2)
+	ld bc, (_dx)
+	add hl, bc
+	ex de, hl
+	ld bc, (_dx + 2)
+	adc hl, bc
+	ex de, hl
+	ld (_x), hl
+	ld (_x + 2), de
+	ex de, hl
+	xor a
+	ld (hl), a
+	ld bc, 0
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	pop iy
+	pop ix
+	exx
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+ZXBASIC_USER_DATA:
+_x:
+	DEFB 00, 00, 00, 00
+_dx:
+	DEFB 00, 00, 00, 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/opt3_fixed.bas

@@ -0,0 +1,5 @@
+DIM x, dx as Fixed
+
+let x = x + dx
+POKE x, 0
+

tests/functional/test.py

@@ -119,7 +119,7 @@ def get_file_lines(filename, ignore_regexp=None, replace_regexp=None,
         lines = [x.replace(replace_what, replace_with, 1) if r.search(x) else x for x in lines]
 
     if strip_blanks:
-        lines = [x.rstrip() for x in lines if x.rstrip()]
+        lines = [x.rstrip(' \t') for x in lines if x.rstrip()]
 
     return lines
 

tox.ini

@@ -26,6 +26,7 @@ exclude =
     library-asm/,
     parsetab/,
     scratch/,
+    .git/
 
 [testenv:flake8]
 deps = flake8