Fix cpu state for in and out

These should not affect nothing except the register used in IN

Author: boriel

arch/zx48k/optimizer/cpustate.py

@@ -736,6 +736,13 @@ def execute(self, asm_code):
             self.Z = int(val == 0)
             return
 
+        if i == 'out':
+            return
+
+        if i == 'in':
+            self.set(o[0], None)
+            return
+
         # Unknown. Resets ALL
         self.reset()
 

tests/arch/zx48k/optimizer/test_cpustate.py

@@ -305,4 +305,25 @@ def test_xor_a(self):
         self.assertEqual(self.regs['a'], '0')
         self.assertEqual(self.cpu_state.C, 0)
         self.assertEqual(self.cpu_state.Z, 1)
-        # Must not crash
+
+    def test_out_c_a(self):
+        code = """
+        xor a
+        out (c), a
+        """
+        self._eval(code)
+        self.assertEqual(self.regs['a'], '0')
+        self.assertEqual(self.cpu_state.C, 0)
+        self.assertEqual(self.cpu_state.Z, 1)
+
+    def test_in_a_c(self):
+        code = """
+        xor a
+        in a, (c)
+        """
+        self._eval(code)
+        self.assertNotEqual(self.regs['a'], '0')
+        self.assertTrue(helpers.is_unknown8(self.regs['a']))
+        self.assertEqual(self.cpu_state.C, 0)
+        self.assertEqual(self.cpu_state.Z, 1)
+

tests/functional/opt3_inout.asm

@@ -0,0 +1,44 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	xor a
+	ld bc, 32768
+	out (c), a
+	out (c), a
+	in a, (c)
+	ld (_a), a
+	in a, (c)
+	ld (_a), a
+	ld (0), 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:
+_a:
+	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/opt3_inout.bas

@@ -0,0 +1,11 @@
+
+DIM a as UByte
+
+out 32768, 0
+out 32768, 0
+
+a = in 32768
+a = in 32768
+
+poke 0, a
+

tests/functional/opt4_inout.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
+	xor a
+	ld bc, 32768
+	out (c), a
+	out (c), a
+	in a, (c)
+	in a, (c)
+	ld (_a), a
+	ld (0), 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:
+_a:
+	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_inout.bas

@@ -0,0 +1,11 @@
+
+DIM a as UByte
+
+out 32768, 0
+out 32768, 0
+
+a = in 32768
+a = in 32768
+
+poke 0, a
+