Release Cosmopolitan 2.0

* Fix %.0e by always rounding even if precision is 0
* Fix %.0g by treating it the same as %.1g
* Fix %g tests to match glibc, add more tests

.gitattributes

@@ -0,0 +1,3 @@
+# -*- conf -*-
+/build/bootstrap/*.com       binary
+/usr/share/zoneinfo/*        binary

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: build
+
+on:
+  push:
+    branches:
+      - "master"
+      - "flake"
+  pull_request:
+    branches:
+      - "master"
+
+  # run workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  matrix_on_mode:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mode: ["", tiny, opt, rel]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: support ape bins
+        run: sudo sh -c "echo ':APE:M::MZqFpD::/bin/sh:' >/proc/sys/fs/binfmt_misc/register"
+
+      - name: make matrix
+        run: V=0 make -j2 MODE=${{ matrix.mode }}

.gitignore

@@ -1,9 +1,13 @@
+# -*- conf -*-
+
 /o
 
+# TODO: Find some way to have Python write to o/
+__pycache__
+
 *.tmp
 /.bochs.log
 /HTAGS
 /TAGS
 /bx_enh_dbg.ini
 /tool/emacs/*.elc
-/usr/share/dict/words

.vscode/c_cpp_properties.json

@@ -1,13 +1,12 @@
 {
 	"configurations": [
 		{
-			"name": "Linux",
+			"name": "Win32",
 			"includePath": [
 				"${workspaceFolder}"
 			],
 			"cStandard": "c11",
 			"cppStandard": "c++11",
-			"compilerPath": "${workspaceFolder}/o/third_party/gcc/bin/x86_64-linux-musl-gcc",
 			"forcedInclude": ["${workspaceFolder}/.vscode/vscode.h"],
 			"defines": [
 				"libcesque=",
@@ -16,7 +15,7 @@
 				"alignas(x)",
 				"alignof(x)",
 				"artificial=",
-				"nodiscard=",
+				"dontdiscard=",
 				"mayalias=",
 				"forceinline=",
 				"forcealign(x)=",
@@ -49,7 +48,7 @@
 				"nosideeffect=",
 				"unreachable=",
 				"thatispacked=",
-				"nothrow=",
+				"dontthrow=",
 				"nocallback=",
 				"relegated=",
 				"hidden=",
@@ -63,6 +62,50 @@
 				"attributeallocalign(x)=",
 				"nullterminated(x)="
 			]
+		},
+		{
+			"name": "Linux",
+			"includePath": [
+				"${workspaceFolder}"
+			],
+			"cStandard": "gnu17",
+			"compilerPath": "${workspaceFolder}/o/third_party/gcc/bin/x86_64-linux-musl-gcc",
+			"compilerArgs": [
+				"-Wall",
+				"-Werror",
+				"-fdebug-prefix-map=${workspaceFolder}=",
+				"-frecord-gcc-switches",
+				"-Wa,-W",
+				"-Wa,-I.",
+				"-Wa,--noexecstack",
+				"-Wa,--nocompress-debug-sections",
+				"-Og",
+				"-g",
+				"-gdescribe-dies",
+				"-msse3",
+				"-mno-red-zone",
+				"-fno-math-errno",
+				"-fno-trapping-math",
+				"-fno-fp-int-builtin-inexact",
+				"-fno-ident",
+				"-fno-common",
+				"-fno-gnu-unique",
+				"-fstrict-aliasing",
+				"-fstrict-overflow",
+				"-fno-semantic-interposition",
+				"-mno-omit-leaf-frame-pointer",
+				"-fno-jump-tables",
+				"-nostdinc",
+				"-iquote."
+			],
+			"forcedInclude": [
+				"libc/integral/normalize.inc"
+			],
+			"defines": [
+				"COSMO",
+				"MODE=",
+				"IMAGE_BASE_VIRTUAL=0x400000"
+			]
 		}
 	],
 	"version": 4

.vscode/vscode.h

@@ -1,160 +1,2 @@
 #define __VSCODE_INTELLISENSE__ 1
 #include "libc/integral/normalize.inc"
-
-#if 0
-#define __VSCODE_INTELLISENSE__ 1
-#define __BIGGEST_ALIGNMENT__   1
-#define __CHAR_MAX__            0x7F
-#define __SCHAR_MAX__           __CHAR_MAX__
-#define __SHRT_MAX__            0x7FFF
-#define __INT_MAX__             0x7FFFFFFF
-#define __LONG_MAX__            0x7FFFFFFFFFFFFFFF
-#define __LONG_LONG_MAX__       __LONG_MAX__
-#define __CHAR_MIN__            -((__CHAR_MAX__) + 1)
-#define __SHRT_MIN__            -((__SHRT_MAX__) + 1)
-#define __INT_MIN__             -((__INT_MAX__) + 1)
-#define __LONG_MIN__            -((__LONG_MAX__) + 1)
-#define __LONG_LONG_MIN__       -((__LONG_LONG_MAX__) + 1)
-#define __UCHAR_MAX__           0xFF
-#define __USHRT_MAX__           0xFFFF
-#define __UINT_MAX__            0xFFFFFFFF
-#define __ULONG_MAX__           0xFFFFFFFFFFFFFFFF
-#define __SIZE_MAX__            __ULONG_MAX__
-#define __SSIZE_MAX__           __LONG_MAX__
-#define __UINTPTR_MAX__         __SIZE_MAX__
-#define __INTPTR_MAX__          __SSIZE_MAX__
-#define __WCHAR_MAX__           __UINT_MAX__
-#define __PTRDIFF_MAX__         __UINTPTR_MAX__
-#define __INTMAX_MAX__          __ULONG_MAX__
-#define __SIZEOF_POINTER__      8
-#define __SIZEOF_SHORT__        2
-#define __SIZEOF_INT__          4
-#define __SIZEOF_LONG__         8
-#define __SIZEOF_LONG_LONG__    8
-#define __SIZEOF_PTRDIFF_T__    8
-#define __SIZEOF_SIZE_T__       8
-#define __SIZEOF_WCHAR_T__      4
-#define __SIZEOF_WINT_T__       4
-#define __SIZEOF_FLOAT__        4
-#define __SIZEOF_FLOAT128__     16
-#define __SIZEOF_DOUBLE__       8
-#define __SIZEOF_FLOAT80__      10
-#define __SIZEOF_LONG_DOUBLE__  16
-#define __FLT_MAX__             1
-#define __DBL_MAX__             1
-
-#define __INT_LEAST8_TYPE__   signed char
-#define __INT_LEAST16_TYPE__  signed short
-#define __INT_LEAST32_TYPE__  signed int
-#define __INT_LEAST64_TYPE__  signed long long
-#define __UINT_LEAST8_TYPE__  unsigned char
-#define __UINT_LEAST16_TYPE__ unsigned short
-#define __UINT_LEAST32_TYPE__ unsigned int
-#define __UINT_LEAST64_TYPE__ unsigned long long
-
-#define __UINT8_MAX__  __UCHAR_MAX__
-#define __UINT16_MAX__ __USHRT_MAX__
-#define __UINT32_MAX__ __UINT_MAX__
-#define __UINT64_MAX__ __ULONG_MAX__
-
-#define __INT8_MAX__  __CHAR_MAX__
-#define __INT16_MAX__ __SHRT_MAX__
-#define __INT32_MAX__ __INT_MAX__
-#define __INT64_MAX__ __LONG_MAX__
-
-#define ATEXIT_MAX 1
-#define STACKSIZE  0x10000
-#define ARG_MAX    255
-#define OPEN_MAX   0x7FFF
-#define CHAR_BIT   7
-#define NSIG       1
-#define NULL       (0)
-#define false 0
-#define true (!(false))
-#define COSMOPOLITAN_C_START_
-#define COSMOPOLITAN_C_END_
-#define PAGESIZE    0x1000
-#define BIGPAGESIZE 0x10000
-#define NAME_MAX    255
-
-#define SWITCHEROO(...) 0
-
-extern unsigned g_loglevel;
-
-typedef void * va_list;
-
-#define va_start(...) 0
-#define va_end(...)   0
-#define va_arg(x, y)  (y)(0)
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-#define int64_t       long long
-#define int128_t      int64_t
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-typedef unsigned long long uint128_t;
-
-typedef int errno_t;
-typedef uint64_t size_t;
-typedef unsigned long long ssize_t;
-typedef uint64_t uintptr_t;
-typedef long long intptr_t;
-
-typedef unsigned long long uintmax_t;
-typedef long long intmax_t;
-
-typedef uint32_t bool32;
-
-#ifndef __cplusplus
-typedef uint8_t bool;
-typedef uint16_t char16_t;
-typedef uint32_t char32_t;
-#endif /* __cplusplus */
-
-typedef char32_t wint_t;
-typedef char32_t wchar_t;
-typedef struct { int ax, dx; } axdx_t;
-
-/* duplicate and replace xmmintrin.internal.h to fix it for IntelliSense
- * SEE: <> */
-
-#define _Vector_size(x) __attribute__((__vector_size__(x)))
-
-#define IMAGE_BASE_VIRTUAL 0x400000
-#define __SIGACTION(...)   (0)
-#define VEIL(x, y)         (y)
-#define STATIC_YOINK(x)
-#define BUFSIZ                1
-#define FRAMESIZE             0x10000
-#define PATH_MAX              252
-#define concat(x, y, z)       0
-#define CONCAT(a, b, c, d, e) 0
-#define shuffle(...)          0
-#define reverse(x, y)         0
-#define autotype(x)           intptr_t
-
-#define _Generic_(...) (void*)(0)
-#define _Generic(...) _Generic_
-#define _Alignas(...)
-#define _Section(...)
-
-#define offsetof(x, y)   0
-#define INITIALIZER(...) struct _dummy
-#define __far
-#define tinystrstr(...) 0
-#define BENCHLOOP(...)  0
-
-#ifdef __hook
-#undef __hook
-#endif /* __hook */
-
-#ifdef UriKeyval
-#undef UriKeyval
-#endif /* UriKeyval */
-
-#define _Static_assert(...) 0
-#endif /* 0 */

CONTRIBUTING.md

@@ -0,0 +1,62 @@
+# Contributing Guidelines
+
+We'd love to accept your patches! Please read this guide first.
+
+## 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)
+
+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.
+
+## Style Guide
+
+You can use clang-format to automatically format your files:
+
+```sh
+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)

LICENSE

@@ -0,0 +1,16 @@
+ISC License
+
+Copyright 2020 Justine Alexandra Roberts Tunney
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted, provided that the
+above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

Makefile

@@ -37,11 +37,10 @@
 #
 #   # basic debugging
 #   make -j8 -O MODE=dbg o/dbg/examples/crashreport.com
-#   o/dbg/examples/crashreport.com
+#   o/examples/crashreport.com
 #   less examples/crashreport.c
 #
-#   # extremely tiny binaries (scout's honor escape hatch)
-#   # please pay the $1k for commercial license if you can
+#   # extremely tiny binaries
 #   make -j8 -O MODE=tiny				\
 #               LDFLAGS+=-s				\
 #               CPPFLAGS+=-DIM_FEELING_NAUGHTY	        \
@@ -60,10 +59,9 @@
 #
 #   build/config.mk
 
-SHELL         = /bin/sh
-HOSTS        ?= freebsd openbsd netbsd rhel7 rhel5 xnu win7 win10
-SANITY       := $(shell build/sanitycheck $$PPID)
-GNUMAKEFLAGS += --output-sync
+SHELL      = build/bootstrap/cocmd.com
+HOSTS     ?= freebsd openbsd netbsd rhel7 rhel5 win10 xnu
+MAKEFLAGS += --no-builtin-rules
 
 .SUFFIXES:
 .DELETE_ON_ERROR:
@@ -71,7 +69,10 @@ GNUMAKEFLAGS += --output-sync
 .PHONY: all o bins check test depend tags
 
 all:	o
-o:	o/$(MODE)/ape		\
+o:	o/$(MODE)
+
+o/$(MODE):			\
+	o/$(MODE)/ape		\
 	o/$(MODE)/dsp		\
 	o/$(MODE)/net		\
 	o/$(MODE)/libc		\
@@ -80,6 +81,19 @@ o:	o/$(MODE)/ape		\
 	o/$(MODE)/examples	\
 	o/$(MODE)/third_party
 
+.STRICT = 1
+.PLEDGE = stdio rpath wpath cpath fattr proc
+.UNVEIL =			\
+	libc/integral		\
+	libc/disclaimer.inc	\
+	rx:build/bootstrap	\
+	rx:o/third_party/gcc	\
+	/proc/self/status	\
+	rw:/dev/null		\
+	w:o/stack.log		\
+	/etc/hosts		\
+	~/.runit.psk
+
 PKGS =
 
 -include ~/.cosmo.mk
@@ -96,91 +110,113 @@ include libc/intrin/intrin.mk			# │  You can use the stack
 include libc/linux/linux.mk			# │  You can manipulate arrays
 include libc/tinymath/tinymath.mk		# │  You can issue raw system calls
 include third_party/compiler_rt/compiler_rt.mk	# │
-include libc/bits/bits.mk			# │
 include libc/str/str.mk				# │
 include third_party/xed/xed.mk			# │
 include third_party/zlib/zlib.mk		# │
 include libc/elf/elf.mk				# │
-include ape/lib/apelib.mk			# │
 include ape/ape.mk				# │
 include libc/fmt/fmt.mk				#─┘
 include libc/calls/calls.mk			#─┐
 include libc/runtime/runtime.mk			# ├──SYSTEMS RUNTIME
 include libc/crt/crt.mk				# │  You can issue system calls
-include libc/rand/rand.mk			# │
-include libc/unicode/unicode.mk			# │
 include third_party/dlmalloc/dlmalloc.mk	#─┘
 include libc/mem/mem.mk				#─┐
-include libc/ohmyplus/ohmyplus.mk		# ├──DYNAMIC RUNTIME
-include libc/zipos/zipos.mk			# │  You can now use stdio
-include third_party/gdtoa/gdtoa.mk		# │  You can finally call malloc()
-include libc/time/time.mk			# │
-include libc/alg/alg.mk				# │
+include libc/zipos/zipos.mk			# ├──DYNAMIC RUNTIME
+include third_party/gdtoa/gdtoa.mk		# │  You can now use stdio
+include libc/time/time.mk			# │  You can finally call malloc()
+include libc/thread/thread.mk			# │
 include libc/stdio/stdio.mk			# │
+include third_party/libcxx/libcxx.mk		# │
 include net/net.mk				# │
 include libc/log/log.mk				# │
+include third_party/bzip2/bzip2.mk		# │
 include dsp/core/core.mk			# │
 include libc/x/x.mk				# │
 include third_party/stb/stb.mk			# │
 include dsp/scale/scale.mk			# │
 include dsp/mpeg/mpeg.mk			# │
 include dsp/dsp.mk				# │
+include third_party/zlib/gz/gz.mk		# │
 include third_party/musl/musl.mk		# │
 include third_party/getopt/getopt.mk		# │
 include libc/libc.mk				#─┘
 include libc/sock/sock.mk			#─┐
 include dsp/tty/tty.mk				# ├──ONLINE RUNTIME
 include libc/dns/dns.mk				# │  You can communicate with the network
-include libc/crypto/crypto.mk			# │
-include net/http/http.mk			#─┘
-include third_party/duktape/duktape.mk
-include third_party/regex/regex.mk
+include net/http/http.mk			# │
+include third_party/mbedtls/mbedtls.mk		# │
+include net/https/https.mk			# │
+include third_party/regex/regex.mk		#─┘
+include third_party/tidy/tidy.mk
 include third_party/third_party.mk
 include libc/testlib/testlib.mk
 include tool/viz/lib/vizlib.mk
-include examples/examples.mk
+include tool/args/args.mk
+include test/tool/args/test.mk
+include third_party/linenoise/linenoise.mk
+include third_party/maxmind/maxmind.mk
+include net/finger/finger.mk
+include third_party/double-conversion/double-conversion.mk
+include third_party/lua/lua.mk
+include third_party/make/make.mk
+include third_party/finger/finger.mk
+include third_party/argon2/argon2.mk
+include third_party/smallz4/smallz4.mk
+include third_party/sqlite3/sqlite3.mk
+include third_party/mbedtls/test/test.mk
+include third_party/quickjs/quickjs.mk
 include third_party/lz4cli/lz4cli.mk
+include third_party/zip/zip.mk
+include third_party/unzip/unzip.mk
 include tool/build/lib/buildlib.mk
 include third_party/chibicc/chibicc.mk
 include third_party/chibicc/test/test.mk
+include third_party/python/python.mk
 include tool/build/emucrt/emucrt.mk
 include tool/build/emubin/emubin.mk
 include tool/build/build.mk
+include examples/examples.mk
+include examples/pyapp/pyapp.mk
+include examples/pylife/pylife.mk
 include tool/decode/lib/decodelib.mk
 include tool/decode/decode.mk
+include tool/lambda/lib/lib.mk
+include tool/lambda/lambda.mk
+include tool/plinko/lib/lib.mk
+include tool/plinko/plinko.mk
+include test/tool/plinko/test.mk
 include tool/hash/hash.mk
 include tool/net/net.mk
 include tool/viz/viz.mk
 include tool/tool.mk
-include test/libc/alg/test.mk
 include test/libc/tinymath/test.mk
 include test/libc/intrin/test.mk
 include test/libc/mem/test.mk
 include test/libc/nexgen32e/test.mk
 include test/libc/runtime/test.mk
+include test/libc/thread/test.mk
 include test/libc/sock/test.mk
-include test/libc/bits/test.mk
-include test/libc/crypto/test.mk
 include test/libc/str/test.mk
-include test/libc/unicode/test.mk
+include test/libc/log/test.mk
+include test/libc/str/test.mk
 include test/libc/calls/test.mk
 include test/libc/x/test.mk
 include test/libc/xed/test.mk
 include test/libc/fmt/test.mk
 include test/libc/dns/test.mk
-include test/libc/rand/test.mk
 include test/libc/time/test.mk
 include test/libc/stdio/test.mk
 include test/libc/release/test.mk
 include test/libc/test.mk
-include test/ape/lib/test.mk
-include test/ape/test.mk
 include test/net/http/test.mk
+include test/net/https/test.mk
+include test/net/finger/test.mk
 include test/net/test.mk
 include test/tool/build/lib/test.mk
 include test/tool/build/test.mk
 include test/tool/viz/lib/test.mk
 include test/tool/viz/test.mk
+include test/tool/net/test.mk
 include test/tool/test.mk
 include test/dsp/core/test.mk
 include test/dsp/scale/test.mk
@@ -191,96 +227,99 @@ include examples/package/build.mk
 #-φ-examples/package/new.sh
 include test/test.mk
 
-OBJS	= $(foreach x,$(PKGS),$($(x)_OBJS))
-SRCS	= $(foreach x,$(PKGS),$($(x)_SRCS))
-HDRS	= $(foreach x,$(PKGS),$($(x)_HDRS))
-INCS	= $(foreach x,$(PKGS),$($(x)_INCS))
-BINS	= $(foreach x,$(PKGS),$($(x)_BINS))
-TESTS	= $(foreach x,$(PKGS),$($(x)_TESTS))
-CHECKS	= $(foreach x,$(PKGS),$($(x)_CHECKS))
+OBJS	 = $(foreach x,$(PKGS),$($(x)_OBJS))
+SRCS	:= $(foreach x,$(PKGS),$($(x)_SRCS))
+HDRS	:= $(foreach x,$(PKGS),$($(x)_HDRS))
+INCS	 = $(foreach x,$(PKGS),$($(x)_INCS))
+BINS	 = $(foreach x,$(PKGS),$($(x)_BINS))
+TESTS	 = $(foreach x,$(PKGS),$($(x)_TESTS))
+CHECKS	 = $(foreach x,$(PKGS),$($(x)_CHECKS))
 
 bins:	$(BINS)
 check:	$(CHECKS)
-test:	$(TESTS) all
+test:	$(TESTS)
 depend:	o/$(MODE)/depend
 tags:	TAGS HTAGS
 
 o/$(MODE)/.x:
-	@$(MKDIR) $(@D) && touch $@
+	@$(COMPILE) -AMKDIR -tT$@ $(MKDIR) $(@D)
 
 o/$(MODE)/srcs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(SRCS),$(dir $(x))))
-	$(file >$@) $(foreach x,$(SRCS),$(file >>$@,$(x)))
-
+	$(file >$@,$(SRCS))
 o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x))))
+	$(file >$@,$(HDRS) $(INCS))
+o/$(MODE)/incs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(INCS) $(INCS),$(dir $(x))))
+	$(file >$@,$(INCS))
+o/$(MODE)/depend: o/$(MODE)/.x o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt o/$(MODE)/incs.txt $(SRCS) $(HDRS) $(INCS)
+	@$(COMPILE) -AMKDEPS -L320 $(MKDEPS) -o $@ -r o/$(MODE)/ @o/$(MODE)/srcs.txt @o/$(MODE)/hdrs.txt @o/$(MODE)/incs.txt
+
+o/$(MODE)/srcs-old.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(SRCS),$(dir $(x))))
+	$(file >$@) $(foreach x,$(SRCS),$(file >>$@,$(x)))
+o/$(MODE)/hdrs-old.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x))))
 	$(file >$@) $(foreach x,$(HDRS) $(INCS),$(file >>$@,$(x)))
 
-o/$(MODE)/depend: o/$(MODE)/.x o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt $(SRCS) $(HDRS) $(INCS)
-	@build/mkdeps -o $@ -r o/$(MODE)/ o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt
+TAGS: .UNSANDBOXED = 1
+TAGS:	o/$(MODE)/srcs-old.txt $(SRCS)
+	@$(RM) $@
+	@$(TAGS) $(TAGSFLAGS) -L $< -o $@
 
-TAGS:	o/$(MODE)/srcs.txt $(SRCS)
-	@rm -f $@
-	@ACTION=TAGS TARGET=$@ build/do $(TAGS) $(TAGSFLAGS) -L $< -o $@
-
-HTAGS:	o/$(MODE)/hdrs.txt $(HDRS)
-	@rm -f $@
-	@ACTION=TAGS TARGET=$@ build/do build/htags -L $< -o $@
+HTAGS: .UNSANDBOXED = 1
+HTAGS:	o/$(MODE)/hdrs-old.txt $(HDRS)
+	@$(RM) $@
+	@build/htags -L $< -o $@
 
+loc: .UNSANDBOXED = 1
 loc: o/$(MODE)/tool/build/summy.com
 	find -name \*.h -or -name \*.c -or -name \*.S | \
 	$(XARGS) wc -l | grep total | awk '{print $$1}' | $<
 
 COSMOPOLITAN_OBJECTS =		\
-	LIBC_CRYPTO		\
+	NET_HTTP		\
 	LIBC_DNS		\
 	LIBC_SOCK		\
 	LIBC_NT_WS2_32		\
+	LIBC_NT_IPHLPAPI	\
 	LIBC_NT_MSWSOCK		\
-	LIBC_OHMYPLUS		\
 	LIBC_X			\
-	THIRD_PARTY_GDTOA	\
 	THIRD_PARTY_GETOPT	\
 	LIBC_LOG		\
-	LIBC_UNICODE		\
 	LIBC_TIME		\
 	LIBC_ZIPOS		\
 	THIRD_PARTY_ZLIB	\
-	APE_LIB			\
 	THIRD_PARTY_MUSL	\
 	LIBC_STDIO		\
+	THIRD_PARTY_GDTOA	\
 	THIRD_PARTY_REGEX	\
-	LIBC_ALG		\
 	LIBC_MEM		\
 	THIRD_PARTY_DLMALLOC	\
-	LIBC_BITS		\
 	LIBC_RUNTIME		\
 	LIBC_ELF		\
 	LIBC_CALLS		\
-	LIBC_RAND		\
 	LIBC_SYSV_CALLS		\
-	LIBC_NT_KERNELBASE	\
-	LIBC_NT_SHELL32		\
+	LIBC_NT_PSAPI		\
+	LIBC_NT_POWRPROF	\
+	LIBC_NT_PDH		\
 	LIBC_NT_GDI32		\
 	LIBC_NT_COMDLG32	\
-	LIBC_NT_NETAPI32	\
 	LIBC_NT_URL		\
 	LIBC_NT_USER32		\
 	LIBC_NT_NTDLL		\
 	LIBC_NT_ADVAPI32	\
 	LIBC_FMT		\
 	THIRD_PARTY_COMPILER_RT	\
+	LIBC_THREAD		\
 	LIBC_TINYMATH		\
-	LIBC_SYSV		\
+	THIRD_PARTY_XED		\
 	LIBC_STR		\
+	LIBC_SYSV		\
 	LIBC_INTRIN		\
 	LIBC_NT_KERNEL32	\
 	LIBC_NEXGEN32E
 
 COSMOPOLITAN_HEADERS =		\
+	APE			\
 	LIBC			\
-	LIBC_ALG		\
-	LIBC_BITS		\
 	LIBC_CALLS		\
-	LIBC_CRYPTO		\
 	LIBC_DNS		\
 	LIBC_ELF		\
 	LIBC_FMT		\
@@ -289,40 +328,46 @@ COSMOPOLITAN_HEADERS =		\
 	LIBC_MEM		\
 	LIBC_NEXGEN32E		\
 	LIBC_NT			\
-	LIBC_OHMYPLUS		\
-	LIBC_RAND		\
 	LIBC_RUNTIME		\
 	LIBC_SOCK		\
 	LIBC_STDIO		\
+	THIRD_PARTY_XED		\
 	LIBC_STR		\
 	LIBC_SYSV		\
+	LIBC_THREAD		\
 	LIBC_TIME		\
 	LIBC_TINYMATH		\
-	LIBC_UNICODE		\
 	LIBC_X			\
 	LIBC_ZIPOS		\
+	NET_HTTP		\
 	THIRD_PARTY_DLMALLOC	\
 	THIRD_PARTY_GDTOA	\
 	THIRD_PARTY_GETOPT	\
 	THIRD_PARTY_MUSL	\
 	THIRD_PARTY_ZLIB	\
+	THIRD_PARTY_ZLIB_GZ	\
 	THIRD_PARTY_REGEX
 
-o/$(MODE)/cosmopolitan.a.txt:
-	printf "%s\n" $(call reverse,$(call uniq,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)))))
-o/$(MODE)/cosmopolitan.a: $(filter-out o/libc/stubs/exit11.o,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_A_OBJS)))
-o/cosmopolitan.h:				\
-		o/$(MODE)/tool/build/rollup.com	\
-		libc/integral/normalize.inc	\
-		$(foreach x,$(COSMOPOLITAN_HEADERS),$($(x)_HDRS))
-	@ACTION=ROLLUP TARGET=$@ build/do $^ >$@
+o/$(MODE)/cosmopolitan.a:	\
+		$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_A_OBJS))
+
+o/cosmopolitan.h:							\
+		o/$(MODE)/tool/build/rollup.com				\
+		libc/integral/normalize.inc				\
+		$(foreach x,$(COSMOPOLITAN_HEADERS),$($(x)_HDRS))	\
+		$(foreach x,$(COSMOPOLITAN_HEADERS),$($(x)_INCS))
+	$(file >$(TMPDIR)/$(subst /,_,$@),libc/integral/normalize.inc $(foreach x,$(COSMOPOLITAN_HEADERS),$($(x)_HDRS)))
+	@$(COMPILE) -AROLLUP -T$@ o/$(MODE)/tool/build/rollup.com @$(TMPDIR)/$(subst /,_,$@) >$@
 
 o/cosmopolitan.html:							\
 		o/$(MODE)/third_party/chibicc/chibicc.com.dbg		\
-		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))
+		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))	\
+		$(SRCS)							\
+		$(HDRS)
+	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))
 	o/$(MODE)/third_party/chibicc/chibicc.com.dbg -J		\
 		-fno-common -include libc/integral/normalize.inc -o $@	\
-		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))
+		@$(TMPDIR)/$(subst /,_,$@)
 
 $(SRCS):					\
 	libc/integral/normalize.inc		\
@@ -356,9 +401,9 @@ $(SRCS):
 $(HDRS):
 $(INCS):
 .DEFAULT:
-	@echo >&2
-	@echo NOTE: deleting o/$(MODE)/depend because of an unspecified prerequisite: $@ >&2
-	@echo >&2
-	rm -f o/$(MODE)/depend
+	@$(ECHO) >&2
+	@$(ECHO) NOTE: deleting o/$(MODE)/depend because of an unspecified prerequisite: $@ >&2
+	@$(ECHO) >&2
+	$(RM) o/$(MODE)/depend
 
 -include o/$(MODE)/depend

NOTICE

@@ -1,14 +0,0 @@
-Copyright 2020 Justine Alexandra Roberts Tunney
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted, provided that the
-above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -1,5 +1,6 @@
 ![Cosmopolitan Honeybadger](usr/share/img/honeybadger.png)
 
+[![build](https://github.com/jart/cosmopolitan/actions/workflows/build.yml/badge.svg)](https://github.com/jart/cosmopolitan/actions/workflows/build.yml)
 # Cosmopolitan
 
 [Cosmopolitan Libc](https://justine.lol/cosmopolitan/index.html) makes C
@@ -19,32 +20,230 @@ libc](https://justine.lol/cosmopolitan/index.html) website. We also have
 ## Getting Started
 
 If you're doing your development work on Linux or BSD then you need just
-five files to get started:
+five files to get started. Here's what you do on Linux:
 
 ```sh
