Add MISC labels

Also add Beep-related routines and BORDER

Author: boriel

src/arch/zx48k/backend/runtime/io.py

@@ -27,6 +27,8 @@ class IOLabels:
     OVER_TMP = f"{NAMESPACE}OVER_TMP"
     PAPER_TMP = f"{NAMESPACE}PAPER_TMP"
 
+    BORDER = f"{NAMESPACE}BORDER"
+
     # Drawing primitives
     CIRCLE = f"{NAMESPACE}CIRCLE"
     DRAW = f"{NAMESPACE}DRAW"
@@ -56,6 +58,10 @@ class IOLabels:
     LOAD_CODE = f"{NAMESPACE}LOAD_CODE"
     SAVE_CODE = f"{NAMESPACE}SAVE_CODE"
 
+    # Sound
+    BEEP = f"{NAMESPACE}BEEP"
+    BEEPER = f"{NAMESPACE}__BEEPER"
+
 
 REQUIRED_MODULES = {
     IOLabels.CLS: 'cls.asm',
@@ -79,6 +85,8 @@ class IOLabels:
     IOLabels.OVER_TMP: 'over.asm',
     IOLabels.PAPER_TMP: 'paper.asm',
 
+    IOLabels.BORDER: 'border.asm',
+
     IOLabels.CIRCLE: 'circle.asm',
     IOLabels.DRAW: 'draw.asm',
     IOLabels.DRAW3: 'draw3.asm',
@@ -103,4 +111,7 @@ class IOLabels:
     IOLabels.PRINT_EOL: 'print.asm',
     IOLabels.PRINT_EOL_ATTR: 'print_eol_attr.asm',
     IOLabels.PRINT_TAB: 'print.asm',
+
+    IOLabels.BEEP: 'beep.asm',
+    IOLabels.BEEPER: 'beeper.asm'
 }

src/arch/zx48k/backend/runtime/labels.py

@@ -9,14 +9,16 @@
 from . import io
 from . import math
 from . import random
+from . import misc
 
 
 class Labels(
     core.CoreLabels,
     datarestore.DataRestoreLabels,
     io.IOLabels,
     math.MathLabels,
-    random.RandomLabels
+    misc.MiscLabels,
+    random.RandomLabels,
 ):
     """ All labels
     """
@@ -44,5 +46,6 @@ def dict_join(*args: Dict[str, str]) -> Dict[str, str]:
     datarestore.REQUIRED_MODULES,
     math.REQUIRED_MODULES,
     io.REQUIRED_MODULES,
-    random.REQUIRED_MODULES
+    random.REQUIRED_MODULES,
+    misc.REQUIRED_MODULES
 )

src/arch/zx48k/backend/runtime/misc.py

@@ -0,0 +1,12 @@
+# Miscelaneous functions
+
+from .namespace import NAMESPACE
+
+
+class MiscLabels:
+    PAUSE = f"{NAMESPACE}__PAUSE"
+
+
+REQUIRED_MODULES = {
+    MiscLabels.PAUSE: 'pause.asm'
+}

src/arch/zx48k/translator.py

@@ -831,29 +831,25 @@ def visit_VERIFY(self, node):
     def visit_BORDER(self, node):
         yield node.children[0]
         self.ic_fparam(TYPE.ubyte, node.children[0].t)
-        self.ic_call('BORDER', 0)
-        backend.REQUIRES.add('border.asm')
+        self.runtime_call(RuntimeLabel.BORDER, 0)
 
     def visit_BEEP(self, node):
         if node.children[0].token == node.children[1].token == 'NUMBER':  # BEEP <const>, <const>
             DE, HL = src.arch.zx48k.beep.getDEHL(float(node.children[0].t), float(node.children[1].t))
             self.ic_param(TYPE.uinteger, HL)
             self.ic_fparam(TYPE.uinteger, DE)
-            self.ic_call('__BEEPER', 0)  # Procedure call. Discard return
-            backend.REQUIRES.add('beeper.asm')
+            self.runtime_call(RuntimeLabel.BEEPER, 0)  # Procedure call. Discard return
         else:
             yield node.children[1]
             self.ic_param(TYPE.float_, node.children[1].t)
             yield node.children[0]
             self.ic_fparam(TYPE.float_, node.children[0].t)
-            self.ic_call('BEEP', 0)
-            backend.REQUIRES.add('beep.asm')
+            self.runtime_call(RuntimeLabel.BEEP, 0)
 
     def visit_PAUSE(self, node):
         yield node.children[0]
         self.ic_fparam(node.children[0].type_, node.children[0].t)
-        self.ic_call('__PAUSE', 0)
-        backend.REQUIRES.add('pause.asm')
+        self.runtime_call(RuntimeLabel.PAUSE, 0)
 
     # endregion