Fold LIBC_BITS into LIBC_INTRIN

Makefile

@@ -110,7 +110,6 @@ include libc/intrin/intrin.mk			# │  You can use the stack
 include libc/linux/linux.mk			# │  You can manipulate arrays
 include libc/tinymath/tinymath.mk		# │  You can issue raw system calls
 include third_party/compiler_rt/compiler_rt.mk	# │
-include libc/bits/bits.mk			# │
 include libc/str/str.mk				# │
 include third_party/xed/xed.mk			# │
 include third_party/zlib/zlib.mk		# │
@@ -201,7 +200,6 @@ include test/libc/nexgen32e/test.mk
 include test/libc/runtime/test.mk
 include test/libc/thread/test.mk
 include test/libc/sock/test.mk
-include test/libc/bits/test.mk
 include test/libc/str/test.mk
 include test/libc/log/test.mk
 include test/libc/unicode/test.mk
@@ -301,7 +299,6 @@ COSMOPOLITAN_OBJECTS =		\
 	LIBC_ALG		\
 	LIBC_MEM		\
 	THIRD_PARTY_DLMALLOC	\
-	LIBC_BITS		\
 	LIBC_RUNTIME		\
 	LIBC_ELF		\
 	LIBC_CALLS		\
@@ -331,7 +328,6 @@ COSMOPOLITAN_HEADERS =		\
 	APE			\
 	LIBC			\
 	LIBC_ALG		\
-	LIBC_BITS		\
 	LIBC_CALLS		\
 	LIBC_DNS		\
 	LIBC_ELF		\

ape/ape.mk

@@ -62,7 +62,7 @@ o/$(MODE)/ape/ape.lds:				\
 		ape/ape.lds			\
 		ape/macros.internal.h		\
 		ape/relocations.h		\
-		libc/bits/bits.h		\
+		libc/intrin/bits.h		\
 		libc/calls/struct/timespec.h	\
 		libc/dce.h			\
 		libc/elf/def.h			\

