Fold conv package into fmt

Both packages had nearly identical dependency requirements, so merging them should help reduce the complexity of the build graph.
2 years ago · 1fc91f3580
parent 978b7858f9
commit 1fc91f3580
203 changed files with 350 additions and 561 deletions
--- a/4
+++ b/4
@ -104,7 +104,6 @@ include ape/lib/apelib.mk			# │
 include ape/ape.mk				#─┘
 include libc/sysv/sysv.mk			#─┐
 include libc/nt/nt.mk				# ├──system
-include libc/conv/conv.mk			# │
 include libc/fmt/fmt.mk				# │
 include libc/rand/rand.mk			#─┘
 include libc/calls/calls.mk			#─┐
@ -186,7 +185,6 @@ include test/libc/dns/test.mk
 include test/libc/rand/test.mk
 include test/libc/time/test.mk
 include test/libc/stdio/test.mk
-include test/libc/conv/test.mk
 include test/libc/release/test.mk
 include test/libc/test.mk
 include test/ape/lib/test.mk
@ -251,7 +249,6 @@ COSMOPOLITAN_OBJECTS =		\
 	LIBC_BITS		\
 	LIBC_CALLS		\
 	LIBC_CALLS_HEFTY	\
-	LIBC_CONV		\
 	LIBC_CRYPTO		\
 	LIBC_DNS		\
 	LIBC_ELF		\
@ -286,7 +283,6 @@ COSMOPOLITAN_HEADERS =		\
 	LIBC_ALG		\
 	LIBC_BITS		\
 	LIBC_CALLS		\
-	LIBC_CONV		\
 	LIBC_CRYPTO		\
 	LIBC_DNS		\
 	LIBC_ELF		\
--- a/dsp/mpeg/mpeg1.c
+++ b/dsp/mpeg/mpeg1.c
@ -33,7 +33,7 @@
 #include "dsp/mpeg/mpeg.h"
 #include "dsp/mpeg/video.h"
 #include "libc/bits/initializer.internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/log.h"
 #include "libc/macros.h"
 #include "libc/math.h"
--- a/examples/cp.c
+++ b/examples/cp.c
@ -9,8 +9,8 @@
 #endif
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/copyfile.h"
-#include "libc/conv/conv.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/runtime/gc.h"
 #include "libc/runtime/runtime.h"
--- a/examples/examples.mk
+++ b/examples/examples.mk
@ -46,7 +46,6 @@ EXAMPLES_DIRECTDEPS =						\
 	LIBC_BITS						\
 	LIBC_CALLS						\
 	LIBC_CALLS_HEFTY					\
-	LIBC_CONV						\
 	LIBC_FMT						\
 	LIBC_LOG						\
 	LIBC_LOG_ASAN						\
--- a/examples/findprime.c
+++ b/examples/findprime.c
@ -10,7 +10,7 @@
 #include "libc/bits/bits.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/itimerval.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/color.internal.h"
--- a/examples/ispell.c
+++ b/examples/ispell.c
@ -12,7 +12,7 @@
 #include "libc/alg/critbit0.h"
 #include "libc/bits/bits.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/macros.h"
--- a/examples/nesemu1.cc
+++ b/examples/nesemu1.cc
@ -18,8 +18,8 @@
 #include "libc/calls/hefty/spawn.h"
 #include "libc/calls/struct/itimerval.h"
 #include "libc/calls/struct/winsize.h"
-#include "libc/conv/conv.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/inttypes.h"
 #include "libc/log/check.h"
--- a/examples/peek.c
+++ b/examples/peek.c
@ -17,14 +17,16 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/runtime/interruptiblecall.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/sig.h"

 struct InterruptibleCall icall;

