diff --git a/.gitignore b/.gitignore
index df3528dc..47ed3f4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ examples/mps3-an536-el2/target
 examples/mps3-an536-el2/target-d32
 examples/versatileab/target
 examples/versatileab/target-d32
+examples/xilinx-zynq-a9/target
+examples/xilinx-zynq-a9/target-d32
 Cargo.lock
 **/.DS_Store
-
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 85074989..570a9516 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,6 @@
         "examples/versatileab/Cargo.toml",
         "examples/mps3-an536/Cargo.toml",
         "examples/mps3-an536-el2/Cargo.toml",
+        "examples/xilinx-zynq-a9/Cargo.toml",
     ]
 }
diff --git a/aarch32-cpu/Cargo.toml b/aarch32-cpu/Cargo.toml
index 9368a5aa..1f9e485c 100644
--- a/aarch32-cpu/Cargo.toml
+++ b/aarch32-cpu/Cargo.toml
@@ -18,7 +18,6 @@ keywords = [
 ]
 license = "MIT OR Apache-2.0"
 name = "aarch32-cpu"
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 homepage = "https://github.com/rust-embedded/aarch32"
 rust-version = "1.93"
@@ -27,7 +26,6 @@ version = "0.4.0"
 [dependencies]
 arbitrary-int = "2"
 bitbybit = "2"
-num_enum = { version = "0.7", default-features = false }
 critical-section = {version = "1.2.0", features = ["restore-state-u8"], optional = true}
 thiserror = { version = "2", default-features = false }
 defmt = { version = "1", optional = true }
diff --git a/aarch32-cpu/src/lib.rs b/aarch32-cpu/src/lib.rs
index 0e037e84..9bb4af2c 100644
--- a/aarch32-cpu/src/lib.rs
+++ b/aarch32-cpu/src/lib.rs
@@ -6,6 +6,10 @@
 #![deny(clippy::unnecessary_safety_comment)]
 #![deny(clippy::unnecessary_safety_doc)]
 
+// Only used by the mmu module, but we don't want cargo to complain
+// about an unused dependency
+use thiserror as _;
+
 pub mod cache;
 pub mod interrupt;
 pub mod register;
diff --git a/aarch32-rt-macros/Cargo.toml b/aarch32-rt-macros/Cargo.toml
index d40af3d3..34074408 100644
--- a/aarch32-rt-macros/Cargo.toml
+++ b/aarch32-rt-macros/Cargo.toml
@@ -8,7 +8,6 @@ description = "Run-Time macros for aarch32-rt"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "aarch32-rt-macros"
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 homepage = "https://github.com/rust-embedded/aarch32"
 rust-version = "1.93"
diff --git a/aarch32-rt/Cargo.toml b/aarch32-rt/Cargo.toml
index 10b1edfb..e52cda62 100644
--- a/aarch32-rt/Cargo.toml
+++ b/aarch32-rt/Cargo.toml
@@ -18,7 +18,6 @@ keywords = [
 ]
 license = "MIT OR Apache-2.0"
 name = "aarch32-rt"
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 rust-version = "1.93"
 version = "0.5.0"
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/c_test-armv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/c-test-armv8r-none-eabihf.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/mps3-an536/c_test-armv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/c-test-armv8r-none-eabihf.snap
index 5d86fd49..9af65300 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/c_test-armv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/c-test-armv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 c_code_char_check(p) -> 2
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/c_test-thumbv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/c-test-thumbv8r-none-eabihf.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/mps3-an536/c_test-thumbv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/c-test-thumbv8r-none-eabihf.snap
index 5d86fd49..9af65300 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/c_test-thumbv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/c-test-thumbv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 c_code_char_check(p) -> 2
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer-armv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-armv8r-none-eabihf.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/mps3-an536/generic_timer-armv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/generic-timer-armv8r-none-eabihf.snap
index e5a782dc..c879f8fc 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer-armv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-armv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Found PERIPHBASE 0xf0000000
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-armv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-armv8r-none-eabihf.snap
similarity index 95%
rename from aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-armv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-armv8r-none-eabihf.snap
index dd7947fd..f4a9145b 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-armv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-armv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Found PERIPHBASE 0xf0000000
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-thumbv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-thumbv8r-none-eabihf.snap
similarity index 95%
rename from aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-thumbv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-thumbv8r-none-eabihf.snap
index dd7947fd..f4a9145b 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer_irq-thumbv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-irq-thumbv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Found PERIPHBASE 0xf0000000
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer-thumbv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-thumbv8r-none-eabihf.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/mps3-an536/generic_timer-thumbv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/generic-timer-thumbv8r-none-eabihf.snap
index e5a782dc..c879f8fc 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/generic_timer-thumbv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/generic-timer-thumbv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Found PERIPHBASE 0xf0000000
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-armv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-armv8r-none-eabihf.snap
similarity index 98%
rename from aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-armv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-armv8r-none-eabihf.snap
index 52eeca97..f4954d6f 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-armv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-armv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
           UND @ 0x1005bd80..=0x1005fd7f
