Merge pull request #842 from bartsanchez/bart/move-int16-to-a-class

ref: move int16 function into a class (Bits16)

Author: boriel

src/arch/z80/backend/_16bit.py

@@ -16,19 +16,16 @@
 from src.arch.z80.backend.runtime import Labels as RuntimeLabel
 
 
-# -----------------------------------------------------
-# 16 bits operands
-# -----------------------------------------------------
-def int16(op):
-    """Returns a 16 bit operand converted to 16 bits unsigned int.
-    Negative numbers are returned in 2 complement.
-    """
-    return int(op) & 0xFFFF
-
-
 class Bits16:
     """Implementation of 16bit operations."""
 
+    @classmethod
+    def int16(cls, op):
+        """Returns a 16 bit operand converted to 16 bits unsigned int.
+        Negative numbers are returned in 2 complement.
+        """
+        return int(op) & 0xFFFF
+
     @classmethod
     def get_oper(cls, op1, op2=None, *, reversed: bool = False):
         """Returns pop sequence for 16 bits operands
@@ -63,7 +60,7 @@ def get_oper(cls, op1, op2=None, *, reversed: bool = False):
             if indirect:
                 output.append("ld hl, (%i)" % op)
             else:
-                output.append("ld hl, %i" % int16(op))
+                output.append("ld hl, %i" % cls.int16(op))
         else:
             if immediate:
                 if indirect:
@@ -104,7 +101,7 @@ def get_oper(cls, op1, op2=None, *, reversed: bool = False):
             if indirect:
                 output.append("ld de, (%i)" % op)
             else:
-                output.append("ld de, %i" % int16(op))
+                output.append("ld de, %i" % cls.int16(op))
         else:
             if immediate:
                 output.append("ld de, %s" % op)
@@ -145,7 +142,7 @@ def add16(cls, ins: Quad) -> list[str]:
         op1, op2 = tuple(ins[2:])
         if _int_ops(op1, op2) is not None:
             op1, op2 = _int_ops(op1, op2)
-            op2 = int16(op2)
+            op2 = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op2 == 0:
@@ -194,7 +191,7 @@ def sub16(cls, ins: Quad) -> list[str]:
         op1, op2 = tuple(ins[2:4])
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op == 0:
@@ -302,7 +299,7 @@ def divu16(cls, ins: Quad) -> list[str]:
             return output
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op2 == 0:  # A * 0 = 0 * A = 0
@@ -361,7 +358,7 @@ def divi16(cls, ins: Quad) -> list[str]:
             return output
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op == 1:
@@ -403,7 +400,7 @@ def modu16(cls, ins: Quad) -> list[str]:
         op1, op2 = tuple(ins[2:])
 
         if is_int(op2):
-            op2 = int16(op2)
+            op2 = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op2 == 1:
@@ -448,7 +445,7 @@ def modi16(cls, ins: Quad) -> list[str]:
         op1, op2 = tuple(ins[2:])
 
         if is_int(op2):
-            op2 = int16(op2)
+            op2 = cls.int16(op2)
             output = Bits16.get_oper(op1)
 
             if op2 == 1:
@@ -888,7 +885,7 @@ def shru16(cls, ins: Quad) -> list[str]:
         label2 = tmp_label()
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             if op == 0:
                 return []
 
@@ -932,7 +929,7 @@ def shri16(cls, ins: Quad) -> list[str]:
         label2 = tmp_label()
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             if op == 0:
                 return []
 
@@ -976,7 +973,7 @@ def shl16(cls, ins: Quad) -> list[str]:
         label2 = tmp_label()
 
         if is_int(op2):
-            op = int16(op2)
+            op = cls.int16(op2)
             if op == 0:
                 return []
 

src/arch/z80/backend/_pload.py

@@ -10,7 +10,7 @@
 # --------------------------------------------------------------
 from . import common
 from ._8bit import Bits8
-from ._16bit import Bits16, int16
+from ._16bit import Bits16
 from ._32bit import Bits32
 from ._f16 import Fixed16
 from ._float import Float
@@ -288,7 +288,7 @@ def _pstore16(ins: Quad) -> list[str]:
 
     if indirect:
         if is_int(value):
-            output.append("ld hl, %i" % int16(value))
+            output.append("ld hl, %i" % Bits16.int16(value))
 
         output.append("ld bc, %i" % i)
         output.append(runtime_call(RuntimeLabel.PISTORE16))
@@ -305,7 +305,7 @@ def _pstore16(ins: Quad) -> list[str]:
         output.append("add hl, bc")
 
         if is_int(value):
-            v = int16(value)
+            v = Bits16.int16(value)
             output.append("ld (hl), %i" % (v & 0xFF))
             output.append("inc hl")
             output.append("ld (hl), %i" % (v >> 8))
@@ -317,7 +317,7 @@ def _pstore16(ins: Quad) -> list[str]:
             return output
 
     if is_int(value):
-        v = int16(value)
+        v = Bits16.int16(value)
         output.append(f"ld ({common.IDX_REG}%+i), %i" % (i, v & 0xFF))
         output.append(f"ld ({common.IDX_REG}%+i), %i" % (i + 1, v >> 8))
     else: