Code review updates

Author: robamu

README.md

@@ -20,7 +20,7 @@ There are currently three libraries here:
 * [cortex-a-rt](./cortex-a-rt/) - run-time library for Cortex-A CPUs (like [cortex-m-rt])
 * [arm-targets](./arm-targets/) - a helper library for your build.rs that sets various `--cfg` flags according to the current target
 
-There are also example programs for QEMU in the [examples](./-examples/) folder.
+There are also example programs for QEMU in the [examples](./examples/) folder.
 
 [cortex-m]: https://crates.io/crates/cortex-m
 [cortex-m-rt]: https://crates.io/crates/cortex-m-rt

cortex-a-rt/src/lib.rs

@@ -167,6 +167,24 @@ macro_rules! save_context {
     };
 }
 
+/// 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 {
+    () => {
+        r#"
+        // restore alignment amount, and preserved register
+        pop     {{r0, r12}}
+        // restore pre-alignment SP
+        add     sp, r0
+        // restore more preserved registers
+        pop     {{r0-r3}}
+        "#
+    };
+}
+
 /// This macro expands to code for saving context on entry to an exception
 /// handler.
 ///
@@ -199,14 +217,22 @@ macro_rules! save_context {
 /// handler.
 ///
 /// It should match `save_context!`.
-#[cfg(not(any(target_abi = "eabihf", feature = "eabi-fpu")))]
+#[cfg(all(
+    any(target_abi = "eabihf", feature = "eabi-fpu"),
+    not(feature = "vfp-dp")
+))]
 macro_rules! restore_context {
     () => {
         r#"
         // restore alignment amount, and preserved register
         pop     {{r0, r12}}
         // restore pre-alignment SP
         add     sp, r0
+        // pop FPU state
+        pop     {{r0-r1}}
+        vmsr    FPEXC, r1
+        vmsr    FPSCR, r0
+        vpop    {{d0-d7}}
         // restore more preserved registers
         pop     {{r0-r3}}
         "#
@@ -239,32 +265,6 @@ macro_rules! save_context {
     };
 }
 
-/// This macro expands to code for restoring context on exit from an exception
-/// handler.
-///
-/// It should match `save_context!`.
-#[cfg(all(
-    any(target_abi = "eabihf", feature = "eabi-fpu"),
-    not(feature = "vfp-dp")
-))]
-macro_rules! restore_context {
-    () => {
-        r#"
-        // restore alignment amount, and preserved register
-        pop     {{r0, r12}}
-        // restore pre-alignment SP
-        add     sp, r0
-        // pop FPU state
-        pop     {{r0-r1}}
-        vmsr    FPEXC, r1
-        vmsr    FPSCR, r0
-        vpop    {{d0-d7}}
-        // restore more preserved registers
-        pop     {{r0-r3}}
-        "#
-    };
-}
-
 /// This macro expands to code for restoring context on exit from an exception
 /// handler.
 ///

cortex-r-rt/src/lib.rs

@@ -157,6 +157,24 @@ macro_rules! save_context {
     };
 }
 
+/// 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 {
+    () => {
+        r#"
+        // restore alignment amount, and preserved register
+        pop     {{r0, r12}}
+        // restore pre-alignment SP
+        add     sp, r0
+        // restore more preserved registers
+        pop     {{r0-r3}}
+        "#
+    };
+}
+
 /// This macro expands to code for saving context on entry to an exception
 /// handler.
 ///
@@ -182,24 +200,6 @@ macro_rules! save_context {
     };
 }
 
-/// 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 {
-    () => {
-        r#"
-        // restore alignment amount, and preserved register
-        pop     {{r0, r12}}
-        // restore pre-alignment SP
-        add     sp, r0
-        // restore more preserved registers
-        pop     {{r0-r3}}
-        "#
-    };
-}
-
 /// This macro expands to code for restoring context on exit from an exception
 /// handler.
 ///