diff --git a/aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-thumbv8r-none-eabihf.snap b/aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-thumbv8r-none-eabihf.snap
similarity index 98%
rename from aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-thumbv8r-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-thumbv8r-none-eabihf.snap
index 52eeca97..f4954d6f 100644
--- a/aarch32-tests/tests/snapshots/mps3-an536/mpu_setup-thumbv8r-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/mps3-an536/mpu-setup-thumbv8r-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
           UND @ 0x1005bd80..=0x1005fd7f
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv4t-none-eabi.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/versatileab/c_test-armv4t-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/c-test-armv4t-none-eabi.snap
index 5d86fd49..9af65300 100644
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv4t-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv4t-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 c_code_char_check(p) -> 2
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv5te-none-eabi.snap
similarity index 94%
rename from aarch32-tests/tests/snapshots/versatileab/c_test-armv5te-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/c-test-armv5te-none-eabi.snap
index 5d86fd49..9af65300 100644
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv5te-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv5te-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 c_code_char_check(p) -> 2
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabihf.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv6-none-eabihf.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabihf.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7a-none-eabihf.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabihf.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-armv7r-none-eabihf.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv4t-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv4t-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv5te-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv5te-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv6-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv6-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabihf.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7a-none-eabihf.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabi.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabi.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabihf.snap
new file mode 100644
index 00000000..9af65300
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/c-test-thumbv7r-none-eabihf.snap
@@ -0,0 +1,19 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+c_code_char_check(p) -> 2
+c_code_unsigned_char_check(p) -> 2
+c_code_signed_char_check(p) -> 2
+c_code_short_check(p) -> 2
+c_code_unsigned_short_check(p) -> 2
+c_code_int_check(p) -> 2
+c_code_unsigned_int_check(p) -> 2
+c_code_long_check(p) -> 2
+c_code_unsigned_long_check(p) -> 2
+c_code_int_ptr_check(p) -> 2
+c_code_float_check(p) -> 2
+c_code_double_check(p) -> 2
+data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
+c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
+called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabihf.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv6-none-eabihf.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabihf.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7a-none-eabihf.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabihf.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-armv7r-none-eabihf.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv4t-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv4t-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv5te-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv5te-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv6-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv6-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabihf.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7a-none-eabihf.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabi.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabi.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabihf.snap
deleted file mode 100644
index 5d86fd49..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/c_test-thumbv7r-none-eabihf.snap
+++ /dev/null
@@ -1,19 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-c_code_char_check(p) -> 2
-c_code_unsigned_char_check(p) -> 2
-c_code_signed_char_check(p) -> 2
-c_code_short_check(p) -> 2
-c_code_unsigned_short_check(p) -> 2
-c_code_int_check(p) -> 2
-c_code_unsigned_int_check(p) -> 2
-c_code_long_check(p) -> 2
-c_code_unsigned_long_check(p) -> 2
-c_code_int_ptr_check(p) -> 2
-c_code_float_check(p) -> 2
-c_code_double_check(p) -> 2
-data_in: c_code_data_t { c: 1, s: 1, i: 1, l: 1, f: 1.0, d: 1.0, e: 1 }
-c_code_struct_check(data_in) -> c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
-called c_code_struct_ref_check, data_in is c_code_data_t { c: 2, s: 2, i: 2, l: 2, f: 2.0, d: 2.0, e: 2 }
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv4t-none-eabi.snap
similarity index 61%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv4t-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv4t-none-eabi.snap
index 0d76b677..16435aff 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv4t-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv4t-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv5te-none-eabi.snap
similarity index 61%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv5te-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv5te-none-eabi.snap
index 0d76b677..16435aff 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv5te-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv5te-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabi.snap
similarity index 61%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabi.snap
index 0d76b677..16435aff 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabihf.snap
similarity index 61%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabihf.snap
index 0d76b677..16435aff 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv6-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv6-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabi.snap
similarity index 93%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabi.snap
index a17f774f..326231fa 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 cntfrq = 62.500 MHz
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabihf.snap
similarity index 93%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabihf.snap
index a17f774f..326231fa 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7a-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7a-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 cntfrq = 62.500 MHz
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabi.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabi.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabihf.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-armv7r-none-eabihf.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv4t-none-eabi.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv4t-none-eabi.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv5te-none-eabi.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv5te-none-eabi.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv6-none-eabi.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv6-none-eabi.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabi.snap
similarity index 93%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabi.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabi.snap
index a17f774f..326231fa 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabi.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabi.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 cntfrq = 62.500 MHz
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabihf.snap
similarity index 93%
rename from aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabihf.snap
rename to aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabihf.snap
index a17f774f..326231fa 100644
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7a-none-eabihf.snap
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7a-none-eabihf.snap
@@ -1,5 +1,5 @@
 ---
