Add USR and USR_STR labels

Author: boriel

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

@@ -7,12 +7,16 @@ class MiscLabels:
     ASC = f"{NAMESPACE}__ASC"
     CHR = f"{NAMESPACE}CHR"
     PAUSE = f"{NAMESPACE}__PAUSE"
+    USR = f"{NAMESPACE}USR"
+    USR_STR = f"{NAMESPACE}USR_STR"
     VAL = f"{NAMESPACE}VAL"
 
 
 REQUIRED_MODULES = {
     MiscLabels.ASC: 'asc.asm',
     MiscLabels.CHR: 'chr.asm',
     MiscLabels.PAUSE: 'pause.asm',
+    MiscLabels.USR: 'usr.asm',
+    MiscLabels.USR_STR: 'usr_str.asm',
     MiscLabels.VAL: 'val.asm'
 }

src/arch/zx48k/translator.py

@@ -1355,15 +1355,13 @@ def visit_UBOUND(self, node):
     def visit_USR_STR(self, node):
         # USR ADDR
         self.ic_fparam(TYPE.string, node.children[0].t)
-        self.ic_call('USR_STR', node.type_.size)
-        backend.REQUIRES.add('usr_str.asm')
+        self.runtime_call(RuntimeLabel.USR_STR, node.type_.size)
 
     def visit_USR(self, node):
         """ Machine code call from basic
         """
         self.ic_fparam(gl.PTR_TYPE, node.children[0].t)
-        self.ic_call('USR', node.type_.size)
-        backend.REQUIRES.add('usr.asm')
+        self.runtime_call(RuntimeLabel.USR, node.type_.size)
 
 
 class FunctionTranslator(Translator):