41 files changed, 24 insertions, 24 deletions
diff --git a/ports/qemu/boards/SABRELITE.mk b/ports/qemu/boards/SABRELITE.mk
index f1945c10fc..839b3d6ac4 100644
--- a/ports/qemu/boards/SABRELITE.mk
+++ b/ports/qemu/boards/SABRELITE.mk
@@ -16,4 +16,4 @@ SRC_BOARD_O = shared/runtime/gchelper_generic.o
 MPY_CROSS_FLAGS += -march=armv6
 
 # These tests don't work on Cortex-A9, so exclude them.
-RUN_TESTS_ARGS = --exclude '(asmdiv|asmspecialregs).py'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb/(asmdiv|asmspecialregs).py'
diff --git a/ports/qemu/boards/VIRT_RV32.mk b/ports/qemu/boards/VIRT_RV32.mk
index 355a09c3d5..e166165a19 100644
--- a/ports/qemu/boards/VIRT_RV32.mk
+++ b/ports/qemu/boards/VIRT_RV32.mk
@@ -11,6 +11,6 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
 MPY_CROSS_FLAGS += -march=rv32imc
 
 # These Thumb tests don't run on RV32, so exclude them.
-RUN_TESTS_ARGS = --exclude 'inlineasm|qemu/asm_test'
+RUN_TESTS_ARGS = --exclude 'inlineasm/thumb|qemu/asm_test'
 
 RUN_NATMODTESTS_ARGS = --arch rv32imc
