Release Cosmopolitan v3.3.8

Caused by ed93fc3dd7

.clang-format

@@ -6,6 +6,8 @@ AlignConsecutiveMacros: true
 AlignConsecutiveDeclarations: false
 AlwaysBreakBeforeMultilineStrings: false
 AllowShortFunctionsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
 KeepEmptyLinesAtTheStartOfBlocks: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 IncludeBlocks: Merge

.gitignore

@@ -1,7 +1,8 @@
 # -*- conf -*-
 
 /o
-/.prompt.jtlp
+/cosmocc
+/.cosmocc
 
 # TODO: Find some way to have Python write to o/
 __pycache__

.vscode/c_cpp_properties.json

@@ -48,11 +48,10 @@
 				"notpossible=",
 				"thatispacked=",
 				"dontthrow=",
-				"nocallback=",
+				"dontcallback=",
 				"relegated=",
 				"hidden=",
 				"textstartup=",
-				"initarray=",
 				"returnsnonnull=",
 				"returnspointerwithnoaliases=",
 				"printfesque(x)=",

CONTRIBUTING.md

@@ -2,23 +2,77 @@
 
 We'd love to accept your patches! Please read this guide first.
 
+## Identity Disclosure
+
+This project does not accept anonymous contributions. Justine Tunney
+won't merge pull requests from strangers. In order to change the Cosmo
+codebase, and have your changes be upstreamed, she has to know who you
+are. You're encouraged to disclose your full name and email address to
+the public too, by including them in your git commit messages; however
+that's not a requirement; as we're happy to respect the wishes of
+contributors who prefer to remain anonymous to the public.
+
 ## Copyright Assignment
 
