Merge #203

203: cortex-m: generate code that compiles on stable r=japaric a=japaric

This is still missing some stuff:

- svd2rust must now generate an interrupts.x linker script and a build script that puts the linker script somewhere the linker can find it. See japaric/stm32f103xx#24 for a sample of what those files look like.

- we have to decide how to organize the svd2rust output. It probably makes sense to generate 3 files on $PWD (lib.rs, build.rs, interrupts.x) for Cortex-M and a single lib.rs for the other targets.

- I probably broke the other targets; need to test them

Co-authored-by: Jorge Aparicio <[email protected]>

Author: bors[bot]

.travis.yml

@@ -12,27 +12,27 @@ matrix:
   include:
     # Nightly, for testing
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Atmel
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Freescale
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Fujitsu
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Holtek
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nordic
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nuvoton
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=NXP
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=SiliconLabs
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Spansion
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=STMicro
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Toshiba
-      rust: nightly
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER
       rust: nightly
 

Cargo.toml

@@ -19,7 +19,7 @@ keywords = [
 license = "MIT OR Apache-2.0"
 name = "svd2rust"
 repository = "https://github.com/japaric/svd2rust"
-version = "0.12.1"
+version = "0.13.0"
 
 [[bin]]
 doc = false

ci/install.sh

@@ -19,14 +19,7 @@ main() {
            --git japaric/cross \
            --tag $tag
 
-    if [ ! -z ${VENDOR-} ]; then
-        curl -LSfs https://japaric.github.io/trust/install.sh | \
-            sh -s -- \
-               --crate rustfmt \
-               --force \
-               --git japaric/rustfmt-bin \
-               --tag v0.8.4-20170605
-    fi
+    rustup component add rustfmt-preview
 }
 
 main

ci/script.sh

@@ -8,8 +8,15 @@ test_svd() {
     )
 
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
-    target/$TARGET/release/svd2rust -i $td/${1}.svd | \
-        ( rustfmt 2>/dev/null > $td/src/lib.rs || true )
+    local cwd=$(pwd)
+    pushd $td
+    $cwd/target/$TARGET/release/svd2rust -i ${1}.svd
+
+    mv lib.rs src/lib.rs
+
+    # ignore rustfmt errors
+    rustfmt src/lib.rs || true
+    popd
 
     cargo check --manifest-path $td/Cargo.toml
 }
@@ -34,18 +41,17 @@ main() {
 
     # test crate
     cargo init --name foo $td
-    echo 'bare-metal = "0.1.0"' >> $td/Cargo.toml
-    echo 'cortex-m = "0.4.0"' >> $td/Cargo.toml
-    echo 'cortex-m-rt = "0.3.0"' >> $td/Cargo.toml
+    echo 'cortex-m = "0.5.0"' >> $td/Cargo.toml
+    echo 'cortex-m-rt = "0.5.0"' >> $td/Cargo.toml
     echo 'vcell = "0.1.0"' >> $td/Cargo.toml
-    echo 'msp430 = "0.1.0"' >> $td/Cargo.toml
-    # echo 'riscv = "0.1.4"' >> $td/Cargo.toml
-    # echo 'riscv-rt = "0.1.3"' >> $td/Cargo.toml
     echo '[profile.dev]' >> $td/Cargo.toml
     echo 'incremental = false' >> $td/Cargo.toml
 
     case $VENDOR in
         Atmel)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD missing resetValue
             # test_svd AT91SAM9CN11
             # test_svd AT91SAM9CN12
@@ -129,6 +135,9 @@ main() {
         ;;
 
         Freescale)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD bad enumeratedValue value
             # test_svd MKV56F20
             # test_svd MKV56F22
@@ -277,6 +286,9 @@ main() {
         ;;
 
         Fujitsu)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd MB9AF10xN
             test_svd MB9AF10xR
@@ -381,6 +393,9 @@ main() {
         ;;
 
         Holtek)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd ht32f125x
             test_svd ht32f175x
@@ -389,6 +404,18 @@ main() {
 
         # test other targets (architectures)
         OTHER)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.1.0"' >> $td/Cargo.toml
+
+            echo '[dependencies.msp430]' >> $td/Cargo.toml
+            echo 'version = "0.1.0"' >> $td/Cargo.toml
+
+            # echo '[dependencies.riscv]' >> $td/Cargo.toml
+            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+
+            # echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
+            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             (
                 cd $td &&
                     curl -LO \
@@ -415,6 +442,9 @@ main() {
         ;;
 
         Nordic)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD two enumeratedValues have the same value
             # test_svd nrf52
 
@@ -423,12 +453,18 @@ main() {
         ;;
 
         Nuvoton)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd M051_Series
             test_svd NUC100_Series
         ;;
 
         NXP)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD two enumeratedValues have the same name
             # test_svd LPC11Exx_v5
             # test_svd LPC11Uxx_v7
