Merge pull request #516 from boriel/feature/refact_core_labels

Feature/refact core labels

Author: boriel

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

@@ -53,6 +53,7 @@ class CoreLabels:
     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"
@@ -110,6 +111,7 @@ class CoreLabels:
     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"
@@ -123,6 +125,7 @@ class CoreLabels:
     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"
@@ -179,6 +182,7 @@ class CoreLabels:
     CoreLabels.FP_PUSH_REV: 'pushf.asm',
     CoreLabels.FTOF16REG: 'ftof16reg.asm',
     CoreLabels.FTOU32REG: 'ftou32reg.asm',
+    CoreLabels.LBOUND: 'bound.asm',
     CoreLabels.LEF: 'lef.asm',
     CoreLabels.LEI16: 'lei16.asm',
     CoreLabels.LEI32: 'lei32.asm',
@@ -236,6 +240,7 @@ class CoreLabels:
     CoreLabels.STORE_STR: 'storestr.asm',
     CoreLabels.STORE_STR2: 'storestr2.asm',
     CoreLabels.STR_ARRAYCOPY: 'strarraycpy.asm',
+    CoreLabels.STR_FAST: 'str.asm',
     CoreLabels.STREQ: 'string.asm',
     CoreLabels.STRGE: 'string.asm',
     CoreLabels.STRGT: 'string.asm',
@@ -249,6 +254,7 @@ class CoreLabels:
     CoreLabels.SWAP32: 'swap32.asm',
     CoreLabels.U32TOFREG: 'u32tofreg.asm',
     CoreLabels.U8TOFREG: 'u32tofreg.asm',
+    CoreLabels.UBOUND: 'bound.asm',
     CoreLabels.XOR16: 'xor16.asm',
     CoreLabels.XOR8: 'xor8.asm',
     CoreLabels.XOR32: 'xor32.asm',

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

@@ -7,6 +7,8 @@
 class IOLabels:
     # Screen and attributes
     CLS = f"{NAMESPACE}CLS"
+    COPY_ATTR = f"{NAMESPACE}COPY_ATTR"
+
     BOLD = f"{NAMESPACE}BOLD"
     BRIGHT = f"{NAMESPACE}BRIGHT"
     FLASH = f"{NAMESPACE}FLASH"
@@ -16,12 +18,26 @@ class IOLabels:
     OVER = f"{NAMESPACE}OVER"
     PAPER = f"{NAMESPACE}PAPER"
 
+    BOLD_TMP = f"{NAMESPACE}BOLD_TMP"
+    BRIGHT_TMP = f"{NAMESPACE}BRIGHT_TMP"
+    FLASH_TMP = f"{NAMESPACE}FLASH_TMP"
+    INK_TMP = f"{NAMESPACE}INK_TMP"
+    INVERSE_TMP = f"{NAMESPACE}INVERSE_TMP"
+    ITALIC_TMP = f"{NAMESPACE}ITALIC_TMP"
+    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"
     DRAW3 = f"{NAMESPACE}DRAW3"
     PLOT = f"{NAMESPACE}PLOT"
 
+    # Keyboard
+    INKEY = f"{NAMESPACE}INKEY"
+
     # Print ("console")
     PRINTI16 = f"{NAMESPACE}__PRINTI16"
     PRINTI32 = f"{NAMESPACE}__PRINTI32"
@@ -42,9 +58,15 @@ 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',
+    IOLabels.COPY_ATTR: 'copy_attr.asm',
+
     IOLabels.BOLD: 'bold.asm',
     IOLabels.BRIGHT: 'bright.asm',
     IOLabels.FLASH: 'flash.asm',
@@ -54,11 +76,24 @@ class IOLabels:
     IOLabels.OVER: 'over.asm',
     IOLabels.PAPER: 'paper.asm',
 
+    IOLabels.BOLD_TMP: 'bold.asm',
+    IOLabels.BRIGHT_TMP: 'bright.asm',
+    IOLabels.FLASH_TMP: 'flash.asm',
+    IOLabels.INK_TMP: 'ink.asm',
+    IOLabels.INVERSE_TMP: 'inverse.asm',
+    IOLabels.ITALIC_TMP: 'italic.asm',
+    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',
     IOLabels.PLOT: 'plot.asm',
 
+    IOLabels.INKEY: 'inkey.asm',
+
     IOLabels.LOAD_CODE: 'load.asm',
     IOLabels.SAVE_CODE: 'save.asm',
 
@@ -76,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

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

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

@@ -0,0 +1,48 @@
+# Runtime labels
+
+from .namespace import NAMESPACE
+
+
+class MathLabels:
+    ACS = f"{NAMESPACE}ACOS"
+    ASN = f"{NAMESPACE}ASIN"
+    ATN = f"{NAMESPACE}ATAN"
+    COS = f"{NAMESPACE}COS"
+    SIN = f"{NAMESPACE}SIN"
+    TAN = f"{NAMESPACE}TAN"
+
+    EXP = f"{NAMESPACE}EXP"
+    LN = f"{NAMESPACE}LN"
+    SQR = f"{NAMESPACE}SQRT"
+
+    SGNI8 = f"{NAMESPACE}__SGNI8"
+    SGNU8 = f"{NAMESPACE}__SGNU8"
+    SGNI16 = f"{NAMESPACE}__SGNI16"
+    SGNU16 = f"{NAMESPACE}__SGNU16"
+    SGNI32 = f"{NAMESPACE}__SGNI32"
+    SGNU32 = f"{NAMESPACE}__SGNU32"
+    SGNF16 = f"{NAMESPACE}__SGNF16"
+    SGNF = f"{NAMESPACE}__SGNF"
+
+
+REQUIRED_MODULES = {
+    MathLabels.ACS: 'acos.asm',
+    MathLabels.ASN: 'asin.asm',
+    MathLabels.ATN: 'atan.asm',
+    MathLabels.COS: 'cos.asm',
+    MathLabels.SIN: 'sin.asm',
+    MathLabels.TAN: 'tan.asm',
+
+    MathLabels.EXP: 'exp.asm',
+    MathLabels.LN: 'logn.asm',
+    MathLabels.SQR: 'sqrt.asm',
+
+    MathLabels.SGNI8: 'sgni8.asm',
+    MathLabels.SGNU8: 'sgnu8.asm',
+    MathLabels.SGNI16: 'sgni16.asm',
+    MathLabels.SGNU16: 'sgnu16.asm',
+    MathLabels.SGNI32: 'sgni32.asm',
+    MathLabels.SGNU32: 'sgnu32.asm',
+    MathLabels.SGNF16: 'sgnf16.asm',
+    MathLabels.SGNF: 'sgnf.asm'
+}

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

@@ -0,0 +1,22 @@
+# Miscelaneous functions
+
+from .namespace import NAMESPACE
+
+
+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/backend/runtime/random.py

@@ -5,8 +5,10 @@
 
 class RandomLabels:
     RANDOMIZE = f"{NAMESPACE}RANDOMIZE"
+    RND = f"{NAMESPACE}RND"
 
 
 REQUIRED_MODULES = {
     RandomLabels.RANDOMIZE: 'random.asm',
+    RandomLabels.RND: 'random.asm'
 }