From fa365d8aefef1e88e0213a214314b9e61396c5a5 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 13 Sep 2017 16:26:01 +0200 Subject: [PATCH 1/2] Assume ARMv6 when `` section is missing This makes the generated crates build in more cases --- Cargo.lock | 2 +- src/generate.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf753973..3396d588 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [root] name = "svd2rust" -version = "0.11.3" +version = "0.11.4" dependencies = [ "cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.20.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/generate.rs b/src/generate.rs index ef05584e..a5aa70e7 100644 --- a/src/generate.rs +++ b/src/generate.rs @@ -244,7 +244,8 @@ pub fn interrupt( Target::CortexM => { let is_armv6 = match device.cpu { Some(ref cpu) if cpu.name.starts_with("CM0") => true, - _ => false, + Some(_) => false, + _ => true, // default to armv6 when the section is missing }; if is_armv6 { From 8b3b27813260a18078280bcc2c90ffba1c31c807 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 19 Sep 2017 23:24:54 +0200 Subject: [PATCH 2/2] Simplify match arms --- src/generate.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/generate.rs b/src/generate.rs index a5aa70e7..de7f9db5 100644 --- a/src/generate.rs +++ b/src/generate.rs @@ -243,9 +243,8 @@ pub fn interrupt( match *target { Target::CortexM => { let is_armv6 = match device.cpu { - Some(ref cpu) if cpu.name.starts_with("CM0") => true, - Some(_) => false, - _ => true, // default to armv6 when the section is missing + Some(ref cpu) => cpu.name.starts_with("CM0"), + None => true, // default to armv6 when the section is missing }; if is_armv6 {