-wget https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-0.2.zip
-unzip cosmopolitan-amalgamated-0.2.zip
-echo 'main() { printf("hello world\n"); }' >hello.c
-gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \
-  -o hello.com.dbg hello.c -fuse-ld=bfd -Wl,-T,ape.lds \
-  -include cosmopolitan.h crt.o ape.o cosmopolitan.a
+wget https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-2.0.zip
+unzip cosmopolitan-amalgamation-2.0.zip
+printf 'main() { printf("hello world\\n"); }\n' >hello.c
+gcc -g -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \
+  -fno-omit-frame-pointer -pg -mnop-mcount -mno-tls-direct-seg-refs \
+  -o hello.com.dbg hello.c -fuse-ld=bfd -Wl,-T,ape.lds -Wl,--gc-sections \
+  -include cosmopolitan.h crt.o ape-no-modify-self.o cosmopolitan.a
 objcopy -S -O binary hello.com.dbg hello.com
-./hello.com
 ```
 
-If you're developing on Windows or MacOS then you need to download an
+You now have a portable program.
+
+```sh
+./hello.com
+bash -c './hello.com'  # zsh/fish workaround (we patched them in 2021)
+```
+
+Since we used the `ape-no-modify-self.o` bootloader (rather than
+`ape.o`) your executable will not modify itself when it's run. What
+it'll instead do, is extract a 4kb program to `${TMPDIR:-${HOME:-.}}`
+that maps your program into memory without needing to copy it. It's
+possible to install the APE loader systemwide as follows.
+
+```sh
+# System-Wide APE Install
+# for Linux, Darwin, and BSDs
+# 1. Copies APE Loader to /usr/bin/ape
+# 2. Registers w/ binfmt_misc too if Linux
+ape/apeinstall.sh
+
+# System-Wide APE Uninstall
+# for Linux, Darwin, and BSDs
+ape/apeuninstall.sh
+```
+
+It's also possible to convert APE binaries into the system-local format
+by using the `--assimilate` flag. Please note that if binfmt_misc is in
+play, you'll need to unregister it temporarily before doing this, since
+the assimilate feature is part of the shell script header.
+
+```sh
+$ file hello.com
+hello.com: DOS/MBR boot sector
+./hello.com --assimilate
+$ file hello.com
+hello.com: ELF 64-bit LSB executable
+```
+
+Now that you're up and running with Cosmopolitan Libc and APE, here's
+some of the most important troubleshooting tools APE offers that you
+should know, in case you encounter any issues:
+
+```sh
+./hello.com --strace   # log system calls to stderr
+./hello.com --ftrace   # log function calls to stderr
+```
+
+Do you love tiny binaries? If so, you may not be happy with Cosmo adding
+heavyweight features like tracing to your binaries by default. In that
+case, you may want to consider using our build system:
+
+```sh
+make -j8 MODE=tiny
+```
+
+Which will cause programs such as `hello.com` and `life.com` to shrink
+from 60kb in size to about 16kb. There's also a prebuilt amalgamation
+online <https://justine.lol/cosmopolitan/cosmopolitan-tiny.zip> hosted
+on our download page <https://justine.lol/cosmopolitan/download.html>.
+
+### MacOS
+
+If you're developing on MacOS you can install the GNU compiler
+collection for x86_64-elf via homebrew:
+
+```sh
+brew install x86_64-elf-gcc
+```
+
+Then in the above scripts just replace `gcc` and `objcopy` with
+`x86_64-elf-gcc` and `x86_64-elf-objcopy` to compile your APE binary.
+
+### Windows
+
+If you're developing on Windows then you need to download an
 x86_64-pc-linux-gnu toolchain beforehand. See the [Compiling on
 Windows](https://justine.lol/cosmopolitan/windows-compiling.html)
 tutorial. It's needed because the ELF object format is what makes
 universal binaries possible.
 
-Cosmopolitan can also be compiled from source on any Linux distro.
+Cosmopolitan officially only builds on Linux. However, one highly
+experimental (and currently broken) thing you could try, is building the
+entire cosmo repository from source using the cross9 toolchain.
+
+```
+mkdir -p o/third_party
+rm -rf o/third_party/gcc
+wget https://justine.lol/linux-compiler-on-windows/cross9.zip
+unzip cross9.zip
+mv cross9 o/third_party/gcc
+build/bootstrap/make.com
+```
+
+## Source Builds
+
+Cosmopolitan can be compiled from source on any Linux distro. First, you
+need to download or clone the repository.
 
 ```sh