-static intptr_t peek(intptr_t *addr) { return *addr; }
+static intptr_t peek(intptr_t *addr) {
+  return *addr;
+}

 int main(int argc, char *argv[]) {
  int i;
--- a/examples/printprimes.c
+++ b/examples/printprimes.c
@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/conv/itoa.h"
+#include "libc/fmt/itoa.h"
 #include "libc/math.h"
 #include "libc/stdio/stdio.h"

--- a/examples/subprocess.c
+++ b/examples/subprocess.c
@ -10,7 +10,7 @@
 #include "libc/alg/alg.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/spawn.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/runtime/gc.h"
--- a/examples/unbourne.c
+++ b/examples/unbourne.c
@ -120,9 +120,9 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/struct/tms.h"
 #include "libc/calls/termios.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
--- a/libc/bits/abs.c
+++ b/libc/bits/abs.c
@ -17,7 +17,9 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"

-int(abs)(int x) { return ABS(x); }
+int(abs)(int x) {
+  return ABS(x);
+}
--- a/libc/calls/calls.mk
+++ b/libc/calls/calls.mk
@ -39,15 +39,14 @@ LIBC_CALLS_A_CHECKS =					\

 LIBC_CALLS_A_DIRECTDEPS =				\
 	LIBC_FMT					\
-	LIBC_STR					\
-	LIBC_RAND					\
-	LIBC_CONV					\
-	LIBC_STUBS					\
 	LIBC_NEXGEN32E					\
-	LIBC_NT_NTDLL					\
 	LIBC_NT_ADVAPI32				\
 	LIBC_NT_KERNEL32				\
 	LIBC_NT_KERNELBASE				\
+	LIBC_NT_NTDLL					\
+	LIBC_RAND					\
+	LIBC_STR					\
+	LIBC_STUBS					\
 	LIBC_SYSV_CALLS					\
 	LIBC_SYSV

--- a/libc/calls/clock_gettime.c
+++ b/libc/calls/clock_gettime.c
@ -23,8 +23,8 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/mach.h"
 #include "libc/nt/struct/filetime.h"
 #include "libc/nt/struct/systemtime.h"
--- a/libc/calls/commandv.c
+++ b/libc/calls/commandv.c
@ -20,9 +20,9 @@
 #include "libc/bits/progn.internal.h"
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/ntdll.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
--- a/libc/calls/fstat-nt.c
+++ b/libc/calls/fstat-nt.c
@ -20,7 +20,7 @@
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/stat.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/enum/fileflagandattributes.h"
 #include "libc/nt/enum/fileinfobyhandleclass.h"
 #include "libc/nt/enum/filetype.h"
--- a/libc/calls/getpriority-nt.c
+++ b/libc/calls/getpriority-nt.c
@ -21,7 +21,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/kntprioritycombos.internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nexgen32e/ffs.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/enum/threadpriority.h"
--- a/libc/calls/getrusage-nt.c
+++ b/libc/calls/getrusage-nt.c
@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/rusage.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thread.h"
--- a/libc/calls/getsetpriority-nt.c
+++ b/libc/calls/getsetpriority-nt.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/sysv/consts/prio.h"
 #include "libc/sysv/errfuns.h"

--- a/libc/calls/gettimeofday-nt.c
+++ b/libc/calls/gettimeofday-nt.c
@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/struct/filetime.h"
 #include "libc/nt/struct/systemtime.h"
 #include "libc/nt/synchronization.h"
--- a/libc/calls/hefty/fork-nt.c
+++ b/libc/calls/hefty/fork-nt.c
@ -22,7 +22,7 @@
 #include "libc/calls/hefty/ntspawn.h"
 #include "libc/calls/hefty/spawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/itoa.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/enum/startf.h"
--- a/libc/calls/hefty/hefty.mk
+++ b/libc/calls/hefty/hefty.mk
@ -37,7 +37,6 @@ LIBC_CALLS_HEFTY_A_CHECKS =				\
 LIBC_CALLS_HEFTY_A_DIRECTDEPS =				\
 	LIBC_ALG					\
 	LIBC_CALLS					\
-	LIBC_CONV					\
 	LIBC_FMT					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
--- a/libc/calls/hefty/mkntcmdline.c
+++ b/libc/calls/hefty/mkntcmdline.c
@ -20,7 +20,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/ntspawn.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/hascharacter.internal.h"
--- a/libc/calls/hefty/mkntenvblock.c
+++ b/libc/calls/hefty/mkntenvblock.c
@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/calls/hefty/ntspawn.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/mem/mem.h"
 #include "libc/str/oldutf16.internal.h"
--- a/libc/calls/hefty/ntspawn.c
+++ b/libc/calls/hefty/ntspawn.c
@ -24,7 +24,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/ntspawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
--- a/libc/calls/hefty/spawnve-sysv.c
+++ b/libc/calls/hefty/spawnve-sysv.c
@ -22,8 +22,8 @@
 #include "libc/calls/hefty/internal.h"
 #include "libc/calls/hefty/spawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/mem/mem.h"
 #include "libc/paths.h"
 #include "libc/runtime/runtime.h"
--- a/libc/calls/isdebuggerpresent.c
+++ b/libc/calls/isdebuggerpresent.c
@ -21,8 +21,8 @@
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/log.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/nt/struct/teb.h"
--- a/libc/calls/nice.c
+++ b/libc/calls/nice.c
@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/sysv/consts/prio.h"

 static int clamp(int p) {
--- a/libc/calls/openanon.c
+++ b/libc/calls/openanon.c
@ -20,10 +20,10 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/isslash.internal.h"
-#include "libc/conv/itoa.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/isslash.internal.h"
+#include "libc/fmt/itoa.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"
--- a/libc/calls/setitimer-nt.c
+++ b/libc/calls/setitimer-nt.c
@ -20,8 +20,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/itimerval.h"
-#include "libc/conv/conv.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/nt/files.h"
--- a/libc/calls/utimensat-nt.c
+++ b/libc/calls/utimensat-nt.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"
--- a/libc/calls/wait4-nt.c
+++ b/libc/calls/wait4-nt.c
@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/rusage.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/enum/status.h"
--- a/libc/conv/conv.mk
+++ b/libc/conv/conv.mk
@ -1,85 +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───────────────────────┘
-#
-# SYNOPSIS
-#
-#   Cosmopolitan Data Conversions
-#
-# DESCRIPTION
-#
-#   This package provides functions that convert between data types.
-#   It's intended to be lower level than the memory and formatting
-#   libraries.
-
-PKGS += LIBC_CONV
-
-LIBC_CONV_ARTIFACTS += LIBC_CONV_A
-LIBC_CONV = $(LIBC_CONV_A_DEPS) $(LIBC_CONV_A)
-LIBC_CONV_A = o/$(MODE)/libc/conv/conv.a
-LIBC_CONV_A_FILES := $(wildcard libc/conv/*)
-LIBC_CONV_A_HDRS = $(filter %.h,$(LIBC_CONV_A_FILES))
-LIBC_CONV_A_SRCS_S = $(filter %.S,$(LIBC_CONV_A_FILES))
-LIBC_CONV_A_SRCS_C = $(filter %.c,$(LIBC_CONV_A_FILES))
-
-LIBC_CONV_A_SRCS =				\
-	$(LIBC_CONV_A_SRCS_S)			\
-	$(LIBC_CONV_A_SRCS_C)
-
-LIBC_CONV_A_OBJS =				\
-	$(LIBC_CONV_A_SRCS:%=o/$(MODE)/%.zip.o)	\
-	$(LIBC_CONV_A_SRCS_S:%.S=o/$(MODE)/%.o)	\
-	$(LIBC_CONV_A_SRCS_C:%.c=o/$(MODE)/%.o)
-
-LIBC_CONV_A_CHECKS =				\
-	$(LIBC_CONV_A).pkg			\
-	$(LIBC_CONV_A_HDRS:%=o/$(MODE)/%.ok)
-
-LIBC_CONV_A_DIRECTDEPS =			\
-	LIBC_NEXGEN32E				\
-	LIBC_STUBS				\
-	LIBC_STR				\
-	LIBC_TINYMATH				\
-	LIBC_SYSV				\
-	THIRD_PARTY_COMPILER_RT
-
-LIBC_CONV_A_DEPS :=				\
-	$(call uniq,$(foreach x,$(LIBC_CONV_A_DIRECTDEPS),$($(x))))
-
-$(LIBC_CONV_A):	libc/conv/			\
-		$(LIBC_CONV_A).pkg		\
-		$(LIBC_CONV_A_OBJS)
-
-$(LIBC_CONV_A).pkg:				\
-		$(LIBC_CONV_A_OBJS)		\
-		$(foreach x,$(LIBC_CONV_A_DIRECTDEPS),$($(x)_A).pkg)
-
-o/$(MODE)/libc/conv/dosdatetimetounix.o		\
-o/$(MODE)/libc/conv/itoa64radix10.greg.o	\
-o/$(MODE)/libc/conv/timetofiletime.o		\
-o/$(MODE)/libc/conv/filetimetotime.o		\
-o/$(MODE)/libc/conv/timespectofiletime.o	\
-o/$(MODE)/libc/conv/filetimetotimespec.o	\
-o/$(MODE)/libc/conv/filetimetotimeval.o:	\
-		OVERRIDE_CFLAGS +=		\
-			-O3
-
-o/$(MODE)/libc/conv/itoa64radix10.greg.o	\
-o/$(MODE)/libc/conv/itoa128radix10.greg.o:	\
-		OVERRIDE_CFLAGS +=		\
-			-fwrapv
-
-$(LIBC_CONV_A_OBJS):				\
-		OVERRIDE_CFLAGS +=		\
-			$(NO_MAGIC)
-
-LIBC_CONV_LIBS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)))
-LIBC_CONV_SRCS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_SRCS))
-LIBC_CONV_HDRS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_HDRS))
-LIBC_CONV_BINS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_BINS))
-LIBC_CONV_CHECKS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_CHECKS))
-LIBC_CONV_OBJS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_OBJS))
-LIBC_CONV_TESTS = $(foreach x,$(LIBC_CONV_ARTIFACTS),$($(x)_TESTS))
-$(LIBC_CONV_OBJS): $(BUILD_FILES) libc/conv/conv.mk
-
-.PHONY: o/$(MODE)/libc/conv
-o/$(MODE)/libc/conv: $(LIBC_CONV_CHECKS)
--- a/libc/conv/isslash.internal.h
+++ b/libc/conv/isslash.internal.h
@ -1,8 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_CONV_ISSLASH_H_
-#define COSMOPOLITAN_LIBC_CONV_ISSLASH_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-forceinline bool isslash(int c) { return c == '/' || c == '\\'; }
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_CONV_ISSLASH_H_ */
--- a/libc/dns/getaddrinfo.c
+++ b/libc/dns/getaddrinfo.c
@ -19,10 +19,10 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
 #include "libc/dns/dns.h"
 #include "libc/dns/hoststxt.h"
 #include "libc/dns/resolvconf.h"
+#include "libc/fmt/conv.h"
 #include "libc/mem/mem.h"
 #include "libc/sock/sock.h"
 #include "libc/str/str.h"
--- a/libc/conv/abs.c
+++ b/libc/conv/abs.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"

 int(abs)(int x) {
  return 0 < x ? x : -x;
--- a/libc/conv/atoi.c
+++ b/libc/conv/atoi.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/strlol.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"

 /**
--- a/libc/conv/atol.c
+++ b/libc/conv/atol.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/strlol.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"

 long atol(const char *s) {
--- a/libc/conv/atoll.c
+++ b/libc/conv/atoll.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/strlol.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"

 long long atoll(const char *s) {
--- a/libc/conv/basename.c
+++ b/libc/conv/basename.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/isslash.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/isslash.internal.h"
 #include "libc/str/str.h"

 /**
--- a/libc/conv/basename_n.c
+++ b/libc/conv/basename_n.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/isslash.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/isslash.internal.h"

 /**
 * Returns pointer to last filename component in path.
--- a/libc/conv/conv.h
+++ b/libc/conv/conv.h
@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_CONV_CONV_H_
-#define COSMOPOLITAN_LIBC_CONV_CONV_H_
+#ifndef COSMOPOLITAN_LIBC_FMT_CONV_H_
+#define COSMOPOLITAN_LIBC_FMT_CONV_H_
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/nt/struct/filetime.h"
@ -103,4 +103,4 @@ intmax_t __imaxabs(intmax_t) libcesque pureconst;

 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_CONV_CONV_H_ */
+#endif /* COSMOPOLITAN_LIBC_FMT_CONV_H_ */
--- a/libc/conv/convertmicros.c
+++ b/libc/conv/convertmicros.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/time/time.h"

 long convertmicros(const struct timeval *tv, long tick) {
--- a/libc/conv/dirname.c
+++ b/libc/conv/dirname.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/str/str.h"

 #define ISDELIM(c) (c == '/' || c == '\\' || c == '.')
--- a/libc/conv/div.c
+++ b/libc/conv/div.c
@ -17,6 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"

-div_t(div)(int num, int den) { return div(num, den); }
+div_t(div)(int num, int den) {
+  return div(num, den);
+}
--- a/libc/conv/dosdatetimetounix.c
+++ b/libc/conv/dosdatetimetounix.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/time/time.h"

--- a/libc/conv/filetimetotime.c
+++ b/libc/conv/filetimetotime.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/struct/filetime.h"

 int64_t filetimetotime(struct NtFileTime ft) {
--- a/libc/conv/filetimetotimespec.c
+++ b/libc/conv/filetimetotimespec.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/struct/filetime.h"

 /**
--- a/libc/conv/filetimetotimeval.c
+++ b/libc/conv/filetimetotimeval.c
@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/struct/filetime.h"

 void FileTimeToTimeVal(struct timeval *tv, struct NtFileTime ft) {
--- a/libc/fmt/fmt.mk
+++ b/libc/fmt/fmt.mk
@ -34,12 +34,12 @@ LIBC_FMT_A_CHECKS =				\
 	$(LIBC_FMT_A_HDRS:%=o/$(MODE)/%.ok)

 LIBC_FMT_A_DIRECTDEPS =				\
-	LIBC_STUBS				\
-	LIBC_STR				\
-	LIBC_TINYMATH				\
 	LIBC_NEXGEN32E				\
 	LIBC_NT_KERNELBASE			\
+	LIBC_STR				\
+	LIBC_STUBS				\
 	LIBC_SYSV				\
+	LIBC_TINYMATH				\
 	THIRD_PARTY_COMPILER_RT

 LIBC_FMT_A_DEPS :=				\
@ -57,6 +57,21 @@ $(LIBC_FMT_A_OBJS):				\
 		OVERRIDE_CFLAGS +=		\
 			-fno-jump-tables

+o/$(MODE)/libc/fmt/dosdatetimetounix.o		\
+o/$(MODE)/libc/fmt/itoa64radix10.greg.o		\
+o/$(MODE)/libc/fmt/timetofiletime.o		\
+o/$(MODE)/libc/fmt/filetimetotime.o		\
+o/$(MODE)/libc/fmt/timespectofiletime.o		\
+o/$(MODE)/libc/fmt/filetimetotimespec.o		\
+o/$(MODE)/libc/fmt/filetimetotimeval.o:		\
+		OVERRIDE_CFLAGS +=		\
+			-O3
+
+o/$(MODE)/libc/fmt/itoa64radix10.greg.o		\
+o/$(MODE)/libc/fmt/itoa128radix10.greg.o:	\
+		OVERRIDE_CFLAGS +=		\
+			-fwrapv
+
 LIBC_FMT_LIBS = $(foreach x,$(LIBC_FMT_ARTIFACTS),$($(x)))
 LIBC_FMT_SRCS = $(foreach x,$(LIBC_FMT_ARTIFACTS),$($(x)_SRCS))
 LIBC_FMT_HDRS = $(foreach x,$(LIBC_FMT_ARTIFACTS),$($(x)_HDRS))
--- a/libc/conv/imaxabs.c
+++ b/libc/conv/imaxabs.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"

 intmax_t(imaxabs)(intmax_t x) {
--- a/libc/conv/imaxabs.thunk.S
+++ b/libc/conv/imaxabs.thunk.S
--- a/libc/conv/isabspath.c
+++ b/libc/conv/isabspath.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/isslash.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/isslash.internal.h"

 /**
 * Returns true if pathname could be absolute on any known platform.
--- a/libc/fmt/isslash.internal.h
+++ b/libc/fmt/isslash.internal.h
@ -0,0 +1,10 @@
+#ifndef COSMOPOLITAN_LIBC_FMT_ISSLASH_H_
+#define COSMOPOLITAN_LIBC_FMT_ISSLASH_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+
+forceinline bool isslash(int c) {
+  return c == '/' || c == '\\';
+}
+
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_LIBC_FMT_ISSLASH_H_ */
--- a/libc/fmt/itoa.c
+++ b/libc/fmt/itoa.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"

 STATIC_YOINK("ntoa");
--- a/libc/conv/itoa.h
+++ b/libc/conv/itoa.h
@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_CONV_ITOA_H_
-#define COSMOPOLITAN_LIBC_CONV_ITOA_H_
+#ifndef COSMOPOLITAN_LIBC_FMT_ITOA_H_
+#define COSMOPOLITAN_LIBC_FMT_ITOA_H_
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 /*───────────────────────────────────────────────────────────────────────────│─╗
@ -29,4 +29,4 @@ size_t uint128toarray_radix10(uint128_t, char *);

 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_CONV_ITOA_H_ */
+#endif /* COSMOPOLITAN_LIBC_FMT_ITOA_H_ */
--- a/libc/conv/itoa128radix10.greg.c
+++ b/libc/conv/itoa128radix10.greg.c
@ -18,8 +18,8 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/reverse.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/itoa.h"
 #include "libc/limits.h"

 uint128_t __udivmodti4(uint128_t, uint128_t, uint128_t *);
--- a/libc/conv/itoa64.c
+++ b/libc/conv/itoa64.c
@ -18,8 +18,8 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/reverse.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/itoa.h"

 noinline size_t uint64toarray(uint64_t i, char *a, int r) {
  size_t j;
--- a/libc/conv/itoa64fixed16.greg.c
+++ b/libc/conv/itoa64fixed16.greg.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/itoa.h"

 size_t uint64toarray_fixed16(uint64_t x, char b[hasatleast 17], uint8_t k) {
  int i;
--- a/libc/conv/itoa64radix10.greg.c
+++ b/libc/conv/itoa64radix10.greg.c
@ -18,8 +18,8 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/reverse.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/itoa.h"
 #include "libc/limits.h"

 /**
--- a/libc/conv/itoa64radix16.greg.c
+++ b/libc/conv/itoa64radix16.greg.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/itoa.h"
 #include "libc/macros.h"
 #include "libc/nexgen32e/bsr.h"

--- a/libc/conv/itoa64radix8.c
+++ b/libc/conv/itoa64radix8.c
@ -18,8 +18,8 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/reverse.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/itoa.h"
 #include "libc/limits.h"

 /**
--- a/libc/conv/kmonthyearday.c
+++ b/libc/conv/kmonthyearday.c
--- a/libc/conv/labs.c
+++ b/libc/conv/labs.c
@ -17,7 +17,9 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"

-long(labs)(long x) { return ABS(x); }
+long(labs)(long x) {
+  return ABS(x);
+}
--- a/libc/conv/ldiv.c
+++ b/libc/conv/ldiv.c
@ -17,6 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"

-ldiv_t(ldiv)(long num, long den) { return ldiv(num, den); }
+ldiv_t(ldiv)(long num, long den) {
+  return ldiv(num, den);
+}
--- a/libc/conv/llabs.c
+++ b/libc/conv/llabs.c
@ -17,7 +17,9 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"

-long long(llabs)(long long x) { return ABS(x); }
+long long(llabs)(long long x) {
+  return ABS(x);
+}
--- a/libc/conv/lldiv.c
+++ b/libc/conv/lldiv.c
@ -17,6 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"

-lldiv_t(lldiv)(long long num, long long den) { return lldiv(num, den); }
+lldiv_t(lldiv)(long long num, long long den) {
+  return lldiv(num, den);
+}
--- a/libc/conv/ltpcpy.c
+++ b/libc/conv/ltpcpy.c
@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"

 char *ltpcpy(char *dst, long x) {
  unsigned len = llog10(abs(x)) + 1;
--- a/libc/fmt/palandntoa.c
+++ b/libc/fmt/palandntoa.c
@ -25,7 +25,7 @@
 │ THE SOFTWARE.                                                                │
 └─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/paland.inc"
 #include "libc/fmt/palandprintf.internal.h"

--- a/libc/fmt/palandprintf.c
+++ b/libc/fmt/palandprintf.c
@ -38,7 +38,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/bits/weaken.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/fmt/paland.inc"
 #include "libc/fmt/palandprintf.internal.h"
--- a/libc/conv/rounddecimalplaces.c
+++ b/libc/conv/rounddecimalplaces.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/math.h"

 double RoundDecimalPlaces(double f, double digs, double rounder(double)) {
--- a/libc/conv/strlol.internal.h
+++ b/libc/conv/strlol.internal.h
--- a/libc/conv/strtoimax.c
+++ b/libc/conv/strtoimax.c
@ -17,7 +17,7 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/limits.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/str/str.h"
--- a/libc/conv/strtol.c
+++ b/libc/conv/strtol.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/conv/conv.h"
-#include "libc/conv/strlol.internal.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"

 /**
--- a/libc/conv/strtoll.c
+++ b/libc/conv/strtoll.c
@ -17,8 +17,8 @@
 │ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
 │ 02110-1301 USA                                                               │