fix: fixes -O3 optimization

ld sp, nn | inc sp | dec sp
pop NN

cannot be replaced with:

pop NN
ld sp, nn | inc sp | dec sp

Author: boriel

src/arch/z80/optimizer/memcell.py

@@ -323,7 +323,7 @@ def affects(self, reglist: list[str] | str) -> bool:
             reglist = [reglist]
 
         reglist = helpers.single_registers(reglist)
-        return bool([x for x in self.destroys if x in reglist])
+        return any(x for x in self.destroys if x in reglist)
 
     def needs(self, reglist: list[str] | str) -> bool:
         """Returns if this instruction need any of the registers
@@ -333,7 +333,7 @@ def needs(self, reglist: list[str] | str) -> bool:
             reglist = [reglist]
 
         reglist = helpers.single_registers(reglist)
-        return bool([x for x in self.requires if x in reglist])
+        return any(x for x in self.requires if x in reglist)
 
     @property
     def used_labels(self) -> list[str]:

src/arch/z80/peephole/opts/028_o3_pop_up.opt

@@ -18,6 +18,7 @@ REPLACE {{
 
 IF {{
   !(INSTR($2) IN (jp, jr, ret, call, djnz, rst)) && !NEEDS($2, (sp, $1)) && !IS_LABEL($2)
+  && OP1($2) <> "sp"
 }}
 
 WITH {{

tests/arch/zx48k/optimizer/test_optimizer.py

@@ -41,3 +41,26 @@ def test_unrequired_or_a(self):
         with mock_options_level(4):
             optimized_code = optimizer.Optimizer().optimize(code)
             assert optimized_code.split("\n")[:2] == ["call .core.__LTI8", "ld bc, 0"]
+
+    def test_ld_sp_requires_sp(self):
+        code_src = """
+        ld sp, hl
+        pop iy
+        """
+        code = [x.strip() for x in code_src.split("\n") if x.strip()]
+
+        with mock_options_level(4):
+            optimized_code = optimizer.Optimizer().optimize(code)
+            assert optimized_code.split("\n")[:2] == ["ld sp, hl", "pop iy"]
+
+    def test_hd_sp_requires_sp(self):
+        code_src = """
+        add hl, sp
+        pop iy
+        jp (hl)
+        """
+        code = [x.strip() for x in code_src.split("\n") if x.strip()]
+
+        with mock_options_level(3):
+            optimized_code = optimizer.Optimizer().optimize(code)
+            assert optimized_code.split("\n") == ["add hl, sp", "pop iy", "jp (hl)"]

tests/functional/zxnext/opt4_mul8.asm

@@ -33,10 +33,10 @@ _y:
 	push hl
 	call _printTest
 .core.__END_PROGRAM:
-	pop iy
 	di
 	ld hl, (.core.__CALL_BACK__)
 	ld sp, hl
+	pop iy
 	ei
 	ret
 _printTest: