Rename _bsr/_bsf to bsr/bsf

Now that these functions are behind _COSMO_SOURCE there's no reason for
having the ugly underscore anymore. To use these functions, you need to
pass -mcosmo to cosmocc.

Author: jart

dsp/scale/gyarados.c

@@ -202,8 +202,8 @@ void *Gyarados(long dyw, long dxw, int dst[dyw][dxw], long syw, long sxw,
       CHECK_LE(sxn, sxw);
       CHECK_LE(dyn, dyw);
       CHECK_LE(dxn, dxw);
-      CHECK_LT(_bsrl(syn) + _bsrl(sxn), 32);
-      CHECK_LT(_bsrl(dyn) + _bsrl(dxn), 32);
+      CHECK_LT(bsrl(syn) + bsrl(sxn), 32);
+      CHECK_LT(bsrl(dyn) + bsrl(dxn), 32);
       CHECK_LE(dyw, 0x7fff);
       CHECK_LE(dxw, 0x7fff);
       CHECK_LE(syw, 0x7fff);

libc/calls/fstat-nt.c

@@ -71,7 +71,7 @@ static textwindows long GetSizeOfReparsePoint(int64_t fh) {
       }
     }
     if (x >= 0200) {
-      z += _bsrl(tpenc(x)) >> 3;
+      z += bsrl(tpenc(x)) >> 3;
     }
     ++z;
   }

libc/calls/pledge-linux.c

@@ -1040,7 +1040,7 @@ static privileged char *FixCpy(char p[17], uint64_t x, int k) {
 }
 
 static privileged char *HexCpy(char p[17], uint64_t x) {
-  return FixCpy(p, x, ROUNDUP(x ? _bsrl(x) + 1 : 1, 4));
+  return FixCpy(p, x, ROUNDUP(x ? bsrl(x) + 1 : 1, 4));
 }
 
 static privileged int GetPid(void) {

libc/calls/sig.c

@@ -97,7 +97,7 @@ static textwindows int __sig_getter(atomic_ulong *sigs, sigset_t masked) {
   for (;;) {
     pending = atomic_load_explicit(sigs, memory_order_acquire);
     if ((deliverable = pending & ~masked)) {
-      sig = _bsfl(deliverable) + 1;
+      sig = bsfl(deliverable) + 1;
       bit = 1ull << (sig - 1);
       if (atomic_fetch_and_explicit(sigs, ~bit, memory_order_acq_rel) & bit) {
         return sig;

libc/fmt/formatbinary64.c

@@ -45,7 +45,7 @@ char *FormatBinary64(char p[hasatleast 67], uint64_t x, char z) {
       *p++ = '0';
       *p++ = 'b';
     }
-    i = PickGoodWidth(_bsrl(x));
+    i = PickGoodWidth(bsrl(x));
     do {
       b = 1;
       b <<= i;

libc/fmt/itoa64radix16.greg.c

@@ -22,5 +22,5 @@
 #include "libc/macros.internal.h"
 
 size_t uint64toarray_radix16(uint64_t x, char b[hasatleast 17]) {
-  return uint64toarray_fixed16(x, b, ROUNDUP(x ? _bsrl(x) + 1 : 1, 4));
+  return uint64toarray_fixed16(x, b, ROUNDUP(x ? bsrl(x) + 1 : 1, 4));
 }

libc/integral/cxx.inc

@@ -18,12 +18,14 @@
 #if 1
 template <bool _P, typename _T, typename _U>
 struct __cxx_choose_expr {
-  __cxx_choose_expr(_T _a, _U _b) : _value(_a) {}
+  __cxx_choose_expr(_T _a, _U _b) : _value(_a) {
+  }
   const _T _value;
 };
 template <typename _T, typename _U>
 struct __cxx_choose_expr<false, _T, _U> {
-  __cxx_choose_expr(_T _a, _U _b) : _value(_b) {}
+  __cxx_choose_expr(_T _a, _U _b) : _value(_b) {
+  }
   const _U _value;
 };
 #define __builtin_choose_expr(X, A, B) \
@@ -32,3 +34,8 @@ struct __cxx_choose_expr<false, _T, _U> {
 #define __builtin_choose_expr(X, A, B) ((X) ? (A) : (B))
 #endif
 #endif
+
+#ifdef __aarch64__
+/* todo jart whyyyy */
+#define _Float16 __fp16
+#endif

libc/intrin/bsf.c

@@ -22,7 +22,7 @@
  * Returns position of first bit set.
  *
  *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
- *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *       uint32 𝑥   bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)   bsr(𝑥) lzcnt(𝑥)
  *     0x00000000      wut       32        0      wut       32
  *     0x00000001        0        0        1        0       31
  *     0x80000001        0        0        1       31        0
@@ -35,7 +35,7 @@
  * @param 𝑥 is a 64-bit integer
  * @return number in range 0..63 or undefined if 𝑥 is 0
  */
-int(_bsfl)(long x) {
+int(bsfl)(long x) {
   unsigned l, r;
   x &= -x;
   l = x | x >> 32;
@@ -52,7 +52,7 @@ int(_bsfl)(long x) {
  * Returns position of first bit set.
  *
  *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
- *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *       uint32 𝑥   bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)   bsr(𝑥) lzcnt(𝑥)
  *     0x00000000      wut       32        0      wut       32
  *     0x00000001        0        0        1        0       31
  *     0x80000001        0        0        1       31        0
@@ -65,8 +65,8 @@ int(_bsfl)(long x) {
  * @param x is a 32-bit integer
  * @return number in range 0..31 or undefined if 𝑥 is 0
  */
-int(_bsf)(int x) {
-  return _bsf((unsigned)x);
+int(bsf)(int x) {
+  return bsf((unsigned)x);
 }
 
-__weak_reference(_bsfl, _bsfll);
+__weak_reference(bsfl, bsfll);

libc/intrin/bsf.h

@@ -1,16 +1,18 @@
+#ifdef _COSMO_SOURCE
 #ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_
 #define COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_
 COSMOPOLITAN_C_START_
 
-libcesque int _bsf(int) pureconst;
-libcesque int _bsfl(long) pureconst;
-libcesque int _bsfll(long long) pureconst;
+libcesque int bsf(int) pureconst;
+libcesque int bsfl(long) pureconst;
+libcesque int bsfll(long long) pureconst;
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#define _bsf(x)   __builtin_ctz(x)
-#define _bsfl(x)  __builtin_ctzl(x)
-#define _bsfll(x) __builtin_ctzll(x)
+#define bsf(x)   __builtin_ctz(x)
+#define bsfl(x)  __builtin_ctzl(x)
+#define bsfll(x) __builtin_ctzll(x)
 #endif
 
 COSMOPOLITAN_C_END_
 #endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_ */
+#endif /* _COSMO_SOURCE */

libc/intrin/bsr.c

@@ -23,7 +23,7 @@
  * Returns binary logarithm of 𝑥.
  *
  *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
- *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *       uint32 𝑥   bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)   bsr(𝑥) lzcnt(𝑥)
  *     0x00000000      wut       32        0      wut       32
  *     0x00000001        0        0        1        0       31
  *     0x80000001        0        0        1       31        0
@@ -36,7 +36,7 @@
  * @param x is a 32-bit integer
  * @return number in range 0..31 or undefined if 𝑥 is 0
  */
-int(_bsr)(int x) {
+int(bsr)(int x) {
   int r = 0;
   if(x & 0xFFFF0000u) { x >>= 16; r |= 16; }
   if(x & 0xFF00) { x >>= 8; r |= 8; }