dsp/core/scalevolume.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"
 
 /**

dsp/core/unmulaw.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
 
 /**
  * Expands μ-Law coded to audio sample.

dsp/mpeg/mpeg1.c

@@ -32,7 +32,7 @@
 #include "dsp/mpeg/idct.h"
 #include "dsp/mpeg/mpeg.h"
 #include "dsp/mpeg/video.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"

dsp/tty/hidecursor.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
-#include "libc/bits/pushpop.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/dce.h"
 #include "libc/log/internal.h"
 #include "libc/log/log.h"

dsp/tty/ident.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"

dsp/tty/internal.h

@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_TTY_INTERNAL_H_
 #define COSMOPOLITAN_DSP_TTY_INTERNAL_H_
 #include "dsp/tty/ttyrgb.h"
-#include "libc/bits/xmmintrin.internal.h"
+#include "libc/intrin/xmmintrin.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 

dsp/tty/itoa8.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/itoa8.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
 #include "libc/str/str.h"
 
 struct Itoa8 kItoa8;

dsp/tty/quant.h

@@ -2,8 +2,8 @@
 #define DSP_TTY_QUANT_H_
 #include "dsp/tty/ttyrgb.h"
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/xmmintrin.internal.h"
+#include "libc/intrin/xmmintrin.internal.h"
 #include "libc/limits.h"
 #include "libc/str/str.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)

dsp/tty/rgb2ansi.c

@@ -19,7 +19,7 @@
 #include "dsp/core/core.h"
 #include "dsp/tty/quant.h"
 #include "libc/assert.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"

dsp/tty/rgb2ttyf2i.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
-#include "libc/bits/xmmintrin.internal.h"
+#include "libc/intrin/xmmintrin.internal.h"
 
 struct TtyRgb rgb2ttyf2i_(__m128 rgb) {
   __v4si i4;

dsp/tty/ttymove.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/itoa8.h"
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 

dsp/tty/ttyquant.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/internal.h"
 #include "dsp/tty/quant.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
 #include "libc/dce.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"

dsp/tty/ttyraster.c

@@ -22,8 +22,8 @@
 #include "dsp/tty/ttyrgb.h"
 #include "dsp/tty/windex.h"
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"

examples/auto-memory-safety-crash.c

@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/dce.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"

examples/auto-memory-safety-crash2.c

@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/dce.h"
 #include "libc/log/log.h"
 #include "libc/mem/mem.h"

examples/auto-memory-safety-crash3.c

@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/dce.h"
 #include "libc/log/log.h"
 #include "libc/mem/mem.h"

examples/cplusplus.cc

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 

examples/curl.c

@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"

examples/examples.mk

@@ -43,7 +43,6 @@ EXAMPLES_DIRECTDEPS =								\
 	DSP_SCALE								\
 	DSP_TTY									\
 	LIBC_ALG								\
-	LIBC_BITS								\
 	LIBC_CALLS								\
 	LIBC_DNS								\
 	LIBC_FMT								\

examples/getrandom.c

@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/errno.h"

examples/greenbean.c

@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/assert.h"
-#include "libc/bits/atomic.h"
+#include "libc/intrin/atomic.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/struct/sigset.h"

examples/ispell.c

@@ -10,7 +10,7 @@
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist.internal.h"
 #include "libc/alg/critbit0.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"

examples/lstime.c

@@ -9,7 +9,7 @@
 #endif
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/struct/stat.h"

examples/nesemu1.cc

@@ -12,8 +12,8 @@
 #include "dsp/tty/tty.h"
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/itimerval.h"
 #include "libc/calls/struct/winsize.h"

examples/ttyaudio.c

@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "dsp/core/core.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/fmt/nf32.h"

examples/unbourne.c

@@ -112,7 +112,7 @@
 
 #include "libc/alg/alg.h"
 #include "libc/assert.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/struct/rlimit.h"

libc/alg/arraylist.internal.h

@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_ALG_ARRAYLIST_H_
 #define COSMOPOLITAN_LIBC_ALG_ARRAYLIST_H_
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)

libc/alg/replacestr.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"

libc/alg/reverse.internal.h

@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_ALG_REVERSE_H_
 #define COSMOPOLITAN_LIBC_ALG_REVERSE_H_
-#include "libc/bits/xchg.internal.h"
+#include "libc/intrin/xchg.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**

libc/alg/shuffle.internal.h

@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
 #define COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
-#include "libc/bits/xchg.internal.h"
+#include "libc/intrin/xchg.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**

libc/atomic.h

@@ -11,7 +11,7 @@ COSMOPOLITAN_C_START_
  * we only define a portability macro for the syntax `_Atomic(T)`.
  *
  * @see libc/integral/c.inc
- * @see libc/bits/atomic.h
+ * @see libc/intrin/atomic.h
  */
 
 #define atomic_bool           _Atomic(_Bool)

libc/bits/asmflag.h

@@ -1,34 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_
-#define COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-/*
- * Constraints for virtual machine flags.
- * @note we beseech clang devs for flag constraints
- */
-#ifdef __GCC_ASM_FLAG_OUTPUTS__ /* GCC6+ CLANG10+ */
-#define CFLAG_CONSTRAINT  "=@ccc"
-#define CFLAG_ASM(OP)     OP
-#define ZFLAG_CONSTRAINT  "=@ccz"
-#define ZFLAG_ASM(OP)     OP
-#define OFLAG_CONSTRAINT  "=@cco"
-#define OFLAG_ASM(OP)     OP
-#define SFLAG_CONSTRAINT  "=@ccs"
-#define SFLAG_ASM(SP)     SP
-#define ABOVE_CONSTRAINT  "=@cca" /* i.e. !ZF && !CF */
-#define ABOVEFLAG_ASM(OP) OP
-#else
-#define CFLAG_CONSTRAINT  "=q"
-#define CFLAG_ASM(OP)     OP "\n\tsetc\t%b0"
-#define ZFLAG_CONSTRAINT  "=q"
-#define ZFLAG_ASM(OP)     OP "\n\tsetz\t%b0"
-#define OFLAG_CONSTRAINT  "=q"
-#define OFLAG_ASM(OP)     OP "\n\tseto\t%b0"
-#define SFLAG_CONSTRAINT  "=q"
-#define SFLAG_ASM(SP)     OP "\n\tsets\t%b0"
-#define ABOVE_CONSTRAINT  "=@cca"
-#define ABOVEFLAG_ASM(OP) OP "\n\tseta\t%b0"
-#endif
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_ASMFLAG_H_ */

