Merge pull request #832 from bartsanchez/bart/move-ret16-to-a-class

ref: move ret16 function into a class (Bits16)

Author: boriel

src/arch/z80/backend/_16bit.py

@@ -1117,13 +1117,13 @@ def jgezeroi16(cls, ins: Quad) -> list[str]:
         output.append("jp nc, %s" % str(ins[2]))
         return output
 
-
-def _ret16(ins: Quad) -> list[str]:
-    """Returns from a procedure / function a 16bits value"""
-    output = Bits16.get_oper(ins[1])
-    output.append("#pragma opt require hl")
-    output.append("jp %s" % str(ins[2]))
-    return output
+    @classmethod
+    def ret16(cls, ins: Quad) -> list[str]:
+        """Returns from a procedure / function a 16bits value"""
+        output = Bits16.get_oper(ins[1])
+        output.append("#pragma opt require hl")
+        output.append("jp %s" % str(ins[2]))
+        return output
 
 
 def _param16(ins: Quad) -> list[str]:

src/arch/z80/backend/main.py

@@ -31,7 +31,6 @@
     _fparam16,
     _jnzero16,
     _param16,
-    _ret16,
 )
 
 # 32 bit bitwise operations
@@ -367,10 +366,10 @@ def _set_quad_table(self):
                 2, Bits8.ret8
             ),  # Returns from a function call (enters the 'leave' sequence'), returning 8 bit value
             ICInstruction.RETI16: ICInfo(
-                2, _ret16
+                2, Bits16.ret16
             ),  # Returns from a func call (enters the 'leave' sequence'), returning 16 bit value
             ICInstruction.RETU16: ICInfo(
-                2, _ret16
+                2, Bits16.ret16
             ),  # Returns from a func call (enters the 'leave' sequence'), returning 16 bit value
             ICInstruction.RETI32: ICInfo(
                 2, Bits32.ret32