Merge pull request #520 from boriel/feature/move_asm_lib_to_CORE_namespace

Feature/move asm lib to core namespace

Author: boriel

src/api/global_.py

@@ -117,11 +117,28 @@
 # ----------------------------------------------------------------------
 SIZE_TYPE = None
 
+# ----------------------------------------------------------------------
+# CORE namespace (for core runtime library, like FP Calc)
+# ----------------------------------------------------------------------
+CORE_NAMESPACE = '.core'
+
 # ----------------------------------------------------------------------
 # DATA Labels namespace
 # ----------------------------------------------------------------------
 DATAS_NAMESPACE = '.DATA'
 
+# ----------------------------------------------------------------------
+# LABEL Labels namespace
+# ----------------------------------------------------------------------
+LABELS_NAMESPACE = '.LABEL'
+
+# ----------------------------------------------------------------------
+# USER DATA LABELS
+# ----------------------------------------------------------------------
+ZXBASIC_USER_DATA = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA"
+ZXBASIC_USER_DATA_LEN = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA_LEN"
+
+
 # ----------------------------------------------------------------------
 # Data Type used for string chars index. Must be an integral
 # ----------------------------------------------------------------------

src/api/symboltable.py

@@ -688,12 +688,11 @@ def declare_label(self, id_: str, lineno: int) -> Optional[SymbolLABEL]:
             entry = symbols.VAR.to_label(entry)
 
         if id_[0] == '.':
-            id_ = id_[1:]
-            # HINT: ??? Mangled name. Just the label, 'cause it starts with '.'
-            entry.mangled = '%s' % id_
+            # Just the label, because it starts with '.' so it's a root-global label
+            entry.mangled = f'{id_}'
         else:
-            # HINT: Mangled name. Labels are __LABEL__
-            entry.mangled = '__LABEL__%s' % entry.name
+            # TODO: This shouln't be needed (but still is). Need investigation
+            entry.mangled = f'{global_.LABELS_NAMESPACE}.{symbols.LABEL.prefix}{entry.name}'
 
         entry.is_line_number = isinstance(id1, int)
 

src/arch/zx48k/backend/__common.py

@@ -7,7 +7,9 @@
 from typing import List
 from typing import Set
 
+import src.api.global_ as gl
 import src.api.errors
+
 from .runtime import RUNTIME_LABELS
 from .runtime import LABEL_REQUIRED_MODULES
 
@@ -69,7 +71,7 @@ def tmp_label() -> str:
     global LABEL_COUNTER
     global TMP_LABELS
 
-    result = '__LABEL%i' % LABEL_COUNTER
+    result = f'{gl.LABELS_NAMESPACE}.__LABEL{LABEL_COUNTER}'
     TMP_LABELS.add(result)
     LABEL_COUNTER += 1
 

src/arch/zx48k/backend/__init__.py

@@ -11,6 +11,8 @@
 from typing import List
 from typing import Set
 
+from src.api import global_
+
 from . import errors
 from .errors import InvalidICError as InvalidIC
 
@@ -118,12 +120,12 @@
 RE_IX_IDX = re.compile(r'^\([ \t]*ix[ \t]*[-+][ \t]*.+\)$')
 
 # Label for the program START end EXIT
-START_LABEL = f'{NAMESPACE}__START_PROGRAM'
-END_LABEL = f'{NAMESPACE}__END_PROGRAM'
-CALL_BACK = f'{NAMESPACE}__CALL_BACK__'
-MAIN_LABEL = f'{NAMESPACE}__MAIN_PROGRAM__'
-DATA_LABEL = f'{NAMESPACE}ZXBASIC_USER_DATA'
-DATA_END_LABEL = f'{NAMESPACE}ZXBASIC_USER_DATA_END'
+START_LABEL = f'{NAMESPACE}.__START_PROGRAM'
+END_LABEL = f'{NAMESPACE}.__END_PROGRAM'
+CALL_BACK = f'{NAMESPACE}.__CALL_BACK__'
+MAIN_LABEL = f'{NAMESPACE}.__MAIN_PROGRAM__'
+DATA_LABEL = global_.ZXBASIC_USER_DATA
+DATA_END_LABEL = f'{DATA_LABEL}_END'
 
 # Whether to use the FunctionExit scheme
 FLAG_use_function_exit = False
