Merge pull request #199 from bgamari/no-stack-check

bgamari · bgamari · commit 37bf74b95e2a · 2014-10-20T09:40:19.000-04:00
Use -C no-stack-check instead of #[no_stack_check]
diff --git a/apps/app_blink.rs b/apps/app_blink.rs
@@ -45,7 +45,6 @@ platformtree!(
   }
 )
 
-#[no_stack_check]
 fn run(args: &pt::run_args) {
   use zinc::hal::pin::GPIO;
   use zinc::hal::timer::Timer;
diff --git a/apps/app_blink_k20.rs b/apps/app_blink_k20.rs
@@ -26,7 +26,6 @@ pub fn wait(ticks: u32) {
 }
 
 #[no_mangle]
-#[no_stack_check]
 #[allow(unused_variable)]
 #[allow(dead_code)]
 pub unsafe fn main() {
diff --git a/apps/app_blink_k20_isr.rs b/apps/app_blink_k20_isr.rs
@@ -18,7 +18,6 @@ static mut i: u32 = 0;
 static mut global_on: u32 = 0;
 
 #[allow(dead_code)]
-#[no_stack_check]
 #[no_mangle]
 pub unsafe extern fn isr_systick() {
     i += 1;
@@ -29,7 +28,6 @@ pub unsafe extern fn isr_systick() {
 }
 
 #[no_mangle]
-#[no_stack_check]
 #[allow(dead_code)]
 pub fn main() {
   zinc::hal::mem_init::init_stack();
diff --git a/apps/app_blink_stm32f4.rs b/apps/app_blink_stm32f4.rs
@@ -6,7 +6,6 @@ extern crate core;
 extern crate zinc;
 
 #[no_mangle]
-#[no_stack_check]
 #[allow(unused_variable)]
 #[allow(dead_code)]
 pub unsafe fn main() {
diff --git a/apps/app_dht22.rs b/apps/app_dht22.rs
@@ -65,7 +65,6 @@ platformtree!(
 )
 
 #[zinc_task]
-#[no_stack_check]
 fn run(args: &pt::run_args) {
   use zinc::drivers::chario::CharIO;
   use zinc::hal::timer::Timer;
diff --git a/apps/app_empty.rs b/apps/app_empty.rs
@@ -26,7 +26,6 @@ platformtree!(
   }
 )
 
-#[no_stack_check]
 fn run() {
   unsafe { asm!("nop") }
 }
diff --git a/apps/app_uart.rs b/apps/app_uart.rs
@@ -57,7 +57,6 @@ platformtree!(
   }
 )
 
-#[no_stack_check]
 fn run(args: &pt::run_args) {
   use zinc::drivers::chario::CharIO;
   use zinc::hal::timer::Timer;
diff --git a/apps/old_app_mbed_lcd.rs b/apps/old_app_mbed_lcd.rs
@@ -55,7 +55,6 @@ static platform: Platform = Platform {
   },
 };
 
-#[no_stack_check]
 pub fn main() {
   platform.configuration.setup();
 
diff --git a/apps/old_app_sched.rs b/apps/old_app_sched.rs
@@ -73,7 +73,6 @@ fn main_task(arg: u32) {
   }
 }
 
-#[no_stack_check]
 pub fn main() {
   platform.configuration.setup();
   debug::setup(&platform.uart);
diff --git a/apps/old_app_systick.rs b/apps/old_app_systick.rs
@@ -28,7 +28,6 @@ static mut i: u32 = 0;
 static mut on: u32 = 0;
 
 #[inline(always)]
-#[no_stack_check]
 unsafe fn systick_handler() {
   i += 1;
   if i > 100 {
@@ -37,7 +36,6 @@ unsafe fn systick_handler() {
   }
 }
 
-#[no_stack_check]
 pub fn main() {
   platform.configuration.setup();
   systick::setup(systick::ten_ms().unwrap_or(480000));
diff --git a/src/zinc/hal/k20/uart.rs b/src/zinc/hal/k20/uart.rs
@@ -78,12 +78,10 @@ impl UART {
     uart
   }
 
-  #[no_stack_check]
   fn uart_clock(&self) -> u32 {
     48000000 // FIXME(bgamari): Use peripheral clocks
   }
 
-  #[no_stack_check]
   fn set_baud_rate(&self, baud_rate: u32) {
     let sbr: u32 = self.uart_clock() / 16 / baud_rate;
     let brfa: u32 = (2 * self.uart_clock() / baud_rate) % 32;
@@ -92,7 +90,6 @@ impl UART {
     (*self.reg).c4.set_brfa(brfa as u8);
   }
 
-  #[no_stack_check]
   fn set_mode(&self, word_len: reg::UART_c1_m, parity: uart::Parity,
               _stop_bits: StopBit) {
     let mut c1 = (*self.reg).c1.set_m(word_len);
diff --git a/src/zinc/hal/lpc17xx/platformtree.rs b/src/zinc/hal/lpc17xx/platformtree.rs
@@ -123,7 +123,6 @@ mod test {
 
       assert_equal_items(items[1].deref(), "
           #[no_mangle]
-          #[no_stack_check]
           #[allow(unused_variable)]
           pub unsafe fn main() {
             zinc::hal::mem_init::init_stack();
diff --git a/src/zinc/hal/lpc17xx/ssp.rs b/src/zinc/hal/lpc17xx/ssp.rs
@@ -201,7 +201,6 @@ impl SSP {
 }
 
 impl spi::SPI for SSP {
-  #[no_stack_check]
   fn write(&self, value: u8) {
     loop { if self.writeable() {
       break;
@@ -212,7 +211,6 @@ impl spi::SPI for SSP {
     } }
   }
 
-  #[no_stack_check]
   fn read(&self) -> u8 {
     loop {
       if self.readable() {
diff --git a/src/zinc/hal/lpc17xx/uart.rs b/src/zinc/hal/lpc17xx/uart.rs
@@ -155,12 +155,10 @@ impl UART {
     uart
   }
 
-  #[no_stack_check]
   fn uart_clock(&self) -> u32 {
     self.clock.frequency()
   }
 
-  #[no_stack_check]
   fn set_baud_rate(&self, baud_rate: u32) {
     self.reg.set_LCR(0b1000_0000); // enable divisor latch access
 
@@ -173,7 +171,6 @@ impl UART {
     self.reg.set_LCR(3);
   }
 
-  #[no_stack_check]
   fn set_mode(&self, word_len: WordLen, parity: uart::Parity, stop_bits: StopBit) {
     let lcr: u8 = (*(self.reg)).LCR() as u8;
     let computed_val: u8 = word_len as u8 | stop_bits as u8 | match parity {
diff --git a/src/zinc/hal/stm32f4/pin.rs b/src/zinc/hal/stm32f4/pin.rs
@@ -77,7 +77,6 @@ pub struct PinConf {
 
 impl PinConf {
   /// Setup the pin.
-  #[no_stack_check]
   #[inline(always)]
   pub fn setup(&self) {
     self.port.clock().enable();  // TODO(farcaller): should be done once per port
diff --git a/src/zinc/util/ioreg.rs b/src/zinc/util/ioreg.rs
@@ -29,7 +29,6 @@ macro_rules! ioreg_old(
 macro_rules! reg_r(
   ($t:ident, $ty:ty, $getter_name:ident, $reg:ident) => (
     impl $t {
-      #[no_stack_check]
       #[allow(dead_code,non_snake_case)]
       #[inline(always)]
       pub fn $getter_name(&self) -> $ty {
@@ -42,7 +41,6 @@ macro_rules! reg_r(
 macro_rules! reg_w(
   ($t:ident, $ty:ty, $setter_name:ident, $reg:ident) => (
     impl $t {
-      #[no_stack_check]
       #[allow(dead_code,non_snake_case)]
       #[inline(always)]
       pub fn $setter_name(&self, val: $ty) {
diff --git a/src/zinc/util/lang_items.rs b/src/zinc/util/lang_items.rs
@@ -17,22 +17,18 @@ use core::fmt::Arguments;
 
 #[cfg(not(test))]
 #[lang="stack_exhausted"]
-#[no_stack_check]
 extern fn stack_exhausted() {}
 
 #[cfg(not(test))]
 #[lang="eh_personality"]
-#[no_stack_check]
 extern fn eh_personality() {}
 
 #[cfg(not(test))]
 #[lang="begin_unwind"]
-#[no_stack_check]
 extern fn begin_unwind() {}
 
 #[cfg(not(test))]
 #[lang="fail_fmt"]
-#[no_stack_check]
 pub fn fail_fmt(_fmt: &Arguments, _file_line: &(&'static str, uint)) -> ! {
   loop { }
 }
diff --git a/support/rake.rb b/support/rake.rb
@@ -77,6 +77,7 @@ def compile_rust(n, h)
     flags += ' ' + :rustcflags_cross.in_env.join(' ') unless build_for_host
     flags += ' --test' if is_test
     flags += ' -g' if h[:debug]
+    flags += ' -C no-stack-check'
     flags += ' ' + more_flags
 
     if optimize

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ platformtree!(`
`45`	`45`	`}`
`46`	`46`	`)`
`47`	`47`
`48`		`-#[no_stack_check]`
`49`	`48`	`fn run(args: &pt::run_args) {`
`50`	`49`	`use zinc::hal::pin::GPIO;`
`51`	`50`	`use zinc::hal::timer::Timer;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ pub fn wait(ticks: u32) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#[no_mangle]`
`29`		`-#[no_stack_check]`
`30`	`29`	`#[allow(unused_variable)]`
`31`	`30`	`#[allow(dead_code)]`
`32`	`31`	`pub unsafe fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ platformtree!(`
`65`	`65`	`)`
`66`	`66`
`67`	`67`	`#[zinc_task]`
`68`		`-#[no_stack_check]`
`69`	`68`	`fn run(args: &pt::run_args) {`
`70`	`69`	`use zinc::drivers::chario::CharIO;`
`71`	`70`	`use zinc::hal::timer::Timer;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ platformtree!(`
`26`	`26`	`}`
`27`	`27`	`)`
`28`	`28`
`29`		`-#[no_stack_check]`
`30`	`29`	`fn run() {`
`31`	`30`	`unsafe { asm!("nop") }`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ platformtree!(`
`57`	`57`	`}`
`58`	`58`	`)`
`59`	`59`
`60`		`-#[no_stack_check]`
`61`	`60`	`fn run(args: &pt::run_args) {`
`62`	`61`	`use zinc::drivers::chario::CharIO;`
`63`	`62`	`use zinc::hal::timer::Timer;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ fn main_task(arg: u32) {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`-#[no_stack_check]`
`77`	`76`	`pub fn main() {`
`78`	`77`	`platform.configuration.setup();`
`79`	`78`	`debug::setup(&platform.uart);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ static mut i: u32 = 0;`
`28`	`28`	`static mut on: u32 = 0;`
`29`	`29`
`30`	`30`	`#[inline(always)]`
`31`		`-#[no_stack_check]`
`32`	`31`	`unsafe fn systick_handler() {`
`33`	`32`	`i += 1;`
`34`	`33`	`if i > 100 {`
`@@ -37,7 +36,6 @@ unsafe fn systick_handler() {`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
`40`		`-#[no_stack_check]`
`41`	`39`	`pub fn main() {`
`42`	`40`	`platform.configuration.setup();`
`43`	`41`	`systick::setup(systick::ten_ms().unwrap_or(480000));`