-source: qemu-tests/tests/tests.rs
+source: aarch32-tests/tests/tests.rs
 expression: stdout
 ---
 cntfrq = 62.500 MHz
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabi.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabi.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabihf.snap
new file mode 100644
index 00000000..16435aff
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/versatileab/generic-timer-thumbv7r-none-eabihf.snap
@@ -0,0 +1,5 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabi.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabi.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabihf.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-armv7r-none-eabihf.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv4t-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv4t-none-eabi.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv4t-none-eabi.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv5te-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv5te-none-eabi.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv5te-none-eabi.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv6-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv6-none-eabi.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv6-none-eabi.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabi.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabi.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabi.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabihf.snap b/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabihf.snap
deleted file mode 100644
index 0d76b677..00000000
--- a/aarch32-tests/tests/snapshots/versatileab/generic_timer-thumbv7r-none-eabihf.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: qemu-tests/tests/tests.rs
-expression: stdout
----
-Skipping timer test, not Armv7-A
diff --git a/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabi.snap
new file mode 100644
index 00000000..6ae50610
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabi.snap
@@ -0,0 +1,206 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Sine wave test (f32)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) ..............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+Sine wave test (f64)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
diff --git a/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabihf.snap
new file mode 100644
index 00000000..6ae50610
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-armv7a-none-eabihf.snap
@@ -0,0 +1,206 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Sine wave test (f32)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) ..............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+Sine wave test (f64)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
diff --git a/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabi.snap b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabi.snap
new file mode 100644
index 00000000..6ae50610
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabi.snap
@@ -0,0 +1,206 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Sine wave test (f32)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) ..............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+Sine wave test (f64)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
diff --git a/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabihf.snap b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabihf.snap
new file mode 100644
index 00000000..6ae50610
--- /dev/null
+++ b/aarch32-tests/tests/snapshots/xilinx-zynq-a9/fpu-test-thumbv7a-none-eabihf.snap
@@ -0,0 +1,206 @@
+---
+source: aarch32-tests/tests/tests.rs
+expression: stdout
+---
+Sine wave test (f32)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) ..............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+Sine wave test (f64)...
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
+( 0.0000) ..............................o
+( 0.1253) .................................o
+( 0.2487) .....................................o
+( 0.3681) .........................................o
+( 0.4818) ............................................o
+( 0.5878) ...............................................o
+( 0.6845) ..................................................o
+( 0.7705) .....................................................o
+( 0.8443) .......................................................o
+( 0.9048) .........................................................o
+( 0.9511) ..........................................................o
+( 0.9823) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9980) ...........................................................o
+( 0.9823) ...........................................................o
+( 0.9511) ..........................................................o
+( 0.9048) .........................................................o
+( 0.8443) .......................................................o
+( 0.7705) .....................................................o
+( 0.6845) ..................................................o
+( 0.5878) ...............................................o
+( 0.4818) ............................................o
+( 0.3681) .........................................o
+( 0.2487) .....................................o
+( 0.1253) .................................o
+(-0.0000) .............................o
+(-0.1253) ..........................o
+(-0.2487) ......................o
+(-0.3681) ..................o
+(-0.4818) ...............o
+(-0.5878) ............o
+(-0.6845) .........o
+(-0.7705) ......o
+(-0.8443) ....o
+(-0.9048) ..o
+(-0.9511) .o
+(-0.9823) o
+(-0.9980) o
+(-0.9980) o
+(-0.9823) o
+(-0.9511) .o
+(-0.9048) ..o
+(-0.8443) ....o
+(-0.7705) ......o
+(-0.6845) .........o
+(-0.5878) ............o
+(-0.4818) ...............o
+(-0.3681) ..................o
+(-0.2487) ......................o
+(-0.1253) ..........................o
diff --git a/aarch32-tests/tests/tests.rs b/aarch32-tests/tests/tests.rs
index 73a11545..8a44e9e0 100644
--- a/aarch32-tests/tests/tests.rs
+++ b/aarch32-tests/tests/tests.rs
@@ -128,6 +128,18 @@ const MATRIX: &[Group] = &[
         rustflags: None,
         variants: &[PLAIN],
     },