diff --git a/ports/qemu/test-frzmpy/frozen_asm.py b/ports/qemu/test-frzmpy/frozen_asm_thumb.py
index ba43264b38..ba43264b38 100644
--- a/ports/qemu/test-frzmpy/frozen_asm.py
+++ b/ports/qemu/test-frzmpy/frozen_asm_thumb.py
diff --git a/tests/inlineasm/asmargs.py b/tests/inlineasm/thumb/asmargs.py
index 3b03f15103..3b03f15103 100644
--- a/tests/inlineasm/asmargs.py
+++ b/tests/inlineasm/thumb/asmargs.py
diff --git a/tests/inlineasm/asmargs.py.exp b/tests/inlineasm/thumb/asmargs.py.exp
index e33a6964f4..e33a6964f4 100644
--- a/tests/inlineasm/asmargs.py.exp
+++ b/tests/inlineasm/thumb/asmargs.py.exp
diff --git a/tests/inlineasm/asmbcc.py b/tests/inlineasm/thumb/asmbcc.py
index 08967d48c7..08967d48c7 100644
--- a/tests/inlineasm/asmbcc.py
+++ b/tests/inlineasm/thumb/asmbcc.py
diff --git a/tests/inlineasm/asmbcc.py.exp b/tests/inlineasm/thumb/asmbcc.py.exp
index 39da7d1a99..39da7d1a99 100644
--- a/tests/inlineasm/asmbcc.py.exp
+++ b/tests/inlineasm/thumb/asmbcc.py.exp
diff --git a/tests/inlineasm/asmbitops.py b/tests/inlineasm/thumb/asmbitops.py
index d1c8a98235..d1c8a98235 100644
--- a/tests/inlineasm/asmbitops.py
+++ b/tests/inlineasm/thumb/asmbitops.py
diff --git a/tests/inlineasm/asmbitops.py.exp b/tests/inlineasm/thumb/asmbitops.py.exp
index 8c560045f4..8c560045f4 100644
--- a/tests/inlineasm/asmbitops.py.exp
+++ b/tests/inlineasm/thumb/asmbitops.py.exp
diff --git a/tests/inlineasm/asmblbx.py b/tests/inlineasm/thumb/asmblbx.py
index 43585dddcc..43585dddcc 100644
--- a/tests/inlineasm/asmblbx.py
+++ b/tests/inlineasm/thumb/asmblbx.py
diff --git a/tests/inlineasm/asmblbx.py.exp b/tests/inlineasm/thumb/asmblbx.py.exp
index 1191247b6d..1191247b6d 100644
--- a/tests/inlineasm/asmblbx.py.exp
+++ b/tests/inlineasm/thumb/asmblbx.py.exp
diff --git a/tests/inlineasm/asmconst.py b/tests/inlineasm/thumb/asmconst.py
index 8412dd2c72..8412dd2c72 100644
--- a/tests/inlineasm/asmconst.py
+++ b/tests/inlineasm/thumb/asmconst.py
diff --git a/tests/inlineasm/asmconst.py.exp b/tests/inlineasm/thumb/asmconst.py.exp
index 3ef9fcabd7..3ef9fcabd7 100644
--- a/tests/inlineasm/asmconst.py.exp
+++ b/tests/inlineasm/thumb/asmconst.py.exp
diff --git a/tests/inlineasm/asmdata.py b/tests/inlineasm/thumb/asmdata.py
index bbd20c9186..bbd20c9186 100644
--- a/tests/inlineasm/asmdata.py
+++ b/tests/inlineasm/thumb/asmdata.py
diff --git a/tests/inlineasm/asmdata.py.exp b/tests/inlineasm/thumb/asmdata.py.exp
index 502c04f993..502c04f993 100644
--- a/tests/inlineasm/asmdata.py.exp
+++ b/tests/inlineasm/thumb/asmdata.py.exp
diff --git a/tests/inlineasm/asmdiv.py b/tests/inlineasm/thumb/asmdiv.py
index c278463846..c278463846 100644
--- a/tests/inlineasm/asmdiv.py
+++ b/tests/inlineasm/thumb/asmdiv.py
diff --git a/tests/inlineasm/asmdiv.py.exp b/tests/inlineasm/thumb/asmdiv.py.exp
index f1b80deb32..f1b80deb32 100644
--- a/tests/inlineasm/asmdiv.py.exp
+++ b/tests/inlineasm/thumb/asmdiv.py.exp
diff --git a/tests/inlineasm/asmfpaddsub.py b/tests/inlineasm/thumb/asmfpaddsub.py
index f69c89cdc6..f69c89cdc6 100644
--- a/tests/inlineasm/asmfpaddsub.py
+++ b/tests/inlineasm/thumb/asmfpaddsub.py
diff --git a/tests/inlineasm/asmfpaddsub.py.exp b/tests/inlineasm/thumb/asmfpaddsub.py.exp
index d61f00d8ca..d61f00d8ca 100644
--- a/tests/inlineasm/asmfpaddsub.py.exp
+++ b/tests/inlineasm/thumb/asmfpaddsub.py.exp
diff --git a/tests/inlineasm/asmfpcmp.py b/tests/inlineasm/thumb/asmfpcmp.py
index 47fd99a347..47fd99a347 100644
--- a/tests/inlineasm/asmfpcmp.py
+++ b/tests/inlineasm/thumb/asmfpcmp.py
diff --git a/tests/inlineasm/asmfpcmp.py.exp b/tests/inlineasm/thumb/asmfpcmp.py.exp
index 104b3580f7..104b3580f7 100644
--- a/tests/inlineasm/asmfpcmp.py.exp
+++ b/tests/inlineasm/thumb/asmfpcmp.py.exp
diff --git a/tests/inlineasm/asmfpldrstr.py b/tests/inlineasm/thumb/asmfpldrstr.py
index c65f8a798b..c65f8a798b 100644
--- a/tests/inlineasm/asmfpldrstr.py
+++ b/tests/inlineasm/thumb/asmfpldrstr.py
diff --git a/tests/inlineasm/asmfpldrstr.py.exp b/tests/inlineasm/thumb/asmfpldrstr.py.exp
index e0ea36feef..e0ea36feef 100644
--- a/tests/inlineasm/asmfpldrstr.py.exp
+++ b/tests/inlineasm/thumb/asmfpldrstr.py.exp
diff --git a/tests/inlineasm/asmfpmuldiv.py b/tests/inlineasm/thumb/asmfpmuldiv.py
index 930ddd053c..930ddd053c 100644
--- a/tests/inlineasm/asmfpmuldiv.py
+++ b/tests/inlineasm/thumb/asmfpmuldiv.py
diff --git a/tests/inlineasm/asmfpmuldiv.py.exp b/tests/inlineasm/thumb/asmfpmuldiv.py.exp
index 209e3ef4b6..209e3ef4b6 100644
--- a/tests/inlineasm/asmfpmuldiv.py.exp
+++ b/tests/inlineasm/thumb/asmfpmuldiv.py.exp
diff --git a/tests/inlineasm/asmfpsqrt.py b/tests/inlineasm/thumb/asmfpsqrt.py
index 519fde4fcc..519fde4fcc 100644
--- a/tests/inlineasm/asmfpsqrt.py
+++ b/tests/inlineasm/thumb/asmfpsqrt.py
diff --git a/tests/inlineasm/asmfpsqrt.py.exp b/tests/inlineasm/thumb/asmfpsqrt.py.exp
index 88a1e93bab..88a1e93bab 100644
--- a/tests/inlineasm/asmfpsqrt.py.exp
+++ b/tests/inlineasm/thumb/asmfpsqrt.py.exp
diff --git a/tests/inlineasm/asmit.py b/tests/inlineasm/thumb/asmit.py
index 640258e7c8..640258e7c8 100644
--- a/tests/inlineasm/asmit.py
+++ b/tests/inlineasm/thumb/asmit.py
diff --git a/tests/inlineasm/asmit.py.exp b/tests/inlineasm/thumb/asmit.py.exp
index d06c72d9bb..d06c72d9bb 100644
--- a/tests/inlineasm/asmit.py.exp
+++ b/tests/inlineasm/thumb/asmit.py.exp
diff --git a/tests/inlineasm/asmpushpop.py b/tests/inlineasm/thumb/asmpushpop.py
index 99566a7558..99566a7558 100644
--- a/tests/inlineasm/asmpushpop.py
+++ b/tests/inlineasm/thumb/asmpushpop.py
diff --git a/tests/inlineasm/asmpushpop.py.exp b/tests/inlineasm/thumb/asmpushpop.py.exp
index fea32e7d83..fea32e7d83 100644
--- a/tests/inlineasm/asmpushpop.py.exp
+++ b/tests/inlineasm/thumb/asmpushpop.py.exp
diff --git a/tests/inlineasm/asmrettype.py b/tests/inlineasm/thumb/asmrettype.py
index 95068795df..95068795df 100644
--- a/tests/inlineasm/asmrettype.py
+++ b/tests/inlineasm/thumb/asmrettype.py
diff --git a/tests/inlineasm/asmrettype.py.exp b/tests/inlineasm/thumb/asmrettype.py.exp
index cbb49d2472..cbb49d2472 100644
--- a/tests/inlineasm/asmrettype.py.exp
+++ b/tests/inlineasm/thumb/asmrettype.py.exp
diff --git a/tests/inlineasm/asmshift.py b/tests/inlineasm/thumb/asmshift.py
index ba4c21b3f2..ba4c21b3f2 100644
--- a/tests/inlineasm/asmshift.py
+++ b/tests/inlineasm/thumb/asmshift.py
diff --git a/tests/inlineasm/asmshift.py.exp b/tests/inlineasm/thumb/asmshift.py.exp
index c6c3a72179..c6c3a72179 100644
--- a/tests/inlineasm/asmshift.py.exp
+++ b/tests/inlineasm/thumb/asmshift.py.exp
diff --git a/tests/inlineasm/asmspecialregs.py b/tests/inlineasm/thumb/asmspecialregs.py
index 053ae29a4d..053ae29a4d 100644
--- a/tests/inlineasm/asmspecialregs.py
+++ b/tests/inlineasm/thumb/asmspecialregs.py
diff --git a/tests/inlineasm/asmspecialregs.py.exp b/tests/inlineasm/thumb/asmspecialregs.py.exp
index aa47d0d46d..aa47d0d46d 100644
--- a/tests/inlineasm/asmspecialregs.py.exp
+++ b/tests/inlineasm/thumb/asmspecialregs.py.exp
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/thumb/asmsum.py
index 51613ef6ac..51613ef6ac 100644
--- a/tests/inlineasm/asmsum.py
+++ b/tests/inlineasm/thumb/asmsum.py
diff --git a/tests/inlineasm/asmsum.py.exp b/tests/inlineasm/thumb/asmsum.py.exp
index 3c83da367a..3c83da367a 100644
--- a/tests/inlineasm/asmsum.py.exp
+++ b/tests/inlineasm/thumb/asmsum.py.exp
diff --git a/tests/ports/qemu/asm_test.py b/tests/ports/qemu/asm_test.py
index 26c7efe427..57238c6294 100644
--- a/tests/ports/qemu/asm_test.py
+++ b/tests/ports/qemu/asm_test.py
@@ -1,4 +1,4 @@
-import frozen_asm
+import frozen_asm_thumb as frozen_asm
 
 print(frozen_asm.asm_add(1, 2))
 print(frozen_asm.asm_add1(3))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a609a1fcbb..f00510f2da 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -138,11 +138,11 @@ platform_tests_to_skip = {
     ),
     "qemu": (
         # Skip tests that require Cortex-M4.
-        "inlineasm/asmfpaddsub.py",
-        "inlineasm/asmfpcmp.py",
-        "inlineasm/asmfpldrstr.py",
-        "inlineasm/asmfpmuldiv.py",
-        "inlineasm/asmfpsqrt.py",
+        "inlineasm/thumb/asmfpaddsub.py",
+        "inlineasm/thumb/asmfpcmp.py",
+        "inlineasm/thumb/asmfpldrstr.py",
+        "inlineasm/thumb/asmfpmuldiv.py",
+        "inlineasm/thumb/asmfpsqrt.py",
     ),
     "webassembly": (
         "basics/string_format_modulo.py",  # can't print nulls to stdout
@@ -664,17 +664,17 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         # Check if @micropython.asm_thumb supports Thumb2 instructions, and skip such tests if it doesn't
         output = run_feature_check(pyb, args, "inlineasm_thumb2.py")
         if output != b"thumb2\n":
-            skip_tests.add("inlineasm/asmbcc.py")
-            skip_tests.add("inlineasm/asmbitops.py")
-            skip_tests.add("inlineasm/asmconst.py")
-            skip_tests.add("inlineasm/asmdiv.py")
-            skip_tests.add("inlineasm/asmfpaddsub.py")
-            skip_tests.add("inlineasm/asmfpcmp.py")
-            skip_tests.add("inlineasm/asmfpldrstr.py")
-            skip_tests.add("inlineasm/asmfpmuldiv.py")
-            skip_tests.add("inlineasm/asmfpsqrt.py")
-            skip_tests.add("inlineasm/asmit.py")
-            skip_tests.add("inlineasm/asmspecialregs.py")
+            skip_tests.add("inlineasm/thumb/asmbcc.py")
+            skip_tests.add("inlineasm/thumb/asmbitops.py")
+            skip_tests.add("inlineasm/thumb/asmconst.py")
+            skip_tests.add("inlineasm/thumb/asmdiv.py")
+            skip_tests.add("inlineasm/thumb/asmfpaddsub.py")
+            skip_tests.add("inlineasm/thumb/asmfpcmp.py")
+            skip_tests.add("inlineasm/thumb/asmfpldrstr.py")
+            skip_tests.add("inlineasm/thumb/asmfpmuldiv.py")
+            skip_tests.add("inlineasm/thumb/asmfpsqrt.py")
+            skip_tests.add("inlineasm/thumb/asmit.py")
+            skip_tests.add("inlineasm/thumb/asmspecialregs.py")
 
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, "repl_emacs_check.py")
@@ -1215,15 +1215,15 @@ the last matching regex is used:
             )
             if args.platform == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "inlineasm", "ports/stm32")
+                test_dirs += ("float", "stress", "inlineasm/thumb", "ports/stm32")
             elif args.platform == "mimxrt":
-                test_dirs += ("float", "stress", "inlineasm")
+                test_dirs += ("float", "stress", "inlineasm/thumb")
             elif args.platform == "renesas-ra":
-                test_dirs += ("float", "inlineasm", "ports/renesas-ra")
+                test_dirs += ("float", "inlineasm/thumb", "ports/renesas-ra")
             elif args.platform == "rp2":
                 test_dirs += ("float", "stress", "thread", "ports/rp2")
                 if "arm" in args.mpy_cross_flags:
-                    test_dirs += ("inlineasm",)
+                    test_dirs += ("inlineasm/thumb",)
             elif args.platform == "esp32":
                 test_dirs += ("float", "stress", "thread")
             elif args.platform in ("esp8266", "minimal", "samd", "nrf"):
@@ -1245,7 +1245,7 @@ the last matching regex is used:
             elif args.platform == "qemu":
                 test_dirs += (
                     "float",
-                    "inlineasm",
+                    "inlineasm/thumb",
                     "ports/qemu",
                 )
             elif args.platform == "webassembly":