@@ -465,6 +501,9 @@ main() {
         ;;
 
         SiliconLabs)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # #99 regression tests
             test_svd SIM3C1x4_SVD
             test_svd SIM3C1x6_SVD
@@ -481,6 +520,9 @@ main() {
         ;;
 
         Spansion)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd MB9AF12xK
             test_svd MB9AF12xL
@@ -576,6 +618,9 @@ main() {
         ;;
 
         STMicro)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd STM32F030
             test_svd STM32F031x
@@ -626,6 +671,9 @@ main() {
         ;;
 
         Toshiba)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD resetValue is bigger than the register size
             # test_svd M365
             # test_svd M367

src/generate/device.rs

@@ -9,7 +9,7 @@ use Target;
 use generate::{interrupt, peripheral};
 
 /// Whole device generation
-pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>> {
+pub fn render(d: &Device, target: &Target, nightly: bool, device_x: &mut String) -> Result<Vec<Tokens>> {
     let mut out = vec![];
 
     let doc = format!(
@@ -27,7 +27,7 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
         });
     }
 
-    if *target != Target::None {
+    if *target != Target::None && *target != Target::CortexM {
         out.push(quote! {
             #![cfg_attr(feature = "rt", feature(global_asm))]
             #![cfg_attr(feature = "rt", feature(use_extern_macros))]
@@ -37,15 +37,19 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
 
     out.push(quote! {
         #![doc = #doc]
-        #![allow(private_no_mangle_statics)]
         #![deny(missing_docs)]
         #![deny(warnings)]
         #![allow(non_camel_case_types)]
-        #![feature(const_fn)]
-        #![feature(try_from)]
         #![no_std]
     });
 
+    if *target != Target::CortexM {
+        out.push(quote! {
+            #![feature(const_fn)]
+            #![feature(try_From)]
+        });
+    }
+
     if nightly {
         out.push(quote! {
             #![feature(untagged_unions)]
@@ -58,8 +62,6 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
                 extern crate cortex_m;
                 #[cfg(feature = "rt")]
                 extern crate cortex_m_rt;
-                #[cfg(feature = "rt")]
-                pub use cortex_m_rt::{default_handler, exception};
             });
         }
         Target::Msp430 => {
@@ -98,7 +100,7 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
         });
     }
 
-    out.extend(interrupt::render(d, target, &d.peripherals)?);
+    out.extend(interrupt::render(target, &d.peripherals, device_x)?);
 
     const CORE_PERIPHERALS: &[&str] = &[
         "CBP", "CPUID", "DCB", "DWT", "FPB", "FPU", "ITM", "MPU", "NVIC", "SCB", "SYST", "TPIU"
@@ -111,18 +113,10 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
             pub use cortex_m::peripheral::Peripherals as CorePeripherals;
         });
 
-        // NOTE re-export only core peripherals available on *all* Cortex-M devices
-        // (if we want to re-export all core peripherals available for the target then we are going
-        // to need to replicate the `#[cfg]` stuff that cortex-m uses and that would require all
-        // device crates to define the custom `#[cfg]`s that cortex-m uses in their build.rs ...)
         out.push(quote! {
-            pub use cortex_m::peripheral::CPUID;
-            pub use cortex_m::peripheral::DCB;
-            pub use cortex_m::peripheral::DWT;
-            pub use cortex_m::peripheral::MPU;
-            pub use cortex_m::peripheral::NVIC;
-            pub use cortex_m::peripheral::SCB;
-            pub use cortex_m::peripheral::SYST;
+            pub use cortex_m::peripheral::{
+                CBP, CPUID, DCB, DWT, FPB, FPU, ITM, MPU, NVIC, SCB, SYST, TPIU,
+            };
         });
     }
 
@@ -132,7 +126,6 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
             continue;
         }
 
-
         out.extend(peripheral::render(p, &d.peripherals, &d.defaults, nightly)?);
 
         if p.registers
@@ -180,6 +173,7 @@ pub fn render(d: &Device, target: &Target, nightly: bool) -> Result<Vec<Tokens>>
         // NOTE `no_mangle` is used here to prevent linking different minor versions of the device
         // crate as that would let you `take` the device peripherals more than once (one per minor
         // version)
+        #[allow(private_no_mangle_statics)]
         #[no_mangle]
         static mut DEVICE_PERIPHERALS: bool = false;