test(port_arm_m): support a new target qemu_mps2_an505 (MPS2+ AN505 on QEMU) and its variations

Author: yvt

src/constance_port_arm_m_test_driver/.cargo/config.toml

@@ -17,3 +17,18 @@ rustflags = [
 rustflags = [
   "-C", "link-arg=-Tlink.x",
 ]
+
+[target.thumbv8m.base-none-eabi]
+rustflags = [
+  "-C", "link-arg=-Tlink.x",
+]
+
+[target.thumbv8m.main-none-eabi]
+rustflags = [
+  "-C", "link-arg=-Tlink.x",
+]
+
+[target.thumbv8m.main-none-eabihf]
+rustflags = [
+  "-C", "link-arg=-Tlink.x",
+]

src/constance_port_arm_m_test_runner/src/targets.rs

@@ -47,7 +47,38 @@ pub static TARGETS: &[(&str, &dyn Target)] = &[
         "qemu_mps2_an385_v6m",
         &OverrideTargetTriple("thumbv6m-none-eabi", QemuMps2An385),
     ),
-    // TODO: Add an emulated target of `thumbv7em-none-eabihf`
+    (
+        "qemu_mps2_an505",
+        &OverrideTargetTriple("thumbv8m.main-none-eabihf", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v8mml",
+        &OverrideTargetTriple("thumbv8m.main-none-eabi", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v8mbl",
+        &OverrideTargetTriple("thumbv8m.base-none-eabi", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v7em_hf",
+        &OverrideTargetTriple("thumbv7em-none-eabihf", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v7m_hf",
+        &OverrideTargetTriple("thumbv7m-none-eabihf", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v7em",
+        &OverrideTargetTriple("thumbv7em-none-eabi", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v7m",
+        &OverrideTargetTriple("thumbv7m-none-eabi", QemuMps2An505),
+    ),
+    (
+        "qemu_mps2_an505_v6m",
+        &OverrideTargetTriple("thumbv6m-none-eabi", QemuMps2An505),
+    ),
 ];
 
 pub struct NucleoF401re;
@@ -125,7 +156,50 @@ impl Target for QemuMps2An385 {
     fn connect(
         &self,
     ) -> Pin<Box<dyn Future<Output = Result<Box<dyn DebugProbe>, Box<dyn Error + Send>>>>> {
-        Box::pin(async { Ok(Box::new(qemu::QemuDebugProbe::new()) as Box<dyn DebugProbe>) })
+        Box::pin(async {
+            Ok(
+                Box::new(qemu::QemuDebugProbe::new(&["-machine", "mps2-an385"]))
+                    as Box<dyn DebugProbe>,
+            )
+        })
+    }
+}
+
+pub struct QemuMps2An505;
+
+impl Target for QemuMps2An505 {
+    fn target_triple(&self) -> &str {
+        "thumbv8m-none-eabihf"
+    }
+
+    fn cargo_features(&self) -> &[&str] {
+        &["output-semihosting"]
+    }
+
+    fn memory_layout_script(&self) -> String {
+        "
+            MEMORY
+            {
+              /* ZBT SRAM (SSRAM1) Secure alias */
+              FLASH : ORIGIN = 0x10000000, LENGTH = 4096k
+              /* ZBT SRAM (SSRAM2 and SSRAM3) Secure alias */
+              RAM : ORIGIN = 0x38000000, LENGTH = 4096K
+            }
+
+            _stack_start = ORIGIN(RAM) + LENGTH(RAM);
+        "
+        .to_owned()
+    }
+
+    fn connect(
+        &self,
+    ) -> Pin<Box<dyn Future<Output = Result<Box<dyn DebugProbe>, Box<dyn Error + Send>>>>> {
+        Box::pin(async {
+            Ok(
+                Box::new(qemu::QemuDebugProbe::new(&["-machine", "mps2-an505"]))
+                    as Box<dyn DebugProbe>,
+            )
+        })
     }
 }
 

src/constance_port_arm_m_test_runner/src/targets/qemu.rs

@@ -11,11 +11,13 @@ use tokio::{io::AsyncRead, process::Child};
 use super::{DebugProbe, DynAsyncRead};
 use crate::subprocess;
 
-pub(super) struct QemuDebugProbe {}
+pub(super) struct QemuDebugProbe {
+    qemu_args: &'static [&'static str],
+}
 
 impl QemuDebugProbe {
-    pub(super) fn new() -> Self {
-        Self {}
+    pub(super) fn new(qemu_args: &'static [&'static str]) -> Self {
+        Self { qemu_args }
     }
 }
 
@@ -27,9 +29,8 @@ impl DebugProbe for QemuDebugProbe {
         let result = subprocess::CmdBuilder::new("qemu-system-arm")
             .arg("-kernel")
             .arg(exe)
+            .args(self.qemu_args)
             .args(&[
-                "-machine",
-                "mps2-an385",
                 "-nographic",
                 "-d",
                 "guest_errors",