Merge pull request #14698 from benpicco/core/bitarithm-msb_clz

core/bitarithm: use __builtin_clz() for bitarithm_msb()

core/bitarithm.c

@@ -23,11 +23,9 @@
 
 #include "bitarithm.h"
 
-unsigned bitarithm_msb(unsigned v)
+unsigned bitarith_msb_32bit_no_native_clz(unsigned v)
 {
     register unsigned r; /* result of log2(v) will go here */
-
-#if ARCH_32_BIT
     register unsigned shift;
 
     /* begin{code-style-ignore} */
@@ -37,13 +35,6 @@ unsigned bitarithm_msb(unsigned v)
     shift = (v > 0x3   ) << 1; v >>= shift; r |= shift;
                                             r |= (v >> 1);
     /* end{code-style-ignore} */
-#else
-    r = 0;
-    while (v >>= 1) { /* unroll for more speed... */
-        r++;
-    }
-
-#endif
 
     return r;
 }

core/include/bitarithm.h

@@ -102,7 +102,7 @@ extern "C" {
  *
  * Source: http://graphics.stanford.edu/~seander/bithacks.html#IntegerLogObvious
  */
-unsigned bitarithm_msb(unsigned v);
+static inline unsigned bitarithm_msb(unsigned v);
 
 /**
  * @brief   Returns the number of the lowest '1' bit in a value
@@ -136,8 +136,33 @@ static inline uint8_t bitarithm_bits_set_u32(uint32_t v)
 uint8_t bitarithm_bits_set_u32(uint32_t v);
 #endif
 
+/**
+ * @brief   Returns the number of the highest '1' bit in a value
+ *
+ *          Internal software implementation for 32 bit platforms,
+ *          use @see bitarithm_msb in application code.
+ * @param[in]   v   Input value
+ * @return          Bit Number
+ */
+unsigned bitarith_msb_32bit_no_native_clz(unsigned v);
+
 /* implementations */
 
+static inline unsigned bitarithm_msb(unsigned v)
+{
+#if defined(BITARITHM_HAS_CLZ)
+    return 8 * sizeof(v) - __builtin_clz(v) - 1;
+#elif ARCH_32_BIT
+    return bitarith_msb_32bit_no_native_clz(v);
+#else
+    unsigned r = 0;
+    while (v >>= 1) { /* unroll for more speed... */
+        ++r;
+    }
+    return r;
+#endif
+}
+
 static inline unsigned bitarithm_lsb(unsigned v)
 #if defined(BITARITHM_LSB_BUILTIN)
 {