@@ -198,9 +200,9 @@ def init():
     # Default HEAP SIZE (Dynamic memory) in bytes
     OPTIONS.add_option('heap_size', int, 4768)  # A bit more than 4K
     # Labels for HEAP START (might not be used if not needed)
-    OPTIONS.add_option('heap_start_label', str, f'{NAMESPACE}ZXBASIC_MEM_HEAP')
+    OPTIONS.add_option('heap_start_label', str, f'{NAMESPACE}.ZXBASIC_MEM_HEAP')
     # Labels for HEAP SIZE (might not be used if not needed)
-    OPTIONS.add_option('heap_size_label', str, f'{NAMESPACE}ZXBASIC_HEAP_SIZE')
+    OPTIONS.add_option('heap_size_label', str, f'{NAMESPACE}.ZXBASIC_HEAP_SIZE')
     # Flag for headerless mode (No prologue / epilogue)
     OPTIONS.add_option('headerless', bool, False)
 
@@ -2224,16 +2226,16 @@ def emit_start():
     heap_init = ['%s:' % DATA_LABEL]
     output.append('org %s' % OPTIONS.org)
 
-    if REQUIRES.intersection(MEMINITS) or f'{NAMESPACE}__MEM_INIT' in INITS:
+    if REQUIRES.intersection(MEMINITS) or f'{NAMESPACE}.__MEM_INIT' in INITS:
         heap_init.append('; Defines HEAP SIZE\n' + OPTIONS.heap_size_label + ' EQU ' +
                          str(OPTIONS.heap_size))
         heap_init.append(OPTIONS.heap_start_label + ':')
         heap_init.append('DEFS %s' % str(OPTIONS.heap_size))
 
     heap_init.append('; Defines USER DATA Length in bytes\n' +
-                     f'{NAMESPACE}ZXBASIC_USER_DATA_LEN EQU {DATA_END_LABEL} - {DATA_LABEL}')
-    heap_init.append(f'{NAMESPACE}__LABEL__.ZXBASIC_USER_DATA_LEN EQU {NAMESPACE}ZXBASIC_USER_DATA_LEN')
-    heap_init.append(f'{NAMESPACE}__LABEL__.ZXBASIC_USER_DATA EQU {DATA_LABEL}')
+                     f'{NAMESPACE}.ZXBASIC_USER_DATA_LEN EQU {DATA_END_LABEL} - {DATA_LABEL}')
+    heap_init.append(f'{NAMESPACE}.__LABEL__.ZXBASIC_USER_DATA_LEN EQU {NAMESPACE}.ZXBASIC_USER_DATA_LEN')
+    heap_init.append(f'{NAMESPACE}.__LABEL__.ZXBASIC_USER_DATA EQU {DATA_LABEL}')
 
     output.append('%s:' % START_LABEL)
     if OPTIONS.headerless:
@@ -2331,7 +2333,7 @@ def remove_unused_labels(output: List[str]):
                 labels_to_delete.pop(new_label, None)
 
                 if new_label != op:
-                    output[i] = re.sub(r'\b' + op + r'\b', new_label, ins)
+                    output[i] = re.sub(f"((?<![.a-zA-Z0-9_])){op.replace('.', '[.]')}(?=$|\\s)", new_label, ins)
 
     for i in sorted(labels_to_delete.values(), reverse=True):
         output.pop(i)

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

@@ -4,132 +4,132 @@
 
 
 class CoreLabels:
