test: fix multi-arch testing

Also add test for mul8 and mul16

Author: boriel

src/arch/__init__.py

@@ -5,7 +5,10 @@
 import importlib
 
 
-__all__ = ["zx48k", "zxnext"]
+__all__ = [
+    "zx48k",
+    "zxnext",
+]
 
 AVAILABLE_ARCHITECTURES = __all__
 target = None

src/arch/z80/backend/__init__.py

@@ -128,18 +128,25 @@
 __all__ = [
     "tmp_label",
     "_fpop",
+    "HI16",
+    "INITS",
+    "LO16",
     "LABEL_COUNTER",
     "MEMORY",
+    "MEMINITS",
+    "QUADS",
+    "REQUIRES",
     "TMP_COUNTER",
     "TMP_STORAGES",
-    "HI16",
-    "LO16",
+    "emit",
+    "emit_end",
+    "emit_start",
 ]
 
 # Default code ORG
-OPTIONS(Action.ADD, name="org", type=int, default=32768)
+OPTIONS(Action.ADD_IF_NOT_DEFINED, name="org", type=int, default=32768)
 # Default HEAP SIZE (Dynamic memory) in bytes
-OPTIONS(Action.ADD, name="heap_size", type=int, default=4768, ignore_none=True)  # A bit more than 4K
+OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_size", type=int, default=4768, ignore_none=True)  # A bit more than 4K
 
 
 def init():
@@ -148,15 +155,15 @@ def init():
     common.init()
 
     # Default code ORG
-    OPTIONS(Action.ADD, name="org", type=int, default=32768)
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="org", type=int, default=32768)
     # Default HEAP SIZE (Dynamic memory) in bytes
-    OPTIONS(Action.ADD, name="heap_size", type=int, default=4768, ignore_none=True)  # A bit more than 4K
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_size", type=int, default=4768, ignore_none=True)  # A bit more than 4K
     # Labels for HEAP START (might not be used if not needed)
-    OPTIONS(Action.ADD, name="heap_start_label", type=str, default=f"{NAMESPACE}.ZXBASIC_MEM_HEAP")
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_start_label", type=str, default=f"{NAMESPACE}.ZXBASIC_MEM_HEAP")
     # Labels for HEAP SIZE (might not be used if not needed)
-    OPTIONS(Action.ADD, name="heap_size_label", type=str, default=f"{NAMESPACE}.ZXBASIC_HEAP_SIZE")
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="heap_size_label", type=str, default=f"{NAMESPACE}.ZXBASIC_HEAP_SIZE")
     # Flag for headerless mode (No prologue / epilogue)
-    OPTIONS(Action.ADD, name="headerless", type=bool, default=False, ignore_none=True)
+    OPTIONS(Action.ADD_IF_NOT_DEFINED, name="headerless", type=bool, default=False, ignore_none=True)
 
     engine.main()  # inits the optimizer
 

src/arch/zx48k/__init__.py

@@ -4,7 +4,7 @@
 
 from src.arch.z80 import beep
 from src.arch.z80.translator import *  # noqa
-from src.arch.z80 import backend  # noqa
+from src.arch.zx48k import backend  # noqa
 from src.arch.z80 import optimizer  # noqa
 
 

src/arch/zx48k/backend/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from src.api.config import OPTIONS
+from src.arch.z80 import backend
+
+from src.arch.z80.backend import *
+
+__all__ = [
+    "tmp_label",
+    "_fpop",
+    "HI16",
+    "INITS",
+    "LO16",
+    "LABEL_COUNTER",
+    "MEMORY",
+    "MEMINITS",
+    "QUADS",
+    "REQUIRES",
+    "TMP_COUNTER",
+    "TMP_STORAGES",
+    "emit",
+    "emit_end",
+    "emit_start",
+]
+
+
+# ZXNext asm enabled by default for this arch
+OPTIONS.zxnext = False
+
+
+def init():
+    # ZXNext asm enabled by default for this arch
+    OPTIONS.zxnext = False
+
+    backend.init()

src/arch/zxnext/__init__.py

@@ -4,7 +4,7 @@
 
 from src.arch.z80 import beep
 from src.arch.z80.translator import *  # noqa
-from src.arch.z80 import backend  # noqa
+from src.arch.zxnext import backend  # noqa
 from src.arch.z80 import optimizer  # noqa
 
 

src/arch/zxnext/backend/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from src.api.config import OPTIONS
+from src.arch.z80 import backend
+
+from src.arch.z80.backend import *
+
+__all__ = [
+    "tmp_label",
+    "_fpop",
+    "HI16",
+    "INITS",
+    "LO16",
+    "LABEL_COUNTER",
+    "MEMORY",
+    "MEMINITS",
+    "QUADS",
+    "REQUIRES",
+    "TMP_COUNTER",
+    "TMP_STORAGES",
+    "emit",
+    "emit_end",
+    "emit_start",
+]
+
+
+# ZXNext asm enabled by default for this arch
+OPTIONS.zxnext = True
+
+
+def init():
+    # ZXNext asm enabled by default for this arch
+    OPTIONS.zxnext = True
+
+    backend.init()

src/zxbc/zxbc.py

@@ -87,6 +87,8 @@ def main(args=None, emitter=None):
     options = parse_options(args)
     arch.set_target_arch(OPTIONS.architecture)
     backend = arch.target.backend
+    backend.init()  # Must reinitialize it again
+
     args = [options.PROGRAM]  # Strip out other options, because they're already set in the OPTIONS container
     input_filename = options.PROGRAM
 

tests/functional/test.py

@@ -21,6 +21,7 @@
 
 EXIT_CODE = 0
 FILTER = r"^(([ \t]*;)|(#[ \t]*line))"
+DEFAULT_ARCH = "zx48k"  # Default testing architecture
 
 # Global tests and failed counters
 COUNTER = 0
@@ -226,6 +227,9 @@ def _get_testbas_options(fname: str):
     prep = ["-e", "/dev/null"] if CLOSE_STDERR else ["-e", STDERR]
     options = ["-O1"]
 
+    arch = os.path.dirname(fname).split(os.path.sep)[-1] or DEFAULT_ARCH
+    options.extend(["--arch", arch])
+
     match = reOPT.match(getName(fname))
     if match:
         options = ["-O" + match.groups()[0]]
@@ -595,7 +599,7 @@ def main(argv=None):
     parser.add_argument("-e", "--stderr", type=str, default=None, help="File for stderr messages")
     parser.add_argument("-S", "--use-shell", action="store_true", help="Use system shell for test instead of inline")
     parser.add_argument(
-        "-O", "--option", action="append", help="Option to pass to compiler in a test " "(can be used many times)"
+        "-O", "--option", action="append", help="Option to pass to compiler in a test (can be used many times)"
     )
     parser.add_argument(
         "-E",
@@ -625,7 +629,7 @@ def main(argv=None):
             TIMEOUT = 0  # disable timeout for Vim-dif
 
         temp_dir_created = set_temp_dir(args.tmp_dir)
-        files = {fname for pattern in args.FILES for fname in glob.glob(pattern, recursive=True)}
+        files = sorted({fname for pattern in args.FILES for fname in glob.glob(pattern, recursive=True)})
 
         if args.update:
             upgradeTest(files, args.update)