libc/bits/bits.h

@@ -1,164 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_H_
-#define COSMOPOLITAN_LIBC_BITS_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-COSMOPOLITAN_C_START_
-
-#define CheckUnsigned(x) ((x) / !((typeof(x))(-1) < 0))
-
-/*───────────────────────────────────────────────────────────────────────────│─╗
-│ cosmopolitan § bits                                                      ─╬─│┼
-╚────────────────────────────────────────────────────────────────────────────│*/
-
-extern const uint8_t kReverseBits[256];
-
-uint32_t gray(uint32_t) pureconst;
-uint32_t ungray(uint32_t) pureconst;
-int bitreverse8(int) libcesque pureconst;
-int bitreverse16(int) libcesque pureconst;
-uint32_t bitreverse32(uint32_t) libcesque pureconst;
-uint64_t bitreverse64(uint64_t) libcesque pureconst;
-unsigned long roundup2pow(unsigned long) libcesque pureconst;
-unsigned long roundup2log(unsigned long) libcesque pureconst;
-unsigned long rounddown2pow(unsigned long) libcesque pureconst;
-unsigned long hamming(unsigned long, unsigned long) pureconst;
-unsigned bextra(const unsigned *, size_t, char);
-
-/*───────────────────────────────────────────────────────────────────────────│─╗
-│ cosmopolitan § bits » no assembly required                               ─╬─│┼
-╚────────────────────────────────────────────────────────────────────────────│*/
-
-#define BITREVERSE8(X) (kReverseBits[255 & (X)])
-#define BITREVERSE16(X) \
-  (kReverseBits[0x00FF & (X)] << 8 | kReverseBits[(0xFF00 & (X)) >> 8])
-
-#ifdef __STRICT_ANSI__
-#define READ16LE(S) ((255 & (S)[1]) << 8 | (255 & (S)[0]))
-#define READ16BE(S) ((255 & (S)[0]) << 8 | (255 & (S)[1]))
-#define READ32LE(S)                                                    \
-  ((uint32_t)(255 & (S)[3]) << 030 | (uint32_t)(255 & (S)[2]) << 020 | \
-   (uint32_t)(255 & (S)[1]) << 010 | (uint32_t)(255 & (S)[0]) << 000)
-#define READ32BE(S)                                                    \
-  ((uint32_t)(255 & (S)[0]) << 030 | (uint32_t)(255 & (S)[1]) << 020 | \
-   (uint32_t)(255 & (S)[2]) << 010 | (uint32_t)(255 & (S)[3]) << 000)
-#define READ64LE(S)                                                    \
-  ((uint64_t)(255 & (S)[7]) << 070 | (uint64_t)(255 & (S)[6]) << 060 | \
-   (uint64_t)(255 & (S)[5]) << 050 | (uint64_t)(255 & (S)[4]) << 040 | \
-   (uint64_t)(255 & (S)[3]) << 030 | (uint64_t)(255 & (S)[2]) << 020 | \
-   (uint64_t)(255 & (S)[1]) << 010 | (uint64_t)(255 & (S)[0]) << 000)
-#define READ64BE(S)                                                    \
-  ((uint64_t)(255 & (S)[0]) << 070 | (uint64_t)(255 & (S)[1]) << 060 | \
-   (uint64_t)(255 & (S)[2]) << 050 | (uint64_t)(255 & (S)[3]) << 040 | \
-   (uint64_t)(255 & (S)[4]) << 030 | (uint64_t)(255 & (S)[5]) << 020 | \
-   (uint64_t)(255 & (S)[6]) << 010 | (uint64_t)(255 & (S)[7]) << 000)
-#else /* gcc needs help knowing above are mov if s isn't a variable */
-#define READ16LE(S)                            \
-  ({                                           \
-    const uint8_t *Ptr = (const uint8_t *)(S); \
-    Ptr[1] << 8 | Ptr[0];                      \
-  })
-#define READ16BE(S)                            \
-  ({                                           \
-    const uint8_t *Ptr = (const uint8_t *)(S); \
-    Ptr[0] << 8 | Ptr[1];                      \
-  })
-#define READ32LE(S)                                      \
-  ({                                                     \
-    const uint8_t *Ptr = (const uint8_t *)(S);           \
-    ((uint32_t)Ptr[3] << 030 | (uint32_t)Ptr[2] << 020 | \
-     (uint32_t)Ptr[1] << 010 | (uint32_t)Ptr[0] << 000); \
-  })
-#define READ32BE(S)                                      \
-  ({                                                     \
-    const uint8_t *Ptr = (const uint8_t *)(S);           \
-    ((uint32_t)Ptr[0] << 030 | (uint32_t)Ptr[1] << 020 | \
-     (uint32_t)Ptr[2] << 010 | (uint32_t)Ptr[3] << 000); \
-  })
-#define READ64LE(S)                                      \
-  ({                                                     \
-    const uint8_t *Ptr = (const uint8_t *)(S);           \
-    ((uint64_t)Ptr[7] << 070 | (uint64_t)Ptr[6] << 060 | \
-     (uint64_t)Ptr[5] << 050 | (uint64_t)Ptr[4] << 040 | \
-     (uint64_t)Ptr[3] << 030 | (uint64_t)Ptr[2] << 020 | \
-     (uint64_t)Ptr[1] << 010 | (uint64_t)Ptr[0] << 000); \
-  })
-#define READ64BE(S)                                      \
-  ({                                                     \
-    const uint8_t *Ptr = (const uint8_t *)(S);           \
-    ((uint64_t)Ptr[0] << 070 | (uint64_t)Ptr[1] << 060 | \
-     (uint64_t)Ptr[2] << 050 | (uint64_t)Ptr[3] << 040 | \
-     (uint64_t)Ptr[4] << 030 | (uint64_t)Ptr[5] << 020 | \
-     (uint64_t)Ptr[6] << 010 | (uint64_t)Ptr[7] << 000); \
-  })
-#endif
-
-#define WRITE16LE(P, V)                        \
-  ((P)[0] = (0x00000000000000FF & (V)) >> 000, \
-   (P)[1] = (0x000000000000FF00 & (V)) >> 010, (P) + 2)
-#define WRITE16BE(P, V)                        \
-  ((P)[0] = (0x000000000000FF00 & (V)) >> 010, \
-   (P)[1] = (0x00000000000000FF & (V)) >> 000, (P) + 2)
-#define WRITE32LE(P, V)                        \
-  ((P)[0] = (0x00000000000000FF & (V)) >> 000, \
-   (P)[1] = (0x000000000000FF00 & (V)) >> 010, \
-   (P)[2] = (0x0000000000FF0000 & (V)) >> 020, \
-   (P)[3] = (0x00000000FF000000 & (V)) >> 030, (P) + 4)
-#define WRITE32BE(P, V)                        \
-  ((P)[0] = (0x00000000FF000000 & (V)) >> 030, \
-   (P)[1] = (0x0000000000FF0000 & (V)) >> 020, \
-   (P)[2] = (0x000000000000FF00 & (V)) >> 010, \
-   (P)[3] = (0x00000000000000FF & (V)) >> 000, (P) + 4)
-#define WRITE64LE(P, V)                        \
-  ((P)[0] = (0x00000000000000FF & (V)) >> 000, \
-   (P)[1] = (0x000000000000FF00 & (V)) >> 010, \
-   (P)[2] = (0x0000000000FF0000 & (V)) >> 020, \
-   (P)[3] = (0x00000000FF000000 & (V)) >> 030, \
-   (P)[4] = (0x000000FF00000000 & (V)) >> 040, \
-   (P)[5] = (0x0000FF0000000000 & (V)) >> 050, \
-   (P)[6] = (0x00FF000000000000 & (V)) >> 060, \
-   (P)[7] = (0xFF00000000000000 & (V)) >> 070, (P) + 8)
-#define WRITE64BE(P, V)                        \
-  ((P)[0] = (0xFF00000000000000 & (V)) >> 070, \
-   (P)[1] = (0x00FF000000000000 & (V)) >> 060, \
-   (P)[2] = (0x0000FF0000000000 & (V)) >> 050, \
-   (P)[3] = (0x000000FF00000000 & (V)) >> 040, \
-   (P)[4] = (0x00000000FF000000 & (V)) >> 030, \
-   (P)[5] = (0x0000000000FF0000 & (V)) >> 020, \
-   (P)[6] = (0x000000000000FF00 & (V)) >> 010, \
-   (P)[7] = (0x00000000000000FF & (V)) >> 000, (P) + 8)
-
-/*───────────────────────────────────────────────────────────────────────────│─╗
-│ cosmopolitan § bits » some assembly required                             ─╬─│┼
-╚────────────────────────────────────────────────────────────────────────────│*/
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-
-#define lockinc(MEM) __ArithmeticOp1("lock inc", MEM)
-#define lockdec(MEM) __ArithmeticOp1("lock dec", MEM)
-#define locknot(MEM) __ArithmeticOp1("lock not", MEM)
-#define lockneg(MEM) __ArithmeticOp1("lock neg", MEM)
-
-#define lockaddeq(MEM, VAL) __ArithmeticOp2("lock add", VAL, MEM)
-#define locksubeq(MEM, VAL) __ArithmeticOp2("lock sub", VAL, MEM)
-#define lockxoreq(MEM, VAL) __ArithmeticOp2("lock xor", VAL, MEM)
-#define lockandeq(MEM, VAL) __ArithmeticOp2("lock and", VAL, MEM)
-#define lockoreq(MEM, VAL)  __ArithmeticOp2("lock or", VAL, MEM)
-
-/*───────────────────────────────────────────────────────────────────────────│─╗
-│ cosmopolitan § bits » implementation details                             ─╬─│┼
-╚────────────────────────────────────────────────────────────────────────────│*/
-
-#define __ArithmeticOp1(OP, MEM)                               \
-  ({                                                           \
-    asm(OP "%z0\t%0" : "+m"(*(MEM)) : /* no inputs */ : "cc"); \
-    MEM;                                                       \
-  })
-
-#define __ArithmeticOp2(OP, VAL, MEM)                          \
-  ({                                                           \
-    asm(OP "%z0\t%1,%0" : "+m,m"(*(MEM)) : "i,r"(VAL) : "cc"); \
-    MEM;                                                       \
-  })
-
-#endif /* __GNUC__ && !__STRICT_ANSI__ */
-COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_H_ */