-Please send an email to Justine Tunney <jtunney@gmail.com> stating that
-you intend to assign her the copyright to the changes you contribute to
-Cosmopolitan. Please use the same email address you use for git commits
-which should only contain original source code from you or other people
-who are also assigning copyright. Please note that, if you're employed,
-you may need to get your employer's approval beforehand. If you can not
-assign copyright due to local laws, then you may alternatively consider
-disclaiming it using the language in [Unlicense](https://unlicense.org)
-or [CC-0](http://creativecommons.org/share-your-work/public-domain/cc0)
+The first time you send a pull request, you need to send an email to
+Justine Tunney <jtunney@gmail.com> stating that you intend to assign her
+the copyright to the changes you contribute to Cosmopolitan. It only
+needs to happen once. This only applies to the code you *choose* to
+contribute. The email should be sent from an email address associated
+with your identity. Your email should link to your pull request.
 
-This is important because we can't produce 12kb single-file executables
-that comply with license requirements if we have to embed lots of them.
-Although that's less of an issue depending on the purpose of the files.
-For example, ownership is much less of a concern in the unit test files
-so you're encouraged to put your copyright on those, provided it's ISC.
+To make things easy, here's an example of a good email you can use:
+
+> **From**: YOUR NAME ([email protected])  
+> **To**: Justine Tunney ([email protected])  
+> **Subject**: Cosmopolitan Copyright Assignment for YOUR NAME
+>
+> Hi Justine,
+>
+> I made my first contribution to Cosmopolitan in
+> https://github.com/jart/cosmopolitan/pull/XXXX could you please take a
+> look? I intend to assign you the copyright to the changes I contribute
+> to Cosmopolitan.
+>
+> Thanks!
+
+Please note that in order to give Justine the copyright, it has to be
+yours to give in the first place. If you're employed, then you should
+get your employer's approval to do this beforehand. Even with big
+companies like Google, this process is quick and painless. Usually we
+see employers granting authorization in less than one day.
+
+If you live in a country that doesn't recognize one's ability to assign
+copyright, then you may alternatively consider disclaiming it using the
+language in [Unlicense](https://unlicense.org) or
+[CC-0](http://creativecommons.org/share-your-work/public-domain/cc0).
+
+If you're checking-in third party code, then you need to have headers at
+the top of each source file (but never header files) documenting its
+owners and the code should go in the `third_party/` folder. Every third
+party project should have a `README.cosmo` file that documents its
+provenance as well as any local changes you've made.
+
+## Copyright Policy Exceptions
+
+### Tests
+
+You're encoraged to claim ownership of your test code. If you add a new
+file under the `test/` directory, then you should put your name in the
+ISC license header at the top of the file. If you add new test cases to
+an existing unit test file, then you're encouraged to append a line with
+your name to the existing copyright header of that file.
+
+### Exceptional Features
+
+Let's say you discovered a faster better way to implement `log10()` and
+you want to give it to Cosmopolitan. In cases like this, it really isn't
+appropriate for Justine to own your code. What you could do instead, is
+write your own new and improved `log10.c` from scratch, put your name on
+the top with the ISC license, and then add a `__notice()` directive so
+that your name will be embedded inside every executable that links the
+`log10()` function. This will help you get your name out there. Please
+note you need get approval from Justine each time you want to do this.
 
 ## Style Guide
 
@@ -29,34 +83,4 @@ clang-format -i -style=file tool/net/redbean.c
 ```
 
 If you use Emacs this can be automated on save for Cosmopolitan using
-[tool/emacs/cosmo-format.el]([tool/emacs/cosmo-format.el]).
-
-### Source Files
-
-- Must use include paths relative to the root of the repository
-- Must have comment at top of file documenting copyright and license
-- Must have notice embedding if not owned by Justine (exception: tests)
-- May use language extensions that are supported by both GCC and Clang
-- Should use Google indentation (otherwise use `/* clang-format off */`)
-- Should use asm() instead of compiler APIs (exception: ctz, clz, memcpy)
-
-### Header Files
-
-- Must not have copyright or license comments
-- Must have once guards (otherwise change `.h` to `.inc`)
-- Must be ANSI C89 compatible to be included in the amalgamation header
-- Must include its dependencies (exception: libc/integral/normalize.inc)
-- Must not define objects (i.e. `cc -c -xc foo.h` will produce empty `.o`)
-- Should not use typedefs
-- Should not use forward declarations
-- Should not include documentation comments
-- Should not include parameter names in prototypes
-- Should not pose problems if included by C++ or Assembly sources
-- Should not declare non-ANSI code, at all, when the user requests ANSI
-
-### Build Config
-
-- Must not write files outside `o/`
-- Must not communicate with Internet
-- Must not depend on system libraries
-- Must not depend on system commands (exception: sh, make, gzip, zip)
+[tool/emacs/cosmo-format.el](tool/emacs/cosmo-format.el).

Makefile

@@ -21,23 +21,23 @@
 #   make -j8 -O MODE=tiny
 #
 #   # build individual target
-#   make -j8 -O o//examples/hello.com
-#   o//examples/hello.com
+#   make -j8 -O o//examples/hello
+#   o//examples/hello
 #
 #   # view source
 #   less examples/hello.c
 #
 #   # view binary
-#   o//tool/viz/bing.com o//examples/hello.com |
-#     o//tool/viz/fold.com
+#   o//tool/viz/bing o//examples/hello |
+#     o//tool/viz/fold
 #
 #   # view transitive closure of legalese
-#   o//tool/viz/bing.com -n o//examples/hello.com |
-#     o//tool/viz/fold.com
+#   o//tool/viz/bing -n o//examples/hello |
+#     o//tool/viz/fold
 #
 #   # basic debugging
-#   make -j8 -O MODE=dbg o/dbg/examples/crashreport.com
-#   o/examples/crashreport.com
+#   make -j8 -O MODE=dbg o/dbg/examples/crashreport
+#   o/examples/crashreport
 #   less examples/crashreport.c
 #
 #   # extremely tiny binaries
@@ -51,7 +51,7 @@
 #
 # TROUBLESHOOTING
 #
-#   make -j8 -O V=1 o//examples/hello.com
+#   make -j8 -O V=1 o//examples/hello
 #   make o//examples/life.elf -pn |& less
 #   etc.
 #
@@ -59,7 +59,7 @@
 #
 #   build/config.mk
 
-SHELL      = build/bootstrap/cocmd.com
+SHELL      = build/bootstrap/cocmd
 MAKEFLAGS += --no-builtin-rules
 
 .SUFFIXES:
@@ -73,10 +73,13 @@ MODE := $(m)
 endif
 endif
 
+COMMA := ,
+PWD := $(shell pwd)
+
 # detect wsl2 running cosmopolitan binaries on the host by checking whether:
-# - user ran build/bootstrap/make.com, in which case make's working directory is in wsl
-# - user ran make, in which case cocmd.com's working directory is in wsl
-ifneq ($(findstring //wsl.localhost/,$(CURDIR) $(shell pwd)),)
+# - user ran build/bootstrap/make, in which case make's working directory is in wsl
+# - user ran make, in which case cocmd's working directory is in wsl
+ifneq ($(findstring //wsl.localhost/,$(CURDIR) $(PWD)),)
 $(warning wsl2 interop is enabled)
 $(error you need to run sudo sh -c 'echo -1 > /proc/sys/fs/binfmt_misc/WSLInterop')
 endif
@@ -86,17 +89,35 @@ UNAME_S := $(shell uname -s)
 
 # apple still distributes a 17 year old version of gnu make
 ifeq ($(MAKE_VERSION), 3.81)
-$(error please use build/bootstrap/make.com)
+$(error please use build/bootstrap/make)
 endif
 
-# provide instructions to non-linux users on unbundling gcc
-ifeq ($(TOOLCHAIN),)                                                # if TOOLCHAIN isn't defined
-ifeq ("$(wildcard o/third_party/gcc/bin/x86_64-linux-cosmo-*)","")  # if our gcc isn't unbundled
-ifneq ($(UNAME_M)-$(UNAME_S), x86_64-Linux)                         # if this is not amd64 linux
-$(error please run tool/cosmocc/fetch.sh)
-endif
-endif
-endif
+LC_ALL = C
+SOURCE_DATE_EPOCH = 0
+
+ARFLAGS = rcsD
+ZFLAGS ?=
+XARGS ?= xargs -P4 -rs8000
+DOT ?= dot
+CLANG = clang
+TMPDIR = o/tmp
+AR = build/bootstrap/ar
+CP = build/bootstrap/cp
+RM = build/bootstrap/rm -f
+GZIP = build/bootstrap/gzip
+ECHO = build/bootstrap/echo
+CHMOD = build/bootstrap/chmod
+TOUCH = build/bootstrap/touch
+PKG = build/bootstrap/package
+MKDEPS = build/bootstrap/mkdeps
+ZIPOBJ = build/bootstrap/zipobj
+ZIPCOPY = build/bootstrap/zipcopy
+PECHECK = build/bootstrap/pecheck
+FIXUPOBJ = build/bootstrap/fixupobj
+MKDIR = build/bootstrap/mkdir -p
+COMPILE = build/bootstrap/compile -V9 -M2048m -P8192 $(QUOTA)
+
+IGNORE := $(shell $(MKDIR) $(TMPDIR))
 
 # the default build modes is empty string
 # on x86_64 hosts, MODE= is the same as MODE=x86_64
@@ -110,6 +131,44 @@ MODE := aarch64
 endif
 endif
 
+ifneq ($(findstring aarch64,$(MODE)),)
+ARCH = aarch64
+HOSTS ?= pi pi5 studio freebsdarm
+else
+ARCH = x86_64
+HOSTS ?= freebsd rhel7 xnu openbsd netbsd win10
+endif
+
+ZIPOBJ_FLAGS += -a$(ARCH)
+IGNORE := $(shell $(MKDIR) $(TMPDIR))
+
+export ADDR2LINE
+export LC_ALL
+export MKDIR
+export MODE
+export SOURCE_DATE_EPOCH
+export TMPDIR
+
+COSMOCC = .cosmocc/3.3.5
+TOOLCHAIN = $(COSMOCC)/bin/$(ARCH)-linux-cosmo-
+DOWNLOAD := $(shell build/download-cosmocc.sh $(COSMOCC) 3.3.5 db78fd8d3f8706e9dff4be72bf71d37a3f12062f212f407e1c33bc4af3780dd0)
+
+AS = $(TOOLCHAIN)as
+CC = $(TOOLCHAIN)gcc
+CXX = $(TOOLCHAIN)g++
+CXXFILT = $(TOOLCHAIN)c++filt
+LD = $(TOOLCHAIN)ld.bfd
+NM = $(TOOLCHAIN)nm
+GCC = $(TOOLCHAIN)gcc
+STRIP = $(TOOLCHAIN)strip
+OBJCOPY = $(TOOLCHAIN)objcopy
+OBJDUMP = $(TOOLCHAIN)objdump
+ifneq ($(wildcard $(PWD)/$(TOOLCHAIN)addr2line),)
+ADDR2LINE = $(PWD)/$(TOOLCHAIN)addr2line
+else
+ADDR2LINE = $(TOOLCHAIN)addr2line
+endif
+
 # primary build rules
 all:	o
 o:	o/$(MODE)
@@ -128,7 +187,7 @@ o/$(MODE):			\
 o/$(MODE)/: o/$(MODE)
 o/$(MODE)/.: o/$(MODE)
 
-# check if we're using o//third_party/make/make.com
+# check if we're using o//third_party/make/make
 # we added sandboxing to guarantee cosmo's makefile is hermetic
 # it also shaves away 200ms of startup latency with native $(uniq)
 ifneq ($(LANDLOCKMAKE_VERSION),)
@@ -138,7 +197,7 @@ $(warning please run ape/apeinstall.sh if you intend to use landlock make)
 $(shell sleep .5)
 endif
 endif
-ifeq ($(USE_SYSTEM_TOOLCHAIN),)
+ifneq ($(TOOLCHAIN),)
 .STRICT = 1
 endif
 endif
@@ -147,10 +206,9 @@ endif
 .UNVEIL +=					\
 	libc/integral				\
 	libc/stdbool.h				\
-	libc/disclaimer.inc			\
 	rwc:/dev/shm				\
+	rx:.cosmocc				\
 	rx:build/bootstrap			\
-	rx:o/third_party/gcc			\
 	r:build/portcosmo.h			\
 	/proc/stat				\
 	rw:/dev/null				\
@@ -189,7 +247,6 @@ include libc/calls/BUILD.mk			#─┐
 include libc/irq/BUILD.mk			# ├──SYSTEMS RUNTIME
 include third_party/nsync/BUILD.mk		# │  You can issue system calls
 include libc/runtime/BUILD.mk			# │
-include third_party/double-conversion/BUILD.mk	# │
 include libc/crt/BUILD.mk			# │
 include third_party/dlmalloc/BUILD.mk		#─┘
 include libc/mem/BUILD.mk			#─┐
@@ -201,7 +258,7 @@ include libc/thread/BUILD.mk			# │  You can finally call malloc()
 include third_party/zlib/BUILD.mk		# │
 include libc/stdio/BUILD.mk			# │
 include tool/hello/BUILD.mk			# │
-include libc/time/BUILD.mk			# │
+include third_party/tz/BUILD.mk			# │
 include net/BUILD.mk				# │
 include third_party/vqsort/BUILD.mk		# │
 include libc/log/BUILD.mk			# │
@@ -224,7 +281,11 @@ include third_party/stb/BUILD.mk		# │
 include third_party/mbedtls/BUILD.mk		# │
 include third_party/ncurses/BUILD.mk		# │
 include third_party/readline/BUILD.mk		# │
+include third_party/libunwind/BUILD.mk		# |
+include third_party/libcxxabi/BUILD.mk		# |
 include third_party/libcxx/BUILD.mk		# │
+include third_party/openmp/BUILD.mk		# │
+include third_party/double-conversion/BUILD.mk	# │
 include third_party/pcre/BUILD.mk		# │
 include third_party/less/BUILD.mk		# │
 include net/https/BUILD.mk			# │
@@ -236,7 +297,9 @@ include third_party/nsync/testing/BUILD.mk
 include libc/testlib/BUILD.mk
 include tool/viz/lib/BUILD.mk
 include tool/args/BUILD.mk
+include test/math/BUILD.mk
 include test/posix/BUILD.mk
+include test/libcxx/BUILD.mk
 include test/tool/args/BUILD.mk
 include third_party/linenoise/BUILD.mk
 include third_party/maxmind/BUILD.mk
@@ -256,7 +319,6 @@ include third_party/argon2/BUILD.mk
 include third_party/smallz4/BUILD.mk
 include third_party/sqlite3/BUILD.mk
 include third_party/mbedtls/test/BUILD.mk
-include third_party/quickjs/BUILD.mk
 include third_party/lz4cli/BUILD.mk
 include third_party/zip/BUILD.mk
 include third_party/xxhash/BUILD.mk
@@ -268,6 +330,7 @@ include third_party/python/BUILD.mk
 include tool/build/BUILD.mk
 include tool/curl/BUILD.mk
 include third_party/qemu/BUILD.mk
+include third_party/libcxxabi/test/BUILD.mk
 include examples/BUILD.mk
 include examples/pyapp/BUILD.mk
 include examples/pylife/BUILD.mk
@@ -352,17 +415,17 @@ o/$(MODE)/hdrs-old.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS
 	$(file >$@) $(foreach x,$(HDRS) $(INCS),$(file >>$@,$(x)))
 
 TAGS: private .UNSANDBOXED = 1
-TAGS:	o/$(MODE)/srcs-old.txt $(SRCS) #o/$(MODE)/third_party/ctags/ctags.com
+TAGS:	o/$(MODE)/srcs-old.txt $(SRCS) #o/$(MODE)/third_party/ctags/ctags
 	@$(RM) $@
-	@o/$(MODE)/third_party/ctags/ctags.com $(TAGSFLAGS) -L $< -o $@
+	@o/$(MODE)/third_party/ctags/ctags $(TAGSFLAGS) -L $< -o $@
 
 HTAGS: private .UNSANDBOXED = 1
-HTAGS:	o/$(MODE)/hdrs-old.txt $(filter-out third_party/libcxx/%,$(HDRS)) #o/$(MODE)/third_party/ctags/ctags.com
+HTAGS:	o/$(MODE)/hdrs-old.txt $(filter-out third_party/libcxx/%,$(HDRS)) #o/$(MODE)/third_party/ctags/ctags
 	@$(RM) $@
-	@build/htags o/$(MODE)/third_party/ctags/ctags.com -L $< -o $@
+	@build/htags o/$(MODE)/third_party/ctags/ctags -L $< -o $@
 
 loc: private .UNSANDBOXED = 1
-loc: o/$(MODE)/tool/build/summy.com
+loc: o/$(MODE)/tool/build/summy
 	find -name \*.h -or -name \*.c -or -name \*.S | \
 	$(XARGS) wc -l | grep total | awk '{print $$1}' | $<
 
@@ -377,9 +440,12 @@ COSMOPOLITAN_OBJECTS =			\
 	LIBC_X				\
 	THIRD_PARTY_GETOPT		\
 	LIBC_LOG			\
-	LIBC_TIME			\
+	THIRD_PARTY_TZ			\
+	THIRD_PARTY_OPENMP		\
 	THIRD_PARTY_MUSL		\
 	THIRD_PARTY_ZLIB_GZ		\
+	THIRD_PARTY_LIBCXXABI		\
+	THIRD_PARTY_LIBUNWIND		\
 	LIBC_STDIO			\
 	THIRD_PARTY_GDTOA		\
 	THIRD_PARTY_REGEX		\
@@ -414,6 +480,7 @@ COSMOPOLITAN_OBJECTS =			\
 	LIBC_STR			\
 	LIBC_SYSV			\
 	LIBC_INTRIN			\
+	LIBC_NT_BCRYPTPRIMITIVES	\
 	LIBC_NT_KERNEL32		\
 	LIBC_NEXGEN32E
 
@@ -438,7 +505,6 @@ COSMOPOLITAN_H_PKGS =			\
 	LIBC_STR			\
 	LIBC_SYSV			\
 	LIBC_THREAD			\
-	LIBC_TIME			\
 	LIBC_TINYMATH			\
 	LIBC_X				\
 	LIBC_VGA			\
@@ -449,12 +515,16 @@ COSMOPOLITAN_H_PKGS =			\
 	THIRD_PARTY_GETOPT		\
 	THIRD_PARTY_MUSL		\
 	THIRD_PARTY_ZLIB		\
+	THIRD_PARTY_ZLIB_GZ		\
 	THIRD_PARTY_REGEX
 
 COSMOCC_PKGS =				\
 	$(COSMOPOLITAN_H_PKGS)		\
 	THIRD_PARTY_AARCH64		\
 	THIRD_PARTY_LIBCXX		\
+	THIRD_PARTY_LIBCXXABI		\
+	THIRD_PARTY_LIBUNWIND		\
+	THIRD_PARTY_OPENMP		\
 	THIRD_PARTY_INTEL
 
 o/$(MODE)/cosmopolitan.a:		\
@@ -479,19 +549,16 @@ o/cosmopolitan.h: o/cosmopolitan.h.txt					\
 		$(wildcard libc/integral/*)				\
 		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_HDRS))	\
 		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_INCS))
-	@$(ECHO) '#ifndef __STRICT_ANSI__' >$@
-	@$(ECHO) '#define _COSMO_SOURCE' >>$@
-	@$(ECHO) '#endif' >>$@
-	@$(COMPILE) -AROLLUP -T$@ build/bootstrap/rollup.com @$< >>$@
+	@$(COMPILE) -AROLLUP -T$@ build/bootstrap/rollup @$< >>$@
 
 o/cosmopolitan.html: private .UNSANDBOXED = 1
 o/cosmopolitan.html:							\
-		o/$(MODE)/third_party/chibicc/chibicc.com.dbg		\
+		o/$(MODE)/third_party/chibicc/chibicc.dbg		\
 		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))	\
-		$(SRCS)							\
+		$(filter-out %.cpp,$(filter-out %.cc,$(SRCS)))				\
 		$(HDRS)
-	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))
-	o/$(MODE)/third_party/chibicc/chibicc.com.dbg -J		\
+	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.cpp,$(filter-out %.cc,$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))))
+	o/$(MODE)/third_party/chibicc/chibicc.dbg -J		\
 		-fno-common -include libc/integral/normalize.inc -o $@	\
 		-DCOSMO @$(TMPDIR)/$(subst /,_,$@)
 
@@ -514,13 +581,13 @@ TOOLCHAIN_ARTIFACTS =				\
 	o/$(MODE)/ape/ape-no-modify-self.o	\
 	o/$(MODE)/cosmopolitan.a		\
 	o/$(MODE)/third_party/libcxx/libcxx.a	\
-	o/$(MODE)/tool/build/march-native.com	\
-	o/$(MODE)/tool/build/ar.com		\
-	o/$(MODE)/tool/build/mktemper.com	\
-	o/$(MODE)/tool/build/fixupobj.com	\
-	o/$(MODE)/tool/build/zipcopy.com	\
-	o/$(MODE)/tool/build/apelink.com	\
-	o/$(MODE)/tool/build/pecheck.com
+	o/$(MODE)/tool/build/march-native	\
+	o/$(MODE)/tool/build/ar			\
+	o/$(MODE)/tool/build/mktemper		\
+	o/$(MODE)/tool/build/fixupobj		\
+	o/$(MODE)/tool/build/zipcopy		\
+	o/$(MODE)/tool/build/apelink		\
+	o/$(MODE)/tool/build/pecheck
 else
 TOOLCHAIN_ARTIFACTS =				\
 	o/$(MODE)/ape/ape.elf			\
@@ -528,9 +595,9 @@ TOOLCHAIN_ARTIFACTS =				\
 	o/$(MODE)/libc/crt/crt.o		\
 	o/$(MODE)/cosmopolitan.a		\
 	o/$(MODE)/third_party/libcxx/libcxx.a	\
-	o/$(MODE)/tool/build/march-native.com	\
-	o/$(MODE)/tool/build/fixupobj.com	\
-	o/$(MODE)/tool/build/zipcopy.com
+	o/$(MODE)/tool/build/march-native	\
+	o/$(MODE)/tool/build/fixupobj		\
+	o/$(MODE)/tool/build/zipcopy
 endif
 
 .PHONY: toolchain

README.md

@@ -76,18 +76,7 @@ make install
 ## Cosmopolitan Source Builds
 
 Cosmopolitan can be compiled from source on any of our supported
-platforms. First, you need to download or clone the repository. If
-you're not using x86-64 Linux then you'll need cosmocc too.
-
-```sh
-git clone https://github.com/jart/cosmopolitan cosmo
-cd cosmo
-mkdir -p o/third_party/gcc
-pushd o/third_party/gcc
-wget https://cosmo.zip/pub/cosmocc/cosmocc.zip
-unzip cosmocc.zip
-popd
-```
+platforms. The Makefile will download cosmocc automatically.
 
 It's recommended that you install a systemwide APE Loader. This command
 requires `sudo` access to copy the `ape` command to a system folder and
@@ -103,8 +92,8 @@ guaranteed to be compatible and furthermore includes our extensions for
 doing build system sandboxing.
 
 ```sh
-o//third_party/gcc/bin/make -j8
-o//examples/hello.com
+build/bootstrap/make -j8
+o//examples/hello
 ```
 
 Since the Cosmopolitan repository is very large, you might only want to
@@ -114,8 +103,8 @@ depends on core LIBC packages.
 
 ```sh
 rm -rf o//libc o//test
-o//third_party/gcc/bin/make o//test/posix/signal_test.com
-o//test/posix/signal_test.com
+build/bootstrap/make o//test/posix/signal_test
+o//test/posix/signal_test
 ```
 
 Sometimes it's desirable to build a subset of targets, without having to
@@ -123,21 +112,21 @@ list out each individual one. For example if you wanted to build and run
 all the unit tests in the `TEST_POSIX` package, you could say:
 
 ```sh
-o//third_party/gcc/bin/make o//test/posix
+build/bootstrap/make o//test/posix
 ```
 
 Cosmopolitan provides a variety of build modes. For example, if you want
 really tiny binaries (as small as 12kb in size) then you'd say:
 
 ```sh
-o//third_party/gcc/bin/make m=tiny
+build/bootstrap/make m=tiny
 ```
 
 You can furthermore cut out the bloat of other operating systems, and
 have Cosmopolitan become much more similar to Musl Libc.
 
 ```sh
-o//third_party/gcc/bin/make m=tinylinux
+build/bootstrap/make m=tinylinux
 ```
 
 For further details, see [//build/config.mk](build/config.mk).
@@ -190,11 +179,11 @@ end
 src
 ```
 
-You normally run the `.com.dbg` file under gdb. If you need to debug the
-`.com` file itself, then you can load the debug symbols independently as
+You normally run the `.dbg` file under gdb. If you need to debug the
+`` file itself, then you can load the debug symbols independently as
 
 ```sh
-gdb foo.com -ex 'add-symbol-file foo.com.dbg 0x401000'
+gdb foo -ex 'add-symbol-file foo.dbg 0x401000'
 ```
 
 ## Platform Notes
@@ -253,16 +242,16 @@ server. You're welcome to join us! <https://discord.gg/FwAVVu7eJ4>
 
 ## Support Vector
 
-| Platform        | Min Version | Circa |
-| :---            | ---:        | ---:  |
-| AMD             | K8 Venus    | 2005  |
-| Intel           | Core        | 2006  |
-| Linux           | 2.6.18      | 2007  |
-| Windows         | 8 [1]       | 2012  |
-| Mac OS X        | 15.6        | 2018  |
-| OpenBSD         | 7           | 2021  |
-| FreeBSD         | 13          | 2020  |
-| NetBSD          | 9.2         | 2021  |
+| Platform       | Min Version | Circa |
+| :---           | ---:        | ---:  |
+| AMD            | K8 Venus    | 2005  |
+| Intel          | Core        | 2006  |
+| Linux          | 2.6.18      | 2007  |
+| Windows        | 8 [1]       | 2012  |
+| Darwin (macOS) | 23.1.0+     | 2023  |
+| OpenBSD        | 7           | 2021  |
+| FreeBSD        | 13          | 2020  |
+| NetBSD         | 9.2         | 2021  |
 
 [1] See our [vista branch](https://github.com/jart/cosmopolitan/tree/vista)
     for a community supported version of Cosmopolitan that works on Windows

ape/BUILD.mk

@@ -157,7 +157,6 @@ o/$(MODE)/ape/ape-no-modify-self.o:		\
 		ape/ape.S			\
 		ape/ape.h			\
 		ape/macros.internal.h		\
-		ape/notice.inc			\
 		ape/relocations.h		\
 		ape/ape.internal.h		\
 		libc/dce.h			\
@@ -173,8 +172,6 @@ o/$(MODE)/ape/ape-no-modify-self.o:		\
 		libc/runtime/mman.internal.h	\
 		libc/runtime/pc.internal.h	\
 		libc/sysv/consts/prot.h		\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz	\
 		o/$(MODE)/ape/ape.elf
 	@$(COMPILE)				\
 		-AOBJECTIFY.S			\
@@ -187,7 +184,6 @@ o/$(MODE)/ape/ape-copy-self.o:			\
 		ape/ape.S			\
 		ape/ape.h			\
 		ape/macros.internal.h		\
-		ape/notice.inc			\
 		ape/relocations.h		\
 		ape/ape.internal.h		\
 		libc/dce.h			\
@@ -202,9 +198,7 @@ o/$(MODE)/ape/ape-copy-self.o:			\
 		libc/runtime/e820.internal.h	\
 		libc/runtime/mman.internal.h	\
 		libc/runtime/pc.internal.h	\
-		libc/sysv/consts/prot.h		\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz
+		libc/sysv/consts/prot.h
 	@$(COMPILE)				\
 		-AOBJECTIFY.S			\
 		$(OBJECTIFY.S)			\
@@ -226,10 +220,10 @@ o/$(MODE)/ape/loader-xnu-clang.asm: ape/loader.c
 	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=8 -S -g0 $(APE_LOADER_FLAGS)
 
 o/$(MODE)/ape/ape.elf: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy.com -f -o $@ $<
+	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy -f -o $@ $<
 
 o/$(MODE)/ape/ape.macho: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy.com -fm -o $@ $<
+	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy -fm -o $@ $<
 
 APE_LOADER_LDFLAGS =				\
 	-static					\
@@ -260,12 +254,25 @@ o/$(MODE)/ape:	$(APE_CHECKS)			\
 endif
 
 # these assembly files are safe to build on aarch64
-o/$(MODE)/ape/ape.o: ape/ape.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
-
 o/$(MODE)/ape/ape.o:				\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz
+		ape/ape.S			\
+		ape/ape.h			\
+		libc/dce.h			\
+		libc/elf/def.h			\
+		ape/relocations.h		\
+		libc/thread/tls.h		\
+		ape/ape.internal.h		\
+		ape/macros.internal.h		\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
+		libc/sysv/consts/prot.h		\
+		libc/nt/pedef.internal.h	\
+		libc/runtime/pc.internal.h	\
+		libc/runtime/e820.internal.h	\
+		libc/runtime/mman.internal.h	\
+		libc/nexgen32e/uart.internal.h	\
+		libc/calls/metalfile.internal.h
+	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
 
 o/$(MODE)/ape/ape.lds:				\
 		ape/ape.lds			\

ape/aarch64.lds

@@ -89,10 +89,12 @@ SECTIONS {
     *(.ubsan.data)
   }
 
-  .comment : {
-    __comment_start = .;
-    KEEP(*(.comment))
+  .notice : {
+    __notices = .;
+    KEEP(*(.notice))
     BYTE(0);
+    BYTE(10);
+    BYTE(10);
   }
 
   .eh_frame_hdr : {
@@ -157,8 +159,11 @@ SECTIONS {
 
   .init_array : {
     __init_array_start = .;
-    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
-    KEEP(*(.init_array EXCLUDE_FILE(*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
+    KEEP(*(.preinit_array))
+    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*)
+           SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP(*(.init_array))
+    KEEP(*(.ctors))
     __init_array_end = .;
   }
 
@@ -288,7 +293,6 @@ _tdata_size = _tdata_end - _tdata_start;
 _tbss_size = _tbss_end - _tbss_start;
 _tbss_offset = _tbss_start - _tdata_start;
 _tls_content = (_tdata_end - _tdata_start) + (_tbss_end - _tbss_start);
-_tls_align = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
-
-ASSERT(ALIGNOF(.tdata) <= TLS_ALIGNMENT && ALIGNOF(.tbss) <= TLS_ALIGNMENT,
-       "_Thread_local _Alignof can't exceed TLS_ALIGNMENT");
+_tdata_align = ALIGNOF(.tdata);
+_tbss_align = ALIGNOF(.tbss);
+_tls_align = MAX(TLS_ALIGNMENT, MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)));

ape/ape-m1.c

@@ -31,6 +31,8 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/random.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 #include <time.h>
 #include <unistd.h>
@@ -39,7 +41,7 @@
 /* maximum path size that cosmo can take */
 #define PATHSIZE       (PATH_MAX < 1024 ? PATH_MAX : 1024)
 #define SYSLIB_MAGIC   ('s' | 'l' << 8 | 'i' << 16 | 'b' << 24)
-#define SYSLIB_VERSION 8
+#define SYSLIB_VERSION 10 /* sync with libc/runtime/syslib.internal.h */
 
 struct Syslib {
   int magic;
@@ -96,43 +98,58 @@ struct Syslib {
   long (*sem_trywait)(int *);
   long (*getrlimit)(int, struct rlimit *);
   long (*setrlimit)(int, const struct rlimit *);
-  // v6 (2023-11-03)
+  /* v6 (2023-11-03) */
   void *(*dlopen)(const char *, int);
   void *(*dlsym)(void *, const char *);
   int (*dlclose)(void *);
   char *(*dlerror)(void);
+  /* MANDATORY (cosmo runtime won't load if version < 8)
+     ---------------------------------------------------
+     OPTIONAL (cosmo lib should check __syslib->version) */
+  /* v9 (2024-01-31) */
+  int (*pthread_cpu_number_np)(size_t *);
+  /* v10 (2024-05-02) */
+  long (*sysctl)(int *, u_int, void *, size_t *, void *, size_t);
+  long (*sysctlbyname)(const char *, void *, size_t *, void *, size_t);
+  long (*sysctlnametomib)(const char *, int *, size_t *);
 };
 
-#define ELFCLASS32  1
-#define ELFDATA2LSB 1
-#define EM_AARCH64  183
-#define ET_EXEC     2
-#define ET_DYN      3
-#define PT_LOAD     1
-#define PT_DYNAMIC  2
-#define PT_INTERP   3
-#define EI_CLASS    4
-#define EI_DATA     5
-#define PF_X        1
-#define PF_W        2
-#define PF_R        4
-#define AT_PHDR     3
-#define AT_PHENT    4
-#define AT_PHNUM    5
-#define AT_PAGESZ   6
-#define AT_BASE     7
-#define AT_ENTRY    9
-#define AT_UID      11
-#define AT_EUID     12
-#define AT_GID      13
-#define AT_EGID     14
-#define AT_HWCAP    16
-#define AT_HWCAP2   16
-#define AT_SECURE   23
-#define AT_RANDOM   25
-#define AT_EXECFN   31
+#define ELFCLASS32                  1
+#define ELFDATA2LSB                 1
+#define EM_AARCH64                  183
+#define ET_EXEC                     2
+#define ET_DYN                      3
+#define PT_LOAD                     1
+#define PT_DYNAMIC                  2
+#define PT_INTERP                   3
+#define EI_CLASS                    4
+#define EI_DATA                     5
+#define PF_X                        1
+#define PF_W                        2
+#define PF_R                        4
+#define AT_PHDR                     3
+#define AT_PHENT                    4
+#define AT_PHNUM                    5
+#define AT_PAGESZ                   6
+#define AT_BASE                     7
+#define AT_FLAGS                    8
+#define AT_FLAGS_PRESERVE_ARGV0_BIT 0
+#define AT_FLAGS_PRESERVE_ARGV0     (1 << AT_FLAGS_PRESERVE_ARGV0_BIT)
+#define AT_ENTRY                    9
+#define AT_UID                      11
+#define AT_EUID                     12
+#define AT_GID                      13
+#define AT_EGID                     14
+#define AT_HWCAP                    16
+#define AT_HWCAP2                   16
+#define AT_SECURE                   23
+#define AT_RANDOM                   25
+#define AT_EXECFN                   31
 
-#define AUXV_WORDS 29
+#define EF_APE_MODERN      0x101ca75
+#define EF_APE_MODERN_MASK 0x1ffffff
+
+#define AUXV_WORDS 31
 
 /* from the xnu codebase */
 #define _COMM_PAGE_START_ADDRESS      0x0000000FFFFFC000ul
@@ -140,8 +157,8 @@ struct Syslib {
 #define _COMM_PAGE_APRR_WRITE_ENABLE  (_COMM_PAGE_START_ADDRESS + 0x110)
 #define _COMM_PAGE_APRR_WRITE_DISABLE (_COMM_PAGE_START_ADDRESS + 0x118)
 
-#define MIN(X, Y) ((Y) > (X) ? (X) : (Y))
-#define MAX(X, Y) ((Y) < (X) ? (X) : (Y))
+#define Min(X, Y) ((Y) > (X) ? (X) : (Y))
+#define Max(X, Y) ((Y) < (X) ? (X) : (Y))
 
 #define READ32(S)                                                      \
   ((unsigned)(255 & (S)[3]) << 030 | (unsigned)(255 & (S)[2]) << 020 | \
@@ -213,13 +230,15 @@ struct ApeLoader {
 
 static unsigned long StrLen(const char *s) {
   unsigned long n = 0;
-  while (*s++) ++n;
+  while (*s++)
+    ++n;
   return n;
 }
 
 static int StrCmp(const char *l, const char *r) {
   unsigned long i = 0;
-  while (l[i] == r[i] && r[i]) ++i;
+  while (l[i] == r[i] && r[i])
+    ++i;
   return (l[i] & 255) - (r[i] & 255);
 }
 
@@ -268,7 +287,8 @@ static char *Utoa(char p[21], unsigned long x) {
 }
 
 static char *Itoa(char p[21], long x) {
-  if (x < 0) *p++ = '-', x = -(unsigned long)x;
+  if (x < 0)
+    *p++ = '-', x = -(unsigned long)x;
   return Utoa(p, x);
 }
 
@@ -304,7 +324,8 @@ static int GetIndirectOffset(const char *arg0) {
 static void Perror(const char *thing, long rc, const char *reason) {
   char ibuf[21];
   ibuf[0] = 0;
-  if (rc) Itoa(ibuf, -rc);
+  if (rc)
+    Itoa(ibuf, -rc);
   Print(2, "ape error: ", thing, ": ", reason, rc ? " failed w/ errno " : "",
         ibuf, "\n", 0l);
 }
@@ -319,20 +340,11 @@ static char AccessCommand(struct PathSearcher *ps, unsigned long pathlen) {
   if (pathlen + 1 + ps->namelen + 1 > sizeof(ps->path)) {
     return 0;
   }
-  if (pathlen && ps->path[pathlen - 1] != '/') ps->path[pathlen++] = '/';
+  if (pathlen && ps->path[pathlen - 1] != '/')
+    ps->path[pathlen++] = '/';
   memmove(ps->path + pathlen, ps->name, ps->namelen);
   ps->path[pathlen + ps->namelen] = 0;
-  if (!access(ps->path, X_OK)) {
-    if (ps->indirect) {
-      ps->namelen -= 4;
-      ps->path[pathlen + ps->namelen] = 0;
-      if (access(ps->path, X_OK) < 0) {
-        Pexit(ps->path, -errno, "access(X_OK)");
-      }
-    }
-    return 1;
-  }
-  return 0;
+  return !access(ps->path, X_OK);
 }
 
 static char SearchPath(struct PathSearcher *ps) {
@@ -358,12 +370,8 @@ static char FindCommand(struct PathSearcher *ps) {
   ps->path[0] = 0;
 
   /* paths are always 100% taken literally when a slash exists
-       $ ape foo/bar.com arg1 arg2 */
-  if (memchr(ps->name, '/', ps->namelen)) {
-    return AccessCommand(ps, 0);
-  }
-
-  /* we don't run files in the current directory
+       $ ape foo/bar.com arg1 arg2
+     we don't run files in the current directory
        $ ape foo.com arg1 arg2
      unless $PATH has an empty string entry, e.g.
        $ expert PATH=":/bin"
@@ -371,8 +379,8 @@ static char FindCommand(struct PathSearcher *ps) {
      however we will execute this
        $ ape - foo.com foo.com arg1 arg2
      because cosmo's execve needs it */
-  if (ps->literally && AccessCommand(ps, 0)) {
-    return 1;
+  if (ps->literally || memchr(ps->name, '/', ps->namelen)) {
+    return AccessCommand(ps, 0);
   }
 
   /* otherwise search for name on $PATH */
@@ -382,8 +390,11 @@ static char FindCommand(struct PathSearcher *ps) {
 static char *Commandv(struct PathSearcher *ps, const char *name,
                       const char *syspath) {
   ps->syspath = syspath ? syspath : "/bin:/usr/local/bin:/usr/bin";
-  if (!(ps->namelen = StrLen((ps->name = name)))) return 0;
-  if (ps->namelen + 1 > sizeof(ps->path)) return 0;
+  ps->name = name;
+  if (!(ps->namelen = ps->indirect ? ps->indirect : StrLen(ps->name)))
+    return 0;
+  if (ps->namelen + 1 > sizeof(ps->path))
+    return 0;
   if (FindCommand(ps)) {
     return ps->path;
   } else {
@@ -550,6 +561,20 @@ static long sys_pselect(int nfds, fd_set *readfds, fd_set *writefds,
   return sysret(pselect(nfds, readfds, writefds, errorfds, timeout, sigmask));
 }
 
+static long sys_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
+                       void *newp, size_t newlen) {
+  return sysret(sysctl(name, namelen, oldp, oldlenp, newp, newlen));
+}
+
+static long sys_sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
+                             void *newp, size_t newlen) {
+  return sysret(sysctlbyname(name, oldp, oldlenp, newp, newlen));
+}
+
+static long sys_sysctlnametomib(const char *name, int *mibp, size_t *sizep) {
+  return sysret(sysctlnametomib(name, mibp, sizep));
+}
+
 __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
                                                 long *sp, struct ElfEhdr *e,
                                                 struct ElfPhdr *p,
@@ -590,10 +615,11 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
     a = p[i].p_vaddr & -pagesz;
     b = (p[i].p_vaddr + p[i].p_memsz + (pagesz - 1)) & -pagesz;
     for (j = i + 1; j < e->e_phnum; ++j) {
-      if (p[j].p_type != PT_LOAD) continue;
+      if (p[j].p_type != PT_LOAD)
+        continue;
       c = p[j].p_vaddr & -pagesz;
       d = (p[j].p_vaddr + p[j].p_memsz + (pagesz - 1)) & -pagesz;
-      if (MAX(a, c) < MIN(b, d)) {
+      if (Max(a, c) < Min(b, d)) {
         Pexit(exe, 0, "ELF segments overlap each others virtual memory");
       }
     }
@@ -619,7 +645,8 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
   if (e->e_type == ET_DYN) {
     rc = sys_mmap(0, virtmax - virtmin, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS,
                   -1, 0);
-    if (rc < 0) Pexit(exe, rc, "pie mmap");
+    if (rc < 0)
+      Pexit(exe, rc, "pie mmap");
     dynbase = rc;
     if (dynbase & (pagesz - 1)) {
       Pexit(exe, 0, "OS mmap incongruent w/ AT_PAGESZ");
@@ -635,14 +662,18 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
   for (i = 0; i < e->e_phnum; ++i) {
     void *addr;
     unsigned long size;
-    if (p[i].p_type != PT_LOAD) continue;
+    if (p[i].p_type != PT_LOAD)
+      continue;
 
     /* configure mapping */
     prot = 0;
     flags = MAP_FIXED | MAP_PRIVATE;
-    if (p[i].p_flags & PF_R) prot |= PROT_READ;
-    if (p[i].p_flags & PF_W) prot |= PROT_WRITE;
-    if (p[i].p_flags & PF_X) prot |= PROT_EXEC;
+    if (p[i].p_flags & PF_R)
+      prot |= PROT_READ;
+    if (p[i].p_flags & PF_W)
+      prot |= PROT_WRITE;
+    if (p[i].p_flags & PF_X)
+      prot |= PROT_EXEC;
 
     /* load from file */
     if (p[i].p_filesz) {
@@ -662,7 +693,7 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
       a = p[i].p_vaddr + p[i].p_filesz; /* end of file content */
       b = (a + (pagesz - 1)) & -pagesz; /* first pure bss page */
       c = p[i].p_vaddr + p[i].p_memsz;  /* end of segment data */
-      wipe = MIN(b - a, c - a);
+      wipe = Min(b - a, c - a);
       if (wipe && (~prot1 & PROT_WRITE)) {
         prot1 = PROT_READ | PROT_WRITE;
       }
@@ -670,9 +701,9 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
       size = (p[i].p_vaddr & (pagesz - 1)) + p[i].p_filesz;
       if (prot1 & PROT_EXEC) {
 #ifdef SIP_DISABLED
-        // if sip is disabled then we can load the executable segments
-        // off the binary into memory without needing to copy anything
-        // which provides considerably better performance for building
+        /* if sip is disabled then we can load the executable segments
+           off the binary into memory without needing to copy anything
+           which provides considerably better performance for building */
         rc = sys_mmap(addr, size, prot1, flags, fd, p[i].p_offset & -pagesz);
         if (rc < 0) {
           if (rc == -EPERM) {
@@ -684,32 +715,38 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
           }
         }
 #else
-        // the issue is that if sip is enabled then, attempting to map
-        // it with exec permission will cause xnu to phone home a hash
-        // of the entire file to apple intelligence as a one time cost
-        // which is literally minutes for executables holding big data
-        // since there's no public apple api for detecting sip we read
-        // as the default strategy which is slow but it works for both
+        /* the issue is that if sip is enabled then, attempting to map
+           it with exec permission will cause xnu to phone home a hash
+           of the entire file to apple intelligence as a one time cost
+           which is literally minutes for executables holding big data
+           since there's no public apple api for detecting sip we read
+           as the default strategy which is slow but it works for both */
         rc = sys_mmap(addr, size, (prot1 = PROT_READ | PROT_WRITE),
                       MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS, -1, 0);
-        if (rc < 0) Pexit(exe, rc, "prog mmap anon");
+        if (rc < 0)
+          Pexit(exe, rc, "prog mmap anon");
         rc = pread(fd, addr, p[i].p_filesz, p[i].p_offset & -pagesz);
-        if (rc != p[i].p_filesz) Pexit(exe, -errno, "prog pread");
+        if (rc != p[i].p_filesz)
+          Pexit(exe, -errno, "prog pread");
 #endif
       } else {
         rc = sys_mmap(addr, size, prot1, flags, fd, p[i].p_offset & -pagesz);
-        if (rc < 0) Pexit(exe, rc, "prog mmap");
+        if (rc < 0)
+          Pexit(exe, rc, "prog mmap");
       }
-      if (wipe) memset((void *)(dynbase + a), 0, wipe);
+      if (wipe)
+        memset((void *)(dynbase + a), 0, wipe);
       if (prot2 != prot1) {
         rc = sys_mprotect(addr, size, prot2);
-        if (rc < 0) Pexit(exe, rc, "prog mprotect");
+        if (rc < 0)
+          Pexit(exe, rc, "prog mprotect");
       }
       /* allocate extra bss */
       if (c > b) {
         flags |= MAP_ANONYMOUS;
         rc = sys_mmap((void *)(dynbase + b), c - b, prot, flags, -1, 0);
-        if (rc < 0) Pexit(exe, rc, "extra bss mmap");
+        if (rc < 0)
+          Pexit(exe, rc, "extra bss mmap");
       }
     } else {
       /* allocate pure bss */
@@ -717,7 +754,8 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
       size = (p[i].p_vaddr & (pagesz - 1)) + p[i].p_memsz;
       flags |= MAP_ANONYMOUS;
       rc = sys_mmap(addr, size, prot, flags, -1, 0);
-      if (rc < 0) Pexit(exe, rc, "bss mmap");
+      if (rc < 0)
+        Pexit(exe, rc, "bss mmap");
     }
   }
 
@@ -764,7 +802,7 @@ __attribute__((__noreturn__)) static void Spawn(const char *exe, int fd,
 }
 
 static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
-                          const char *exe, int fd, long *sp, long *auxv,
+                          char *exe, int fd, long *sp, long *auxv,
                           char *execfn) {
   long i, rc;
   unsigned size;
@@ -785,6 +823,10 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
   if (e->e_machine != EM_AARCH64) {
     return "couldn't find ELF header with ARM64 machine type";
   }
+  if ((e->e_flags & EF_APE_MODERN_MASK) != EF_APE_MODERN && sp[0] > 0) {
+    /* change argv[0] to resolved path for older binaries */
+    ((char **)(sp + 1))[0] = exe;
+  }
   if (e->e_phentsize != sizeof(struct ElfPhdr)) {
     Pexit(exe, 0, "e_phentsize is wrong");
   }
@@ -795,8 +837,10 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
 
   /* read program headers */
   rc = pread(fd, M->phdr.buf, size, ebuf->ehdr.e_phoff);
-  if (rc < 0) return "failed to read ELF program headers";
-  if (rc != size) return "truncated read of ELF program headers";
+  if (rc < 0)
+    return "failed to read ELF program headers";
+  if (rc != size)
+    return "truncated read of ELF program headers";
 
   /* bail on recoverable program header errors */
   p = &M->phdr.phdr;
@@ -822,12 +866,10 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
     }
   }
 
-  /*
-   * merge adjacent loads that are contiguous with equal protection,
-   * which prevents our program header overlap check from needlessly
-   * failing later on; it also shaves away a microsecond of latency,
-   * since every program header requires invoking at least 1 syscall
-   */
+  /* merge adjacent loads that are contiguous with equal protection,
+     which prevents our program header overlap check from needlessly
+     failing later on; it also shaves away a microsecond of latency,
+     since every program header requires invoking at least 1 syscall */
   for (i = 0; i + 1 < e->e_phnum;) {
     if (p[i].p_type == PT_LOAD && p[i + 1].p_type == PT_LOAD &&
         ((p[i].p_flags & (PF_R | PF_W | PF_X)) ==
@@ -861,25 +903,27 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
   auxv[7] = ebuf->ehdr.e_entry;
   auxv[8] = AT_PAGESZ;
   auxv[9] = pagesz;
-  auxv[10] = AT_UID;
-  auxv[11] = getuid();
-  auxv[12] = AT_EUID;
-  auxv[13] = geteuid();
-  auxv[14] = AT_GID;
-  auxv[15] = getgid();
-  auxv[16] = AT_EGID;
-  auxv[17] = getegid();
-  auxv[18] = AT_HWCAP;
-  auxv[19] = 0xffb3ffffu;
-  auxv[20] = AT_HWCAP2;
-  auxv[21] = 0x181;
-  auxv[22] = AT_SECURE;
-  auxv[23] = issetugid();
-  auxv[24] = AT_RANDOM;
-  auxv[25] = (long)M->rando;
-  auxv[26] = AT_EXECFN;
-  auxv[27] = (long)execfn;
-  auxv[28] = 0;
+  auxv[10] = AT_FLAGS;
+  auxv[11] = M->ps.literally ? AT_FLAGS_PRESERVE_ARGV0 : 0;
+  auxv[12] = AT_UID;
+  auxv[13] = getuid();
+  auxv[14] = AT_EUID;
+  auxv[15] = geteuid();
+  auxv[16] = AT_GID;
+  auxv[17] = getgid();
+  auxv[18] = AT_EGID;
+  auxv[19] = getegid();
+  auxv[20] = AT_HWCAP;
+  auxv[21] = 0xffb3ffffu;
+  auxv[22] = AT_HWCAP2;
+  auxv[23] = 0x181;
+  auxv[24] = AT_SECURE;
+  auxv[25] = issetugid();
+  auxv[26] = AT_RANDOM;
+  auxv[27] = (long)M->rando;
+  auxv[28] = AT_EXECFN;
+  auxv[29] = (long)execfn;
+  auxv[30] = 0;
 
   /* we're now ready to load */
   Spawn(exe, fd, sp, e, p, &M->lib, M->ps.path);
@@ -891,7 +935,7 @@ int main(int argc, char **argv, char **envp) {
   struct ApeLoader *M;
   long *sp, *sp2, *auxv;
   union ElfEhdrBuf *ebuf;
-  char *p, *pe, *exe, *prog, *execfn, *shell;
+  char *p, *pe, *exe, *prog, *execfn;
 
   /* allocate loader memory in program's arg block */
   n = sizeof(struct ApeLoader);
@@ -952,14 +996,22 @@ int main(int argc, char **argv, char **envp) {
   M->lib.dlsym = dlsym;
   M->lib.dlclose = dlclose;
   M->lib.dlerror = dlerror;
+  M->lib.pthread_cpu_number_np = pthread_cpu_number_np;
+  M->lib.sysctl = sys_sysctl;
+  M->lib.sysctlbyname = sys_sysctlbyname;
+  M->lib.sysctlnametomib = sys_sysctlnametomib;
 
   /* getenv("_") is close enough to at_execfn */
-  execfn = argc > 0 ? argv[0] : 0;
+  execfn = 0;
   for (i = 0; envp[i]; ++i) {
     if (envp[i][0] == '_' && envp[i][1] == '=') {
       execfn = envp[i] + 2;
     }
   }
+  prog = GetEnv(envp + i + 1, "executable_path");
+  if (!execfn) {
+    execfn = prog;
+  }
 
   /* sneak the system five abi back out of args */
   sp = (long *)(argv - 1);
@@ -970,7 +1022,8 @@ int main(int argc, char **argv, char **envp) {
      grows down the alloc by poking the guard pages */
   n = (auxv - sp + AUXV_WORDS + 1) * sizeof(long);
   sp2 = (long *)__builtin_alloca(n);
-  if ((long)sp2 & 15) ++sp2;
+  if ((long)sp2 & 15)
+    ++sp2;
   for (; n > 0; n -= pagesz) {
     ((char *)sp2)[n - 1] = 0;
   }
@@ -981,8 +1034,8 @@ int main(int argc, char **argv, char **envp) {
   sp = sp2;
 
   /* interpret command line arguments */
-  if ((M->ps.indirect = argc > 0 ? GetIndirectOffset(argv[0]) : 0)) {
-    /* if argv[0] is $prog.ape, then we strip off the .ape and run
+  if ((M->ps.indirect = GetIndirectOffset(prog))) {
+    /* if called as $prog.ape, then strip off the .ape and run the
        $prog. This allows you to use symlinks to trick the OS when
        a native executable is required. For example, let's say you
        want to use the APE binary /opt/cosmos/bin/bash as a system
@@ -991,13 +1044,7 @@ int main(int argc, char **argv, char **envp) {
        but it will if you say:
            ln -sf /usr/local/bin/ape /opt/cosmos/bin/bash.ape
        and then use #!/opt/cosmos/bin/bash.ape instead. */
-    M->ps.literally = 0;
-    if (*argv[0] == '-' && (shell = GetEnv(envp, "SHELL")) &&
-        !StrCmp(argv[0] + 1, BaseName(shell))) {
-      execfn = prog = shell;
-    } else {
-      prog = (char *)sp[1];
-    }
+    M->ps.literally = 1;
     argc = sp[0];
     argv = (char **)(sp + 1);
   } else if ((M->ps.literally = argc >= 3 && !StrCmp(argv[1], "-"))) {
@@ -1011,7 +1058,7 @@ int main(int argc, char **argv, char **envp) {
   } else if (argc < 2) {
     Emit("usage: ape   PROG [ARGV1,ARGV2,...]\n"
          "       ape - PROG [ARGV0,ARGV1,...]\n"
-         "  ($0 = PROG.ape) [ARGV1,ARGV2,...]\n"
+         "         PROG.ape [ARGV1,ARGV2,...]\n"
          "actually portable executable loader silicon 1.10\n"
          "copyrights 2023 justine alexandra roberts tunney\n"
          "https://justine.lol/ape.html\n");

ape/ape.S

@@ -1,5 +1,5 @@
 /*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
+│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8 nofixeol                        :vi │
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
@@ -33,7 +33,6 @@
 │ αcτµαlly pδrταblε εxεcµταblε § program header                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "ape/macros.internal.h"
-#include "ape/notice.inc"
 #include "ape/relocations.h"
 #include "libc/calls/metalfile.internal.h"
 #include "libc/dce.h"
@@ -197,7 +196,7 @@ ape_mz:
 	.quad	ape_elf_entry			//  18: e_entry
 	.quad	ape_elf_phoff			//  20: e_phoff
 	.quad	ape_elf_shoff			//  28: e_shoff
-	.long	0				//  30: e_flags
+	.long	0x101ca75			//  30: ape e_flags
 	.short	64				//  34: e_ehsize
 	.short	56				//  36: e_phentsize
 	.short	ape_elf_phnum			//  38: e_phnum
@@ -670,7 +669,7 @@ apesh:	.ascii	"\n@\n#'\"\n"			// sixth edition shebang
 	.shstub	    ape_elf_entry,8		//  18: e_entry
 	.shstub	    ape_elf_phoff,8		//  20: e_phoff
 	.shstub	    ape_elf_shoff,8		//  28: e_shoff
-	.ascii	    "\\0\\0\\0\\0"		//  30: e_flags
+	.ascii	    "\\165\\312\\1\\1"		//  30: ape e_flags
 	.ascii	    "\\100\\0"			//  34: e_ehsize
 	.ascii	    "\\070\\0"			//  36: e_phentsize
 	.shstub	    ape_elf_phnum,2		//  38: e_phnum
@@ -700,36 +699,9 @@ apesh:	.ascii	"\n@\n#'\"\n"			// sixth edition shebang
 #endif /* APE_NO_MODIFY_SELF */
 	.ascii	  "exit $?\n"
 	.ascii	"fi\n"				// x86_64
-//	...
-//	decentralized section (.apesh)
-//	...
-	.ascii	"PHDRS='' <<'@'\n"
-	.endobj	apesh
-
-//	elf program headers get inserted here
-//	because they need to be in the first 4096 bytes
-        .section .emushprologue,"a",@progbits
-emush:	.ascii	"\n@\n#'\"\n"
-	.ascii	"s=$(uname -s 2>/dev/null) || s=Darwin\n"
-//	our script is running on a non-x86_64 architecture
-//	1. `dd` out the appropriate blink vm blob
-//	2. gunzip the blink virtual machine executable
-//	3. relaunch this program inside the blink vm
-	.ascii	"o=\"$(command -v \"$0\")\"\n"
-	.ascii	"e=\"${TMPDIR:-${HOME:-.}}/.ape-blink-1.0.0\"\n"
-	.previous
-//	...
-//	decentralized section (.emush)
-//	- __static_yoink("blink_linux_aarch64");  // for raspberry pi
-//	- __static_yoink("blink_xnu_aarch64");    // is apple silicon
-//	...
-        .section .emushepilogue,"a",@progbits
-	.ascii	"echo \"$0: this ape binary lacks $m support\" >&2\n"
-	.rept	16
-	.ascii	"exit 127\n"
-	.endr
+	.ascii	"echo error: this ape binary only supports x86_64 >&2\n"
 	.ascii	"exit 1\n"
-	.previous
+	.endobj	apesh
 
 #ifdef APE_LOADER
         .section .ape.loader,"a",@progbits
@@ -1799,49 +1771,31 @@ kernel:	movabs	$ape_stack_vaddr,%rsp
 	.type	ape_text_nops,@object
 	.type	__test_end,@object
 
-	.section .commentprologue,"a",@progbits
-	.globl	__comment_start
-	.type	__comment_start,@object
-	.hidden	__comment_start
-__comment_start:/*
-	...
-	decentralized content
-	...
-	*/.previous
-	.section .commentepilogue,"a",@progbits
-	.byte	0
-	.previous
-
 	.section .ape.pad.head,"a",@progbits
 	.type	ape_pad_head,@object
 	.hidden	ape_pad_head
 ape_pad_head:
-	.previous
 
 	.section .ape.pad.text,"a",@progbits
 	.type	ape_pad_text,@object
 	.hidden	ape_pad_text
 ape_pad_text:
-	.previous
 
 	.section .ape.pad.privileged,"a",@progbits
 	.type	ape_pad_privileged,@object
 	.hidden	ape_pad_privileged
 ape_pad_privileged:
-	.previous
 
 	.section .ape.pad.data,"a",@progbits
 	.type	ape_pad_data,@object
 	.hidden	ape_pad_data
 ape_pad_data:
-	.previous
 
 #if SupportsWindows()
 	.section .idata.ro,"a",@progbits
 	.type	ape_idata_ro,@object
 	.hidden	ape_idata_ro
 ape_idata_ro:
-	.previous
 #endif /* SupportsWindows() */
 
 	.section .dataprologue,"aw",@progbits
@@ -1849,32 +1803,45 @@ ape_idata_ro:
 	.globl	__data_start
 	.hidden	__data_start
 __data_start:
-	.previous
 
 	.section .dataepilogue,"aw",@progbits
 	.type	__data_end,@object
 	.globl	__data_end
 	.hidden	__data_end
 __data_end:
-	.previous
 
 	.section .bssprologue,"aw",@nobits
 	.type	__bss_start,@object
 	.globl	__bss_start
 	.hidden	__bss_start
 __bss_start:
-	.previous
 
 	.section .bssepilogue,"aw",@nobits
 	.type	__bss_end,@object
 	.globl	__bss_end
 	.hidden	__bss_end
 __bss_end:
-	.previous
 
 	.section .fstls,"awT",@nobits
 	.align	TLS_ALIGNMENT
-	.previous
+
+	.section .notice,"aR",@progbits
+	.asciz	"\n\n\
+Cosmopolitan\n\
+Copyright 2024 Justine Alexandra Roberts Tunney\n\
+\n\
+Permission to use, copy, modify, and/or distribute this software for\n\
+any purpose with or without fee is hereby granted, provided that the\n\
+above copyright notice and this permission notice appear in all copies.\n\
+\n\
+THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL\n\
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED\n\
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE\n\
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL\n\
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR\n\
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n\
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\n\
+PERFORMANCE OF THIS SOFTWARE."
 
 .end
 

ape/ape.lds

@@ -229,7 +229,6 @@ SECTIONS {
 
     /* Real Mode */
     KEEP(*(.head))
-    KEEP(*(.apesh))
     KEEP(*(.text.head))
 
     /* Executable & Linkable Format */
@@ -238,10 +237,6 @@ SECTIONS {
     KEEP(*(.elf.phdrs))
     ape_phdrs_end = .;
 
-    KEEP(*(.emushprologue))
-    KEEP(*(.emush))
-    KEEP(*(.emushepilogue))
-
     /* OpenBSD */
     . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
     ape_note = .;
@@ -287,12 +282,9 @@ SECTIONS {
     KEEP(*(SORT_BY_NAME(.init.*)))
     KEEP(*(.init))
     KEEP(*(.initepilogue))
-    KEEP(*(.pltprologue))
     *(.plt)
-    KEEP(*(.pltepilogue))
-    KEEP(*(.pltgotprologue))
     *(.plt.got)
-    KEEP(*(.pltgotepilogue))
+    *(.iplt)
     *(.text.startup .text.startup.*)
     *(.text.exit .text.exit.*)
     *(.text.unlikely .text.*_unlikely .text.unlikely.*)
@@ -301,7 +293,6 @@ SECTIONS {
     KEEP(*(.textwindowsprologue))
     *(.text.windows)
     KEEP(*(.textwindowsepilogue))
-    KEEP(*(.blink))
     *(SORT_BY_ALIGNMENT(.text.modernity))
     *(SORT_BY_ALIGNMENT(.text.modernity.*))
     *(SORT_BY_ALIGNMENT(.text.hot))
@@ -329,7 +320,7 @@ SECTIONS {
 
 /*BEGIN: Read Only Data */
 
-  .rodata . : {
+  .rodata ALIGN(CONSTANT(COMMONPAGESIZE)) : {
     KEEP(*(.rodata.pytab.0));
     KEEP(*(.rodata.pytab.1));
     KEEP(*(.rodata.pytab.2));
@@ -339,11 +330,11 @@ SECTIONS {
     *(.ubsan.data)
 
     /* Legal Notices */
-#if !defined(IM_FEELING_NAUGHTY) || defined(EMBED_NOTICES)
-    KEEP(*(.commentprologue))
-    KEEP(*(.comment))
-    KEEP(*(.commentepilogue))
-#endif
+    __notices = .;
+    KEEP(*(.notice))
+    BYTE(0);
+    BYTE(10);
+    BYTE(10);
 
 /*BEGIN: read-only data that's only needed for initialization */
 
@@ -399,26 +390,28 @@ SECTIONS {
 /*BEGIN: NT FORK COPYING */
     KEEP(*(.dataprologue))
     *(.data .data.*)
+    *(.gnu_extab)
+    *(.gcc_except_table .gcc_except_table.*)
+    *(.exception_ranges*)
     *(.PyRuntime) /* for python */
     *(.subrs) /* for emacs */
     KEEP(*(SORT_BY_NAME(.sort.data.*)))
     . += . > 0 ? CODE_GRANULE : 0;
 
-    KEEP(*(.gotprologue))
+    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
+    __got_start = .;
     *(.got)
-    KEEP(*(.gotepilogue))
+    __got_end = .;
 
-    KEEP(*(.gotpltprologue))
     *(.got.plt)
-    KEEP(*(.gotpltepilogue))
 
     . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
     __init_array_start = .;
+    KEEP(*(.preinit_array))
     KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*)
            SORT_BY_INIT_PRIORITY(.ctors.*)))
-    KEEP(*(.ctors))
     KEEP(*(.init_array))
-    KEEP(*(.preinit_array))
+    KEEP(*(.ctors))
     __init_array_end = .;
 
     . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
@@ -435,7 +428,9 @@ SECTIONS {
     . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
     KEEP(*(SORT_BY_NAME(.piro.data.sort.*)))
     KEEP(*(.piro.pad.data))
+    *(.igot.plt)
     KEEP(*(.dataepilogue))
+
     . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
 /*END: NT FORK COPYING */
     _edata = .;
@@ -533,7 +528,9 @@ SECTIONS {
     *(.piro.data.sort.iat.*)
 #endif
     *(__patchable_function_entries)
+    *(.note.gnu.property)
     *(__mcount_loc)
+    *(.rela.dyn)
     *(.discard)
     *(.yoink)
   }
@@ -556,7 +553,9 @@ _tdata_size = _tdata_end - _tdata_start;
 _tbss_size = _tbss_end - _tbss_start;
 _tbss_offset = _tbss_start - _tdata_start;
 _tls_content = (_tdata_end - _tdata_start) + (_tbss_end - _tbss_start);
-_tls_align = 1;
+_tdata_align = ALIGNOF(.tdata);
+_tbss_align = ALIGNOF(.tbss);
+_tls_align = MAX(TLS_ALIGNMENT, MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)));
 
 ape_cod_offset = 0;
 ape_cod_vaddr = ADDR(.head);
@@ -613,29 +612,6 @@ SHSTUB2(ape_loader_dd_count,
             ? ROUNDUP(ape_loader_end - ape_loader, CONSTANT(COMMONPAGESIZE)) / 64
             : 0);
 
-#if defined(APE_IS_SHELL_SCRIPT) && !IsTiny()
-
-#define IDENTITY(X) X
-
-#define APE_DECLARE_FIXED_DECIMAL(F, X)                                                      \
-    X##_quad = DEFINED(X) ? ((F(X) < 1000000000 ? 32 : F(X) / 1000000000 % 10 + 48) << 000 | \
-                             (F(X) < 100000000 ? 32 : F(X) / 100000000 % 10 + 48) << 010 |   \
-                             (F(X) < 10000000 ? 32 : F(X) / 10000000 % 10 + 48) << 020 |     \
-                             (F(X) < 1000000 ? 32 : F(X) / 1000000 % 10 + 48) << 030 |       \
-                             (F(X) < 100000 ? 32 : F(X) / 100000 % 10 + 48) << 040 |         \
-                             (F(X) < 10000 ? 32 : F(X) / 10000 % 10 + 48) << 050 |           \
-                             (F(X) < 1000 ? 32 : F(X) / 1000 % 10 + 48) << 060 |             \
-                             (F(X) < 100 ? 32 : F(X) / 100 % 10 + 48) << 070) : 0;           \
-    X##_short = DEFINED(X) ? ((F(X) < 10 ? 32 : F(X) / 10 % 10 + 48) << 000 |                \
-                              (F(X) % 10 + 48) << 010) : 0
-
-APE_DECLARE_FIXED_DECIMAL(RVA,      blink_linux_aarch64);
-APE_DECLARE_FIXED_DECIMAL(IDENTITY, blink_linux_aarch64_size);
-APE_DECLARE_FIXED_DECIMAL(RVA,      blink_xnu_aarch64);
-APE_DECLARE_FIXED_DECIMAL(IDENTITY, blink_xnu_aarch64_size);
-
-#endif /* APE_IS_SHELL_SCRIPT */
-
 #if SupportsMetal()
 v_ape_realsectors = MIN(0x70000 - IMAGE_BASE_REAL, ROUNDUP(RVA(_ezip), 512)) / 512;
 v_ape_realbytes = v_ape_realsectors * 512;

ape/apeinstall.sh

@@ -10,73 +10,98 @@ if [ ! -f ape/loader.c ]; then
   cd "$COSMO" || exit
 fi
 
+if [ -x build/bootstrap/make ]; then
+  MAKE=build/bootstrap/make
+else
+  MAKE=make
+fi
+
 if [ "$(id -u)" -eq 0 ]; then
   SUDO=
-else
+elif command -v sudo >/dev/null 2>&1; then
   SUDO=sudo
+elif command -v doas >/dev/null 2>&1; then
+  SUDO=doas
+else
+  echo "need root or sudo" >&2
+  exit
+fi
+
+if command -v install >/dev/null 2>&1; then
+  if [ x"$(uname -s)" = xLinux ]; then
+    INSTALL="install -o root -g root -m 755"
+  else
+    INSTALL="install -o root -g wheel -m 755"
+  fi
+else
+  INSTALL="cp -f"
 fi
 
 echo "Actually Portable Executable (APE) Installer" >&2
 echo "Author:  Justine Tunney <[email protected]>"  >&2
 
 # special installation process for apple silicon
-if [ "$(uname -s)" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then
+if [ x"$(uname -s)" = xDarwin ] && [ x"$(uname -m)" = xarm64 ]; then
   echo "cc -O -o $TMPDIR/ape.$$ ape/ape-m1.c" >&2
   cc -O -o "$TMPDIR/ape.$$" ape/ape-m1.c || exit
+  trap 'rm "$TMPDIR/ape.$$"' EXIT
   if [ ! -d /usr/local/bin ]; then
     echo "$SUDO mkdir -p /usr/local/bin" >&2
     $SUDO mkdir -p /usr/local/bin || exit
   fi
-  echo "$SUDO mv -f $TMPDIR/ape.$$ /usr/local/bin/ape" >&2
-  $SUDO mv -f "$TMPDIR/ape.$$" /usr/local/bin/ape || exit
+  echo "$SUDO $INSTALL $TMPDIR/ape.$$ /usr/local/bin/ape" >&2
+  $SUDO $INSTALL "$TMPDIR/ape.$$" /usr/local/bin/ape || exit
+  exit
+fi
+
+if [ x"$(uname -m)" = xarm64 ] || [ x"$(uname -m)" = xaarch64 ]; then
+  MODE=aarch64
+  EXT=elf
+  BEXT=aarch64
+elif [ x"$(uname -m)" = xx86_64 ]; then
+  MODE=
+  if [ x"$(uname -s)" = xDarwin ]; then
+    EXT=macho
+  else
+    EXT=elf
+  fi
+  BEXT=$EXT
+else
+  echo "unsupported architecture $(uname -m)" >&2
   exit
 fi
 
 ################################################################################
 # INSTALL APE LOADER SYSTEMWIDE
 
-if [ -f o/depend ] && make -j8 o//ape; then
+if [ -f o/$MODE/depend ] && $MAKE -j8 o/$MODE/ape; then
   echo "successfully recompiled ape loader" >&2
-elif [ -x o//ape/ape.elf ] && [ -x o//ape/ape.macho ]; then
+elif [ -x o/$MODE/ape/ape.$EXT ]; then
   echo "using ape loader you compiled earlier" >&2
 elif [ -d build/bootstrap ]; then
   # if make isn't being used then it's unlikely the user changed the sources
   # in that case the prebuilt binaries should be completely up-to-date
   echo "using prebuilt ape loader from cosmo repo" >&2
-  mkdir -p o//ape || exit
-  cp -af build/bootstrap/ape.elf o//ape/ape.elf || exit
-  cp -af build/bootstrap/ape.macho o//ape/ape.macho || exit
+  mkdir -p o/$MODE/ape || exit
+  cp -af build/bootstrap/ape.$BEXT o/$MODE/ape/ape.$EXT || exit
 else
   echo "no cosmopolitan libc repository here" >&2
-  echo "fetching ape loader from justine.lol"  >&2
-  mkdir -p o//ape || exit
+  echo "fetching ape loader from justine.lol" >&2
+  mkdir -p o/$MODE/ape || exit
   if command -v wget >/dev/null 2>&1; then
-    wget -qO o//ape/ape.elf https://justine.lol/ape.elf || exit
-    wget -qO o//ape/ape.macho https://justine.lol/ape.macho || exit
+    wget -qO o/$MODE/ape/ape.$EXT https://justine.lol/ape.$BEXT || exit
   else
-    curl -Rso o//ape/ape.elf https://justine.lol/ape.elf || exit
-    curl -Rso o//ape/ape.macho https://justine.lol/ape.macho || exit
+    curl -Rso o/$MODE/ape/ape.$EXT https://justine.lol/ape.$BEXT || exit
   fi
-  chmod +x o//ape/ape.elf || exit
-  chmod +x o//ape/ape.macho || exit
+  chmod +x o/$MODE/ape/ape.$EXT || exit
 fi
 
-if [ "$(uname -s)" = "Darwin" ]; then
-  if ! [ /usr/bin/ape -nt o//ape/ape.macho ]; then
-    echo >&2
-    echo "installing o//ape/ape.macho to /usr/bin/ape" >&2
-    echo "$SUDO cp -f o//ape/ape.macho /usr/bin/ape" >&2
-    $SUDO cp -f o//ape/ape.macho /usr/bin/ape || exit
-    echo "done" >&2
-  fi
-else
-  if ! [ /usr/bin/ape -nt o//ape/ape.elf ]; then
-    echo >&2
-    echo "installing o//ape/ape.elf to /usr/bin/ape" >&2
-    echo "$SUDO mv -f o//ape/ape.elf /usr/bin/ape" >&2
-    $SUDO cp -f o//ape/ape.elf /usr/bin/ape || exit
-    echo "done" >&2
-  fi
+if ! [ /usr/bin/ape -nt o/$MODE/ape/ape.$EXT ]; then
+  echo >&2
+  echo "installing o/$MODE/ape/ape.$EXT to /usr/bin/ape" >&2
+  echo "$SUDO $INSTALL o/$MODE/ape/ape.$EXT /usr/bin/ape" >&2
+  $SUDO $INSTALL o/$MODE/ape/ape.$EXT /usr/bin/ape || exit
+  echo "done" >&2
 fi
 
 ################################################################################
@@ -112,13 +137,20 @@ if [ x"$(uname -s)" = xLinux ]; then
     echo done >&2
   fi
 
+  uname_r="$(uname -r)"
+  if printf '%s\n%s\n' 5.12 "$uname_r" | sort -CV; then
+    FLAGS=FP
+  else
+    FLAGS=F
+  fi
+
   echo >&2
   echo registering APE with binfmt_misc >&2
   echo you may need to edit configs to persist across reboot >&2
-  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
-  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:'"$FLAGS'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:$FLAGS' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:'"$FLAGS'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:$FLAGS' >/proc/sys/fs/binfmt_misc/register" || exit
   echo done >&2
 
   if [ x"$(cat /proc/sys/fs/binfmt_misc/status)" = xdisabled ]; then

ape/apeuninstall.sh

@@ -11,8 +11,13 @@ fi
 
 if [ "$UID" = "0" ]; then
   SUDO=
-else
+elif command -v sudo >/dev/null 2>&1; then
   SUDO=sudo
+elif command -v doas >/dev/null 2>&1; then
+  SUDO=doas
+else
+  echo "need root or sudo" >&2
+  exit
 fi
 
 {
@@ -54,9 +59,7 @@ for x in .ape \
          .ape-1.7 \
          .ape-1.8 \
          .ape-1.9 \
-         .ape-1.10 \
-         .ape-blink-0.9.2 \
-         .ape-blink-1.0.0; do
+         .ape-1.10; do
   rm -f \
      ~/$x \
      /tmp/$x \

ape/loader-macho.S

@@ -22,7 +22,7 @@
 #include "libc/macros.internal.h"
 
 //	Apple Mach-O Executable Headers
-//	Fixups are applied by objbincopy.com
+//	Fixups are applied by objbincopy
 //	There must exist a MAC_LC_SEGMENT_64 for every PT_LOAD
 
 	.section .macho,"a",@progbits

ape/loader.c

@@ -113,41 +113,47 @@
 #define EXTERN_C
 #endif
 
-#define O_RDONLY           0
-#define PROT_NONE          0
-#define PROT_READ          1
-#define PROT_WRITE         2
-#define PROT_EXEC          4
-#define MAP_SHARED         1
-#define MAP_PRIVATE        2
-#define MAP_FIXED          16
-#define MAP_ANONYMOUS      (IsLinux() ? 32 : 4096)
-#define MAP_NORESERVE      (IsLinux() ? 16384 : 0)
-#define ELFCLASS32         1
-#define ELFDATA2LSB        1
-#define EM_NEXGEN32E       62
-#define EM_AARCH64         183
-#define ET_EXEC            2
-#define ET_DYN             3
-#define PT_LOAD            1
-#define PT_DYNAMIC         2
-#define PT_INTERP          3
-#define EI_CLASS           4
-#define EI_DATA            5
-#define PF_X               1
-#define PF_W               2
-#define PF_R               4
-#define AT_PHDR            3
-#define AT_PHENT           4
-#define AT_PHNUM           5
-#define AT_PAGESZ          6
-#define AT_EXECFN_LINUX    31
-#define AT_EXECFN_NETBSD   2014
-#define X_OK               1
-#define XCR0_SSE           2
-#define XCR0_AVX           4
-#define PR_SET_MM          35
-#define PR_SET_MM_EXE_FILE 13
+#define O_RDONLY                    0
+#define PROT_NONE                   0
+#define PROT_READ                   1
+#define PROT_WRITE                  2
+#define PROT_EXEC                   4
+#define MAP_SHARED                  1
+#define MAP_PRIVATE                 2
+#define MAP_FIXED                   16
+#define MAP_ANONYMOUS               (IsLinux() ? 32 : 4096)
+#define MAP_NORESERVE               (IsLinux() ? 16384 : 0)
+#define ELFCLASS32                  1
+#define ELFDATA2LSB                 1
+#define EM_NEXGEN32E                62
+#define EM_AARCH64                  183
+#define ET_EXEC                     2
+#define ET_DYN                      3
+#define PT_LOAD                     1
+#define PT_DYNAMIC                  2
+#define PT_INTERP                   3
+#define EI_CLASS                    4
+#define EI_DATA                     5
+#define PF_X                        1
+#define PF_W                        2
+#define PF_R                        4
+#define AT_PHDR                     3
+#define AT_PHENT                    4
+#define AT_PHNUM                    5
+#define AT_PAGESZ                   6
+#define AT_FLAGS                    8
+#define AT_FLAGS_PRESERVE_ARGV0_BIT 0
+#define AT_FLAGS_PRESERVE_ARGV0     (1 << AT_FLAGS_PRESERVE_ARGV0_BIT)
+#define AT_EXECFN_LINUX             31
+#define AT_EXECFN_NETBSD            2014
+#define X_OK                        1
+#define XCR0_SSE                    2
+#define XCR0_AVX                    4
+#define PR_SET_MM                   35
+#define PR_SET_MM_EXE_FILE          13
+
+#define EF_APE_MODERN      0x101ca75
+#define EF_APE_MODERN_MASK 0x1ffffff
 
 #define READ32(S)                                                      \
   ((unsigned)(255 & (S)[3]) << 030 | (unsigned)(255 & (S)[2]) << 020 | \
@@ -163,13 +169,6 @@
    (unsigned long)(255 & (S)[1]) << 010 | \
    (unsigned long)(255 & (S)[0]) << 000)
 
-#define DEBUG(VAR)                          \
-  {                                         \
-    char ibuf[19] = {0};                    \
-    Utox(ibuf, VAR);                        \
-    Print(os, 2, ibuf, " " #VAR, "\n", 0l); \
-  }
-
 struct ElfEhdr {
   unsigned char e_ident[16];
   unsigned short e_type;
@@ -232,13 +231,15 @@ extern char _end[];
 
 static unsigned long StrLen(const char *s) {
   unsigned long n = 0;
-  while (*s++) ++n;
+  while (*s++)
+    ++n;
   return n;
 }
 
 static int StrCmp(const char *l, const char *r) {
   unsigned long i = 0;
-  while (l[i] == r[i] && r[i]) ++i;
+  while (l[i] == r[i] && r[i])
+    ++i;
   return (l[i] & 255) - (r[i] & 255);
 }
 
@@ -337,23 +338,6 @@ static char *GetEnv(char **p, const char *s) {
   return 0;
 }
 
-static char *Utox(char p[19], unsigned long x) {
-  int i;
-  if (x) {
-    *p++ = '0';
-    *p++ = 'x';
-    i = (__builtin_clzl(x) ^ (sizeof(long) * 8 - 1)) + 1;
-    i = (i + 3) & -4;
-    do {
-      *p++ = "0123456789abcdef"[(x >> (i -= 4)) & 15];
-    } while (i);
-  } else {
-    *p++ = '0';
-  }
-  *p = 0;
-  return p;
-}
-
 static char *Utoa(char p[20], unsigned long x) {
   char t;
   unsigned long i, a, b;
@@ -374,7 +358,8 @@ static char *Utoa(char p[20], unsigned long x) {
 }
 
 static char *Itoa(char p[21], long x) {
-  if (x < 0) *p++ = '-', x = -(unsigned long)x;
+  if (x < 0)
+    *p++ = '-', x = -(unsigned long)x;
   return Utoa(p, x);
 }
 
@@ -383,7 +368,8 @@ __attribute__((__noinline__)) static long CallSystem(long arg1, long arg2,
                                                      long arg5, long arg6,
                                                      long arg7, int numba,
                                                      char os) {
-  if (IsXnu()) numba |= 0x2000000;
+  if (IsXnu())
+    numba |= 0x2000000;
   return SystemCall(arg1, arg2, arg3, arg4, arg5, arg6, arg7, numba);
 }
 
@@ -531,10 +517,62 @@ static long Print(int os, int fd, const char *s, ...) {
   return Write(fd, b, n, os);
 }
 
+static long Printf(int os, int fd, const char *fmt, ...) {
+  int i;
+  char c;
+  int k = 0;
+  unsigned u;
+  char b[512];
+  const char *s;
+  unsigned long d;
+  __builtin_va_list va;
+  __builtin_va_start(va, fmt);
+  for (;;) {
+    switch ((c = *fmt++)) {
+      case '\0':
+        __builtin_va_end(va);
+        return Write(fd, b, k, os);
+      case '%':
+        switch ((c = *fmt++)) {
+          case 's':
+            for (s = __builtin_va_arg(va, const char *); s && *s; ++s) {
+              if (k < 512)
+                b[k++] = *s;
+            }
+            break;
+          case 'd':
+            d = __builtin_va_arg(va, unsigned long);
+            for (i = 16; i--;) {
+              u = (d >> (i * 4)) & 15;
+              if (u < 10) {
+                c = '0' + u;
+              } else {
+                u -= 10;
+                c = 'a' + u;
+              }
+              if (k < 512)
+                b[k++] = c;
+            }
+            break;
+          default:
+            if (k < 512)
+              b[k++] = c;
+            break;
+        }
+        break;
+      default:
+        if (k < 512)
+          b[k++] = c;
+        break;
+    }
+  }
+}
+
 static void Perror(int os, const char *thing, long rc, const char *reason) {
   char ibuf[21];
   ibuf[0] = 0;
-  if (rc) Itoa(ibuf, -rc);
+  if (rc)
+    Itoa(ibuf, -rc);
   Print(os, 2, "ape error: ", thing, ": ", reason,
         rc ? " failed w/ errno " : "", ibuf, "\n", 0l);
 }
@@ -546,8 +584,10 @@ __attribute__((__noreturn__)) static void Pexit(int os, const char *c, int rc,
 }
 
 static char AccessCommand(struct PathSearcher *ps, unsigned long pathlen) {
-  if (pathlen + 1 + ps->namelen + 1 > sizeof(ps->path)) return 0;
-  if (pathlen && ps->path[pathlen - 1] != '/') ps->path[pathlen++] = '/';
+  if (pathlen + 1 + ps->namelen + 1 > sizeof(ps->path))
+    return 0;
+  if (pathlen && ps->path[pathlen - 1] != '/')
+    ps->path[pathlen++] = '/';
   MemMove(ps->path + pathlen, ps->name, ps->namelen);
   ps->path[pathlen + ps->namelen] = 0;
   return !Access(ps->path, X_OK, ps->os);
@@ -572,39 +612,18 @@ static char SearchPath(struct PathSearcher *ps) {
   }
 }
 
-static char FindCommand(struct PathSearcher *ps) {
-  ps->path[0] = 0;
-
-  /* paths are always 100% taken literally when a slash exists
-       $ ape foo/bar.com arg1 arg2 */
-  if (MemChr(ps->name, '/', ps->namelen)) {
-    return AccessCommand(ps, 0);
-  }
-
-  /* we don't run files in the current directory
-       $ ape foo.com arg1 arg2
-     unless $PATH has an empty string entry, e.g.
-       $ expert PATH=":/bin"
-       $ ape foo.com arg1 arg2
-     however we will execute this
-       $ ape - foo.com foo.com arg1 arg2
-     because cosmo's execve needs it */
-  if (ps->literally && AccessCommand(ps, 0)) {
-    return 1;
-  }
-
-  /* otherwise search for name on $PATH */
-  return SearchPath(ps);
-}
-
 static char *Commandv(struct PathSearcher *ps, int os, char *name,
-                      const char *syspath, int may_path_search) {
-  if (!may_path_search) return name;
+                      const char *syspath) {
+  if (!(ps->namelen = StrLen((ps->name = name))))
+    return 0;
+  if (ps->literally || MemChr(ps->name, '/', ps->namelen))
+    return name;
   ps->os = os;
   ps->syspath = syspath ? syspath : "/bin:/usr/local/bin:/usr/bin";
-  if (!(ps->namelen = StrLen((ps->name = name)))) return 0;
-  if (ps->namelen + 1 > sizeof(ps->path)) return 0;
-  if (FindCommand(ps)) {
+  if (ps->namelen + 1 > sizeof(ps->path))
+    return 0;
+  ps->path[0] = 0;
+  if (SearchPath(ps)) {
     return ps->path;
   } else {
     return 0;
@@ -659,7 +678,8 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
       Pexit(os, exe, 0, "ELF segments overlap your APE loader");
     }
     for (j = i + 1; j < e->e_phnum; ++j) {
-      if (p[j].p_type != PT_LOAD) continue;
+      if (p[j].p_type != PT_LOAD)
+        continue;
       c = p[j].p_vaddr & -pagesz;
       d = (p[j].p_vaddr + p[j].p_memsz + (pagesz - 1)) & -pagesz;
       if (MAX(a, c) < MIN(b, d)) {
@@ -692,7 +712,8 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
   if (e->e_type == ET_DYN) {
     rc = Mmap(0, virtmax - virtmin, PROT_NONE,
               MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0, os);
-    if (rc < 0) Pexit(os, exe, rc, "pie mmap");
+    if (rc < 0)
+      Pexit(os, exe, rc, "pie mmap");
     dynbase = rc;
     if (dynbase & (pagesz - 1)) {
       Pexit(os, exe, 0, "OS mmap incongruent w/ AT_PAGESZ");
@@ -708,14 +729,18 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
   for (i = 0; i < e->e_phnum; ++i) {
     void *addr;
     unsigned long size;
-    if (p[i].p_type != PT_LOAD) continue;
+    if (p[i].p_type != PT_LOAD)
+      continue;
 
     /* configure mapping */
     prot = 0;
     flags = MAP_FIXED | MAP_PRIVATE;
-    if (p[i].p_flags & PF_R) prot |= PROT_READ;
-    if (p[i].p_flags & PF_W) prot |= PROT_WRITE;
-    if (p[i].p_flags & PF_X) prot |= PROT_EXEC;
+    if (p[i].p_flags & PF_R)
+      prot |= PROT_READ;
+    if (p[i].p_flags & PF_W)
+      prot |= PROT_WRITE;
+    if (p[i].p_flags & PF_X)
+      prot |= PROT_EXEC;
 
     if (p[i].p_filesz) {
       /* load from file */
@@ -742,17 +767,21 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
       addr = (void *)(dynbase + (p[i].p_vaddr & -pagesz));
       size = (p[i].p_vaddr & (pagesz - 1)) + p[i].p_filesz;
       rc = Mmap(addr, size, prot1, flags, fd, p[i].p_offset & -pagesz, os);
-      if (rc < 0) Pexit(os, exe, rc, "prog mmap");
-      if (wipe) Bzero((void *)(dynbase + a), wipe);
+      if (rc < 0)
+        Pexit(os, exe, rc, "prog mmap");
+      if (wipe)
+        Bzero((void *)(dynbase + a), wipe);
       if (prot2 != prot1) {
         rc = Mprotect(addr, size, prot2, os);
-        if (rc < 0) Pexit(os, exe, rc, "prog mprotect");
+        if (rc < 0)
+          Pexit(os, exe, rc, "prog mprotect");
       }
       /* allocate extra bss */
       if (c > b) {
         flags |= MAP_ANONYMOUS;
         rc = Mmap((void *)(dynbase + b), c - b, prot, flags, -1, 0, os);
-        if (rc < 0) Pexit(os, exe, rc, "extra bss mmap");
+        if (rc < 0)
+          Pexit(os, exe, rc, "extra bss mmap");
       }
     } else {
       /* allocate pure bss */
@@ -760,7 +789,8 @@ __attribute__((__noreturn__)) static void Spawn(int os, char *exe, int fd,
       size = (p[i].p_vaddr & (pagesz - 1)) + p[i].p_memsz;
       flags |= MAP_ANONYMOUS;
       rc = Mmap(addr, size, prot, flags, -1, 0, os);
-      if (rc < 0) Pexit(os, exe, rc, "bss mmap");
+      if (rc < 0)
+        Pexit(os, exe, rc, "bss mmap");
     }
   }
 
@@ -781,7 +811,8 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
   struct ElfPhdr *p;
 
   /* validate page size */
-  if (!pagesz) pagesz = 4096;
+  if (!pagesz)
+    pagesz = 4096;
   if (pagesz & (pagesz - 1)) {
     Pexit(os, exe, 0, "AT_PAGESZ isn't two power");
   }
@@ -806,6 +837,10 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
     return "couldn't find ELF header with x86-64 machine type";
   }
 #endif
+  if ((e->e_flags & EF_APE_MODERN_MASK) != EF_APE_MODERN && sp[0] > 0) {
+    /* change argv[0] to resolved path for older binaries */
+    ((char **)(sp + 1))[0] = exe;
+  }
   if (e->e_phentsize != sizeof(struct ElfPhdr)) {
     Pexit(os, exe, 0, "e_phentsize is wrong");
   }
@@ -816,8 +851,10 @@ static const char *TryElf(struct ApeLoader *M, union ElfEhdrBuf *ebuf,
 
   /* read program headers */
   rc = Pread(fd, M->phdr.buf, size, e->e_phoff, os);
-  if (rc < 0) return "failed to read ELF program headers";
-  if (rc != size) return "truncated read of ELF program headers";
+  if (rc < 0)
+    return "failed to read ELF program headers";
+  if (rc != size)
+    return "truncated read of ELF program headers";
 
   /* bail on recoverable program header errors */
   p = &M->phdr.phdr;
@@ -897,7 +934,7 @@ __attribute__((__noreturn__)) static void ShowUsage(int os, int fd, int rc) {
         "NAME\n"
         "\n"
         "  actually portable executable loader version " APE_VERSION_STR "\n"
-        "  copyright 2023 justine alexandra roberts tunney\n"
+        "  copyrights 2024 justine alexandra roberts tunney\n"
         "  https://justine.lol/ape.html\n"
         "\n"
         "USAGE\n"
@@ -913,16 +950,16 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
                                                       char dl) {
   int rc, n;
   unsigned i;
-  char literally;
   const char *ape;
   int c, fd, os, argc;
   struct ApeLoader *M;
+  char arg0, literally;
   unsigned long pagesz;
   union ElfEhdrBuf *ebuf;
   long *auxv, *ap, *endp, *sp2;
   char *p, *pe, *exe, *prog, **argv, **envp;
 
-  (void)Utox;
+  (void)Printf;
 
   /* detect freebsd */
   if (SupportsXnu() && dl == XNU) {
@@ -947,7 +984,8 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
 
   /* determine ape loader program name */
   ape = argv[0];
-  if (!ape) ape = "ape";
+  if (!ape)
+    ape = "ape";
 
   /* detect openbsd */
   if (SupportsOpenbsd() && !os && !auxv[0]) {
@@ -961,11 +999,15 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
 
   /* detect netbsd and find end of words */
   pagesz = 0;
+  arg0 = 0;
   for (ap = auxv; ap[0]; ap += 2) {
     if (ap[0] == AT_PAGESZ) {
       pagesz = ap[1];
     } else if (SupportsNetbsd() && !os && ap[0] == AT_EXECFN_NETBSD) {
       os = NETBSD;
+    } else if (SupportsLinux() && ap[0] == AT_FLAGS) {
+      // TODO(mrdomino): maybe set/insert this when we are called as "ape -".
+      arg0 = !!(ap[1] & AT_FLAGS_PRESERVE_ARGV0);
     }
   }
   if (!pagesz) {
@@ -979,8 +1021,12 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
   }
 
   /* we can load via shell, shebang, or binfmt_misc */
-  int may_path_search = 1;
-  if ((literally = argc >= 3 && !StrCmp(argv[1], "-"))) {
+  if (arg0) {
+    literally = 1;
+    prog = (char *)sp[2];
+    argc = sp[2] = sp[0] - 2;
+    argv = (char **)((sp += 2) + 1);
+  } else if ((literally = argc >= 3 && !StrCmp(argv[1], "-"))) {
     /* if the first argument is a hyphen then we give the user the
        power to change argv[0] or omit it entirely. most operating
        systems don't permit the omission of argv[0] but we do, b/c
@@ -988,12 +1034,12 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
     prog = (char *)sp[3];
     argc = sp[3] = sp[0] - 3;
     argv = (char **)((sp += 3) + 1);
-    may_path_search = 0;
   } else if (argc < 2) {
     ShowUsage(os, 2, 1);
   } else {
     if (argv[1][0] == '-') {
-      rc = !(argv[1][1] == 'h' && !argv[1][2]) || !StrCmp(argv[1] + 1, "-help");
+      rc = !((argv[1][1] == 'h' && !argv[1][2]) ||
+             !StrCmp(argv[1] + 1, "-help"));
       ShowUsage(os, 1 + rc, rc);
     }
     prog = (char *)sp[2];
@@ -1011,7 +1057,8 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
      grows down the alloc by poking the guard pages */
   n = (endp - sp + 1) * sizeof(long);
   sp2 = (long *)__builtin_alloca(n);
-  if ((long)sp2 & 15) ++sp2;
+  if ((long)sp2 & 15)
+    ++sp2;
   for (; n > 0; n -= pagesz) {
     ((char *)sp2)[n - 1] = 0;
   }
@@ -1029,8 +1076,7 @@ EXTERN_C __attribute__((__noreturn__)) void ApeLoader(long di, long *sp,
   }
 
   /* resolve path of executable and read its first page */
-  if (!(exe = Commandv(&M->ps, os, prog, GetEnv(envp, "PATH"),
-                       may_path_search))) {
+  if (!(exe = Commandv(&M->ps, os, prog, GetEnv(envp, "PATH")))) {
     Pexit(os, prog, 0, "not found (maybe chmod +x or ./ needed)");
   } else if ((fd = Open(exe, O_RDONLY, 0, os)) < 0) {
     Pexit(os, exe, fd, "open");

ape/sections.internal.h

@@ -2,7 +2,7 @@
 #define COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_
 COSMOPOLITAN_C_START_
 
-extern const char __comment_start[] __attribute__((__weak__));
+extern const char __notices[] __attribute__((__weak__));
 extern unsigned char __executable_start[] __attribute__((__weak__));
 extern unsigned char __privileged_start[] __attribute__((__weak__));
 extern unsigned char _ehead[] __attribute__((__weak__));
@@ -16,12 +16,16 @@ extern unsigned char _tdata_end[] __attribute__((__weak__));
 extern unsigned char _tbss_start[] __attribute__((__weak__));
 extern unsigned char _tbss_end[] __attribute__((__weak__));
 extern unsigned char _tls_align[] __attribute__((__weak__));
+extern unsigned char _tdata_align[] __attribute__((__weak__));
+extern unsigned char _tbss_align[] __attribute__((__weak__));
 extern unsigned char __test_start[] __attribute__((__weak__));
 extern unsigned char __ro[] __attribute__((__weak__));
-extern uint8_t __data_start[] __attribute__((__weak__));
-extern uint8_t __data_end[] __attribute__((__weak__));
-extern uint8_t __bss_start[] __attribute__((__weak__));
-extern uint8_t __bss_end[] __attribute__((__weak__));
+extern unsigned char __data_start[] __attribute__((__weak__));
+extern unsigned char __data_end[] __attribute__((__weak__));
+extern unsigned char __bss_start[] __attribute__((__weak__));
+extern unsigned char __bss_end[] __attribute__((__weak__));
+extern unsigned long __got_start[] __attribute__((__weak__));
+extern unsigned long __got_end[] __attribute__((__weak__));
 extern unsigned char ape_phdrs[] __attribute__((__weak__));
 
 COSMOPOLITAN_C_END_

build/bootstrap/gcc-only-flags.txt

@@ -0,0 +1,58 @@
+--nocompress-debug-sections
+--noexecstack
+-Wa,--nocompress-debug-sections
+-Wa,--noexecstack
+-Wa,-msse2avx
+-Werror=maybe-uninitialized
+-Wno-literal-suffix
+-Wno-unused-but-set-variable
+-Wunsafe-loop-optimizations
+-fbranch-target-load-optimize
+-fcx-limited-range
+-fdelete-dead-exceptions
+-femit-struct-debug-baseonly
+-ffp-int-builtin-inexact
+-finline-functions-called-once
+-fipa-pta
+-fivopts
+-flimit-function-alignment
+-fmerge-constants
+-fmodulo-sched
+-fmodulo-sched-allow-regmoves
+-fno-align-jumps
+-fno-align-labels
+-fno-align-loops
+-fno-code-hoisting
+-fno-cx-limited-range
+-fno-fp-int-builtin-inexact
+-fno-gnu-unique
+-fno-inline-functions-called-once
+-fno-instrument-functions
+-fno-schedule-insns2
+-fno-whole-program
+-fopt-info-vec
+-fopt-info-vec-missed
+-freg-struct-return
+-freschedule-modulo-scheduled-loops
+-frounding-math
+-fsched2-use-superblocks
+-fschedule-insns
+-fschedule-insns2
+-fshrink-wrap
+-fshrink-wrap-separate
+-fsignaling-nans
+-fstack-clash-protection
+-ftracer
+-ftrapv
+-ftree-loop-im
+-ftree-loop-vectorize
+-funsafe-loop-optimizations
+-fversion-loops-for-strides
+-fwhole-program
+-gdescribe-dies
+-gstabs
+-mcall-ms2sysv-xlogues
+-mdispatch-scheduler
+-mfpmath=sse+387
+-mmitigate-rop
+-mno-fentry

build/definitions.mk

@@ -53,93 +53,8 @@
 #     OVERRIDE_FOO set ~/.cosmo.mk and target-specific (use rarely)
 #
 
-LC_ALL = C
-SOURCE_DATE_EPOCH = 0
-
-ARFLAGS = rcsD
-ZFLAGS ?=
-XARGS ?= xargs -P4 -rs8000
-DOT ?= dot
-CLANG = clang
-TMPDIR = o/tmp
-
-AR = build/bootstrap/ar.com
-CP = build/bootstrap/cp.com
-RM = build/bootstrap/rm.com -f
-GZIP = build/bootstrap/gzip.com
-ECHO = build/bootstrap/echo.com
-CHMOD = build/bootstrap/chmod.com
-TOUCH = build/bootstrap/touch.com
-PKG = build/bootstrap/package.com
-MKDEPS = build/bootstrap/mkdeps.com
-ZIPOBJ = build/bootstrap/zipobj.com
-ZIPCOPY = build/bootstrap/zipcopy.com
-PECHECK = build/bootstrap/pecheck.com
-FIXUPOBJ = build/bootstrap/fixupobj.com
-MKDIR = build/bootstrap/mkdir.com -p
-COMPILE = build/bootstrap/compile.com -V9 -P4096 $(QUOTA)
-
-COMMA := ,
-PWD := $(shell build/bootstrap/pwd.com)
-
-IGNORE := $(shell $(MKDIR) $(TMPDIR))
-
-ifneq ($(findstring aarch64,$(MODE)),)
-ARCH = aarch64
-HOSTS ?= pi studio freebsdarm
-else
-ARCH = x86_64
-HOSTS ?= freebsd rhel7 xnu win10 openbsd netbsd
-endif
-
-ZIPOBJ_FLAGS += -a$(ARCH)
-
-ifeq ($(PREFIX),)
-ifeq ($(USE_SYSTEM_TOOLCHAIN),)
-ifeq ($(ARCH),x86_64)
-ifneq ("$(wildcard o/third_party/gcc/bin/x86_64-linux-cosmo-*)","")
-PREFIX = o/third_party/gcc/bin/x86_64-linux-cosmo-
-else
-IGNORE := $(shell build/bootstrap/unbundle.com)
-PREFIX = o/third_party/gcc/bin/x86_64-linux-musl-
-endif
-endif # ($(ARCH),x86_64))
-ifeq ($(ARCH),aarch64)
-ifneq ("$(wildcard o/third_party/gcc/bin/aarch64-linux-cosmo-*)","")
-PREFIX = o/third_party/gcc/bin/aarch64-linux-cosmo-
-else
-IGNORE := $(shell build/bootstrap/unbundle.com)
-PREFIX = o/third_party/gcc/bin/aarch64-linux-musl-
-endif
-endif # ($(ARCH),aarch64)
-endif # ($(USE_SYSTEM_TOOLCHAIN),)
-endif # ($(PREFIX),)
-
-AS = $(PREFIX)as
-CC = $(PREFIX)gcc
-CXX = $(PREFIX)g++
-CXXFILT = $(PREFIX)c++filt
-LD = $(PREFIX)ld.bfd
-NM = $(PREFIX)nm
-GCC = $(PREFIX)gcc
-STRIP = $(PREFIX)strip
-OBJCOPY = $(PREFIX)objcopy
-OBJDUMP = $(PREFIX)objdump
-ifneq ($(wildcard $(PWD)/$(PREFIX)addr2line),)
-ADDR2LINE = $(PWD)/$(PREFIX)addr2line
-else
-ADDR2LINE = $(PREFIX)addr2line
-endif
-
-export ADDR2LINE
-export LC_ALL
-export MKDIR
-export MODE
-export SOURCE_DATE_EPOCH
-export TMPDIR
-
 ifeq ($(LANDLOCKMAKE_VERSION),)
-TMPSAFE = $(join $(TMPDIR),$(subst /,_,$@)).tmp
+TMPSAFE = $(join $(TMPDIR)/,$(subst /,_,$@)).tmp
 else
 TMPSAFE = $(TMPDIR)/
 endif
@@ -148,10 +63,6 @@ BACKTRACES =								\
 	-fno-optimize-sibling-calls					\
 	-mno-omit-leaf-frame-pointer
 
-ifneq ($(ARCH), aarch64)
-BACKTRACES += -fno-schedule-insns2
-endif
-
 SANITIZER =								\
 	-fsanitize=address
 
@@ -178,7 +89,6 @@ DEFAULT_CCFLAGS +=							\
 	-frecord-gcc-switches
 
 DEFAULT_COPTS ?=							\
-	-fno-math-errno							\
 	-fno-ident							\
 	-fno-common							\
 	-fno-gnu-unique							\
@@ -213,6 +123,7 @@ ifeq ($(ARCH), aarch64)
 DEFAULT_COPTS +=							\
 	-ffixed-x18							\
 	-ffixed-x28							\
+	-fsigned-char							\
 	-mno-outline-atomics
 endif
 
@@ -223,6 +134,8 @@ MATHEMATICAL =								\
 DEFAULT_CPPFLAGS +=							\
 	-D_COSMO_SOURCE							\
 	-DMODE='"$(MODE)"'						\
+	-Wno-prio-ctor-dtor						\
+	-Wno-unknown-pragmas						\
 	-nostdinc							\
 	-iquote.							\
 	-isystem libc/isystem
@@ -248,6 +161,7 @@ DEFAULT_LDFLAGS =							\
 	-nostdlib							\
 	-znorelro							\
 	--gc-sections							\
+	-z noexecstack							\
 	--build-id=none							\
 	--no-dynamic-linker
 

build/download-cosmocc.sh

@@ -0,0 +1,101 @@
+#!/bin/sh
+# cosmocc downloader script
+# https://justine.lol/cosmo3/#install
+# https://github.com/jart/cosmopolitan/blob/master/tool/cosmocc/README.md
+
+# collect arguments
+OUTPUT_DIR=${1:?OUTPUT_DIR}
+COSMOCC_VERSION=${2:?COSMOCC_VERSION}
+COSMOCC_SHA256SUM=${3:?COSMOCC_SHA256SUM}
+URL1="https://github.com/jart/cosmopolitan/releases/download/${COSMOCC_VERSION}/cosmocc-${COSMOCC_VERSION}.zip"
+URL2="https://cosmo.zip/pub/cosmocc/cosmocc-${COSMOCC_VERSION}.zip"
+
+# helper function
+abort() {
+  printf '%s\n' "download terminated." >&2
+  exit 1
+}
+
+# exit if already downloaded
+# we need it because directory timestamps work wierdly
+OUTPUT_DIR=${OUTPUT_DIR%/}
+if [ -d "${OUTPUT_DIR}" ]; then
+  exit 0
+fi
+
+# find commands we need to securely download cosmocc
+if ! UNZIP=$(command -v unzip 2>/dev/null); then
+  printf '%s\n' "$0: fatal error: you need the unzip command" >&2
+  printf '%s\n' "please download https://cosmo.zip/pub/cosmos/bin/unzip and put it on the system path" >&2
+  abort
+fi
+if command -v sha256sum >/dev/null 2>&1; then
+  # can use system sha256sum
+  true
+elif command -v shasum >/dev/null 2>&1; then
+  sha256sum() {
+    shasum -a 256 "$@"
+  }
+else
+  if [ ! -f build/sha256sum.c ]; then
+    printf '%s\n' "$0: fatal error: you need to install sha256sum" >&2
+    printf '%s\n' "please download https://cosmo.zip/pub/cosmos/bin/sha256sum and put it on the system path" >&2
+    abort
+  fi
+  if ! SHA256SUM=$(command -v "$PWD/o/build/sha256sum" 2>/dev/null); then
+    if ! CC=$(command -v "$CC" 2>/dev/null); then
+      if ! CC=$(command -v cc 2>/dev/null); then
+        if ! CC=$(command -v cosmocc 2>/dev/null); then
+          printf '%s\n' "$0: fatal error: you need to install either sha256sum, cc, or cosmocc" >&2
+          printf '%s\n' "please download https://cosmo.zip/pub/cosmos/bin/sha256sum and put it on the system path" >&2
+          abort
+        fi
+      fi
+    fi
+    mkdir -p o/build || abort
+    SHA256SUM="$PWD/o/build/sha256sum"
+    printf '%s\n' "${CC} -w -O2 -o ${SHA256SUM} build/sha256sum.c" >&2
+    "${CC}" -w -O2 -o "${SHA256SUM}.$$" build/sha256sum.c || abort
+    mv -f "${SHA256SUM}.$$" "${SHA256SUM}" || abort
+  fi
+  sha256sum() {
+    "${SHA256SUM}" "$@"
+  }
+fi
+if WGET=$(command -v wget 2>/dev/null); then
+  DOWNLOAD=$WGET
+  DOWNLOAD_ARGS=-O
+elif CURL=$(command -v curl 2>/dev/null); then
+  DOWNLOAD=$CURL
+  DOWNLOAD_ARGS=-fLo
+else
+  printf '%s\n' "$0: fatal error: you need to install either wget or curl" >&2
+  printf '%s\n' "please download https://cosmo.zip/pub/cosmos/bin/wget and put it on the system path" >&2
+  abort
+fi
+
+# create temporary output directory
+OLDPWD=$PWD
+OUTPUT_TMP="${OUTPUT_DIR}.tmp.$$/"
+mkdir -p "${OUTPUT_TMP}" || abort
+cd "${OUTPUT_TMP}"
+die() {
+  cd "${OLDPWD}"
+  rm -rf "${OUTPUT_TMP}"
+  abort
+}
+
+# download cosmocc toolchain
+# multiple urls avoids outages and national firewalls
+if ! "${DOWNLOAD}" ${DOWNLOAD_ARGS} cosmocc.zip "${URL1}"; then
+  rm -f cosmocc.zip
+  "${DOWNLOAD}" ${DOWNLOAD_ARGS} cosmocc.zip "${URL2}" || die
+fi
+printf '%s\n' "${COSMOCC_SHA256SUM} *cosmocc.zip" >cosmocc.zip.sha256sum
+sha256sum -c cosmocc.zip.sha256sum || die
+"${UNZIP}" cosmocc.zip || die
+rm -f cosmocc.zip cosmocc.zip.sha256sum
+
+# commit output directory
+cd "${OLDPWD}" || die
+mv "${OUTPUT_TMP}" "${OUTPUT_DIR}" || die

build/htags

@@ -55,7 +55,7 @@ set -- --regex-c='/_Atomic(\([^)]*\))/\1/b' "$@"
 set -- --regex-c='/^\(\(hidden\|extern\|const\) \)*[_[:alpha:]][_[:alnum:]]*[ *][ *]*\([_[:alpha:]][_[:alnum:]]*[ *][ *]*\)*\([_[:alpha:]][_$[:alnum:]]*\)/\4/b' "$@"
 
 # ctags doesn't understand function prototypes, e.g.
-#   bool isheap(void *p) dontthrow nocallback;
+#   bool isheap(void *p) dontthrow dontcallback;
 set -- --regex-c='/^[_[:alpha:]][_[:alnum:]]*[ *][ *]*\([_[:alpha:]][_[:alnum:]]*[ *][ *]*\)*\([_[:alpha:]][_$[:alnum:]]*\)(.*/\2/b' "$@"
 
 # ctags doesn't understand function pointers, e.g.
@@ -66,7 +66,7 @@ set -- --regex-c='/^extern [^(]*(\*const \([^)]*\))(/\1/b' "$@"
 #   struct WorstSoftwareEver;
 set -- --regex-c='/^struct.*;$/uehocruehcroue/b' "$@"
 
-exec $TAGS                                                        \
+build/run $TAGS                                                   \
      -e                                                           \
      --langmap=c:.c.h                                             \
      --exclude=libc/nt/struct/imagefileheader.internal.h          \

build/objdump

@@ -6,14 +6,14 @@ if [ -n "$OBJDUMP" ]; then
 fi
 
 find_objdump() {
-  if [ -x o/third_party/gcc/bin/$1-linux-cosmo-objdump ]; then
-    OBJDUMP=o/third_party/gcc/bin/$1-linux-cosmo-objdump
-  elif [ -x o/third_party/gcc/bin/$1-linux-musl-objdump ]; then
-    OBJDUMP=o/third_party/gcc/bin/$1-linux-musl-objdump
-  elif [ -x "$COSMO/o/third_party/gcc/bin/$1-linux-cosmo-objdump" ]; then
-    OBJDUMP="$COSMO/o/third_party/gcc/bin/$1-linux-cosmo-objdump"
-  elif [ -x "$COSMO/o/third_party/gcc/bin/$1-linux-musl-objdump" ]; then
-    OBJDUMP="$COSMO/o/third_party/gcc/bin/$1-linux-musl-objdump"
+  if [ -x .cosmocc/3.3.2/bin/$1-linux-cosmo-objdump ]; then
+    OBJDUMP=.cosmocc/3.3.2/bin/$1-linux-cosmo-objdump
+  elif [ -x .cosmocc/3.3.2/bin/$1-linux-musl-objdump ]; then
+    OBJDUMP=.cosmocc/3.3.2/bin/$1-linux-musl-objdump
+  elif [ -x "$COSMO/.cosmocc/3.3.2/bin/$1-linux-cosmo-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.3.2/bin/$1-linux-cosmo-objdump"
+  elif [ -x "$COSMO/.cosmocc/3.3.2/bin/$1-linux-musl-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.3.2/bin/$1-linux-musl-objdump"
   else
     echo "error: toolchain not found (try running 'cosmocc --update' or 'make' in the cosmo monorepo)" >&2
     exit 1

build/online.mk

@@ -22,13 +22,14 @@
 #   - tool/build/runit.c
 #   - tool/build/runitd.c
 
-.PRECIOUS: o/$(MODE)/%.com.ok
-o/$(MODE)/%.com.ok: private .PLEDGE = stdio rpath wpath cpath proc fattr inet
-o/$(MODE)/%.com.ok:				\
-		o/$(MODE)/tool/build/runit.com	\
-		o/$(MODE)/tool/build/runitd.com	\
-		o/$(MODE)/%.com
+.PRECIOUS: o/$(MODE)/%.ok
+o/$(MODE)/%.ok: private .PLEDGE = stdio rpath wpath cpath proc fattr inet dns
+o/$(MODE)/%.ok: private .UNVEIL += r:/etc/resolv.conf
+o/$(MODE)/%.ok:					\
+		o/$(MODE)/tool/build/runit	\
+		o/$(MODE)/tool/build/runitd	\
+		o/$(MODE)/%
 	@$(COMPILE) -wATEST -tT$@ $^ $(HOSTS)
 
 .PHONY:
-o/tiny/tool/build/runit.com:
+o/tiny/tool/build/runit:

build/rules.mk

@@ -39,6 +39,10 @@ o/$(MODE)/%.h: %.c
 
 o/$(MODE)/%.o: %.cc
 	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/$(MODE)/%.o: %.cpp
+	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
 
 o/$(MODE)/%.lds: %.lds
 	@$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
@@ -75,17 +79,17 @@ o/$(MODE)/%.pkg:
 	$(file >$(TMPSAFE).args,$(filter %.o,$^))
 	@$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPSAFE).args
 
-o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj.com
-	@$(COMPILE) -wAPYOBJ o/$(MODE)/third_party/python/pyobj.com $(PYFLAGS) -o $@ $<
+o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj
+	@$(COMPILE) -wAPYOBJ o/$(MODE)/third_party/python/pyobj $(PYFLAGS) -o $@ $<
 
-o/$(MODE)/%.pyc: %.py o/$(MODE)/third_party/python/pycomp.com
-	@$(COMPILE) -wAPYCOMP o/$(MODE)/third_party/python/pycomp.com $(PYCFLAGS) -o $@ $<
+o/$(MODE)/%.pyc: %.py o/$(MODE)/third_party/python/pycomp
+	@$(COMPILE) -wAPYCOMP o/$(MODE)/third_party/python/pycomp $(PYCFLAGS) -o $@ $<
 
-o/$(MODE)/%.lua: %.lua o/$(MODE)/third_party/lua/luac.com
-	@$(COMPILE) -wALUAC o/$(MODE)/third_party/lua/luac.com -s -o $@ $<
+o/$(MODE)/%.lua: %.lua o/$(MODE)/third_party/lua/luac
+	@$(COMPILE) -wALUAC o/$(MODE)/third_party/lua/luac -s -o $@ $<
 
-o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean.com
-	@$(COMPILE) -wALUA -tT$@ o/$(MODE)/tool/net/redbean.com $(LUAFLAGS) -i $<
+o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean
+	@$(COMPILE) -wALUA -tT$@ o/$(MODE)/tool/net/redbean $(LUAFLAGS) -i $<
 
 ################################################################################
 # LOCAL UNIT TESTS
@@ -104,22 +108,22 @@ o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean.com
 #
 # You could then run a command like:
 #
-#     make -j8 o//test/libc/calls/openbsd_test.com.runs
+#     make -j8 o//test/libc/calls/openbsd_test.runs
 #
 # You need PROT_EXEC permission since ftrace morphs the binary. It's
-# also worth mentioning that the pledge.com command can simulate what
+# also worth mentioning that the pledge command can simulate what
 # Landlock Make does:
 #
-#     o//tool/build/pledge.com \
+#     o//tool/build/pledge \
 #       -v. -p 'stdio rpath wpath cpath tty prot_exec' \
-#       o//test/libc/calls/openbsd_test.com \
+#       o//test/libc/calls/openbsd_test \
 #       ----ftrace
 #
 # This is useful in the event a test binary should run by itself, but
 # fails to run beneath Landlock Make. It's also useful sometimes to
 # override the verbosity when running tests:
 #
-#     make V=5 TESTARGS=-b o//test/libc/calls/openbsd_test.com.runs
+#     make V=5 TESTARGS=-b o//test/libc/calls/openbsd_test.runs
 #
 # This way, if for some reason a test should fail but calls exit(0),
 # then the stdout/stderr output, which would normally be suppressed,
@@ -131,7 +135,7 @@ o/$(MODE)/%.runs: o/$(MODE)/%
 ################################################################################
 # ELF ZIP FILES
 #
-# zipobj.com lets us do fast incremental linking of compressed data.
+# zipobj lets us do fast incremental linking of compressed data.
 # it's nice because if we link a hundred binaries that use the time zone
 # database, then that database only needs to be DEFLATE'd once.
 
@@ -179,23 +183,6 @@ o/$(MODE)/%.okk: private .UNSANDBOXED = 1
 o/$(MODE)/%.okk: %
 	@$(COMPILE) -ACHECK.h $(COMPILE.cxx) -xc++ -g0 -o $@ $<
 
-################################################################################
-# EXECUTABLE HELPERS
-
-MAKE_SYMTAB_CREATE =				\
-	$(COMPILE) -wASYMTAB			\
-	o/$(MODE)/tool/build/symtab.com		\
-	-o $(TMPSAFE)/.symtab			\
-	$<
-
-MAKE_SYMTAB_ZIP =				\
-	$(COMPILE) -AZIP -T$@			\
-	o/$(MODE)/third_party/zip/zip.com	\
-	-b$(TMPDIR)				\
-	-9qj					\
-	$@					\
-	$(TMPSAFE)/.symtab
-
 ################################################################################
 # EMACS ASSEMBLY GENERATION
 

build/run

@@ -1,9 +1,8 @@
 #!/bin/sh
-if printf '%s\n' "$*" | grep aarch64 >/dev/null 2>&1; then
-  if [ ! -f o/third_party/qemu/qemu-aarch64 ]; then
-    make -j8 o/third_party/qemu/qemu-aarch64
-  fi
-  exec o/third_party/qemu/qemu-aarch64 "$@"
+UNAMEM=$(uname -m)
+UNAMES=$(uname -s)
+if [ x"$UNAMES" = x"Darwin" ] && [ x"$UNAMEM" = x"arm64" ]; then
+  exec ape "$@"
 else
   exec "$@"
 fi

build/sha256sum.c

@@ -0,0 +1,455 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8                               :vi │
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ 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         │
+│ 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 <errno.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+// this file should not have dependencies, because everything will be
+// re-downloaded if the o/tool/sha256sum artifact becomes invalidated
+
+#define PROG "sha256sum"
+#define USAGE \
+  "\
+Usage: " PROG " [-?hbctw] [PATH...]\n\
+  -h          help\n\
+  -c          check mode\n\
+  -b          binary mode\n\
+  -t          textual mode\n\
+  -w          warning mode\n"
+
+#define ROTR(a, b)   (((a) >> (b)) | ((a) << (32 - (b))))
+#define CH(x, y, z)  (((x) & (y)) ^ (~(x) & (z)))
+#define MAJ(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#define EP0(x)       (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
+#define EP1(x)       (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
+#define SIG0(x)      (ROTR(x, 7) ^ ROTR(x, 18) ^ ((x) >> 3))
+#define SIG1(x)      (ROTR(x, 17) ^ ROTR(x, 19) ^ ((x) >> 10))
+
+struct Sha256Ctx {
+  uint8_t data[64];
+  uint32_t datalen;
+  uint64_t bitlen;
+  uint32_t state[8];
+};
+
+static const uint32_t kSha256Tab[64] = {
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,  //
+    0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,  //
+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,  //
+    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,  //
+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,  //
+    0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,  //
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,  //
+    0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,  //
+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,  //
+    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,  //
+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,  //
+    0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,  //
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,  //
+    0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,  //
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,  //
+    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,  //
+};
+
+static bool g_warn;
+static char g_mode;
+static bool g_check;
+static int g_mismatches;
+
+static void Sha256Transform(uint32_t state[8], const uint8_t data[64]) {
+  unsigned i;
+  uint32_t a, b, c, d, e, f, g, h, t1, t2, m[64];
+  for (i = 0; i < 16; ++i, data += 4) {
+    m[i] = (uint32_t)data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+  }
+  for (; i < 64; ++i) {
+    m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
+  }
+  a = state[0];
+  b = state[1];
+  c = state[2];
+  d = state[3];
+  e = state[4];
+  f = state[5];
+  g = state[6];
+  h = state[7];
+  for (i = 0; i < 64; ++i) {
+    t1 = h + EP1(e) + CH(e, f, g) + kSha256Tab[i] + m[i];
+    t2 = EP0(a) + MAJ(a, b, c);
+    h = g;
+    g = f;
+    f = e;
+    e = d + t1;
+    d = c;
+    c = b;
+    b = a;
+    a = t1 + t2;
+  }
+  state[0] += a;
+  state[1] += b;
+  state[2] += c;
+  state[3] += d;
+  state[4] += e;
+  state[5] += f;
+  state[6] += g;
+  state[7] += h;
+}
+
+static void Sha256Init(struct Sha256Ctx *ctx) {
+  ctx->datalen = 0;
+  ctx->bitlen = 0;
+  ctx->state[0] = 0x6a09e667;
+  ctx->state[1] = 0xbb67ae85;
+  ctx->state[2] = 0x3c6ef372;
+  ctx->state[3] = 0xa54ff53a;
+  ctx->state[4] = 0x510e527f;
+  ctx->state[5] = 0x9b05688c;
+  ctx->state[6] = 0x1f83d9ab;
+  ctx->state[7] = 0x5be0cd19;
+}
+
+static void Sha256Update(struct Sha256Ctx *ctx, const uint8_t *data,
+                         long size) {
+  long i;
+  for (i = 0; i < size; ++i) {
+    ctx->data[ctx->datalen] = data[i];
+    ctx->datalen++;
+    if (ctx->datalen == 64) {
+      Sha256Transform(ctx->state, ctx->data);
+      ctx->bitlen += 512;
+      ctx->datalen = 0;
+    }
+  }
+}
+
+static void Sha256Final(struct Sha256Ctx *ctx, uint8_t *hash) {
+  long i;
+  i = ctx->datalen;
+  ctx->data[i++] = 0x80;
+  if (ctx->datalen < 56) {
+    memset(ctx->data + i, 0, 56 - i);
+  } else {
+    memset(ctx->data + i, 0, 64 - i);
+    Sha256Transform(ctx->state, ctx->data);
+    memset(ctx->data, 0, 56);
+  }
+  ctx->bitlen += ctx->datalen * 8;
+  ctx->data[63] = ctx->bitlen;
+  ctx->data[62] = ctx->bitlen >> 8;
+  ctx->data[61] = ctx->bitlen >> 16;
+  ctx->data[60] = ctx->bitlen >> 24;
+  ctx->data[59] = ctx->bitlen >> 32;
+  ctx->data[58] = ctx->bitlen >> 40;
+  ctx->data[57] = ctx->bitlen >> 48;
+  ctx->data[56] = ctx->bitlen >> 56;
+  Sha256Transform(ctx->state, ctx->data);
+  for (i = 0; i < 4; ++i) {
+    hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0xff;
+    hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0xff;
+    hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0xff;
+    hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0xff;
+    hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0xff;
+    hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0xff;
+    hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0xff;
+    hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0xff;
+  }
+}
+
+static char *FormatUint32(char *p, uint32_t x) {
+  char t;
+  size_t i, a, b;
+  i = 0;
+  do {
+    p[i++] = x % 10 + '0';
+    x = x / 10;
+  } while (x > 0);
+  p[i] = '\0';
+  if (i) {
+    for (a = 0, b = i - 1; a < b; ++a, --b) {
+      t = p[a];
+      p[a] = p[b];
+      p[b] = t;
+    }
+  }
+  return p + i;
+}
+
+static char *FormatInt32(char *p, int32_t x) {
+  if (x < 0)
+    *p++ = '-', x = -(uint32_t)x;
+  return FormatUint32(p, x);
+}
+
+static size_t StrCat(char *dst, const char *src, size_t dsize) {
+  size_t m, n = dsize;
+  const char *p = dst;
+  const char *q = src;
+  while (n-- != 0 && *dst != '\0')
+    dst++;
+  m = dst - p;
+  n = dsize - m;
+  if (n-- == 0) {
+    return m + strlen(src);
+  }
+  while (*src != '\0') {
+    if (n != 0) {
+      *dst++ = *src;
+      n--;
+    }
+    src++;
+  }
+  *dst = '\0';
+  return m + (src - q);
+}
+
+static void GetOpts(int argc, char *argv[]) {
+  int opt;
+  g_mode = ' ';
+  while ((opt = getopt(argc, argv, "?hbctw")) != -1) {
+    switch (opt) {
+      case 'w':
+        g_warn = true;
+        break;
+      case 'c':
+        g_check = true;
+        break;
+      case 't':
+        g_mode = ' ';
+        break;
+      case 'b':
+        g_mode = '*';
+        break;
+      case 'h':
+      case '?':
+        (void)write(1, USAGE, sizeof(USAGE) - 1);
+        exit(0);
+      default:
+        (void)write(2, USAGE, sizeof(USAGE) - 1);
+        exit(64);
+    }
+  }
+}
+
+static void Write(int fd, const char *s, ...) {
+  va_list va;
+  char buf[512];
+  buf[0] = 0;
+  va_start(va, s);
+  do {
+    StrCat(buf, s, sizeof(buf));
+  } while ((s = va_arg(va, const char *)));
+  va_end(va);
+  (void)write(fd, buf, strlen(buf));
+}
+
+static bool IsModeCharacter(char c) {
+  switch (c) {
+    case ' ':
+    case '*':
+      return true;
+    default:
+      return false;
+  }
+}
+
+static bool IsSupportedPath(const char *path) {
+  size_t i;
+  for (i = 0;; ++i) {
+    switch (path[i]) {
+      case 0:
+        if (i)
+          return true;
+        // fallthrough
+      case '\r':
+      case '\n':
+      case '\\':
+        Write(2, PROG, ": ", path, ": unsupported path\n", NULL);
+        return false;
+      default:
+        break;
+    }
+  }
+}
+
+static bool GetDigest(const char *path, FILE *f, uint8_t digest[32]) {
+  size_t got;
+  uint8_t buf[512];
+  struct Sha256Ctx ctx;
+  Sha256Init(&ctx);
+  while ((got = fread(buf, 1, sizeof(buf), f))) {
+    Sha256Update(&ctx, buf, got);
+  }
+  if (ferror(f)) {
+    Write(2, PROG, ": ", path, ": ", strerror(errno), "\n", NULL);
+    return false;
+  }
+  Sha256Final(&ctx, digest);
+  return true;
+}
+
+static char *CopyHex(char *s, const void *p, size_t n) {
+  const char *d, *e;
+  for (d = (const char *)p, e = d + n; d < e; ++d) {
+    *s++ = "0123456789abcdef"[(*d >> 4) & 15];
+    *s++ = "0123456789abcdef"[(*d >> 0) & 15];
+  }
+  *s = 0;
+  return s;
+}
+
+static bool ProduceDigest(const char *path, FILE *f) {
+  char hexdigest[65];
+  char mode[2] = {g_mode};
+  unsigned char digest[32];
+  if (!IsSupportedPath(path))
+    return false;
+  if (!GetDigest(path, f, digest))
+    return false;
+  CopyHex(hexdigest, digest, 32);
+  Write(1, hexdigest, " ", mode, path, "\n", NULL);
+  return true;
+}
+
+static char *Chomp(char *line) {
+  size_t i;
+  if (line) {
+    for (i = strlen(line); i--;) {
+      if (line[i] == '\r' || line[i] == '\n') {
+        line[i] = '\0';
+      } else {
+        break;
+      }
+    }
+  }
+  return line;
+}
+
+static int HexToInt(int c) {
+  if ('0' <= c && c <= '9') {
+    return c - '0';
+  } else if ('a' <= c && c <= 'f') {
+    return c - 'a' + 10;
+  } else if ('A' <= c && c <= 'F') {
+    return c - 'A' + 10;
+  } else {
+    return -1;
+  }
+}
+
+static bool CheckDigests(const char *path, FILE *f) {
+  FILE *f2;
+  bool k = true;
+  int a, b, i, line;
+  const char *path2, *status;
+  uint8_t wantdigest[32], gotdigest[32];
+  char buf[64 + 2 + PATH_MAX + 1 + 1], *p;
+  for (line = 0; fgets(buf, sizeof(buf), f); ++line) {
+    if (!*Chomp(buf))
+      continue;
+    for (p = buf, i = 0; i < 32; ++i) {
+      if ((a = HexToInt(*p++ & 255)) == -1)
+        goto InvalidLine;
+      if ((b = HexToInt(*p++ & 255)) == -1)
+        goto InvalidLine;
+      wantdigest[i] = a << 4 | b;
+    }
+    if (*p++ != ' ')
+      goto InvalidLine;
+    if (!IsModeCharacter(*p++))
+      goto InvalidLine;
+    path2 = p;
+    if (!*path2)
+      goto InvalidLine;
+    if (!IsSupportedPath(path2))
+      continue;
+    if ((f2 = fopen(path2, "rb"))) {
+      if (GetDigest(path2, f2, gotdigest)) {
+        if (!memcmp(wantdigest, gotdigest, 32)) {
+          status = "OK";
+        } else {
+          status = "FAILED";
+          ++g_mismatches;
+          k = false;
+        }
+        Write(1, path2, ": ", status, "\n", NULL);
+      } else {
+        k = false;
+      }
+      fclose(f2);
+    } else {
+      Write(2, PROG, ": ", path2, ": ", strerror(errno), "\n", NULL);
+      k = false;
+    }
+    continue;
+  InvalidLine:
+    if (g_warn) {
+      char linestr[12];
+      FormatInt32(linestr, line + 1);
+      Write(2, PROG, ": ", path, ":", linestr, ": ",
+            "improperly formatted checksum line", "\n", NULL);
+    }
+  }
+  if (ferror(f)) {
+    Write(2, PROG, ": ", path, ": ", strerror(errno), "\n", NULL);
+    k = false;
+  }
+  return k;
+}
+
+static bool Process(const char *path, FILE *f) {
+  if (g_check) {
+    return CheckDigests(path, f);
+  } else {
+    return ProduceDigest(path, f);
+  }
+}
+
+int main(int argc, char *argv[]) {
+  int i;
+  FILE *f;
+  bool k = true;
+  GetOpts(argc, argv);
+  if (optind == argc) {
+    f = stdin;
+    k &= Process("-", f);
+  } else {
+    for (i = optind; i < argc; ++i) {
+      if ((f = fopen(argv[i], "rb"))) {
+        k &= Process(argv[i], f);
+        fclose(f);
+      } else {
+        Write(2, PROG, ": ", argv[i], ": ", strerror(errno), "\n", NULL);
+        k = false;
+      }
+    }
+  }
+  if (g_mismatches) {
+    char ibuf[12];
+    FormatInt32(ibuf, g_mismatches);
+    Write(2, PROG, ": WARNING: ", ibuf, " computed checksum did NOT match\n",
+          NULL);
+  }
+  return !k;
+}

dsp/core/alaw.c

@@ -27,7 +27,8 @@
  */
 int alaw(int x) {
   int a, b, i;
-  if ((a = x) < 0) a = ~a;
+  if ((a = x) < 0)
+    a = ~a;
   a >>= 4;
   if (a > 15) {
     if ((i = a >> 5)) {
@@ -40,6 +41,7 @@ int alaw(int x) {
       a += 16;
     }
   }
-  if (x >= 0) a |= 128;
+  if (x >= 0)
+    a |= 128;
   return a ^ 85;
 }

dsp/core/mulaw.c

@@ -28,13 +28,15 @@
 int mulaw(int x) {
   int b, i, a, s, l, h;
   a = x < 0 ? (~x >> 2) + 33 : (x >> 2) + 33;
-  if (a > 8191) a = 8191;
+  if (a > 8191)
+    a = 8191;
   i = a >> 6;
   s = i ? (__builtin_clz(i) ^ 31) + 2 : 1;
   h = 8 - s;
   l = (a >> s) & 15;
   l = 15 - l;
   b = (h << 4) | l;
-  if (x >= 0) b |= 128;
+  if (x >= 0)
+    b |= 128;
   return b;
 }

dsp/core/scalevolume.c

@@ -29,7 +29,8 @@ void scalevolume(size_t n, int16_t pcm[n][8], int p) {
   /* TODO(jart): This isn't acceptable. */
   size_t i, j;
   if (p > 0) {
-    if (p > 15) p = 15;
+    if (p > 15)
+      p = 15;
     for (i = 0; i < n; ++i) {
       for (j = 0; j < 8; ++j) {
         pcm[i][j] =
@@ -38,7 +39,8 @@ void scalevolume(size_t n, int16_t pcm[n][8], int p) {
     }
   } else if (p < 0) {
     p = -p;
-    if (p > 15) p = 15;
+    if (p > 15)
+      p = 15;
     for (i = 0; i < n; ++i) {
       for (j = 0; j < 8; ++j) {
         pcm[i][j] = pcm[i][j] >> p;

dsp/core/unalaw.c

@@ -31,8 +31,10 @@ int unalaw(int x) {
   i = (x ^ 85) & 127;
   e = i >> 4;
   m = i & 15;
-  if (e > 0) m += 16;
+  if (e > 0)
+    m += 16;
   m = (m << 4) + 8;
-  if (e > 1) m = m << (e - 1);
+  if (e > 1)
+    m = m << (e - 1);
   return x & 128 ? m : -m;
 }

dsp/mpeg/BUILD.mk

@@ -35,7 +35,6 @@ DSP_MPEG_A_DIRECTDEPS =				\
 	LIBC_STDIO				\
 	LIBC_STR				\
 	LIBC_SYSV				\
-	LIBC_TIME				\
 	LIBC_TINYMATH				\
 	THIRD_PARTY_COMPILER_RT
 

dsp/mpeg/buffer.c

@@ -35,12 +35,7 @@
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/madv.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 /* clang-format off */
 // -----------------------------------------------------------------------------

dsp/mpeg/demux.c

@@ -27,17 +27,12 @@
 │  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE            │
 │  SOFTWARE.                                                                   │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "dsp/mpeg/buffer.h"
 #include "dsp/mpeg/demux.h"
+#include "dsp/mpeg/buffer.h"
 #include "dsp/mpeg/mpeg.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 /* clang-format off */
 // ----------------------------------------------------------------------------

dsp/mpeg/idct.c

@@ -28,12 +28,7 @@
 │  SOFTWARE.                                                                   │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/half.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 /**
  * Computes Fixed-Point 8x8 Inverse Discrete Cosine Transform.

dsp/mpeg/macroblock.c

@@ -46,7 +46,8 @@ forceinline void plm_video_process_macroblock(plm_video_t *self,
   si = ((self->mb_row * BW) + vp) * dw + (self->mb_col * BW) + hp;
   di = (self->mb_row * dw + self->mb_col) * BW;
   max_address = (dw * (self->mb_height * BW - BW + 1) - BW);
-  if (si > max_address || di > max_address) return;
+  if (si > max_address || di > max_address)
+    return;
   d += di;
   s += si;
   switch (((interpolate << 2) | (odd_h << 1) | (odd_v)) & 7) {

dsp/mpeg/mp2.c

@@ -33,12 +33,6 @@
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
-
 /* clang-format off */
 // -----------------------------------------------------------------------------
 // plm_audio implementation

dsp/mpeg/mpeg1.c

@@ -39,14 +39,9 @@
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 #include "libc/x/x.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 // -----------------------------------------------------------------------------
 // plm_video implementation
@@ -1104,7 +1099,7 @@ plm_video_t *plm_video_create_with_buffer(plm_buffer_t *buffer,
   return self;
 }
 
-static textstartup void plm_video_init(void) {
+__attribute__((__constructor__)) static textstartup void plm_video_init(void) {
   PLM_VIDEO_MACROBLOCK_TYPE[0] = NULL;
   PLM_VIDEO_MACROBLOCK_TYPE[1] = (void *)PLM_VIDEO_MACROBLOCK_TYPE_INTRA;
   PLM_VIDEO_MACROBLOCK_TYPE[2] = (void *)PLM_VIDEO_MACROBLOCK_TYPE_PREDICTIVE;
@@ -1113,5 +1108,3 @@ static textstartup void plm_video_init(void) {
   PLM_VIDEO_DCT_SIZE[1] = (void *)PLM_VIDEO_DCT_SIZE_CHROMINANCE;
   PLM_VIDEO_DCT_SIZE[2] = (void *)PLM_VIDEO_DCT_SIZE_CHROMINANCE;
 }
-
-const void *const plm_video_init_ctor[] initarray = {plm_video_init};

dsp/mpeg/notice.c

@@ -0,0 +1,4 @@
+__notice(pl_mpeg_notice, "\
+PL_MPEG (MIT License)\n\
+Copyright(c) 2019 Dominic Szablewski\n\
+https://phoboslab.org");

dsp/mpeg/plm.c

@@ -32,12 +32,7 @@
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 /* clang-format off */
 // -----------------------------------------------------------------------------

dsp/mpeg/slowrgb.c

@@ -29,12 +29,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/mpeg/mpeg.h"
 #include "libc/macros.internal.h"
-
-asm(".ident\t\"\\n\\n\
-PL_MPEG (MIT License)\\n\
-Copyright(c) 2019 Dominic Szablewski\\n\
-https://phoboslab.org\"");
-asm(".include \"libc/disclaimer.inc\"");
+__static_yoink("pl_mpeg_notice");
 
 /**
  * @see YCbCr2RGB() in tool/viz/lib/ycbcr2rgb.c

dsp/scale/BUILD.mk

@@ -31,7 +31,6 @@ DSP_SCALE_A_DIRECTDEPS =			\
 	LIBC_NEXGEN32E				\
 	LIBC_RUNTIME				\
 	LIBC_STR				\
-	LIBC_TIME				\
 	LIBC_TINYMATH				\
 	LIBC_X
 

dsp/scale/gyarados.c

@@ -27,7 +27,7 @@
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
@@ -77,7 +77,8 @@ static struct SamplingSolution *NewSamplingSolution(long n, long s) {
 static bool IsNormalized(int n, double A[n]) {
   int i;
   double x;
-  for (x = i = 0; i < n; ++i) x += A[i];
+  for (x = i = 0; i < n; ++i)
+    x += A[i];
   return fabs(x - 1) < 1e-4;
 }
 
@@ -96,8 +97,10 @@ struct SamplingSolution *ComputeSamplingSolution(long dn, long sn, double dar,
   short *weights, *indices;
   struct SamplingSolution *res;
   long j, i, k, n, min, max, s, N[6];
-  if (!dar) dar = sn, dar /= dn;
-  if (!off) off = (dar - 1) / 2;
+  if (!dar)
+    dar = sn, dar /= dn;
+  if (!off)
+    off = (dar - 1) / 2;
   f = dar < 1 ? 1 / dar : dar;
   s = 3 * f + 4;
   fweights = gc(xcalloc(s + /*xxx*/ 2, sizeof(double)));
@@ -114,8 +117,10 @@ struct SamplingSolution *ComputeSamplingSolution(long dn, long sn, double dar,
     for (k = 0, j = min; j <= max; ++j) {
       fweights[k++] = ComputeWeight((j - x) / (f / par));
     }
-    for (sum = k = 0; k < n; ++k) sum += fweights[k];
-    for (j = 0; j < n; ++j) fweights[j] *= 1 / sum;
+    for (sum = k = 0; k < n; ++k)
+      sum += fweights[k];
+    for (j = 0; j < n; ++j)
+      fweights[j] *= 1 / sum;
     DCHECK(IsNormalized(n, fweights));
     for (j = 0; j < n; ++j) {
       indices[i * s + j] = MIN(sn - 1, MAX(0, min + j));
@@ -202,8 +207,8 @@ void *Gyarados(long dyw, long dxw, int dst[dyw][dxw], long syw, long sxw,
       CHECK_LE(sxn, sxw);
       CHECK_LE(dyn, dyw);
       CHECK_LE(dxn, dxw);
-      CHECK_LT(_bsrl(syn) + _bsrl(sxn), 32);
-      CHECK_LT(_bsrl(dyn) + _bsrl(dxn), 32);
+      CHECK_LT(bsrl(syn) + bsrl(sxn), 32);
+      CHECK_LT(bsrl(dyn) + bsrl(dxn), 32);
       CHECK_LE(dyw, 0x7fff);
       CHECK_LE(dxw, 0x7fff);
       CHECK_LE(syw, 0x7fff);

dsp/scale/magikarp.c

@@ -121,8 +121,7 @@ void *MagikarpY(long dys, long dxs, unsigned char d[restrict dys][dxs],
   return d;
 }
 
-static textstartup void g_magikarp_init() {
+__attribute__((__constructor__)) static textstartup void g_magikarp_init() {
   memcpy(g_magkern, kMagkern[0], sizeof(g_magkern));
   memcpy(g_magikarp, kMagikarp[0], sizeof(g_magikarp));
 }
-const void *const g_magikarp_ctor[] initarray = {g_magikarp_init};

dsp/tty/BUILD.mk

@@ -38,7 +38,6 @@ DSP_TTY_A_DIRECTDEPS =				\
 	LIBC_SOCK				\
 	LIBC_SYSV				\
 	LIBC_TINYMATH				\
-	LIBC_TIME				\
 	LIBC_X
 
 DSP_TTY_A_DEPS :=				\

dsp/tty/hidecursor.c

@@ -30,8 +30,10 @@
 static int ttysetcursor(int fd, bool visible) {
   struct NtConsoleCursorInfo ntcursor;
   char code[8] = "\e[?25l";
-  if (__nocolor) return 0;
-  if (visible) code[5] = 'h';
+  if (__nocolor)
+    return 0;
+  if (visible)
+    code[5] = 'h';
   if (IsWindows()) {
     GetConsoleCursorInfo(GetStdHandle(kNtStdOutputHandle), &ntcursor);
     ntcursor.bVisible = visible;

dsp/tty/itoa8.c

@@ -21,7 +21,7 @@
 
 struct Itoa8 kItoa8;
 
-static textstartup void itoa8_init(void) {
+__attribute__((__constructor__)) static textstartup void itoa8_init(void) {
   int i;
   uint8_t z;
   uint32_t w;
@@ -41,5 +41,3 @@ static textstartup void itoa8_init(void) {
     kItoa8.data[i] = w;
   }
 }
-
-const void *const itoa8_init_ctor[] initarray = {itoa8_init};

dsp/tty/rgb2ansi.c

@@ -97,7 +97,7 @@ static int uncube(int x) {
   return x < 48 ? 0 : x < 115 ? 1 : (x - 35) / 40;
 }
 
-static textstartup void rgb2ansi_init(void) {
+__attribute__((__constructor__)) static textstartup void rgb2ansi_init(void) {
   uint8_t c;
   uint32_t i;
   memcpy(g_ansi2rgb_, &kCgaPalette, sizeof(kCgaPalette));
@@ -114,5 +114,3 @@ static textstartup void rgb2ansi_init(void) {
     g_ansi2rgb_[i].xt = i;
   }
 }
-
-const void *const rgb2ansi_init_ctor[] initarray = {rgb2ansi_init};

dsp/tty/sendtitle.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
 #include "libc/mem/arraylist2.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/x/x.h"
 

dsp/tty/setbgfg16.c

@@ -21,16 +21,20 @@
 #include "libc/limits.h"
 
 static char *ansitoa(char *p, unsigned xt, unsigned base) {
-  if (xt >= 8) xt -= 8, base += 60;
+  if (xt >= 8)
+    xt -= 8, base += 60;
   return itoa8(p, xt + base);
 }
 
 static char *setansibgfg(char *p, unsigned bg, unsigned fg) {
   *p++ = '\e';
   *p++ = '[';
-  if (bg != -1u) p = ansitoa(p, bg, 40);
-  if (bg != -1u && fg != -1u) *p++ = ';';
-  if (fg != -1u) p = ansitoa(p, fg, 30);
+  if (bg != -1u)
+    p = ansitoa(p, bg, 40);
+  if (bg != -1u && fg != -1u)
+    *p++ = ';';
+  if (fg != -1u)
+    p = ansitoa(p, fg, 30);
   *p++ = 'm';
   return p;
 }

dsp/tty/ttyquant.c

@@ -73,8 +73,6 @@ textstartup void ttyquantsetup(enum TtyQuantizationAlgorithm alg,
   TTYQUANT()->blocks = blocks;
 }
 
-textstartup void ttyquant_init(void) {
+__attribute__((__constructor__)) textstartup void ttyquant_init(void) {
   ttyquantsetup(kTtyQuantXterm256, kTtyQuantRgb, kTtyBlocksUnicode);
 }
-
-const void *const ttyquant_init_ctor[] initarray = {ttyquant_init};

dsp/tty/ttyraster.c

@@ -666,7 +666,8 @@ static char *CopyBlock(char *v, const struct TtyRgb chunk[hasatleast 4],
                        struct Glyph *glyph) {
   unsigned i;
   CHECK_LT(pick.bg, 4);
-  if (pick.fg != 0xff) CHECK_LT(pick.fg, 4);
+  if (pick.fg != 0xff)
+    CHECK_LT(pick.fg, 4);
   i = 0;
   if (pick.fg == 0xff) {
     if (!ttyeq(*bg, chunk[pick.bg])) {
@@ -744,7 +745,8 @@ static dontinline char *CopyRun(char *v, size_t n,
     v = CopyGlyph(v, *glyph);
     *x += 2;
     *c += 2;
-    if (*x >= n) break;
+    if (*x >= n)
+      break;
     CopyChunk(chunk, *c, n);
   } while (ChunkEq(chunk, lastchunk));
   *x -= 2;

dsp/tty/ttyraw.c

@@ -25,7 +25,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
-#include "libc/mem/gc.internal.h"
+#include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/fileno.h"
@@ -69,13 +69,16 @@ static textstartup int ttyraw_enable(void) {
 }
 
 static textstartup void ttyraw_hidecursor(void) {
-  if (!g_ttyraw.setup) return;
-  if (g_ttyraw.flags & kTtyCursor) return;
+  if (!g_ttyraw.setup)
+    return;
+  if (g_ttyraw.flags & kTtyCursor)
+    return;
   ttyhidecursor(FD);
 }
 
 static textexit int ttyraw_disable(void) {
-  if (!g_ttyraw.setup) return 0;
+  if (!g_ttyraw.setup)
+    return 0;
   ttyshowcursor(FD);
   return ttyrestore(FD, &g_ttyraw.old);
 }
@@ -87,7 +90,8 @@ static textexit void ttyraw_onexit(void) {
 static relegated void ttyraw_onsig(int sig, struct siginfo *info,
                                    struct ucontext *ctx) {
   size_t i;
-  if (g_ttyraw.noreentry) _Exit(128 + sig);
+  if (g_ttyraw.noreentry)
+    _Exit(128 + sig);
   g_ttyraw.noreentry = true;
   if (g_ttyraw.flags != -1) {
     if (sig == SIGCONT) {

examples/BUILD.mk

@@ -14,130 +14,130 @@ EXAMPLES_MAINS_S = $(filter %.S,$(EXAMPLES_FILES))
 EXAMPLES_MAINS_C = $(filter %.c,$(EXAMPLES_FILES))
 EXAMPLES_MAINS_CC = $(filter %.cc,$(EXAMPLES_FILES))
 
-EXAMPLES_SRCS =									\
-	$(EXAMPLES_MAINS_S)							\
-	$(EXAMPLES_MAINS_C)							\
+EXAMPLES_SRCS =							\
+	$(EXAMPLES_MAINS_S)					\
+	$(EXAMPLES_MAINS_C)					\
 	$(EXAMPLES_MAINS_CC)
 
-EXAMPLES_MAINS =								\
-	$(EXAMPLES_MAINS_S)							\
-	$(EXAMPLES_MAINS_C)							\
+EXAMPLES_MAINS =						\
+	$(EXAMPLES_MAINS_S)					\
+	$(EXAMPLES_MAINS_C)					\
 	$(EXAMPLES_MAINS_CC)
 
-EXAMPLES_OBJS =									\
-	$(EXAMPLES_MAINS_S:%.S=o/$(MODE)/%.o)					\
-	$(EXAMPLES_MAINS_C:%.c=o/$(MODE)/%.o)					\
+EXAMPLES_OBJS =							\
+	$(EXAMPLES_MAINS_S:%.S=o/$(MODE)/%.o)			\
+	$(EXAMPLES_MAINS_C:%.c=o/$(MODE)/%.o)			\
 	$(EXAMPLES_MAINS_CC:%.cc=o/$(MODE)/%.o)
 
-EXAMPLES_COMS =									\
-	$(EXAMPLES_MAINS_S:%.S=o/$(MODE)/%.com)					\
-	$(EXAMPLES_MAINS_C:%.c=o/$(MODE)/%.com)					\
-	$(EXAMPLES_MAINS_CC:%.cc=o/$(MODE)/%.com)
+EXAMPLES_COMS =							\
+	$(EXAMPLES_MAINS_S:%.S=o/$(MODE)/%)			\
+	$(EXAMPLES_MAINS_C:%.c=o/$(MODE)/%)			\
+	$(EXAMPLES_MAINS_CC:%.cc=o/$(MODE)/%)
 
-EXAMPLES_BINS =									\
-	$(EXAMPLES_COMS)							\
+EXAMPLES_BINS =							\
+	$(EXAMPLES_COMS)					\
 	$(EXAMPLES_COMS:%=%.dbg)
 
-EXAMPLES_DIRECTDEPS =								\
-	DSP_CORE								\
-	DSP_SCALE								\
-	DSP_TTY									\
-	LIBC_CALLS								\
-	LIBC_DLOPEN								\
-	LIBC_FMT								\
-	LIBC_INTRIN								\
-	LIBC_IRQ								\
-	LIBC_LOG								\
-	LIBC_MEM								\
-	LIBC_NEXGEN32E								\
-	LIBC_NT_ADVAPI32							\
-	LIBC_NT_IPHLPAPI							\
-	LIBC_NT_KERNEL32							\
-	LIBC_NT_NTDLL								\
-	LIBC_NT_USER32								\
-	LIBC_NT_WS2_32								\
-	LIBC_PROC								\
-	LIBC_RUNTIME								\
-	LIBC_SOCK								\
-	LIBC_STDIO								\
-	LIBC_STR								\
-	LIBC_SYSV								\
-	LIBC_SYSV_CALLS								\
-	LIBC_TESTLIB								\
-	LIBC_THREAD								\
-	LIBC_TIME								\
-	LIBC_TINYMATH								\
-	LIBC_VGA								\
-	LIBC_X									\
-	NET_HTTP								\
-	NET_HTTPS								\
-	THIRD_PARTY_AWK								\
-	THIRD_PARTY_COMPILER_RT							\
-	THIRD_PARTY_DLMALLOC							\
-	THIRD_PARTY_DOUBLECONVERSION						\
-	THIRD_PARTY_GDTOA							\
-	THIRD_PARTY_GETOPT							\
-	THIRD_PARTY_HIREDIS							\
-	THIRD_PARTY_LIBCXX							\
-	THIRD_PARTY_LINENOISE							\
-	THIRD_PARTY_LUA								\
-	THIRD_PARTY_MBEDTLS							\
-	THIRD_PARTY_MUSL							\
-	THIRD_PARTY_NSYNC							\
-	THIRD_PARTY_NSYNC_MEM							\
-	THIRD_PARTY_QUICKJS							\
-	THIRD_PARTY_SED								\
-	THIRD_PARTY_STB								\
-	THIRD_PARTY_TR								\
-	THIRD_PARTY_VQSORT							\
-	THIRD_PARTY_XED								\
-	THIRD_PARTY_ZLIB							\
-	TOOL_ARGS								\
-	TOOL_BUILD_LIB								\
+EXAMPLES_DIRECTDEPS =						\
+	DSP_CORE						\
+	DSP_SCALE						\
+	DSP_TTY							\
+	LIBC_CALLS						\
+	LIBC_DLOPEN						\
+	LIBC_FMT						\
+	LIBC_INTRIN						\
+	LIBC_IRQ						\
+	LIBC_LOG						\
+	LIBC_MEM						\
+	LIBC_NEXGEN32E						\
+	LIBC_NT_ADVAPI32					\
+	LIBC_NT_IPHLPAPI					\
+	LIBC_NT_KERNEL32					\
+	LIBC_NT_NTDLL						\
+	LIBC_NT_USER32						\
+	LIBC_NT_WS2_32						\
+	LIBC_PROC						\
+	LIBC_RUNTIME						\
+	LIBC_SOCK						\
+	LIBC_STDIO						\
+	LIBC_STR						\
+	LIBC_SYSV						\
+	LIBC_SYSV_CALLS						\
+	LIBC_TESTLIB						\
+	LIBC_THREAD						\
+	LIBC_TINYMATH						\
+	LIBC_VGA						\
+	LIBC_X							\
+	NET_HTTP						\
+	NET_HTTPS						\
+	THIRD_PARTY_AWK						\
+	THIRD_PARTY_COMPILER_RT					\
+	THIRD_PARTY_DLMALLOC					\
+	THIRD_PARTY_DOUBLECONVERSION				\
+	THIRD_PARTY_GDTOA					\
+	THIRD_PARTY_GETOPT					\
+	THIRD_PARTY_HIREDIS					\
+	THIRD_PARTY_LIBCXX					\
+	THIRD_PARTY_LINENOISE					\
+	THIRD_PARTY_LUA						\
+	THIRD_PARTY_MBEDTLS					\
+	THIRD_PARTY_MUSL					\
+	THIRD_PARTY_NSYNC					\
+	THIRD_PARTY_NSYNC_MEM					\
+	THIRD_PARTY_OPENMP					\
+	THIRD_PARTY_SED						\
+	THIRD_PARTY_STB						\
+	THIRD_PARTY_TR						\
+	THIRD_PARTY_TZ						\
+	THIRD_PARTY_VQSORT					\
+	THIRD_PARTY_XED						\
+	THIRD_PARTY_ZLIB					\
+	TOOL_ARGS						\
+	TOOL_BUILD_LIB						\
 	TOOL_VIZ_LIB
 
-EXAMPLES_DEPS :=								\
+EXAMPLES_DEPS :=						\
 	$(call uniq,$(foreach x,$(EXAMPLES_DIRECTDEPS),$($(x))))
 
-o/$(MODE)/examples/examples.pkg:						\
-		$(EXAMPLES_OBJS)						\
+o/$(MODE)/examples/examples.pkg:				\
+		$(EXAMPLES_OBJS)				\
 		$(foreach x,$(EXAMPLES_DIRECTDEPS),$($(x)_A).pkg)
 
-o/$(MODE)/examples/unbourne.o: private						\
-		CPPFLAGS +=							\
-			-DSTACK_FRAME_UNLIMITED					\
+o/$(MODE)/examples/unbourne.o: private				\
+		CPPFLAGS +=					\
+			-DSTACK_FRAME_UNLIMITED			\
 			-fpie
 
-o/$(MODE)/examples/%.com.dbg:							\
-		$(EXAMPLES_DEPS)						\
-		o/$(MODE)/examples/%.o						\
-		o/$(MODE)/examples/examples.pkg					\
+o/$(MODE)/examples/%.dbg:					\
+		$(EXAMPLES_DEPS)				\
+		o/$(MODE)/examples/%.o				\
+		o/$(MODE)/examples/examples.pkg			\
 		$(EXAMPLES_BOOTLOADER)
 	@$(APELINK)
 
-o/$(MODE)/examples/hellolua.com.dbg:						\
-		$(EXAMPLES_DEPS)						\
-		o/$(MODE)/examples/hellolua.o					\
-		o/$(MODE)/examples/hellolua.lua.zip.o				\
-		o/$(MODE)/examples/examples.pkg					\
+o/$(MODE)/examples/hellolua.dbg:				\
+		$(EXAMPLES_DEPS)				\
+		o/$(MODE)/examples/hellolua.o			\
+		o/$(MODE)/examples/hellolua.lua.zip.o		\
+		o/$(MODE)/examples/examples.pkg			\
 		$(EXAMPLES_BOOTLOADER)
 	@$(APELINK)
 
-o/$(MODE)/examples/ispell.com.dbg:						\
-		$(EXAMPLES_DEPS)						\
-		o/$(MODE)/examples/ispell.o					\
-		o/$(MODE)/usr/share/dict/words.zip.o				\
-		o/$(MODE)/examples/examples.pkg					\
+o/$(MODE)/examples/ispell.dbg:					\
+		$(EXAMPLES_DEPS)				\
+		o/$(MODE)/examples/ispell.o			\
+		o/$(MODE)/usr/share/dict/words.zip.o		\
+		o/$(MODE)/examples/examples.pkg			\
 		$(EXAMPLES_BOOTLOADER)
 	@$(APELINK)
 
-o/$(MODE)/examples/nesemu1.com.dbg:						\
-		$(EXAMPLES_DEPS)						\
-		o/$(MODE)/examples/nesemu1.o					\
-		o/$(MODE)/usr/share/rom/mario.nes.zip.o				\
-		o/$(MODE)/usr/share/rom/zelda.nes.zip.o				\
-		o/$(MODE)/usr/share/rom/tetris.nes.zip.o			\
-		o/$(MODE)/examples/examples.pkg					\
+o/$(MODE)/examples/nesemu1.dbg:					\
+		$(EXAMPLES_DEPS)				\
+		o/$(MODE)/examples/nesemu1.o			\
+		o/$(MODE)/usr/share/rom/mario.nes.zip.o		\
+		o/$(MODE)/usr/share/rom/zelda.nes.zip.o		\
+		o/$(MODE)/usr/share/rom/tetris.nes.zip.o	\
+		o/$(MODE)/examples/examples.pkg			\
 		$(EXAMPLES_BOOTLOADER)
 	@$(APELINK)
 
@@ -145,7 +145,7 @@ o/$(MODE)/examples/picol.o: private				\
 		CPPFLAGS +=					\
 			-DSTACK_FRAME_UNLIMITED
 
-o/$(MODE)/examples/picol.com.dbg:				\
+o/$(MODE)/examples/picol.dbg:					\
 		$(EXAMPLES_DEPS)				\
 		o/$(MODE)/examples/picol.o			\
 		o/$(MODE)/examples/examples.pkg			\
@@ -153,9 +153,10 @@ o/$(MODE)/examples/picol.com.dbg:				\
 		$(APE_NO_MODIFY_SELF)
 	@$(APELINK)
 
-o/$(MODE)/examples/nesemu1.o: private QUOTA += -M512m
 o/$(MODE)/usr/share/dict/words.zip.o: private ZIPOBJ_FLAGS += -C2
 
+o/$(MODE)/examples/blas.o: private COPTS += -O3 -fopenmp
+
 $(EXAMPLES_OBJS): examples/BUILD.mk
 
 o/$(MODE)/usr/share/dict/words:					\
@@ -166,8 +167,8 @@ o/$(MODE)/usr/share/dict/words:					\
 ################################################################################
 
 .PHONY: o/$(MODE)/examples
-o/$(MODE)/examples:								\
-		o/$(MODE)/examples/package					\
-		o/$(MODE)/examples/pylife					\
-		o/$(MODE)/examples/pyapp					\
+o/$(MODE)/examples:						\
+		o/$(MODE)/examples/package			\
+		o/$(MODE)/examples/pylife			\
+		o/$(MODE)/examples/pyapp			\
 		$(EXAMPLES_BINS)

examples/asantest.c

@@ -0,0 +1,16 @@
+#include <stdlib.h>
+
+__static_yoink("__die");
+__static_yoink("GetSymbolByAddr");
+__static_yoink("malloc_inspect_all");
+
+char *lol(int n) {
+  return malloc(n);
+}
+
+char *(*pLol)(int) = lol;
+
+int main(int argc, char *argv[]) {
+  char *s = pLol(4);
+  s[4] = 1;
+}

examples/blas.cc

@@ -0,0 +1,221 @@
+// Copyright 2024 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 <unistd.h>
+#include <cinttypes>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include "libc/assert.h"
+
+// high performance high accuracy matrix multiplication in ansi c
+
+#define MATH __target_clones("avx512f,fma")
+
+namespace {
+namespace ansiBLAS {
+
+static constexpr int KN = 8;
+
+struct Vector {
+  double v[KN];
+};
+
+Vector load(const float *p) {
+  Vector x;
+  for (int i = 0; i < KN; ++i)
+    x.v[i] = p[i];
+  return x;
+}
+
+Vector madd(Vector x, Vector y, Vector s) {
+  for (int i = 0; i < KN; ++i)
+    s.v[i] = fma(x.v[i], y.v[i], s.v[i]);
+  return s;
+}
+
+float hsum(Vector x) {
+  double s = 0;
+  for (int i = 0; i < KN; ++i)
+    s += x.v[i];
+  return s;
+}
+
+struct ansiBLAS {
+ public:
+  ansiBLAS(int k, const float *A, int lda, const float *B, int ldb, float *C,
+           int ldc, int ith, int nth)
+      : k(k),
+        A(A),
+        lda(lda),
+        B(B),
+        ldb(ldb),
+        C(C),
+        ldc(ldc),
+        ith(ith),
+        nth(nth) {
+  }
+
+  void matmul(int m, int n) {
+    mnpack(0, m, 0, n);
+  }
+
+ private:
+  void mnpack(int m0, int m, int n0, int n) {
+    int mc, nc, mp, np;
+    if (m - m0 <= 0 || n - n0 <= 0)
+      return;
+    if (m - m0 >= 4 && n - n0 >= 3) {
+      mc = 4;
+      nc = 3;
+      gemm<4, 3>(m0, m, n0, n);
+    } else {
+      mc = 1;
+      nc = 1;
+      gemm<1, 1>(m0, m, n0, n);
+    }
+    mp = m0 + (m - m0) / mc * mc;
+    np = n0 + (n - n0) / nc * nc;
+    mnpack(mp, m, n0, np);
+    mnpack(m0, m, np, n);
+  }
+
+  template <int RM, int RN>
+  MATH void gemm(int m0, int m, int n0, int n) {
+    int ytiles = (m - m0) / RM;
+    int xtiles = (n - n0) / RN;
+    int tiles = xtiles * ytiles;
+    int duty = (tiles + nth - 1) / nth;
+    int start = duty * ith;
+    int end = start + duty;
+    if (end > tiles)
+      end = tiles;
+    for (int job = start; job < end; ++job) {
+      int ii = m0 + job / xtiles * RM;
+      int jj = n0 + job % xtiles * RN;
+      Vector Cv[RN][RM] = {};
+      for (int l = 0; l < k; l += KN)
+        for (int j = 0; j < RN; ++j)
+          for (int i = 0; i < RM; ++i)
+            Cv[j][i] = madd(load(A + lda * (ii + i) + l),  //
+                            load(B + ldb * (jj + j) + l),  //
+                            Cv[j][i]);
+      for (int j = 0; j < RN; ++j)
+        for (int i = 0; i < RM; ++i)
+          C[ldc * (jj + j) + (ii + i)] = hsum(Cv[j][i]);
+    }
+  }
+
+  const int k;
+  const float *const A;
+  const int lda;
+  const float *const B;
+  const int ldb;
+  float *const C;
+  const int ldc;
+  const int ith;
+  const int nth;
+};
+
+void sgemm(int m, int n, int k,      //
+           const float *A, int lda,  //
+           const float *B, int ldb,  //
+           float *C, int ldc) {
+  int nth = sysconf(_SC_NPROCESSORS_ONLN);
+#pragma omp parallel for
+  for (int ith = 0; ith < nth; ++ith) {
+    ansiBLAS tb{k, A, lda, B, ldb, C, ldc, ith, nth};
+    tb.matmul(m, n);
+  }
+}
+
+}  // namespace ansiBLAS
+
+long micros(void) {
+  struct timespec ts;
+  clock_gettime(CLOCK_REALTIME, &ts);
+  return ts.tv_sec * 1000000 + (ts.tv_nsec + 999) / 1000;
+}
+
+unsigned rand32(void) {
+  /* Knuth, D.E., "The Art of Computer Programming," Vol 2,
+     Seminumerical Algorithms, Third Edition, Addison-Wesley, 1998,
+     p. 106 (line 26) & p. 108 */
+  static unsigned long long lcg = 1;
+  lcg *= 6364136223846793005;
+  lcg += 1442695040888963407;
+  return lcg >> 32;
+}
+
+float float01(unsigned x) {  // (0,1)
+  return 1.f / 8388608 * ((x >> 9) + .5f);
+}
+
+float numba(void) {  // (-1,1)
+  return float01(rand32()) * 2 - 1;
+}
+
+void fill(int m, int n, float *A, int lda) {
+  for (int j = 0; j < n; ++j)
+    for (int i = 0; i < m; ++i)
+      A[lda * j + i] = numba();
+}
+
+float *new_matrix(int m, int n, int *lda) {
+  void *ptr = 0;
+  int b = 64 / sizeof(float);
+  *lda = (n + b - 1) & -b;
+  posix_memalign(&ptr, 4096, sizeof(float) * m * *lda);
+  return (float *)ptr;
+}
+
+}  // namespace
+
+void barrier(void) {
+}
+void (*pBarrier)(void) = barrier;
+
+#define BENCH(x)                                                           \
+  do {                                                                     \
+    x;                                                                     \
+    int N = 10;                                                            \
+    long t1 = micros();                                                    \
+    for (long i = 0; i < N; ++i) {                                         \
+      pBarrier();                                                          \
+      x;                                                                   \
+    }                                                                      \
+    long t2 = micros();                                                    \
+    printf("%8" PRId64 " µs %s %g gigaflops\n", (t2 - t1 + N - 1) / N, #x, \
+           1e6 / ((t2 - t1 + N - 1) / N) * m * n * k * 2 * 1e-9);          \
+  } while (0)
+
+int main() {
+  int m = 1024;
+  int n = 1024;
+  int k = 1024;
+  int lda, ldb, ldc;
+  float *A = new_matrix(m, k, &lda);
+  float *B = new_matrix(n, k, &ldb);
+  float *C = new_matrix(n, m, &ldc);
+  fill(k, n, A, lda);
+  fill(k, m, B, ldb);
+  BENCH(ansiBLAS::sgemm(m, n, k, A, lda, B, ldb, C, ldc));
+  assert(C[0] == -0x1.20902ap+4);
+  assert(C[1] == -0x1.bf7726p+4);
+  free(C);
+  free(B);
+  free(A);
+}

examples/crashreport2.cc

@@ -7,6 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
+#include "libc/calls/calls.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
 
@@ -18,6 +19,17 @@ void crash(long x0, long x1, long x2,  //
 void (*pCrash)(long, long, long, double, double, double) = crash;
 
 int main(int argc, char *argv[]) {
+
+  // // by default we launch an addr2line subprocess to print backtraces
+  // // with line numbers. you can force it to use the embedded solution
+  // setenv("ADDR2LINE", "", true);
+
+  // // using a seccomp sandbox is another way to force embedded backtraces
+  // pledge("stdio", NULL);
+
+  // enable the crash reporting feature
   ShowCrashReports();
+
+  // time to die
   pCrash(1, 2, 3, NAN, NAN, NAN);
 }

examples/date.c

@@ -9,19 +9,30 @@
 #endif
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/timespec.h"
+#include "libc/intrin/kprintf.h"
+#include "libc/macros.internal.h"
+#include "libc/nt/enum/timezoneid.h"
+#include "libc/nt/struct/timezoneinformation.h"
+#include "libc/nt/time.h"
+#include "libc/runtime/runtime.h"
+#include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
-#include "libc/time/struct/tm.h"
+#include "libc/thread/threads.h"
+#include "libc/time.h"
 
 /**
  * @fileoverview High performance ISO-8601 timestamp formatter.
+ *
+ * The strftime() function is very slow. This goes much faster.
+ * Consider using something like this instead for your loggers.
  */
 
 char *GetTimestamp(void) {
   int x;
   struct timespec ts;
-  _Thread_local static long last;
-  _Thread_local static char s[27];
-  _Thread_local static struct tm tm;
+  thread_local static long last;
+  thread_local static char s[32];
+  thread_local static struct tm tm;
   clock_gettime(0, &ts);
   if (ts.tv_sec != last) {
     localtime_r(&ts.tv_sec, &tm);
@@ -61,11 +72,21 @@ char *GetTimestamp(void) {
   s[23] = '0' + x / 100000 % 10;
   s[24] = '0' + x / 10000 % 10;
   s[25] = '0' + x / 1000 % 10;
+  s[26] = tm.tm_gmtoff < 0 ? '-' : '+';
+  x = ABS(tm.tm_gmtoff) / 60 / 60;
+  s[27] = '0' + x / 10 % 10;
+  s[28] = '0' + x % 10;
+  x = ABS(tm.tm_gmtoff) / 60 % 60;
+  s[29] = '0' + x / 10 % 10;
+  s[30] = '0' + x % 10;
   return s;
 }
 
 int main(int argc, char *argv[]) {
   char buf[128], *p = buf;
+  // setenv("TZ", "UTC", true);
+  // setenv("TZ", "US/Eastern", true);
+  // setenv("TZ", "Asia/Kolkata", true);
   p = stpcpy(p, GetTimestamp());
   p = stpcpy(p, "\n");
   write(1, buf, p - buf);

examples/greenbean.c

@@ -104,8 +104,10 @@ void *Worker(void *id) {
     if (client == -1) {
       // accept() errors are generally ephemeral or recoverable
       // it'd potentially be a good idea to exponential backoff here
-      if (errno == ECANCELED) continue;  // pthread_cancel() was called
-      if (errno == EMFILE) ExplainPrlimit();
+      if (errno == ECANCELED)
+        continue;  // pthread_cancel() was called
+      if (errno == EMFILE)
+        ExplainPrlimit();
       LOG("accept() returned %m");
       SomethingHappened();
       continue;
@@ -285,7 +287,7 @@ int main(int argc, char *argv[]) {
   // print all the ips that 0.0.0.0 would bind
   // Cosmo's GetHostIps() API is much easier than ioctl(SIOCGIFCONF)
   uint32_t *hostips;
-  for (hostips = _gc(GetHostIps()), i = 0; hostips[i]; ++i) {
+  for (hostips = gc(GetHostIps()), i = 0; hostips[i]; ++i) {
     kprintf("listening on http://%hhu.%hhu.%hhu.%hhu:%hu\n", hostips[i] >> 24,
             hostips[i] >> 16, hostips[i] >> 8, hostips[i], PORT);
   }
@@ -339,15 +341,17 @@ int main(int argc, char *argv[]) {
   unassert(!pthread_attr_setguardsize(&attr, pagesz));
   unassert(!pthread_attr_setsigmask_np(&attr, &block));
   unassert(!pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0));
-  pthread_t *th = _gc(calloc(threads, sizeof(pthread_t)));
+  pthread_t *th = gc(calloc(threads, sizeof(pthread_t)));
   for (i = 0; i < threads; ++i) {
     int rc;
     ++a_workers;
     if ((rc = pthread_create(th + i, &attr, Worker, (void *)(intptr_t)i))) {
       --a_workers;
       kprintf("pthread_create failed: %s\n", strerror(rc));
-      if (rc == EAGAIN) ExplainPrlimit();
-      if (!i) exit(1);
+      if (rc == EAGAIN)
+        ExplainPrlimit();
+      if (!i)
+        exit(1);
       threads = i;
       break;
     }
@@ -364,7 +368,8 @@ int main(int argc, char *argv[]) {
     PrintEphemeralStatusLine();
     unassert(!pthread_cond_wait(&statuscond, &statuslock));
     // limit status line updates to sixty frames per second
-    do tick = timespec_add(tick, (struct timespec){0, 1e9 / 60});
+    do
+      tick = timespec_add(tick, (struct timespec){0, 1e9 / 60});
     while (timespec_cmp(tick, timespec_real()) < 0);
     clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &tick, 0);
   }
@@ -378,7 +383,8 @@ int main(int argc, char *argv[]) {
   }
 
   // on windows this is the only way accept() can be canceled
-  if (IsWindows()) close(server);
+  if (IsWindows())
+    close(server);
 
   // print status in terminal as the shutdown progresses
   unassert(!pthread_mutex_lock(&statuslock));
@@ -394,7 +400,8 @@ int main(int argc, char *argv[]) {
   }
 
   // close the server socket
-  if (!IsWindows()) close(server);
+  if (!IsWindows())
+    close(server);
 
   // clean up terminal line
   LOG("thank you for choosing \e[32mgreenbean\e[0m");

examples/hangman.c

@@ -42,7 +42,7 @@
 #include "libc/stdio/rand.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 #include "third_party/zlib/zlib.h"
 // clang-format off
 

examples/kilo.c

@@ -33,11 +33,10 @@
 │  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.        │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 
-asm(".ident \"\n\
+__notice(kilo_notice, "\
 Kilo ─ A very simple editor (BSD-2)\n\
 Copyright 2016 Salvatore Sanfilippo\n\
-Contact: [email protected]\"\n\
-.include \"libc/disclaimer.inc\"");
+Contact: [email protected]");
 
 /*
  * This software has been modified by Justine Tunney to:
@@ -72,7 +71,7 @@ Contact: [email protected]\"\n\
 #include "libc/sysv/consts/fileno.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/consts/termios.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 
 /* Syntax highlight types */
 #define HL_NORMAL    0
@@ -213,10 +212,13 @@ void editorAtExit(void) {
 int enableRawMode(int64_t fd) {
   struct termios raw;
 
-  if (E.rawmode) return 0; /* Already enabled. */
-  if (!isatty(STDIN_FILENO)) goto fatal;
+  if (E.rawmode)
+    return 0; /* Already enabled. */
+  if (!isatty(STDIN_FILENO))
+    goto fatal;
   atexit(editorAtExit);
-  if (tcgetattr(fd, &orig_termios) == -1) goto fatal;
+  if (tcgetattr(fd, &orig_termios) == -1)
+    goto fatal;
 
   raw = orig_termios; /* modify the original mode */
   /* input modes: no break, no CR to NL, no parity check, no strip char,
@@ -234,7 +236,8 @@ int enableRawMode(int64_t fd) {
   raw.c_cc[VTIME] = 1; /* 100 ms timeout (unit is tens of second). */
 
   /* put terminal in raw mode after flushing */
-  if (tcsetattr(fd, TCSAFLUSH, &raw) < 0) goto fatal;
+  if (tcsetattr(fd, TCSAFLUSH, &raw) < 0)
+    goto fatal;
   E.rawmode = 1;
   return 0;
 
@@ -250,7 +253,8 @@ int editorReadKey(int64_t fd) {
   char c, seq[3];
   do {
     nread = read(fd, &c, 1);
-    if (nread == -1) exit(1);
+    if (nread == -1)
+      exit(1);
   } while (!nread);
 
   while (1) {
@@ -261,12 +265,15 @@ int editorReadKey(int64_t fd) {
         return PAGE_DOWN;
       case '\e': /* escape sequence */
         /* If this is just an ESC, we'll timeout here. */
-        if (read(fd, seq, 1) == 0) return CTRL('[');
+        if (read(fd, seq, 1) == 0)
+          return CTRL('[');
         if (seq[0] == '[') {
-          if (read(fd, seq + 1, 1) == 0) return CTRL('[');
+          if (read(fd, seq + 1, 1) == 0)
+            return CTRL('[');
           if (seq[1] >= '0' && seq[1] <= '9') {
             /* Extended escape, read additional byte. */
-            if (read(fd, seq + 2, 1) == 0) return CTRL('[');
+            if (read(fd, seq + 2, 1) == 0)
+              return CTRL('[');
             if (seq[2] == '~') {
               switch (seq[1]) {
                 case '1':
@@ -309,7 +316,8 @@ int editorReadKey(int64_t fd) {
         } else if (seq[0] == 'v') {
           return PAGE_UP;
         } else if (seq[0] == 'O') {
-          if (read(fd, seq + 1, 1) == 0) return CTRL('[');
+          if (read(fd, seq + 1, 1) == 0)
+            return CTRL('[');
           /* ESC O sequences. */
           switch (seq[1]) {
             case 'H':
@@ -333,19 +341,24 @@ int getCursorPosition(int64_t ifd, int64_t ofd, int *rows, int *cols) {
   unsigned i = 0;
 
   /* Report cursor location */
-  if (write(ofd, "\e[6n", 4) != 4) return -1;
+  if (write(ofd, "\e[6n", 4) != 4)
+    return -1;
 
   /* Read the response: ESC [ rows ; cols R */
   while (i < sizeof(buf) - 1) {
-    if (read(ifd, buf + i, 1) != 1) break;
-    if (buf[i] == 'R') break;
+    if (read(ifd, buf + i, 1) != 1)
+      break;
+    if (buf[i] == 'R')
+      break;
     i++;
   }
   buf[i] = '\0';
 
   /* Parse it. */
-  if (buf[0] != CTRL('[') || buf[1] != '[') return -1;
-  if (sscanf(buf + 2, "%d;%d", rows, cols) != 2) return -1;
+  if (buf[0] != CTRL('[') || buf[1] != '[')
+    return -1;
+  if (sscanf(buf + 2, "%d;%d", rows, cols) != 2)
+    return -1;
   return 0;
 }
 
@@ -360,12 +373,15 @@ int getWindowSize(int64_t ifd, int64_t ofd, int *rows, int *cols) {
 
     /* Get the initial position so we can restore it later. */
     retval = getCursorPosition(ifd, ofd, &orig_row, &orig_col);
-    if (retval == -1) goto failed;
+    if (retval == -1)
+      goto failed;
 
     /* Go to right/bottom margin and get position. */
-    if (write(ofd, "\e[999C\e[999B", 12) != 12) goto failed;
+    if (write(ofd, "\e[999C\e[999B", 12) != 12)
+      goto failed;
     retval = getCursorPosition(ifd, ofd, rows, cols);
-    if (retval == -1) goto failed;
+    if (retval == -1)
+      goto failed;
 
     /* Restore position. */
     char seq[32];
@@ -407,7 +423,8 @@ void editorUpdateSyntax(erow *row) {
   row->hl = realloc(row->hl, row->rsize);
   memset(row->hl, HL_NORMAL, row->rsize);
 
-  if (E.syntax == NULL) return; /* No syntax, everything is HL_NORMAL. */
+  if (E.syntax == NULL)
+    return; /* No syntax, everything is HL_NORMAL. */
 
   int i, prev_sep, in_string, in_comment;
   char *p;
@@ -476,7 +493,8 @@ void editorUpdateSyntax(erow *row) {
         prev_sep = 0;
         continue;
       }
-      if (*p == in_string) in_string = 0;
+      if (*p == in_string)
+        in_string = 0;
       p++;
       i++;
       continue;
@@ -516,7 +534,8 @@ void editorUpdateSyntax(erow *row) {
       for (j = 0; keywords[j]; j++) {
         int klen = strlen(keywords[j]);
         int kw2 = keywords[j][klen - 1] == '|';
-        if (kw2) klen--;
+        if (kw2)
+          klen--;
 
         if (!memcmp(p, keywords[j], klen) && is_separator(*(p + klen))) {
           /* Keyword */
@@ -600,7 +619,8 @@ void editorUpdateRow(erow *row) {
    * respecting tabs, substituting non printable characters with '?'. */
   free(row->render);
   for (j = 0; j < row->size; j++) {
-    if (row->chars[j] == '\t') tabs++;
+    if (row->chars[j] == '\t')
+      tabs++;
   }
 
   row->render = malloc(row->size + tabs * 8 + nonprint * 9 + 1);
@@ -627,11 +647,13 @@ void editorUpdateRow(erow *row) {
 /* Insert a row at the specified position, shifting the other rows on the bottom
  * if required. */
 void editorInsertRow(int at, char *s, size_t len) {
-  if (at > E.numrows) return;
+  if (at > E.numrows)
+    return;
   E.row = realloc(E.row, sizeof(erow) * (E.numrows + 1));
   if (at != E.numrows) {
     memmove(E.row + at + 1, E.row + at, sizeof(E.row[0]) * (E.numrows - at));
-    for (int j = at + 1; j <= E.numrows; j++) E.row[j].idx++;
+    for (int j = at + 1; j <= E.numrows; j++)
+      E.row[j].idx++;
   }
   E.row[at].size = len;
   E.row[at].chars = malloc(len + 1);
@@ -658,11 +680,13 @@ void editorFreeRow(erow *row) {
 void editorDelRow(int at) {
   erow *row;
 
-  if (at >= E.numrows) return;
+  if (at >= E.numrows)
+    return;
   row = E.row + at;
   editorFreeRow(row);
   memmove(E.row + at, E.row + at + 1, sizeof(E.row[0]) * (E.numrows - at - 1));
-  for (int j = at; j < E.numrows - 1; j++) E.row[j].idx++;
+  for (int j = at; j < E.numrows - 1; j++)
+    E.row[j].idx++;
   E.numrows--;
   E.dirty++;
 }
@@ -730,7 +754,8 @@ void editorRowAppendString(erow *row, char *s, size_t len) {
 
 /* Delete the character at offset 'at' from the specified row. */
 void editorRowDelChar(erow *row, int at) {
-  if (row->size <= at) return;
+  if (row->size <= at)
+    return;
   memmove(row->chars + at, row->chars + at + 1, row->size - at);
   editorUpdateRow(row);
   row->size--;
@@ -746,7 +771,8 @@ void editorInsertChar(int c) {
   /* If the row where the cursor is currently located does not exist in our
    * logical representation of the file, add enough empty rows as needed. */
   if (!row) {
-    while (E.numrows <= filerow) editorInsertRow(E.numrows, "", 0);
+    while (E.numrows <= filerow)
+      editorInsertRow(E.numrows, "", 0);
   }
   row = &E.row[filerow];
   editorRowInsertChar(row, filecol, c);
@@ -774,7 +800,8 @@ void editorInsertNewline(void) {
   }
   /* If the cursor is over the current line size, we want to conceptually
    * think it's just over the last character. */
-  if (filecol >= row->size) filecol = row->size;
+  if (filecol >= row->size)
+    filecol = row->size;
   if (filecol == 0) {
     editorInsertRow(filerow, "", 0);
   } else {
@@ -801,7 +828,8 @@ void editorDelChar(void) {
   int filecol = E.coloff + E.cx;
   erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];
 
-  if (!row || (filecol == 0 && filerow == 0)) return;
+  if (!row || (filecol == 0 && filerow == 0))
+    return;
   if (filecol == 0) {
     /* Handle the case of column 0, we need to move the current line
      * on the right of the previous one. */
@@ -826,7 +854,8 @@ void editorDelChar(void) {
     else
       E.cx--;
   }
-  if (row) editorUpdateRow(row);
+  if (row)
+    editorUpdateRow(row);
   E.dirty++;
 }
 
@@ -869,12 +898,15 @@ int editorSave(void) {
   int len;
   char *buf = editorRowsToString(&len);
   int64_t fd = open(E.filename, O_RDWR | O_CREAT, 0644);
-  if (fd == -1) goto writeerr;
+  if (fd == -1)
+    goto writeerr;
 
   /* Use truncate + a single write(2) call in order to make saving
    * a bit safer, under the limits of what we can do in a small editor. */
-  if (ftruncate(fd, len) == -1) goto writeerr;
-  if (write(fd, buf, len) != len) goto writeerr;
+  if (ftruncate(fd, len) == -1)
+    goto writeerr;
+  if (write(fd, buf, len) != len)
+    goto writeerr;
 
   close(fd);
   free(buf);
@@ -884,7 +916,8 @@ int editorSave(void) {
 
 writeerr:
   free(buf);
-  if (fd != -1) close(fd);
+  if (fd != -1)
+    close(fd);
   editorSetStatusMessage("Can't save! I/O error: %s", strerror(errno));
   return 1;
 }
@@ -925,7 +958,8 @@ void editorRefreshScreen(void) {
           abAppend(&ab, "~", 1);
           padding--;
         }
-        while (padding--) abAppend(&ab, " ", 1);
+        while (padding--)
+          abAppend(&ab, " ", 1);
         abAppend(&ab, welcome, welcomelen);
       } else {
         abAppend(&ab, "~\e[0K\r\n", 7);
@@ -940,7 +974,8 @@ void editorRefreshScreen(void) {
     int current_color = -1;
 #endif
     if (len > 0) {
-      if (len > E.screencols) len = E.screencols;
+      if (len > E.screencols)
+        len = E.screencols;
       char *c = r->render + E.coloff;
 #if SYNTAX
       unsigned char *hl = r->hl + E.coloff;
@@ -991,7 +1026,8 @@ void editorRefreshScreen(void) {
                      E.numrows, E.dirty ? "(modified)" : "");
   int rlen = snprintf(rstatus, sizeof(rstatus), "%d/%d", E.rowoff + E.cy + 1,
                       E.numrows);
-  if (len > E.screencols) len = E.screencols;
+  if (len > E.screencols)
+    len = E.screencols;
   abAppend(&ab, status, len);
   while (len < E.screencols) {
     if (E.screencols - len == rlen) {
@@ -1019,7 +1055,8 @@ void editorRefreshScreen(void) {
   erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];
   if (row) {
     for (j = E.coloff; j < (E.cx + E.coloff); j++) {
-      if (j < row->size && row->chars[j] == CTRL('I')) cx += 7 - ((cx) % 8);
+      if (j < row->size && row->chars[j] == CTRL('I'))
+        cx += 7 - ((cx) % 8);
       cx++;
     }
   }
@@ -1070,7 +1107,8 @@ void editorFind(int64_t fd) {
 
     int c = editorReadKey(fd);
     if (c == DEL_KEY || c == CTRL('H') || c == CTRL('?')) {
-      if (qlen != 0) query[--qlen] = '\0';
+      if (qlen != 0)
+        query[--qlen] = '\0';
       last_match = -1;
     } else if (c == CTRL('G')) {
       break;
@@ -1097,7 +1135,8 @@ void editorFind(int64_t fd) {
     }
 
     /* Search occurrence. */
-    if (last_match == -1) find_next = 1;
+    if (last_match == -1)
+      find_next = 1;
     if (find_next) {
       char *match = NULL;
       int match_offset = 0;
@@ -1191,7 +1230,8 @@ void editorMoveCursor(int key) {
       break;
     case ARROW_UP:
       if (E.cy == 0) {
-        if (E.rowoff) E.rowoff--;
+        if (E.rowoff)
+          E.rowoff--;
       } else {
         E.cy -= 1;
       }
@@ -1300,9 +1340,11 @@ void editorProcessKeypress(int64_t fd) {
 
     case CTRL('L'):
       times = E.screenrows / 2;
-      while (times--) editorMoveCursor(c == PAGE_UP ? ARROW_UP : ARROW_DOWN);
+      while (times--)
+        editorMoveCursor(c == PAGE_UP ? ARROW_UP : ARROW_DOWN);
       times = E.screenrows / 2;
-      while (times--) editorMoveCursor(c == PAGE_UP ? ARROW_DOWN : ARROW_UP);
+      while (times--)
+        editorMoveCursor(c == PAGE_UP ? ARROW_DOWN : ARROW_UP);
       break;
 
     case PAGE_UP:
@@ -1313,14 +1355,17 @@ void editorProcessKeypress(int64_t fd) {
         E.cy = E.screenrows - 1;
       }
       times = E.screenrows;
-      while (times--) editorMoveCursor(c == PAGE_UP ? ARROW_UP : ARROW_DOWN);
+      while (times--)
+        editorMoveCursor(c == PAGE_UP ? ARROW_UP : ARROW_DOWN);
       times = E.screenrows / 2;
-      while (times--) editorMoveCursor(c == PAGE_UP ? ARROW_DOWN : ARROW_UP);
+      while (times--)
+        editorMoveCursor(c == PAGE_UP ? ARROW_DOWN : ARROW_UP);
       break;
 
     case HOME_KEY:
     case CTRL('A'):
-      while (E.cx || E.coloff) editorMoveCursor(ARROW_LEFT);
+      while (E.cx || E.coloff)
+        editorMoveCursor(ARROW_LEFT);
       break;
     case END_KEY:
     case CTRL('E'):

examples/localtime.c

@@ -0,0 +1,15 @@
+#if 0
+/*─────────────────────────────────────────────────────────────────╗
+│ To the extent possible under law, Justine Tunney has waived      │
+│ all copyright and related or neighboring rights to this file,    │
+│ as it is written in the following disclaimers:                   │
+│   • http://unlicense.org/                                        │
+│   • http://creativecommons.org/publicdomain/zero/1.0/            │
+╚─────────────────────────────────────────────────────────────────*/
+#endif
+#include "libc/time.h"
+
+int main(int argc, char *argv[]) {
+  int64_t t = 0;
+  localtime(&t);
+}

examples/ls.c

@@ -50,7 +50,7 @@ void List(const char *path) {
   if (strcmp(path, ".") == 0) {
     vpath = "";
   } else if (!endswith(path, "/")) {
-    vpath = _gc(xasprintf("%s/", path));
+    vpath = gc(xasprintf("%s/", path));
   } else {
     vpath = path;
   }

examples/nesemu1.cc

@@ -44,7 +44,7 @@
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/consts/w.h"
 #include "libc/thread/thread.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 #include "libc/x/xasprintf.h"
 #include "libc/x/xsigaction.h"
 #include "libc/zip.internal.h"
@@ -492,7 +492,8 @@ void TransmitVideo(void) {
   ssize_t rc;
   struct Frame* f;
   f = &vf_[frame_];
-  if (!HasVideo(f)) f = FlipFrameBuffer();
+  if (!HasVideo(f))
+    f = FlipFrameBuffer();
   if ((rc = Write(STDOUT_FILENO, f->w, f->p - f->w)) != -1) {
     f->w += rc;
   } else if (errno == EAGAIN) {
@@ -504,9 +505,12 @@ void TransmitVideo(void) {
 
 void TransmitAudio(void) {
   ssize_t rc;
-  if (!playpid_) return;
-  if (!audio_.i) return;
-  if (playfd_ == -1) return;
+  if (!playpid_)
+    return;
+  if (!audio_.i)
+    return;
+  if (playfd_ == -1)
+    return;
   if ((rc = Write(playfd_, audio_.p, audio_.i * sizeof(short))) != -1) {
     rc /= sizeof(short);
     memmove(audio_.p, audio_.p + rc, (audio_.i - rc) * sizeof(short));
@@ -561,9 +565,12 @@ void KeyCountdown(struct Action* a) {
 void PollAndSynchronize(void) {
   do {
     if (ReadKeyboard() == -1) {
-      if (errno != EINTR) Exit(1);
-      if (exited_) Exit(0);
-      if (resized_) GetTermSize();
+      if (errno != EINTR)
+        Exit(1);
+      if (exited_)
+        Exit(0);
+      if (resized_)
+        GetTermSize();
     }
   } while (!timeout_);
   TransmitVideo();
@@ -734,7 +741,8 @@ u8 Access(unsigned addr, u8 value, bool write) {
       }
     }
   }
-  if ((addr >> 13) == 3) return PRAM[addr & 0x1FFF];
+  if ((addr >> 13) == 3)
+    return PRAM[addr & 0x1FFF];
   return banks[(addr / RomGranularity) % RomPages][addr % RomGranularity];
 }
 
@@ -828,7 +836,8 @@ bool offset_toggle = false;
 u8& NesMmap(int i) {
   i &= 0x3FFF;
   if (i >= 0x3F00) {
-    if (i % 4 == 0) i &= 0x0F;
+    if (i % 4 == 0)
+      i &= 0x0F;
     return palette[i & 0x1F];
   }
   if (i < 0x2000) {
@@ -844,7 +853,8 @@ u8 PpuAccess(u16 index, u8 v, bool write) {
     return open_bus_decay_timer = 77777, open_bus = v;
   };
   u8 res = open_bus;
-  if (write) RefreshOpenBus(v);
+  if (write)
+    RefreshOpenBus(v);
   switch (index) {  // Which port from $200x?
     case 0:
       if (write) {
@@ -858,7 +868,8 @@ u8 PpuAccess(u16 index, u8 v, bool write) {
       }
       break;
     case 2:
-      if (write) break;
+      if (write)
+        break;
       res = reg.status | (open_bus & 0x1F);
       reg.InVBlank = false;   // Reading $2002 clears the vblank flag.
       offset_toggle = false;  // Also resets the toggle for address updates.
@@ -867,7 +878,8 @@ u8 PpuAccess(u16 index, u8 v, bool write) {
       }
       break;
     case 3:
-      if (write) reg.OAMaddr = v;
+      if (write)
+        reg.OAMaddr = v;
       break;  // Index into Object Attribute Memory
     case 4:
       if (write) {
@@ -878,7 +890,8 @@ u8 PpuAccess(u16 index, u8 v, bool write) {
       }
       break;
     case 5:
-      if (!write) break;  // Set background scrolling offset
+      if (!write)
+        break;  // Set background scrolling offset
       if (offset_toggle) {
         scroll.yfine = v & 7;
         scroll.ycoarse = v >> 3;
@@ -888,7 +901,8 @@ u8 PpuAccess(u16 index, u8 v, bool write) {
       offset_toggle = !offset_toggle;
       break;
     case 6:
-      if (!write) break;  // Set video memory position for reads/writes
+      if (!write)
+        break;  // Set video memory position for reads/writes
       if (offset_toggle) {
         scroll.vaddrlo = v;
         vaddr.raw = (unsigned)scroll.raw;
@@ -926,17 +940,21 @@ void RenderingTick() {
     case 2:  // Point to attribute table
       ioaddr = 0x23C0 + 0x400 * vaddr.basenta + 8 * (vaddr.ycoarse / 4) +
                (vaddr.xcoarse / 4);
-      if (tile_decode_mode) break;  // Or nametable, with sprites.
-    case 0:                         // Point to nametable
+      if (tile_decode_mode)
+        break;  // Or nametable, with sprites.
+    case 0:     // Point to nametable
       ioaddr = 0x2000 + (vaddr.raw & 0xFFF);
       // Reset sprite data
       if (x_ == 0) {
         sprinpos = sproutpos = 0;
-        if (reg.ShowSP) reg.OAMaddr = 0;
+        if (reg.ShowSP)
+          reg.OAMaddr = 0;
       }
-      if (!reg.ShowBG) break;
+      if (!reg.ShowBG)
+        break;
       // Reset scrolling (vertical once, horizontal each scanline)
-      if (x_ == 304 && scanline == -1) vaddr.raw = (unsigned)scroll.raw;
+      if (x_ == 304 && scanline == -1)
+        vaddr.raw = (unsigned)scroll.raw;
       if (x_ == 256) {
         vaddr.xcoarse = (unsigned)scroll.xcoarse;
         vaddr.basenta_h = (unsigned)scroll.basenta_h;
@@ -949,7 +967,8 @@ void RenderingTick() {
       }
       // Name table access
       pat_addr = 0x1000 * reg.BGaddr + 16 * NesMmap(ioaddr) + vaddr.yfine;
-      if (!tile_decode_mode) break;
+      if (!tile_decode_mode)
+        break;
       // Push the current tile into shift registers.
       // The bitmap pattern is 16 bits, while the attribute is 2 bits, repeated
       // 8 times.
@@ -976,7 +995,8 @@ void RenderingTick() {
         auto& o = OAM3[sprrenpos];  // Sprite to render on next scanline
         memcpy(&o, &OAM2[sprrenpos], sizeof(o));
         unsigned y = (scanline)-o.y;
-        if (o.attr & 0x80) y ^= (reg.SPsize ? 15 : 7);
+        if (o.attr & 0x80)
+          y ^= (reg.SPsize ? 15 : 7);
         pat_addr = 0x1000 * (reg.SPsize ? (o.index & 0x01) : reg.SPaddr);
         pat_addr += 0x10 * (reg.SPsize ? (o.index & 0xFE) : (o.index & 0xFF));
         pat_addr += (y & 7) + (y & 8) * 2;
@@ -1011,8 +1031,10 @@ void RenderingTick() {
         break;
       }
       ++sprinpos;  // next sprite
-      if (sproutpos < 8) OAM2[sproutpos].y = sprtmp;
-      if (sproutpos < 8) OAM2[sproutpos].sprindex = reg.OAMindex;
+      if (sproutpos < 8)
+        OAM2[sproutpos].y = sprtmp;
+      if (sproutpos < 8)
+        OAM2[sproutpos].sprindex = reg.OAMindex;
       y1 = sprtmp;
       y2 = sprtmp + (reg.SPsize ? 16 : 8);
       if (!(scanline >= y1 && scanline < y2)) {
@@ -1020,19 +1042,23 @@ void RenderingTick() {
       }
       break;
     case 1:
-      if (sproutpos < 8) OAM2[sproutpos].index = sprtmp;
+      if (sproutpos < 8)
+        OAM2[sproutpos].index = sprtmp;
       break;
     case 2:
-      if (sproutpos < 8) OAM2[sproutpos].attr = sprtmp;
+      if (sproutpos < 8)
+        OAM2[sproutpos].attr = sprtmp;
       break;
     case 3:
-      if (sproutpos < 8) OAM2[sproutpos].x_ = sprtmp;
+      if (sproutpos < 8)
+        OAM2[sproutpos].x_ = sprtmp;
       if (sproutpos < 8) {
         ++sproutpos;
       } else {
         reg.SPoverflow = true;
       }
-      if (sprinpos == 2) reg.OAMaddr = 8;
+      if (sprinpos == 2)
+        reg.OAMaddr = 8;
       break;
   }
 }
@@ -1060,13 +1086,17 @@ void RenderPixel() {
       auto& s = OAM3[sno];
       // Check if this sprite is horizontally in range
       unsigned xdiff = x_ - s.x_;
-      if (xdiff >= 8) continue;  // Also matches negative values
+      if (xdiff >= 8)
+        continue;  // Also matches negative values
       // Determine which pixel to display; skip transparent pixels
-      if (!(s.attr & 0x40)) xdiff = 7 - xdiff;
+      if (!(s.attr & 0x40))
+        xdiff = 7 - xdiff;
       u8 spritepixel = (s.pattern >> (xdiff * 2)) & 3;
-      if (!spritepixel) continue;
+      if (!spritepixel)
+        continue;
       // Register sprite-0 hit if applicable
-      if (x_ < 255 && pixel && s.sprindex == 0) reg.SP0hit = true;
+      if (x_ < 255 && pixel && s.sprindex == 0)
+        reg.SP0hit = true;
       // Render the pixel unless behind-background placement wanted
       if (!(s.attr & 0x20) || !pixel) {
         attr = (s.attr & 3) + 4;
@@ -1095,11 +1125,13 @@ void ReadToolAssistedSpeedrunRobotKeys() {
     }
     if (ctrlmask & 0x80) {
       joy_next_[0] = fgetc(fp);
-      if (feof(fp)) joy_next_[0] = 0;
+      if (feof(fp))
+        joy_next_[0] = 0;
     }
     if (ctrlmask & 0x40) {
       joy_next_[1] = fgetc(fp);
-      if (feof(fp)) joy_next_[1] = 0;
+      if (feof(fp))
+        joy_next_[1] = 0;
     }
   }
 }
@@ -1144,18 +1176,23 @@ void Tick() {
       CPU::nmi = reg.InVBlank && reg.NMIenabled;
       break;
   }
-  if (VBlankState != 0) VBlankState += (VBlankState < 0 ? 1 : -1);
-  if (open_bus_decay_timer && !--open_bus_decay_timer) open_bus = 0;
+  if (VBlankState != 0)
+    VBlankState += (VBlankState < 0 ? 1 : -1);
+  if (open_bus_decay_timer && !--open_bus_decay_timer)
+    open_bus = 0;
 
   // Graphics processing scanline?
   if (scanline < DYN) {
     /* Process graphics for this cycle */
-    if (reg.ShowBGSP) RenderingTick();
-    if (scanline >= 0 && x_ < 256) RenderPixel();
+    if (reg.ShowBGSP)
+      RenderingTick();
+    if (scanline >= 0 && x_ < 256)
+      RenderPixel();
   }
 
   // Done with the cycle. Check for end of scanline.
-  if (++cycle_counter == 3) cycle_counter = 0;  // For NTSC pixel shifting
+  if (++cycle_counter == 3)
+    cycle_counter = 0;  // For NTSC pixel shifting
   if (++x_ >= scanline_end) {
     // Begin new scanline
     FlushScanline(scanline);
@@ -1242,30 +1279,36 @@ struct channel {
   template <unsigned c>
   int Tick() {
     channel& ch = *this;
-    if (!ChannelsEnabled[c]) return c == 4 ? 64 : 8;
+    if (!ChannelsEnabled[c])
+      return c == 4 ? 64 : 8;
     int wl = (ch.reg.WaveLength + 1) * (c >= 2 ? 1 : 2);
-    if (c == 3) wl = NoisePeriods[ch.reg.NoiseFreq];
+    if (c == 3)
+      wl = NoisePeriods[ch.reg.NoiseFreq];
     int volume = ch.length_counter
                      ? ch.reg.EnvDecayDisable ? ch.reg.FixedVolume : ch.envelope
                      : 0;
     // Sample may change at wavelen intervals.
     auto& S = ch.level;
-    if (!count(ch.wave_counter, wl)) return S;
+    if (!count(ch.wave_counter, wl))
+      return S;
     switch (c) {
       default:  // Square wave. With four different 8-step binary waveforms (32
                 // bits of data total).
-        if (wl < 8) return S = 8;
+        if (wl < 8)
+          return S = 8;
         return S = (0xF33C0C04u &
                     (1u << (++ch.phase % 8 + ch.reg.DutyCycle * 8)))
                        ? volume
                        : 0;
 
       case 2:  // Triangle wave
-        if (ch.length_counter && ch.linear_counter && wl >= 3) ++ch.phase;
+        if (ch.length_counter && ch.linear_counter && wl >= 3)
+          ++ch.phase;
         return S = (ch.phase & 15) ^ ((ch.phase & 16) ? 15 : 0);
 
       case 3:  // Noise: Linear feedback shift register
-        if (!ch.hold) ch.hold = 1;
+        if (!ch.hold)
+          ch.hold = 1;
         ch.hold =
             (ch.hold >> 1) |
             (((ch.hold ^ (ch.hold >> (ch.reg.NoiseType ? 6 : 1))) & 1) << 14);
@@ -1302,7 +1345,8 @@ struct channel {
           } else {
             v -= 2;
           }
-          if (v >= 0 && v <= 0x7F) ch.linear_counter = v;
+          if (v >= 0 && v <= 0x7F)
+            ch.linear_counter = v;
         }
         return S = ch.linear_counter;
     }
@@ -1338,7 +1382,8 @@ void Write(u8 index, u8 value) {
       ch.linear_counter = ch.reg.LinearCounterInit;
       ch.env_delay = ch.reg.EnvDecayRate;
       ch.envelope = 15;
-      if (index < 8) ch.phase = 0;
+      if (index < 8)
+        ch.phase = 0;
       break;
     case 0x10:
       ch.reg.reg3 = value;
@@ -1384,9 +1429,11 @@ u8 Read() {
   for (c = 0; c < 5; ++c) {
     res |= channels[c].length_counter ? 1 << c : 0;
   }
-  if (PeriodicIRQ) res |= 0x40;
+  if (PeriodicIRQ)
+    res |= 0x40;
   PeriodicIRQ = false;
-  if (DMC_IRQ) res |= 0x80;
+  if (DMC_IRQ)
+    res |= 0x80;
   DMC_IRQ = false;
   CPU::intr = false;
   return res;
@@ -1396,7 +1443,8 @@ void Tick() {  // Invoked at CPU's rate.
   // Divide CPU clock by 7457.5 to get a 240 Hz, which controls certain events.
   if ((hz240counter.lo += 2) >= 14915) {
     hz240counter.lo -= 14915;
-    if (++hz240counter.hi >= 4 + FiveCycleDivider) hz240counter.hi = 0;
+    if (++hz240counter.hi >= 4 + FiveCycleDivider)
+      hz240counter.hi = 0;
 
     // 60 Hz interval: IRQ. IRQ is not invoked in five-cycle mode (48 Hz).
     if (!IRQdisable && !FiveCycleDivider && hz240counter.hi == 0) {
@@ -1422,7 +1470,8 @@ void Tick() {  // Invoked at CPU's rate.
         if (wl >= 8 && ch.reg.SweepEnable && ch.reg.SweepShift) {
           int s = wl >> ch.reg.SweepShift, d[4] = {s, s, ~s, -s};
           wl += d[ch.reg.SweepDecrease * 2 + c];
-          if (wl < 0x800) ch.reg.WaveLength = wl;
+          if (wl < 0x800)
+            ch.reg.WaveLength = wl;
         }
 
       // Linear tick (triangle wave only)
@@ -1464,20 +1513,24 @@ namespace CPU {
 
 void Tick() {
   // PPU clock: 3 times the CPU rate
-  for (unsigned n = 0; n < 3; ++n) PPU::Tick();
+  for (unsigned n = 0; n < 3; ++n)
+    PPU::Tick();
   // APU clock: 1 times the CPU rate
-  for (unsigned n = 0; n < 1; ++n) APU::Tick();
+  for (unsigned n = 0; n < 1; ++n)
+    APU::Tick();
 }
 
 template <bool write>
 u8 MemAccess(u16 addr, u8 v) {
   // Memory writes are turned into reads while reset is being signalled
-  if (reset && write) return MemAccess<0>(addr);
+  if (reset && write)
+    return MemAccess<0>(addr);
   Tick();
   // Map the memory from CPU's viewpoint.
   /**/ if (addr < 0x2000) {
     u8& r = RAM[addr & 0x7FF];
-    if (!write) return r;
+    if (!write)
+      return r;
     r = v;
   } else if (addr < 0x4000) {
     return PPU::PpuAccess(addr & 7, v, write);
@@ -1489,17 +1542,21 @@ u8 MemAccess(u16 addr, u8 v) {
             WB(0x2004, RB((v & 7) * 0x0100 + b));
         return 0;
       case 0x15:
-        if (!write) return APU::Read();
+        if (!write)
+          return APU::Read();
         APU::Write(0x15, v);
         break;
       case 0x16:
-        if (!write) return JoyRead(0);
+        if (!write)
+          return JoyRead(0);
         JoyStrobe(v);
         break;
       case 0x17:
-        if (!write) return JoyRead(1);  // write:passthru
+        if (!write)
+          return JoyRead(1);  // write:passthru
       default:
-        if (!write) break;
+        if (!write)
+          break;
         APU::Write(addr & 0x1F, v);
     }
   } else {
@@ -1527,7 +1584,8 @@ u16 wrap(u16 oldaddr, u16 newaddr) {
 }
 void Misfire(u16 old, u16 addr) {
   u16 q = wrap(old, addr);
-  if (q != addr) RB(q);
+  if (q != addr)
+    RB(q);
 }
 u8 Pop() {
   return RB(0x100 | u8(++S));
@@ -1655,7 +1713,8 @@ void Op() {
   } else if (intr && !P.I) {
     op = 0x102;
   }
-  if (!nmi_now) nmi_edge_detected = false;
+  if (!nmi_now)
+    nmi_edge_detected = false;
 
     // Define function pointers for each opcode (00..FF) and each interrupt
     // (100,101,102)
@@ -1757,12 +1816,15 @@ Press enter to continue without sound: ",
   fgetc(fp);
   fgetc(fp);
 
-  if (mappernum >= 0x40) mappernum &= 15;
+  if (mappernum >= 0x40)
+    mappernum &= 15;
   GamePak::mappernum = mappernum;
 
   // Read the ROM data
-  if (rom16count) GamePak::ROM.resize(rom16count * 0x4000);
-  if (vrom8count) GamePak::VRAM.resize(vrom8count * 0x2000);
+  if (rom16count)
+    GamePak::ROM.resize(rom16count * 0x4000);
+  if (vrom8count)
+    GamePak::VRAM.resize(vrom8count * 0x2000);
   fread(&GamePak::ROM[0], rom16count, 0x4000, fp);
   fread(&GamePak::VRAM[0], vrom8count, 0x2000, fp);
 
@@ -1776,10 +1838,12 @@ Press enter to continue without sound: ",
   PPU::reg.value = 0;
 
   // Pre-initialize RAM the same way as FCEUX does, to improve TAS sync.
-  for (unsigned a = 0; a < 0x800; ++a) CPU::RAM[a] = (a & 4) ? 0xFF : 0x00;
+  for (unsigned a = 0; a < 0x800; ++a)
+    CPU::RAM[a] = (a & 4) ? 0xFF : 0x00;
 
   // Run the CPU until the program is killed.
-  for (;;) CPU::Op();
+  for (;;)
+    CPU::Op();
 }
 
 wontreturn void PrintUsage(int rc, FILE* f) {

examples/picol.c

@@ -123,14 +123,16 @@ int picolParseCommand(struct picolParser *p) {
     } else if (*p->p == '[' && blevel == 0) {
       level++;
     } else if (*p->p == ']' && blevel == 0) {
-      if (!--level) break;
+      if (!--level)
+        break;
     } else if (*p->p == '\\') {
       p->p++;
       p->len--;
     } else if (*p->p == '{') {
       blevel++;
     } else if (*p->p == '}') {
-      if (blevel != 0) blevel--;
+      if (blevel != 0)
+        blevel--;
     }
     p->p++;
     p->len--;
@@ -270,11 +272,13 @@ int picolGetToken(struct picolParser *p) {
       case ' ':
       case '\t':
       case '\r':
-        if (p->insidequote) return picolParseString(p);
+        if (p->insidequote)
+          return picolParseString(p);
         return picolParseSep(p);
       case '\n':
       case ';':
-        if (p->insidequote) return picolParseString(p);
+        if (p->insidequote)
+          return picolParseString(p);
         return picolParseEol(p);
       case '[':
         return picolParseCommand(p);
@@ -310,7 +314,8 @@ void picolSetResult(struct picolInterp *i, char *s) {
 struct picolVar *picolGetVar(struct picolInterp *i, char *name) {
   struct picolVar *v = i->callframe->vars;
   while (v) {
-    if (strcmp(v->name, name) == 0) return v;
+    if (strcmp(v->name, name) == 0)
+      return v;
     v = v->next;
   }
   return NULL;
@@ -334,7 +339,8 @@ int picolSetVar(struct picolInterp *i, char *name, char *val) {
 struct picolCmd *picolGetCommand(struct picolInterp *i, char *name) {
   struct picolCmd *c = i->commands;
   while (c) {
-    if (strcmp(c->name, name) == 0) return c;
+    if (strcmp(c->name, name) == 0)
+      return c;
     c = c->next;
   }
   return NULL;
@@ -372,9 +378,11 @@ int picolEval(struct picolInterp *i, char *t) {
     int tlen;
     int prevtype = p.type;
     picolGetToken(&p);
-    if (p.type == PT_EOF) break;
+    if (p.type == PT_EOF)
+      break;
     tlen = p.end - p.start + 1;
-    if (tlen < 0) tlen = 0;
+    if (tlen < 0)
+      tlen = 0;
     t = malloc(tlen + 1);
     memcpy(t, p.start, tlen);
     t[tlen] = '\0';
@@ -392,7 +400,8 @@ int picolEval(struct picolInterp *i, char *t) {
     } else if (p.type == PT_CMD) {
       retcode = picolEval(i, t);
       free(t);
-      if (retcode != PICOL_OK) goto err;
+      if (retcode != PICOL_OK)
+        goto err;
       t = strdup(i->result);
     } else if (p.type == PT_ESC) {
       /* XXX: escape handling missing! */
@@ -414,10 +423,12 @@ int picolEval(struct picolInterp *i, char *t) {
           goto err;
         }
         retcode = c->func(i, argc, argv, c->privdata);
-        if (retcode != PICOL_OK) goto err;
+        if (retcode != PICOL_OK)
+          goto err;
       }
       /* Prepare for the next command */
-      for (j = 0; j < argc; j++) free(argv[j]);
+      for (j = 0; j < argc; j++)
+        free(argv[j]);
       free(argv);
       argv = NULL;
       argc = 0;
@@ -438,7 +449,8 @@ int picolEval(struct picolInterp *i, char *t) {
     prevtype = p.type;
   }
 err:
-  for (j = 0; j < argc; j++) free(argv[j]);
+  for (j = 0; j < argc; j++)
+    free(argv[j]);
   free(argv);
   return retcode;
 }
@@ -454,7 +466,8 @@ int picolArityErr(struct picolInterp *i, char *name) {
 int picolCommandMath(struct picolInterp *i, int argc, char **argv, void *pd) {
   char buf[64];
   int a, b, c;
-  if (argc != 3) return picolArityErr(i, argv[0]);
+  if (argc != 3)
+    return picolArityErr(i, argv[0]);
   a = atoi(argv[1]);
   b = atoi(argv[2]);
   if (argv[0][0] == '+')
@@ -485,22 +498,26 @@ int picolCommandMath(struct picolInterp *i, int argc, char **argv, void *pd) {
 }
 
 int picolCommandSet(struct picolInterp *i, int argc, char **argv, void *pd) {
-  if (argc != 3) return picolArityErr(i, argv[0]);
+  if (argc != 3)
+    return picolArityErr(i, argv[0]);
   picolSetVar(i, argv[1], argv[2]);
   picolSetResult(i, argv[2]);
   return PICOL_OK;
 }
 
 int picolCommandPuts(struct picolInterp *i, int argc, char **argv, void *pd) {
-  if (argc != 2) return picolArityErr(i, argv[0]);
+  if (argc != 2)
+    return picolArityErr(i, argv[0]);
   printf("%s\n", argv[1]);
   return PICOL_OK;
 }
 
 int picolCommandIf(struct picolInterp *i, int argc, char **argv, void *pd) {
   int retcode;
-  if (argc != 3 && argc != 5) return picolArityErr(i, argv[0]);
-  if ((retcode = picolEval(i, argv[1])) != PICOL_OK) return retcode;
+  if (argc != 3 && argc != 5)
+    return picolArityErr(i, argv[0]);
+  if ((retcode = picolEval(i, argv[1])) != PICOL_OK)
+    return retcode;
   if (atoi(i->result))
     return picolEval(i, argv[2]);
   else if (argc == 5)
@@ -509,10 +526,12 @@ int picolCommandIf(struct picolInterp *i, int argc, char **argv, void *pd) {
 }
 
 int picolCommandWhile(struct picolInterp *i, int argc, char **argv, void *pd) {
-  if (argc != 3) return picolArityErr(i, argv[0]);
+  if (argc != 3)
+    return picolArityErr(i, argv[0]);
   while (1) {
     int retcode = picolEval(i, argv[1]);
-    if (retcode != PICOL_OK) return retcode;
+    if (retcode != PICOL_OK)
+      return retcode;
     if (atoi(i->result)) {
       if ((retcode = picolEval(i, argv[2])) == PICOL_CONTINUE)
         continue;
@@ -530,7 +549,8 @@ int picolCommandWhile(struct picolInterp *i, int argc, char **argv, void *pd) {
 
 int picolCommandRetCodes(struct picolInterp *i, int argc, char **argv,
                          void *pd) {
-  if (argc != 1) return picolArityErr(i, argv[0]);
+  if (argc != 1)
+    return picolArityErr(i, argv[0]);
   if (strcmp(argv[0], "break") == 0)
     return PICOL_BREAK;
   else if (strcmp(argv[0], "continue") == 0)
@@ -564,25 +584,31 @@ int picolCommandCallProc(struct picolInterp *i, int argc, char **argv,
   tofree = p;
   while (1) {
     char *start = p;
-    while (*p != ' ' && *p != '\0') p++;
+    while (*p != ' ' && *p != '\0')
+      p++;
     if (*p != '\0' && p == start) {
       p++;
       continue;
     }
-    if (p == start) break;
+    if (p == start)
+      break;
     if (*p == '\0')
       done = 1;
     else
       *p = '\0';
-    if (++arity > argc - 1) goto arityerr;
+    if (++arity > argc - 1)
+      goto arityerr;
     picolSetVar(i, start, argv[arity]);
     p++;
-    if (done) break;
+    if (done)
+      break;
   }
   free(tofree);
-  if (arity != argc - 1) goto arityerr;
+  if (arity != argc - 1)
+    goto arityerr;
   errcode = picolEval(i, body);
-  if (errcode == PICOL_RETURN) errcode = PICOL_OK;
+  if (errcode == PICOL_RETURN)
+    errcode = PICOL_OK;
   picolDropCallFrame(i); /* remove the called proc callframe */
   return errcode;
 arityerr:
@@ -594,14 +620,16 @@ arityerr:
 
 int picolCommandProc(struct picolInterp *i, int argc, char **argv, void *pd) {
   char **procdata = malloc(sizeof(char *) * 2);
-  if (argc != 4) return picolArityErr(i, argv[0]);
+  if (argc != 4)
+    return picolArityErr(i, argv[0]);
   procdata[0] = strdup(argv[2]); /* arguments list */
   procdata[1] = strdup(argv[3]); /* procedure body */
   return picolRegisterCommand(i, argv[1], picolCommandCallProc, procdata);
 }
 
 int picolCommandReturn(struct picolInterp *i, int argc, char **argv, void *pd) {
-  if (argc != 1 && argc != 2) return picolArityErr(i, argv[0]);
+  if (argc != 1 && argc != 2)
+    return picolArityErr(i, argv[0]);
   picolSetResult(i, (argc == 2) ? argv[1] : "");
   return PICOL_RETURN;
 }
@@ -631,9 +659,11 @@ int main(int argc, char **argv) {
       int retcode;
       printf("picol> ");
       fflush(stdout);
-      if (fgets(clibuf, 1024, stdin) == NULL) return 0;
+      if (fgets(clibuf, 1024, stdin) == NULL)
+        return 0;
       retcode = picolEval(&interp, clibuf);
-      if (interp.result[0] != '\0') printf("[%d] %s\n", retcode, interp.result);
+      if (interp.result[0] != '\0')
+        printf("[%d] %s\n", retcode, interp.result);
     }
   } else if (argc == 2) {
     char buf[1024 * 16];
@@ -644,7 +674,8 @@ int main(int argc, char **argv) {
     }
     buf[fread(buf, 1, 1024 * 16, fp)] = '\0';
     fclose(fp);
-    if (picolEval(&interp, buf) != PICOL_OK) printf("%s\n", interp.result);
+    if (picolEval(&interp, buf) != PICOL_OK)
+      printf("%s\n", interp.result);
   }
   return 0;
 }

examples/pyapp/BUILD.mk

@@ -14,13 +14,13 @@
 # GETTING STARTED
 #
 #   # run these commands after cloning the cosmo repo on linux
-#   $ make -j8 o//examples/pyapp/pyapp.com
-#   $ o//examples/pyapp/pyapp.com
+#   $ make -j8 o//examples/pyapp/pyapp
+#   $ o//examples/pyapp/pyapp
 #   cosmopolitan is cool!
 #
 # HOW IT WORKS
 #
-#   $ pyobj.com -m -o pyapp.o pyapp.py
+#   $ pyobj -m -o pyapp.o pyapp.py
 #   $ ld -static -nostdlib -T o//ape/ape.lds ape.o crt.o \
 #       pyapp.o \
 #       cosmopolitan-python-stage2.a \
@@ -29,19 +29,19 @@
 #       cosmopolitan-bzip2.a \
 #       cosmopolitan-python-stage1.a \
 #       cosmopolitan.a
-#   $ ./pyapp.com
+#   $ ./pyapp
 #   cosmopolitan is cool!
 #
 # NOTES
 #
-#   If you enjoy this tutorial, let us know jtunney@gmail.com. If
+#   If you enjoy this tutorial, let us know jtunney@gmail. If
 #   you're building something cool, then we can we can add you to
 #   our .gitowners file which grants you commit access so you can
 #   indepnedently maintain your package, as part of the mono-repo
 
 PKGS      += PYAPP
 PYAPP      = $(PYAPP_DEPS) o/$(MODE)/examples/pyapp/pyapp.a
-PYAPP_COMS = o/$(MODE)/examples/pyapp/pyapp.com
+PYAPP_COMS = o/$(MODE)/examples/pyapp/pyapp
 PYAPP_BINS = $(PYAPP_COMS) $(PYAPP_COMS:%=%.dbg)
 
 # Specify our Cosmopolitan library dependencies
@@ -58,7 +58,7 @@ PYAPP_DIRECTDEPS = \
 # them all out and arranges them in the correct order.
 PYAPP_DEPS := $(call uniq,$(foreach x,$(PYAPP_DIRECTDEPS),$($(x))))
 
-# # Asks PYOBJ.COM to turn our Python source into an ELF object which
+# # Asks PYOBJ to turn our Python source into an ELF object which
 # # contains (a) embedded zip file artifacts of our .py file and .pyc
 # # which it it compiled; and (b) statically analyzed listings of our
 # # python namespaces and imports that GNU ld will use for tree shake
@@ -71,18 +71,18 @@ PYAPP_DEPS := $(call uniq,$(foreach x,$(PYAPP_DIRECTDEPS),$($(x))))
 # in `.python/` (which is accessible via open() system calls, using
 # the synthetic path `"/zip/.python/"`) which means that if we want
 # to turn `pyapp/pyapp.py` into `.python/pyapp.py` so it's imported
-# using `import pyapp` then we can simply append to PYOBJ.COM flags
+# using `import pyapp` then we can simply append to PYOBJ flags
 # flags above asking it to strip one directory component and prefix
 # Lastly be sure that whenever you use this variable override trick
 # you only do it to .o files, since otherwise it'll ruin everything
-# Passing -m to PYOBJ.COM causes a C main() function to get yoinked
+# Passing -m to PYOBJ causes a C main() function to get yoinked
 # and it means our Python module can no longer be used as a library
 o/$(MODE)/examples/pyapp/pyapp.o: PYFLAGS += -m -C2 -P.python
 
-# Asks PACKAGE.COM to sanity check our DIRECTDEPS and symbol graph.
+# Asks PACKAGE to sanity check our DIRECTDEPS and symbol graph.
 # This program functions as an incremental linker. It also provides
 # enhancements to the object code that GCC generated similar to LTO
-# so be certain that your .com.dbg rule depends on the .pkg output!
+# so be certain that your .dbg rule depends on the .pkg output!
 o/$(MODE)/examples/pyapp/pyapp.pkg: \
 		o/$(MODE)/examples/pyapp/pyapp.o \
 		$(foreach x,$(PYAPP_DIRECTDEPS),$($(x)_A).pkg)
@@ -90,7 +90,7 @@ o/$(MODE)/examples/pyapp/pyapp.pkg: \
 # Ask GNU LD to link our APE executable within an ELF binary shell.
 # The CRT and APE dependencies are special dependencies that define
 # your _start() / WinMain() entrpoints as well as APE linker script
-o/$(MODE)/examples/pyapp/pyapp.com.dbg: \
+o/$(MODE)/examples/pyapp/pyapp.dbg: \
 		$(PYAPP_DEPS) \
 		o/$(MODE)/examples/pyapp/pyapp.pkg \
 		o/$(MODE)/examples/pyapp/pyapp.o \
@@ -98,10 +98,10 @@ o/$(MODE)/examples/pyapp/pyapp.com.dbg: \
 		$(APE_NO_MODIFY_SELF)
 	@$(COMPILE) -ALINK.ape $(LINK) $(LINKARGS) -o $@
 
-# # Unwrap the APE .COM binary, that's embedded within the linked file
+# # Unwrap the APE  binary, that's embedded within the linked file
 # # NOTE: This line can be commented out, since it's in build/rules.mk
-# o/$(MODE)/examples/pyapp/pyapp.com: \
-# 		o/$(MODE)/examples/pyapp/pyapp.com.dbg
+# o/$(MODE)/examples/pyapp/pyapp: \
+# 		o/$(MODE)/examples/pyapp/pyapp.dbg
 # 	$(OBJCOPY) -S -O binary $< $@
 
 # Ensure that build config changes will invalidate build artifacts.
@@ -112,5 +112,5 @@ o/$(MODE)/examples/pyapp/pyapp.o: \
 # and have it build all targets the package defines.
 .PHONY: o/$(MODE)/examples/pyapp
 o/$(MODE)/examples/pyapp: \
-		o/$(MODE)/examples/pyapp/pyapp.com \
-		o/$(MODE)/examples/pyapp/pyapp.com.dbg
+		o/$(MODE)/examples/pyapp/pyapp \
+		o/$(MODE)/examples/pyapp/pyapp.dbg

examples/pylife/BUILD.mk

@@ -14,13 +14,13 @@
 # GETTING STARTED
 #
 #   # run these commands after cloning the cosmo repo on linux
-#   $ make -j8 o//examples/pylife/pylife.com
-#   $ o//examples/pylife/pylife.com
+#   $ make -j8 o//examples/pylife/pylife
+#   $ o//examples/pylife/pylife
 #   cosmopolitan is cool!
 #
 # HOW IT WORKS
 #
-#   $ pyobj.com -m -o pylife.o pylife.py
+#   $ pyobj -m -o pylife.o pylife.py
 #   $ ld -static -nostdlib -T o//ape/ape.lds ape.o crt.o \
 #       pylife.o \
 #       cosmopolitan-python-stage2.a \
@@ -29,19 +29,19 @@
 #       cosmopolitan-bzip2.a \
 #       cosmopolitan-python-stage1.a \
 #       cosmopolitan.a
-#   $ ./pylife.com
+#   $ ./pylife
 #   cosmopolitan is cool!
 #
 # NOTES
 #
-#   If you enjoy this tutorial, let us know jtunney@gmail.com. If
+#   If you enjoy this tutorial, let us know jtunney@gmail. If
 #   you're building something cool, then we can we can add you to
 #   our .gitowners file which grants you commit access so you can
 #   indepnedently maintain your package, as part of the mono-repo
 
 PKGS      += PYLIFE
 PYLIFE      = $(PYLIFE_DEPS) o/$(MODE)/examples/pylife/pylife.a
-PYLIFE_COMS = o/$(MODE)/examples/pylife/pylife.com
+PYLIFE_COMS = o/$(MODE)/examples/pylife/pylife
 PYLIFE_BINS = $(PYLIFE_COMS) $(PYLIFE_COMS:%=%.dbg)
 
 # Specify our Cosmopolitan library dependencies
@@ -58,7 +58,7 @@ PYLIFE_DIRECTDEPS = \
 # them all out and arranges them in the correct order.
 PYLIFE_DEPS := $(call uniq,$(foreach x,$(PYLIFE_DIRECTDEPS),$($(x))))
 
-# # Asks PYOBJ.COM to turn our Python source into an ELF object which
+# # Asks PYOBJ to turn our Python source into an ELF object which
 # # contains (a) embedded zip file artifacts of our .py file and .pyc
 # # which it it compiled; and (b) statically analyzed listings of our
 # # python namespaces and imports that GNU ld will use for tree shake
@@ -71,18 +71,18 @@ PYLIFE_DEPS := $(call uniq,$(foreach x,$(PYLIFE_DIRECTDEPS),$($(x))))
 # in `.python/` (which is accessible via open() system calls, using
 # the synthetic path `"/zip/.python/"`) which means that if we want
 # to turn `pylife/pylife.py` into `.python/pylife.py` so it's imported
-# using `import pylife` then we can simply append to PYOBJ.COM flags
+# using `import pylife` then we can simply append to PYOBJ flags
 # flags above asking it to strip one directory component and prefix
 # Lastly be sure that whenever you use this variable override trick
 # you only do it to .o files, since otherwise it'll ruin everything
-# Passing -m to PYOBJ.COM causes a C main() function to get yoinked
+# Passing -m to PYOBJ causes a C main() function to get yoinked
 # and it means our Python module can no longer be used as a library
 o/$(MODE)/examples/pylife/pylife.o: PYFLAGS += -m -C2 -P.python
 
-# Asks PACKAGE.COM to sanity check our DIRECTDEPS and symbol graph.
+# Asks PACKAGE to sanity check our DIRECTDEPS and symbol graph.
 # This program functions as an incremental linker. It also provides
 # enhancements to the object code that GCC generated similar to LTO
-# so be certain that your .com.dbg rule depends on the .pkg output!
+# so be certain that your .dbg rule depends on the .pkg output!
 o/$(MODE)/examples/pylife/pylife.pkg: \
 		o/$(MODE)/examples/pylife/pylife.o \
 		$(foreach x,$(PYLIFE_DIRECTDEPS),$($(x)_A).pkg)
@@ -90,7 +90,7 @@ o/$(MODE)/examples/pylife/pylife.pkg: \
 # Ask GNU LD to link our APE executable within an ELF binary shell.
 # The CRT and APE dependencies are special dependencies that define
 # your _start() / WinMain() entrpoints as well as APE linker script
-o/$(MODE)/examples/pylife/pylife.com.dbg: \
+o/$(MODE)/examples/pylife/pylife.dbg: \
 		$(PYLIFE_DEPS) \
 		o/$(MODE)/examples/pylife/pylife.pkg \
 		o/$(MODE)/examples/pylife/pylife.o \
@@ -98,10 +98,10 @@ o/$(MODE)/examples/pylife/pylife.com.dbg: \
 		$(APE_NO_MODIFY_SELF)
 	@$(COMPILE) -ALINK.ape $(LINK) $(LINKARGS) -o $@
 
-# # Unwrap the APE .COM binary, that's embedded within the linked file
+# # Unwrap the APE  binary, that's embedded within the linked file
 # # NOTE: This line can be commented out, since it's in build/rules.mk
-# o/$(MODE)/examples/pylife/pylife.com: \
-# 		o/$(MODE)/examples/pylife/pylife.com.dbg
+# o/$(MODE)/examples/pylife/pylife: \
+# 		o/$(MODE)/examples/pylife/pylife.dbg
 # 	$(OBJCOPY) -S -O binary $< $@
 
 # Ensure that build config changes will invalidate build artifacts.
@@ -112,5 +112,5 @@ o/$(MODE)/examples/pylife/pylife.o: \
 # and have it build all targets the package defines.
 .PHONY: o/$(MODE)/examples/pylife
 o/$(MODE)/examples/pylife: \
-		o/$(MODE)/examples/pylife/pylife.com \
-		o/$(MODE)/examples/pylife/pylife.com.dbg
+		o/$(MODE)/examples/pylife/pylife \
+		o/$(MODE)/examples/pylife/pylife.dbg

examples/rusage.c

@@ -23,7 +23,8 @@
 int main(int argc, char *argv[]) {
 
   const char *prog = argv[0];
-  if (!prog) prog = "rusage";
+  if (!prog)
+    prog = "rusage";
 
   if (argc < 2) {
     tinyprint(2, prog, ": missing command\n", NULL);

examples/script.c

@@ -50,7 +50,7 @@
 #include "libc/sysv/consts/fileno.h"
 #include "libc/sysv/consts/s.h"
 #include "libc/sysv/consts/termios.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 #include "third_party/getopt/getopt.internal.h"
 // clang-format off
 
@@ -67,13 +67,10 @@
  * @see https://asciinema.org/
  */
 
-asm(".ident\t\"\\n\\n\
-FreeBSD Script (BSD-3 License)\\n\
-Copyright (c) 2010, 2012 David E. O'Brien\\n\
-Copyright (c) 1980, 1992, 1993\\n\
-\tThe Regents of the University of California.\\n\
-\tAll rights reserved.\"");
-asm(".include \"libc/disclaimer.inc\"");
+__notice(freebsd_script_notice, "\
+FreeBSD Script (BSD-3 License)\n\
+Copyright (c) 2010, 2012 David E. O'Brien\n\
+Copyright (c) 1980, 1992, 1993 The Regents of the University of California");
 
 #define DEF_BUF 65536
 

examples/setitimer.c

@@ -17,7 +17,7 @@
 #include "libc/sysv/consts/itimer.h"
 #include "libc/sysv/consts/sa.h"
 #include "libc/sysv/consts/sig.h"
-#include "libc/time/time.h"
+#include "libc/time.h"
 
 volatile bool gotalrm;
 

examples/spawn_bench.c

@@ -50,8 +50,10 @@ static char *Ithoa(char p[27], unsigned long x) {
   } while (x);
   for (;;) {
     *p++ = m[--i];
-    if (!i) break;
-    if (!(i % 3)) *p++ = ',';
+    if (!i)
+      break;
+    if (!(i % 3))
+      *p++ = ',';
   }
   *p = '\0';
   return p;

examples/stackexplorer.c

@@ -36,8 +36,10 @@ void Append(intptr_t i, char *s) {
 int Compare(const void *a, const void *b) {
   struct Thing *x = (struct Thing *)a;
   struct Thing *y = (struct Thing *)b;
-  if (x->i < y->i) return +1;
-  if (x->i > y->i) return -1;
+  if (x->i < y->i)
+    return +1;
+  if (x->i > y->i)
+    return -1;
   return 0;
 }
 
@@ -46,19 +48,22 @@ int main(int argc, char *argv[]) {
   Append((uintptr_t)__oldstack, "__oldstack");
   for (int i = 0;; ++i) {
     Append((uintptr_t)&argv[i], xasprintf("&argv[%d] = %`'s", i, argv[i]));
-    if (!argv[i]) break;
+    if (!argv[i])
+      break;
     Append((uintptr_t)argv[i], xasprintf("argv[%d] = %`'s", i, argv[i]));
   }
   for (int i = 0;; ++i) {
     Append((uintptr_t)&environ[i],
            xasprintf("&environ[%d] = %`'s", i, environ[i]));
-    if (!environ[i]) break;
+    if (!environ[i])
+      break;
     Append((uintptr_t)environ[i],
            xasprintf("environ[%d] = %`'s", i, environ[i]));
   }
   for (int i = 0;; i += 2) {
     Append((uintptr_t)&__auxv[i], xasprintf("&auxv[%d] = %ld", i, __auxv[i]));
-    if (!__auxv[i]) break;
+    if (!__auxv[i])
+      break;
     Append((uintptr_t)&__auxv[i + 1],
            xasprintf("&auxv[%d] = %#lx", i + 1, __auxv[i + 1]));
   }

examples/stat.c

@@ -8,16 +8,18 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/calls/struct/stat.h"
+#include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/mem/gc.h"
+#include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/s.h"
-#include "libc/x/xiso8601.h"
+#include "libc/time.h"
 
 /**
  * @fileoverview File metadata viewer.
@@ -27,6 +29,23 @@
 
 bool numeric;
 
+char *xiso8601(struct timespec ts) {
+  struct tm tm;
+  if (!localtime_r(&ts.tv_sec, &tm))
+    return 0;
+  int len = 128;
+  char *res = malloc(len);
+  char *ptr = res;
+  char *end = res + len;
+  if (!res)
+    return 0;
+  ptr += strftime(ptr, end - ptr, "%Y-%m-%d %H:%M:%S", &tm);
+  ptr += snprintf(ptr, end - ptr, ".%09ld", ts.tv_nsec);
+  ptr += strftime(ptr, end - ptr, "%z %Z", &tm);
+  unassert(ptr + 1 <= end);
+  return res;
+}
+
 const char *DescribeFileType(unsigned mode) {
   switch (mode & S_IFMT) {
     case S_IFIFO:
@@ -74,16 +93,16 @@ void PrintFileMetadata(const char *pathname, struct stat *st) {
          "%-32s%s\n"
          "%-32s%s\n"
          "%-32s%s\n",
-         "bytes in file", st->st_size, "physical bytes", st->st_blocks * 512,
-         "device id w/ file", st->st_dev, "inode", st->st_ino,
-         "hard link count", st->st_nlink, "mode / permissions", st->st_mode,
-         DescribeFileType(st->st_mode), "owner id", st->st_uid, "group id",
-         st->st_gid, "flags", st->st_flags, "gen", st->st_gen,
-         "device id (if special)", st->st_rdev, "block size", st->st_blksize,
-         "access time", _gc(xiso8601(&st->st_atim)), "modified time",
-         _gc(xiso8601(&st->st_mtim)), "c[omplicated]time",
-         _gc(xiso8601(&st->st_ctim)), "birthtime",
-         _gc(xiso8601(&st->st_birthtim)));
+         "bytes in file:", st->st_size, "physical bytes:", st->st_blocks * 512,
+         "device id w/ file:", st->st_dev, "inode:", st->st_ino,
+         "hard link count:", st->st_nlink, "mode / permissions:", st->st_mode,
+         DescribeFileType(st->st_mode), "owner id:", st->st_uid,
+         "group id:", st->st_gid, "flags:", st->st_flags, "gen:", st->st_gen,
+         "device id (if special):", st->st_rdev, "block size:", st->st_blksize,
+         "access time:", gc(xiso8601(st->st_atim)),
+         "modified time:", gc(xiso8601(st->st_mtim)),
+         "c[omplicated]time:", gc(xiso8601(st->st_ctim)),
+         "[birthtime]:", gc(xiso8601(st->st_birthtim)));
 }
 
 int main(int argc, char *argv[]) {

examples/system.c

@@ -7,6 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
+#include "libc/calls/calls.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"