Merge pull request #829 from bartsanchez/bart/move-jzero16-to-a-class

ref: move jzero16 function into a class (Bits16)

Author: boriel

src/arch/z80/backend/_16bit.py

@@ -1073,21 +1073,21 @@ def store16(cls, ins: Quad) -> list[str]:
 
         return output
 
+    @classmethod
+    def jzero16(cls, ins: Quad) -> list[str]:
+        """Jumps if top of the stack (16bit) is 0 to arg(1)"""
+        value = ins[1]
+        if is_int(value):
+            if int(value) == 0:
+                return ["jp %s" % str(ins[2])]  # Always true
+            else:
+                return []
 
-def _jzero16(ins: Quad) -> list[str]:
-    """Jumps if top of the stack (16bit) is 0 to arg(1)"""
-    value = ins[1]
-    if is_int(value):
-        if int(value) == 0:
-            return ["jp %s" % str(ins[2])]  # Always true
-        else:
-            return []
-
-    output = Bits16.get_oper(value)
-    output.append("ld a, h")
-    output.append("or l")
-    output.append("jp z, %s" % str(ins[2]))
-    return output
+        output = Bits16.get_oper(value)
+        output.append("ld a, h")
+        output.append("or l")
+        output.append("jp z, %s" % str(ins[2]))
+        return output
 
 
 def _jgezerou16(ins: Quad) -> list[str]:

src/arch/z80/backend/main.py

@@ -32,7 +32,6 @@
     _jgezeroi16,
     _jgezerou16,
     _jnzero16,
-    _jzero16,
     _param16,
     _ret16,
 )
@@ -313,8 +312,8 @@ def _set_quad_table(self):
             ICInstruction.LENSTR: ICInfo(2, String.lenstr),  # Gets strlen
             ICInstruction.JZEROI8: ICInfo(2, Bits8.jzero8),  # if X == 0 jmp LABEL
             ICInstruction.JZEROU8: ICInfo(2, Bits8.jzero8),  # if X == 0 jmp LABEL
-            ICInstruction.JZEROI16: ICInfo(2, _jzero16),  # if X == 0 jmp LABEL
-            ICInstruction.JZEROU16: ICInfo(2, _jzero16),  # if X == 0 jmp LABEL
+            ICInstruction.JZEROI16: ICInfo(2, Bits16.jzero16),  # if X == 0 jmp LABEL
+            ICInstruction.JZEROU16: ICInfo(2, Bits16.jzero16),  # if X == 0 jmp LABEL
             ICInstruction.JZEROI32: ICInfo(2, Bits32.jzero32),  # if X == 0 jmp LABEL (32bit, fixed)
             ICInstruction.JZEROU32: ICInfo(2, Bits32.jzero32),  # if X == 0 jmp LABEL (32bit, fixed)
             ICInstruction.JZEROF16: ICInfo(2, Fixed16.jzerof16),  # if X == 0 jmp LABEL (32bit, fixed)