turn macros into attributes

Author: japaric

cortex-m-rt/.gitignore

@@ -1,4 +1,5 @@
 **/*.rs.bk
+.#*
 Cargo.lock
 bin/*.after
 bin/*.before

cortex-m-rt/Cargo.toml

@@ -12,6 +12,7 @@ version = "0.5.3"
 
 [dependencies]
 r0 = "0.2.1"
+cortex-m-rt-macros = { path = "macros", version = "0.1.0" }
 
 [dev-dependencies]
 panic-semihosting = "0.3.0"

cortex-m-rt/ci/script.sh

@@ -5,6 +5,8 @@ main() {
 
     cargo check --target $TARGET --features device
 
+    ( cd macros && cargo check && cargo test )
+
     local examples=(
         alignment
         minimal

cortex-m-rt/examples/alignment.rs

@@ -4,13 +4,12 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry)]
 extern crate cortex_m_rt as rt;
 extern crate panic_abort;
 
 use core::ptr;
 
-entry!(main);
+use rt::entry;
 
 static mut BSS1: u16 = 0;
 static mut BSS2: u8 = 0;
@@ -19,6 +18,7 @@ static mut DATA2: u16 = 1;
 static RODATA1: &[u8; 3] = b"012";
 static RODATA2: &[u8; 2] = b"34";
 
+#[entry]
 fn main() -> ! {
     unsafe {
         let _bss1 = ptr::read_volatile(&BSS1);

cortex-m-rt/examples/data_overflow.rs

@@ -5,13 +5,12 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry)]
 extern crate cortex_m_rt as rt;
 extern crate panic_abort;
 
 use core::ptr;
 
-entry!(main);
+use rt::entry;
 
 // This large static array uses most of .rodata
 static RODATA: [u8; 48*1024] = [1u8; 48*1024];
@@ -20,6 +19,7 @@ static RODATA: [u8; 48*1024] = [1u8; 48*1024];
 // without also overflowing RAM.
 static mut DATA: [u8; 16*1024] = [1u8; 16*1024];
 
+#[entry]
 fn main() -> ! {
     unsafe {
         let _bigdata = ptr::read_volatile(&RODATA as *const u8);

cortex-m-rt/examples/device.rs

@@ -5,13 +5,12 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry)]
 extern crate cortex_m_rt as rt;
 extern crate panic_semihosting;
 
-// the program entry point
-entry!(main);
+use rt::entry;
 
+#[entry]
 fn main() -> ! {
     loop {}
 }

cortex-m-rt/examples/minimal.rs

@@ -5,13 +5,13 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry)]
 extern crate cortex_m_rt as rt;
 extern crate panic_semihosting;
 
-// the program entry point
-entry!(main);
+use rt::entry;
 
+// the program entry point
+#[entry]
 fn main() -> ! {
     loop {}
 }

cortex-m-rt/examples/override-exception.rs

@@ -6,28 +6,23 @@
 #![no_std]
 
 extern crate cortex_m;
-#[macro_use(entry, exception)]
 extern crate cortex_m_rt as rt;
 extern crate panic_semihosting;
 
 use cortex_m::asm;
-use rt::ExceptionFrame;
-
-// the program entry point
-entry!(main);
+use rt::{entry, exception, ExceptionFrame};
 
+#[entry]
 fn main() -> ! {
     loop {}
 }
 
-exception!(*, default_handler);
-
+#[exception(DefaultHandler)]
 fn default_handler(_irqn: i16) {
     asm::bkpt();
 }
 
-exception!(HardFault, hard_fault);
-
+#[exception(HardFault)]
 fn hard_fault(_ef: &ExceptionFrame) -> ! {
     asm::bkpt();
 

cortex-m-rt/examples/pre_init.rs

@@ -4,19 +4,17 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry, pre_init)]
 extern crate cortex_m_rt as rt;
 extern crate panic_semihosting;
 
-pre_init!(disable_watchdog);
+use rt::{entry, pre_init};
 
+#[pre_init]
 unsafe fn disable_watchdog() {
     // Do what you need to disable the watchdog.
 }
 
-// the program entry point
-entry!(main);
-
+#[entry]
 fn main() -> ! {
     loop {}
 }

cortex-m-rt/examples/state.rs

@@ -5,20 +5,18 @@
 #![no_main]
 #![no_std]
 
-#[macro_use(entry, exception)]
 extern crate cortex_m_rt as rt;
 extern crate panic_semihosting;
 
-// the program entry point
-entry!(main);
+use rt::{entry, exception};
 
+#[entry]
 fn main() -> ! {
     loop {}
 }
 
 // exception handler with state
-exception!(SysTick, sys_tick, state: u32 = 0);
-
-fn sys_tick(state: &mut u32) {
-    *state += 1;
+#[exception(SysTick, static STATE: u32 = 0)]
+fn sys_tick() {
+    *STATE += 1;
 }