2.3.2

Corrected SST_Task_lock() for ARMv7-M and higher

Author: quantum-leaps

sst_c/ports/arm-cm/sst_port.c

@@ -162,15 +162,12 @@ SST_LockKey SST_Task_lock(SST_TaskPrio ceiling) {
     */
     uint32_t nvic_prio = ((0xFFU >> nvic_prio_shift) + 1U - ceiling)
                          << nvic_prio_shift;
-    SST_LockKey basepri_;
+    SST_LockKey basepri_; /* initialized in the following asm() instruction */
     __asm volatile ("mrs %0,BASEPRI" : "=r" (basepri_) :: );
     if (basepri_ > nvic_prio) { /* current priority lower than the ceiling? */
         __asm volatile ("cpsid i\n msr BASEPRI,%0\n cpsie i"
                         :: "r" (nvic_prio) : );
     }
-    else {
-        basepri_ = nvic_prio;
-    }
     return basepri_;
 #endif
 }

sst_cpp/ports/arm-cm/sst_port.cpp

@@ -165,15 +165,12 @@ LockKey Task::lock(TaskPrio ceiling) {
     //
     uint32_t nvic_prio = ((0xFFU >> nvic_prio_shift) + 1U - ceiling)
                          << nvic_prio_shift;
-    LockKey basepri_;
+    LockKey basepri_; // initialized in the following asm() instruction
     __asm volatile ("mrs %0,BASEPRI" : "=r" (basepri_) :: );
     if (basepri_ > nvic_prio) { // current priority lower than the ceiling?
         __asm volatile ("cpsid i\n msr BASEPRI,%0\n cpsie i"
                         :: "r" (nvic_prio) : );
     }
-    else {
-        basepri_ = nvic_prio;
-    }
     return basepri_;
 #endif
 }