code review updates

Author: robamu

cortex-a-rt/src/lib.rs

@@ -123,7 +123,7 @@
 //!   `_asm_default_fiq_handler` but you can override it.
 //! * `_asm_undefined_handler` - a naked function to call when an Undefined
 //!   Exception occurs. Our linker script PROVIDEs a default function at
-//!   `_asm_defeault_undefined_handler` but you can override it.
+//!   `_asm_default_undefined_handler` but you can override it.
 //! * `_asm_prefetch_handler` - a naked function to call when an Prefetch
 //!   Exception occurs. Our linker script PROVIDEs a default function at
 //!   `_asm_default_prefetch_handler` but you can override it. The provided default
@@ -224,12 +224,13 @@ core::arch::global_asm!(
 );
 
 /// This macro expands to code for saving context on entry to an exception
-/// handler, ignoring FPU registers.
+/// handler.
 ///
 /// It should match `restore_context!`.
 ///
 /// On entry to this block, we assume that we are in exception context.
-macro_rules! save_context_ignore_fpu {
+#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
+macro_rules! save_context {
     () => {
         r#"
         // save preserved registers (and gives us some working area)
@@ -245,10 +246,11 @@ macro_rules! save_context_ignore_fpu {
 }
 
 /// This macro expands to code for restoring context on exit from an exception
-/// handler, ignoring FPU registers.
+/// handler.
 ///
 /// It should match `save_context!`.
-macro_rules! restore_context_ignore_fpu {
+#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
+macro_rules! restore_context {
     () => {
         r#"
         // restore alignment amount, and preserved register
@@ -261,30 +263,6 @@ macro_rules! restore_context_ignore_fpu {
     };
 }
 
-/// This macro expands to code for saving context on entry to an exception
-/// handler.
-///
-/// It should match `restore_context!`.
-///
-/// On entry to this block, we assume that we are in exception context.
-#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
-macro_rules! save_context {
-    () => {
-        save_context_ignore_fpu!()
-    };
-}
-
-/// This macro expands to code for restoring context on exit from an exception
-/// handler.
-///
-/// It should match `save_context!`.
-#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
-macro_rules! restore_context {
-    () => {
-        restore_context_ignore_fpu!()
-    };
-}
-
 /// This macro expands to code for saving context on entry to an exception
 /// handler.
 ///
@@ -463,14 +441,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {und_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _undefined_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!
@@ -488,14 +466,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {abt_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _prefetch_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!
@@ -513,14 +491,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {abt_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _abort_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!

cortex-r-rt/src/lib.rs

@@ -34,14 +34,13 @@
 //!
 //! ### Functions
 //!
-//! * `boot_core` - the `extern "C"` entry point to your application. The CPU ID
-//!   will be passed as the first argument to this function.
+//! * `kmain` - the `extern "C"` entry point to your application.
 //!
 //!   Expected prototype:
 //!
 //!   ```rust
 //!   #[unsafe(no_mangle)]
-//!   extern "C" fn boot_core(cpu_id: u32) -> !;
+//!   extern "C" fn kmain() -> !;
 //!   ```
 //!
 //! * `_svc_handler` - an `extern "C"` function to call when an SVC Exception
@@ -113,7 +112,7 @@
 //!   `_asm_default_fiq_handler` but you can override it.
 //! * `_asm_undefined_handler` - a naked function to call when an Undefined
 //!   Exception occurs. Our linker script PROVIDEs a default function at
-//!   `_asm_defeault_undefined_handler` but you can override it.
+//!   `_asm_default_undefined_handler` but you can override it.
 //! * `_asm_prefetch_handler` - a naked function to call when an Prefetch
 //!   Exception occurs. Our linker script PROVIDEs a default function at
 //!   `_asm_default_prefetch_handler` but you can override it. The provided default
@@ -217,12 +216,13 @@ core::arch::global_asm!(
 );
 
 /// This macro expands to code for saving context on entry to an exception
-/// handler, ignoring FPU registers.
+/// handler.
 ///
 /// It should match `restore_context!`.
 ///
 /// On entry to this block, we assume that we are in exception context.
-macro_rules! save_context_ignore_fpu {
+#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
+macro_rules! save_context {
     () => {
         r#"
         // save preserved registers (and gives us some working area)
@@ -238,10 +238,11 @@ macro_rules! save_context_ignore_fpu {
 }
 
 /// This macro expands to code for restoring context on exit from an exception
-/// handler, ignoring FPU registers.
+/// handler.
 ///
 /// It should match `save_context!`.
-macro_rules! restore_context_ignore_fpu {
+#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
+macro_rules! restore_context {
     () => {
         r#"
         // restore alignment amount, and preserved register
@@ -254,30 +255,6 @@ macro_rules! restore_context_ignore_fpu {
     };
 }
 
-/// This macro expands to code for saving context on entry to an exception
-/// handler.
-///
-/// It should match `restore_context!`.
-///
-/// On entry to this block, we assume that we are in exception context.
-#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
-macro_rules! save_context {
-    () => {
-        save_context_ignore_fpu!()
-    };
-}
-
-/// This macro expands to code for restoring context on exit from an exception
-/// handler.
-///
-/// It should match `save_context!`.
-#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
-macro_rules! restore_context {
-    () => {
-        restore_context_ignore_fpu!()
-    };
-}
-
 /// This macro expands to code for saving context on entry to an exception
 /// handler.
 ///
@@ -401,14 +378,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {und_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _undefined_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!
@@ -426,14 +403,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {abt_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _prefetch_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!
@@ -451,14 +428,14 @@ done:
         // state save from compiled code
         srsfd   sp!, {abt_mode}
     "#,
-    save_context_ignore_fpu!(),
+    save_context!(),
     r#"
         // Pass the faulting instruction address to the handler.
         mov r0, lr
         // call C handler
         bl      _abort_handler
     "#,
-    restore_context_ignore_fpu!(),
+    restore_context!(),
     r#"
         // Return to the failing instruction which is the recommended approach by ARM.
         rfefd   sp!

examples/mps3-an536/src/bin/svc.rs

@@ -30,7 +30,7 @@ pub fn main() -> ! {
 }
 
 /// This is our SVC exception handler
-#[unsafe(no_mangle)]
+#[no_mangle]
 unsafe extern "C" fn _svc_handler(arg: u32) {
     println!("In _svc_handler, with arg={:#06x}", arg);
     if arg == 0xABCDEF {

examples/versatileab/src/bin/svc.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
 }
 
 /// This is our SVC exception handler
-#[unsafe(no_mangle)]
+#[no_mangle]
 unsafe extern "C" fn _svc_handler(arg: u32) {
     println!("In _svc_handler, with arg={:#06x}", arg);
     if arg == 0xABCDEF {