Merge pull request #19 from YuhanLiin/inline-interrupt

Inline interrupt inner functions

Author: cr1901

macros/src/lib.rs

@@ -91,7 +91,8 @@ use syn::{
 /// pre-interrupt initialization to be done.
 ///
 /// Note that a function marked with the entry attribute is allowed to take no input parameters
-/// even if `init` returns a value, due to implementation details.
+/// even if `init` returns a value, due to implementation details. To reduce code size, it is
+/// strongly recommended to put `#[inline(always)]` on `init` if it's used nowhere else.
 ///
 /// ## Examples
 ///
@@ -115,6 +116,7 @@ use syn::{
 /// use msp430::interrupt::CriticalSection;
 ///
 /// # struct Hal;
+/// #[inline(always)]
 /// fn init(cs: CriticalSection) -> Hal {
 ///     /* initialize hardware */
 ///     # Hal
@@ -135,6 +137,7 @@ use syn::{
 /// # use msp430_rt_macros::entry;
 /// use msp430::interrupt::CriticalSection;
 ///
+/// #[inline(always)]
 /// fn arg(cs: CriticalSection) {
 ///     /* initialize */
 /// }
@@ -494,6 +497,7 @@ pub fn interrupt(args: TokenStream, input: TokenStream) -> TokenStream {
             #unsafety extern "msp430-interrupt" fn #hash() {
                 #check
 
+                #[inline(always)]
                 #unsafety fn #hash<'a>(#fn_param) #output {
                     #(#vars)*
                     #(#stmts)*

macros/tests/ui/interrupt_wrong_import.stderr

@@ -0,0 +1,25 @@
+error[E0433]: failed to resolve: use of undeclared crate or module `interrupt`
+  --> tests/ui/interrupt_wrong_import.rs:11:1
+   |
+11 | #[interrupt]
+   | ^^^^^^^^^^^^ use of undeclared crate or module `interrupt`
+   |
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0658]: msp430-interrupt ABI is experimental and subject to change
+  --> tests/ui/interrupt_wrong_import.rs:11:1
+   |
+11 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
+   = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
+  --> tests/ui/interrupt_wrong_import.rs:11:1
+   |
+11 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)

macros/tests/ui/recursion.stderr

@@ -0,0 +1,29 @@
+error[E0425]: cannot find function `main` in this scope
+ --> tests/ui/recursion.rs:7:5
+  |
+7 |     main(cs)
+  |     ^^^^ not found in this scope
+
+error[E0425]: cannot find function, tuple struct or tuple variant `DefaultHandler` in this scope
+  --> tests/ui/recursion.rs:12:5
+   |
+12 |     DefaultHandler(cs)
+   |     ^^^^^^^^^^^^^^ not found in this scope
+
+error[E0658]: msp430-interrupt ABI is experimental and subject to change
+  --> tests/ui/recursion.rs:10:1
+   |
+10 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
+   = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
+  --> tests/ui/recursion.rs:10:1
+   |
+10 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)

macros/tests/ui/recursion2.stderr

@@ -0,0 +1,29 @@
+error[E0425]: cannot find function `main` in this scope
+ --> tests/ui/recursion2.rs:7:5
+  |
+7 |     main()
+  |     ^^^^ not found in this scope
+
+error[E0425]: cannot find function, tuple struct or tuple variant `DefaultHandler` in this scope
+  --> tests/ui/recursion2.rs:12:5
+   |
+12 |     DefaultHandler()
+   |     ^^^^^^^^^^^^^^ not found in this scope
+
+error[E0658]: msp430-interrupt ABI is experimental and subject to change
+  --> tests/ui/recursion2.rs:10:1
+   |
+10 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
+   = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
+  --> tests/ui/recursion2.rs:10:1
+   |
+10 | #[interrupt]
+   | ^^^^^^^^^^^^
+   |
+   = note: this error originates in the attribute macro `interrupt` (in Nightly builds, run with -Z macro-backtrace for more info)