libc/bits/bits.mk

@@ -1,50 +0,0 @@
-#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
-
-PKGS += LIBC_BITS
-
-LIBC_BITS_ARTIFACTS += LIBC_BITS_A
-LIBC_BITS = $(LIBC_BITS_A_DEPS) $(LIBC_BITS_A)
-LIBC_BITS_A = o/$(MODE)/libc/bits/bits.a
-LIBC_BITS_A_FILES := $(wildcard libc/bits/*)
-LIBC_BITS_A_HDRS = $(filter %.h,$(LIBC_BITS_A_FILES))
-LIBC_BITS_A_SRCS_S = $(filter %.S,$(LIBC_BITS_A_FILES))
-LIBC_BITS_A_SRCS_C = $(filter %.c,$(LIBC_BITS_A_FILES))
-
-LIBC_BITS_A_SRCS =				\
-	$(LIBC_BITS_A_SRCS_S)			\
-	$(LIBC_BITS_A_SRCS_C)
-
-LIBC_BITS_A_OBJS =				\
-	$(LIBC_BITS_A_SRCS_S:%.S=o/$(MODE)/%.o)	\
-	$(LIBC_BITS_A_SRCS_C:%.c=o/$(MODE)/%.o)
-
-LIBC_BITS_A_CHECKS =				\
-	$(LIBC_BITS_A).pkg			\
-	$(LIBC_BITS_A_HDRS:%=o/$(MODE)/%.ok)
-
-LIBC_BITS_A_DIRECTDEPS =			\
-	LIBC_STUBS				\
-	LIBC_INTRIN				\
-	LIBC_NEXGEN32E
-
-LIBC_BITS_A_DEPS :=				\
-	$(call uniq,$(foreach x,$(LIBC_BITS_A_DIRECTDEPS),$($(x))))
-
-$(LIBC_BITS_A):	libc/bits/			\
-		$(LIBC_BITS_A).pkg		\
-		$(LIBC_BITS_A_OBJS)
-
-$(LIBC_BITS_A).pkg:				\
-		$(LIBC_BITS_A_OBJS)		\
-		$(foreach x,$(LIBC_BITS_A_DIRECTDEPS),$($(x)_A).pkg)
-
-LIBC_BITS_LIBS = $(foreach x,$(LIBC_BITS_ARTIFACTS),$($(x)))
-LIBC_BITS_SRCS = $(foreach x,$(LIBC_BITS_ARTIFACTS),$($(x)_SRCS))
-LIBC_BITS_HDRS = $(foreach x,$(LIBC_BITS_ARTIFACTS),$($(x)_HDRS))
-LIBC_BITS_CHECKS = $(foreach x,$(LIBC_BITS_ARTIFACTS),$($(x)_CHECKS))
-LIBC_BITS_OBJS = $(foreach x,$(LIBC_BITS_ARTIFACTS),$($(x)_OBJS))
-$(LIBC_BITS_OBJS): $(BUILD_FILES) libc/bits/bits.mk
-
-.PHONY: o/$(MODE)/libc/bits
-o/$(MODE)/libc/bits: $(LIBC_BITS_CHECKS)

libc/bits/bswap.h

@@ -1,18 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_BSWAP_H_
-#define COSMOPOLITAN_LIBC_BITS_BSWAP_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-COSMOPOLITAN_C_START_
-
-uint16_t bswap_16(uint16_t) pureconst;
-uint32_t bswap_32(uint32_t) pureconst;
-uint32_t bswap_64(uint32_t) pureconst;
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#define bswap_16(x) __builtin_bswap16(x)
-#define bswap_32(x) __builtin_bswap32(x)
-#define bswap_64(x) __builtin_bswap64(x)
-#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */
-
-COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_BSWAP_H_ */

libc/bits/likely.h

@@ -1,21 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_LIKELY_H_
-#define COSMOPOLITAN_LIBC_BITS_LIKELY_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-#define LIKELY(x)   __builtin_expect(!!(x), 1)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-
-#if __GNUC__ + 0 >= 9 && !defined(__chibicc__)
-#define VERY_LIKELY(x) __builtin_expect_with_probability(!!(x), 1, 0.999)
-#else
-#define VERY_LIKELY(x) LIKELY(x)
-#endif
-
-#if __GNUC__ + 0 >= 9 && !defined(__chibicc__)
-#define VERY_UNLIKELY(x) __builtin_expect_with_probability(!!(x), 0, 0.999)
-#else
-#define VERY_UNLIKELY(x) UNLIKELY(x)
-#endif
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_LIKELY_H_ */

libc/bits/midpoint.h

@@ -1,32 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_MIDPOINT_H_
-#define COSMOPOLITAN_LIBC_BITS_MIDPOINT_H_
-#include "libc/assert.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && defined(__x86__)
-/**
- * Computes `(a + b) / 2` assuming unsigned.
- *
- * This implementation is the fastest on AMD Zen architecture.
- */
-#define _midpoint(a, b)         \
-  ({                            \
-    typeof((a) + (b)) a_ = (a); \
-    typeof(a_) b_ = (b);        \
-    assert(a_ >= 0);            \
-    assert(b_ >= 0);            \
-    asm("add\t%1,%0\n\t"        \
-        "rcr\t%0"               \
-        : "+r"(a_)              \
-        : "r"(b_));             \
-    a_;                         \
-  })
-#else
-/**
- * Computes `(a + b) / 2` assuming unsigned.
- */
-#define _midpoint(a, b) (((a) & (b)) + ((a) ^ (b)) / 2)
-#endif /* __GNUC__ && !__STRICT_ANSI__ && x86 */
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_MIDPOINT_H_ */

libc/bits/safemacros.internal.h

@@ -1,71 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_
-#define COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_
-#include "libc/macros.internal.h"
-#include "libc/runtime/runtime.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-COSMOPOLITAN_C_START_
-
-#define min(x, y)              \
-  ({                           \
-    autotype(x) MinX = (x);    \
-    autotype(y) MinY = (y);    \
-    MinX < MinY ? MinX : MinY; \
-  })
-
-#define max(x, y)              \
-  ({                           \
-    autotype(x) MaxX = (x);    \
-    autotype(y) MaxY = (y);    \
-    MaxX > MaxY ? MaxX : MaxY; \
-  })
-
-#define roundup(x, k)            \
-  ({                             \
-    autotype(x) RoundupX = (x);  \
-    autotype(k) RoundupK = (k);  \
-    ROUNDUP(RoundupX, RoundupK); \
-  })
-
-#define rounddown(x, k)                \
-  ({                                   \
-    autotype(x) RounddownX = (x);      \
-    autotype(k) RounddownK = (k);      \
-    ROUNDDOWN(RounddownX, RounddownK); \
-  })
-
-#define isempty(s)              \
-  ({                            \
-    autotype(s) IsEmptyS = (s); \
-    !IsEmptyS || !(*IsEmptyS);  \
-  })
-
-#define nulltoempty(s)                \
-  ({                                  \
-    autotype(s) NullToEmptyS = (s);   \
-    NullToEmptyS ? NullToEmptyS : ""; \
-  })
-
-#define firstnonnull(a, b)                         \
-  ({                                               \
-    autotype(a) FirstNonNullA = (a);               \
-    autotype(a) FirstNonNullB = (b);               \
-    if (!FirstNonNullA && !FirstNonNullB) abort(); \
-    FirstNonNullA ? FirstNonNullA : FirstNonNullB; \
-  })
-
-#define emptytonull(s)                                      \
-  ({                                                        \
-    autotype(s) EmptyToNullS = (s);                         \
-    EmptyToNullS && !(*EmptyToNullS) ? NULL : EmptyToNullS; \
-  })
-
-#define unsignedsubtract(a, b)                                 \
-  ({                                                           \
-    uint64_t UnsubA = (a);                                     \
-    uint64_t UnsubB = (b);                                     \
-    UnsubA >= UnsubB ? UnsubA - UnsubB : ~UnsubB + UnsubA + 1; \
-  })
-
-COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ */

libc/bits/weaken.h

@@ -1,28 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_WEAKEN_H_
-#define COSMOPOLITAN_LIBC_BITS_WEAKEN_H_
-#include "libc/bits/ezlea.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-#ifndef __STRICT_ANSI__
-
-#define weaken(symbol) ((const typeof(&(symbol)))weakaddr(#symbol))
-
-#define strongaddr(symbolstr)                \
-  ({                                         \
-    intptr_t waddr;                          \
-    asm(ezlea(symbolstr) "0" : "=r"(waddr)); \
-    waddr;                                   \
-  })
-
-#define weakaddr(symbolstr)                                             \
-  ({                                                                    \
-    intptr_t waddr;                                                     \
-    asm(".weak\t" symbolstr "\n\t" ezlea(symbolstr) "0" : "=r"(waddr)); \
-    waddr;                                                              \
-  })
-
-#else
-#define weaken(symbol)      symbol
-#define weakaddr(symbolstr) &(symbolstr)
-#endif /* __STRICT_ANSI__ */
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_WEAKEN_H_ */

libc/bits/xchg.internal.h

@@ -1,25 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_BITS_XCHG_H_
-#define COSMOPOLITAN_LIBC_BITS_XCHG_H_
-#include "libc/str/str.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-/**
- * Exchanges *MEMORY into *LOCALVAR.
- *
- * @return *MEMORY
- * @see lockcmpxchg()
- * todo(jart): what's the point of this?
- */
-#define xchg(MEMORY, LOCALVAR)              \
-  ({                                        \
-    autotype(MEMORY) Memory = (MEMORY);     \
-    typeof(Memory) LocalVar = (LOCALVAR);   \
-    typeof(*Memory) Temp;                   \
-    memcpy(&Temp, Memory, sizeof(Temp));    \
-    memcpy(Memory, LocalVar, sizeof(Temp)); \
-    memcpy(LocalVar, &Temp, sizeof(Temp));  \
-    Temp;                                   \
-  })
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_BITS_XCHG_H_ */

libc/calls/asan.internal.h

@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_ASAN_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_ASAN_INTERNAL_H_
-#include "libc/bits/asmflag.h"
+#include "libc/intrin/asmflag.h"
 #include "libc/calls/struct/timespec.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_

libc/calls/clock_gettime-mono.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
 #include "libc/calls/clock_gettime.internal.h"
 #include "libc/intrin/spinlock.h"
 #include "libc/nexgen32e/rdtsc.h"

libc/calls/clock_gettime.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/asmflag.h"
+#include "libc/intrin/asmflag.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/asan.internal.h"
 #include "libc/calls/clock_gettime.internal.h"
 #include "libc/calls/internal.h"

libc/calls/close.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/commandv.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/dce.h"

libc/calls/directmap.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/errno.h"

libc/calls/dup-nt.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"

libc/calls/execve-nt.greg.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #define ShouldUseMsabiAttribute() 1
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/ntspawn.h"

libc/calls/execve-sysv.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"

libc/calls/execve.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/pledge.h"
 #include "libc/calls/pledge.internal.h"

libc/calls/faccessat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"

libc/calls/fchmodat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"

libc/calls/fchownat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"

libc/calls/fcntl.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/fileexists.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/struct/metastat.internal.h"

libc/calls/fstat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/fstatat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/getcpucount.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/popcnt.h"
+#include "libc/intrin/popcnt.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/dce.h"

libc/calls/getcwd.greg.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/state.internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/getfiledescriptorsize.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/getttysize.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
 #include "libc/fmt/conv.h"

libc/calls/interrupts-nt.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"

libc/calls/ioctl_default.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/syscall-sysv.internal.h"

libc/calls/ioctl_siocgifconf-nt.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/intrin/cmpxchg.h"
 #include "libc/mem/mem.h"

libc/calls/ioctl_siocgifconf.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"

libc/calls/ioctl_tcsets.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/strace.internal.h"

libc/calls/ioctl_tiocgwinsz-nt.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/isdirectory.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/struct/metastat.internal.h"

libc/calls/isregularfile.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/struct/metastat.internal.h"

libc/calls/issymlink.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/struct/metastat.internal.h"

libc/calls/kntprioritycombos.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/kntprioritycombos.internal.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"

libc/calls/linkat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"

libc/calls/lseek.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/memtrack.greg.c

@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/dce.h"

libc/calls/mkdirat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"

libc/calls/mkntenvblock.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
 #include "libc/calls/ntspawn.h"
 #include "libc/fmt/conv.h"
 #include "libc/intrin/kprintf.h"

libc/calls/mremap-sysv.greg.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/asmflag.h"
+#include "libc/intrin/asmflag.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/sysv/consts/map.h"

libc/calls/now.c

@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/clock_gettime.internal.h"
 #include "libc/calls/internal.h"

libc/calls/ntaccesscheck.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"

libc/calls/ntspawn.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/pushpop.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/calls/ntspawn.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"

libc/calls/oldbench.c

@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/initializer.internal.h"
+#include "libc/intrin/initializer.internal.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/state.internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/openat-metal.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/metalfile.internal.h"
 #include "libc/mem/mem.h"

libc/calls/openat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/pledge-linux.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/pledge.internal.h"
 #include "libc/calls/struct/bpf.h"

libc/calls/poll-metal.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/nexgen32e/rdtsc.h"
 #include "libc/nexgen32e/uart.internal.h"

libc/calls/poll-nt.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"

libc/calls/poll.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/dce.h"

libc/calls/pread.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/preadv.c

@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/pwritev.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/read.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/readlinkat.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"

libc/calls/readv-nt.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/syscall_fd.internal.h"

libc/calls/readv.c

@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/likely.h"
+#include "libc/intrin/likely.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/strace.internal.h"

libc/calls/realpath.c

@@ -26,9 +26,9 @@
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/bits.h"
+#include "libc/intrin/bits.h"
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/errno.h"

libc/calls/renameat.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/strace.internal.h"
 #include "libc/calls/syscall-nt.internal.h"

libc/calls/reservefd.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/weaken.h"
+#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"

libc/calls/sched_setaffinity.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.internal.h"
+#include "libc/intrin/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/sched-sysv.internal.h"
 #include "libc/calls/strace.internal.h"