Auto merge of #164 - japaric:gh161, r=japaric

add tests for the msp430 and none targets

fix codegen for the msp430 target

closes #161

Author: homunkulus

.travis.yml

@@ -33,6 +33,8 @@ matrix:
       rust: nightly
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Toshiba
       rust: nightly
+    - env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER
+      rust: nightly
 
     # Linux
     - env: TARGET=i686-unknown-linux-gnu

ci/script.sh

@@ -8,7 +8,8 @@ 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 )
+    target/$TARGET/release/svd2rust -i $td/${1}.svd | \
+        ( rustfmt 2>/dev/null > $td/src/lib.rs || true )
 
     cargo check --manifest-path $td/Cargo.toml
 }
@@ -381,6 +382,27 @@ main() {
             test_svd ht32f275x
         ;;
 
+        # test other targets (architectures)
+        OTHER)
+            echo 'msp430 = "0.1.0"' >> $td/Cargo.toml
+
+            (
+                cd $td &&
+                    curl -LO \
+                         https://github.com/pftbest/msp430g2553/raw/v0.1.0/msp430g2553.svd
+            )
+
+            target/$TARGET/release/svd2rust --target msp430 -i $td/msp430g2553.svd | \
+                ( rustfmt 2>/dev/null > $td/src/lib.rs || true )
+
+            cargo check --manifest-path $td/Cargo.toml
+
+            target/$TARGET/release/svd2rust --target none -i $td/msp430g2553.svd | \
+                ( rustfmt 2>/dev/null > $td/src/lib.rs || true )
+
+            cargo check --manifest-path $td/Cargo.toml
+        ;;
+
         Nordic)
             # BAD-SVD two enumeratedValues have the same value
             # test_svd nrf52

src/generate.rs

@@ -57,6 +57,7 @@ pub fn device(d: &Device, target: &Target, items: &mut Vec<Tokens>) -> Result<()
         }
         Target::Msp430 => {
             items.push(quote! {
+                extern crate msp430;
                 #[macro_reexport(default_handler)]
                 #[cfg(feature = "rt")]
                 extern crate msp430_rt;
@@ -142,6 +143,24 @@ pub fn device(d: &Device, target: &Target, items: &mut Vec<Tokens>) -> Result<()
         exprs.push(quote!(#id: #id { _marker: PhantomData }));
     }
 
+    let take = match *target {
+        Target::CortexM => Some(Ident::new("cortex_m")),
+        Target::Msp430 => Some(Ident::new("msp430")),
+        Target::None => None,
+    }.map(|krate| quote! {
+        /// Returns all the peripherals *once*
+        #[inline]
+        pub fn take() -> Option<Self> {
+            #krate::interrupt::free(|_| {
+                if unsafe { DEVICE_PERIPHERALS } {
+                    None
+                } else {
+                    Some(unsafe { Peripherals::steal() })
+                }
+            })
+        }
+    });
+
     items.push(quote! {
         // 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
@@ -156,17 +175,7 @@ pub fn device(d: &Device, target: &Target, items: &mut Vec<Tokens>) -> Result<()
         }
 
         impl Peripherals {
-            /// Returns all the peripherals *once*
-            #[inline(always)]
-            pub fn take() -> Option<Self> {
-                cortex_m::interrupt::free(|_| {
-                    if unsafe { DEVICE_PERIPHERALS } {
-                        None
-                    } else {
-                        Some(unsafe { Peripherals::steal() })
-                    }
-                })
-            }
+            #take
 
             /// Unchecked version of `Peripherals::take`
             pub unsafe fn steal() -> Self {