Pay off more technical debt

This makes breaking changes to add underscores to many non-standard
function names provided by the c library. MODE=tiny is now tinier and
we now use smaller locks that are better for tiny apps in this mode.
Some headers have been renamed to be in the same folder as the build
package, so it'll be easier to know which build dependency is needed.
Certain old misguided interfaces have been removed. Intel intrinsics
headers are now listed in libc/isystem (but not in the amalgamation)
to help further improve open source compatibility. Header complexity
has also been reduced. Lastly, more shell scripts are now available.

Compared to 6f7d0cb1c3, some tiny corrections were made in libc/intrin/g_fds.c and libc/zipos/open.c including double semi colons and incorrect indentation for existing vista changes that were manually pulled from this commit previously.

libc/intrin/_getauxval.c

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

libc/intrin/_getauxval.internal.h

@@ -0,0 +1,15 @@
+#ifndef COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_INTERNAL_H_
+#define COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_INTERNAL_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+struct AuxiliaryValue {
+  unsigned long value;
+  bool isfound;
+};
+
+struct AuxiliaryValue _getauxval(unsigned long);
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_INTRIN_GETAUXVAL_INTERNAL_H_ */

libc/intrin/arememoryintervalsok.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/strace.internal.h"
+#include "libc/intrin/strace.internal.h"
 #include "libc/runtime/memtrack.internal.h"
 
 noasan bool AreMemoryIntervalsOk(const struct MemoryIntervals *mm) {

libc/intrin/asan.c

@@ -19,7 +19,6 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/strace.internal.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"
 #include "libc/intrin/asan.internal.h"
@@ -29,6 +28,8 @@
 #include "libc/intrin/likely.h"
 #include "libc/intrin/lockcmpxchg.h"
 #include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/tpenc.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/internal.h"
@@ -49,7 +50,6 @@
 #include "libc/runtime/stack.h"
 #include "libc/runtime/symbols.internal.h"
 #include "libc/str/str.h"
-#include "libc/str/tpenc.h"
 #include "libc/sysv/consts/auxv.h"
 #include "libc/sysv/consts/map.h"
 #include "libc/sysv/consts/nr.h"
@@ -108,16 +108,16 @@ STATIC_YOINK("_init_asan");
  *     movq (%addr),%dst
  */
 
-#define HOOK(HOOK, IMPL)    \
-  do {                      \
-    if (weaken(HOOK)) {     \
-      *weaken(HOOK) = IMPL; \
-    }                       \
+#define HOOK(HOOK, IMPL)     \
+  do {                       \
+    if (_weaken(HOOK)) {     \
+      *_weaken(HOOK) = IMPL; \
+    }                        \
   } while (0)
 
 #define REQUIRE(FUNC)                           \
   do {                                          \
-    if (!weaken(FUNC)) {                        \
+    if (!_weaken(FUNC)) {                       \
       kprintf("error: asan needs %s\n", #FUNC); \
       __asan_die()();                           \
       __asan_unreachable();                     \
@@ -170,6 +170,7 @@ struct ReportOriginHeap {
   int z;
 };
 
+static char __asan_bigbuf[FRAMESIZE];
 static int __asan_noreentry;
 static pthread_spinlock_t __asan_lock;
 static struct AsanMorgue __asan_morgue;
@@ -195,7 +196,7 @@ static uint64_t __asan_roundup2pow(uint64_t x) {
 
 static char *__asan_utf8cpy(char *p, unsigned c) {
   uint64_t z;
-  z = tpenc(c);
+  z = _tpenc(c);
   do *p++ = z;
   while ((z >>= 8));
   return p;
@@ -350,13 +351,12 @@ static void __asan_exit(void) {
   kprintf("your asan runtime needs\n"
           "\tSTATIC_YOINK(\"__die\");\n"
           "in order to show you backtraces\n");
-  __restorewintty();
-  _Exit(99);
+  _Exitr(99);
 }
 
 dontdiscard static __asan_die_f *__asan_die(void) {
-  if (weaken(__die)) {
-    return weaken(__die);
+  if (_weaken(__die)) {
+    return _weaken(__die);
   } else {
     return __asan_exit;
   }
@@ -403,7 +403,7 @@ static bool __asan_is_mapped(int x) {
   bool res;
   struct MemoryIntervals *m;
   __mmi_lock();
-  m = weaken(_mmi);
+  m = _weaken(_mmi);
   i = FindMemoryInterval(m, x);
   res = i < m->i && x >= m->p[i].x;
   __mmi_unlock();
@@ -668,8 +668,8 @@ static void __asan_report_memory_origin_image(intptr_t a, int z) {
   unsigned l, m, r, n, k;
   struct SymbolTable *st;
   kprintf("\nthe memory belongs to image symbols\n");
-  if (weaken(GetSymbolTable)) {
-    if ((st = weaken(GetSymbolTable)())) {
+  if (_weaken(GetSymbolTable)) {
+    if ((st = _weaken(GetSymbolTable)())) {
       l = 0;
       r = n = st->count;
       k = a - st->addr_base;
@@ -716,10 +716,10 @@ static noasan void OnMemory(void *x, void *y, size_t n, void *a) {
 static void __asan_report_memory_origin_heap(const unsigned char *a, int z) {
   struct ReportOriginHeap t;
   kprintf("\nthe memory was allocated by\n");
-  if (weaken(malloc_inspect_all)) {
+  if (_weaken(malloc_inspect_all)) {
     t.a = a;
     t.z = z;
-    weaken(malloc_inspect_all)(OnMemory, &t);
+    _weaken(malloc_inspect_all)(OnMemory, &t);
   } else {
     kprintf("\tunknown please STATIC_YOINK(\"malloc_inspect_all\");\n");
   }
@@ -765,7 +765,7 @@ dontdiscard static __asan_die_f *__asan_report(const void *addr, int size,
   char *p, *q, *base;
   struct MemoryIntervals *m;
   --__ftrace;
-  p = __fatalbuf;
+  p = __asan_bigbuf;
   kprintf("\n\e[J\e[1;31masan error\e[0m: %s %d-byte %s at %p shadow %p\n",
           __asan_describe_access_poison(kind), size, message, addr,
           SHADOW(addr));
@@ -827,7 +827,7 @@ dontdiscard static __asan_die_f *__asan_report(const void *addr, int size,
   p = __asan_format_section(p, _etext, _edata, ".data", addr);
   p = __asan_format_section(p, _end, _edata, ".bss", addr);
   __mmi_lock();
-  for (m = weaken(_mmi), i = 0; i < m->i; ++i) {
+  for (m = _weaken(_mmi), i = 0; i < m->i; ++i) {
     x = m->p[i].x;
     y = m->p[i].y;
     p = __asan_format_interval(p, x << 16, (y << 16) + (FRAMESIZE - 1));
@@ -839,7 +839,7 @@ dontdiscard static __asan_die_f *__asan_report(const void *addr, int size,
   }
   __mmi_unlock();
   *p = 0;
-  kprintf("%s", __fatalbuf);
+  kprintf("%s", __asan_bigbuf);
   __asan_report_memory_origin(addr, size, kind);
   kprintf("\nthe crash was caused by\n");
   ++__ftrace;
@@ -881,8 +881,8 @@ static void __asan_morgue_flush(void) {
   void *p;
   if (__threaded) pthread_spin_lock(&__asan_lock);
   for (i = 0; i < ARRAYLEN(__asan_morgue.p); ++i) {
-    if (__asan_morgue.p[i] && weaken(dlfree)) {
-      weaken(dlfree)(__asan_morgue.p[i]);
+    if (__asan_morgue.p[i] && _weaken(dlfree)) {
+      _weaken(dlfree)(__asan_morgue.p[i]);
     }
     __asan_morgue.p[i] = 0;
   }
@@ -946,9 +946,9 @@ static void __asan_trace(struct AsanTrace *bt, const struct StackFrame *bp) {
     }
     if (!__asan_checka(SHADOW(bp), sizeof(*bp) >> 3).kind) {
       addr = bp->addr;
-      if (addr == weakaddr("__gc") && weakaddr("__gc")) {
+      if (addr == _weakaddr("__gc") && _weakaddr("__gc")) {
         do --gi;
-        while ((addr = garbage->p[gi].ret) == weakaddr("__gc"));
+        while ((addr = garbage->p[gi].ret) == _weakaddr("__gc"));
       }
       bt->p[i] = addr;
     } else {
@@ -968,8 +968,8 @@ void *__asan_allocate(size_t a, size_t n, int underrun, int overrun,
   size_t c;
   struct AsanExtra *e;
   n = __asan_user_size(n);
-  if ((p = weaken(dlmemalign)(a, __asan_heap_size(n)))) {
-    c = weaken(dlmalloc_usable_size)(p);
+  if ((p = _weaken(dlmemalign)(a, __asan_heap_size(n)))) {
+    c = _weaken(dlmalloc_usable_size)(p);
     e = (struct AsanExtra *)(p + c - sizeof(*e));
     __asan_unpoison(p, n);
     __asan_poison(p - 16, 16, underrun); /* see dlmalloc design */
@@ -986,7 +986,7 @@ static struct AsanExtra *__asan_get_extra(const void *p, size_t *c) {
   long x, n;
   struct AsanExtra *e;
   f = (intptr_t)p >> 16;
-  if (!kisdangerous(p) && (n = weaken(dlmalloc_usable_size)(p)) > sizeof(*e) &&
+  if (!kisdangerous(p) && (n = _weaken(dlmalloc_usable_size)(p)) > sizeof(*e) &&
       !__builtin_add_overflow((intptr_t)p, n, &x) && x <= 0x800000000000 &&
       (LIKELY(f == (int)((x - 1) >> 16)) || !kisdangerous((void *)(x - 1))) &&
       (LIKELY(f == (int)((x = x - sizeof(*e)) >> 16)) ||
@@ -1046,9 +1046,9 @@ int __asan_print_trace(void *p) {
   }
   for (i = 0; i < ARRAYLEN(e->bt.p) && e->bt.p[i]; ++i) {
     kprintf("\n%*lx %s", 12, e->bt.p[i],
-            weaken(__get_symbol_by_addr)
-                ? weaken(__get_symbol_by_addr)(e->bt.p[i])
-                : "please STATIC_YOINK(\"__get_symbol_by_addr\")");
+            _weaken(GetSymbolByAddr)
+                ? _weaken(GetSymbolByAddr)(e->bt.p[i])
+                : "please STATIC_YOINK(\"GetSymbolByAddr\")");
   }
   return 0;
 }
@@ -1060,13 +1060,13 @@ int __asan_is_leaky(void *p) {
   intptr_t f, *l;
   struct AsanExtra *e;
   struct SymbolTable *st;
-  if (!weaken(GetSymbolTable)) notpossible;
+  if (!_weaken(GetSymbolTable)) notpossible;
   if (!(e = __asan_get_extra(p, &c))) return 0;
   if (!__asan_read48(e->size, &n)) return 0;
   if (!__asan_is_mapped((((intptr_t)p >> 3) + 0x7fff8000) >> 16)) return 0;
   if (!(st = GetSymbolTable())) return 0;
   for (i = 0; i < ARRAYLEN(e->bt.p) && e->bt.p[i]; ++i) {
-    if ((sym = weaken(__get_symbol)(st, e->bt.p[i])) == -1) continue;
+    if ((sym = _weaken(__get_symbol)(st, e->bt.p[i])) == -1) continue;
     f = st->addr_base + st->symbols[sym].x;
     for (l = _leaky_start; l < _leaky_end; ++l) {
       if (f == *l) {
@@ -1086,7 +1086,7 @@ static void __asan_deallocate(char *p, long kind) {
       if (c <= ASAN_MORGUE_THRESHOLD) {
         p = __asan_morgue_add(p);
       }
-      weaken(dlfree)(p);
+      _weaken(dlfree)(p);
     } else {
       __asan_report_invalid_pointer(p)();
       __asan_unreachable();
@@ -1204,8 +1204,8 @@ void *__asan_realloc_in_place(void *p, size_t n) {
 
 int __asan_malloc_trim(size_t pad) {
   __asan_morgue_flush();
-  if (weaken(dlmalloc_trim)) {
-    return weaken(dlmalloc_trim)(pad);
+  if (_weaken(dlmalloc_trim)) {
+    return _weaken(dlmalloc_trim)(pad);
   } else {
     return 0;
   }
@@ -1332,7 +1332,7 @@ void __asan_map_shadow(uintptr_t p, size_t n) {
     kprintf("error: %p size %'zu overlaps shadow space\n", p, n);
     _Exit(1);
   }
-  m = weaken(_mmi);
+  m = _weaken(_mmi);
   a = (0x7fff8000 + (p >> 3)) >> 16;
   b = (0x7fff8000 + (p >> 3) + (n >> 3) + 0xffff) >> 16;
   for (; a <= b; a += i) {
@@ -1349,12 +1349,12 @@ void __asan_map_shadow(uintptr_t p, size_t n) {
     addr = (void *)(intptr_t)((int64_t)((uint64_t)a << 32) >> 16);
     prot = PROT_READ | PROT_WRITE;
     flag = MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS;
-    sm = weaken(sys_mmap)(addr, size, prot, flag, -1, 0);
+    sm = _weaken(sys_mmap)(addr, size, prot, flag, -1, 0);
     if (sm.addr == MAP_FAILED ||
-        weaken(TrackMemoryInterval)(m, a, a + i - 1, sm.maphandle,
-                                    PROT_READ | PROT_WRITE,
-                                    MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
-                                    false, false, 0, size) == -1) {
+        _weaken(TrackMemoryInterval)(m, a, a + i - 1, sm.maphandle,
+                                     PROT_READ | PROT_WRITE,
+                                     MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
+                                     false, false, 0, size) == -1) {
       kprintf("error: could not map asan shadow memory\n");
       __asan_die()();
       __asan_unreachable();
@@ -1372,11 +1372,11 @@ static textstartup void __asan_shadow_string(char *s) {
 static textstartup void __asan_shadow_auxv(intptr_t *auxv) {
   size_t i;
   for (i = 0; auxv[i]; i += 2) {
-    if (weaken(AT_RANDOM) && auxv[i] == *weaken(AT_RANDOM)) {
+    if (_weaken(AT_RANDOM) && auxv[i] == *_weaken(AT_RANDOM)) {
       __asan_map_shadow(auxv[i + 1], 16);
-    } else if (weaken(AT_EXECFN) && auxv[i] == *weaken(AT_EXECFN)) {
+    } else if (_weaken(AT_EXECFN) && auxv[i] == *_weaken(AT_EXECFN)) {
       __asan_shadow_string((char *)auxv[i + 1]);
-    } else if (weaken(AT_PLATFORM) && auxv[i] == *weaken(AT_PLATFORM)) {
+    } else if (_weaken(AT_PLATFORM) && auxv[i] == *_weaken(AT_PLATFORM)) {
       __asan_shadow_string((char *)auxv[i + 1]);
     }
   }
@@ -1414,15 +1414,14 @@ textstartup void __asan_init(int argc, char **argv, char **envp,
   if (!_lockcmpxchg(&once, false, true)) return;
   if (IsWindows() && NtGetVersion() < kNtVersionWindows10) {
     __write_str("error: asan binaries require windows10\r\n");
-    __restorewintty();
-    _Exit(0); /* So `make MODE=dbg test` passes w/ Windows7 */
+    _Exitr(0); /* So `make MODE=dbg test` passes w/ Windows7 */
   }
   REQUIRE(_mmi);
   REQUIRE(sys_mmap);
   REQUIRE(TrackMemoryInterval);
-  if (weaken(hook_malloc) || weaken(hook_calloc) || weaken(hook_realloc) ||
-      weaken(hook_realloc_in_place) || weaken(hook_free) ||
-      weaken(hook_malloc_usable_size)) {
+  if (_weaken(hook_malloc) || _weaken(hook_calloc) || _weaken(hook_realloc) ||
+      _weaken(hook_realloc_in_place) || _weaken(hook_free) ||
+      _weaken(hook_malloc_usable_size)) {
     REQUIRE(dlmemalign);
     REQUIRE(dlmalloc_usable_size);
   }
@@ -1446,8 +1445,8 @@ textstartup void __asan_init(int argc, char **argv, char **envp,
 }
 
 static textstartup void __asan_ctor(void) {
-  if (weaken(__cxa_atexit)) {
-    weaken(__cxa_atexit)(__asan_morgue_flush, NULL, NULL);
+  if (_weaken(__cxa_atexit)) {
+    _weaken(__cxa_atexit)(__asan_morgue_flush, NULL, NULL);
   }
 }
 

libc/intrin/assertfail.greg.c

@@ -17,12 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/state.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/lockcmpxchgp.h"
+#include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/internal.h"
 #include "libc/runtime/internal.h"
@@ -43,20 +43,19 @@ relegated void __assert_fail(const char *expr, const char *file, int line) {
     kprintf("%s:%d: assert(%s) failed (tid %d)\n", file, line, expr, me);
     if (__vforked || _lockcmpxchgp(&sync, &owner, me)) {
       __restore_tty();
-      if (weaken(ShowBacktrace)) {
-        weaken(ShowBacktrace)(2, __builtin_frame_address(0));
-      } else if (weaken(PrintBacktraceUsingSymbols) && weaken(GetSymbolTable)) {
-        weaken(PrintBacktraceUsingSymbols)(2, __builtin_frame_address(0),
-                                           weaken(GetSymbolTable)());
+      if (_weaken(ShowBacktrace)) {
+        _weaken(ShowBacktrace)(2, __builtin_frame_address(0));
+      } else if (_weaken(PrintBacktraceUsingSymbols) &&
+                 _weaken(GetSymbolTable)) {
+        _weaken(PrintBacktraceUsingSymbols)(2, __builtin_frame_address(0),
+                                            _weaken(GetSymbolTable)());
       } else {
         kprintf("can't backtrace b/c `ShowCrashReports` not linked\n");
       }
-      __restorewintty();
-      _Exit(23);
+      _Exitr(23);
     } else if (owner == me) {
       kprintf("assert failed while failing\n");
-      __restorewintty();
-      _Exit(24);
+      _Exitr(24);
     } else {
       _Exit1(25);
     }

libc/intrin/bextra.c

@@ -21,7 +21,7 @@
 /**
  * Extracts bit field from array.
  */
-unsigned bextra(const unsigned *p, size_t i, char b) {
+unsigned _bextra(const unsigned *p, size_t i, char b) {
   unsigned k, r, w;
   w = sizeof(unsigned) * CHAR_BIT;
   if (b) {

libc/intrin/bitreverse16.c

@@ -21,6 +21,6 @@
 /**
  * Reverses bits in 16-bit word.
  */
-int bitreverse16(int x) {
-  return BITREVERSE16(x);
+int _bitreverse16(int x) {
+  return kReverseBits[0x00FF & x] << 8 | kReverseBits[(0xFF00 & x) >> 8];
 }

libc/intrin/bitreverse32.c

@@ -22,7 +22,7 @@
 /**
  * Reverses bits in 32-bit word.
  */
-uint32_t bitreverse32(uint32_t x) {
+uint32_t _bitreverse32(uint32_t x) {
   x = bswap_32(x);
   x = (x & 0xaaaaaaaa) >> 1 | (x & 0x55555555) << 1;
   x = (x & 0xcccccccc) >> 2 | (x & 0x33333333) << 2;

libc/intrin/bitreverse64.c

@@ -22,7 +22,7 @@
 /**
  * Reverses bits in 64-bit word.
  */
-uint64_t bitreverse64(uint64_t x) {
+uint64_t _bitreverse64(uint64_t x) {
   x = bswap_64(x);
   x = (x & 0xaaaaaaaaaaaaaaaa) >> 1 | (x & 0x5555555555555555) << 1;
   x = (x & 0xcccccccccccccccc) >> 2 | (x & 0x3333333333333333) << 2;

libc/intrin/bitreverse8.c

@@ -21,6 +21,6 @@
 /**
  * Reverses bits in 8-bit word.
  */
-int bitreverse8(int x) {
-  return BITREVERSE8(x);
+int _bitreverse8(int x) {
+  return kReverseBits[255 & x];
 }

libc/intrin/bits.h

@@ -13,24 +13,20 @@ 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);
+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]))

libc/intrin/bsf.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsf.h"
+
+/**
+ * Returns position of first bit set.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param x is a 32-bit integer
+ * @return number in range 0..31 or undefined if 𝑥 is 0
+ */
+int(_bsf)(int x) {
+  return _bsf(x);
+}

libc/intrin/bsf.h

@@ -0,0 +1,29 @@
+#ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_
+#define COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+int _bsf(int) pureconst;
+int _bsfl(long) pureconst;
+int _bsfll(long long) pureconst;
+int _bsf128(uintmax_t) pureconst;
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#define _bsf(u)                                                 \
+  ({                                                            \
+    unsigned BiTs;                                              \
+    asm("bsf\t%0,%0" : "=r"(BiTs) : "0"((unsigned)(u)) : "cc"); \
+    BiTs;                                                       \
+  })
+#define _bsfl(u)                                                     \
+  ({                                                                 \
+    unsigned long BiTs;                                              \
+    asm("bsf\t%0,%0" : "=r"(BiTs) : "0"((unsigned long)(u)) : "cc"); \
+    (unsigned)BiTs;                                                  \
+  })
+#define _bsfll(u) _bsfl(u)
+#endif
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BSF_H_ */

libc/intrin/bsfl.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsf.h"
+
+/**
+ * Returns position of first bit set.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param 𝑥 is a 64-bit integer
+ * @return number in range 0..63 or undefined if 𝑥 is 0
+ */
+int(_bsfl)(long x) {
+  return _bsfl(x);
+}

libc/intrin/bsfll.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsf.h"
+
+/**
+ * Returns position of first bit set.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param 𝑥 is a 64-bit integer
+ * @return number in range 0..63 or undefined if 𝑥 is 0
+ */
+int(_bsfll)(long long x) {
+  return _bsfll(x);
+}

libc/intrin/bsr.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsr.h"
+
+/**
+ * Returns binary logarithm of 𝑥.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param x is a 32-bit integer
+ * @return number in range 0..31 or undefined if 𝑥 is 0
+ */
+int(_bsr)(int x) {
+  return _bsr(x);
+}

libc/intrin/bsr.h

@@ -0,0 +1,29 @@
+#ifndef COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_
+#define COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+int _bsr(int) pureconst;
+int _bsrl(long) pureconst;
+int _bsrll(long long) pureconst;
+
+#if defined(__GNUC__) && defined(__x86_64__) && !defined(__STRICT_ANSI__)
+int _bsr128(uint128_t) pureconst;
+#define _bsr(u)                                                 \
+  ({                                                            \
+    unsigned BiTs;                                              \
+    asm("bsr\t%0,%0" : "=r"(BiTs) : "0"((unsigned)(u)) : "cc"); \
+    BiTs;                                                       \
+  })
+#define _bsrl(u)                                                     \
+  ({                                                                 \
+    unsigned long BiTs;                                              \
+    asm("bsr\t%0,%0" : "=r"(BiTs) : "0"((unsigned long)(u)) : "cc"); \
+    (unsigned)BiTs;                                                  \
+  })
+#define _bsrll(u) _bsrl(u)
+#endif
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_NEXGEN32E_BSR_H_ */

libc/intrin/bsr128.S

@@ -0,0 +1,45 @@
+/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
+│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/macros.internal.h"
+
+//	Returns binary logarithm of integer 𝑥.
+//
+//	      uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)   bsr(𝑥) lzcnt(𝑥)
+//	    0x00000000      wut       32        0      wut       32
+//	    0x00000001        0        0        1        0       31
+//	    0x80000001        0        0        1       31        0
+//	    0x80000000       31       31       32       31        0
+//	    0x00000010        4        4        5        4       27
+//	    0x08000010        4        4        5       27        4
+//	    0x08000000       27       27       28       27        4
+//	    0xffffffff        0        0        1       31        0
+//
+//	@param	rsi:rdi is 128-bit unsigned 𝑥 value
+//	@return	eax number in range [0,128) or undef if 𝑥 is 0
+//	@see	also treasure trove of nearly identical functions
+_bsr128:
+	.leafprologue
+	.profilable
+	bsr	%rsi,%rax
+	jnz	2f
+	bsr	%rdi,%rax
+1:	.leafepilogue
+2:	add	$64,%eax
+	jmp	1b
+	.endfn	_bsr128,globl

libc/intrin/bsrl.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsr.h"
+
+/**
+ * Returns binary logarithm of 𝑥.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param x is a 64-bit integer
+ * @return number in range 0..63 or undefined if 𝑥 is 0
+ */
+int(_bsrl)(long x) {
+  return _bsrl(x);
+}

libc/intrin/bsrll.c

@@ -0,0 +1,40 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/intrin/bsr.h"
+
+/**
+ * Returns binary logarithm of 𝑥.
+ *
+ *                           ctz(𝑥)         31^clz(𝑥)   clz(𝑥)
+ *       uint32 𝑥  _bsf(𝑥) tzcnt(𝑥)   ffs(𝑥)  _bsr(𝑥) lzcnt(𝑥)
+ *     0x00000000      wut       32        0      wut       32
+ *     0x00000001        0        0        1        0       31
+ *     0x80000001        0        0        1       31        0
+ *     0x80000000       31       31       32       31        0
+ *     0x00000010        4        4        5        4       27
+ *     0x08000010        4        4        5       27        4
+ *     0x08000000       27       27       28       27        4
+ *     0xffffffff        0        0        1       31        0
+ *
+ * @param x is a 64-bit integer
+ * @return number in range 0..63 or undefined if 𝑥 is 0
+ */
+int(_bsrll)(long long x) {
+  return _bsrll(x);
+}

libc/intrin/closehandle.c

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

libc/intrin/createdirectory.c

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

libc/intrin/createfile.c

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

libc/intrin/createfilemapping.c

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

libc/intrin/createfilemappingnuma.c

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

libc/intrin/createnamedpipe.c

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

libc/intrin/createpipe.c

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

libc/intrin/createprocess.c

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

libc/intrin/createsymboliclink.c

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

libc/intrin/createthread.c

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

libc/intrin/cxaatexit.c

@@ -17,12 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/intrin/weaken.h"
-#include "libc/calls/strace.internal.h"
+#include "libc/intrin/bsr.h"
 #include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
-#include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
@@ -51,8 +51,8 @@ noasan int __cxa_atexit(void *fp, void *arg, void *pred) {
   b = __cxa_blocks.p;
   if (!b) b = __cxa_blocks.p = &__cxa_blocks.root;
   if (!~b->mask) {
-    if (weaken(calloc) &&
-        (b2 = weaken(calloc)(1, sizeof(struct CxaAtexitBlock)))) {
+    if (_weaken(calloc) &&
+        (b2 = _weaken(calloc)(1, sizeof(struct CxaAtexitBlock)))) {
       b2->next = b;
       __cxa_blocks.p = b = b2;
     } else {
@@ -60,7 +60,7 @@ noasan int __cxa_atexit(void *fp, void *arg, void *pred) {
       return enomem();
     }
   }
-  i = bsr(~b->mask);
+  i = _bsr(~b->mask);
   assert(i < ARRAYLEN(b->p));
   b->mask |= 1u << i;
   b->p[i].fp = fp;

libc/intrin/cxafinalize.c

@@ -17,11 +17,11 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/intrin/weaken.h"
-#include "libc/calls/strace.internal.h"
+#include "libc/intrin/bsf.h"
 #include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/weaken.h"
 #include "libc/mem/mem.h"
-#include "libc/nexgen32e/bsf.h"
 #include "libc/runtime/runtime.h"
 
 /**
@@ -44,7 +44,7 @@ StartOverLocked:
     for (;;) {
       mask = b->mask;
       while (mask) {
-        i = bsf(mask);
+        i = _bsf(mask);
         mask &= ~(1u << i);
         if (!pred || pred == b->p[i].pred) {
           b->mask &= ~(1u << i);
@@ -61,8 +61,8 @@ StartOverLocked:
         b2 = b->next;
         if (b2) {
           assert(b != &__cxa_blocks.root);
-          if (weaken(free)) {
-            weaken(free)(b);
+          if (_weaken(free)) {
+            _weaken(free)(b);
           }
         }
         __cxa_blocks.p = b2;

libc/intrin/deletefile.c

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

libc/intrin/describefutexresult.c

@@ -18,11 +18,11 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/describeflags.internal.h"
-#include "libc/str/errfun.h"
+#include "libc/str/str.h"
 
 const char *(DescribeFutexResult)(char buf[12], int ax) {
   const char *s;
-  if (ax > -4095u && (s = strerrno(-ax))) {
+  if (ax > -4095u && (s = _strerrno(-ax))) {
     return s;
   } else {
     FormatInt32(buf, ax);

libc/intrin/describerlimit.c

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

libc/intrin/deviceiocontrol.c

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

libc/intrin/directmap.c

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

libc/intrin/exit.c

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

libc/intrin/exit1.greg.c

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

libc/intrin/exitr.c

@@ -1,7 +1,7 @@
 /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
 │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
 ╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│ Copyright 2022 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
 │ Permission to use, copy, modify, and/or distribute this software for         │
 │ any purpose with or without fee is hereby granted, provided that the         │
@@ -16,6 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/log/libfatal.internal.h"
+#include "libc/runtime/runtime.h"
 
-char __fatalbuf[FRAMESIZE];
+privileged wontreturn void _Exitr(int exitcode) {
+  _restorewintty();
+  _Exit(exitcode);
+}

libc/intrin/extend.c

@@ -52,7 +52,9 @@ static void _mapframe(void *p) {
  *
  *     !(p & 0xffff) && !(((p >> 3) + 0x7fff8000) & 0xffff)
  *
- * which must be the case when selecting a starting address.
+ * which must be the case when selecting a starting address. We also
+ * make the assumption that allocations can only grow monotonically.
+ * Furthermore allocations shall never be removed or relocated.
  *
  * @param p points to start of memory region
  * @param n specifies how many bytes are needed
@@ -81,6 +83,5 @@ noasan void *_extend(void *p, size_t n, void *e, intptr_t h) {
       *SHADOW(q) = 0;
     }
   }
-  asm("mfence");
   return q;
 }

libc/intrin/extend.internal.h

@@ -0,0 +1,10 @@
+#ifndef COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_
+#define COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+void *_extend(void *, size_t, void *, intptr_t);
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_CALLS_EXTEND_INTERNAL_H_ */

libc/intrin/ezlea.h

@@ -3,9 +3,9 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #if __pic__ + __pie__ + __code_model_medium__ + __code_model_large__ + 0 > 1
-#define ezlea(symbol) "lea\t" symbol "(%%rip),%"
+#define _ezlea(symbol) "lea\t" symbol "(%%rip),%"
 #else
-#define ezlea(symbol) "mov\t$" symbol ",%k"
+#define _ezlea(symbol) "mov\t$" symbol ",%k"
 #endif
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

libc/intrin/findclose.c

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

libc/intrin/findfirstfile.c

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

libc/intrin/findnextfile.c

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

libc/intrin/flushfilebuffers.c

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

libc/intrin/flushviewoffile.c

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

libc/intrin/g_fds.c

@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/extend.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
+#include "libc/intrin/extend.internal.h"
 #include "libc/intrin/pushpop.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/runtime.h"
@@ -48,11 +48,11 @@ textstartup void InitializeFileDescriptors(void) {
   fds->n = 4;
   fds->f = 3;
   fds->e = _extend(fds->p, fds->n * sizeof(*fds->p), fds->e,
-                   kMemtrackFdsStart + kMemtrackFdsSize);;
+                   kMemtrackFdsStart + kMemtrackFdsSize);
   if (IsMetal()) {
     extern const char vga_console[];
     pushmov(&fds->f, 3ull);
-    if (weaken(vga_console)) {
+    if (_weaken(vga_console)) {
       fds->p[0].kind = pushpop(kFdConsole);
       fds->p[1].kind = pushpop(kFdConsole);
       fds->p[2].kind = pushpop(kFdConsole);

libc/intrin/generateconsolectrlevent.c

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

libc/intrin/getenv.greg.c

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

libc/intrin/getexitcodeprocess.c

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

libc/intrin/getfileattributes.c

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

libc/intrin/hamming.c

@@ -22,6 +22,6 @@
  * Counts number of different bits.
  * @see https://en.wikipedia.org/wiki/Hamming_code
  */
-unsigned long hamming(unsigned long x, unsigned long y) {
+unsigned long _hamming(unsigned long x, unsigned long y) {
   return popcnt(x ^ y);
 }

libc/intrin/kprintf.greg.c

@@ -48,7 +48,6 @@
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/symbols.internal.h"
 #include "libc/str/str.h"
-#include "libc/str/tpenc.h"
 #include "libc/str/utf16.h"
 #include "libc/sysv/consts/nr.h"
 #include "libc/sysv/consts/prot.h"
@@ -114,27 +113,27 @@ privileged static inline bool kischarmisaligned(const char *p, signed char t) {
 }
 
 privileged static inline bool kismemtrackhosed(void) {
-  return !((weaken(_mmi)->i <= weaken(_mmi)->n) &&
-           (weaken(_mmi)->p == weaken(_mmi)->s ||
-            weaken(_mmi)->p == (struct MemoryInterval *)kMemtrackStart));
+  return !((_weaken(_mmi)->i <= _weaken(_mmi)->n) &&
+           (_weaken(_mmi)->p == _weaken(_mmi)->s ||
+            _weaken(_mmi)->p == (struct MemoryInterval *)kMemtrackStart));
 }
 
 privileged static bool kismapped(int x) {
   // xxx: we can't lock because no reentrant locks yet
   size_t m, r, l = 0;
-  if (!weaken(_mmi)) return true;
+  if (!_weaken(_mmi)) return true;
   if (kismemtrackhosed()) return false;
-  r = weaken(_mmi)->i;
+  r = _weaken(_mmi)->i;
   while (l < r) {
     m = (l + r) >> 1;
-    if (weaken(_mmi)->p[m].y < x) {
+    if (_weaken(_mmi)->p[m].y < x) {
       l = m + 1;
     } else {
       r = m;
     }
   }
-  if (l < weaken(_mmi)->i && x >= weaken(_mmi)->p[l].x) {
-    return !!(weaken(_mmi)->p[l].prot & PROT_READ);
+  if (l < _weaken(_mmi)->i && x >= _weaken(_mmi)->p[l].x) {
+    return !!(_weaken(_mmi)->p[l].prot & PROT_READ);
   } else {
     return false;
   }
@@ -462,16 +461,16 @@ privileged static size_t kformat(char *b, size_t n, const char *fmt,
           unixerr = errno;
           winerr = 0;
           if (IsWindows()) {
-            if (type == 1 && weaken(WSAGetLastError)) {
-              winerr = weaken(WSAGetLastError)();
-            } else if (weaken(GetLastError)) {
-              winerr = weaken(GetLastError)();
+            if (type == 1 && _weaken(WSAGetLastError)) {
+              winerr = _weaken(WSAGetLastError)();
+            } else if (_weaken(GetLastError)) {
+              winerr = _weaken(GetLastError)();
             }
           }
           if (!unixerr && sign == ' ') {
             break;
-          } else if (weaken(strerror_wr) &&
-                     !weaken(strerror_wr)(unixerr, winerr, z, sizeof(z))) {
+          } else if (_weaken(strerror_wr) &&
+                     !_weaken(strerror_wr)(unixerr, winerr, z, sizeof(z))) {
             s = z;
             type = 0;
             goto FormatString;
@@ -493,7 +492,7 @@ privileged static size_t kformat(char *b, size_t n, const char *fmt,
 
         case 'G':
           x = va_arg(va, int);
-          if (weaken(strsignal) && (s = weaken(strsignal)(x))) {
+          if (_weaken(strsignal) && (s = _weaken(strsignal)(x))) {
             goto FormatString;
           } else {
             goto FormatDecimal;
@@ -508,11 +507,11 @@ privileged static size_t kformat(char *b, size_t n, const char *fmt,
           // can be manually consulted to look up the faulting code.
           int idx;
           x = va_arg(va, intptr_t);
-          if (weaken(__symtab) && *weaken(__symtab) &&
-              (idx = weaken(__get_symbol)(0, x)) != -1) {
+          if (_weaken(__symtab) && *_weaken(__symtab) &&
+              (idx = _weaken(__get_symbol)(0, x)) != -1) {
             if (p + 1 <= e) *p++ = '&';
-            s = (*weaken(__symtab))->name_base +
-                (*weaken(__symtab))->names[idx];
+            s = (*_weaken(__symtab))->name_base +
+                (*_weaken(__symtab))->names[idx];
             goto FormatString;
           }
           base = 4;
@@ -651,8 +650,8 @@ privileged static size_t kformat(char *b, size_t n, const char *fmt,
           EmitChar:
             if (t <= 0x7f) goto EmitByte;
             if (uppr) {
-              if (weaken(towupper)) {
-                t = weaken(towupper)(t);
+              if (_weaken(towupper)) {
+                t = _weaken(towupper)(t);
               } else if (uppr && 'a' <= t && t <= 'z') {
                 t -= 'a' - 'A';
               }

libc/intrin/mapviewoffileex.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/calls/strace.internal.h"
+#include "libc/intrin/strace.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/intrin/describeflags.internal.h"
 #include "libc/nt/enum/filemapflags.h"

libc/intrin/mapviewoffileexnuma.c

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

libc/intrin/memtrack.greg.c

@@ -18,13 +18,12 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
-#include "libc/calls/strace.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/asan.internal.h"
 #include "libc/intrin/bits.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/weaken.h"
+#include "libc/intrin/strace.internal.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"

libc/intrin/mmi.init.S

@@ -22,5 +22,5 @@
 	.init.start 200,_init__mmi
 	movb	$OPEN_MAX,_mmi+8
 	movl	$_mmi+24,_mmi+16
-	movb	$PTHREAD_MUTEX_RECURSIVE,__mmi_lock_obj+16(%rip)
+	movb	$PTHREAD_MUTEX_RECURSIVE,__mmi_lock_obj+4(%rip)
 	.init.end 200,_init__mmi

libc/intrin/movefileex.c

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

libc/intrin/openprocess.c

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

libc/intrin/pthread_key_create.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/nexgen32e/bsr.h"
+#include "libc/intrin/bsr.h"
 #include "libc/runtime/runtime.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/thread.h"
@@ -31,7 +31,7 @@ int pthread_key_create(pthread_key_t *key, pthread_key_dtor dtor) {
   pthread_spin_lock(&_pthread_keys_lock);
   for (i = 0; i < (PTHREAD_KEYS_MAX + 63) / 64; ++i) {
     if (~_pthread_key_usage[i]) {
-      j = bsrl(~_pthread_key_usage[i]);
+      j = _bsrl(~_pthread_key_usage[i]);
       _pthread_key_usage[i] |= 1ul << j;
       _pthread_key_dtor[i * 64 + j] = dtor;
       *key = i * 64 + j;

libc/intrin/pthread_key_destruct.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/nexgen32e/bsr.h"
+#include "libc/intrin/bsr.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/thread.h"
 #include "libc/thread/tls.h"
@@ -33,7 +33,7 @@ StartOver:
   for (i = 0; i < (PTHREAD_KEYS_MAX + 63) / 64; ++i) {
     x = _pthread_key_usage[i];
     while (x) {
-      j = bsrl(x);
+      j = _bsrl(x);
       if ((value = key[i * 64 + j]) && (dtor = _pthread_key_dtor[i * 64 + j])) {
         key[i * 64 + j] = 0;
         pthread_spin_unlock(&_pthread_keys_lock);

libc/intrin/pthread_mutex_init.c

@@ -19,7 +19,16 @@
 #include "libc/thread/thread.h"
 
 /**
- * Initializes mutex.
+ * Initializes mutex, e.g.
+ *
+ *     pthread_mutex_t lock;
+ *     pthread_mutexattr_t attr;
+ *     pthread_mutexattr_init(&attr);
+ *     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
+ *     pthread_mutex_init(&lock, &attr);
+ *     pthread_mutexattr_destroy(&attr);
+ *     // ...
+ *     pthread_mutex_destroy(&lock);
  *
  * @param attr may be null
  * @return 0 on success, or error number on failure

libc/intrin/pthread_mutex_lock.c

@@ -65,8 +65,15 @@ int pthread_mutex_lock(pthread_mutex_t *mutex) {
   if (LIKELY(__tls_enabled &&                               //
              mutex->_type == PTHREAD_MUTEX_NORMAL &&        //
              mutex->_pshared == PTHREAD_PROCESS_PRIVATE &&  //
-             weaken(nsync_mu_lock))) {
-    weaken(nsync_mu_lock)((nsync_mu *)mutex);
+             _weaken(nsync_mu_lock))) {
+    _weaken(nsync_mu_lock)((nsync_mu *)mutex);
+    return 0;
+  }
+
+  if (mutex->_type == PTHREAD_MUTEX_NORMAL) {
+    while (atomic_exchange_explicit(&mutex->_lock, 1, memory_order_acquire)) {
+      pthread_yield();
+    }
     return 0;
   }
 

libc/intrin/pthread_mutex_trylock.c

@@ -42,8 +42,8 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) {
   if (LIKELY(__tls_enabled &&                               //
              mutex->_type == PTHREAD_MUTEX_NORMAL &&        //
              mutex->_pshared == PTHREAD_PROCESS_PRIVATE &&  //
-             weaken(nsync_mu_trylock))) {
-    if (weaken(nsync_mu_trylock)((nsync_mu *)mutex)) {
+             _weaken(nsync_mu_trylock))) {
+    if (_weaken(nsync_mu_trylock)((nsync_mu *)mutex)) {
       return 0;
     } else {
       return EBUSY;
@@ -51,9 +51,7 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) {
   }
 
   if (mutex->_type == PTHREAD_MUTEX_NORMAL) {
-    c = 0;
-    if (atomic_compare_exchange_strong_explicit(
-            &mutex->_lock, &c, 1, memory_order_acquire, memory_order_relaxed)) {
+    if (!atomic_exchange_explicit(&mutex->_lock, 1, memory_order_acquire)) {
       return 0;
     } else {
       return EBUSY;

libc/intrin/pthread_mutex_unlock.c

@@ -37,8 +37,13 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex) {
   if (LIKELY(__tls_enabled &&                               //
              mutex->_type == PTHREAD_MUTEX_NORMAL &&        //
              mutex->_pshared == PTHREAD_PROCESS_PRIVATE &&  //
-             weaken(nsync_mu_unlock))) {
-    weaken(nsync_mu_unlock)((nsync_mu *)mutex);
+             _weaken(nsync_mu_unlock))) {
+    _weaken(nsync_mu_unlock)((nsync_mu *)mutex);
+    return 0;
+  }
+
+  if (mutex->_type == PTHREAD_MUTEX_NORMAL) {
+    atomic_store_explicit(&mutex->_lock, 0, memory_order_release);
     return 0;
   }
 

libc/intrin/pthread_once.c

@@ -46,8 +46,8 @@
  */
 int pthread_once(pthread_once_t *once, void init(void)) {
   uint32_t old;
-  if (weaken(nsync_run_once)) {
-    weaken(nsync_run_once)((nsync_once *)once, init);
+  if (_weaken(nsync_run_once)) {
+    _weaken(nsync_run_once)((nsync_once *)once, init);
     return 0;
   }
   switch ((old = atomic_load_explicit(&once->_lock, memory_order_relaxed))) {

libc/intrin/pthread_yield.c

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

libc/intrin/quick_exit.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/strace.internal.h"
+#include "libc/intrin/strace.internal.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
@@ -31,9 +31,9 @@
 wontreturn void quick_exit(int exitcode) {
   const uintptr_t *p;
   STRACE("quick_exit(%d)", exitcode);
-  __restorewintty();
-  if (weaken(fflush)) {
-    weaken(fflush)(0);
+  _restorewintty();
+  if (_weaken(fflush)) {
+    _weaken(fflush)(0);
   }
   for (p = __fini_array_end; p > __fini_array_start;) {
     ((void (*)(void))(*--p))();

libc/intrin/rand64.c

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

libc/intrin/removedirectory.c

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

libc/intrin/reopenfile.c

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

libc/intrin/restorewintty.c

@@ -33,7 +33,7 @@ const char kConsoleHandles[3] = {
 /**
  * Puts cmd.exe gui back the way it was.
  */
-noinstrument void __restorewintty(void) {
+noinstrument void _restorewintty(void) {
   int i;
   if (!IsWindows()) return;
   if (GetCurrentProcessId() == __winmainpid) {

libc/intrin/rounddown2pow.c

@@ -17,14 +17,14 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bits.h"
-#include "libc/nexgen32e/bsr.h"
+#include "libc/intrin/bsr.h"
 
 /**
  * Returns 𝑥 rounded down to previous two power.
  *
  * @define (𝑥>0→2^⌊log₂𝑥⌋, x=0→0, 𝑇→⊥)
- * @see roundup2pow()
+ * @see _roundup2pow()
  */
-unsigned long rounddown2pow(unsigned long x) {
-  return x ? 1ul << bsrl(x) : 0;
+unsigned long _rounddown2pow(unsigned long x) {
+  return x ? 1ul << _bsrl(x) : 0;
 }

libc/intrin/roundup2log.c

@@ -17,12 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bits.h"
-#include "libc/nexgen32e/bsr.h"
+#include "libc/intrin/bsr.h"
 
 /**
  * Returns 𝑥 rounded up to next two power and log'd.
- * @see roundup2pow()
+ * @see _roundup2pow()
  */
-unsigned long roundup2log(unsigned long x) {
-  return x > 1 ? (bsrl(x - 1) + 1) : x ? 1 : 0;
+unsigned long _roundup2log(unsigned long x) {
+  return x > 1 ? (_bsrl(x - 1) + 1) : x ? 1 : 0;
 }

libc/intrin/roundup2pow.c

@@ -17,14 +17,14 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bits.h"
-#include "libc/nexgen32e/bsr.h"
+#include "libc/intrin/bsr.h"
 
 /**
  * Returns 𝑥 rounded up to next two power.
  *
  * @define (𝑥>0→2^⌈log₂x⌉, x=0→0, 𝑇→⊥)
- * @see rounddown2pow()
+ * @see _rounddown2pow()
  */
-unsigned long roundup2pow(unsigned long x) {
-  return x > 1 ? 2ul << bsrl(x - 1) : x ? 1 : 0;
+unsigned long _roundup2pow(unsigned long x) {
+  return x > 1 ? 2ul << _bsrl(x - 1) : x ? 1 : 0;
 }

libc/intrin/setcurrentdirectory.c

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

libc/intrin/strace.internal.h

@@ -0,0 +1,55 @@
+#ifndef COSMOPOLITAN_LIBC_CALLS_STRACE_INTERNAL_H_
+#define COSMOPOLITAN_LIBC_CALLS_STRACE_INTERNAL_H_
+#include "libc/intrin/likely.h"
+#include "libc/runtime/runtime.h"
+
+#define _KERNTRACE 0 /* not configurable w/ flag yet */
+#define _POLLTRACE 0 /* not configurable w/ flag yet */
+#define _DATATRACE 1 /* not configurable w/ flag yet */
+#define _NTTRACE   0 /* not configurable w/ flag yet */
+
+#define STRACE_PROLOGUE "%rSYS %6P %'18T "
+
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+#ifdef SYSDEBUG
+#define STRACE(FMT, ...)                                  \
+  do {                                                    \
+    if (UNLIKELY(__strace > 0)) {                         \
+      __stracef(STRACE_PROLOGUE FMT "\n", ##__VA_ARGS__); \
+    }                                                     \
+  } while (0)
+#else
+#define STRACE(FMT, ...) (void)0
+#endif
+
+#if defined(SYSDEBUG) && _DATATRACE
+#define DATATRACE(FMT, ...) STRACE(FMT, ##__VA_ARGS__)
+#else
+#define DATATRACE(FMT, ...) (void)0
+#endif
+
+#if defined(SYSDEBUG) && _POLLTRACE
+#define POLLTRACE(FMT, ...) STRACE(FMT, ##__VA_ARGS__)
+#else
+#define POLLTRACE(FMT, ...) (void)0
+#endif
+
+#if defined(SYSDEBUG) && _KERNTRACE
+#define KERNTRACE(FMT, ...) STRACE(FMT, ##__VA_ARGS__)
+#else
+#define KERNTRACE(FMT, ...) (void)0
+#endif
+
+#if defined(SYSDEBUG) && _NTTRACE
+#define NTTRACE(FMT, ...) STRACE(FMT, ##__VA_ARGS__)
+#else
+#define NTTRACE(FMT, ...) (void)0
+#endif
+
+void __stracef(const char *, ...);
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_CALLS_STRACE_INTERNAL_H_ */

libc/intrin/stracef.greg.c

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

libc/intrin/strerdoc.greg.c

@@ -23,7 +23,7 @@
  * Converts errno value to descriptive sentence.
  * @return non-null rodata string or null if not found
  */
-privileged char *strerdoc(int x) {
+privileged char *_strerdoc(int x) {
   if (x) {
     return GetMagnumStr(kErrnoDocs, x);
   } else {

libc/intrin/strerrno.greg.c

@@ -17,13 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/str/errfun.h"
 
 /**
  * Converts errno value to symbolic name.
  * @return non-null rodata string or null if not found
  */
-privileged char *strerrno(int x) {
+privileged char *_strerrno(int x) {
   if (x) {
     return GetMagnumStr(kErrnoNames, x);
   } else {

libc/intrin/strerror_wr.greg.c

@@ -24,7 +24,6 @@
 #include "libc/nt/enum/formatmessageflags.h"
 #include "libc/nt/enum/lang.h"
 #include "libc/nt/process.h"
-#include "libc/str/errfun.h"
 #include "libc/str/str.h"
 
 /**
@@ -40,8 +39,8 @@ privileged int strerror_wr(int err, uint32_t winerr, char *buf, size_t size) {
   char16_t winmsg[256];
   const char *sym, *msg;
   wanting = false;
-  sym = firstnonnull(strerrno(err), (wanting = true, "EUNKNOWN"));
-  msg = firstnonnull(strerdoc(err), (wanting = true, "No error information"));
+  sym = firstnonnull(_strerrno(err), (wanting = true, "EUNKNOWN"));
+  msg = firstnonnull(_strerdoc(err), (wanting = true, "No error information"));
   if (IsTiny()) {
     if (!sym) sym = "EUNKNOWN";
     for (; (c = *sym++); --size)

libc/intrin/terminateprocess.c

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

libc/intrin/tpenc.S

@@ -23,7 +23,7 @@
 //	@param	edi is int to encode
 //	@return	rax is word-encoded byte buffer
 //	@note	invented on a napkin in a new jersey diner
-tpenc:	.leafprologue
+_tpenc:	.leafprologue
 	.profilable
 	mov	%edi,%edi
 	xor	%eax,%eax
@@ -42,7 +42,7 @@ tpenc:	.leafprologue
 2:	or	%ch,%al
 3:	or	%rdi,%rax
 	.leafepilogue
-	.endfn	tpenc,globl
+	.endfn	_tpenc,globl
 
 	.rodata
 	.align	4

libc/intrin/tpenc.h

@@ -0,0 +1,22 @@
+#ifndef COSMOPOLITAN_LIBC_STR_TPENC_H_
+#define COSMOPOLITAN_LIBC_STR_TPENC_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+uint64_t _tpenc(int32_t) pureconst;
+
+#if defined(__MNO_RED_ZONE__) && defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#define _tpenc(CODE)           \
+  ({                           \
+    long Edi, Buf;             \
+    asm("call\t_tpenc"         \
+        : "=a"(Buf), "=D"(Edi) \
+        : "1"((int)(CODE))     \
+        : "rcx", "rdx", "cc"); \
+    Buf;                       \
+  })
+#endif
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_STR_TPENC_H_ */

libc/intrin/ubsan.c

@@ -16,17 +16,17 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/mem/reverse.internal.h"
-#include "libc/intrin/pushpop.h"
-#include "libc/intrin/weaken.h"
 #include "libc/calls/calls.h"
-#include "libc/calls/strace.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/intrin/kprintf.h"
+#include "libc/intrin/pushpop.h"
+#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/weaken.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/internal.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/log/log.h"
+#include "libc/mem/reverse.internal.h"
 #include "libc/nt/runtime.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
@@ -200,8 +200,7 @@ static void __ubsan_exit(void) {
   kprintf("your ubsan runtime needs\n"
           "\tSTATIC_YOINK(\"__die\");\n"
           "in order to show you backtraces\n");
-  __restorewintty();
-  _Exit(99);
+  _Exitr(99);
 }
 
 static char *__ubsan_stpcpy(char *d, const char *s) {
@@ -214,8 +213,8 @@ static char *__ubsan_stpcpy(char *d, const char *s) {
 }
 
 dontdiscard static __ubsan_die_f *__ubsan_die(void) {
-  if (weaken(__die)) {
-    return weaken(__die);
+  if (_weaken(__die)) {
+    return _weaken(__die);
   } else {
     return __ubsan_exit;
   }

libc/intrin/unmapviewoffile.c

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

libc/intrin/virtualprotect.c

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

libc/intrin/waitformultipleobjects.c

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

libc/intrin/waitforsingleobject.c

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

libc/intrin/weaken.h

@@ -4,25 +4,25 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 #ifndef __STRICT_ANSI__
 
-#define weaken(symbol) ((const typeof(&(symbol)))weakaddr(#symbol))
+#define _weaken(symbol) ((const typeof(&(symbol)))_weakaddr(#symbol))
 
-#define strongaddr(symbolstr)                \
-  ({                                         \
-    intptr_t waddr;                          \
-    asm(ezlea(symbolstr) "0" : "=r"(waddr)); \
-    waddr;                                   \
+#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;                                                              \
+#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)
+#define _weaken(symbol)      symbol
+#define _weakaddr(symbolstr) &(symbolstr)
 #endif /* __STRICT_ANSI__ */
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_BITS_WEAKEN_H_ */

libc/intrin/winerr.greg.c

@@ -17,7 +17,6 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #define ShouldUseMsabiAttribute() 1
-#include "libc/intrin/weaken.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/nt/errors.h"

libc/intrin/wsarecv.c

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

libc/intrin/wsarecvfrom.c

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