+    Group {
+        example: "xilinx-zynq-a9",
+        targets: &[
+            "armv7a-none-eabi",
+            "thumbv7a-none-eabi",
+            "armv7a-none-eabihf",
+            "thumbv7a-none-eabihf",
+        ],
+        flags: &["--release", "--features=fpu-d32", "--target-dir=target-d32"],
+        rustflags: Some("-Ctarget-cpu=cortex-a9"),
+        variants: &[FPU],
+    },
 ];
 
 fn main() {
diff --git a/arm-targets/Cargo.toml b/arm-targets/Cargo.toml
index 5fbe3faa..7632bfa2 100644
--- a/arm-targets/Cargo.toml
+++ b/arm-targets/Cargo.toml
@@ -8,7 +8,6 @@ description = "Compile-time feature detection for Arm processors"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 name = "arm-targets"
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 homepage = "https://github.com/rust-embedded/aarch32"
 rust-version = "1.93"
diff --git a/examples/mps3-an536-el2/Cargo.toml b/examples/mps3-an536-el2/Cargo.toml
index a35fbd41..d9a5a555 100644
--- a/examples/mps3-an536-el2/Cargo.toml
+++ b/examples/mps3-an536-el2/Cargo.toml
@@ -10,7 +10,6 @@ homepage = "https://github.com/rust-embedded/aarch32"
 license = "MIT OR Apache-2.0"
 name = "mps3-an536-el2"
 publish = false
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 version = "0.0.0"
 
@@ -19,8 +18,6 @@ aarch32-cpu = { path = "../../aarch32-cpu", features = ["critical-section-multi-
 aarch32-rt = { path = "../../aarch32-rt", features = ["el2-mode"] }
 arm-gic = "0.8.1"
 critical-section = "1.2.0"
-heapless = "0.9.1"
-libm = "0.2.15"
 semihosting = { version = "0.1.18", features = ["stdio"] }
 
 [build-dependencies]
diff --git a/examples/mps3-an536/Cargo.toml b/examples/mps3-an536/Cargo.toml
index 6410c60e..63ea6c0f 100644
--- a/examples/mps3-an536/Cargo.toml
+++ b/examples/mps3-an536/Cargo.toml
@@ -10,7 +10,6 @@ homepage = "https://github.com/rust-embedded/aarch32"
 license = "MIT OR Apache-2.0"
 name = "mps3-an536"
 publish = false
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 version = "0.0.0"
 
diff --git a/examples/mps3-an536/src/bin/c_test.rs b/examples/mps3-an536/src/bin/c-test.rs
similarity index 100%
rename from examples/mps3-an536/src/bin/c_test.rs
rename to examples/mps3-an536/src/bin/c-test.rs
diff --git a/examples/mps3-an536/src/bin/generic_timer_irq.rs b/examples/mps3-an536/src/bin/generic-timer-irq.rs
similarity index 100%
rename from examples/mps3-an536/src/bin/generic_timer_irq.rs
rename to examples/mps3-an536/src/bin/generic-timer-irq.rs
diff --git a/examples/mps3-an536/src/bin/generic_timer.rs b/examples/mps3-an536/src/bin/generic-timer.rs
similarity index 100%
rename from examples/mps3-an536/src/bin/generic_timer.rs
rename to examples/mps3-an536/src/bin/generic-timer.rs
diff --git a/examples/mps3-an536/src/bin/mpu_setup.rs b/examples/mps3-an536/src/bin/mpu-setup.rs
similarity index 100%
rename from examples/mps3-an536/src/bin/mpu_setup.rs
rename to examples/mps3-an536/src/bin/mpu-setup.rs
diff --git a/examples/versatileab/Cargo.toml b/examples/versatileab/Cargo.toml
index cefc0c6a..b7844b76 100644
--- a/examples/versatileab/Cargo.toml
+++ b/examples/versatileab/Cargo.toml
@@ -10,7 +10,6 @@ homepage = "https://github.com/rust-embedded/aarch32"
 license = "MIT OR Apache-2.0"
 name = "versatileab"
 publish = false
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 version = "0.0.0"
 
diff --git a/examples/versatileab/src/bin/c_test.rs b/examples/versatileab/src/bin/c-test.rs
similarity index 100%
rename from examples/versatileab/src/bin/c_test.rs
rename to examples/versatileab/src/bin/c-test.rs
diff --git a/examples/versatileab/src/bin/generic_timer.rs b/examples/versatileab/src/bin/generic-timer.rs
similarity index 100%
rename from examples/versatileab/src/bin/generic_timer.rs
rename to examples/versatileab/src/bin/generic-timer.rs
diff --git a/examples/xilinx-zynq-a9/Cargo.toml b/examples/xilinx-zynq-a9/Cargo.toml
index 6313c87f..667431f3 100644
--- a/examples/xilinx-zynq-a9/Cargo.toml
+++ b/examples/xilinx-zynq-a9/Cargo.toml
@@ -9,7 +9,6 @@ homepage = "https://github.com/rust-embedded/aarch32"
 license = "MIT OR Apache-2.0"
 name = "xilinx-zynq-a9"
 publish = false
-readme = "README.md"
 repository = "https://github.com/rust-embedded/aarch32.git"
 version = "0.0.0"
 
@@ -18,11 +17,8 @@ aarch32-cpu = { path = "../../aarch32-cpu", features = ["critical-section-multi-
 aarch32-rt = { path = "../../aarch32-rt" }
 arbitrary-int = "2.1.1"
 arm-gic = "0.8.1"
-c-code = { version = "0.1.0", path = "../c-code" }
 critical-section = "1.2.0"
-heapless = "0.9.1"
 libm = "0.2.15"
-portable-atomic = { version = "1.11.1", features = ["critical-section"] }
 semihosting = { version = "0.1.18", features = ["stdio"] }
 
 [build-dependencies]
diff --git a/examples/xilinx-zynq-a9/src/bin/fpu-test.rs b/examples/xilinx-zynq-a9/src/bin/fpu-test.rs
new file mode 100644
index 00000000..1e2aa7ed
--- /dev/null
+++ b/examples/xilinx-zynq-a9/src/bin/fpu-test.rs
@@ -0,0 +1,36 @@
+//! Simple FPU test
+
+#![no_std]
+#![no_main]
+
+use aarch32_rt::entry;
+use semihosting::println;
+use xilinx_zynq_a9 as _;
+
+static BAR: &str = "............................................................";
+const MAX_LEN: f32 = BAR.len() as f32;
+
+/// The entry-point to the Rust application.
+///
+/// It is called by the start-up code in `aarch32-rt`.
+#[entry]
+fn main() -> ! {
+    const STEPS: u16 = 100;
+    const RADIANS_PER_STEP: f32 = (4.0 * core::f32::consts::PI) / (STEPS as f32);
+    println!("Sine wave test (f32)...");
+    for row in 0..STEPS {
+        let angle = (row as f32) * RADIANS_PER_STEP;
+        let sine = libm::sinf(angle);
+        let bar_len = ((sine + 1.0) * (MAX_LEN / 2.0)) as usize;
+        println!("({:7.04}) {:.*}o", sine, bar_len, BAR);
+    }
+
+    println!("Sine wave test (f64)...");
+    for row in 0..STEPS {
+        let angle = (row as f64) * f64::from(RADIANS_PER_STEP);
+        let sine = libm::sin(angle);
+        let bar_len = ((sine + 1.0) * (f64::from(MAX_LEN) / 2.0)) as usize;
+        println!("({:7.04}) {:.*}o", sine, bar_len, BAR);
+    }
+    xilinx_zynq_a9::exit(0);
+}
diff --git a/justfile b/justfile
index 7d851ce4..932c734a 100644
--- a/justfile
+++ b/justfile
@@ -9,7 +9,7 @@ verbose := if v == "1" { "--verbose" } else { "" }
 
 # The aarch32-tests harness invocation shared by every test-qemu recipe. Each
 # recipe appends a name filter; the build matrix lives in the harness itself.
-qemu_test := "cargo test -p aarch32-tests --test tests --"
+qemu_test := "cargo test -p aarch32-tests --test tests -- --test-threads=1"
 
 # Our default target. It does everything that you might want to do pre-checkin.
 check: build-all build-all-examples doc-all fmt-check clippy-all test
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index beeb4b22..60803438 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2026-06-04"
+channel = "nightly-2026-09-03"
 targets = [
 	"armv7a-none-eabi",
 	"armv7a-none-eabihf",