Merge #312

312: Fix timing of asm-based delay implementation r=adamgreig a=jonas-schievink

Should fix https://github.com/rust-embedded/cortex-m/issues/236

I've also moved the cycle adjustment into the assembly implementation, since it seems more appropriate there (and this will be useful if we make `cortex-m-asm` its own crate).

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/asm/inline.rs b/asm/inline.rs
index 9150c9c..5e2fbc1 100644
--- a/asm/inline.rs
+++ b/asm/inline.rs
@@ -52,13 +52,16 @@ pub unsafe fn __cpsie() {
 
 #[inline(always)]
 pub unsafe fn __delay(cyc: u32) {
-    // Use local labels to avoid R_ARM_THM_JUMP8 relocations which fail on thumbv6m.
+    // The loop will normally take 3 to 4 CPU cycles per iteration, but superscalar cores
+    // (eg. Cortex-M7) can potentially do it in 2, so we use that as the lower bound, since delaying
+    // for more cycles is okay.
+    let real_cyc = cyc / 2;
     asm!(
+        // Use local labels to avoid R_ARM_THM_JUMP8 relocations which fail on thumbv6m.
         "1:",
-        "nop",
         "subs {}, #1",
         "bne 1b",
-        in(reg) cyc
+        in(reg) real_cyc
     );
 }