-    ABS16 = f"{NAMESPACE}__ABS16"
-    ABS8 = f"{NAMESPACE}__ABS8"
-    ABS32 = f"{NAMESPACE}__ABS32"
-    ADDF = f"{NAMESPACE}__ADDF"
-    ADDSTR = f"{NAMESPACE}__ADDSTR"
-    ALLOC_INITIALIZED_LOCAL_ARRAY = f"{NAMESPACE}__ALLOC_INITIALIZED_LOCAL_ARRAY"
-    ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS = f"{NAMESPACE}__ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS"
-    ALLOC_LOCAL_ARRAY = f"{NAMESPACE}__ALLOC_LOCAL_ARRAY"
-    ALLOC_LOCAL_ARRAY_WITH_BOUNDS = f"{NAMESPACE}__ALLOC_LOCAL_ARRAY_WITH_BOUNDS"
-    AND16 = f"{NAMESPACE}__AND16"
-    AND32 = f"{NAMESPACE}__AND32"
-    ANDF = f"{NAMESPACE}__ANDF"
-    ARRAY = f"{NAMESPACE}__ARRAY"
-    ARRAY_PTR = f"{NAMESPACE}__ARRAY_PTR"
-    ARRAYSTR_FREE_MEM = f"{NAMESPACE}__ARRAYSTR_FREE_MEM"
-    BAND16 = f"{NAMESPACE}__BAND16"
-    BAND32 = f"{NAMESPACE}__BAND32"
-    BNOT16 = f"{NAMESPACE}__BNOT16"
-    BNOT32 = f"{NAMESPACE}__BNOT32"
-    BOR16 = f"{NAMESPACE}__BOR16"
-    BOR32 = f"{NAMESPACE}__BOR32"
-    BXOR16 = f"{NAMESPACE}__BXOR16"
-    BXOR32 = f"{NAMESPACE}__BXOR32"
-    CHECK_BREAK = f"{NAMESPACE}CHECK_BREAK"
-    DIVF = f"{NAMESPACE}__DIVF"
-    DIVF16 = f"{NAMESPACE}__DIVF16"
-    DIVI16 = f"{NAMESPACE}__DIVI16"
-    DIVI32 = f"{NAMESPACE}__DIVI32"
-    DIVI8_FAST = f"{NAMESPACE}__DIVI8_FAST"
-    DIVU8_FAST = f"{NAMESPACE}__DIVU8_FAST"
-    DIVU16 = f"{NAMESPACE}__DIVU16"
-    DIVU32 = f"{NAMESPACE}__DIVU32"
-    EQ16 = f"{NAMESPACE}__EQ16"
-    EQ32 = f"{NAMESPACE}__EQ32"
-    EQF = f"{NAMESPACE}__EQF"
-    ERROR = f"{NAMESPACE}__ERROR"
-    F16TOFREG = f"{NAMESPACE}__F16TOFREG"
-    FP_PUSH_REV = f"{NAMESPACE}__FP_PUSH_REV"
-    FTOF16REG = f"{NAMESPACE}__FTOF16REG"
-    FTOU32REG = f"{NAMESPACE}__FTOU32REG"
-    GEF = f"{NAMESPACE}__GEF"
-    GTF = f"{NAMESPACE}__GTF"
-    I8TOFREG = f"{NAMESPACE}__I8TOFREG"
-    I32TOFREG = f"{NAMESPACE}__I32TOFREG"
-    ILOAD32 = f"{NAMESPACE}__ILOAD32"
-    ILOADF = f"{NAMESPACE}__ILOADF"
-    ILOADSTR = f"{NAMESPACE}__ILOADSTR"
-    ISTORE32 = f"{NAMESPACE}__ISTORE32"
-    ISTOREF = f"{NAMESPACE}__ISTOREF"
-    LBOUND = f"{NAMESPACE}__LBOUND"
-    LOADSTR = f"{NAMESPACE}__LOADSTR"
-    LOAD_DE_DE = f"{NAMESPACE}__LOAD_DE_DE"
-    LEF = f"{NAMESPACE}__LEF"
-    LEI16 = f"{NAMESPACE}__LEI16"
-    LEI32 = f"{NAMESPACE}__LEI32"
-    LEI8 = f"{NAMESPACE}__LEI8"
-    LETSUBSTR = f"{NAMESPACE}__LETSUBSTR"
-    LOADF = f"{NAMESPACE}__LOADF"
-    LTF = f"{NAMESPACE}__LTF"
-    LTI16 = f"{NAMESPACE}__LTI16"
-    LTI8 = f"{NAMESPACE}__LTI8"
-    LTI32 = f"{NAMESPACE}__LTI32"
-    MEM_FREE = f"{NAMESPACE}__MEM_FREE"
-    MODF = f"{NAMESPACE}__MODF"
-    MODF16 = f"{NAMESPACE}__MODF16"
-    MODI16 = f"{NAMESPACE}__MODI16"
-    MODI32 = f"{NAMESPACE}__MODI32"
-    MODU16 = f"{NAMESPACE}__MODU16"
-    MODU32 = f"{NAMESPACE}__MODU32"
-    MODI8_FAST = f"{NAMESPACE}__MODI8_FAST"
-    MODU8_FAST = f"{NAMESPACE}__MODU8_FAST"
-    MUL8_FAST = f"{NAMESPACE}__MUL8_FAST"
-    MUL16_FAST = f"{NAMESPACE}__MUL16_FAST"
-    MUL32 = f"{NAMESPACE}__MUL32"
-    MULF = f"{NAMESPACE}__MULF"
-    MULF16 = f"{NAMESPACE}__MULF16"
-    NEF = f"{NAMESPACE}__NEF"
-    NEG32 = f"{NAMESPACE}__NEG32"
-    NEGF = f"{NAMESPACE}__NEGF"
-    NEGHL = f"{NAMESPACE}__NEGHL"
-    NORMALIZE_BOOLEAN = f"{NAMESPACE}__NORMALIZE_BOOLEAN"
-    NOT32 = f"{NAMESPACE}__NOT32"
-    NOTF = f"{NAMESPACE}__NOTF"
-    ON_GOTO = f"{NAMESPACE}__ON_GOTO"
-    ON_GOSUB = f"{NAMESPACE}__ON_GOSUB"
-    OR32 = f"{NAMESPACE}__OR32"
-    ORF = f"{NAMESPACE}__ORF"
-    PISTORE16 = f"{NAMESPACE}__PISTORE16"
-    PISTORE32 = f"{NAMESPACE}__PISTORE32"
-    PISTOREF = f"{NAMESPACE}__PISTOREF"
-    PISTORE_STR = f"{NAMESPACE}__PISTORE_STR"
-    PISTORE_STR2 = f"{NAMESPACE}__PISTORE_STR2"
-    PLOADF = f"{NAMESPACE}__PLOADF"
-    POWF = f"{NAMESPACE}__POW"
-    PSTOREF = f"{NAMESPACE}__PSTOREF"
-    PSTORE32 = f"{NAMESPACE}__PSTORE32"
-    PSTORE_STR = f"{NAMESPACE}__PSTORE_STR"
-    PSTORE_STR2 = f"{NAMESPACE}__PSTORE_STR2"
-    SHL32 = f"{NAMESPACE}__SHL32"
-    SHRA32 = f"{NAMESPACE}__SHRA32"
-    SHRL32 = f"{NAMESPACE}__SHRL32"
-    STOREF = f"{NAMESPACE}__STOREF"
-    STOP = f"{NAMESPACE}__STOP"
-    STORE32 = f"{NAMESPACE}__STORE32"
-    STORE_STR = f"{NAMESPACE}__STORE_STR"
-    STORE_STR2 = f"{NAMESPACE}__STORE_STR2"
-    STR_ARRAYCOPY = f"{NAMESPACE}STR_ARRAYCOPY"
-    STR_FAST = f"{NAMESPACE}__STR_FAST"
-    STREQ = f"{NAMESPACE}__STREQ"
-    STRGE = f"{NAMESPACE}__STRGE"
-    STRGT = f"{NAMESPACE}__STRGT"
-    STRLE = f"{NAMESPACE}__STRLE"
-    STRLEN = f"{NAMESPACE}__STRLEN"
-    STRLT = f"{NAMESPACE}__STRLT"
-    STRNE = f"{NAMESPACE}__STRNE"
-    STRSLICE = f"{NAMESPACE}__STRSLICE"
-    SUB32 = f"{NAMESPACE}__SUB32"
-    SUBF = f"{NAMESPACE}__SUBF"
-    SWAP32 = f"{NAMESPACE}__SWAP32"
-    U32TOFREG = f"{NAMESPACE}__U32TOFREG"
-    U8TOFREG = f"{NAMESPACE}__U8TOFREG"
-    UBOUND = f"{NAMESPACE}__UBOUND"
-    XOR16 = f"{NAMESPACE}__XOR16"
-    XOR8 = f"{NAMESPACE}__XOR8"
-    XOR32 = f"{NAMESPACE}__XOR32"
-    XORF = f"{NAMESPACE}__XORF"
+    ABS16 = f"{NAMESPACE}.__ABS16"
+    ABS8 = f"{NAMESPACE}.__ABS8"
+    ABS32 = f"{NAMESPACE}.__ABS32"
+    ADDF = f"{NAMESPACE}.__ADDF"
+    ADDSTR = f"{NAMESPACE}.__ADDSTR"
+    ALLOC_INITIALIZED_LOCAL_ARRAY = f"{NAMESPACE}.__ALLOC_INITIALIZED_LOCAL_ARRAY"
+    ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS = f"{NAMESPACE}.__ALLOC_INITIALIZED_LOCAL_ARRAY_WITH_BOUNDS"
+    ALLOC_LOCAL_ARRAY = f"{NAMESPACE}.__ALLOC_LOCAL_ARRAY"
+    ALLOC_LOCAL_ARRAY_WITH_BOUNDS = f"{NAMESPACE}.__ALLOC_LOCAL_ARRAY_WITH_BOUNDS"
+    AND16 = f"{NAMESPACE}.__AND16"
+    AND32 = f"{NAMESPACE}.__AND32"
+    ANDF = f"{NAMESPACE}.__ANDF"
+    ARRAY = f"{NAMESPACE}.__ARRAY"
+    ARRAY_PTR = f"{NAMESPACE}.__ARRAY_PTR"
+    ARRAYSTR_FREE_MEM = f"{NAMESPACE}.__ARRAYSTR_FREE_MEM"
+    BAND16 = f"{NAMESPACE}.__BAND16"
+    BAND32 = f"{NAMESPACE}.__BAND32"
+    BNOT16 = f"{NAMESPACE}.__BNOT16"
+    BNOT32 = f"{NAMESPACE}.__BNOT32"
+    BOR16 = f"{NAMESPACE}.__BOR16"
+    BOR32 = f"{NAMESPACE}.__BOR32"
+    BXOR16 = f"{NAMESPACE}.__BXOR16"
+    BXOR32 = f"{NAMESPACE}.__BXOR32"
+    CHECK_BREAK = f"{NAMESPACE}.CHECK_BREAK"
+    DIVF = f"{NAMESPACE}.__DIVF"
+    DIVF16 = f"{NAMESPACE}.__DIVF16"
+    DIVI16 = f"{NAMESPACE}.__DIVI16"
+    DIVI32 = f"{NAMESPACE}.__DIVI32"
+    DIVI8_FAST = f"{NAMESPACE}.__DIVI8_FAST"
+    DIVU8_FAST = f"{NAMESPACE}.__DIVU8_FAST"
+    DIVU16 = f"{NAMESPACE}.__DIVU16"
+    DIVU32 = f"{NAMESPACE}.__DIVU32"
+    EQ16 = f"{NAMESPACE}.__EQ16"
+    EQ32 = f"{NAMESPACE}.__EQ32"
+    EQF = f"{NAMESPACE}.__EQF"
+    ERROR = f"{NAMESPACE}.__ERROR"
+    F16TOFREG = f"{NAMESPACE}.__F16TOFREG"
+    FP_PUSH_REV = f"{NAMESPACE}.__FP_PUSH_REV"
+    FTOF16REG = f"{NAMESPACE}.__FTOF16REG"
+    FTOU32REG = f"{NAMESPACE}.__FTOU32REG"
+    GEF = f"{NAMESPACE}.__GEF"
+    GTF = f"{NAMESPACE}.__GTF"
+    I8TOFREG = f"{NAMESPACE}.__I8TOFREG"
+    I32TOFREG = f"{NAMESPACE}.__I32TOFREG"
+    ILOAD32 = f"{NAMESPACE}.__ILOAD32"
+    ILOADF = f"{NAMESPACE}.__ILOADF"
+    ILOADSTR = f"{NAMESPACE}.__ILOADSTR"
+    ISTORE32 = f"{NAMESPACE}.__ISTORE32"
+    ISTOREF = f"{NAMESPACE}.__ISTOREF"
+    LBOUND = f"{NAMESPACE}.__LBOUND"
+    LOADSTR = f"{NAMESPACE}.__LOADSTR"
+    LOAD_DE_DE = f"{NAMESPACE}.__LOAD_DE_DE"
+    LEF = f"{NAMESPACE}.__LEF"
+    LEI16 = f"{NAMESPACE}.__LEI16"
+    LEI32 = f"{NAMESPACE}.__LEI32"
+    LEI8 = f"{NAMESPACE}.__LEI8"
+    LETSUBSTR = f"{NAMESPACE}.__LETSUBSTR"
+    LOADF = f"{NAMESPACE}.__LOADF"
+    LTF = f"{NAMESPACE}.__LTF"
+    LTI16 = f"{NAMESPACE}.__LTI16"
+    LTI8 = f"{NAMESPACE}.__LTI8"
+    LTI32 = f"{NAMESPACE}.__LTI32"
+    MEM_FREE = f"{NAMESPACE}.__MEM_FREE"
+    MODF = f"{NAMESPACE}.__MODF"
+    MODF16 = f"{NAMESPACE}.__MODF16"
+    MODI16 = f"{NAMESPACE}.__MODI16"
+    MODI32 = f"{NAMESPACE}.__MODI32"
+    MODU16 = f"{NAMESPACE}.__MODU16"
+    MODU32 = f"{NAMESPACE}.__MODU32"
+    MODI8_FAST = f"{NAMESPACE}.__MODI8_FAST"
+    MODU8_FAST = f"{NAMESPACE}.__MODU8_FAST"
+    MUL8_FAST = f"{NAMESPACE}.__MUL8_FAST"
+    MUL16_FAST = f"{NAMESPACE}.__MUL16_FAST"
+    MUL32 = f"{NAMESPACE}.__MUL32"
+    MULF = f"{NAMESPACE}.__MULF"
+    MULF16 = f"{NAMESPACE}.__MULF16"
+    NEF = f"{NAMESPACE}.__NEF"
+    NEG32 = f"{NAMESPACE}.__NEG32"
+    NEGF = f"{NAMESPACE}.__NEGF"
+    NEGHL = f"{NAMESPACE}.__NEGHL"
+    NORMALIZE_BOOLEAN = f"{NAMESPACE}.__NORMALIZE_BOOLEAN"
+    NOT32 = f"{NAMESPACE}.__NOT32"
+    NOTF = f"{NAMESPACE}.__NOTF"
+    ON_GOTO = f"{NAMESPACE}.__ON_GOTO"
+    ON_GOSUB = f"{NAMESPACE}.__ON_GOSUB"
+    OR32 = f"{NAMESPACE}.__OR32"
+    ORF = f"{NAMESPACE}.__ORF"
+    PISTORE16 = f"{NAMESPACE}.__PISTORE16"
+    PISTORE32 = f"{NAMESPACE}.__PISTORE32"
+    PISTOREF = f"{NAMESPACE}.__PISTOREF"
+    PISTORE_STR = f"{NAMESPACE}.__PISTORE_STR"
+    PISTORE_STR2 = f"{NAMESPACE}.__PISTORE_STR2"
+    PLOADF = f"{NAMESPACE}.__PLOADF"
+    POWF = f"{NAMESPACE}.__POW"
+    PSTOREF = f"{NAMESPACE}.__PSTOREF"
+    PSTORE32 = f"{NAMESPACE}.__PSTORE32"
+    PSTORE_STR = f"{NAMESPACE}.__PSTORE_STR"
+    PSTORE_STR2 = f"{NAMESPACE}.__PSTORE_STR2"
+    SHL32 = f"{NAMESPACE}.__SHL32"
+    SHRA32 = f"{NAMESPACE}.__SHRA32"
+    SHRL32 = f"{NAMESPACE}.__SHRL32"
+    STOREF = f"{NAMESPACE}.__STOREF"
+    STOP = f"{NAMESPACE}.__STOP"
+    STORE32 = f"{NAMESPACE}.__STORE32"
+    STORE_STR = f"{NAMESPACE}.__STORE_STR"
+    STORE_STR2 = f"{NAMESPACE}.__STORE_STR2"
+    STR_ARRAYCOPY = f"{NAMESPACE}.STR_ARRAYCOPY"
+    STR_FAST = f"{NAMESPACE}.__STR_FAST"
+    STREQ = f"{NAMESPACE}.__STREQ"
+    STRGE = f"{NAMESPACE}.__STRGE"
+    STRGT = f"{NAMESPACE}.__STRGT"
+    STRLE = f"{NAMESPACE}.__STRLE"
+    STRLEN = f"{NAMESPACE}.__STRLEN"
+    STRLT = f"{NAMESPACE}.__STRLT"
+    STRNE = f"{NAMESPACE}.__STRNE"
+    STRSLICE = f"{NAMESPACE}.__STRSLICE"
+    SUB32 = f"{NAMESPACE}.__SUB32"
+    SUBF = f"{NAMESPACE}.__SUBF"
+    SWAP32 = f"{NAMESPACE}.__SWAP32"
+    U32TOFREG = f"{NAMESPACE}.__U32TOFREG"
+    U8TOFREG = f"{NAMESPACE}.__U8TOFREG"
+    UBOUND = f"{NAMESPACE}.__UBOUND"
+    XOR16 = f"{NAMESPACE}.__XOR16"
+    XOR8 = f"{NAMESPACE}.__XOR8"
+    XOR32 = f"{NAMESPACE}.__XOR32"
+    XORF = f"{NAMESPACE}.__XORF"
 
 
 REQUIRED_MODULES = {