-wget https://justine.lol/cosmopolitan/cosmopolitan-0.2.tar.gz
-tar xf cosmopolitan-0.2.tar.gz  # see releases page
-cd cosmopolitan-0.2
-make -j16
+wget https://justine.lol/cosmopolitan/cosmopolitan.tar.gz
+tar xf cosmopolitan.tar.gz  # see releases page
+cd cosmopolitan
+```
+
+This will build the entire repository and run all the tests:
+
+```sh
+build/bootstrap/make.com -j16
 o//examples/hello.com
 find o -name \*.com | xargs ls -rShal | less
 ```
+
+If you get an error running make.com then it's probably because you have
+WINE installed to `binfmt_misc`. You can fix that by installing the the
+APE loader as an interpreter. It'll improve build performance too!
+
+```sh
+ape/apeinstall.sh
+```
+
+Since the Cosmopolitan repository is very large, you might only want to
+build a particular thing. Cosmopolitan's build config does a good job at
+having minimal deterministic builds. For example, if you wanted to build
+only hello.com then you could do that as follows:
+
+```sh
+build/bootstrap/make.com -j16 o//examples/hello.com
+```
+
+Sometimes it's desirable to build a subset of targets, without having to
+list out each individual one. You can do that by asking make to build a
+directory name. For example, if you wanted to build only the targets and
+subtargets of the chibicc package including its tests, you would say:
+
+```sh
+build/bootstrap/make.com -j16 o//third_party/chibicc
+o//third_party/chibicc/chibicc.com --help
+```
+
+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
+build/bootstrap/make.com -j16 MODE=tiny
+```
+
+Here's some other build modes you can try:
+
+```sh
+build/bootstrap/make.com -j16 MODE=dbg       # asan + ubsan + debug
+build/bootstrap/make.com -j16 MODE=asan      # production memory safety
+build/bootstrap/make.com -j16 MODE=opt       # -march=native optimizations
+build/bootstrap/make.com -j16 MODE=rel       # traditional release binaries
+build/bootstrap/make.com -j16 MODE=optlinux  # optimal linux-only performance
+build/bootstrap/make.com -j16 MODE=tinylinux # tiniest linux-only 4kb binaries
+```
+
+For further details, see [//build/config.mk](build/config.mk).
+
+## GDB
+
+Here's the recommended `~/.gdbinit` config:
+
+```
+set host-charset UTF-8
+set target-charset UTF-8
+set target-wide-charset UTF-8
+set osabi none
+set complaints 0
+set confirm off
+set history save on
+set history filename ~/.gdb_history
+define asm
+  layout asm
+  layout reg
+end
+define src
+  layout src
+  layout reg
+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
+
+```
+gdb foo.com -ex 'add-symbol-file foo.com.dbg 0x401000'
+```
+
+## Support Vector
+
+| Platform        | Min Version | Circa |
+| :---            | ---:        | ---:  |
+| AMD             | K8 Venus    | 2005  |
+| Intel           | Core        | 2006  |
+| Windows         | Vista       | 2006  |
+| Linux           | 2.6.18      | 2007  |
+| Mac OS X        | 15.6        | 2018  |
+| FreeBSD         | 13          | 2020  |
+| OpenBSD         | 6.4         | 2018  |
+| NetBSD          | 9.2         | 2021  |
+
+## Special Thanks
+
+Funding for this project is crowdsourced using
+[GitHub Sponsors](https://github.com/sponsors/jart) and
+[Patreon](https://www.patreon.com/jart). Your support is what makes this
+project possible. Thank you! We'd also like to give special thanks to
+the following individuals:
+
+- [Joe Drumgoole](https://github.com/jdrumgoole)
+
+For publicly sponsoring our work at the highest tier.

ape/ape.lds

@@ -175,18 +175,22 @@
 
 #ifdef __LINKER__
 #include "ape/macros.internal.h"
-#include "ape/config.h"
+#include "ape/relocations.h"
 #include "libc/dce.h"
+#include "libc/elf/def.h"
+#include "libc/elf/pf2prot.internal.h"
 #include "libc/nt/pedef.internal.h"
 #include "libc/zip.h"
 
 ENTRY(_start)
 
 PHDRS {
-  Head PT_LOAD FLAGS(5);
-  Rom PT_LOAD FLAGS(5);
-  Ram PT_LOAD FLAGS(6);
-  stack PT_GNU_STACK FLAGS(6);
+  Head PT_LOAD FLAGS(PF_X|PF_R);
+  Rom PT_LOAD FLAGS(PF_X|PF_R);
+  Ram PT_LOAD FLAGS(PF_W|PF_R);
+  Tls PT_TLS FLAGS(PF_W|PF_R);
+  Bss PT_LOAD FLAGS(PF_W|PF_R);
+  stack PT_GNU_STACK FLAGS(PF_W|PF_R);
 }
 
 SECTIONS {
@@ -196,56 +200,57 @@ SECTIONS {
 /*BEGIN: linux addressability guarantee */
 /*BEGIN: bsd addressability guarantee */
 
-  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) : {
+  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) : AT(IMAGE_BASE_REAL) {
     HIDDEN(_base = .);
 
     /* Real Mode */
     KEEP(*(.head))
-    . += 1;
+    KEEP(*(.apesh))
+    KEEP(*(.head2))
+    KEEP(*(.text.head))
 
     /* Executable & Linkable Format */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 1);
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_phdrs = .);
     KEEP(*(.elf.phdrs))
     HIDDEN(ape_phdrs_end = .);
-    . += 1;
 
     /* OpenBSD */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 1);
+    . = ALIGN(__SIZEOF_POINTER__);
     HIDDEN(ape_note = .);
     KEEP(*(.note.openbsd.ident))
     KEEP(*(.note.netbsd.ident))
     HIDDEN(ape_note_end = .);
-    . += 1;
 
     /* Portable Executable */
     KEEP(*(.pe.header))
     HIDDEN(ape_pe_sections = .);
     KEEP(*(.pe.sections))
     HIDDEN(ape_pe_sections_end = .);
-    . += 1;
 
     /* Mach-O */
     KEEP(*(.macho))
     . = ALIGN(__SIZEOF_POINTER__);
     HIDDEN(ape_macho_end = .);
-    . += 1;
 
     KEEP(*(.ape.pad.head))
-    . = ALIGN(SupportsWindows() ? PAGESIZE : 16);
+    . = ALIGN(SupportsWindows() || SupportsMetal() ? PAGESIZE : 16);
     HIDDEN(_ehead = .);
   } :Head
 
 /*BEGIN: nt addressability guarantee */
 
   .text . : {
+    BYTE(0x90) /* TODO: fix blinkenlights symbol __map_phdrs */
     /* Code that needs to be addressable in Real Mode */
     *(.text.real)
     KEEP(*(SORT_BY_NAME(.sort.text.real.*)))
-    *(.rodata.real)
-    KEEP(*(SORT_BY_NAME(.sort.rodata.real.*)))
+    /* Code we want earlier in the binary w/o modifications */
+    KEEP(*(.ape.loader))
     HIDDEN(_ereal = .);
-
 /*END: realmode addressability guarantee */
+/*BEGIN: morphable code */
+    . += 1;
 
     /* Normal Code */
     *(.start)
@@ -276,21 +281,25 @@ SECTIONS {
     KEEP(*(SORT_BY_NAME(.sort.text.*)))
 
     KEEP(*(.ape.pad.test));
-    HIDDEN(__test_start = .);
     *(.test.unlikely)
     *(.test .test.*)
 
     /* Privileged code invulnerable to magic */
     KEEP(*(.ape.pad.privileged));
+    . += . > 0 ? 1 : 0;
+/*END: morphable code */
     HIDDEN(__privileged_start = .);
-    HIDDEN(__test_end = .);
-    . += 1;
+    . += . > 0 ? 1 : 0;
     *(.privileged)
     HIDDEN(__privileged_end = .);
+    . += . > 0 ? 1 : 0;
 
 /*BEGIN: Read Only Data */
 
     KEEP(*(.ape.pad.rodata));
+    KEEP(*(.rodata.pytab.0));
+    KEEP(*(.rodata.pytab.1));
+    KEEP(*(.rodata.pytab.2));
 
     *(.rodata .rodata.*)
     *(.ubsan.types)
@@ -306,11 +315,10 @@ SECTIONS {
     KEEP(*(.comment))
     KEEP(*(.commentepilogue))
 #endif
- 
+
     /* Windows DLL Import Directory */
     KEEP(*(.idata.ro));
     KEEP(*(SORT_BY_NAME(.idata.ro.*)))
-    . += 1;
 
     . = ALIGN(__SIZEOF_POINTER__);
     PROVIDE_HIDDEN(__init_array_start = .);
@@ -342,8 +350,10 @@ SECTIONS {
 /*END: Read Only Data */
   } :Rom
 
-  .data . : {
+  .data ALIGN(PAGESIZE) : {
 /*BEGIN: Read/Write Data */
+    KEEP(*(SORT_BY_NAME(.piro.data.sort.iat.*)))
+/*BEGIN: NT FORK COPYING */
     KEEP(*(.dataprologue))
     *(.data .data.*)
     KEEP(*(SORT_BY_NAME(.sort.data.*)))
@@ -364,16 +374,47 @@ SECTIONS {
     . = ALIGN(__SIZEOF_POINTER__);
     KEEP(*(SORT_BY_NAME(.piro.data.sort.*)))
     KEEP(*(.piro.pad.data))
-    . = ALIGN(PAGESIZE);
+    KEEP(*(.dataepilogue))
+/*END: NT FORK COPYING */
     HIDDEN(_edata = .);
     PROVIDE_HIDDEN(edata = .);
+    KEEP(*(SORT_BY_NAME(.zip.*)))
+    HIDDEN(_ezip = .);
   } :Ram
 
-  .bss . : {
+  .tdata . : {
+    _tdata_start = .;
+    *(SORT_BY_ALIGNMENT(.tdata))
+    *(SORT_BY_ALIGNMENT(.tdata.*))
+    . = ALIGN(16);
+    _tdata_end = .;
+    . = ALIGN(PAGESIZE);
+  } :Tls
+  . = ALIGN(PAGESIZE);
+
+/*END:   file content that's loaded by o/s */
+/*BEGIN: bss memory void */
+
+  .tbss . : {
+    _tbss_start = .;
+    *(SORT_BY_ALIGNMENT(.tbss))
+    *(SORT_BY_ALIGNMENT(.tbss.*))
+    . = ALIGN(16);
+    /* the %fs register is based on this location */
+    _tbss_end = .;
+  } :Tls
+
+/*END:   file content */
+/*BEGIN: bss memory that's addressable */
+
+  .bss ALIGN(64) : {
+/*BEGIN: NT FORK COPYING */
+    KEEP(*(.bssprologue))
     KEEP(*(SORT_BY_NAME(.piro.bss.init.*)))
     *(.piro.bss)
     KEEP(*(SORT_BY_NAME(.piro.bss.sort.*)))
     HIDDEN(__piro_end = .);
+    . += . > 0 ? 1 : 0;
 /*END: Post-Initialization Read-Only */
 
     /* Statically Allocated Empty Space */
@@ -383,15 +424,12 @@ SECTIONS {
 
     KEEP(*(SORT_BY_NAME(.sort.bss.*)))
 
-    /* eXtreme Low Memory w/ Userspace Remapping */
-    . = ALIGN(0x1000);
-    *(.xlm)
-    . = ALIGN(0x1000);
-
-    . = ALIGN(0x10000); /* for brk()/sbrk() allocation */
+    KEEP(*(.bssepilogue))
+/*END: NT FORK COPYING */
+    . = ALIGN(FRAMESIZE); /* for brk()/sbrk() allocation */
     HIDDEN(_end = .);
     PROVIDE_HIDDEN(end = .);
-  } :Ram
+  } :Bss
 
 /*END: nt addressability guarantee */
 /*END: bsd addressability guarantee */
@@ -447,9 +485,13 @@ PFSTUB4(ape_elf_phnum, (ape_phdrs_end - ape_phdrs) / 56);
 PFSTUB4(ape_elf_shnum, 0);
 PFSTUB4(ape_elf_shstrndx, 0);
 
-HIDDEN(__privileged_addr = ROUNDDOWN(__privileged_start, PAGESIZE)); 
+HIDDEN(_tdata_size = _tdata_end - _tdata_start);
+HIDDEN(_tls_size = _tbss_end - _tdata_start);
+HIDDEN(_tls_content = (_tdata_end - _tdata_start) + (_tbss_end - _tbss_start));
+
+HIDDEN(__privileged_addr = ROUNDDOWN(__privileged_start, PAGESIZE));
 HIDDEN(__privileged_size = (ROUNDUP(__privileged_end, PAGESIZE) -
-                            ROUNDDOWN(__privileged_start, PAGESIZE))); 
+                            ROUNDDOWN(__privileged_start, PAGESIZE)));
 
 HIDDEN(ape_rom_offset = 0);
 HIDDEN(ape_rom_vaddr = ADDR(.head));
@@ -462,11 +504,20 @@ HIDDEN(ape_rom_rva = RVA(ape_rom_vaddr));
 HIDDEN(ape_ram_offset = ape_rom_offset + ape_rom_filesz);
 HIDDEN(ape_ram_vaddr = ADDR(.data));
 HIDDEN(ape_ram_paddr = LOADADDR(.data));
-HIDDEN(ape_ram_filesz = LOADADDR(.bss) - LOADADDR(.data));
+HIDDEN(ape_ram_filesz = SIZEOF(.data) + SIZEOF(.tdata));
 HIDDEN(ape_ram_memsz = ADDR(.bss) + SIZEOF(.bss) - ape_ram_vaddr);
 HIDDEN(ape_ram_align = PAGESIZE);
 HIDDEN(ape_ram_rva = RVA(ape_ram_vaddr));
 
+HIDDEN(ape_stack_pf = DEFINED(ape_stack_pf) ? ape_stack_pf : PF_R | PF_W);
+HIDDEN(ape_stack_prot = _PF2PROT(ape_stack_pf));
+HIDDEN(ape_stack_offset = ape_ram_offset + ape_ram_filesz);
+HIDDEN(ape_stack_vaddr = DEFINED(ape_stack_vaddr) ? ape_stack_vaddr : 0x700000000000);
+HIDDEN(ape_stack_paddr = ape_ram_paddr + ape_ram_filesz);
+HIDDEN(ape_stack_filesz = 0);
+HIDDEN(ape_stack_memsz = DEFINED(ape_stack_memsz) ? ape_stack_memsz : STACKSIZE);
+HIDDEN(ape_stack_align = 16);
+
 HIDDEN(ape_note_offset = ape_rom_offset + (ape_note - ape_rom_vaddr));
 HIDDEN(ape_note_vaddr = ape_note);
 HIDDEN(ape_note_paddr = ape_rom_paddr + ape_note_offset);
@@ -485,8 +536,8 @@ HIDDEN(ape_text_rva = RVA(ape_text_vaddr));
 HIDDEN(ape_data_offset = ape_ram_offset + LOADADDR(.data) - ape_ram_paddr);
 HIDDEN(ape_data_paddr = LOADADDR(.data));
 HIDDEN(ape_data_vaddr = ADDR(.data));
-HIDDEN(ape_data_filesz = SIZEOF(.data));
-HIDDEN(ape_data_memsz = SIZEOF(.data));
+HIDDEN(ape_data_filesz = SIZEOF(.data) + SIZEOF(.tdata));
+HIDDEN(ape_data_memsz = SIZEOF(.data) + SIZEOF(.tdata));
 HIDDEN(ape_data_align = PAGESIZE);
 HIDDEN(ape_data_rva = RVA(ape_data_vaddr));
 
@@ -497,25 +548,18 @@ HIDDEN(ape_bss_filesz = 0);
 HIDDEN(ape_bss_memsz = SIZEOF(.bss));
 HIDDEN(ape_bss_align = PAGESIZE);
 
-#if SupportsXnu()
-SHSTUB2(ape_macho_dd_skip, RVA(ape_macho) / 8);
-SHSTUB2(ape_macho_dd_count, (ape_macho_end - ape_macho) / 8);
-#endif
-
-#if SupportsWindows()
-PFSTUB4(ape_pe_offset, ape_pe - ape_mz);
-HIDDEN(ape_pe_optsz = ape_pe_sections - (ape_pe + 24));
-HIDDEN(ape_pe_shnum = (ape_pe_sections_end - ape_pe_sections) / 40);
-HIDDEN(ape_idata_idtsize = ape_idata_idtend - ape_idata_idt);
-HIDDEN(ape_idata_iatsize = ape_idata_iatend - ape_idata_iat);
-HIDDEN(v_ntsubsystem = (DEFINED(GetMessage)
-                        ? kNtImageSubsystemWindowsGui
-                        : kNtImageSubsystemWindowsCui));
-#endif
+/* we roundup here because xnu wants the file load segments page-aligned */
+/* but we don't want to add the nop padding to the ape program, so we'll */
+/* let ape.S dd read past the end of the file into the wrapping binaries */
+SHSTUB2(ape_loader_dd_skip, DEFINED(ape_loader) ? RVA(ape_loader) / 64 : 0);
+SHSTUB2(ape_loader_dd_count,
+        DEFINED(ape_loader_end)
+            ? ROUNDUP(ape_loader_end - ape_loader, PAGESIZE) / 64
+            : 0);
 
 #if SupportsMetal()
 HIDDEN(v_ape_realsectors =
-           MIN(REAL_SCRATCH_AREA - IMAGE_BASE_REAL,
+           MIN(0x70000 - IMAGE_BASE_REAL,
                ROUNDUP(RVA(_edata), 4096)) / 512);
 HIDDEN(v_ape_realpages = v_ape_realsectors / (4096 / 512));
 HIDDEN(v_ape_highsectors =
@@ -526,8 +570,9 @@ HIDDEN(v_ape_highsectors =
 #define ZIPCONST(NAME, VAL) HIDDEN(NAME = DEFINED(__zip_start) ? VAL : 0);
 ZIPCONST(v_zip_cdoffset, __zip_start - IMAGE_BASE_VIRTUAL);
 ZIPCONST(v_zip_cdirsize, __zip_end - __zip_start);
+ASSERT(v_zip_cdirsize % kZipCdirHdrLinkableSize == 0, "bad zip cdir");
 ZIPCONST(v_zip_records, v_zip_cdirsize / kZipCdirHdrLinkableSize);
-ZIPCONST(v_zip_commentsize, _edata - __zip_end - kZipCdirHdrMinSize);
+ZIPCONST(v_zip_commentsize, _ezip - __zip_end - kZipCdirHdrMinSize);
 
 #if SupportsXnu()
 /* Generates deterministic ID. */
@@ -605,7 +650,7 @@ CHURN(v_ape_realsectors);
 #if SupportsXnu()
 CHURN(ape_macho);
 #endif
-#if SupportsWindows()
+#if SupportsWindows() || SupportsMetal()
 CHURN(ape_mz);
 CHURN(ape_pe);
 CHURN(ape_pe_offset);
@@ -618,6 +663,32 @@ CHURN(WinMain);
 #endif /* SupportsWindows() */
 #endif /* SupportsXnu() */
 
+#if SupportsWindows() || SupportsMetal()
+#define LINK_WINDOWS (SupportsWindows() && !DEFINED(EfiMain))
+PFSTUB4(ape_pe_offset, ape_pe - ape_mz);
+HIDDEN(ape_pe_optsz = ape_pe_sections - (ape_pe + 24));
+HIDDEN(ape_pe_shnum = (ape_pe_sections_end - ape_pe_sections) / 40);
+HIDDEN(ape_pe_base = IMAGE_BASE_VIRTUAL);
+HIDDEN(ape_idata = LINK_WINDOWS ? RVA(ape_idata_iat) : 0);
+HIDDEN(ape_idata_iatsize = LINK_WINDOWS ? ape_idata_iatend - ape_idata_iat : 0);
+HIDDEN(ape_idata = LINK_WINDOWS ? RVA(ape_idata_idt) : 0);
+HIDDEN(ape_idata_idtsize = LINK_WINDOWS ? ape_idata_idtend - ape_idata_idt : 0);
+HIDDEN(v_ntversion = LINK_WINDOWS ? 6 : 1);
+HIDDEN(v_ntdllchar = LINK_WINDOWS ? 288 : 0);
+HIDDEN(v_ntsubversion = LINK_WINDOWS ? 6 : 5);
+HIDDEN(v_ntsubsystem = (LINK_WINDOWS
+                        ? (DEFINED(GetMessage)
+                           ? kNtImageSubsystemWindowsGui
+                           : kNtImageSubsystemWindowsCui)
+                        : kNtImageSubsystemEfiApplication));
+HIDDEN(ape_pe_entry = LINK_WINDOWS ? WinMain : EfiMain);
+#endif
+
+#if SupportsXnu()
+SHSTUB2(ape_macho_dd_skip, RVA(ape_macho) / 8);
+SHSTUB2(ape_macho_dd_count, (ape_macho_end - ape_macho) / 8);
+#endif
+
 ASSERT(DEFINED(ape_mz) ? ape_mz == IMAGE_BASE_VIRTUAL : 1, "linker panic");
 ASSERT((DEFINED(__init_bss_end) ? __init_bss_end : 0) % __SIZEOF_POINTER__ == 0,
        "__init_bss misalign");
@@ -634,6 +705,12 @@ ASSERT(DEFINED(_start) || DEFINED(_start16),
 ASSERT(!DEFINED(_start16) || REAL(_end) < 65536,
        "ape won't support non-tiny real mode programs");
 
+ASSERT(IS2POW(ape_stack_memsz),
+       "ape_stack_memsz must be a two power");
+
+ASSERT(!(ape_stack_vaddr & (ape_stack_memsz - 1)),
+       "ape_stack_vaddr must have ape_stack_memsz alignment; try using STATIC_STACK_ADDR(0x700000000000 - ape_stack_memsz);");
+
 /* Let's not be like Knight Capital. */
 /* NOCROSSREFS_TO(.test .text) */
 

ape/ape.mk

@@ -15,40 +15,151 @@
 
 PKGS += APE
 
-APE =	$(APE_DEPS)			\
-	$(APE_OBJS)			\
+APE =	o/$(MODE)/ape/ape.o			\
 	o/$(MODE)/ape/ape.lds
 
-APELINK =				\
-	ACTION=LINK.ape 		\
-	$(COMPILE)			\
-	$(LINK)				\
-	$(LINKARGS)			\
+APE_NO_MODIFY_SELF =				\
+	o/$(MODE)/ape/ape.lds			\
+	o/$(MODE)/ape/ape-no-modify-self.o
+
+APE_COPY_SELF =					\
+	o/$(MODE)/ape/ape.lds			\
+	o/$(MODE)/ape/ape-copy-self.o
+
+APELINK =					\
+	$(COMPILE)				\
+	-ALINK.ape				\
+	$(LINK)					\
+	$(LINKARGS)				\
 	$(OUTPUT_OPTION)
 
+APE_LOADER_FLAGS =				\
+	-DNDEBUG				\
+	-iquote.				\
+	-Wall					\
+	-Wextra					\
+	-fpie					\
+	-Os					\
+	-ffreestanding				\
+	-mgeneral-regs-only			\
+	-mno-red-zone				\
+	-fno-ident				\
+	-fno-gnu-unique				\
+	-c					\
+	 $(OUTPUT_OPTION)			\
+	$<
+
 APE_FILES := $(wildcard ape/*.*)
 APE_HDRS = $(filter %.h,$(APE_FILES))
 APE_INCS = $(filter %.inc,$(APE_FILES))
-APE_SRCS = $(filter %.S,$(APE_FILES))
-APE_OBJS = $(APE_SRCS:%.S=o/$(MODE)/%.o)
-APE_DEPS = $(APE_LIB)
+APE_SRCS_C = ape/loader.c
+APE_SRCS_S = $(filter %.S,$(APE_FILES))
+APE_SRCS = $(APE_SRCS_C) $(APE_SRCS_S)
+APE_OBJS = $(APE_SRCS_S:%.S=o/$(MODE)/%.o)
 APE_CHECKS = $(APE_HDRS:%=o/%.ok)
 
-o/$(MODE)/ape/ape.lds:			\
-		ape/ape.lds		\
-		ape/config.h		\
-		ape/macros.internal.h	\
-		libc/dce.h		\
+o/$(MODE)/ape/ape.lds:				\
+		ape/ape.lds			\
+		ape/macros.internal.h		\
+		ape/relocations.h		\
+		libc/intrin/bits.h		\
+		libc/calls/struct/timespec.h	\
+		libc/dce.h			\
+		libc/elf/def.h			\
+		libc/elf/pf2prot.internal.h	\
+		libc/macros.internal.h		\
+		libc/nt/pedef.internal.h	\
+		libc/str/str.h			\
 		libc/zip.h
 
-o/ape/idata.inc:			\
-		ape/idata.internal.h	\
+o/ape/idata.inc:				\
+		ape/idata.internal.h		\
 		ape/relocations.h
 
-$(APE_OBJS):	$(BUILD_FILES)		\
-		ape/ape.mk
+o/$(MODE)/ape/ape-no-modify-self.o:		\
+		ape/ape.S			\
+		ape/macros.internal.h		\
+		ape/notice.inc			\
+		ape/relocations.h		\
+		libc/dce.h			\
+		libc/elf/def.h			\
+		libc/intrin/asancodes.h		\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
+		libc/nexgen32e/uart.internal.h	\
+		libc/nexgen32e/vidya.internal.h	\
+		libc/nt/pedef.internal.h	\
+		libc/runtime/e820.internal.h	\
+		libc/runtime/mman.internal.h	\
+		libc/runtime/pc.internal.h	\
+		libc/runtime/symbolic.h		\
+		libc/sysv/consts/prot.h		\
+		o/$(MODE)/ape/ape.elf
+	@$(COMPILE)				\
+		-AOBJECTIFY.S			\
+		$(OBJECTIFY.S)			\
+		$(OUTPUT_OPTION)		\
+		-DAPE_NO_MODIFY_SELF		\
+		-DAPE_LOADER='"o/$(MODE)/ape/ape.elf"' $<
+
+o/$(MODE)/ape/ape-copy-self.o:			\
+		ape/ape.S			\
+		ape/macros.internal.h		\
+		ape/notice.inc			\
+		ape/relocations.h		\
+		libc/dce.h			\
+		libc/elf/def.h			\
+		libc/intrin/asancodes.h		\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
+		libc/nexgen32e/uart.internal.h	\
+		libc/nexgen32e/vidya.internal.h	\
+		libc/nt/pedef.internal.h	\
+		libc/runtime/e820.internal.h	\
+		libc/runtime/mman.internal.h	\
+		libc/runtime/pc.internal.h	\
+		libc/runtime/symbolic.h		\
+		libc/sysv/consts/prot.h
+	@$(COMPILE)				\
+		-AOBJECTIFY.S			\
+		$(OBJECTIFY.S)			\
+		$(OUTPUT_OPTION)		\
+		-DAPE_NO_MODIFY_SELF $<
+
+o/$(MODE)/ape/loader.o: ape/loader.c ape/loader.h
+	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=0b01111001 -g $(APE_LOADER_FLAGS)
+o/$(MODE)/ape/loader-gcc.asm: ape/loader.c
+	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=0b01111001 -S -g0 $(APE_LOADER_FLAGS)
+o/$(MODE)/ape/loader-clang.asm: ape/loader.c
+	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=0b01111001 -S -g0 $(APE_LOADER_FLAGS)
+
+o/$(MODE)/ape/loader-xnu.o: ape/loader.c ape/loader.h
+	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=0b00001000 -g $(APE_LOADER_FLAGS)
+o/$(MODE)/ape/loader-xnu-gcc.asm: ape/loader.c
+	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=0b00001000 -S -g0 $(APE_LOADER_FLAGS)
+o/$(MODE)/ape/loader-xnu-clang.asm: ape/loader.c
+	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=0b00001000 -S -g0 $(APE_LOADER_FLAGS)
+
+o/$(MODE)/ape/ape.elf: o/$(MODE)/ape/ape.elf.dbg
+o/$(MODE)/ape/ape.macho: o/$(MODE)/ape/ape.macho.dbg
+
+o/$(MODE)/ape/ape.elf.dbg:			\
+		o/$(MODE)/ape/loader.o		\
+		o/$(MODE)/ape/loader-elf.o	\
+		ape/loader.lds
+	@$(ELFLINK) -z max-page-size=0x10
+
+o/$(MODE)/ape/ape.macho.dbg:			\
+		o/$(MODE)/ape/loader-xnu.o	\
+		o/$(MODE)/ape/loader-macho.o	\
+		ape/loader-macho.lds
+	@$(ELFLINK) -z max-page-size=0x10
 
 .PHONY: o/$(MODE)/ape
-o/$(MODE)/ape:	$(APE)			\
-		$(APE_CHECKS)		\
-		o/$(MODE)/ape/lib
+o/$(MODE)/ape:	$(APE_CHECKS)			\
+		o/$(MODE)/ape/ape.o		\
+		o/$(MODE)/ape/ape.lds		\
+		o/$(MODE)/ape/ape.elf		\
+		o/$(MODE)/ape/ape.macho		\
+		o/$(MODE)/ape/ape-copy-self.o	\
+		o/$(MODE)/ape/ape-no-modify-self.o

ape/apeinstall.sh

@@ -0,0 +1,126 @@
+#!/bin/sh
+
+if [ $UID -eq 0 ]; then
+  SUDO=
+else
+  SUDO=sudo
+fi
+
+echo "Actually Portable Executable (APE) Installer" >&2
+echo "Author:  Justine Tunney <[email protected]>"  >&2
+
+################################################################################
+# INSTALL APE LOADER SYSTEMWIDE
+
+if [ -f o/depend ]; then
+  # mkdeps.com build was successfully run so assume we can build
+  echo >&2
+  echo "recompiling ape loader" >&2
+  echo "running: make -j8 o//ape" >&2
+  make -j8 o//ape || exit
+  echo "done" >&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
+else
+  echo "no cosmopolitan libc repository here" >&2
+  echo "fetching ape loader from justine.lol"  >&2
+  mkdir -p o//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
+  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
+  fi
+  chmod +x o//ape/ape.elf || exit
+  chmod +x o//ape/ape.macho || exit
+fi
+
+if [ "$(uname -s)" = "Darwin" ]; then
+  if ! [ /usr/bin/ape -nt o//ape/ape.macho ]; 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.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
+fi
+
+################################################################################
+# REGISTER APE LOADER WITH BINFMT_MISC TOO (LINUX-ONLY)
+
+if [ x"$(uname -s)" = xLinux ]; then
+
+  if [ -e /proc/sys/fs/binfmt_misc/APE ]; then
+    echo >&2
+    echo it looks like APE is already registered with binfmt_misc >&2
+    echo To reinstall please run ape/apeuninstall.sh first >&2
+    echo please check that it is mapped to ape not /bin/sh >&2
+    echo cat /proc/sys/fs/binfmt_misc/APE >&2
+    cat /proc/sys/fs/binfmt_misc/APE >&2
+    exit
+  fi
+
+  if ! [ -e /proc/sys/fs/binfmt_misc ]; then
+    echo >&2
+    echo loading binfmt_misc into your kernel >&2
+    echo you may need to edit configs to persist across reboot >&2
+    echo $SUDO modprobe binfmt_misc >&2
+    $SUDO modprobe binfmt_misc || exit
+    echo done >&2
+  fi
+
+  if ! [ -e /proc/sys/fs/binfmt_misc/register ]; then
+    echo >&2
+    echo mounting binfmt_misc into your kernel >&2
+    echo you may need to edit configs to persist across reboot >&2
+    echo $SUDO mount -t binfmt_misc none /proc/sys/fs/binfmt_misc >&2
+    $SUDO mount -t binfmt_misc none /proc/sys/fs/binfmt_misc || exit
+    echo done >&2
+  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 done >&2
+
+  if [ x"$(cat /proc/sys/fs/binfmt_misc/status)" = xdisabled ]; then
+    echo >&2
+    echo enabling binfmt_misc >&2
+    echo you may need to edit configs to persist across reboot >&2
+    echo $SUDO sh -c 'echo 1 >/proc/sys/fs/binfmt_misc/status' >&2
+    $SUDO sh -c 'echo 1 >/proc/sys/fs/binfmt_misc/status' || exit
+    echo done >&2
+  fi
+
+fi
+
+################################################################################
+
+{
+  echo
+  echo "------------------------------------------------------------------"
+  echo
+  echo "APE INSTALL COMPLETE"
+  echo
+  echo "If you decide to uninstall APE later on"
+  echo "you may do so using ape/apeuninstall.sh"
+  echo
+  echo "Enjoy your APE loader (>'.')>"
+  echo
+} >&2

ape/apeuninstall.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ "$UID" = "0" ]; then
+  SUDO=
+else
+  SUDO=sudo
+fi
+
+{
+  echo
+  echo "APE Uninstaller intends to run"
+  echo
+  echo "    $SUDO sh -c 'echo -1 >/proc/sys/fs/binfmt_misc/APE'"
+  echo "    $SUDO rm -f /usr/bin/ape ~/.ape o/tmp/.ape /tmp/.ape"
+  echo
+  echo "You may then use ape/apeinstall.sh to reinstall it"
+  echo
+} >&2
+
+set -ex
+if [ -f /proc/sys/fs/binfmt_misc/APE ]; then
+  $SUDO sh -c 'echo -1 >/proc/sys/fs/binfmt_misc/APE' || exit
+fi
+$SUDO rm -f /usr/bin/ape ~/.ape o/tmp/.ape o/tmp/ape /tmp/.ape /tmp/ape || exit

ape/config.h

@@ -1,118 +1,10 @@
-#ifndef APE_CONFIG_H_
-#define APE_CONFIG_H_
-#include "ape/relocations.h"
-#include "libc/macros.h"
+#ifndef COSMOPOLITAN_APE_CONFIG_H_
+#define COSMOPOLITAN_APE_CONFIG_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
 
-/*
- * Post-Initialization Read-Only Code Size Threshold.
- *
- * An executable needs to have at least this much code, before the
- * linker adds non-mandatory 4kb alignments. The benefit is better
- * memory protection. The tradeoff is sparser binaries.
- */
-#ifndef APE_PIRO_THRESHOLD
-#ifdef CONFIG_DBG
-#define APE_PIRO_THRESHOLD 0x1000
-#else
-#define APE_PIRO_THRESHOLD 0x10000
-#endif
-#endif
+#define STATIC_SYMBOL(NAME, VALUE)   \
+  asm(".equ\t" NAME "," VALUE "\n\t" \
+      ".globl\t" NAME)
 
-#ifndef METAL_STDIN
-#define METAL_STDIN COM1
-#endif
-#ifndef METAL_STDOUT
-#define METAL_STDOUT COM1
-#endif
-#ifndef METAL_STDERR
-#define METAL_STDERR COM1
-#endif
-
-#ifndef VIDYA_MODE
-#define VIDYA_MODE VIDYA_MODE_CGA
-#endif
-
-/* FPU Control Word (x87) Exception Masks
-   @see Intel Manual V1 §8.1.5
-
-       IM: Invalid Operation ───────────────┐
-       DM: Denormal Operand ───────────────┐│
-       ZM: Zero Divide ───────────────────┐││
-       OM: Overflow ─────────────────────┐│││
-       UM: Underflow ───────────────────┐││││
-       PM: Precision ──────────────────┐│││││
-      PC: Precision Control ────────┐  ││││││
-       {float,∅,double,long double} │  ││││││
-      RC: Rounding Control ───────┐ │  ││││││
-       {even, →-∞, →+∞, →0}       │┌┤  ││││││
-                                 ┌┤││  ││││││
-                                d││││rr││││││*/
-#define X87_NORMAL    0b000000000001101111111
-#define X87_DTOA      0b000000000001000000000
-#define X87_DTOA_MASK 0b000000000001100000000
-#ifndef X87_DEFAULT
-#define X87_DEFAULT X87_NORMAL
-#endif
-
-#ifndef UART_BAUD_RATE
-#define UART_BAUD_RATE 9600 /* bits per second ∈ [50,115200] */
-#endif
-#define UART_CONF_DLR (1843200 /*hz*/ / 16 /*wut*/ / (UART_BAUD_RATE))
-#ifndef UART_CONF_IIR
-/*                      ┌interrupt trigger level {1,4,8,14}
-                        │ ┌enable 64 byte fifo (UART 16750+)
-                        │ │ ┌select dma mode
-                        │ │ │┌clear transmit fifo
-                        │ │ ││┌clear receive fifo
-                        ├┐│ │││┌enable fifos*/
-#define UART_CONF_IIR 0b00000000
-#endif
-#ifndef UART_CONF_LCR
-/*                      ┌dlab: flips configuration mode state
-                        │┌enable break signal
-                        ││ ┌parity {none,odd,even,high,low}
-                        ││ │ ┌extra stop bit
-                        ││ │ │┌data word length (bits+5)
-                        ││┌┴┐│├┐*/
-#define UART_CONF_LCR 0b01000011
-#endif
-
-#define XLM(VAR)                            (XLM_BASE_REAL + XLM_##VAR)
-#define XLMV(VAR)                           (__xlm + XLM_##VAR)
-#define XLM_BASE_REAL                       0x1000
-#define XLM_E820                            0
-#define XLM_E820_SIZE                       0x2000
-#define XLM_BIOS_DATA_AREA                  0x2000
-#define XLM_BIOS_DATA_AREA_SIZE             256
-#define XLM_DRIVE_BASE_TABLE                0x2200 /* drive values are contiguous */
-#define XLM_DRIVE_BASE_TABLE_SIZE           11
-#define XLM_DRIVE_TYPE                      0x220b
-#define XLM_DRIVE_TYPE_SIZE                 1
-#define XLM_DRIVE_LAST_SECTOR               0x220c /* 1-based inclusive, e.g. 18 */
-#define XLM_DRIVE_LAST_SECTOR_SIZE          1
-#define XLM_DRIVE_LAST_CYLINDER             0x220d /* 0-based incl, e.g. 79 */
-#define XLM_DRIVE_LAST_CYLINDER_SIZE        2
-#define XLM_DRIVE_ATTACHED                  0x220f
-#define XLM_DRIVE_ATTACHED_SIZE             1
-#define XLM_DRIVE_LAST_HEAD                 0x2210 /* 0-based inclusive, e.g. 1 */
-#define XLM_DRIVE_LAST_HEAD_SIZE            1
-#define XLM_DRIVE                           0x2211
-#define XLM_DRIVE_SIZE                      1
-#define XLM_HAVEEXTMEMKB                    0x2212
-#define XLM_HAVEEXTMEMKB_SIZE               4
-#define XLM_VIDEO_POSITION_FAR_POINTER      0x2216 /* video cursor far pointer */
-#define XLM_VIDEO_POSITION_FAR_POINTER_SIZE 4
-#define XLM_PAGE_TABLE_STACK_POINTER        0x2220
-#define XLM_PAGE_TABLE_STACK_POINTER_SIZE   8
-#define XLM_BADIDT                          0x2230
-#define XLM_BADIDT_SIZE                     6
-#define XLM_LOADSTATE                       0x2240
-#define XLM_LOADSTATE_SIZE                  8
-#define XLM_SIZE                            ROUNDUP(XLM_LOADSTATE + XLM_LOADSTATE_SIZE, 0x1000)
-#define IMAGE_BASE_REAL                     (XLM_BASE_REAL + XLM_SIZE)
-
-#if !defined(__LINKER__) && !defined(__ASSEMBLER__)
-extern char __xlm[XLM_SIZE];
-#endif /* !defined(__LINKER__) && !defined(__ASSEMBLER__) */
-
-#endif /* APE_CONFIG_H_ */
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_APE_CONFIG_H_ */

ape/lib/apelib.mk

@@ -1,45 +0,0 @@
-#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
-
-PKGS += APE_LIB
-
-APE_LIB_ARTIFACTS += APE_LIB_A
-APE_LIB = $(APE_LIB_A_DEPS) $(APE_LIB_A)
-APE_LIB_A = o/$(MODE)/ape/lib/apelib.a
-APE_LIB_A_FILES := $(wildcard ape/lib/*)
-APE_LIB_A_HDRS = $(filter %.h,$(APE_LIB_A_FILES))
-APE_LIB_A_SRCS_S = $(filter %.S,$(APE_LIB_A_FILES))
-APE_LIB_A_SRCS_C = $(filter %.c,$(APE_LIB_A_FILES))
-
-APE_LIB_A_SRCS =					\
-	$(APE_LIB_A_SRCS_S)				\
-	$(APE_LIB_A_SRCS_C)
-
-APE_LIB_A_OBJS =					\
-	$(APE_LIB_A_SRCS_S:%.S=o/$(MODE)/%.o)		\
-	$(APE_LIB_A_SRCS_C:%.c=o/$(MODE)/%.o)
-
-APE_LIB_A_DIRECTDEPS =					\
-	LIBC_NEXGEN32E					\
-	LIBC_INTRIN					\
-	LIBC_STR					\
-	LIBC_STUBS
-
-APE_LIB_A_CHECKS = $(APE_LIB_A_HDRS:%=o/$(MODE)/%.ok)
-APE_LIB_A_DEPS = $(call uniq,$(foreach x,$(APE_LIB_A_DIRECTDEPS),$($(x))))
-
-$(APE_LIB_A): ape/lib/ $(APE_LIB_A).pkg $(APE_LIB_A_OBJS)
-$(APE_LIB_A).pkg: $(APE_LIB_A_OBJS) $(foreach x,$(APE_LIB_A_DIRECTDEPS),$($(x)_A).pkg)
-
-APE_LIB_LIBS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)))
-APE_LIB_SRCS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)_SRCS))
-APE_LIB_HDRS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)_HDRS))
-APE_LIB_BINS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)_BINS))
-APE_LIB_CHECKS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)_CHECKS))
-APE_LIB_OBJS = $(foreach x,$(APE_LIB_ARTIFACTS),$($(x)_OBJS))
-$(APE_LIB_OBJS): $(BUILD_FILES) libc/str/str.mk
-
-.PHONY: o/$(MODE)/ape/lib
-o/$(MODE)/ape/lib:			\
-		$(APE_LIB_CHECKS)	\
-		$(APE_LIB_A)

ape/lib/apm.h

@@ -1,58 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=8 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╠──────────────────────────────────────────────────────────────────────────────╣
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█▀█░▀█▀░█░█░█▀█░█░░░█░░░█░█░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█░▄░░█░░█░█░█▀█░█░░░█░░░▀█▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░▀░▀░▀▀▀░░▀░░▀▀▀░▀░▀░▀▀▀░▀▀▀░░▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█▀█░█▀█░▀█▀░█▀█░█▀█░█░░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀▀░█ █░██▀░░█░░█▀█░█▀█░█░░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░▀░░░▀▀▀░▀░▀░░▀░░▀░▀░▀▀▀░▀▀▀░▀▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀▀░█░█░█▀▀░█▀█░█░█░▀█▀░█▀█░█▀█░█░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░▄▄░░░▐█░░│
-│░░░░░░░█▀▀░▄▀▄░█▀▀░█░▄░█░█░░█░░█▀█░█▀█░█░░█▀▀░░░░░░░░░░░░▄▄▄░░░▄██▄░░█▀░░░█░▄░│
-│░░░░░░░▀▀▀░▀░▀░▀▀▀░▀▀▀░▀▀▀░░▀░░▀░▀░▀▀▀░▀▀░▀▀▀░░░░░░░░░░▄██▀█▌░██▄▄░░▐█▀▄░▐█▀░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▐█▀▀▌░░░▄▀▌░▌░█░▌░░▌░▌░░│
-╠──────────────────────────────────────────────────────▌▀▄─▐──▀▄─▐▄─▐▄▐▄─▐▄─▐▄─│
-│ αcτµαlly pδrταblε εxεcµταblε § green energy                                  │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#ifndef APE_LIB_APM_H_
-#define APE_LIB_APM_H_
-
-/**
- * @fileoverview Advanced Power Management.
- *
- * <p>APM is useful for exiting programs, without needing to ask the
- * human to flip a physical switch or pass QEMU's -no-reboot flag.
- *
- * <p><b>Implementation Detail:</b> Supporting ACPI would literally
- * require implementing a programming language.
- *
- * @see APM BIOS Interface Specification v1.2
- * @since IBM PC/AT
- */
-
-#define APM_SERVICE 0x15
-
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-
-void apmoff(void) wontreturn;
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* APE_LIB_APM_H_ */

ape/lib/bootdr.S

@@ -1,35 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 sw=8 fenc=utf-8                                     :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/macros.internal.h"
-#include "ape/notice.inc"
-.section .real,"ax",@progbits
-.source	__FILE__
-.code16
-
-//	Resets personal computer.
-//
-//	@param	di drive number, e.g. A:\ is 0x00, C:\ is 0x80
-//	@mode	real
-//	@noreturn
-bootdr:	push	%bp
-	mov	%sp,%bp
-	mov	%di,%dx
-	int	$0x19
-	ljmp	$0xf000,$0xfff0
-	.endfn	bootdr,globl

ape/lib/e820map.S

@@ -1,37 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "ape/config.h"
-#include "ape/macros.internal.h"
-#include "ape/notice.inc"
-.section .real,"ax",@progbits
-.source	__FILE__
-.code16
-
-	.globl	e820map
-	.hidden	e820map
-	.type	e820map,@object
-	.size	e820map,XLM_E820_SIZE
-	e820map = ape_xlm + XLM_E820
-
-	.globl	e820map_xlm
-	.hidden	e820map_xlm
-	.type	e820map_xlm,@object
-	.size	e820map_xlm,XLM_E820_SIZE
-	e820map_xlm = XLM(E820)

ape/lib/flattenhighmemory.c

@@ -1,55 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/config.h"
-#include "ape/lib/pc.h"
-#include "libc/bits/bits.h"
-#include "libc/macros.h"
-
-/**
- * Virtualizes physical memory.
- *
- * This function removes memory holes (discovered by e820() earlier) and
- * creates the illusion of flat contiguous memory for as much RAM as the
- * BIOS reports usable. Memory is safe to use and remap afterwards.
- *
- * @see ape/ape.S
- */
-textreal void flattenhighmemory(struct SmapEntry *e820, struct PageTable *pml4t,
-                                uint64_t *ptsp) {
-  uint64_t *entry, paddr, vaddr;
-  struct SmapEntry *smap, *hole;
-  for (smap = hole = e820, vaddr = IMAGE_BASE_VIRTUAL; smap->size; ++smap) {
-    while (smap->size && smap->type != kMemoryUsable) smap++;
-    paddr = ROUNDUP(MAX(IMAGE_BASE_PHYSICAL, smap->addr), PAGESIZE);
-    while (paddr < ROUNDDOWN(smap->addr + smap->size, PAGESIZE)) {
-      while (hole->size &&
-             (hole->type == kMemoryUsable || hole->addr + hole->size < paddr)) {
-        hole++;
-      }
-      if (paddr >= hole->addr && paddr < hole->addr + hole->size) {
-        paddr = ROUNDUP(hole->addr + hole->size, PAGESIZE);
-      } else {
-        entry = __getpagetableentry(vaddr, 3, pml4t, ptsp);
-        *entry = paddr | PAGE_V | PAGE_RW;
-        vaddr += 0x1000;
-        paddr += 0x1000;
-      }
-    }
-  }
-}

ape/lib/g_pml4t.S

@@ -1,31 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "ape/config.h"
-#include "ape/macros.internal.h"
-#include "ape/notice.inc"
-.section .real,"ax",@progbits
-.source	__FILE__
-.code16
-
-	.globl	g_pml4t
-	.hidden	g_pml4t
-	.type	g_pml4t,@object
-	.size	g_pml4t,0x1000
-	g_pml4t = REAL_STACK_FRAME - 0x1000

ape/lib/g_ptsp.S

@@ -1,37 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "ape/config.h"
-#include "ape/macros.internal.h"
-#include "ape/notice.inc"
-.section .real,"ax",@progbits
-.source	__FILE__
-.code16
-
-	.globl	g_ptsp
-	.hidden	g_ptsp
-	.type	g_ptsp,@object
-	.size	g_ptsp,XLM_PAGE_TABLE_STACK_POINTER_SIZE
-	g_ptsp = ape_xlm + XLM_PAGE_TABLE_STACK_POINTER
-
-	.globl	g_ptsp_xlm
-	.hidden	g_ptsp_xlm
-	.type	g_ptsp_xlm,@object
-	.size	g_ptsp_xlm,XLM_PAGE_TABLE_STACK_POINTER_SIZE
-	g_ptsp_xlm = XLM(PAGE_TABLE_STACK_POINTER)

ape/lib/getpagetableentry.c

@@ -1,42 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "libc/assert.h"
-
-static textreal uint64_t __pushpagetable(uint64_t *ptsp) {
-  return (*ptsp -= PAGESIZE) | PAGE_V | PAGE_RW;
-}
-
-textreal uint64_t *__getpagetableentry(int64_t vaddr, unsigned depth,
-                                       struct PageTable *pml4t,
-                                       uint64_t *ptsp) {
-  uint64_t *entry;
-  unsigned char shift;
-  assert(depth <= 3);
-  assert(!(*ptsp & 0xfff));
-  assert(!((uintptr_t)pml4t & 0xfff));
-  shift = 39;
-  for (;;) {
-    entry = &pml4t->p[(vaddr >> shift) & 511];
-    if (!depth--) return entry;
-    shift -= 9;
-    if (!*entry) *entry = __pushpagetable(ptsp);
-    pml4t = (void *)(*entry & PAGE_TA);
-  }
-}

ape/lib/kbiosdataarea.S

@@ -1,45 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "ape/config.h"
-#include "ape/macros.internal.h"
-#include "ape/notice.inc"
-.section .real,"ax",@progbits
-.source	__FILE__
-.code16
-
-	.globl	kBiosDataArea
-	.hidden	kBiosDataArea
-	.type	kBiosDataArea,@object
-	.size	kBiosDataArea,XLM_BIOS_DATA_AREA_SIZE
-	kBiosDataArea = ape_xlm + XLM_BIOS_DATA_AREA
-
-	.globl	kBiosDataAreaXlm
-	.hidden	kBiosDataAreaXlm
-	.type	kBiosDataAreaXlm,@object
-	.size	kBiosDataAreaXlm,XLM_BIOS_DATA_AREA_SIZE
-	kBiosDataAreaXlm = XLM(BIOS_DATA_AREA)
-
-	.section .sort.text.real.init.2.kBiosDataArea,"ax",@progbits
-	movpp	%ds,%es			# copy bios data to valid page
-	mov	$PC_BIOS_DATA_AREA,%si
-	mov	$XLM(BIOS_DATA_AREA),%di
-	mov	$XLM_BIOS_DATA_AREA_SIZE,%cx
-	rep movsb
-	.previous

ape/lib/mapimage.c

@@ -1,36 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-#include "ape/relocations.h"
-#include "libc/runtime/runtime.h"
-
-textreal static void __map_segment(uint64_t k, uint64_t a, uint64_t b) {
-  uint64_t *e;
-  for (; a < b; a += 0x1000) {
-    e = __getpagetableentry(IMAGE_BASE_VIRTUAL + a, 3, &g_pml4t, &g_ptsp_xlm);
-    *e = (IMAGE_BASE_REAL + a) | k;
-  }
-}
-
-textreal void __map_image(void) {
-  __map_segment(PAGE_V | PAGE_U, 0, (uintptr_t)_etext - IMAGE_BASE_VIRTUAL);
-  __map_segment(PAGE_V | PAGE_U | PAGE_RW,
-                (uintptr_t)_etext - IMAGE_BASE_VIRTUAL,
-                (uintptr_t)_end - IMAGE_BASE_VIRTUAL);
-}

ape/lib/pageunmap.c

@@ -1,26 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-
-textreal void pageunmap(int64_t vaddr) {
-  uint64_t *entry;
-  entry = __getpagetableentry(vaddr, 3, &g_pml4t, &g_ptsp_xlm);
-  *entry &= ~PAGE_V;
-  asm volatile("invlpg\t(%0)" : /* no outputs */ : "r"(vaddr) : "memory");
-}

ape/lib/pc.h

@@ -1,242 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=8 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╠──────────────────────────────────────────────────────────────────────────────╣
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█▀█░▀█▀░█░█░█▀█░█░░░█░░░█░█░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█░▄░░█░░█░█░█▀█░█░░░█░░░▀█▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░▀░▀░▀▀▀░░▀░░▀▀▀░▀░▀░▀▀▀░▀▀▀░░▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀█░█▀█░█▀█░▀█▀░█▀█░█▀█░█░░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀▀░█ █░██▀░░█░░█▀█░█▀█░█░░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░▀░░░▀▀▀░▀░▀░░▀░░▀░▀░▀▀▀░▀▀▀░▀▀▀░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
-│░░░░░░░█▀▀░█░█░█▀▀░█▀█░█░█░▀█▀░█▀█░█▀█░█░░█▀▀░░░░░░░░░░░░░░░░░░░░░░░░▄▄░░░▐█░░│
-│░░░░░░░█▀▀░▄▀▄░█▀▀░█░▄░█░█░░█░░█▀█░█▀█░█░░█▀▀░░░░░░░░░░░░▄▄▄░░░▄██▄░░█▀░░░█░▄░│
-│░░░░░░░▀▀▀░▀░▀░▀▀▀░▀▀▀░▀▀▀░░▀░░▀░▀░▀▀▀░▀▀░▀▀▀░░░░░░░░░░▄██▀█▌░██▄▄░░▐█▀▄░▐█▀░░│
-│░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▐█▀▀▌░░░▄▀▌░▌░█░▌░░▌░▌░░│
-╠──────────────────────────────────────────────────────▌▀▄─▐──▀▄─▐▄─▐▄▐▄─▐▄─▐▄─│
-│ αcτµαlly pδrταblε εxεcµταblε § ibm personal computer                         │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#ifndef APE_LIB_PC_H_
-#define APE_LIB_PC_H_
-
-#define BOOTSIG           0xaa55 /* master boot record signature */
-#define PC_BIOS_DATA_AREA 0x400
-
-#define kInterruptFlag (1u << 9)
-
-/* FPU Status Word (x87)
-   @see Intel Manual V1 §8.1.3
-   IE: Invalid Operation ────────────────┐
-   DE: Denormalized Operand ────────────┐│
-   ZE: Zero Divide ────────────────────┐││
-   OE: Overflow Flag ─────────────────┐│││
-   UE: Underflow Flag ───────────────┐││││
-   PE: Precision Flag ──────────────┐│││││
-   SF: Stack Fault ────────────────┐││││││
-   ES: Exception Summary Status ──┐│││││││
-   C0-3: Condition Codes ──┬────┐ ││││││││
-   TOP of Stack Pointer ─────┐  │ ││││││││
-   B: FPU Busy ───────────┐│ │  │ ││││││││
-                          ││┌┴┐┌┼┐││││││││
-                          │↓│ │↓↓↓││││││││*/
-#define FPU_IE 0b0000000000100000000000001
-#define FPU_ZE 0b0000000000100000000000100
-#define FPU_SF 0b0000000000000000001000000
-#define FPU_C0 0b0000000000000000100000000
-#define FPU_C1 0b0000000000000001000000000
-#define FPU_C2 0b0000000000000010000000000
-#define FPU_C3 0b0000000000100000000000000
-
-#define CR0_PE 0x01       /* protected mode enabled */
-#define CR0_MP 0x02       /* monitor coprocessor */
-#define CR0_EM 0x04       /* no x87 fpu present if set */
-#define CR0_TS 0x08       /* task switched x87 */
-#define CR0_ET 0x10       /* extension type 287 or 387 */
-#define CR0_NE 0x20       /* enable x87 error reporting */
-#define CR0_WP 0x00010000 /* write protect read-only pages @pl0 */
-#define CR0_AM 0x00040000 /* alignment mask */
-#define CR0_NW 0x20000000 /* global write-through cache disable */
-#define CR0_CD 0x40000000 /* global cache disable */
-#define CR0_PG 0x80000000 /* paging enabled */
-
-#define CR4_VME        0x01       /* virtual 8086 mode extension */
-#define CR4_PVI        0x02       /* protected mode virtual interrupts */
-#define CR4_TSD        0x04       /* time stamp disable (rdtsc) */
-#define CR4_DE         0x08       /* debugging extensions */
-#define CR4_PSE        0x10       /* page size extension */
-#define CR4_PAE        0x20       /* physical address extension */
-#define CR4_MCE        0x40       /* machine check exception */
-#define CR4_PGE        0x80       /* page global enabled */
-#define CR4_OSFXSR     0x0200     /* enable SSE and fxsave/fxrestor */
-#define CR4_OSXMMEXCPT 0x0400     /* enable unmasked SSE exceptions */
-#define CR4_LA57       0x1000     /* enable level-5 paging */
-#define CR4_VMXE       0x2000     /* enable VMX operations */
-#define CR4_SMXE       0x4000     /* enable SMX operations */
-#define CR4_FSGSBASE   0x00010000 /* enable *FSBASE and *GSBASE instructions */
-#define CR4_PCIDE      0x00020000 /* enable process-context identifiers */
-#define CR4_OSXSAVE    0x00040000 /* enable XSAVE */
-
-#define XCR0_X87       0x01
-#define XCR0_SSE       0x02
-#define XCR0_AVX       0x04
-#define XCR0_BNDREG    0x08
-#define XCR0_BNDCSR    0x10
-#define XCR0_OPMASK    0x20
-#define XCR0_ZMM_HI256 0x40
-#define XCR0_HI16_ZMM  0x80
-
-#define EFER     0xc0000080 /* extended feature enable register */
-#define EFER_SCE 0x01       /* system call extensions */
-#define EFER_LME 0x0100     /* long mode enable */
-#define EFER_LMA 0x0400     /* long mode active */
-#define EFER_NXE 0x0800     /* no-execute enable */
-
-#define GDT_REAL_CODE   8
-#define GDT_REAL_DATA   16
-#define GDT_LEGACY_CODE 24
-#define GDT_LEGACY_DATA 32
-#define GDT_LONG_CODE   40
-#define GDT_LONG_DATA   48
-
-#define PIC1         0x20 /* IO base address for master PIC */
-#define PIC2         0xA0 /* IO base address for slave PIC */
-#define PIC1_CMD     PIC1
-#define PIC1_DATA    (PIC1 + 1)
-#define PIC2_CMD     PIC2
-#define PIC2_DATA    (PIC2 + 1)
-#define PIC_EOI      0x20 /* End-of-interrupt command code */
-#define PIC_READ_IRR 0x0a /* OCW3 irq ready next CMD read */
-#define PIC_READ_ISR 0x0b /* OCW3 irq service next CMD read */
-
-/* Long Mode Paging
-   @see Intel Manual V.3A §4.1 §4.5
-                                          IsValid (ignored on CR3) V┐
-     ┌XD:No Inst. Fetches (if NXE)   IsWritable (ignored on CR3) RW┐│
-     │                                 Permit User-Mode Access - u┐││
-     │                             Page-level Write-Through - PWT┐│││
-     │                            Page-level Cache Disable - PCD┐││││
-     │                          Set if has been read - Accessed┐│││││
-     │                         Set if has been written - Dirty┐││││││
-     │                   IsPage (if PDPTE/PDE) or PAT (if PT)┐│││││││
-     │        (If this maps 2MB/1GB page and CR4.PGE) Global┐││││││││
-     │      (If IsPage 2MB/1GB, see Intel V3A § 11.12) PAT  │││││││││
-     │                                                  │   │││││││││
-     │             ┌────────────────────────────────────┤   │││││││││
-     │   Must Be 0┐│ Next Page Table Address (!IsPage)  │   │││││││││
-     │            │├────────────────────────────────────┤   │││││││││
-     │            ││ Physical Address 4KB               │   │││││││││
-     │┌───┐┌─────┐│├───────────────────────────┐        │ign│││││││││
-     ││PKE││ ign │││ Physical Address 2MB      │        │┌┴┐│││││││││
-     ││   ││     ││├──────────────────┐        │        ││ ││││││││││
-     ││   ││     │││ Phys. Addr. 1GB  │        │        ││ ││││││││││
-     ││   ││     │││                  │        │        ││ ││││││││││
-     6666555555555544444444443333333333222222222211111111110000000000
-     3210987654321098765432109876543210987654321098765432109876543210*/
-#define PAGE_V   /*                                    */ 0b000000001
-#define PAGE_RW  /*                                    */ 0b000000010
-#define PAGE_U   /*                                    */ 0b000000100
-#define PAGE_4KB /*                                    */ 0b010000000
-#define PAGE_2MB /*                                    */ 0b110000000
-#define PAGE_1GB /*                                    */ 0b110000000
-#define PAGE_TA  0b11111111111111111111111111111111111111000000000000
-#define PAGE_PA2 0b11111111111111111111111111111000000000000000000000
-#define PAGE_XD  0x8000000000000000
-
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-#include "ape/config.h"
-
-struct thatispacked GlobalDescriptorTable {
-  uint16_t size;
-  uint64_t *entries;
-};
-
-/**
- * Memory hole map.
- * @see wiki.osdev.org/Detecting_Memory_(x86)
- * @since 2002
- */
-struct SmapEntry {
-  uint64_t addr;
-  uint64_t size;
-  enum {
-    kMemoryUsable = 1,
-    kMemoryUnusable = 2,
-    kMemoryAcpiReclaimable = 3,
-    kMemoryAcpiNvs = 4,
-    kMemoryBad = 5
-  } type;
-  uint32_t __acpi3; /* is abstracted */
-};
-
-struct IdtDescriptor {
-  uint16_t offset_1; /* offset bits 0..15 */
-  uint16_t selector; /* a code segment selector in GDT or LDT */
-  uint8_t ist;       /* bits 0..2 hold stack table offset, rest are zero */
-  uint8_t type_attr; /* type and attributes */
-  uint16_t offset_2; /* offset bits 16..31 */
-  uint32_t offset_3; /* offset bits 32..63 */
-  uint32_t zero;     /* reserved */
-};
-
-struct thatispacked PageTable {
-  uint64_t p[512];
-} forcealign(PAGESIZE);
-
-extern struct PageTable g_pml4t;
-extern struct GlobalDescriptorTable gdt;
-
-extern const unsigned char kBiosDataArea[256];
-extern const unsigned char kBiosDataAreaXlm[256];
-
-extern struct SmapEntry e820map[XLM_E820_SIZE / sizeof(struct SmapEntry)];
-extern struct SmapEntry e820map_xlm[XLM_E820_SIZE / sizeof(struct SmapEntry)];
-
-extern uint64_t g_ptsp;
-extern uint64_t g_ptsp_xlm;
-
-void bootdr(char drive) wontreturn;
-
-void smapsort(struct SmapEntry *);
-uint64_t *__getpagetableentry(int64_t, unsigned, struct PageTable *,
-                              uint64_t *);
-void flattenhighmemory(struct SmapEntry *, struct PageTable *, uint64_t *);
-void pageunmap(int64_t);
-
-forceinline unsigned long eflags(void) {
-  unsigned long res;
-  asm("pushf\n\t"
-      "pop\t%0"
-      : "=rm"(res));
-  return res;
-}
-
-forceinline unsigned char inb(unsigned short port) {
-  unsigned char al;
-  asm volatile("inb\t%1,%0" : "=a"(al) : "dN"(port));
-  return al;
-}
-
-forceinline void outb(unsigned short port, unsigned char byte) {
-  asm volatile("outb\t%0,%1"
-               : /* no inputs */
-               : "a"(byte), "dN"(port));
-}
-
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* APE_LIB_PC_H_ */

ape/lib/smapsort.c

@@ -1,46 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "ape/lib/pc.h"
-
-textreal static unsigned smapcount(const struct SmapEntry *se) {
-  unsigned i = 0;
-  while (se[i].size) ++i;
-  return i;
-}
-
-textreal static void smapsorter(size_t n, struct SmapEntry a[n]) {
-  struct SmapEntry t;
-  unsigned i, j;
-  for (i = 1; i < n; ++i) {
-    j = i;
-    t = a[i];
-    while (j > 0 && (intptr_t)t.addr - (intptr_t)a[j - 1].addr) {
-      a[j] = a[j - 1];
-      --j;
-    }
-    a[j] = t;
-  }
-}
-
-/**
- * Sorts BIOS e820 memory map.
- */
-textreal void smapsort(struct SmapEntry *smap) {
-  smapsorter(smapcount(smap), smap);
-}

ape/loader-elf.S

@@ -0,0 +1,249 @@
+/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
+│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/elf/def.h"
+#include "libc/sysv/consts/prot.h"
+#include "libc/macho.internal.h"
+#include "libc/dce.h"
+#include "libc/macros.internal.h"
+
+//	APE Loader Executable Structure
+//	Linux, FreeBSD, NetBSD, OpenBSD
+
+	.align	8
+ehdr:	.ascii	"\177ELF"
+	.byte	ELFCLASS64
+	.byte	ELFDATA2LSB
+	.byte	1
+	.byte	ELFOSABI_FREEBSD
+	.quad	0
+	.word	ET_EXEC			# e_type
+	.word	EM_NEXGEN32E		# e_machine
+	.long	1			# e_version
+	.quad	_start			# e_entry
+	.quad	phdrs - ehdr		# e_phoff
+	.quad	0			# e_shoff
+	.long	0			# e_flags
+	.word	64			# e_ehsize
+	.word	56			# e_phentsize
+	.word	4			# e_phnum
+	.word	0			# e_shentsize
+	.word	0			# e_shnum
+	.word	0			# e_shstrndx
+	.endobj	ehdr,globl
+
+	.align	8
+phdrs:	.long	PT_LOAD			# p_type
+	.long	PF_R|PF_X		# p_flags
+	.quad	0			# p_offset
+	.quad	ehdr			# p_vaddr
+	.quad	ehdr			# p_paddr
+	.quad	filesz			# p_filesz
+	.quad	filesz			# p_memsz
+	.quad	PAGESIZE		# p_align
+
+	.long	PT_LOAD			# p_type
+	.long	PF_R|PF_W		# p_flags
+	.quad	0			# p_offset
+	.quad	bss			# p_vaddr
+	.quad	bss			# p_paddr
+	.quad	0			# p_filesz
+	.quad	bsssize			# p_memsz
+	.quad	PAGESIZE		# p_align
+
+	.long	PT_GNU_STACK		# p_type
+	.long	PF_R|PF_W		# p_flags
+	.quad	0			# p_offset
+	.quad	0			# p_vaddr
+	.quad	0			# p_paddr
+	.quad	0			# p_filesz
+	.quad	0			# p_memsz
+	.quad	16			# p_align
+
+	.long	PT_NOTE			# p_type
+	.long	PF_R			# p_flags
+	.quad	note - ehdr		# p_offset
+	.quad	note			# p_vaddr
+	.quad	note			# p_paddr
+	.quad	notesize		# p_filesz
+	.quad	notesize		# p_memsz
+	.quad	8			# p_align
+	.endobj	phdrs
+
+note:	.long	2f-1f
+	.long	4f-3f
+	.long	1
+1:	.asciz	"OpenBSD"
+2:	.align	4
+3:	.long	0
+4:	.long	2f-1f
+	.long	4f-3f
+	.long	1
+1:	.asciz	"NetBSD"
+2:	.align	4
+3:	.long	901000000
+4:	.endobj	note
+	notesize = . - note
+
+	.align	64,0				# for ape.S dd
+	.org	0x180				# for ape.S dd
+
+//	APE Loader XNU Header
+//
+//	This header is dd'd backwards by the APE shell script when
+//	running on Mac OS X.
+//
+//	@see	ape/ape.S
+macho:	.long	0xFEEDFACE+1
+	.long	MAC_CPU_NEXGEN32E
+	.long	MAC_CPU_NEXGEN32E_ALL
+	.long	MAC_EXECUTE
+	.long	5				# number of load commands
+	.long	60f-10f				# size of all load commands
+	.long	MAC_NOUNDEFS			# flags
+	.long	0				# reserved
+10:	.long	MAC_LC_SEGMENT_64
+	.long	20f-10b				# unmaps first page dir
+	.ascin	"__PAGEZERO",16			# consistent with linux
+	.quad	0,0x200000,0,0			# which forbids mem <2m
+	.long	0,0,0,0
+20:	.long	MAC_LC_SEGMENT_64
+	.long	30f-20b
+	.ascin	"__TEXT",16
+	.quad	ehdr				# vaddr
+	.quad	4096				# memsz
+	.quad	0				# file offset
+	.quad	filesz				# file size
+	.long	PROT_EXEC|PROT_READ|PROT_WRITE	# maxprot
+	.long	PROT_EXEC|PROT_READ		# initprot
+	.long	1				# segment section count
+	.long	0				# flags
+210:	.ascin	"__text",16			# section name (.text)
+	.ascin	"__TEXT",16
+	.quad	_start				# vaddr
+	.quad	textsz				# memsz
+	.long	textoff				# offset
+	.long	6				# align 2**6 = 64
+	.long	0				# reloc table offset
+	.long	0				# relocation count
+	.long	MAC_S_ATTR_SOME_INSTRUCTIONS	# section type & attributes
+	.long	0,0,0				# reserved
+30:	.long	MAC_LC_SEGMENT_64
+	.long	40f-30b
+	.ascin	"__DATA",16
+	.quad	bss				# vaddr
+	.quad	bsssize				# memsz
+	.quad	0				# offset
+	.quad	0				# file size
+	.long	PROT_EXEC|PROT_READ|PROT_WRITE	# maxprot
+	.long	PROT_READ|PROT_WRITE		# initprot
+	.long	1				# segment section count
+	.long	0				# flags
+310:	.ascin	"__bss",16			# section name (.bss)
+	.ascin	"__DATA",16
+	.quad	bss				# vaddr
+	.quad	bsssize				# memsz
+	.long	0				# offset
+	.long	12				# align 2**12 = 4096
+	.long	0				# reloc table offset
+	.long	0				# relocation count
+	.long	MAC_S_ZEROFILL			# section type & attributes
+	.long	0,0,0				# reserved
+40:	.long	MAC_LC_UUID
+	.long	50f-40b
+	.quad	0x3fb29ee4ac6c87aa		# uuid1
+	.quad	0xdd2c9bb866d9eef8		# uuid2
+50:	.long	MAC_LC_UNIXTHREAD
+	.long	60f-50b				# cmdsize
+	.long	MAC_THREAD_NEXGEN32E		# flavaflav
+	.long	(520f-510f)/4			# count
+510:	.quad	0				# rax
+	.quad	0				# rbx
+	.quad	0				# rcx
+	.quad	XNU				# rdx
+	.quad	0				# rdi
+	.quad	0				# rsi
+	.quad	0				# rbp
+	.quad	0				# rsp
+	.quad	0				# r8
+	.quad	0				# r9
+	.quad	0				# r10
+	.quad	0				# r11
+	.quad	0				# r12
+	.quad	0				# r13
+	.quad	0				# r14
+	.quad	0				# r15
+	.quad	_start				# rip
+	.quad	0				# rflags
+	.quad	0				# cs
+	.quad	0				# fs
+	.quad	0				# gs
+520:
+60:
+	.endobj	macho
+
+	.align	64,0				# for ape.S dd
+	.org	0x400				# for ape.S dd
+
+//	Ape Loader Entrpoint
+//
+//	This is normally called by the operating system. However it may
+//	be called by the Actually Portable Executables themselves, when
+//	re-executing a program. Just do this:
+//
+//	    memcpy(0x200000, loader)
+//	    lea handoff(%rip),%rcx
+//	    lea argblock(%rip),%rsp
+//	    jmp 0x200400
+//
+//	@see	APE_LOADER_ENTRY
+//	@see	ape/loader.h
+_start:
+
+//	Hack for detecting M1 Rosetta environment.
+//	https://github.com/jart/cosmopolitan/issues/429#issuecomment-1166704377
+	cmp	$-1,%ebx
+	jne	0f
+	cmp	$+1,%edx
+	jne	0f
+	mov	$XNU,%dl
+	xor	%ecx,%ecx
+
+0:	mov	%rsp,%rsi
+	jmp	ApeLoader
+	.endfn	_start,globl
+
+//	System Call Entrpoint
+//
+//	This function is used by the APE loader to make system calls.
+//	We also pass a reference to this function to the APE binary's
+//	_start() function. It's needed because on OpenBSD, msyscall()
+//	restricts which pages can issue system calls, and it can only
+//	be called once. Therefore if we want to be load and re-load a
+//	binary multiple times without calling the system execve(), we
+//	need to be able to handover the SYSCALL function. We hardcode
+//	this to a fixed address, but that shouldn't be used, since we
+//	would ideally want to move it to a random page in the future.
+__syscall_loader:
+	clc
+	syscall
+	jc	1f
+	ret
+1:	neg	%rax
+	ret
+	.endfn	__syscall_loader,globl

ape/loader-macho.S

@@ -0,0 +1,138 @@
+/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
+│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/macho.internal.h"
+#include "libc/sysv/consts/prot.h"
+#include "libc/dce.h"
+#include "libc/macros.internal.h"
+
+//	APE Loader Executable Structure for XNU
+
+	.align	4096
+macho:	.long	0xFEEDFACE+1
+	.long	MAC_CPU_NEXGEN32E
+	.long	MAC_CPU_NEXGEN32E_ALL
+	.long	MAC_EXECUTE
+	.long	5				# number of load commands
+	.long	60f-10f				# size of all load commands
+	.long	MAC_NOUNDEFS			# flags
+	.long	0				# reserved
+10:	.long	MAC_LC_SEGMENT_64
+	.long	20f-10b				# unmaps first page dir
+	.ascin	"__PAGEZERO",16			# consistent with linux
+	.quad	0,0x200000,0,0			# which forbids mem <2m
+	.long	0,0,0,0
+20:	.long	MAC_LC_SEGMENT_64
+	.long	30f-20b
+	.ascin	"__TEXT",16
+	.quad	macho				# vaddr
+	.quad	4096				# memsz
+	.quad	0				# file offset
+	.quad	filesz				# file size
+	.long	PROT_EXEC|PROT_READ|PROT_WRITE	# maxprot
+	.long	PROT_EXEC|PROT_READ		# initprot
+	.long	1				# segment section count
+	.long	0				# flags
+210:	.ascin	"__text",16			# section name (.text)
+	.ascin	"__TEXT",16
+	.quad	_start				# vaddr
+	.quad	textsz				# memsz
+	.long	textoff				# offset
+	.long	6				# align 2**3 = 64
+	.long	0				# reloc table offset
+	.long	0				# relocation count
+	.long	MAC_S_ATTR_SOME_INSTRUCTIONS	# section type & attributes
+	.long	0,0,0				# reserved
+30:	.long	MAC_LC_SEGMENT_64
+	.long	40f-30b
+	.ascin	"__DATA",16
+	.quad	bss				# vaddr
+	.quad	bsssize				# memsz
+	.quad	0				# offset
+	.quad	0				# file size
+	.long	PROT_EXEC|PROT_READ|PROT_WRITE	# maxprot
+	.long	PROT_READ|PROT_WRITE		# initprot
+	.long	1				# segment section count
+	.long	0				# flags
+310:	.ascin	"__bss",16			# section name (.bss)
+	.ascin	"__DATA",16
+	.quad	bss				# vaddr
+	.quad	bsssize				# memsz
+	.long	0				# offset
+	.long	12				# align 2**12 = 4096
+	.long	0				# reloc table offset
+	.long	0				# relocation count
+	.long	MAC_S_ZEROFILL			# section type & attributes
+	.long	0,0,0				# reserved
+40:	.long	MAC_LC_UUID
+	.long	50f-40b
+	.quad	0x3fb29ee4ac6c87aa		# uuid1
+	.quad	0xdd2c9bb866d9eef8		# uuid2
+50:	.long	MAC_LC_UNIXTHREAD
+	.long	60f-50b				# cmdsize
+	.long	MAC_THREAD_NEXGEN32E		# flavaflav
+	.long	(520f-510f)/4			# count
+510:	.quad	0				# rax
+	.quad	0				# rbx
+	.quad	0				# rcx
+	.quad	XNU				# rdx
+	.quad	0				# rdi
+	.quad	0				# rsi
+	.quad	0				# rbp
+	.quad	0				# rsp
+	.quad	0				# r8
+	.quad	0				# r9
+	.quad	0				# r10
+	.quad	0				# r11
+	.quad	0				# r12
+	.quad	0				# r13
+	.quad	0				# r14
+	.quad	0				# r15
+	.quad	_start				# rip
+	.quad	0				# rflags
+	.quad	0				# cs
+	.quad	0				# fs
+	.quad	0				# gs
+520:
+60:
+	.endobj	macho,globl
+
+	.align	64
+_start:
+
+//	Hack for detecting M1 Rosetta environment.
+//	https://github.com/jart/cosmopolitan/issues/429#issuecomment-1166704377
+	cmp	$-1,%ebx
+	jne	0f
+	cmp	$+1,%edx
+	jne	0f
+	mov	$XNU,%dl
+	xor	%ecx,%ecx
+
+0:	mov	%rsp,%rsi
+	jmp	ApeLoader
+	.endfn	_start,globl
+
+__syscall_loader:
+	clc
+	syscall
+	jc	1f
+	ret
+1:	neg	%rax
+	ret
+	.endfn	__syscall_loader,globl

ape/loader-macho.lds

@@ -0,0 +1,42 @@
+/*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
+│vi: set et sts=2 tw=2 fenc=utf-8                                           :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 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.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+ENTRY(_start)
+
+SECTIONS {
+  . = 0x200000;
+  .text : {
+    *(.text)
+    *(.rodata .rodata.*)
+    . = ALIGN(4096);
+  }
+  filesz = . - macho;
+  textsz = . - _start;
+  .bss ALIGN(4096) : {
+    bss = .;
+    *(.bss)
+    . = ALIGN(4096);
+  }
+  memsz = . - macho;
+  /DISCARD/ : {
+    *(.*)
+  }
+}
+
+bsssize = SIZEOF(.bss);
+textoff = _start - macho;

ape/loader.c

@@ -0,0 +1,791 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ 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 "ape/loader.h"
+
+#define SET_EXE_FILE    0 /* needs root ;_; */
+#define TROUBLESHOOT    0
+#define TROUBLESHOOT_OS LINUX
+
+/**
+ * @fileoverview APE Loader for GNU/Systemd/XNU/FreeBSD/NetBSD/OpenBSD
+ *
+ * We recommend using the normal APE design, where binaries assimilate
+ * themselves once by self-modifying the first 64 bytes. If that can't
+ * meet your requirements then we provide an excellent alternative.
+ *
+ *     m=tiny
+ *     make -j8 MODE=$m o/$m/ape o/$m/examples/printargs.com
+ *     o/$m/ape/ape.elf o/$m/examples/printargs.com
+ *
+ * This is an embeddable Actually Portable Executable interpreter. The
+ * `ape/ape.S` bootloader embeds this binary inside each binary that's
+ * linked using `$(APE_NO_MODIFY_SELF)` so it is an automated seamless
+ * process. the shell script at the top of the .COM files will copy it
+ * to `${TMPDIR:-${HOME:-.}}/.ape` and call execve(). It's a zero copy
+ * operation in praxis since this payload uses mmap() to load the rest
+ * of your executable the same way the kernel does, based on ELF phdrs
+ * which are located in accordance with the first sh printf statement.
+ *
+ * APE executables will look for this program on the system path first
+ * so your APE loader may be installed to your system as follows:
+ *
+ *     m=tiny
+ *     make -j8 MODE=$m o/$m/ape/ape.elf
+ *     sudo cp o/$m/ape/ape.elf /usr/bin/ape
+ *
+ * For Mac OS X systems you should install the `ape.macho` executable:
+ *
+ *     sudo cp o/$m/ape/ape.macho /usr/bin/ape
+ *
+ * Your APE loader may be used as a shebang interpreter by doing this:
+ *
+ *     #!/usr/bin/ape python.com
+ *     # -*- python -*-
+ *     print("hello world")
+ *
+ * However you won't need to do that, if your APE Loader is registered
+ * as a binfmt_misc interpreter. You can do that as follows with root:
+ *
+ *     sudo cp -f o/$m/ape/ape.elf /usr/bin
+ *     f=/proc/sys/fs/binfmt_misc/register
+ *     sudo sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >$f"
+ *
+ * If the register file doesn't exist on your Linux machine then you'd
+ * load it using the following commands:
+ *
+ *     sudo modprobe binfmt_misc
+ *     sudo mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+ *
+ * You should now experience a performance boost, and you can also now
+ * use the regular shebang form:
+ *
+ *     #!/usr/bin/python.com
+ *     # -*- python -*-
+ *     print("hello world")
+ *
+ * @note this can probably be used as a binfmt_misc interpreter
+ */
+
+#define LINUX   1
+#define XNU     8
+#define OPENBSD 16
+#define FREEBSD 32
+#define NETBSD  64
+
+#define SupportsLinux()   (SUPPORT_VECTOR & LINUX)
+#define SupportsXnu()     (SUPPORT_VECTOR & XNU)
+#define SupportsFreebsd() (SUPPORT_VECTOR & FREEBSD)
+#define SupportsOpenbsd() (SUPPORT_VECTOR & OPENBSD)
+#define SupportsNetbsd()  (SUPPORT_VECTOR & NETBSD)
+
+#define IsLinux()   (SupportsLinux() && os == LINUX)
+#define IsXnu()     (SupportsXnu() && os == XNU)
+#define IsFreebsd() (SupportsFreebsd() && os == FREEBSD)
+#define IsOpenbsd() (SupportsOpenbsd() && os == OPENBSD)
+#define IsNetbsd()  (SupportsNetbsd() && os == NETBSD)
+
+#define O_RDONLY           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 AT_EXECFN_LINUX    31
+#define AT_EXECFN_NETBSD   2014
+#define ELFCLASS64         2
+#define ELFDATA2LSB        1
+#define EM_NEXGEN32E       62
+#define ET_EXEC            2
+#define PT_LOAD            1
+#define PT_DYNAMIC         2
+#define EI_CLASS           4
+#define EI_DATA            5
+#define PF_X               1
+#define PF_W               2
+#define PF_R               4
+#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 Read32(S)                                                      \
+  ((unsigned)(255 & (S)[3]) << 030 | (unsigned)(255 & (S)[2]) << 020 | \
+   (unsigned)(255 & (S)[1]) << 010 | (unsigned)(255 & (S)[0]) << 000)
+
+#define Read64(S)                         \
+  ((unsigned long)(255 & (S)[7]) << 070 | \
+   (unsigned long)(255 & (S)[6]) << 060 | \
+   (unsigned long)(255 & (S)[5]) << 050 | \
+   (unsigned long)(255 & (S)[4]) << 040 | \
+   (unsigned long)(255 & (S)[3]) << 030 | \
+   (unsigned long)(255 & (S)[2]) << 020 | \
+   (unsigned long)(255 & (S)[1]) << 010 | \
+   (unsigned long)(255 & (S)[0]) << 000)
+
+struct PathSearcher {
+  char os;
+  unsigned long namelen;
+  const char *name;
+  const char *syspath;
+  char path[1024];
+};
+
+struct ElfEhdr {
+  unsigned char e_ident[16];
+  unsigned short e_type;
+  unsigned short e_machine;
+  unsigned e_version;
+  unsigned long e_entry;
+  unsigned long e_phoff;
+  unsigned long e_shoff;
+  unsigned e_flags;
+  unsigned short e_ehsize;
+  unsigned short e_phentsize;
+  unsigned short e_phnum;
+  unsigned short e_shentsize;
+  unsigned short e_shnum;
+  unsigned short e_shstrndx;
+};
+
+struct ElfPhdr {
+  unsigned p_type;
+  unsigned p_flags;
+  unsigned long p_offset;
+  unsigned long p_vaddr;
+  unsigned long p_paddr;
+  unsigned long p_filesz;
+  unsigned long p_memsz;
+  unsigned long p_align;
+};
+
+extern char ehdr[];
+extern char _end[];
+static void *syscall;
+static char relocated;
+static struct PathSearcher ps;
+extern char __syscall_loader[];
+
+static int ToLower(int c) {
+  return 'A' <= c && c <= 'Z' ? c + ('a' - 'A') : c;
+}
+
+char *MemCpy(char *d, const char *s, unsigned long n) {
+  unsigned long i = 0;
+  for (; i < n; ++i) d[i] = s[i];
+  return d + n;
+}
+
+static unsigned long StrLen(const char *s) {
+  unsigned long n = 0;
+  while (*s++) ++n;
+  return n;
+}
+
+static const char *MemChr(const char *s, unsigned char c, unsigned long n) {
+  for (; n; --n, ++s) {
+    if ((*s & 255) == c) {
+      return s;
+    }
+  }
+  return 0;
+}
+
+static char *GetEnv(char **p, const char *s) {
+  unsigned long i, j;
+  if (p) {
+    for (i = 0; p[i]; ++i) {
+      for (j = 0;; ++j) {
+        if (!s[j]) {
+          if (p[i][j] == '=') {
+            return p[i] + j + 1;
+          }
+          break;
+        }
+        if (s[j] != p[i][j]) {
+          break;
+        }
+      }
+    }
+  }
+  return 0;
+}
+
+static char *Utoa(char p[21], unsigned long x) {
+  char t;
+  unsigned long 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 *Itoa(char p[21], long x) {
+  if (x < 0) *p++ = '-', x = -(unsigned long)x;
+  return Utoa(p, x);
+}
+
+#if TROUBLESHOOT
+const char *DescribeOs(int os) {
+  if (IsLinux()) {
+    return "GNU/SYSTEMD";
+  } else if (IsXnu()) {
+    return "XNU";
+  } else if (IsFreebsd()) {
+    return "FREEBSD";
+  } else if (IsOpenbsd()) {
+    return "OPENBSD";
+  } else if (IsNetbsd()) {
+    return "NETBSD";
+  } else {
+    return "WUT";
+  }
+}
+#endif
+
+__attribute__((__noreturn__)) static void Exit(int rc, int os) {
+  asm volatile("call\t*%2"
+               : /* no outputs */
+               : "a"((IsLinux() ? 60 : 1) | (IsXnu() ? 0x2000000 : 0)), "D"(rc),
+                 "rm"(syscall)
+               : "memory");
+  __builtin_unreachable();
+}
+
+static void Close(int fd, int os) {
+  int ax, di;
+  asm volatile("call\t*%4"
+               : "=a"(ax), "=D"(di)
+               : "0"((IsLinux() ? 3 : 6) | (IsXnu() ? 0x2000000 : 0)), "1"(fd),
+                 "rm"(syscall)
+               : "rcx", "rdx", "rsi", "r8", "r9", "r10", "r11", "memory", "cc");
+}
+
+static int Read(int fd, void *data, int size, int os) {
+  long si;
+  int ax, di, dx;
+  asm volatile("call\t*%8"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx)
+               : "0"((IsLinux() ? 0 : 3) | (IsXnu() ? 0x2000000 : 0)), "1"(fd),
+                 "2"(data), "3"(size), "rm"(syscall)
+               : "rcx", "r8", "r9", "r10", "r11", "memory");
+  return ax;
+}
+
+static void Write(int fd, const void *data, int size, int os) {
+  long si;
+  int ax, di, dx;
+  asm volatile("call\t*%8"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx)
+               : "0"((IsLinux() ? 1 : 4) | (IsXnu() ? 0x2000000 : 0)), "1"(fd),
+                 "2"(data), "3"(size), "rm"(syscall)
+               : "rcx", "r8", "r9", "r10", "r11", "memory", "cc");
+}
+
+static void Execve(const char *prog, char **argv, char **envp, int os) {
+  long ax, di, si, dx;
+  asm volatile("call\t*%8"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx)
+               : "0"(59 | (IsXnu() ? 0x2000000 : 0)), "1"(prog), "2"(argv),
+                 "3"(envp), "rm"(syscall)
+               : "rcx", "r8", "r9", "r10", "r11", "memory", "cc");
+}
+
+static int Access(const char *path, int mode, int os) {
+  int ax, si;
+  long dx, di;
+  asm volatile("call\t*%7"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx)
+               : "0"((IsLinux() ? 21 : 33) | (IsXnu() ? 0x2000000 : 0)),
+                 "1"(path), "2"(mode), "rm"(syscall)
+               : "rcx", "r8", "r9", "r10", "r11", "memory", "cc");
+  return ax;
+}
+
+static int Msyscall(long p, long n, int os) {
+  int ax;
+  long di, si;
+  if (!IsOpenbsd()) {
+    return 0;
+  } else {
+    asm volatile("call\t*%6"
+                 : "=a"(ax), "=D"(di), "=S"(si)
+                 : "0"(37), "1"(p), "2"(n), "rm"(syscall)
+                 : "rcx", "rdx", "r8", "r9", "r10", "r11", "memory", "cc");
+    return ax;
+  }
+}
+
+static int Open(const char *path, int flags, int mode, int os) {
+  long di;
+  int ax, dx, si;
+  asm volatile("call\t*%8"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx)
+               : "0"((IsLinux() ? 2 : 5) | (IsXnu() ? 0x2000000 : 0)),
+                 "1"(path), "2"(flags), "3"(mode), "rm"(syscall)
+               : "rcx", "r8", "r9", "r10", "r11", "memory", "cc");
+  return ax;
+}
+
+__attribute__((__noinline__)) static long Mmap(long addr, long size, int prot,
+                                               int flags, int fd, long off,
+                                               int os) {
+  long ax, di, si, dx;
+  register int flags_ asm("r10") = flags;
+  register int fd_ asm("r8") = fd;
+  register long off_ asm("r9") = off;
+  asm volatile("push\t%%r9\n\t"
+               "push\t%%r9\n\t"
+               "call\t*%7\n\t"
+               "pop\t%%r9\n\t"
+               "pop\t%%r9"
+               : "=a"(ax), "=D"(di), "=S"(si), "=d"(dx), "+r"(flags_),
+                 "+r"(fd_), "+r"(off_)
+               : "rm"(syscall),
+                 "0"((IsLinux()     ? 9
+                      : IsFreebsd() ? 477
+                                    : 197) |
+                     (IsXnu() ? 0x2000000 : 0)),
+                 "1"(addr), "2"(size), "3"(prot)
+               : "rcx", "r11", "memory", "cc");
+  return ax;
+}
+
+static int MunmapLinux(const void *addr, unsigned long size) {
+  int ax;
+  asm volatile("syscall"
+               : "=a"(ax)
+               : "0"(11), "D"(addr), "S"(size)
+               : "rcx", "r11", "memory");
+  return ax;
+}
+
+static int PrctlLinux(int op, long a, long b, long c, long d) {
+  int rc;
+  asm volatile("mov\t%5,%%r10\n\t"
+               "mov\t%6,%%r8\n\t"
+               "syscall"
+               : "=a"(rc)
+               : "0"(157), "D"(op), "S"(a), "d"(b), "g"(c), "g"(d)
+               : "rcx", "r8", "r10", "r11", "memory");
+  return rc;
+}
+
+static void Emit(int os, const char *s) {
+  Write(2, s, StrLen(s), os);
+}
+
+static void Perror(int os, const char *c, int rc, const char *s) {
+  char ibuf[21];
+  Emit(os, "ape error: ");
+  Emit(os, c);
+  Emit(os, ": ");
+  Emit(os, s);
+  if (rc) {
+    Emit(os, " failed errno=");
+    Itoa(ibuf, -rc);
+    Emit(os, ibuf);
+  }
+  Emit(os, "\n");
+}
+
+__attribute__((__noreturn__)) static void Pexit(int os, const char *c, int rc,
+                                                const char *s) {
+  Perror(os, c, rc, s);
+  Exit(127, os);
+}
+
+static int StrCmp(const char *l, const char *r) {
+  unsigned long i = 0;
+  while (l[i] == r[i] && r[i]) ++i;
+  return (l[i] & 255) - (r[i] & 255);
+}
+
+static char EndsWithIgnoreCase(const char *p, unsigned long n, const char *s) {
+  unsigned long i, m;
+  if (n >= (m = StrLen(s))) {
+    for (i = n - m; i < n; ++i) {
+      if (ToLower(p[i]) != *s++) {
+        return 0;
+      }
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+static char IsComPath(struct PathSearcher *ps) {
+  return EndsWithIgnoreCase(ps->name, ps->namelen, ".com") ||
+         EndsWithIgnoreCase(ps->name, ps->namelen, ".exe") ||
+         EndsWithIgnoreCase(ps->name, ps->namelen, ".com.dbg");
+}
+
+static char AccessCommand(struct PathSearcher *ps, const char *suffix,
+                          unsigned long pathlen) {
+  unsigned long suffixlen;
+  suffixlen = StrLen(suffix);
+  if (pathlen + 1 + ps->namelen + suffixlen + 1 > sizeof(ps->path)) return 0;
+  if (pathlen && ps->path[pathlen - 1] != '/') ps->path[pathlen++] = '/';
+  MemCpy(ps->path + pathlen, ps->name, ps->namelen);
+  MemCpy(ps->path + pathlen + ps->namelen, suffix, suffixlen + 1);
+  return !Access(ps->path, X_OK, ps->os);
+}
+
+static char SearchPath(struct PathSearcher *ps, const char *suffix) {
+  const char *p;
+  unsigned long i;
+  for (p = ps->syspath;;) {
+    for (i = 0; p[i] && p[i] != ':'; ++i) {
+      if (i < sizeof(ps->path)) {
+        ps->path[i] = p[i];
+      }
+    }
+    if (AccessCommand(ps, suffix, i)) {
+      return 1;
+    } else if (p[i] == ':') {
+      p += i + 1;
+    } else {
+      return 0;
+    }
+  }
+}
+
+static char FindCommand(struct PathSearcher *ps, const char *suffix) {
+  if (MemChr(ps->name, '/', ps->namelen) ||
+      MemChr(ps->name, '\\', ps->namelen)) {
+    ps->path[0] = 0;
+    return AccessCommand(ps, suffix, 0);
+  } else {
+    if (AccessCommand(ps, suffix, 0)) return 1;
+  }
+  return SearchPath(ps, suffix);
+}
+
+static char *Commandv(struct PathSearcher *ps, int os, const char *name,
+                      const char *syspath) {
+  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, "") || (!IsComPath(ps) && FindCommand(ps, ".com"))) {
+    return ps->path;
+  } else {
+    return 0;
+  }
+}
+
+__attribute__((__noreturn__)) static void Spawn(int os, const char *exe, int fd,
+                                                long *sp, char *page,
+                                                struct ElfEhdr *e) {
+  long rc;
+  unsigned long i;
+  int prot, flags;
+  struct ElfPhdr *p;
+  long code, codesize;
+  if (e->e_type != ET_EXEC) {
+    Pexit(os, exe, 0, "ELF e_type != ET_EXEC");
+  }
+  if (e->e_machine != EM_NEXGEN32E) {
+    Pexit(os, exe, 0, "ELF e_machine != EM_NEXGEN32E");
+  }
+  if (e->e_ident[EI_CLASS] != ELFCLASS64) {
+    Pexit(os, exe, 0, "ELF e_ident[EI_CLASS] != ELFCLASS64");
+  }
+  if (e->e_ident[EI_DATA] != ELFDATA2LSB) {
+    Pexit(os, exe, 0, "ELF e_ident[EI_DATA] != ELFDATA2LSB");
+  }
+  if (e->e_phoff + e->e_phnum * sizeof(*p) > 0x1000) {
+    Pexit(os, exe, 0, "ELF phdrs need to be in first page");
+  }
+  code = 0;
+  codesize = 0;
+  for (p = (struct ElfPhdr *)(page + e->e_phoff), i = e->e_phnum; i--;) {
+    if (p[i].p_type == PT_DYNAMIC) {
+      Pexit(os, exe, 0, "not a real executable");
+    }
+    if (p[i].p_type != PT_LOAD) continue;
+    if ((p[i].p_vaddr | p[i].p_filesz | p[i].p_memsz | p[i].p_offset) & 0xfff) {
+      Pexit(os, exe, 0, "APE phdrs must be 4096-aligned and 4096-padded");
+    }
+    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;
+      code = p[i].p_vaddr;
+      codesize = p[i].p_filesz;
+    }
+    if (p[i].p_memsz > p[i].p_filesz) {
+      if ((rc = Mmap(p[i].p_vaddr + p[i].p_filesz, p[i].p_memsz - p[i].p_filesz,
+                     prot, flags | MAP_ANONYMOUS, -1, 0, os)) < 0) {
+        Pexit(os, exe, rc, "bss mmap()");
+      }
+    }
+    if (p[i].p_filesz) {
+      if ((rc = Mmap(p[i].p_vaddr, p[i].p_filesz, prot, flags, fd,
+                     p[i].p_offset, os)) < 0) {
+        Pexit(os, exe, rc, "image mmap()");
+      }
+    }
+  }
+  if (!code) {
+    Pexit(os, exe, 0, "ELF needs PT_LOAD phdr w/ PF_X");
+  }
+
+#if SET_EXE_FILE
+  // change /proc/pid/exe to new executable path
+  if (IsLinux() && relocated) {
+    MunmapLinux((char *)0x200000, (long)(_end - ehdr));
+    PrctlLinux(PR_SET_MM, PR_SET_MM_EXE_FILE, fd, 0, 0);
+  }
+#endif
+
+  if (relocated) {
+    int ax;
+    asm volatile("syscall"
+                 : "=a"(ax)
+                 : "0"(1), "D"(1), "S"("hello\n"), "d"(6)
+                 : "rcx", "r11", "memory");
+  }
+
+  Close(fd, os);
+
+  // authorize only the loaded program to issue system calls. if this
+  // fails, then we pass a link to our syscall function to the program
+  // since it probably means a userspace program executed this loader
+  // and passed us a custom syscall function earlier.
+  if (Msyscall(code, codesize, os) != -1) {
+    syscall = 0;
+  }
+
+#if TROUBLESHOOT
+  Emit(TROUBLESHOOT_OS, "preparing to jump\n");
+#endif
+
+  // we clear all the general registers we can to have some wiggle room
+  // to extend the behavior of this loader in the future. we don't need
+  // to clear the xmm registers since the ape loader should be compiled
+  // with the -mgeneral-regs-only flag.
+  register void *r8 asm("r8") = syscall;
+  asm volatile("xor\t%%eax,%%eax\n\t"
+               "xor\t%%r9d,%%r9d\n\t"
+               "xor\t%%r10d,%%r10d\n\t"
+               "xor\t%%r11d,%%r11d\n\t"
+               "xor\t%%ebx,%%ebx\n\t"    // netbsd doesnt't clear this
+               "xor\t%%r12d,%%r12d\n\t"  // netbsd doesnt't clear this
+               "xor\t%%r13d,%%r13d\n\t"  // netbsd doesnt't clear this
+               "xor\t%%r14d,%%r14d\n\t"  // netbsd doesnt't clear this
+               "xor\t%%r15d,%%r15d\n\t"  // netbsd doesnt't clear this
+               "mov\t%%rdx,%%rsp\n\t"
+               "xor\t%%edx,%%edx\n\t"
+               "push\t%%rsi\n\t"
+               "xor\t%%esi,%%esi\n\t"
+               "xor\t%%ebp,%%ebp\n\t"
+               "ret"
+               : /* no outputs */
+               : "D"(IsFreebsd() ? sp : 0), "S"(e->e_entry), "d"(sp), "c"(os),
+                 "r"(r8)
+               : "memory");
+  __builtin_unreachable();
+}
+
+__attribute__((__noreturn__)) void ApeLoader(long di, long *sp, char dl,
+                                             struct ApeLoader *handoff) {
+  int rc;
+  long *auxv;
+  struct ElfEhdr *eh;
+  int c, i, fd, os, argc;
+  char *p, *exe, *prog, **argv, **envp, *page;
+  static union {
+    struct ElfEhdr ehdr;
+    char p[0x1000];
+  } u;
+
+  // detect freebsd
+  if (handoff) {
+    os = handoff->os;
+  } else if (SupportsXnu() && dl == XNU) {
+    os = XNU;
+  } else if (SupportsFreebsd() && di) {
+    os = FREEBSD;
+    sp = (long *)di;
+  } else {
+    os = 0;
+  }
+
+  // extract arguments
+  argc = *sp;
+  argv = (char **)(sp + 1);
+  envp = (char **)(sp + 1 + argc + 1);
+  auxv = (long *)(sp + 1 + argc + 1);
+  for (;;) {
+    if (!*auxv++) {
+      break;
+    }
+  }
+
+  // get syscall function pointer
+  if (handoff && handoff->syscall) {
+    syscall = handoff->syscall;
+  } else {
+    syscall = __syscall_loader;
+  }
+
+  if (handoff) {
+    // we were called by ape_execve()
+    // no argument parsing is needed
+    // no path searching is needed
+    exe = handoff->prog;
+    fd = handoff->fd;
+    exe = handoff->prog;
+    page = handoff->page;
+    eh = (struct ElfEhdr *)handoff->page;
+  } else {
+
+    // detect openbsd
+    if (SupportsOpenbsd() && !os && !auxv[0]) {
+      os = OPENBSD;
+    }
+
+    // detect netbsd
+    if (SupportsNetbsd() && !os) {
+      for (; auxv[0]; auxv += 2) {
+        if (auxv[0] == AT_EXECFN_NETBSD) {
+          os = NETBSD;
+          break;
+        }
+      }
+    }
+
+    // default operating system
+    if (!os) {
+      os = LINUX;
+    }
+
+#if SET_EXE_FILE
+    if (IsLinux() && !relocated) {
+      char *b1 = (char *)0x200000;
+      char *b2 = (char *)0x300000;
+      void (*pApeLoader)(long, long *, char, struct ApeLoader *);
+      Mmap((long)b2, (long)(_end - ehdr), PROT_READ | PROT_WRITE | PROT_EXEC,
+           MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0, os);
+      relocated = 1;
+      MemCpy(b2, b1, (long)(_end - ehdr));
+      pApeLoader = (void *)((char *)&ApeLoader - b1 + b2);
+      pApeLoader(di, sp, dl, handoff);
+    }
+#endif
+
+    // we can load via shell, shebang, or binfmt_misc
+    if (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
+      // it's specified by ANSI X3.159-1988.
+      prog = (char *)sp[3];
+      argc = sp[3] = sp[0] - 3;
+      argv = (char **)((sp += 3) + 1);
+    } else if (argc < 2) {
+      Emit(os, "usage: ape   PROG [ARGV1,ARGV2,...]\n"
+               "       ape - PROG [ARGV0,ARGV1,...]\n"
+               "αcτµαlly pδrταblε εxεcµταblε loader v1.o\n"
+               "copyright 2022 justine alexandra roberts tunney\n"
+               "https://justine.lol/ape.html\n");
+      Exit(1, os);
+    } else {
+      prog = (char *)sp[2];
+      argc = sp[1] = sp[0] - 1;
+      argv = (char **)((sp += 1) + 1);
+    }
+
+    if (!(exe = Commandv(&ps, os, prog, GetEnv(envp, "PATH")))) {
+      Pexit(os, prog, 0, "not found (maybe chmod +x)");
+    } else if ((fd = Open(exe, O_RDONLY, 0, os)) < 0) {
+      Pexit(os, exe, fd, "open");
+    } else if ((rc = Read(fd, u.p, sizeof(u.p), os)) < 0) {
+      Pexit(os, exe, rc, "read");
+    } else if (rc != sizeof(u.p) && Read32(u.p) != Read32("\177ELF")) {
+      Pexit(os, exe, 0, "too small");
+    }
+
+    page = u.p;
+    eh = &u.ehdr;
+  }
+
+#if TROUBLESHOOT
+  Emit(TROUBLESHOOT_OS, "os = ");
+  Emit(TROUBLESHOOT_OS, DescribeOs(os));
+  Emit(TROUBLESHOOT_OS, "\n");
+  for (i = 0; i < argc; ++i) {
+    Emit(TROUBLESHOOT_OS, "argv = ");
+    Emit(TROUBLESHOOT_OS, argv[i]);
+    Emit(TROUBLESHOOT_OS, "\n");
+  }
+#endif
+
+  if ((IsXnu() && Read32(page) == 0xFEEDFACE + 1) ||
+      (!IsXnu() && Read32(page) == Read32("\177ELF"))) {
+    Close(fd, os);
+    Execve(exe, argv, envp, os);
+  }
+
+  // TODO(jart): Parse Mach-O for old APE binary support on XNU.
+  for (p = page; p < page + sizeof(u.p); ++p) {
+    if (Read64(p) != Read64("printf '")) continue;
+    for (i = 0, p += 8; p + 3 < page + sizeof(u.p) && (c = *p++) != '\'';) {
+      if (c == '\\') {
+        if ('0' <= *p && *p <= '7') {
+          c = *p++ - '0';
+          if ('0' <= *p && *p <= '7') {
+            c *= 8;
+            c += *p++ - '0';
+            if ('0' <= *p && *p <= '7') {
+              c *= 8;
+              c += *p++ - '0';
+            }
+          }
+        }
+      }
+      page[i++] = c;
+    }
+    if (i >= 64 && Read32(page) == Read32("\177ELF")) {
+      Spawn(os, exe, fd, sp, page, eh);
+    }
+  }
+
+  Pexit(os, exe, 0, "could not find printf elf in first page");
+}

ape/loader.h

@@ -0,0 +1,20 @@
+#ifndef COSMOPOLITAN_APE_LOADER_H_
+#define COSMOPOLITAN_APE_LOADER_H_
+
+#define APE_LOADER_BASE  0x200000
+#define APE_LOADER_SIZE  0x200000
+#define APE_LOADER_ENTRY 0x200400
+#define APE_LOADER_BSS   (PAGESIZE * 2)
+#define APE_LOADER_STACK 0x7f0000000000
+#define APE_BLOCK_BASE   0x7e0000000000
+#define APE_BLOCK_SIZE   0x000200000000
+
+struct ApeLoader {
+  int fd;
+  int os;
+  char *prog;
+  char *page;
+  void *syscall;
+};
+
+#endif /* COSMOPOLITAN_APE_LOADER_H_ */

ape/loader.lds

@@ -0,0 +1,43 @@
+/*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
+│vi: set et sts=2 tw=2 fenc=utf-8                                           :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 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.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+ENTRY(_start)
+
+SECTIONS {
+  . = 0x200000;
+  .text : {
+    *(.text)
+    *(.rodata .rodata.*)
+    . = ALIGN(64);
+  }
+  filesz = . - ehdr;
+  textsz = . - _start;
+  .bss ALIGN(4096) : {
+    bss = .;
+    *(.bss)
+    . = ALIGN(4096);
+  }
+  _end = .;
+  memsz = _end - ehdr;
+  /DISCARD/ : {
+    *(.*)
+  }
+}
+
+bsssize = SIZEOF(.bss);
+textoff = _start - ehdr;

ape/macros.internal.h

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #ifndef APE_MACROS_H_
 #define APE_MACROS_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */
 
@@ -26,13 +26,6 @@
  * @fileoverview Macros relevant to αcτµαlly pδrταblε εxεcµταblε.
  */
 
-//	Calls function in real mode.
-//	It's needed because LLVM 8 LLD doesn't support R_X86_64_PC16.
-	.macro	call16 name:req
-	mov	$REAL(\name),%ax
-	call	*%ax
-	.endm
-
 //	Calls near (i.e. pc+pcrel<64kB) FUNCTION.
 //	@mode	long,legacy,real
 //	@cost	9 bytes overhead
@@ -61,7 +54,7 @@
 	jmp	297f
 	.byte	0xbf			# mov $0x????xxxx,%edi
 	.long	\address
-297:	
+297:
 .endm
 
 //	Loads 16-bit CONSTEXPR into Qw-register w/ optional zero-extend.

ape/relocations.h

@@ -11,6 +11,8 @@
   In some cases it's necessary to use addend macros that change virtual
   addresses into the other two types: physical and real. */
 
+#define IMAGE_BASE_REAL 0x2000
+
 #ifndef IMAGE_BASE_VIRTUAL
 #define IMAGE_BASE_VIRTUAL 0x400000
 #endif
@@ -19,26 +21,6 @@
 #define IMAGE_BASE_PHYSICAL 0x100000
 #endif
 
-#ifndef REAL_SCRATCH_AREA
-/**
- * Location of anything goes memory for real mode.
- *
- * The MBR won't load program content beyond this address, so we have
- * room for buffers, page tables, etc. before we reach the stack frame.
- */
-#define REAL_SCRATCH_AREA 0x40000
-#endif
-
-#ifndef REAL_STACK_FRAME
-/**
- * Location of real mode 64kb stack frame.
- *
- * This address was chosen because memory beyond 0x80000 can't be
- * accessed safely without consulting e820.
- */
-#define REAL_STACK_FRAME 0x70000
-#endif
-
 /**
  * Returns Relative Virtual Address.
  */

build/actuallynice

@@ -1,29 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# SYNOPSIS
-#
-#   Program Deprioritizer
-#
-# OVERVIEW
-#
-#   This is a drop-in replacement for the traditional Unix `nice`
-#   command that also invokes `ionice`, which is important, since
-#   network and traffic is usually what clobber the system.
-
-if [ -z "$IONICE" ]; then
-  if IONICE=$(command -v ionice 2>/dev/null); then
-    IONICE="$IONICE -c3"
-  fi
-fi
-
-if [ -z "$NICE" ]; then
-  NICE=$(command -v nice 2>/dev/null)
-fi
-
-if [ -z "$IONICE$NICE" ]; then
-  echo "error: can't be nice" >&2
-fi
-
-exec $IONICE $NICE "$@"

build/archive

@@ -1,53 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Cosmopolitan Archiver
-#
-# DESCRIPTION
-#
-#   This goes 100x faster than ar and ranlib.
-#
-# EXAMPLE
-#
-#   build/archive rcsD library.a foo.o ...
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-if [ -x "o//tool/build/ar.com" ]; then
-  set -- "o//tool/build/ar.com" "$@"
-else
-  if [ ! -x o/build/bootstrap/ar.com ]; then
-    mkdir -p o/build/bootstrap &&
-      cp -f build/bootstrap/ar.com o/build/bootstrap/ar.com.$$ &&
-      mv -f o/build/bootstrap/ar.com.$$ o/build/bootstrap/ar.com || exit
-  fi
-  set -- o/build/bootstrap/ar.com "$@"
-fi
-OUT=$3
-
-printf "$LOGFMT" "${ACTION:-ARCHIVE.a}" "$OUT" >&2
-# if [ "$V" = "0" ]; then
-#   printf "$LOGFMT" "${ACTION:-ARCHIVE.a}" "$OUT" >&2
-# else
-#   # some of these windows nt archives are quite huge
-#   COLUMNS=${COLUMNS:-80}
-#   COLUMNS=$((COLUMNS - 4))
-#   printf "%s\n" "$*" |
-#     /usr/bin/fold -s -w $COLUMNS |
-#     sed -e '1bb' -e 's/^/  /' -e ':b' -e '$b' -e 's/$/ \\/' >&2
-# fi
-
-REASON=failed
-trap REASON=interrupted INT
-
-"$@" >/dev/null && exit
-
-if [ "$TERM" = "dumb" ]; then
-  f='%s %s\r\n\r\n'
-else
-  f='\033[91m%s\033[39m \033[94m%s\033[39m\r\n\r\n'
-fi
-printf "$f" "archive $REASON:" "$*" >&2
-exit 1

build/assemble

@@ -1,49 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   GNU Assembler Veneer
-#
-# DESCRIPTION
-#
-#   This script wraps normal assembler commands that're transparently
-#   passed-through. It adds ephemeral logging and directory creation.
-#
-# EXAMPLE
-#
-#   TARGET=program build/assemble as -o program program.o
-#
-# SEE ALSO
-#
-#   https://justine.storage.googleapis.com/perm/as.pdf
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-OBJECTIFY.s}" "$TARGET" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-if [ "$TARGET" ]; then
-  TARGETDIR="${TARGET%/*}"
-  if [ "$TARGETDIR" != "$TARGET" ] && [ ! -d "$TARGETDIR" ]; then
-    $MKDIR "$TARGETDIR" || exit 2
-  fi
-fi
-
-"$@" && exit
-
-if [ "$TERM" = "dumb" ]; then
-  f='%s %s\r\n\r\n'
-else
-  f='\033[91m%s\033[39m \033[94m%s\033[39m\r\n\r\n'
-fi
-printf "$f" "assemble failed:" "$*" >&2
-exit 1

build/bochs-debugger

@@ -1,9 +0,0 @@
-#!/bin/sh
-# -*- mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8 -*-
-# vi: set net ft=sh ts=2 sts=2 sw=2 fenc=utf-8              :vi
-
-echo c |
-  bochs \
-    -q \
-    -f ape/etc/bochsrc.dbg \
-    floppya:1_44=$1,status=inserted

build/bochs-scriptable

@@ -1,51 +0,0 @@
-#!/bin/sh
-# -*- mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8 -*-
-# vi: set net ft=sh ts=2 sts=2 sw=2 fenc=utf-8              :vi
-#
-# bochs-scriptable executes a disk with serial uart stdio.
-#
-# USAGE
-#
-#   build/bochs-scriptable IMAGE...
-#
-# DESCRIPTION
-#
-#   This script is useful for end-to-end testing metal apps in <100ms.
-#
-# SEE ALSO
-#
-#   build/boot(1)
-
-while getopts h X; do
-  case $X in
-    h)  exec less "$0" ;;
-    \?) echo "$0: bad arg" >&2; exit 1 ;;
-  esac
-done
-shift $((OPTIND - 1))
-
-trap '' INT
-
-IMG=$1
-OUT=/tmp/$USER.$$.bochs.stdout
-ERR=/tmp/$USER.$$.bochs.stderr
-
-mkfifo $OUT || exit
-
-cat <$OUT &
-CAT=$!
-exec 4>$OUT
-rm -f $OUT
-
-echo c |
-  bochs \
-    -q \
-    -f ape/etc/bochsrc.ffs \
-    display_library:nogui \
-    floppya:1_44=$1,status=inserted \
-    >>$ERR 2>>$ERR
-RC=$?
-
-kill $CAT
-exec 4>&-
-rm -f $ERR

build/catcode

@@ -1,21 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Source File Concatenation Tool
-#
-# DESCRIPTION
-#
-#   This program is the same as cat, but inserts preprocessor directives
-#   that allow compiler errors to point back to the original lines.
-
-if [ $# -eq 0 ]; then
-  cat
-else
-  for x; do
-    printf '# 1 "%s"\n' "$x"
-    cat "$x"
-  done
-fi

build/compile

@@ -1,298 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   GNU/LLVM Compiler Frontend Frontend
-#
-# DESCRIPTION
-#
-#   This wrapper script filters out certain flags so the compiler won't
-#   whine, and passes extra information to the preprocessor.
-#
-# EXAMPLE
-#
-#   build/compile cc -o program program.c
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-if [ "$1" = "clang-10" ]; then
-  if ! command -v clang-10 >/dev/null; then
-    shift
-    set -- o/third_party/gcc/bin/x86_64-linux-musl-gcc "$@"
-  fi
-fi
-
-if [ "$1" = "clang++-10" ]; then
-  if ! command -v clang++-10 >/dev/null; then
-    shift
-    set -- o/third_party/gcc/bin/x86_64-linux-musl-g++ "$@"
-  fi
-fi
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-
-GZME=
-ASAN=
-UBSAN=
-PLAT="${1%% *}"
-FDIAGNOSTIC_COLOR=
-CCNAME=${CCNAME:-gcc}
-CCVERSION=${CCVERSION:-4}
-COUNTERMAND=
-
-# The GNU Compiler Collection passes a lot of CFLAGS to the preprocessor
-# (which we call CCFLAGS) but it should pass more; and we do just that.
-NOPG=0
-FIRST=1
-OUTARG=0
-INVISIBLE=0
-for x; do
-  if [ $FIRST -eq 1 ]; then
-    set --
-    FIRST=0
-  fi
-  if [ $OUTARG -eq 1 ]; then
-    OUTARG=0
-    OUT="$x"
-  fi
-  case "$x" in
-    -o)
-      set -- "$@" "$x"
-      OUTARG=1
-      ;;
-    -w)
-      set -- "$@" "$x" -D__W__
-      ;;
-    -x-no-pg)
-      NOPG=1
-      ;;
-    -pg)
-      if [ $NOPG -eq 0 ] && [ $INVISIBLE -eq 0 ]; then
-        set -- "$@" "$x" -D__PG__  # @see libc/macros.h
-      fi
-      ;;
-    -mfentry)
-      if [ $NOPG -eq 0 ] && [ $INVISIBLE -eq 0 ]; then
-        set -- "$@" "$x" -D__MFENTRY__
-      fi
-      ;;
-    -fomit-frame-pointer)
-      INVISIBLE=1
-      set -- "$@" "$x"
-      ;;
-    -mno-vzeroupper)
-      set -- "$@" "$x" -Wa,-msse2avx -D__MNO_VZEROUPPER__
-      ;;
-    -fsanitize=address)
-      ASAN="$x -D__FSANITIZE_ADDRESS__"
-      ;;
-    -fsanitize=undefined)
-      # UBSAN w/ -fdata-sections exceeds ELF's 65,280 section limit
-      UBSAN="$x -fno-data-sections"
-      ;;
-    -fno-sanitize=address)
-      ASAN=
-      ;;
-    -fno-sanitize=ubsan)
-      UBSAN=
-      ;;
-    -fno-sanitize=all)
-      ASAN=
-      UBSAN=
-      ;;
-    -mnop-mcount)
-      if [ "$CCNAME" = "gcc" ] && [ "$CCVERSION" -ge 6 ]; then
-        set -- "$@" "$x" -D__MNOP_MCOUNT__
-      fi
-      ;;
-    -mrecord-mcount)
-      if [ "$CCNAME" = "gcc" ] && [ "$CCVERSION" -ge 6 ]; then
-        set -- "$@" "$x" -D__MRECORD_MCOUNT__
-      fi
-      ;;
-    -fsanitize=implicit*integer*)
-      if ! [ "$CCNAME" = "gcc" ]; then
-        set -- "$@" "$x"
-      fi
-      ;;
-    -f*sanitize*|-gz*|-*stack-protector*|-fvect-cost*|-mstringop*)
-      if [ "$CCNAME" = "gcc" ] && [ "$CCVERSION" -ge 6 ]; then
-        set -- "$@" "$x"
-      fi
-      ;;
-    -freorder-blocks-and-partition|-fstack-clash-protection)
-      if [ "$CCNAME" = "gcc" ] && [ "$CCVERSION" -ge 8 ]; then
-        set -- "$@" "$x"
-      fi
-      ;;
-    -fdiagnostic-color=*)
-      FDIAGNOSTIC_COLOR=$x
-      ;;
-    -fopt-info*=*.optinfo)
-      if [ "$CCNAME" = "gcc" ] && [ "$CCVERSION" -ge 9 ]; then
-        GZME="$GZME ${x##*=}"
-        set -- "$@" "$x"
-      fi
-      ;;
-    -R*)                         # e.g. clang's -Rpass-missed=all
-      if [ "${PLAT#*clang}" != "${PLAT}" ]; then
-        set -- "$@" "$x"
-      fi
-      ;;
-    -fsave-optimization-record)  # clang only
-      if [ "${PLAT#*clang}" != "${PLAT}" ]; then
-        set -- "$@" "$x"
-      fi
-      ;;
-    *)
-      set -- "$@" "$x"
-      ;;
-  esac
-done
-if [ -z "$FDIAGNOSTIC_COLOR" ] && [ "$TERM" != "dumb" ]; then
-  FDIAGNOSTIC_COLOR=-fdiagnostics-color=always
-fi
-
-if [ "${PLAT#*clang}" != "${PLAT}" ]; then
-  FIRST=1
-  for x; do
-    # clang's assembler isn't complete yet
-    if [ $FIRST -eq 1 ]; then
-      set --                                \
-          "$x"                              \
-          -fno-integrated-as                \
-          -Wno-unused-command-line-argument \
-          -Wno-incompatible-pointer-types-discards-qualifiers
-      FIRST=0
-      continue
-    fi
-    TRAPV= # clang handles -f{,no-}{trap,wrap}v weird
-    # removes flags clang whines about
-    case "$x" in
-      -gstabs) ;;
-      -ftrapv) ;;
-      -ffixed-*) ;;
-      -fcall-saved*) ;;
-      -fsignaling-nans) ;;
-      -fcx-limited-range) ;;
-      -fno-fp-int-builtin-inexact) ;;
-      -Wno-unused-but-set-variable) ;;
-      -Wunsafe-loop-optimizations) ;;
-      -mdispatch-scheduler) ;;
-      -ftracer) ;;
-      -frounding-math) ;;
-      -fmerge-constants) ;;
-      -fmodulo-sched) ;;
-      -msse2avx)
-        set -- "$@" -Wa,-msse2avx
-        ;;
-      -fopt-info-vec) ;;
-      -fopt-info-vec-missed) ;;
-      -fmodulo-sched-allow-regmoves) ;;
-      -fgcse-*) ;;
-      -freschedule-modulo-scheduled-loops) ;;
-      -freschedule-modulo-scheduled-loops) ;;
-      -fipa-pta) ;;
-      -fsched2-use-superblocks) ;;
-      -fbranch-target-load-optimize) ;;
-      -fdelete-dead-exceptions) ;;
-      -funsafe-loop-optimizations) ;;
-      -fcall-used*) ;;
-      -mmitigate-rop) ;;
-      -mnop-mcount) ;;
-      -fno-align-jumps) ;;
-      -fno-align-labels) ;;
-      -fno-align-loops) ;;
-      -fivopts) ;;
-      -fschedule-insns) ;;
-      -fno-semantic-interposition) ;;
-      -mno-fentry) ;;
-      -f*shrink-wrap) ;;
-      -f*schedule-insns2) ;;
-      -fvect-cost-model=*) ;;
-      -fsimd-cost-model=*) ;;
-      -fversion-loops-for-strides) ;;
-      -fopt-info*) ;;
-      -f*var-tracking-assignments) ;;
-      -femit-struct-debug-baseonly) ;;
-      -ftree-loop-vectorize) ;;
-      -gdescribe-dies) ;;
-      -flimit-function-alignment) ;;
-      -ftree-loop-im) ;;
-      -fno-instrument-functions) ;;
-      -fstack-clash-protection) ;;
-      -mstringop-strategy=*) ;;
-      -mpreferred-stack-boundary=*) ;;
-      -*stack-protector*) ;;  # clang requires segmented memory for this
-      -f*gnu-unique) ;;
-      -Wframe-larger-than=*) ;;
-      -f*whole-program) ;;
-      -Wa,--size-check=*) ;;
-      -Wa,--listing*) ;;
-      -mfpmath=sse+387) ;;
-      -Wa,--noexecstack) ;;
-      -freg-struct-return) ;;
-      -mcall-ms2sysv-xlogues) ;;
-      -mno-vzeroupper)
-        set -- "$@" -mllvm -x86-use-vzeroupper=0
-        ;;
-      -Wa,-a*)
-        x="${x#*=}"
-        if [ "$x" ] && [ -p "$x" ]; then
-          printf '' >"$x"
-        fi
-        ;;
-      *)
-        set -- "$@" "$x"
-        ;;
-    esac
-  done
-  set -- "$@" -fno-stack-protector
-else
-  # removes flags only clang supports
-  FIRST=1
-  for x; do
-    if [ $FIRST -eq 1 ]; then
-      set --
-      FIRST=0
-    fi
-    case "$x" in
-      -Oz) set -- "$@" -Os ;;
-      *) set -- "$@" "$x" ;;
-    esac
-  done
-fi
-
-set -- "$@" -no-canonical-prefixes $FDIAGNOSTIC_COLOR $ASAN $UBSAN $COUNTERMAND
-
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-COMPILE}" "${TARGET:-$OUT}" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-OUTDIR="${OUT%/*}"
-if [ "$OUTDIR" != "$OUT" ] && [ ! -d "$OUTDIR" ]; then
-  $MKDIR "$OUTDIR" || exit 2
-fi
-
-REASON=failed
-trap REASON=interrupted INT
-
-if "$@"; then
-  for f in $GZME; do
-    if GZ=${GZ:-$(command -v gzip)}; then
-      if [ -f "$f" ]; then
-        build/actuallynice $GZ $ZFLAGS -qf $f &
-      fi
-    fi
-  done
-  exit 0
-fi
-
-printf "\n$LOGFMT" "$CCNAME $CCVERSION: compile $REASON:" "$*" >&2
-exit 1

build/config.mk

@@ -5,21 +5,19 @@
 #
 #   - `make`
 #   - Backtraces
+#   - Syscall tracing
 #   - Function tracing
 #   - Reasonably small
 #   - Reasonably optimized
 #   - Reasonably debuggable
-
 ifeq ($(MODE),)
-
 CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
 	$(FTRACE)		\
-	-Og
-
+	-DSYSDEBUG		\
+	-O2
 TARGET_ARCH ?=			\
 	-msse3
-
 endif
 
 # Optimized Mode
@@ -27,29 +25,53 @@ endif
 #   - `make MODE=opt`
 #   - Backtraces
 #   - More optimized
+#   - Syscall tracing
+#   - Function tracing
 #   - Reasonably small
 #   - No memory corruption detection
 #   - assert() / CHECK_xx() may leak code into binary for debuggability
 #   - GCC 8+ hoists check fails into .text.cold, thus minimizing impact
-
 ifeq ($(MODE), opt)
-
 CONFIG_CPPFLAGS +=		\
 	-DNDEBUG		\
 	-msse2avx		\
 	-Wa,-msse2avx
-
 CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
-	-O3
-
+	$(FTRACE)		\
+	-DSYSDEBUG		\
+	-O3			\
+	-fmerge-all-constants
 TARGET_ARCH ?=			\
 	-march=native
+endif
 
+# Optimized Linux Mode
+#
+#   - `make MODE=optlinux`
+#   - Turns on red zone
+#   - Turns off backtraces
+#   - Turns off function tracing
+#   - Turns off support for older cpu models
+#   - Turns off support for other operating systems
+ifeq ($(MODE), optlinux)
+CONFIG_CPPFLAGS +=		\
+	-DNDEBUG		\
+	-msse2avx		\
+	-Wa,-msse2avx		\
+	-DSUPPORT_VECTOR=1
+CONFIG_CCFLAGS +=		\
+	-O3 -fmerge-all-constants
+DEFAULT_COPTS +=		\
+	-mred-zone
+TARGET_ARCH ?=			\
+	-march=native
 endif
 
 # Release Mode
 #
+# Follows traditional closed source release binary norms.
+#
 #   - `make MODE=rel`
 #   - More optimized
 #   - Reasonably small
@@ -59,47 +81,63 @@ endif
 #   - DCHECK_xx() statements removed
 #   - No memory corruption detection
 #   - CHECK_xx() won't leak strings into binary
-
 ifeq ($(MODE), rel)
-
 CONFIG_CPPFLAGS +=		\
 	-DNDEBUG
-
 CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
 	-O2
+TARGET_ARCH ?=			\
+	-msse3
+PYFLAGS +=			\
+	-O1
+endif
 
+# Asan Mode
+#
+# Safer binaries good for backend production serving.
+#
+#   - `make MODE=asan`
+#   - Memory safety
+#   - Production worthy
+#   - Backtraces
+#   - Debuggability
+#   - Larger binaries
+ifeq ($(MODE), asan)
+CONFIG_CCFLAGS +=		\
+	$(BACKTRACES)		\
+	-O2
+CONFIG_COPTS +=			\
+	-fsanitize=address
+TARGET_ARCH ?=			\
+	-msse3
 endif
 
 # Debug Mode
 #
 #   - `make MODE=dbg`
 #   - Backtraces
-#   - Zero optimization
-#   - Enables sanitization
-#   - Enables stack canaries
-#   - Enormous binaries (b/c ubsan suboptimalities)
-
+#   - Enables asan
+#   - Enables ubsan (TODO)
+#   - Stack canaries
+#   - No optimization (TODO)
+#   - Enormous binaries
 ifeq ($(MODE), dbg)
-
 CONFIG_CPPFLAGS +=		\
 	-DMODE_DBG
-
 CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
 	$(FTRACE)		\
-	-O2
-
+	-DSYSDEBUG		\
+	-O2			\
+	-fno-inline
 CONFIG_COPTS +=			\
-	$(SECURITY_BLANKETS)	\
-	$(SANITIZER)
-
+	-fsanitize=address	\
+	-fsanitize=undefined
 TARGET_ARCH ?=			\
 	-msse3
-
 OVERRIDE_CCFLAGS +=		\
 	-fno-pie
-
 endif
 
 # Tiny Mode
@@ -114,23 +152,30 @@ endif
 #   - No algorithmics
 #   - YOLO
 ifeq ($(MODE), tiny)
-CONFIG_CPPFLAGS +=		\
-	-DTINY			\
-	-DNDEBUG		\
+CONFIG_CPPFLAGS +=			\
+	-DTINY				\
+	-DNDEBUG			\
 	-DTRUSTWORTHY
-CONFIG_CCFLAGS +=		\
-	-Os			\
-	-fno-align-functions	\
-	-fno-align-jumps	\
-	-fno-align-labels	\
-	-fno-align-loops
-TARGET_ARCH ?=			\
+CONFIG_CCFLAGS +=			\
+	-Os				\
+	-fno-align-functions		\
+	-fno-align-jumps		\
+	-fno-align-labels		\
+	-fno-align-loops		\
+	-fschedule-insns2		\
+	-fomit-frame-pointer		\
+	-momit-leaf-frame-pointer	\
+	-foptimize-sibling-calls
+TARGET_ARCH ?=				\
 	-msse3
+PYFLAGS +=				\
+	-O2				\
+	-B
 endif
 
 # Linux-Only Tiny Mode
 #
-#   - `make MODE=tiny`
+#   - `make MODE=tinylinux`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -141,24 +186,26 @@ endif
 #   - No algorithmics
 #   - YOLO
 ifeq ($(MODE), tinylinux)
-CONFIG_CPPFLAGS +=		\
-	-DTINY			\
-	-DNDEBUG		\
-	-DTRUSTWORTHY		\
+CONFIG_CPPFLAGS +=			\
+	-DTINY				\
+	-DNDEBUG			\
+	-DTRUSTWORTHY			\
 	-DSUPPORT_VECTOR=1
-CONFIG_CCFLAGS +=		\
-	-Os			\
-	-fno-align-functions	\
-	-fno-align-jumps	\
-	-fno-align-labels	\
+DEFAULT_COPTS +=			\
+	-mred-zone
+CONFIG_CCFLAGS +=			\
+	-Os				\
+	-fno-align-functions		\
+	-fno-align-jumps		\
+	-fno-align-labels		\
 	-fno-align-loops
-TARGET_ARCH ?=			\
+TARGET_ARCH ?=				\
 	-msse3
 endif
 
 # Linux+BSD Tiny Mode
 #
-#   - `make MODE=tiny`
+#   - `make MODE=tinylinuxbsd`
 #   - No apple
 #   - No checks
 #   - No asserts
@@ -175,6 +222,8 @@ CONFIG_CPPFLAGS +=		\
 	-DNDEBUG		\
 	-DTRUSTWORTHY		\
 	-DSUPPORT_VECTOR=113
+DEFAULT_COPTS +=		\
+	-mred-zone
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
@@ -187,7 +236,7 @@ endif
 
 # Unix Tiny Mode
 #
-#   - `make MODE=tiny`
+#   - `make MODE=tinysysv`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -203,6 +252,8 @@ CONFIG_CPPFLAGS +=		\
 	-DNDEBUG		\
 	-DTRUSTWORTHY		\
 	-DSUPPORT_VECTOR=121
+DEFAULT_COPTS +=		\
+	-mred-zone
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
@@ -215,7 +266,7 @@ endif
 
 # Tiny Metallic Unix Mode
 #
-#   - `make MODE=tiny`
+#   - `make MODE=tinynowin`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -244,7 +295,7 @@ endif
 # LLVM Mode
 ifeq ($(MODE), llvm)
 TARGET_ARCH ?= -msse3
-CONFIG_CCFLAGS += $(BACKTRACES) $(FTRACE) -O2
+CONFIG_CCFLAGS += $(BACKTRACES) $(FTRACE) -DSYSDEBUG -O2
 AS = clang
 CC = clang
 CXX = clang++
@@ -282,11 +333,6 @@ endif
 # such as MSVC or XCode. You can run your binary objects through a tool
 # like objconv to convert them to COFF or MachO. Then use ANSI mode to
 # rollup one header file that'll enable linkage with minimal issues.
-#
-# Lastly note that in some cases, such as gc(), there simply isn't any
-# ANSI workaround available. It's only in cases like that when we'll use
-# the __asm__() header workaround, rather than simply removing it. We do
-# however try to do that much less often than mainstream C libraries.
 
 ifeq ($(MODE), ansi)
 

build/definitions.mk

@@ -42,96 +42,89 @@
 #     ASFLAGS      assembler flags (don't use -Wa, frontend prefix)
 #     TARGET_ARCH  microarchitecture flags (e.g. -march=native)
 
-V ?= 1
-LC_ALL = C.UTF-8
+LC_ALL = C
 SOURCE_DATE_EPOCH = 0
 
-DD ?= /bin/dd
-CP ?= /bin/cp -f
-RM ?= /bin/rm -f
-SED ?= /bin/sed
-MKDIR ?= /bin/mkdir -p
 TAGS ?= /usr/bin/ctags  # emacs source builds or something breaks it
 ARFLAGS = rcsD
 ZFLAGS ?=
 XARGS ?= xargs -P4 -rs8000
-NICE ?= build/actuallynice
 DOT ?= dot
-GZ ?= gzip
-CLANG = clang-10
+CLANG = clang
 FC = gfortran  #/opt/cross9f/bin/x86_64-linux-musl-gfortran
+TMPDIR = o/tmp
 
-# see build/compile, etc. which run third_party/gcc/unbundle.sh
+AR = build/bootstrap/ar.com
+CP = build/bootstrap/cp.com
+RM = build/bootstrap/rm.com -f
+ECHO = build/bootstrap/echo.com
+TOUCH = build/bootstrap/touch.com
+PKG = build/bootstrap/package.com
+MKDEPS = build/bootstrap/mkdeps.com
+ZIPOBJ = build/bootstrap/zipobj.com
+FIXUPOBJ = build/bootstrap/fixupobj.com
+MKDIR = build/bootstrap/mkdir.com -p
+COMPILE = build/bootstrap/compile.com -V9 -P4096 $(QUOTA)
+SYMTAB = $(TMPDIR)/$(subst /,_,$@).symtab
+
+COMMA := ,
+PWD := $(shell build/bootstrap/pwd.com)
+IMAGE_BASE_VIRTUAL ?= 0x400000
+
+IGNORE := $(shell $(ECHO) -2 ♥cosmo)
+IGNORE := $(shell $(MKDIR) o/tmp)
+
+ifneq ("$(wildcard o/third_party/gcc/bin/x86_64-pc-linux-gnu-as.exe)","")
+AS = o/third_party/gcc/bin/x86_64-pc-linux-gnu-as.exe
+CC = o/third_party/gcc/bin/x86_64-pc-linux-gnu-gcc.exe
+CXX = o/third_party/gcc/bin/x86_64-pc-linux-gnu-g++.exe
+CXXFILT = o/third_party/gcc/bin/x86_64-pc-linux-gnu-c++filt.exe
+LD = o/third_party/gcc/bin/x86_64-pc-linux-gnu-ld.bfd.exe
+NM = o/third_party/gcc/bin/x86_64-pc-linux-gnu-nm.exe
+GCC = o/third_party/gcc/bin/x86_64-pc-linux-gnu-gcc.exe
+STRIP = o/third_party/gcc/bin/x86_64-pc-linux-gnu-strip.exe
+OBJCOPY = o/third_party/gcc/bin/x86_64-pc-linux-gnu-objcopy.exe
+OBJDUMP = o/third_party/gcc/bin/x86_64-pc-linux-gnu-objdump.exe
+ADDR2LINE = $(PWD)/o/third_party/gcc/bin/x86_64-pc-linux-gnu-addr2line.exe
+else
+IGNORE := $(shell build/bootstrap/unbundle.com)
 AS = o/third_party/gcc/bin/x86_64-linux-musl-as
 CC = o/third_party/gcc/bin/x86_64-linux-musl-gcc
 CXX = o/third_party/gcc/bin/x86_64-linux-musl-g++
 CXXFILT = o/third_party/gcc/bin/x86_64-linux-musl-c++filt
 LD = o/third_party/gcc/bin/x86_64-linux-musl-ld.bfd
-AR = build/archive
 NM = o/third_party/gcc/bin/x86_64-linux-musl-nm
 GCC = o/third_party/gcc/bin/x86_64-linux-musl-gcc
 STRIP = o/third_party/gcc/bin/x86_64-linux-musl-strip
 OBJCOPY = o/third_party/gcc/bin/x86_64-linux-musl-objcopy
 OBJDUMP = o/third_party/gcc/bin/x86_64-linux-musl-objdump
-ADDR2LINE = o/third_party/gcc/bin/x86_64-linux-musl-addr2line
-
-COMMA := ,
-PWD := $(shell pwd)
-IMAGE_BASE_VIRTUAL ?= 0x400000
-TMPDIR := $(shell build/findtmp)
-LOGFMT := $(shell build/getlogfmt)
-COMPILE := $(shell build/getcompile)
-CCNAME := $(shell build/getccname $(CC))
-CCVERSION := $(shell build/getccversion $(CC))
-BLAH1 := $(shell build/zipobj 2>/dev/null)
-BLAH2 := $(shell build/package 2>/dev/null)
+ADDR2LINE = $(PWD)/o/third_party/gcc/bin/x86_64-linux-musl-addr2line
+endif
 
 export ADDR2LINE
-export CCNAME
-export CCVERSION
-export COMPILE
-export CP
-export DD
-export GZ
-export IMAGE_BASE_VIRTUAL
 export LC_ALL
-export LOGFMT
 export MKDIR
 export MODE
-export OBJDUMP
-export RM
-export SED
 export SOURCE_DATE_EPOCH
 export TMPDIR
-export V
-export ZFLAGS
-
-unexport COMPILER_PATH
-unexport CPATH
-unexport CPLUS_INCLUDE_PATH
-unexport C_INCLUDE_PATH
-unexport DEPENDENCIES_OUTPUT
-unexport GCC_COMPARE_DEBUG
-unexport GCC_EXEC_PREFIX
-unexport LANG
-unexport LC_CTYPE
-unexport LC_MESSAGES
-unexport LIBRARY_PATH
-unexport OBJC_INCLUDE_PATH
-unexport SUNPRO_DEPENDENCIES
 
 FTRACE =								\
 	-pg
 
+BACKTRACES =								\
+	-fno-schedule-insns2						\
+	-fno-omit-frame-pointer						\
+	-fno-optimize-sibling-calls					\
+	-mno-omit-leaf-frame-pointer
+
 SANITIZER =								\
-	-fsanitize=leak							\
 	-fsanitize=address
 
 NO_MAGIC =								\
 	-mno-fentry							\
 	-fno-stack-protector						\
-	-fno-sanitize=all						\
-	-fwrapv
+	-fwrapv								\
+	-fno-sanitize=all
 
 OLD_CODE =								\
 	-fno-strict-aliasing						\
@@ -145,7 +138,7 @@ TRADITIONAL =								\
 DEFAULT_CCFLAGS =							\
 	-Wall								\
 	-Werror								\
-	-fdebug-prefix-map="$(PWD)"=					\
+	-fdebug-prefix-map='$(PWD)'=					\
 	-frecord-gcc-switches
 
 DEFAULT_OFLAGS =							\
@@ -162,30 +155,31 @@ DEFAULT_COPTS =								\
 	-fno-gnu-unique							\
 	-fstrict-aliasing						\
 	-fstrict-overflow						\
-	-fno-omit-frame-pointer						\
 	-fno-semantic-interposition					\
-	-mno-omit-leaf-frame-pointer
+	-mno-tls-direct-seg-refs
 
 MATHEMATICAL =								\
 	-O3								\
 	-fwrapv
 
 DEFAULT_CPPFLAGS =							\
+	-DCOSMO								\
+	-DMODE='"$(MODE)"'						\
 	-DIMAGE_BASE_VIRTUAL=$(IMAGE_BASE_VIRTUAL)			\
 	-nostdinc							\
-	-iquote.
+	-iquote .
 
 DEFAULT_CFLAGS =							\
 	-std=gnu2x
 
 DEFAULT_CXXFLAGS =							\
-	-std=gnu++11							\
 	-fno-rtti							\
 	-fno-exceptions							\
 	-fuse-cxa-atexit						\
 	-fno-threadsafe-statics						\
 	-Wno-int-in-bool-context					\
-	-Wno-narrowing
+	-Wno-narrowing							\
+	-Wno-literal-suffix
 
 DEFAULT_ASFLAGS =							\
 	-W								\
@@ -196,24 +190,27 @@ DEFAULT_ASFLAGS =							\
 DEFAULT_LDFLAGS =							\
 	-static								\
 	-nostdlib							\
-	-m elf_x86_64							\
+	-melf_x86_64							\
+	--gc-sections							\
 	--build-id=none							\
 	--no-dynamic-linker						\
-	-z max-page-size=0x1000
+	-zmax-page-size=0x1000 #--cref [email protected]
 
 ZIPOBJ_FLAGS =								\
 	 -b$(IMAGE_BASE_VIRTUAL)
 
+PYFLAGS =								\
+	 -b$(IMAGE_BASE_VIRTUAL)
+
 ASONLYFLAGS =								\
 	-c								\
 	-g								\
-	--debug-prefix-map="$(PWD)"=
+	--debug-prefix-map='$(PWD)'=
 
 DEFAULT_LDLIBS =
 
 MCA =	llvm-mca-10							\
 	-mtriple=x86_64-pc-linux-gnu					\
-	-iterations=3							\
 	-instruction-info						\
 	-iterations=3							\
 	-all-stats							\
@@ -289,8 +286,8 @@ COMPILE.F.flags = $(cc.flags) $(cpp.flags) $(copt.flags) $(f.flags)
 COMPILE.i.flags = $(cc.flags) $(copt.flags) $(c.flags)
 COMPILE.ii.flags = $(cc.flags) $(copt.flags) $(cxx.flags)
 LINK.flags = $(DEFAULT_LDFLAGS) $(CONFIG_LDFLAGS) $(LDFLAGS)
-OBJECTIFY.c.flags = $(OBJECTIFY.S.flags) $(c.flags)
-OBJECTIFY.cxx.flags = $(OBJECTIFY.S.flags) $(cxx.flags)
+OBJECTIFY.c.flags = $(OBJECTIFY.S.flags) $(copt.flags) $(c.flags)
+OBJECTIFY.cxx.flags = $(OBJECTIFY.S.flags) $(copt.flags) $(cxx.flags)
 OBJECTIFY.s.flags = $(ASONLYFLAGS) $(s.flags)
 OBJECTIFY.S.flags = $(copt.flags) $(cc.flags) $(o.flags) $(cpp.flags) $(S.flags)
 OBJECTIFY.f.flags = $(copt.flags) $(cc.flags) $(o.flags) $(copt.flags) $(S.flags) $(f.flags)
@@ -313,8 +310,7 @@ PREPROCESS = $(CC) $(PREPROCESS.flags)
 PREPROCESS.lds = $(CC) $(PREPROCESS.lds.flags)
 LINK = $(LD) $(LINK.flags)
 ELF = o/libc/elf/elf.lds
-ELFLINK = ACTION=LINK.elf $(LINK) $(LINKARGS) $(OUTPUT_OPTION)
-ARCHIVE = $(AR) $(ARFLAGS)
+ELFLINK = $(COMPILE) -ALINK.elf $(LINK) $(LINKARGS) $(OUTPUT_OPTION)
 LINKARGS = $(patsubst %.lds,-T %.lds,$(call uniqr,$(LD.libs) $(filter-out %.pkg,$^)))
 LOLSAN = build/lolsan -b $(IMAGE_BASE_VIRTUAL)
 
@@ -330,6 +326,9 @@ OBJECTIFY.greg.c =							\
 	-fno-instrument-functions					\
 	-fno-optimize-sibling-calls					\
 	-fno-sanitize=all						\
+	-ffreestanding							\
+	-mno-fentry							\
+	-fwrapv								\
 	-c
 
 OBJECTIFY.ansi.c = $(CC) $(OBJECTIFY.c.flags) -ansi -Wextra -Werror -pedantic-errors -c

build/do

@@ -1,55 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Generic Command Runner
-#
-# DESCRIPTION
-#
-#   This does auto mkdir and ephemeral logging.
-#
-# EXAMPLE
-#
-#   build/do PROG [ARGS...]
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-
-# Ensure directory creation if -o PATH flag is passed.
-OUT="$TARGET"
-FIRST=1
-OUTARG=0
-for x; do
-  if [ $FIRST -eq 1 ]; then
-    set --
-    FIRST=0
-  elif [ $OUTARG -eq 1 ]; then
-    OUTARG=0
-    OUT="$x"
-  fi
-  case "$x" in
-    -o)
-      OUTARG=1
-      ;;
-    -o*)
-      OUT=${x#-o}
-      ;;
-  esac
-  set -- "$@" "$x"
-done
-if [ "$OUT" ]; then
-  OUTDIR="${OUT%/*}"
-  if [ "$OUTDIR" != "$OUT" ] && [ ! -d "$OUTDIR" ]; then
-    $MKDIR "$OUTDIR" || exit 2
-  fi
-fi
-
-# Log command.
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-BUILD}" "$TARGET" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-exec "$@"

build/findtmp

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Temporary Directory Discovery
-#
-# DESCRIPTION
-#
-#   We call this script once per build to ideally find a folder that's
-#   backed by an in-memory file system. We then export it to the TMPDIR
-#   environment variable. Many programs use it under the hood, e.g. gcc,
-#   so it grants many small performance improvements.
-
-mkdir -p o/tmp
-echo o/tmp

build/gdb

@@ -0,0 +1,5 @@
+#!/bin/sh
+exec gdb -q -nh -i=mi $1                   \
+     -ex "set confirm off"                 \
+     -ex "add-symbol-file $1.dbg 0x401000" \
+     -ex "run"

build/getccname

@@ -1,46 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Compiler Name Discovery
-#
-# DESCRIPTION
-#
-#   Cosmopolitan itself may be built using either GCC and Clang, and our
-#   build irons out many of the differences between the two. This script
-#   determines which one's in play, which is nontrivial, since they tend
-#   to call themselves so many different names.
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-set -e
-
-SPECIAL_TEXT=$(
-  $1 --version |
-    sed -n '
-        /chibicc/ {
-          i\
-chibicc
-          q
-        }
-        /Free Software/ {
-          i\
-gcc
-          q
-        }
-        /clang/ {
-          i\
-clang
-          q
-        }
-      ')
-
-if [ -z "$SPECIAL_TEXT" ]; then
-  echo gcc
-else
-  printf '%s\n' "$SPECIAL_TEXT"
-fi

build/getccversion

@@ -1,39 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Compiler Version Discovery
-#
-# DESCRIPTION
-#
-#   Cosmopolitan itself may be built using either GCC and Clang, and our
-#   build irons out many of the differences between the two. This script
-#   is used by build/definitions.mk alongside build/getccname to support
-#   the different versions folks use.
-#
-#   Our aim is to support GCC 4.2.1+ since that's the last GPLv2 version
-#   with any sort of industry consensus. Please note, Cosmopolitan never
-#   links GCC runtimes when using later versions, so some concerns might
-#   not apply.
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-set -e
-
-MAJOR_VERSION=$(
-  $1 --version |
-    head -n1 |
-    sed -n '
-        s!^[^(]*([^)]*) \([[:digit:]][[:digit:]]*\).*!\1!p
-        s!^.*clang.*version \([[:digit:]][[:digit:]]*\).*!\1!p
-      ')
-
-if [ -z "$MAJOR_VERSION" ]; then
-  echo 6
-else
-  printf '%s\n' "$MAJOR_VERSION"
-fi

build/getcompile

@@ -1,12 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-if ! [ o/build/bootstrap/compile.com -nt build/bootstrap/compile.com ]; then
-  mkdir -p o/build/bootstrap/
-  cp -f build/bootstrap/compile.com o/build/bootstrap/compile.$$.com
-  o/build/bootstrap/compile.$$.com --do-nothing
-  mv -f o/build/bootstrap/compile.$$.com o/build/bootstrap/compile.com
-fi
-
-echo o/build/bootstrap/compile.com

build/getlogfmt

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   Printf Logger Initializer
-#
-# DESCRIPTION
-#
-#   This program is invoked once by build/definitions.mk to choose the
-#   most appropriate format string when logging command invocations.
-
-W1=15
-if [ "$TERM" = "dumb" ]; then
-  if [ "$COLUMNS" = "" ]; then
-    if TPUT=$(command -v tput); then
-      COLUMNS=$("$TPUT" cols)
-    else
-      COLUMNS=80
-    fi
-  fi
-  COLUMNS=$((COLUMNS - 1))
-  W2=$((COLUMNS - W1))
-  printf '%%-%ds%%-%ds\\r' "$W1" "$W2"
-else
-  echo ♥cosmo >&2
-  printf '\\033[F\\033[K%%-%ds%%s\\r\\n' "$W1"
-fi

build/htags

@@ -43,12 +43,16 @@
 #     '(progn
 #        (add-hook 'c-mode-common-hook 'jart-c-mode-common-hook)))
 
+# ctags doesn't understand atomics, e.g.
+#   extern char **environ;
+set -- --regex-c='/_Atomic(\([^)]*\))/\1/b' "$@"
+
 # ctags doesn't understand variable prototypes, e.g.
 #   extern char **environ;
 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) nothrow nocallback;
+#   bool isheap(void *p) dontthrow nocallback;
 set -- --regex-c='/^[_[:alpha:]][_[:alnum:]]*[ *][ *]*\([_[:alpha:]][_[:alnum:]]*[ *][ *]*\)*\([_[:alpha:]][_$[:alnum:]]*\)(.*/\2/b' "$@"
 
 # ctags doesn't understand function pointers, e.g.

build/includeall

@@ -1,7 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-for x; do
-  printf '#include "%s"\n' "$x"
-done

build/link

@@ -1,65 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   GNU Linker Veneer
-#
-# DESCRIPTION
-#
-#   This script wraps normal linker commands that're transparently
-#   passed-through. It adds ephemeral logging and directory creation.
-#
-# EXAMPLE
-#
-#   build/linker ld -o program program.o
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-
-OUT=
-FIRST=1
-OUTARG=0
-for x; do
-  if [ $FIRST -eq 1 ]; then
-    set --
-    FIRST=0
-  elif [ $OUTARG -eq 1 ]; then
-    OUTARG=0
-    OUT="$x"
-  fi
-  case "$x" in
-    -o)
-      OUTARG=1
-      ;;
-  esac
-  set -- "$@" "$x"
-done
-
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-LINK.elf}" "$OUT" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-OUTDIR="${OUT%/*}"
-if [ "$OUTDIR" != "$OUT" ] && [ ! -d "$OUTDIR" ]; then
-  $MKDIR "$OUTDIR" || exit 2
-fi
-
-REASON=failed
-trap REASON=interrupted INT
-
-"$@" && exit
-
-if [ "$TERM" = "dumb" ]; then
-  f='%s %s\r\n\r\n'
-else
-  f='\033[91m%s\033[39m \033[94m%s\033[39m\r\n\r\n'
-fi
-printf "$f" "link $REASON:" "$*" >&2
-exit 1

build/mkdeps

@@ -1,22 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-if [ -x "o/$MODE/tool/build/mkdeps.com" ]; then
-  set -- "o/$MODE/tool/build/mkdeps.com" "$@"
-else
-  if [ ! -x o/build/bootstrap/mkdeps.com ]; then
-    mkdir -p o/build/bootstrap &&
-    cp -a build/bootstrap/mkdeps.com \
-       o/build/bootstrap/mkdeps.com || exit
-  fi
-  set -- o/build/bootstrap/mkdeps.com "$@"
-fi
-
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-MKDEPS}" "$3" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-exec "$@"

build/objdump

@@ -1,22 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   GNU Disassembly Veneer
-#
-# DESCRIPTION
-#
-#   This script wraps normal objdump commands that're transparently
-#   passed-through.
-#
-# EXAMPLE
-#
-#   build/objdump -xd o/tiny/examples/life.com.dbg
-
-if [ ! -d o/third_party/gcc ]; then
-  third_party/gcc/unbundle.sh
-fi
-
-exec o/third_party/gcc/bin/x86_64-linux-musl-objdump "$@"

build/online.mk

@@ -23,9 +23,9 @@
 #   - tool/build/runitd.c
 
 .PRECIOUS: o/$(MODE)/%.com.ok
-o/$(MODE)/%.com.ok:					\
-		o/$(MODE)/tool/build/runit.com.dbg	\
-		o/$(MODE)/tool/build/runitd.com		\
+o/$(MODE)/%.com.ok: .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
-	@ACTION=TEST TARGET=$@ build/do $^ $(HOSTS)
-	@touch $@
+	@$(COMPILE) -wATEST -tT$@ $^ $(HOSTS)

build/package

@@ -1,33 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-if [ "$TOOL_BUILD_PACKAGE" ]; then
-  set -- "$TOOL_BUILD_PACKAGE" "$@"
-else
-  if [ -x "o/tool/build/package.com.dbg" ]; then
-    set -- "o/tool/build/package.com.dbg" "$@"
-  else
-    MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-    CP=${CP:-$(command -v cp) -f} || exit
-    if [ ! -x o/build/bootstrap/package.com ]; then
-      $MKDIR o/build/bootstrap &&
-        $CP -a build/bootstrap/package.com \
-            o/build/bootstrap/package.com || exit
-    fi
-    set -- o/build/bootstrap/package.com "$@"
-  fi
-fi
-
-printf "$LOGFMT" "${ACTION:-PACKAGE}" "$3" >&2
-# if [ "$V" = "0" ]; then
-#   printf "$LOGFMT" "${ACTION:-PACKAGE}" "$3" >&2
-# else
-#   COLUMNS=${COLUMNS:-80}
-#   COLUMNS=$((COLUMNS - 4))
-#   printf "%s\n" "$*" |
-#     /usr/bin/fold -s -w $COLUMNS |
-#     sed -e '1bb' -e 's/^/  /' -e ':b' -e '$b' -e 's/$/ \\/' >&2
-# fi
-
-exec "$@"

build/rollup

@@ -1,7 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-for x; do
-  printf '#include "%s"\n' "$x"
-done

build/rules.mk

@@ -16,73 +16,110 @@
 
 MAKEFLAGS += --no-builtin-rules
 
-o/%.a:; @$(ARCHIVE) $@ $^
-o/%.o: %.s; @TARGET=$@ $(COMPILE) $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/%.o: o/%.s; @TARGET=$@ $(COMPILE) $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/%.s: %.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.s: o/%.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.i: %.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.o: %.S; @ACTION=OBJECTIFY.S $(COMPILE) $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/%.o: o/%.S; @ACTION=OBJECTIFY.S $(COMPILE) $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/%.s: %.i; @ACTION=COMPILE.i $(COMPILE) $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/%.s: o/%.i; @ACTION=COMPILE.i $(COMPILE) $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/%.o: %.cc; @ACTION=OBJECTIFY.cxx $(COMPILE) $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/%.o: o/%.cc; @ACTION=OBJECTIFY.cxx $(COMPILE) $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/%.lds: %.lds; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
-o/%.inc: %.h; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) -D__ASSEMBLER__ -P $<
-o/%.pkg:; @build/package $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
-o/%.h.ok: %.h; @ACTION=CHECK.h $(COMPILE) $(COMPILE.c) -x c -g0 -o $@ $<
-o/%.h.okk: %.h; @ACTION=CHECK.h $(COMPILE) $(COMPILE.cxx) -x c++ -g0 -o $@ $<
-o/%.greg.o: %.greg.c; @ACTION=OBJECTIFY.greg $(COMPILE) $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/%.zip.o: o/%; @build/zipobj $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+o/%.o: %.s                         ; @$(COMPILE) -AOBJECTIFY.s $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
+o/%.o: o/%.s                       ; @$(COMPILE) -AOBJECTIFY.s $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
+o/%.s: %.S                         ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/%.s: o/%.S                       ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/%.o: %.S                         ; @$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
+o/%.o: o/%.S                       ; @$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
+o/%.lds: %.lds                     ; @$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
+o/%.inc: %.h                       ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) -D__ASSEMBLER__ -P $<
+o/%.greg.o: %.greg.c               ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/%.zip.o: o/%                     ; @$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
 
-o/$(MODE)/%.a:; @$(ARCHIVE) $@ $^
-o/$(MODE)/%: o/$(MODE)/%.dbg; @ACTION=OBJCOPY TARGET=$@ $(COMPILE) $(OBJCOPY) -S -O binary $< $@
-o/$(MODE)/%.o: %.s; @TARGET=$@ $(COMPILE) $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.s; @TARGET=$@ $(COMPILE) $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: %.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: o/$(MODE)/%.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.c; @ACTION=OBJECTIFY.c $(COMPILE) $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.f; @ACTION=OBJECTIFY.f $(COMPILE) $(OBJECTIFY.f) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.F; @ACTION=OBJECTIFY.F $(COMPILE) $(OBJECTIFY.F) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.c; @ACTION=OBJECTIFY.c $(COMPILE) $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ss: %.c; @ACTION=COMPILE.c $(COMPILE) $(COMPILE.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ss: o/$(MODE)/%.c; @ACTION=OBJECTIFY.s $(COMPILE) $(COMPILE.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.S; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.c; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.cc; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: o/$(MODE)/%.c; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.h: %.c; @ACTION=AMALGAMATE $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
-o/$(MODE)/%.h: o/$(MODE)/%.c; @ACTION=AMALGAMATE $(COMPILE) $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
-o/$(MODE)/%.o: %.S; @ACTION=OBJECTIFY.S $(COMPILE) $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.S; @ACTION=OBJECTIFY.S $(COMPILE) $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: %.i; @ACTION=COMPILE.i $(COMPILE) $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: o/$(MODE)/%.i; @ACTION=COMPILE.i $(COMPILE) $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.cc; @ACTION=OBJECTIFY.cxx $(COMPILE) $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.cc; @ACTION=OBJECTIFY.cxx $(COMPILE) $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.lds: %.lds; @ACTION=PREPROCESS $(COMPILE) $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.h.ok: %.h; @ACTION=CHECK.h $(COMPILE) $(COMPILE.c) -x c -g0 -o $@ $<
-o/$(MODE)/%.h.okk: %.h; @ACTION=CHECK.h $(COMPILE) $(COMPILE.cxx) -x c++ -g0 -o $@ $<
-o/$(MODE)/%.o: %.greg.c; @ACTION=OBJECTIFY.greg $(COMPILE) $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.greg.o: %.greg.c; @ACTION=OBJECTIFY.greg $(COMPILE) $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ansi.o: %.ansi.c; @ACTION=OBJECTIFY.ansi $(COMPILE) $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ansi.o: %.c; @ACTION=OBJECTIFY.ansi $(COMPILE) $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c99.o: %.c99.c; @ACTION=OBJECTIFY.c99 $(COMPILE) $(OBJECTIFY.c99.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c11.o: %.c11.c; @ACTION=OBJECTIFY.c11 $(COMPILE) $(OBJECTIFY.c11.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c2x.o: %.c2x.c; @ACTION=OBJECTIFY.c2x $(COMPILE) $(OBJECTIFY.c2x.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.initabi.o: %.initabi.c; @ACTION=OBJECTIFY.init $(COMPILE) $(OBJECTIFY.initabi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ncabi.o: %.ncabi.c; @ACTION=OBJECTIFY.nc $(COMPILE) $(OBJECTIFY.ncabi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.real.o: %.c; @ACTION=OBJECTIFY.real $(COMPILE) $(OBJECTIFY.real.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.runs: o/$(MODE)/%; @ACTION=CHECK.runs TARGET=$< build/runcom $< $(TESTARGS) && touch $@
-o/$(MODE)/%.pkg:; @build/package $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
-o/$(MODE)/%.zip.o: %; @build/zipobj $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%: o/$(MODE)/%.dbg       ; @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
+o/$(MODE)/%.o: %.s                 ; @$(COMPILE) -AOBJECTIFY.s $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: o/$(MODE)/%.s       ; @$(COMPILE) -AOBJECTIFY.s $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.f                 ; @$(COMPILE) -AOBJECTIFY.f $(OBJECTIFY.f) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.F                 ; @$(COMPILE) -AOBJECTIFY.F $(OBJECTIFY.F) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.h: %.c                 ; @$(COMPILE) -AAMALGAMATE $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
+o/$(MODE)/%.h: o/$(MODE)/%.c       ; @$(COMPILE) -AAMALGAMATE $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
+o/$(MODE)/%.o: %.S                 ; @$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: o/$(MODE)/%.S       ; @$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.cc                ; @$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.lds: %.lds             ; @$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.greg.c            ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.greg.o: %.greg.c       ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.initabi.o: %.initabi.c ; @$(COMPILE) -AOBJECTIFY.init $(OBJECTIFY.initabi.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.ncabi.o: %.ncabi.c     ; @$(COMPILE) -AOBJECTIFY.nc $(OBJECTIFY.ncabi.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.real.o: %.c            ; @$(COMPILE) -AOBJECTIFY.real $(OBJECTIFY.real.c) $(OUTPUT_OPTION) $<
 
-o/$(MODE)/%-gcc.asm: %.c; @ACTION=OBJECTIFY.c $(COMPILE) $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
+o/$(MODE)/%.runs: o/$(MODE)/%      ; @$(COMPILE) -ACHECK -wtT$@ $< $(TESTARGS)
+o/$(MODE)/%.zip.o: %               ; @$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%-gcc.asm: %.c           ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
+o/$(MODE)/%-gcc.asm: %.cc          ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.cxx) -S -g0 $(OUTPUT_OPTION) $<
+o/$(MODE)/%-clang.asm: %.c         ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
+o/$(MODE)/%-clang.asm: %.cc        ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.cxx) -S -g0 $(OUTPUT_OPTION) $<
 o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.c; @ACTION=OBJECTIFY.c $(COMPILE) $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
-o/$(MODE)/%-gcc.asm: %.f; @ACTION=OBJECTIFY.f $(COMPILE) $(OBJECTIFY.f) -S -g0 $(OUTPUT_OPTION) $<
-o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.f; @ACTION=OBJECTIFY.f $(COMPILE) $(OBJECTIFY.f) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
-o/$(MODE)/%-gcc.asm: %.F; @ACTION=OBJECTIFY.F $(COMPILE) $(OBJECTIFY.F) -S -g0 $(OUTPUT_OPTION) $<
-o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.F; @ACTION=OBJECTIFY.F $(COMPILE) $(OBJECTIFY.F) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
+
+o/%.o: %.cc
+	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/%.o: o/%.cc
+	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/$(MODE)/%.o: %.c
+	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/$(MODE)/%.o: o/$(MODE)/%.c
+	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/$(MODE)/%.o: o/$(MODE)/%.cc
+	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
+
+o/%.a:
+	$(file >$(TMPDIR)/$(subst /,_,$@),$^)
+	@$(COMPILE) -AARCHIVE -wT$@ $(AR) $(ARFLAGS) $@ @$(TMPDIR)/$(subst /,_,$@)
+
+o/%.pkg:
+	$(file >$(TMPDIR)/$(subst /,_,$@).args,$(filter %.o,$^))
+	@$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPDIR)/$(subst /,_,$@)
+
+o/$(MODE)/%.pkg:
+	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter %.o,$^))
+	@$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPDIR)/$(subst /,_,$@)
+
+o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj.com
+	@$(COMPILE) -wAPYOBJ o/$(MODE)/third_party/python/pyobj.com $(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)/%.lua: %.lua o/$(MODE)/third_party/lua/luac.com
+	@$(COMPILE) -wALUAC o/$(MODE)/third_party/lua/luac.com -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)/%: o/$(MODE)/%.com o/$(MODE)/tool/build/cp.com o/$(MODE)/tool/build/assimilate.com
+	@$(COMPILE) -wACP -T$@ o/$(MODE)/tool/build/cp.com $< $@
+	@$(COMPILE) -wAASSIMILATE -T$@ o/$(MODE)/tool/build/assimilate.com $@
+
+################################################################################
+# strict header checking
+# these rules are unsandboxed since they're kind of a sandboxing test themselves
+
+o/%.h.ok: .UNSANDBOXED = 1
+o/%.h.ok: %.h
+	@$(COMPILE) -ACHECK.h $(COMPILE.c) -xc -g0 -o $@ $<
+
+o/$(MODE)/%.h.ok: .UNSANDBOXED = 1
+o/$(MODE)/%.h.ok: %.h
+	@$(COMPILE) -ACHECK.h $(COMPILE.c) -xc -g0 -o $@ $<
+
+o/$(MODE)/%.hh.ok: .UNSANDBOXED = 1
+o/$(MODE)/%.hh.ok: %.hh
+	@$(COMPILE) -ACHECK.h $(COMPILE.cxx) -xc++ -g0 -o $@ $<
+
+o/%.okk: .UNSANDBOXED = 1
+o/%.okk: %
+	@$(COMPILE) -ACHECK.h $(COMPILE.cxx) -xc++ -g0 -o $@ $<
+
+o/$(MODE)/%.okk: .UNSANDBOXED = 1
+o/$(MODE)/%.okk: %
+	@$(COMPILE) -ACHECK.h $(COMPILE.cxx) -xc++ -g0 -o $@ $<

build/runcom

@@ -1,11 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-DD=${DD:-$(command -v dd)} || exit
-$DD if="$1" of="$1.bak" bs=4096 count=1 conv=notrunc 2>/dev/null
-"$@"
-rc=$?
-echo "$1"
-$DD if="$1.bak" of="$1" bs=4096 count=1 conv=notrunc 2>/dev/null
-exit $rc

build/sanitycheck

@@ -27,29 +27,37 @@ EOF
   exit 1
 fi
 
-build/sanitycheck2
-if [ $? -ne 123 ]; then
+if [ ! -f /proc/sys/fs/binfmt_misc/status ]; then
+  exit 0
+fi
+
+if ! build/bootstrap/echo.com -n; then
   cat <<'EOF' >&2
 
 ERROR
 
-  Thompson Shell Backwards Compatibility Issue Detected
+  APE Execution error.
 
 DETAILS
 
-  Actually Portable Executable assumes stock Linux configuration.
-  Normal behavior is non-ELF files with x bit are run by /bin/sh.
-  Linux lets people globally define arbitrary magic interpreters.
-  Your computer couldve been tuned to run MZ scripts inside WINE.
-  So if you use binfmt_misc you need to explicitly register this.
+  Your system has probably been configured to use binfmt_misc. You need
+  to run the command below to install /usr/bin/ape and register it with
+  binfmt_misc. See ape/loader.c for source code, and technical details.
 
 WORKAROUND
 
-  sudo sh -c "echo ':APE:M::MZqFpD::/bin/sh:' >/proc/sys/fs/binfmt_misc/register"
+  ape/apeinstall.sh
+
+NOTES
+
+  If it still doesn't work, possibly due to an overly aggressive WINE
+  or WSL registration, or possibly due to the ordering of definitions,
+  then one troubleshooting step is to just unregister everything using
+  sudo sh -c 'echo -1 >/proc/sys/fs/binfmt_misc/status' and try again.
 
 SEE ALSO
 
-  https://justine.storage.googleapis.com/ape.html
+  https://justine.lol/ape.html
 
 EOF
   kill $1

build/sanitycheck2

@@ -1,9 +0,0 @@
-MZqFpD=123
-exit $MZqFpD
-                                                                                
-                                                                                
-                                                                                
-                                                                                
-                                                                                
-                                                                                
- 

build/ssh

@@ -1,14 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-#
-# OVERVIEW
-#
-#   SSH Command Wrapper
-#
-# DESCRIPTION
-#
-#   This script, like most of our wrappers, asks the tooling to whine
-#   less often.
-
-exec ${SSH:-ssh} -o LogLevel=QUIET "$@"

build/zipobj

@@ -1,51 +0,0 @@
-#!/bin/sh
-#-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
-
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-CP=${CP:-$(command -v cp) -f} || exit
-SED=${SED:-$(command -v sed)} || exit
-
-MODE=
-
-OUT=
-FIRST=1
-OUTARG=0
-for x; do
-  if [ $FIRST -eq 1 ]; then
-    set --
-    FIRST=0
-  elif [ $OUTARG -eq 1 ]; then
-    OUTARG=0
-    OUT="$x"
-  fi
-  case "$x" in
-    -o)
-      OUTARG=1
-      ;;
-  esac
-  set -- "$@" "$x"
-done
-OUTDIR="${OUT%/*}"
-if [ "$OUTDIR" != "$OUT" ] && [ ! -d "$OUTDIR" ]; then
-  $MKDIR "$OUTDIR" || exit 2
-fi
-
-if [ -x "o/$MODE/tool/build/zipobj.com.dbg" ]; then
-  set -- "o/$MODE/tool/build/zipobj.com.dbg" "$@"
-else
-  if [ ! -x o/build/bootstrap/zipobj.com ]; then
-    $MKDIR o/build/bootstrap &&
-    $CP -a build/bootstrap/zipobj.com \
-       o/build/bootstrap/zipobj.com || exit
-  fi
-  set -- o/build/bootstrap/zipobj.com "$@"
-fi
-
-if [ "$V" = "0" ]; then
-  printf "$LOGFMT" "${ACTION:-ZIPOBJ}" "$3" >&2
-else
-  printf "%s\n" "$*" >&2
-fi
-
-exec "$@"

dsp/bmp/bmp.mk

@@ -40,11 +40,11 @@ $(DSP_BMP_A).pkg:				\
 		$(foreach x,$(DSP_BMP_A_DIRECTDEPS),$($(x)_A).pkg)
 
 o/$(MODE)/dsp/bmp/float2short.o			\
-o/$(MODE)/dsp/bmp/scalevolume.o:		\
+o/$(MODE)/dsp/bmp/scalevolume.o: private	\
 		OVERRIDE_CFLAGS +=		\
 			$(MATHEMATICAL)
 
-o/tiny/dsp/bmp/scalevolume.o:			\
+o/tiny/dsp/bmp/scalevolume.o: private		\
 		OVERRIDE_CFLAGS +=		\
 			-Os
 

dsp/core/alaw.c

@@ -0,0 +1,46 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ 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 "dsp/core/core.h"
+
+/**
+ * Compresses 16-bit signed linear audio sample with a-Law.
+ *
+ * @param x is clamped to 16-bits of which the top 14 are considered
+ * @return coded number in range [0..255]
+ * @see ITU G.711
+ */
+int alaw(int x) {
+  int a, b, e, i;
+  if ((a = x) < 0) a = ~a;
+  a >>= 4;
+  if (a > 15) {
+    if ((i = a >> 5)) {
+      b = (__builtin_clz(i) ^ 31) + 1;
+      a >>= b;
+      a -= 16;
+      a += (b + 1) << 4;
+    } else {
+      e = 1;
+      a -= 16;
+      a += 16;
+    }
+  }
+  if (x >= 0) a |= 128;
+  return a ^ 85;
+}

dsp/core/byte2double.c

@@ -22,7 +22,7 @@
 void *byte2double(long n, const void *p, double weight, double bias) {
   long i;
   double f, *dst;
-  unsigned char *src;
+  const unsigned char *src;
   if ((dst = valloc(n * sizeof(double)))) {
     for (src = p, i = 0; i < n; ++i) {
       f = src[i];

dsp/core/c161.h

@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_DSP_CORE_C161_H_
 #define COSMOPOLITAN_DSP_CORE_C161_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #define EXTRA_SHARP 2

dsp/core/c161s.h

@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_C161S_H_
 #define COSMOPOLITAN_DSP_CORE_C161S_H_
 #include "dsp/core/c161.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 forceinline pureconst artificial signed char C161S(signed char al,

dsp/core/core.h

@@ -3,23 +3,19 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-/**
- * @fileoverview Cosmopolitan Digital Signal Processing.
- */
-
+int alaw(int);
+int unalaw(int);
 int mulaw(int);
+int unmulaw(int);
 void *double2byte(long, const void *, double, double) vallocesque;
 void *byte2double(long, const void *, double, double) vallocesque;
-
 void *dct(float[8][8], float, float, float, float, float);
 void *dctjpeg(float[8][8]);
-
 double det3(const double[3][3]) nosideeffect;
 void *inv3(double[restrict 3][3], const double[restrict 3][3], double);
 void *matmul3(double[restrict 3][3], const double[3][3], const double[3][3]);
 void *vmatmul3(double[restrict 3], const double[3], const double[3][3]);
 void *matvmul3(double[restrict 3], const double[3][3], const double[3]);
-
 double rgb2stdtv(double) pureconst;
 double rgb2lintv(double) pureconst;
 double rgb2stdpc(double, double) pureconst;

dsp/core/core.mk

@@ -47,15 +47,15 @@ o/$(MODE)/dsp/core/c1331.o			\
 o/$(MODE)/dsp/core/magikarp.o			\
 o/$(MODE)/dsp/core/c93654369.o			\
 o/$(MODE)/dsp/core/float2short.o		\
-o/$(MODE)/dsp/core/scalevolume.o:		\
+o/$(MODE)/dsp/core/scalevolume.o: private	\
 		OVERRIDE_CFLAGS +=		\
 			$(MATHEMATICAL)
 
-o/tiny/dsp/core/scalevolume.o:			\
+o/tiny/dsp/core/scalevolume.o: private		\
 		OVERRIDE_CFLAGS +=		\
 			-Os
 
-o/$(MODE)/dsp/core/det3.o:			\
+o/$(MODE)/dsp/core/det3.o: private		\
 		OVERRIDE_CFLAGS +=		\
 			-ffast-math
 

dsp/core/dct.c

@@ -21,7 +21,7 @@
 #define DCT(A, B, C, D, E, F, G, H, T, C0, C1, C2, C3, C4)    \
   do {                                                        \
     T z1, z2, z3, z4, z5, z11, z13;                           \
-    T t0, t1, t2, t3, t4, t5, t6, t7, t8, t10, t11, t12, t13; \
+    T t0, t1, t2, t3, t4, t5, t6, t7, t10, t11, t12, t13;     \
     t0 = A + H;                                               \
     t7 = A - H;                                               \
     t1 = B + G;                                               \

dsp/core/double2byte.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 

dsp/core/float2short.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 
@@ -30,7 +30,6 @@
  */
 void float2short(size_t n, short pcm16[n][8], const float binary32[n][8]) {
   size_t i, j;
-  float f[8], w[8];
   for (i = 0; i < n; ++i) {
     for (j = 0; j < 8; ++j) {
       pcm16[i][j] =

dsp/core/getintegercoefficients.c

@@ -20,7 +20,7 @@
 #include "libc/assert.h"
 #include "libc/dce.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 

dsp/core/getintegercoefficients8.c

@@ -19,7 +19,7 @@
 #include "dsp/core/core.h"
 #include "dsp/core/q.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"