Add APE support for 32-bit programs

This is an experimental proof of concept demo:

    make -j8 o//examples/i386.i386.com
    o//examples/i386.i386.com --32
    echo $?  # <-- prints main32's argc parameter

Please note there's no libc support at the moment. This change is just
for fun and shouldn't be interpreted as intent to support. Having this
project on the whole support i386 would be tough because the calling
conventions are so different. There really isn't much in the way of low
hanging fruit opportunities to do something like NOP out REX prefixes
and call it a day. It'd likely need disjoint builds or possibly better
yet really cleverly crafted code generation in //third_party/chibicc!

Another challenge is is that Linux changed its SYSCALL ordinals when it
migrated from i386 to x86_64. Linux used to use the same magic numbers
as everyone else for functions like exit/write/read/etc. BSDs on the
other hand didn't pointlessly renumber things. So we'd need to find a
way to define the ordinals in libc/sysv/syscalls.sh twice for Linux. The
same goes for other ISAs too. Especially MIPS. For the Linux Kernel
alone, syscall magic numbers and data structure layouts are totally
different, and that's likely the case for other ISAs on other operating
systems too. Probably because ISA code historically got contributed to
open source by the companies that made the chips. Ulrich Drepper wrote
an amusing essay on the subject some years back.

.clang-format

@@ -8,7 +8,6 @@ AlwaysBreakBeforeMultilineStrings: false
 AllowShortFunctionsOnASingleLine: false
 KeepEmptyLinesAtTheStartOfBlocks: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IncludeBlocks: Merge
 ---
 Language: Cpp
 AllowShortFunctionsOnASingleLine: false

.gitattributes

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

.github/workflows/build.yml

@@ -1,31 +0,0 @@
-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, rel, tinylinux, optlinux]
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: support ape bins 1
-        run: sudo cp build/bootstrap/ape.elf /usr/bin/ape
-
-      - name: support ape bins 2
-        run: sudo sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register"
-
-      - name: make matrix
-        run: V=0 make -j2 MODE=${{ matrix.mode }}

.gitignore

@@ -1,11 +1,4 @@
-# -*- conf -*-
-
 /o
-/cosmocc
-/.prompt.jtlp
-
-# TODO: Find some way to have Python write to o/
-__pycache__
 
 *.tmp
 /.bochs.log
@@ -13,5 +6,4 @@ __pycache__
 /TAGS
 /bx_enh_dbg.ini
 /tool/emacs/*.elc
-/perf.data
-/perf.data.old
+/usr/share/dict/words

.vscode/c_cpp_properties.json

@@ -1,12 +1,13 @@
 {
 	"configurations": [
 		{
-			"name": "Win32",
+			"name": "Linux",
 			"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=",
@@ -15,7 +16,7 @@
 				"alignas(x)",
 				"alignof(x)",
 				"artificial=",
-				"__wur=",
+				"nodiscard=",
 				"mayalias=",
 				"forceinline=",
 				"forcealign(x)=",
@@ -35,19 +36,20 @@
 				"returnstwice=",
 				"textwindows=",
 				"privileged=",
-				"dontinstrument=",
+				"compatfn=",
+				"noinstrument=",
 				"nodebuginfo=",
 				"interruptfn=",
 				"optimizespeed=",
 				"forcealignargpointer=",
-				"dontasan=",
-				"dontubsan=",
+				"noasan=",
+				"noubsan=",
+				"testonly=",
 				"donothing=",
 				"nosideeffect=",
-				"unreachable=",,
-				"notpossible=",
+				"unreachable=",
 				"thatispacked=",
-				"dontthrow=",
+				"nothrow=",
 				"nocallback=",
 				"relegated=",
 				"hidden=",
@@ -61,48 +63,6 @@
 				"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",
-				"-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="
-			]
 		}
 	],
 	"version": 4

.vscode/vscode.h

@@ -1,2 +1,160 @@
 #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

@@ -1,62 +0,0 @@
-# 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

@@ -1,16 +0,0 @@
-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

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 #
 # SYNOPSIS
 #
@@ -37,10 +37,11 @@
 #
 #   # basic debugging
 #   make -j8 -O MODE=dbg o/dbg/examples/crashreport.com
-#   o/examples/crashreport.com
+#   o/dbg/examples/crashreport.com
 #   less examples/crashreport.c
 #
-#   # extremely tiny binaries
+#   # extremely tiny binaries (scout's honor escape hatch)
+#   # please pay the $1k for commercial license if you can
 #   make -j8 -O MODE=tiny				\
 #               LDFLAGS+=-s				\
 #               CPPFLAGS+=-DIM_FEELING_NAUGHTY	        \
@@ -59,122 +60,18 @@
 #
 #   build/config.mk
 
-SHELL      = build/bootstrap/cocmd.com
-MAKEFLAGS += --no-builtin-rules
+SHELL         = /bin/sh
+HOSTS        ?= freebsd openbsd netbsd rhel7 rhel5 xnu win7 win10
+SANITY       := $(shell build/sanitycheck $$PPID)
+GNUMAKEFLAGS += --output-sync
 
 .SUFFIXES:
 .DELETE_ON_ERROR:
 .FEATURES: output-sync
-.PHONY: all o bins check test depend tags aarch64 clean
+.PHONY: all o bins check test depend tags
 
-ifneq ($(m),)
-ifeq ($(MODE),)
-MODE := $(m)
-endif
-endif
-
-COMMA := ,
-PWD := $(shell pwd)
-
-# detect wsl2 running cosmopolitan binaries on the host by checking whether:
-# - user ran build/bootstrap/make.com, in which case make's working directory is in wsl
-# - user ran make, in which case cocmd.com's working directory is in wsl
-ifneq ($(findstring //wsl.localhost/,$(CURDIR) $(PWD)),)
-$(warning wsl2 interop is enabled)
-$(error you need to run sudo sh -c 'echo -1 > /proc/sys/fs/binfmt_misc/WSLInterop')
-endif
-
-UNAME_M := $(shell uname -m)
-UNAME_S := $(shell uname -s)
-
-# apple still distributes a 17 year old version of gnu make
-ifeq ($(MAKE_VERSION), 3.81)
-$(error please use build/bootstrap/make.com)
-endif
-
-LC_ALL = C
-SOURCE_DATE_EPOCH = 0
-
-ARFLAGS = rcsD
-ZFLAGS ?=
-XARGS ?= xargs -P4 -rs8000
-DOT ?= dot
-CLANG = clang
-TMPDIR = o/tmp
-
-AR = build/bootstrap/ar.com
-CP = build/bootstrap/cp.com
-RM = build/bootstrap/rm.com -f
-GZIP = build/bootstrap/gzip.com
-ECHO = build/bootstrap/echo.com
-CHMOD = build/bootstrap/chmod.com
-TOUCH = build/bootstrap/touch.com
-PKG = build/bootstrap/package.com
-MKDEPS = build/bootstrap/mkdeps.com
-ZIPOBJ = build/bootstrap/zipobj.com
-ZIPCOPY = build/bootstrap/zipcopy.com
-PECHECK = build/bootstrap/pecheck.com
-FIXUPOBJ = build/bootstrap/fixupobj.com
-MKDIR = build/bootstrap/mkdir.com -p
-COMPILE = build/bootstrap/compile.com -V9 -P4096 $(QUOTA)
-
-IGNORE := $(shell $(MKDIR) $(TMPDIR))
-
-ifneq ($(findstring aarch64,$(MODE)),)
-ARCH = aarch64
-HOSTS ?= pi studio freebsdarm
-else
-ARCH = x86_64
-HOSTS ?= freebsd rhel7 xnu win10 openbsd netbsd
-endif
-
-ZIPOBJ_FLAGS += -a$(ARCH)
-IGNORE := $(shell $(MKDIR) $(TMPDIR))
-
-export ADDR2LINE
-export LC_ALL
-export MKDIR
-export MODE
-export SOURCE_DATE_EPOCH
-export TMPDIR
-
-COSMOCC = cosmocc/3.2
-TOOLCHAIN = $(COSMOCC)/bin/$(ARCH)-linux-cosmo-
-DOWNLOAD := $(shell build/download-cosmocc.sh $(COSMOCC) 3.2 28b48682595f0f46b45ab381118cdffdabc8fcfa29aa54e301fe6ffe35269f5e)
-
-AS = $(TOOLCHAIN)as
-CC = $(TOOLCHAIN)gcc
-CXX = $(TOOLCHAIN)g++
-CXXFILT = $(TOOLCHAIN)c++filt
-LD = $(TOOLCHAIN)ld.bfd
-NM = $(TOOLCHAIN)nm
-GCC = $(TOOLCHAIN)gcc
-STRIP = $(TOOLCHAIN)strip
-OBJCOPY = $(TOOLCHAIN)objcopy
-OBJDUMP = $(TOOLCHAIN)objdump
-ifneq ($(wildcard $(PWD)/$(TOOLCHAIN)addr2line),)
-ADDR2LINE = $(PWD)/$(TOOLCHAIN)addr2line
-else
-ADDR2LINE = $(TOOLCHAIN)addr2line
-endif
-
-# the default build modes is empty string
-# on x86_64 hosts, MODE= is the same as MODE=x86_64
-# on aarch64 hosts, MODE= is changed to MODE=aarch64
-ifeq ($(MODE),)
-ifeq ($(UNAME_M),arm64)
-MODE := aarch64
-endif
-ifeq ($(UNAME_M),aarch64)
-MODE := aarch64
-endif
-endif
-
-# primary build rules
 all:	o
-o:	o/$(MODE)
-o/$(MODE):			\
-	o/$(MODE)/ape		\
+o:	o/$(MODE)/ape		\
 	o/$(MODE)/dsp		\
 	o/$(MODE)/net		\
 	o/$(MODE)/libc		\
@@ -183,46 +80,6 @@ o/$(MODE):			\
 	o/$(MODE)/examples	\
 	o/$(MODE)/third_party
 
-# TODO(jart): Make Emacs `C-c C-c` shortcut not need this.
-.PHONY: o/$(MODE)/ o/$(MODE)/.
-o/$(MODE)/: o/$(MODE)
-o/$(MODE)/.: o/$(MODE)
-
-# check if we're using o//third_party/make/make.com
-# we added sandboxing to guarantee cosmo's makefile is hermetic
-# it also shaves away 200ms of startup latency with native $(uniq)
-ifneq ($(LANDLOCKMAKE_VERSION),)
-ifeq ($(UNAME_S),Linux)
-ifeq ($(wildcard /usr/bin/ape),)
-$(warning please run ape/apeinstall.sh if you intend to use landlock make)
-$(shell sleep .5)
-endif
-endif
-ifneq ($(TOOLCHAIN),)
-.STRICT = 1
-endif
-endif
-
-.PLEDGE += stdio rpath wpath cpath fattr proc
-.UNVEIL +=					\
-	libc/integral				\
-	libc/stdbool.h				\
-	libc/disclaimer.inc			\
-	rwc:/dev/shm				\
-	rx:cosmocc				\
-	rx:build/bootstrap			\
-	r:build/portcosmo.h			\
-	/proc/stat				\
-	rw:/dev/null				\
-	rw:/dev/full				\
-	w:o/stack.log				\
-	/etc/hosts				\
-	~/.runit.psk				\
-	/proc/self/status			\
-	rx:/usr/bin/qemu-aarch64		\
-	rx:o/third_party/qemu/qemu-aarch64	\
-	/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-
 PKGS =
 
 -include ~/.cosmo.mk
@@ -230,330 +87,242 @@ include build/functions.mk			#─┐
 include build/definitions.mk			# ├──META
 include build/config.mk				# │  You can build
 include build/rules.mk				# │  You can topologically order
-include build/online.mk				#─┘
-include libc/nexgen32e/BUILD.mk			#─┐
-include libc/sysv/BUILD.mk			# ├──SYSTEM SUPPORT
-include libc/nt/BUILD.mk			# │  You can do math
-include libc/intrin/BUILD.mk			# │  You can use the stack
-include third_party/compiler_rt/BUILD.mk	# │  You can manipulate arrays
-include libc/tinymath/BUILD.mk			# │  You can issue raw system calls
-include libc/str/BUILD.mk			# │
-include third_party/xed/BUILD.mk		# │
-include third_party/puff/BUILD.mk		# │
-include libc/elf/BUILD.mk			# │
-include ape/BUILD.mk				# │
-include libc/fmt/BUILD.mk			# │
-include libc/vga/BUILD.mk			# │
-include libc/irq/BUILD.mk			#─┘
-include libc/calls/BUILD.mk			#─┐
-include libc/irq/BUILD.mk			# ├──SYSTEMS RUNTIME
-include third_party/nsync/BUILD.mk		# │  You can issue system calls
-include libc/runtime/BUILD.mk			# │
-include third_party/double-conversion/BUILD.mk	# │
-include libc/crt/BUILD.mk			# │
-include third_party/dlmalloc/BUILD.mk		#─┘
-include libc/mem/BUILD.mk			#─┐
-include third_party/gdtoa/BUILD.mk		# ├──DYNAMIC RUNTIME
-include third_party/nsync/mem/BUILD.mk		# │  You can now use stdio
-include libc/proc/BUILD.mk			# │  You can now use threads
-include libc/dlopen/BUILD.mk			# │  You can now use processes
-include libc/thread/BUILD.mk			# │  You can finally call malloc()
-include third_party/zlib/BUILD.mk		# │
-include libc/stdio/BUILD.mk			# │
-include tool/hello/BUILD.mk			# │
-include libc/time/BUILD.mk			# │
-include net/BUILD.mk				# │
-include third_party/vqsort/BUILD.mk		# │
-include libc/log/BUILD.mk			# │
-include third_party/getopt/BUILD.mk		# │
-include third_party/bzip2/BUILD.mk		# │
-include dsp/core/BUILD.mk			# │
-include third_party/zlib/gz/BUILD.mk		# │
-include third_party/intel/BUILD.mk		# │
-include third_party/aarch64/BUILD.mk		# │
-include libc/BUILD.mk				#─┘
-include libc/sock/BUILD.mk			#─┐
-include net/http/BUILD.mk			# ├──ONLINE RUNTIME
-include third_party/musl/BUILD.mk		# │  You can communicate with the network
-include libc/x/BUILD.mk				# │
-include dsp/scale/BUILD.mk			# │
-include dsp/mpeg/BUILD.mk			# │
-include dsp/tty/BUILD.mk			# │
-include dsp/BUILD.mk				# │
-include third_party/stb/BUILD.mk		# │
-include third_party/mbedtls/BUILD.mk		# │
-include third_party/ncurses/BUILD.mk		# │
-include third_party/readline/BUILD.mk		# │
-include third_party/libcxx/BUILD.mk		# │
-include third_party/pcre/BUILD.mk		# │
-include third_party/less/BUILD.mk		# │
-include net/https/BUILD.mk			# │
-include third_party/regex/BUILD.mk		# │
-include third_party/bash/BUILD.mk		#─┘
-include third_party/tidy/BUILD.mk
-include third_party/BUILD.mk
-include third_party/nsync/testing/BUILD.mk
-include libc/testlib/BUILD.mk
-include tool/viz/lib/BUILD.mk
-include tool/args/BUILD.mk
-include test/posix/BUILD.mk
-include test/tool/args/BUILD.mk
-include third_party/linenoise/BUILD.mk
-include third_party/maxmind/BUILD.mk
-include net/finger/BUILD.mk
-include third_party/double-conversion/test/BUILD.mk
-include third_party/lua/BUILD.mk
-include third_party/tree/BUILD.mk
-include third_party/zstd/BUILD.mk
-include third_party/tr/BUILD.mk
-include third_party/sed/BUILD.mk
-include third_party/awk/BUILD.mk
-include third_party/hiredis/BUILD.mk
-include third_party/make/BUILD.mk
-include third_party/ctags/BUILD.mk
-include third_party/finger/BUILD.mk
-include third_party/argon2/BUILD.mk
-include third_party/smallz4/BUILD.mk
-include third_party/sqlite3/BUILD.mk
-include third_party/mbedtls/test/BUILD.mk
-include third_party/quickjs/BUILD.mk
-include third_party/lz4cli/BUILD.mk
-include third_party/zip/BUILD.mk
-include third_party/xxhash/BUILD.mk
-include third_party/unzip/BUILD.mk
-include tool/build/lib/BUILD.mk
-include third_party/chibicc/BUILD.mk
-include third_party/chibicc/test/BUILD.mk
-include third_party/python/BUILD.mk
-include tool/build/BUILD.mk
-include tool/curl/BUILD.mk
-include third_party/qemu/BUILD.mk
-include examples/BUILD.mk
-include examples/pyapp/BUILD.mk
-include examples/pylife/BUILD.mk
-include tool/decode/lib/BUILD.mk
-include tool/decode/BUILD.mk
-include tool/lambda/lib/BUILD.mk
-include tool/lambda/BUILD.mk
-include tool/plinko/lib/BUILD.mk
-include tool/plinko/BUILD.mk
-include test/tool/plinko/BUILD.mk
-include tool/net/BUILD.mk
-include tool/viz/BUILD.mk
-include tool/BUILD.mk
-include net/turfwar/BUILD.mk
-include test/libc/tinymath/BUILD.mk
-include test/libc/intrin/BUILD.mk
-include test/libc/mem/BUILD.mk
-include test/libc/nexgen32e/BUILD.mk
-include test/libc/runtime/BUILD.mk
-include test/libc/thread/BUILD.mk
-include test/libc/sock/BUILD.mk
-include test/libc/str/BUILD.mk
-include test/libc/log/BUILD.mk
-include test/libc/str/BUILD.mk
-include test/libc/calls/BUILD.mk
-include test/libc/x/BUILD.mk
-include test/libc/xed/BUILD.mk
-include test/libc/fmt/BUILD.mk
-include test/libc/time/BUILD.mk
-include test/libc/proc/BUILD.mk
-include test/libc/stdio/BUILD.mk
-include test/libc/release/BUILD.mk
-include test/libc/BUILD.mk
-include test/net/http/BUILD.mk
-include test/net/https/BUILD.mk
-include test/net/finger/BUILD.mk
-include test/net/BUILD.mk
-include test/tool/build/lib/BUILD.mk
-include test/tool/build/BUILD.mk
-include test/tool/viz/lib/BUILD.mk
-include test/tool/viz/BUILD.mk
-include test/tool/net/BUILD.mk
-include test/tool/BUILD.mk
-include test/dsp/core/BUILD.mk
-include test/dsp/scale/BUILD.mk
-include test/dsp/tty/BUILD.mk
-include test/dsp/BUILD.mk
-include examples/package/lib/BUILD.mk
-include examples/package/BUILD.mk
+include build/online.mk				# │
+include libc/stubs/stubs.mk			#─┘
+include libc/nexgen32e/nexgen32e.mk		#─┐
+include libc/sysv/sysv.mk			# ├──SYSTEM SUPPORT
+include libc/nt/nt.mk				# │  You can do math
+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/stdio/stdio.mk			# │
+include net/net.mk				# │
+include libc/log/log.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/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 third_party/third_party.mk
+include libc/testlib/testlib.mk
+include tool/viz/lib/vizlib.mk
+include examples/examples.mk
+include third_party/lz4cli/lz4cli.mk
+include tool/build/lib/buildlib.mk
+include third_party/chibicc/chibicc.mk
+include third_party/chibicc/test/test.mk
+include tool/build/emucrt/emucrt.mk
+include tool/build/emubin/emubin.mk
+include tool/build/build.mk
+include tool/decode/lib/decodelib.mk
+include tool/decode/decode.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/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/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/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/test.mk
+include test/dsp/core/test.mk
+include test/dsp/scale/test.mk
+include test/dsp/tty/test.mk
+include test/dsp/test.mk
+include examples/package/lib/build.mk
+include examples/package/build.mk
 #-φ-examples/package/new.sh
-include test/BUILD.mk
+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)
+test:	$(TESTS) all
 depend:	o/$(MODE)/depend
 tags:	TAGS HTAGS
 
 o/$(MODE)/.x:
-	@$(COMPILE) -AMKDIR -tT$@ $(MKDIR) $(@D)
+	@mkdir -p $(@D) && touch $@
 
-o/$(MODE)/srcs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(SRCS),$(dir $(x)))) $(SRCS)
-	$(file >$@,$(SRCS))
-o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x)))) $(HDRS) $(INCS)
-	$(file >$@,$(HDRS) $(INCS))
-o/$(MODE)/incs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(INCS) $(INCS),$(dir $(x)))) $(INCS) $(INCS)
-	$(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 $@ -s -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))))
+o/$(MODE)/srcs.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))))
+
+o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x))))
 	$(file >$@) $(foreach x,$(HDRS) $(INCS),$(file >>$@,$(x)))
 
-TAGS: private .UNSANDBOXED = 1
-TAGS:	o/$(MODE)/srcs-old.txt $(SRCS) #o/$(MODE)/third_party/ctags/ctags.com
-	@$(RM) $@
-	@o/$(MODE)/third_party/ctags/ctags.com $(TAGSFLAGS) -L $< -o $@
+o/$(MODE)/depend: o/$(MODE)/.x o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt $(SRCS) $(HDRS) $(INCS)
+	@$(COMPILE) -AMKDEPS $(MKDEPS) -o $@ -r o/$(MODE)/ o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt
 
-HTAGS: private .UNSANDBOXED = 1
-HTAGS:	o/$(MODE)/hdrs-old.txt $(filter-out third_party/libcxx/%,$(HDRS)) #o/$(MODE)/third_party/ctags/ctags.com
-	@$(RM) $@
-	@build/htags o/$(MODE)/third_party/ctags/ctags.com -L $< -o $@
+TAGS:	o/$(MODE)/srcs.txt $(SRCS)
+	@rm -f $@
+	@$(COMPILE) -ATAGS -T$@ $(TAGS) $(TAGSFLAGS) -L $< -o $@
+
+HTAGS:	o/$(MODE)/hdrs.txt $(HDRS)
+	@rm -f $@
+	@$(COMPILE) -ATAGS -T$@ build/htags -L $< -o $@
 
-loc: private .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}' | $<
 
-# PLEASE: MAINTAIN TOPOLOGICAL ORDER
-# FROM HIGHEST LEVEL TO LOWEST LEVEL
-COSMOPOLITAN_OBJECTS =			\
-	TOOL_ARGS			\
-	NET_HTTP			\
-	LIBC_SOCK			\
-	LIBC_NT_WS2_32			\
-	LIBC_NT_IPHLPAPI		\
-	LIBC_X				\
-	THIRD_PARTY_GETOPT		\
-	LIBC_LOG			\
-	LIBC_TIME			\
-	THIRD_PARTY_MUSL		\
-	THIRD_PARTY_ZLIB_GZ		\
-	LIBC_STDIO			\
-	THIRD_PARTY_GDTOA		\
-	THIRD_PARTY_REGEX		\
-	LIBC_THREAD			\
-	LIBC_PROC			\
-	THIRD_PARTY_NSYNC_MEM		\
-	LIBC_MEM			\
-	THIRD_PARTY_DLMALLOC		\
-	LIBC_DLOPEN			\
-	LIBC_RUNTIME			\
-	THIRD_PARTY_NSYNC		\
-	LIBC_ELF			\
-	LIBC_IRQ			\
-	LIBC_CALLS			\
-	LIBC_SYSV_CALLS			\
-	LIBC_VGA			\
-	LIBC_NT_PSAPI			\
-	LIBC_NT_POWRPROF		\
-	LIBC_NT_PDH			\
-	LIBC_NT_GDI32			\
-	LIBC_NT_COMDLG32		\
-	LIBC_NT_USER32			\
-	LIBC_NT_NTDLL			\
-	LIBC_NT_ADVAPI32		\
-	LIBC_NT_SYNCHRONIZATION		\
-	LIBC_FMT			\
-	THIRD_PARTY_ZLIB		\
-	THIRD_PARTY_PUFF		\
-	THIRD_PARTY_COMPILER_RT		\
-	LIBC_TINYMATH			\
-	THIRD_PARTY_XED			\
-	LIBC_STR			\
-	LIBC_SYSV			\
-	LIBC_INTRIN			\
-	LIBC_NT_KERNEL32		\
+COSMOPOLITAN_OBJECTS =		\
+	LIBC_CRYPTO		\
+	LIBC_DNS		\
+	LIBC_SOCK		\
+	LIBC_NT_WS2_32		\
+	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_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_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_TINYMATH		\
+	LIBC_SYSV		\
+	LIBC_STR		\
+	LIBC_INTRIN		\
+	LIBC_NT_KERNEL32	\
 	LIBC_NEXGEN32E
 
-COSMOPOLITAN_H_PKGS =			\
-	APE				\
-	LIBC				\
-	LIBC_CALLS			\
-	LIBC_ELF			\
-	LIBC_FMT			\
-	LIBC_DLOPEN			\
-	LIBC_INTRIN			\
-	LIBC_LOG			\
-	LIBC_MEM			\
-	LIBC_NEXGEN32E			\
-	LIBC_NT				\
-	LIBC_RUNTIME			\
-	LIBC_SOCK			\
-	LIBC_STDIO			\
-	LIBC_PROC			\
-	THIRD_PARTY_NSYNC		\
-	THIRD_PARTY_XED			\
-	LIBC_STR			\
-	LIBC_SYSV			\
-	LIBC_THREAD			\
-	LIBC_TIME			\
-	LIBC_TINYMATH			\
-	LIBC_X				\
-	LIBC_VGA			\
-	NET_HTTP			\
-	TOOL_ARGS			\
-	THIRD_PARTY_DLMALLOC		\
-	THIRD_PARTY_GDTOA		\
-	THIRD_PARTY_GETOPT		\
-	THIRD_PARTY_MUSL		\
-	THIRD_PARTY_ZLIB		\
+COSMOPOLITAN_HEADERS =		\
+	LIBC			\
+	LIBC_ALG		\
+	LIBC_BITS		\
+	LIBC_CALLS		\
+	LIBC_CRYPTO		\
+	LIBC_DNS		\
+	LIBC_ELF		\
+	LIBC_FMT		\
+	LIBC_INTRIN		\
+	LIBC_LOG		\
+	LIBC_MEM		\
+	LIBC_NEXGEN32E		\
+	LIBC_NT			\
+	LIBC_OHMYPLUS		\
+	LIBC_RAND		\
+	LIBC_RUNTIME		\
+	LIBC_SOCK		\
+	LIBC_STDIO		\
+	LIBC_STR		\
+	LIBC_SYSV		\
+	LIBC_TIME		\
+	LIBC_TINYMATH		\
+	LIBC_UNICODE		\
+	LIBC_X			\
+	LIBC_ZIPOS		\
+	THIRD_PARTY_DLMALLOC	\
+	THIRD_PARTY_GDTOA	\
+	THIRD_PARTY_GETOPT	\
+	THIRD_PARTY_MUSL	\
+	THIRD_PARTY_ZLIB	\
 	THIRD_PARTY_REGEX
 
-COSMOCC_PKGS =				\
-	$(COSMOPOLITAN_H_PKGS)		\
-	THIRD_PARTY_AARCH64		\
-	THIRD_PARTY_LIBCXX		\
-	THIRD_PARTY_INTEL
+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))
+	@$(COMPILE) -AROLLUP -T$@ $^ >$@
 
-o/$(MODE)/cosmopolitan.a:		\
-		$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_A_OBJS))
-
-COSMOCC_HDRS =								\
-	$(wildcard libc/integral/*)					\
-	$(foreach x,$(COSMOCC_PKGS),$($(x)_HDRS))			\
-	$(foreach x,$(COSMOCC_PKGS),$($(x)_INCS))
-
-o/cosmocc.h.txt: Makefile
-	$(file >$@, $(call uniq,$(COSMOCC_HDRS)))
-
-COSMOPOLITAN_H_ROOT_HDRS =						\
-	libc/integral/normalize.inc					\
-	$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_HDRS))
-
-o/cosmopolitan.h.txt: Makefile
-	$(file >$@, $(call uniq,$(COSMOPOLITAN_H_ROOT_HDRS)))
-
-o/cosmopolitan.h: o/cosmopolitan.h.txt					\
-		$(wildcard libc/integral/*)				\
-		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_HDRS))	\
-		$(foreach x,$(COSMOPOLITAN_H_PKGS),$($(x)_INCS))
-	@$(ECHO) '#ifndef __STRICT_ANSI__' >$@
-	@$(ECHO) '#define _COSMO_SOURCE' >>$@
-	@$(ECHO) '#endif' >>$@
-	@$(COMPILE) -AROLLUP -T$@ build/bootstrap/rollup.com @$< >>$@
-
-o/cosmopolitan.html: private .UNSANDBOXED = 1
 o/cosmopolitan.html:							\
 		o/$(MODE)/third_party/chibicc/chibicc.com.dbg		\
-		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))	\
-		$(SRCS)							\
-		$(HDRS)
-	$(file >$(TMPDIR)/$(subst /,_,$@),$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS))))
+		$(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 $@	\
-		-DCOSMO @$(TMPDIR)/$(subst /,_,$@)
+		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))
 
 $(SRCS):					\
 	libc/integral/normalize.inc		\
@@ -563,51 +332,6 @@ $(SRCS):					\
 	libc/integral/lp64arg.inc		\
 	libc/integral/lp64.inc
 
-ifeq ($(ARCH), x86_64)
-TOOLCHAIN_ARTIFACTS =				\
-	o/cosmopolitan.h			\
-	o/$(MODE)/ape/ape.lds			\
-	o/$(MODE)/libc/crt/crt.o		\
-	o/$(MODE)/ape/ape.elf			\
-	o/$(MODE)/ape/ape.o			\
-	o/$(MODE)/ape/ape-copy-self.o		\
-	o/$(MODE)/ape/ape-no-modify-self.o	\
-	o/$(MODE)/cosmopolitan.a		\
-	o/$(MODE)/third_party/libcxx/libcxx.a	\
-	o/$(MODE)/tool/build/march-native.com	\
-	o/$(MODE)/tool/build/ar.com		\
-	o/$(MODE)/tool/build/mktemper.com	\
-	o/$(MODE)/tool/build/fixupobj.com	\
-	o/$(MODE)/tool/build/zipcopy.com	\
-	o/$(MODE)/tool/build/apelink.com	\
-	o/$(MODE)/tool/build/pecheck.com
-else
-TOOLCHAIN_ARTIFACTS =				\
-	o/$(MODE)/ape/ape.elf			\
-	o/$(MODE)/ape/aarch64.lds		\
-	o/$(MODE)/libc/crt/crt.o		\
-	o/$(MODE)/cosmopolitan.a		\
-	o/$(MODE)/third_party/libcxx/libcxx.a	\
-	o/$(MODE)/tool/build/march-native.com	\
-	o/$(MODE)/tool/build/fixupobj.com	\
-	o/$(MODE)/tool/build/zipcopy.com
-endif
-
-.PHONY: toolchain
-toolchain: $(TOOLCHAIN_ARTIFACTS)
-
-.PHONY: clean_toolchain
-clean_toolchain:
-	$(RM) $(TOOLCHAIN_ARTIFACTS)
-
-aarch64: private .INTERNET = true
-aarch64: private .UNSANDBOXED = true
-aarch64:
-	$(MAKE) m=aarch64
-
-clean:
-	$(RM) -r o
-
 # UNSPECIFIED PREREQUISITES TUTORIAL
 #
 # A build rule must exist for all files that make needs to consider in
@@ -632,9 +356,9 @@ $(SRCS):
 $(HDRS):
 $(INCS):
 .DEFAULT:
-	@$(ECHO)
-	@$(ECHO) NOTE: deleting o/$(MODE)/depend because of an unspecified prerequisite: $@
-	@$(ECHO)
-	$(RM) o/$(MODE)/depend
+	@echo >&2
+	@echo NOTE: deleting o/$(MODE)/depend because of an unspecified prerequisite: $@ >&2
+	@echo >&2
+	rm -f o/$(MODE)/depend
 
 -include o/$(MODE)/depend

NOTICE

@@ -0,0 +1,14 @@
+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,6 +1,5 @@
 ![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
@@ -12,261 +11,40 @@ possible performance and the tiniest footprint imaginable.
 
 ## Background
 
-For an introduction to this project, please read the [actually portable
-executable](https://justine.lol/ape.html) blog post and [cosmopolitan
+For an introduction to this project, please read the [αcτµαlly pδrταblε
+εxεcµταblε](https://justine.lol/ape.html) blog post and [cosmopolitan
 libc](https://justine.lol/cosmopolitan/index.html) website. We also have
-[API
-documentation](https://justine.lol/cosmopolitan/documentation.html).
+[API documentation](https://justine.lol/cosmopolitan/documentation.html).
 
 ## Getting Started
 
-You can start by obtaining a release of our `cosmocc` compiler from
-<https://cosmo.zip/pub/cosmocc/>.
+If you're doing your development work on Linux or BSD then you need just
+five files to get started:
 
 ```sh
-mkdir -p cosmocc
-cd cosmocc
-wget https://cosmo.zip/pub/cosmocc/cosmocc.zip
-unzip cosmocc.zip
+wget https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-0.2.zip
+unzip cosmopolitan-amalgamation-0.2.zip
+printf 'main() { printf("hello world\\n"); }\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
+objcopy -S -O binary hello.com.dbg hello.com
+./hello.com
 ```
 
-Here's an example program we can write:
+If you're developing on Windows or MacOS 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.
 
-```c
-// hello.c
-#include <stdio.h>
-
-int main() {
-  printf("hello world\n");
-}
-```
-
-It can be compiled as follows:
+Cosmopolitan can also be compiled from source on any Linux distro.
 
 ```sh
-cosmocc -o hello hello.c
-./hello
-```
-
-The Cosmopolitan Libc runtime links some heavyweight troubleshooting
-features by default, which are very useful for developers and admins.
-Here's how you can log system calls:
-
-```sh
-./hello --strace
-```
-
-Here's how you can get a much more verbose log of function calls:
-
-```sh
-./hello --ftrace
-```
-
-You can use the Cosmopolitan's toolchain to build conventional open
-source projects which use autotools. This strategy normally works:
-
-```sh
-export CC=x86_64-unknown-cosmo-cc
-export CXX=x86_64-unknown-cosmo-c++
-./configure --prefix=/opt/cosmos/x86_64
-make -j
-make install
-```
-
-## Cosmopolitan Source Builds
-
-Cosmopolitan can be compiled from source on any of our supported
-platforms. The Makefile will download cosmocc automatically.
-
-It's recommended that you install a systemwide APE Loader. This command
-requires `sudo` access to copy the `ape` command to a system folder and
-register with binfmt_misc on Linux, for even more performance.
-
-```sh
-ape/apeinstall.sh
-```
-
-You can now build the mono repo with any modern version of GNU Make. To
-make life easier, we've included one in the cosmocc toolchain, which is
-guaranteed to be compatible and furthermore includes our extensions for
-doing build system sandboxing.
-
-```sh
-build/bootstrap/make.com -j8
+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
 o//examples/hello.com
+find o -name \*.com | xargs ls -rShal | less
 ```
-
-Since the Cosmopolitan repository is very large, you might only want to
-build one particular thing. Here's an example of a target that can be
-compiled relatively quickly, which is a simple POSIX test that only
-depends on core LIBC packages.
-
-```sh
-rm -rf o//libc o//test
-build/bootstrap/make.com o//test/posix/signal_test.com
-o//test/posix/signal_test.com
-```
-
-Sometimes it's desirable to build a subset of targets, without having to
-list out each individual one. For example if you wanted to build and run
-all the unit tests in the `TEST_POSIX` package, you could say:
-
-```sh
-build/bootstrap/make.com o//test/posix
-```
-
-Cosmopolitan provides a variety of build modes. For example, if you want
-really tiny binaries (as small as 12kb in size) then you'd say:
-
-```sh
-build/bootstrap/make.com m=tiny
-```
-
-You can furthermore cut out the bloat of other operating systems, and
-have Cosmopolitan become much more similar to Musl Libc.
-
-```sh
-build/bootstrap/make.com m=tinylinux
-```
-
-For further details, see [//build/config.mk](build/config.mk).
-
-## Debugging
-
-To print a log of system calls to stderr:
-
-```sh
-cosmocc -o hello hello.c
-./hello --strace
-```
-
-To print a log of function calls to stderr:
-
-```sh
-cosmocc -o hello hello.c
-./hello --ftrace
-```
-
-Both strace and ftrace use the unbreakable kprintf() facility, which is
-able to be sent to a file by setting an environment variable.
-
-```sh
-export KPRINTF_LOG=log
-./hello --strace
-```
-
-## GDB
-
-Here's the recommended `~/.gdbinit` config:
-
-```gdb
-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
-
-```sh
-gdb foo.com -ex 'add-symbol-file foo.com.dbg 0x401000'
-```
-
-## Platform Notes
-
-### Shells
-
-If you use zsh and have trouble running APE programs try `sh -c ./prog`
-or simply upgrade to zsh 5.9+ (since we patched it two years ago). The
-same is the case for Python `subprocess`, old versions of fish, etc.
-
-### Linux
-
-Some Linux systems are configured to launch MZ executables under WINE.
-Other distros configure their stock installs so that APE programs will
-print "run-detectors: unable to find an interpreter". For example:
-
-```sh
-jart@ubuntu:~$ wget https://cosmo.zip/pub/cosmos/bin/dash
-jart@ubuntu:~$ chmod +x dash
-jart@ubuntu:~$ ./dash
-run-detectors: unable to find an interpreter for ./dash
-```
-
-You can fix that by registering APE with `binfmt_misc`:
-
-```sh
-sudo wget -O /usr/bin/ape https://cosmo.zip/pub/cosmos/bin/ape-$(uname -m).elf
-sudo chmod +x /usr/bin/ape
-sudo sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register"
-sudo sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register"
-```
-
-You should be good now. APE will not only work, it'll launch executables
-400µs faster now too. However if things still didn't work out, it's also
-possible to disable `binfmt_misc` as follows:
-
-```sh
-sudo sh -c 'echo -1 > /proc/sys/fs/binfmt_misc/cli'     # remove Ubuntu's MZ interpreter
-sudo sh -c 'echo -1 > /proc/sys/fs/binfmt_misc/status'  # remove ALL binfmt_misc entries
-```
-
-### WSL
-
-It's normally unsafe to use APE in a WSL environment, because it tries
-to run MZ executables as WIN32 binaries within the WSL environment. In
-order to make it safe to use Cosmopolitan software on WSL, run this:
-
-```sh
-sudo sh -c "echo -1 > /proc/sys/fs/binfmt_misc/WSLInterop"
-```
-
-## Discord Chatroom
-
-The Cosmopolitan development team collaborates on the Redbean Discord
-server. You're welcome to join us! <https://discord.gg/FwAVVu7eJ4>
-
-## Support Vector
-
-| Platform        | Min Version | Circa |
-| :---            | ---:        | ---:  |
-| AMD             | K8 Venus    | 2005  |
-| Intel           | Core        | 2006  |
-| Linux           | 2.6.18      | 2007  |
-| Windows         | 8 [1]       | 2012  |
-| Mac OS X        | 15.6        | 2018  |
-| OpenBSD         | 7           | 2021  |
-| FreeBSD         | 13          | 2020  |
-| NetBSD          | 9.2         | 2021  |
-
-[1] See our [vista branch](https://github.com/jart/cosmopolitan/tree/vista)
-    for a community supported version of Cosmopolitan that works on Windows
-    Vista and Windows 7.
-
-## 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 groups and individuals:
-
-- [Joe Drumgoole](https://github.com/jdrumgoole)
-- [Rob Figueiredo](https://github.com/robfig)
-- [Wasmer](https://wasmer.io/)
-
-For publicly sponsoring our work at the highest tier.

ape/BUILD.mk

@@ -1,284 +0,0 @@
-#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
-#
-# OVERVIEW
-#
-#   αcτµαlly pδrταblε εxεcµταblε
-#
-# DESCRIPTION
-#
-#   This file defines the libraries, runtimes, and build rules needed to
-#   create executables from your Linux workstation that'll run anywhere.
-#   Loading this package will make certain systemic modifications to the
-#   build like turning off the System V "Red Zone" optimization, because
-#   αcτµαlly pδrταblε εxεcµταblεs need to be able to run in kernelspace.
-
-PKGS += APE
-
-APE_FILES := $(wildcard ape/*.*)
-APE_HDRS = $(filter %.h,$(APE_FILES))
-APE_INCS = $(filter %.inc,$(APE_FILES))
-
-ifeq ($(ARCH), aarch64)
-
-APE = o/$(MODE)/ape/aarch64.lds
-
-APELINK =					\
-	$(COMPILE)				\
-	-ALINK.ape				\
-	$(LINK)					\
-	$(LINKARGS)				\
-	$(OUTPUT_OPTION) &&			\
-	$(COMPILE)				\
-	-AFIXUP.ape				\
-	-wT$@					\
-	$(FIXUPOBJ)				\
-	$@
-
-APE_SRCS = ape/ape.S ape/start.S ape/launch.S ape/systemcall.S
-APE_OBJS = o/$(MODE)/ape/ape.o
-APE_NO_MODIFY_SELF = $(APE)
-APE_COPY_SELF = $(APE)
-
-.PHONY: o/$(MODE)/ape
-o/$(MODE)/ape: $(APE)
-
-o/$(MODE)/ape/aarch64.lds:			\
-	ape/aarch64.lds				\
-	libc/zip.internal.h			\
-	libc/thread/tls.h			\
-	libc/calls/struct/timespec.h		\
-	libc/macros.internal.h			\
-	libc/str/str.h
-
-APE_LOADER_LDFLAGS =				\
-	-pie					\
-	-static					\
-	-nostdlib				\
-	--no-dynamic-linker			\
-	-z norelro				\
-	-z common-page-size=0x4000		\
-	-z max-page-size=0x4000
-
-APE_LOADER_FLAGS =				\
-	-DNDEBUG				\
-	-iquote.				\
-	-Wall					\
-	-Wextra					\
-	-fpie					\
-	-Os					\
-	-ffreestanding				\
-	-mgeneral-regs-only			\
-	-fno-asynchronous-unwind-tables		\
-	-fno-stack-protector			\
-	-fno-ident				\
-	-fno-gnu-unique				\
-	-c					\
-	 $(OUTPUT_OPTION)			\
-	$<
-
-o/$(MODE)/ape/ape.elf: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -g $< $@
-	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
-
-o/$(MODE)/ape/ape.elf.dbg:			\
-		o/$(MODE)/ape/start.o		\
-		o/$(MODE)/ape/loader.o		\
-		o/$(MODE)/ape/launch.o		\
-		o/$(MODE)/ape/systemcall.o
-	@$(COMPILE) -ALINK.elf $(LD) $(APE_LOADER_LDFLAGS) -o $@ $(patsubst %.lds,-T %.lds,$^)
-
-o/$(MODE)/ape/loader.o: ape/loader.c ape/ape.h
-	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=33 -g $(APE_LOADER_FLAGS)
-o/$(MODE)/ape/start.o: ape/start.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
-o/$(MODE)/ape/launch.o: ape/launch.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
-o/$(MODE)/ape/systemcall.o: ape/systemcall.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
-
-.PHONY: o/$(MODE)/ape
-o/$(MODE)/ape: o/$(MODE)/ape/ape.elf
-
-else
-
-APE =	o/$(MODE)/ape/ape.o			\
-	o/$(MODE)/ape/ape.lds
-
-APELINK =					\
-	$(COMPILE)				\
-	-ALINK.ape				\
-	$(LINK)					\
-	$(LINKARGS)				\
-	$(OUTPUT_OPTION) &&			\
-	$(COMPILE)				\
-	-AFIXUP.ape				\
-	-wT$@					\
-	$(FIXUPOBJ)				\
-	$@
-
-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
-
-APE_LOADER_FLAGS =				\
-	-DNDEBUG				\
-	-iquote.				\
-	-Wall					\
-	-Wextra					\
-	-Werror					\
-	-pedantic-errors			\
-	-fpie					\
-	-Os					\
-	-ffreestanding				\
-	-mgeneral-regs-only			\
-	-fno-stack-protector			\
-	-fno-ident				\
-	-fno-gnu-unique				\
-	-c					\
-	 $(OUTPUT_OPTION)			\
-	$<
-
-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/ape/idata.inc:				\
-		ape/idata.internal.h		\
-		ape/relocations.h
-
-o/$(MODE)/ape/ape-no-modify-self.o:		\
-		ape/ape.S			\
-		ape/ape.h			\
-		ape/macros.internal.h		\
-		ape/notice.inc			\
-		ape/relocations.h		\
-		ape/ape.internal.h		\
-		libc/dce.h			\
-		libc/elf/def.h			\
-		libc/thread/tls.h		\
-		libc/intrin/asancodes.h		\
-		libc/macho.internal.h		\
-		libc/macros.internal.h		\
-		libc/nexgen32e/uart.internal.h	\
-		libc/calls/metalfile.internal.h	\
-		libc/nt/pedef.internal.h	\
-		libc/runtime/e820.internal.h	\
-		libc/runtime/mman.internal.h	\
-		libc/runtime/pc.internal.h	\
-		libc/sysv/consts/prot.h		\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz	\
-		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/ape.h			\
-		ape/macros.internal.h		\
-		ape/notice.inc			\
-		ape/relocations.h		\
-		ape/ape.internal.h		\
-		libc/dce.h			\
-		libc/elf/def.h			\
-		libc/thread/tls.h		\
-		libc/intrin/asancodes.h		\
-		libc/macho.internal.h		\
-		libc/macros.internal.h		\
-		libc/nexgen32e/uart.internal.h	\
-		libc/calls/metalfile.internal.h	\
-		libc/nt/pedef.internal.h	\
-		libc/runtime/e820.internal.h	\
-		libc/runtime/mman.internal.h	\
-		libc/runtime/pc.internal.h	\
-		libc/sysv/consts/prot.h		\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz
-	@$(COMPILE)				\
-		-AOBJECTIFY.S			\
-		$(OBJECTIFY.S)			\
-		$(OUTPUT_OPTION)		\
-		-DAPE_NO_MODIFY_SELF $<
-
-o/$(MODE)/ape/loader.o: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=121 -g $(APE_LOADER_FLAGS)
-o/$(MODE)/ape/loader-gcc.asm: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=121 -S -g0 $(APE_LOADER_FLAGS)
-o/$(MODE)/ape/loader-clang.asm: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=121 -S -g0 $(APE_LOADER_FLAGS)
-
-o/$(MODE)/ape/loader-xnu.o: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=8 -g $(APE_LOADER_FLAGS)
-o/$(MODE)/ape/loader-xnu-gcc.asm: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CC) -DSUPPORT_VECTOR=8 -S -g0 $(APE_LOADER_FLAGS)
-o/$(MODE)/ape/loader-xnu-clang.asm: ape/loader.c
-	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=8 -S -g0 $(APE_LOADER_FLAGS)
-
-o/$(MODE)/ape/ape.elf: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy.com -f -o $@ $<
-
-o/$(MODE)/ape/ape.macho: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy.com -fm -o $@ $<
-
-APE_LOADER_LDFLAGS =				\
-	-static					\
-	-nostdlib				\
-	--no-dynamic-linker			\
-	-z separate-code			\
-	-z common-page-size=0x1000		\
-	-z max-page-size=0x10000
-
-o/$(MODE)/ape/ape.elf.dbg:			\
-		o/$(MODE)/ape/loader-macho.o	\
-		o/$(MODE)/ape/start.o		\
-		o/$(MODE)/ape/loader.o		\
-		o/$(MODE)/ape/launch.o		\
-		o/$(MODE)/ape/systemcall.o	\
-		ape/loader.lds
-	@$(COMPILE) -ALINK.elf $(LD) $(APE_LOADER_LDFLAGS) -o $@ $(patsubst %.lds,-T %.lds,$^)
-
-.PHONY: o/$(MODE)/ape
-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
-
-endif
-
-# these assembly files are safe to build on aarch64
-o/$(MODE)/ape/ape.o: ape/ape.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) -c $<
-
-o/$(MODE)/ape/ape.o:				\
-		ape/blink-linux-aarch64.gz	\
-		ape/blink-xnu-aarch64.gz
-
-o/$(MODE)/ape/ape.lds:				\
-		ape/ape.lds			\
-		ape/macros.internal.h		\
-		ape/relocations.h		\
-		ape/ape.internal.h		\
-		libc/thread/tls.h		\
-		libc/calls/struct/timespec.h	\
-		libc/thread/thread.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.internal.h

ape/aarch64.lds

@@ -1,294 +0,0 @@
-/*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/thread/tls.h"
-
-ENTRY(_start)
-OUTPUT_ARCH(aarch64)
-OUTPUT_FORMAT("elf64-littleaarch64",
-              "elf64-bigaarch64",
-              "elf64-littleaarch64")
-
-SECTIONS {
-
-  . = SEGMENT_START("text-segment", 0x010000000000);
-  __executable_start = .;
-  . += SIZEOF_HEADERS;
-
-  .interp            : { *(.interp) }
-  .note.gnu.build-id : { *(.note.gnu.build-id) }
-  .hash              : { *(.hash) }
-  .gnu.hash          : { *(.gnu.hash) }
-  .dynsym            : { *(.dynsym) }
-  .dynstr            : { *(.dynstr) }
-  .gnu.version       : { *(.gnu.version) }
-  .gnu.version_d     : { *(.gnu.version_d) }
-  .gnu.version_r     : { *(.gnu.version_r) }
-  .rela.init         : { *(.rela.init) }
-  .rela.text         : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rela.fini         : { *(.rela.fini) }
-  .rela.rodata       : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rela.data.rel.ro  : { *(.rela.data.rel.ro .rela.data.rel.ro.* .rela.gnu.linkonce.d.rel.ro.*) }
-  .rela.data         : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rela.tdata        : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rela.tbss         : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rela.ctors        : { *(.rela.ctors) }
-  .rela.dtors        : { *(.rela.dtors) }
-  .rela.got          : { *(.rela.got) }
-  .rela.bss          : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rela.ifunc        : { *(.rela.ifunc) }
-
-  .rela.plt : {
-    *(.rela.plt)
-    __rela_iplt_start = .;
-    *(.rela.iplt)
-    __rela_iplt_end = .;
-  }
-
-  .init : {
-    *(.start)
-    KEEP(*(.initprologue))
-    KEEP(*(SORT_NONE(.init)))
-    KEEP(*(.initepilogue))
-  } =0x1f2003d5
-
-  .plt : ALIGN(16) {
-    *(.plt)
-    *(.iplt)
-  }
-
-  .text : {
-    *(.text.unlikely .text.*_unlikely .text.unlikely.*)
-    *(.text.antiquity .text.antiquity.*)
-    *(.text.exit .text.exit.*)
-    *(.text.startup .text.startup.*)
-    *(.text.hot .text.hot.*)
-    *(.text.modernity .text.modernity.*)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    *(.gnu.warning)
-  } =0x1f2003d5
-
-  .fini : {
-    KEEP(*(SORT_NONE(.fini)))
-  } =0x1f2003d5
-
-  . += CONSTANT(MAXPAGESIZE);
-
-  .privileged : {
-    __privileged_start = ABSOLUTE(.) & -CONSTANT(MAXPAGESIZE);
-    *(.privileged*)
-  } =0x1f2003d6
-
-  .rodata : {
-    KEEP(*(.rodata.pytab.0));
-    KEEP(*(.rodata.pytab.1));
-    KEEP(*(.rodata.pytab.2));
-    KEEP(*(SORT_BY_NAME(.sort.rodata.*)))
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    *(.ubsan.types)
-    *(.ubsan.data)
-  }
-
-  .comment : {
-    __comment_start = .;
-    KEEP(*(.comment))
-    BYTE(0);
-  }
-
-  .eh_frame_hdr : {
-    *(.eh_frame_hdr)
-    *(.eh_frame_entry .eh_frame_entry.*)
-  }
-
-  .eh_frame : ONLY_IF_RO {
-    KEEP(*(.eh_frame))
-    *(.eh_frame.*)
-  }
-
-  .gcc_except_table : ONLY_IF_RO {
-    *(.gcc_except_table .gcc_except_table.*)
-  }
-
-  .gnu_extab : ONLY_IF_RO {
-    *(.gnu_extab*)
-  }
-
-  .exception_ranges : ONLY_IF_RO {
-    *(.exception_ranges*)
-  }
-
-  __etext = .;
-  _etext = .;
-  PROVIDE(etext = .);
-
-  . += CONSTANT(MAXPAGESIZE);
-  . = DATA_SEGMENT_ALIGN(CONSTANT(MAXPAGESIZE), CONSTANT(COMMONPAGESIZE));
-
-  .eh_frame : ONLY_IF_RW {
-    KEEP(*(.eh_frame))
-    *(.eh_frame.*)
-  }
-
-  .gnu_extab : ONLY_IF_RW {
-    *(.gnu_extab)
-  }
-
-  .gcc_except_table : ONLY_IF_RW {
-    *(.gcc_except_table .gcc_except_table.*)
-  }
-
-  .exception_ranges : ONLY_IF_RW {
-    *(.exception_ranges*)
-  }
-
-  .tdata : {
-    _tdata_start = .;
-    __tdata_start = .;
-    *(.tdata .tdata.* .gnu.linkonce.td.*)
-    _tdata_end = .;
-  }
-
-  .tbss : {
-    _tbss_start = .;
-    *(.tbss .tbss.* .gnu.linkonce.tb.*)
-    *(.tcommon)
-    _tbss_end = .;
-  }
-
-  .init_array : {
-    __init_array_start = .;
-    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
-    KEEP(*(.init_array EXCLUDE_FILE(*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
-    __init_array_end = .;
-  }
-
-  .fini_array : {
-    __fini_array_start = .;
-    KEEP(*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
-    KEEP(*(.fini_array EXCLUDE_FILE(*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
-    __fini_array_end = .;
-  }
-
-  .data.rel.ro : {
-    KEEP(*(SORT_BY_NAME(.piro.relo.sort.*)))
-    *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*)
-    *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*)
-  }
-
-  .dynamic : {
-    *(.dynamic)
-  }
-
-  .got : {
-    *(.got)
-    *(.igot)
-  }
-
-  . = DATA_SEGMENT_RELRO_END(24, .);
-
-  .got.plt : {
-    *(.got.plt)
-    *(.igot.plt)
-  }
-
-  .data : {
-    __data_start = .;
-    KEEP(*(SORT_BY_NAME(.piro.data.sort.*)))
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP(*(SORT_BY_NAME(.sort.data.*)))
-    SORT(CONSTRUCTORS)
-  }
-
-  _edata = .;
-  PROVIDE(edata = .);
-
-  . = .;
-  __bss_start = .;
-  __bss_start__ = .;
-
-  .bss : {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    KEEP(*(SORT_BY_NAME(.piro.bss.sort.*)))
-    *(COMMON)
-    . = ALIGN(CONSTANT(COMMONPAGESIZE));
-  }
-
-  _bss_end__ = .;
-  __bss_end__ = .;
-  . = ALIGN(64 / 8);
-  . = SEGMENT_START("ldata-segment", .);
-  . = ALIGN(64 / 8);
-  __end__ = .;
-  _end = .;
-  PROVIDE(end = .);
-
-  . = DATA_SEGMENT_END(.);
-
-  .stab               0 : { *(.stab) }
-  .stabstr            0 : { *(.stabstr) }
-  .stab.excl          0 : { *(.stab.excl) }
-  .stab.exclstr       0 : { *(.stab.exclstr) }
-  .stab.index         0 : { *(.stab.index) }
-  .stab.indexstr      0 : { *(.stab.indexstr) }
-  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
-  .debug              0 : { *(.debug) }
-  .line               0 : { *(.line) }
-  .debug_srcinfo      0 : { *(.debug_srcinfo) }
-  .debug_sfnames      0 : { *(.debug_sfnames) }
-  .debug_aranges      0 : { *(.debug_aranges) }
-  .debug_pubnames     0 : { *(.debug_pubnames) }
-  .debug_info         0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev       0 : { *(.debug_abbrev) }
-  .debug_line         0 : { *(.debug_line .debug_line.* .debug_line_end) }
-  .debug_frame        0 : { *(.debug_frame) }
-  .debug_str          0 : { *(.debug_str) }
-  .debug_loc          0 : { *(.debug_loc) }
-  .debug_macinfo      0 : { *(.debug_macinfo) }
-  .debug_weaknames    0 : { *(.debug_weaknames) }
-  .debug_funcnames    0 : { *(.debug_funcnames) }
-  .debug_typenames    0 : { *(.debug_typenames) }
-  .debug_varnames     0 : { *(.debug_varnames) }
-  .debug_pubtypes     0 : { *(.debug_pubtypes) }
-  .debug_ranges       0 : { *(.debug_ranges) }
-  .debug_macro        0 : { *(.debug_macro) }
-  .debug_addr         0 : { *(.debug_addr) }
-  .ARM.attributes     0 : { KEEP(*(.ARM.attributes)) KEEP(*(.gnu.attributes)) }
-  .note.gnu.arm.ident 0 : { KEEP(*(.note.gnu.arm.ident)) }
-
-  .zip 0 : {
-    KEEP(*(.zip.file))
-    __zip_cdir_start = .;
-    KEEP(*(.zip.cdir))
-    __zip_cdir_size = . - __zip_cdir_start;
-    KEEP(*(.zip.eocd))
-  }
-
-  /DISCARD/ : {
-    *(__patchable_function_entries)
-    *(.GCC.command.line)
-    *(.note.GNU-stack)
-    *(.gnu_debuglink)
-    *(.text.windows)
-    *(.gnu.lto_*)
-    *(.eh_frame)
-    *(.idata.*)
-    *(.yoink)
-    *(.head)
-  }
-}
-
-ape_stack_vaddr = DEFINED(ape_stack_vaddr) ? ape_stack_vaddr : 0x700000000000;
-ape_stack_memsz = DEFINED(ape_stack_memsz) ? ape_stack_memsz : 8 * 1024 * 1024;
-ape_stack_align = DEFINED(ape_stack_align) ? ape_stack_align : 16;
-ape_stack_round = -ape_stack_align;
-
-_tls_size = _tbss_end - _tdata_start;
-_tdata_size = _tdata_end - _tdata_start;
-_tbss_size = _tbss_end - _tbss_start;
-_tbss_offset = _tbss_start - _tdata_start;
-_tls_content = (_tdata_end - _tdata_start) + (_tbss_end - _tbss_start);
-_tls_align = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
-
-ASSERT(ALIGNOF(.tdata) <= TLS_ALIGNMENT && ALIGNOF(.tbss) <= TLS_ALIGNMENT,
-       "_Thread_local _Alignof can't exceed TLS_ALIGNMENT");

ape/ape.h

@@ -1,13 +0,0 @@
-#ifndef COSMOPOLITAN_APE_APE_H_
-#define COSMOPOLITAN_APE_APE_H_
-
-#define APE_VERSION_MAJOR 1
-#define APE_VERSION_MINOR 10
-#define APE_VERSION_STR   APE_VERSION_STR_(APE_VERSION_MAJOR, APE_VERSION_MINOR)
-#define APE_VERSION_NOTE  APE_VERSION_NOTE_(APE_VERSION_MAJOR, APE_VERSION_MINOR)
-
-#define APE_VERSION_STR__(x, y) #x "." #y
-#define APE_VERSION_STR_(x, y)  APE_VERSION_STR__(x, y)
-#define APE_VERSION_NOTE_(x, y) (100000000 * (x) + 1000000 * (y))
-
-#endif /* COSMOPOLITAN_APE_APE_H_ */

ape/ape.internal.h

@@ -1,9 +0,0 @@
-#ifndef COSMOPOLITAN_APE_APE_INTERNAL_H_
-#define COSMOPOLITAN_APE_APE_INTERNAL_H_
-#include "libc/dce.h"
-
-#if SupportsWindows() || SupportsMetal() || SupportsXnu()
-#define APE_IS_SHELL_SCRIPT
-#endif
-
-#endif /* COSMOPOLITAN_APE_APE_INTERNAL_H_ */

ape/ape.lds

@@ -1,5 +1,5 @@
 /*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
+│vi: set et sts=2 tw=2 fenc=utf-8                                           :vi│
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
@@ -175,46 +175,18 @@
 
 #ifdef __LINKER__
 #include "ape/macros.internal.h"
-#include "ape/relocations.h"
+#include "ape/config.h"
 #include "libc/dce.h"
-#include "libc/elf/def.h"
-#include "libc/elf/pf2prot.internal.h"
 #include "libc/nt/pedef.internal.h"
-#include "libc/thread/tls.h"
-#include "ape/ape.internal.h"
-
-/* uncomment if .com.dbg won't execute on your kernel (will break .com file) */
-/* #define APE_FIX_COM_DBG */
-
-#ifdef __x86__
-#define CODE_GRANULE 1
-#else
-#define CODE_GRANULE 4
-#endif
-
-#ifdef APE_FIX_COM_DBG
-#define SKEW SIZEOF_HEADERS
-#else
-#define SKEW 0
-#endif
-
-#ifndef IMAGE_BASE_VIRTUAL
-#define IMAGE_BASE_VIRTUAL 0x400000
-#endif
-
-#if IMAGE_BASE_VIRTUAL > 0xffffffff
-#error "please use 32-bit addresses for image data"
-#endif
+#include "libc/zip.h"
 
 ENTRY(_start)
 
 PHDRS {
-  Head PT_LOAD FLAGS(PF_X|PF_R);
-  Cod PT_LOAD FLAGS(PF_X|PF_R);
-  Rom PT_LOAD FLAGS(PF_R);
-  Tls PT_TLS FLAGS(PF_W|PF_R);
-  Ram PT_LOAD FLAGS(PF_W|PF_R);
-  stack PT_GNU_STACK FLAGS(PF_W|PF_R);
+  Head PT_LOAD FLAGS(5);
+  Rom PT_LOAD FLAGS(5);
+  Ram PT_LOAD FLAGS(6);
+  stack PT_GNU_STACK FLAGS(6);
 }
 
 SECTIONS {
@@ -224,65 +196,60 @@ SECTIONS {
 /*BEGIN: linux addressability guarantee */
 /*BEGIN: bsd addressability guarantee */
 
-  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) + SKEW : AT(IMAGE_BASE_REAL) {
-    __executable_start = .;
+  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) : {
+    HIDDEN(_base = .);
 
     /* Real Mode */
     KEEP(*(.head))
-    KEEP(*(.apesh))
-    KEEP(*(.text.head))
 
     /* Executable & Linkable Format */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
-    ape_phdrs = .;
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_phdrs = .);
     KEEP(*(.elf.phdrs))
-    ape_phdrs_end = .;
-
-    KEEP(*(.emushprologue))
-    KEEP(*(.emush))
-    KEEP(*(.emushepilogue))
+    HIDDEN(ape_phdrs_end = .);
+    HIDDEN(ape_phdrs32 = .);
+    KEEP(*(.elf.phdrs32))
+    HIDDEN(ape_phdrs32_end = .);
 
     /* OpenBSD */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
-    ape_note = .;
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_note = .);
     KEEP(*(.note.openbsd.ident))
     KEEP(*(.note.netbsd.ident))
-    ape_note_end = .;
+    HIDDEN(ape_note_end = .);
 
     /* Portable Executable */
     KEEP(*(.pe.header))
-    ape_pe_sections = .;
+    HIDDEN(ape_pe_sections = .);
     KEEP(*(.pe.sections))
-    ape_pe_sections_end = .;
+    HIDDEN(ape_pe_sections_end = .);
+    . += 1;
 
     /* Mach-O */
     KEEP(*(.macho))
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
-    ape_macho_end = .;
-
-    /* APE loader */
-    KEEP(*(.ape.loader))
-    . = ALIGN(. != 0 ? CODE_GRANULE : 0);
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_macho_end = .);
+    . += 1;
 
     KEEP(*(.ape.pad.head))
-    . = ALIGN(. != 0 ? (SupportsWindows() || SupportsMetal() ? CONSTANT(COMMONPAGESIZE) : 16) : 0);
-    _ehead = .;
+    . = ALIGN(SupportsWindows() ? 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.*)))
-    _ereal = .;
+    *(.rodata.real)
+    KEEP(*(SORT_BY_NAME(.sort.rodata.real.*)))
+    HIDDEN(_ereal = .);
+
 /*END: realmode addressability guarantee */
-/*BEGIN: morphable code */
-    . += CODE_GRANULE;
 
     /* Normal Code */
-    *(.start)
+    KEEP(*(.start))
     KEEP(*(.initprologue))
     KEEP(*(SORT_BY_NAME(.init.*)))
     KEEP(*(.init))
@@ -301,7 +268,6 @@ SECTIONS {
     KEEP(*(.textwindowsprologue))
     *(.text.windows)
     KEEP(*(.textwindowsepilogue))
-    KEEP(*(.blink))
     *(SORT_BY_ALIGNMENT(.text.modernity))
     *(SORT_BY_ALIGNMENT(.text.modernity.*))
     *(SORT_BY_ALIGNMENT(.text.hot))
@@ -311,98 +277,78 @@ 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));
-    . = ALIGN(__privileged_end > __privileged_start ? CONSTANT(COMMONPAGESIZE) : 0);
-/*END: morphable code */
-    __privileged_start = .;
+    HIDDEN(__privileged_start = .);
+    HIDDEN(__test_end = .);
+    . += 1;
     *(.privileged)
-    __privileged_end = .;
-
-    KEEP(*(.ape.pad.text))
-    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
-/*END: Read Only Data (only needed for initialization) */
-  } :Cod
+    HIDDEN(__privileged_end = .);
 
 /*BEGIN: Read Only Data */
 
-  .rodata . : {
-    KEEP(*(.rodata.pytab.0));
-    KEEP(*(.rodata.pytab.1));
-    KEEP(*(.rodata.pytab.2));
+    KEEP(*(.ape.pad.rodata));
 
     *(.rodata .rodata.*)
     *(.ubsan.types)
     *(.ubsan.data)
 
+    /* Unit Test & Fixture Registry */
+
+/*BEGIN: Read only data that needn't be mapped after initialization */
+
     /* Legal Notices */
 #if !defined(IM_FEELING_NAUGHTY) || defined(EMBED_NOTICES)
     KEEP(*(.commentprologue))
     KEEP(*(.comment))
     KEEP(*(.commentepilogue))
 #endif
-
-/*BEGIN: read-only data that's only needed for initialization */
-
-#if SupportsWindows()
+ 
     /* Windows DLL Import Directory */
     KEEP(*(.idata.ro));
     KEEP(*(SORT_BY_NAME(.idata.ro.*)))
-#endif
+    . += 1;
+
+    . = ALIGN(__SIZEOF_POINTER__);
+    PROVIDE_HIDDEN(__init_array_start = .);
+    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*)
+           SORT_BY_INIT_PRIORITY(.ctors.*)))
+    KEEP(*(.ctors))
+    KEEP(*(.init_array))
+    KEEP(*(.preinit_array))
+    PROVIDE_HIDDEN(__init_array_end = .);
+
+    . = ALIGN(__SIZEOF_POINTER__);
+    PROVIDE_HIDDEN(__fini_array_start = .);
+    KEEP(*(SORT_BY_INIT_PRIORITY(.fini_array.*)
+           SORT_BY_INIT_PRIORITY(.dtors.*)))
+    KEEP(*(.dtors))
+    PROVIDE_HIDDEN(__fini_array_end = .);
 
     /* Encoded Data Structures w/ Linear Initialization Order */
     KEEP(*(.initroprologue))
     KEEP(*(SORT_BY_NAME(.initro.*)))
     KEEP(*(.initroepilogue))
     KEEP(*(SORT_BY_NAME(.sort.rodata.*)))
-    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0); /* don't delete this line :o */
 
-/*END: read-only data that's only needed for initialization */
-
-  } :Rom
-
-/* initialization image for thread-local storage, this is copied */
-/* out to actual TLS areas at runtime, so just make it read-only */
-  .tdata . : {
-    _tdata_start = .;
-    *(SORT_BY_ALIGNMENT(.tdata))
-    *(SORT_BY_ALIGNMENT(.tdata.*))
-    _tdata_end = .;
-    KEEP(*(.ape.pad.rodata))
-    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
-    _etext = .;
-    PROVIDE(etext = .);
-  } :Tls :Rom
+    KEEP(*(.ape.pad.text))
+    . = ALIGN(PAGESIZE);
+    HIDDEN(_etext = .);
+    PROVIDE_HIDDEN(etext = .);
+/*END: Read Only Data (only needed for initialization) */
 /*END: Read Only Data */
-
-  . = ALIGN(CONSTANT(COMMONPAGESIZE));
-
-/* this only tells the linker about the layout of uninitialized */
-/* TLS data, and does not advance the linker's location counter */
-  .tbss : {
-    _tbss_start = .;
-    *(SORT_BY_ALIGNMENT(.tbss))
-    *(SORT_BY_ALIGNMENT(.tbss.*))
-    KEEP(*(.fstls))
-    /* the %fs register is based on this location */
-    _tbss_end = .;
-  } :Tls
+  } :Rom
 
   .data . : {
 /*BEGIN: Read/Write Data */
-#if SupportsWindows()
-    KEEP(*(SORT_BY_NAME(.piro.data.sort.iat.*)))
-#endif
-/*BEGIN: NT FORK COPYING */
     KEEP(*(.dataprologue))
     *(.data .data.*)
-    *(.PyRuntime) /* for python */
-    *(.subrs) /* for emacs */
     KEEP(*(SORT_BY_NAME(.sort.data.*)))
-    . += . > 0 ? CODE_GRANULE : 0;
+    . += . > 0 ? 1 : 0;
 
     KEEP(*(.gotprologue))
     *(.got)
@@ -412,51 +358,23 @@ SECTIONS {
     *(.got.plt)
     KEEP(*(.gotpltepilogue))
 
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
-    __init_array_start = .;
-    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*)
-           SORT_BY_INIT_PRIORITY(.ctors.*)))
-    KEEP(*(.ctors))
-    KEEP(*(.init_array))
-    KEEP(*(.preinit_array))
-    __init_array_end = .;
-
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
-    __fini_array_start = .;
-    KEEP(*(SORT_BY_INIT_PRIORITY(.fini_array.*)
-           SORT_BY_INIT_PRIORITY(.dtors.*)))
-    KEEP(*(.fini_array))
-    KEEP(*(.dtors))
-    __fini_array_end = .;
-
 /*BEGIN: Post-Initialization Read-Only */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
+    . = ALIGN(__SIZEOF_POINTER__);
     KEEP(*(SORT_BY_NAME(.piro.relo.sort.*)))
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 0);
+    PROVIDE_HIDDEN(__relo_end = .);
+    . = ALIGN(__SIZEOF_POINTER__);
     KEEP(*(SORT_BY_NAME(.piro.data.sort.*)))
     KEEP(*(.piro.pad.data))
-    KEEP(*(.dataepilogue))
-    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
-/*END: NT FORK COPYING */
-    _edata = .;
-    PROVIDE(edata = .);
-    _ezip = .; /* <-- very deprecated */
+    . = ALIGN(PAGESIZE);
+    HIDDEN(_edata = .);
+    PROVIDE_HIDDEN(edata = .);
   } :Ram
 
-  . = ALIGN(CONSTANT(COMMONPAGESIZE));
-
-/*END:   file content that's loaded by o/s */
-/*END:   file content */
-/*BEGIN: bss memory that's addressable */
-
-  .bss : {
-/*BEGIN: NT FORK COPYING */
-    KEEP(*(.bssprologue))
+  .bss . : {
     KEEP(*(SORT_BY_NAME(.piro.bss.init.*)))
     *(.piro.bss)
     KEEP(*(SORT_BY_NAME(.piro.bss.sort.*)))
-    __piro_end = .;
-    . += . > 0 ? CODE_GRANULE : 0;
+    HIDDEN(__piro_end = .);
 /*END: Post-Initialization Read-Only */
 
     /* Statically Allocated Empty Space */
@@ -466,17 +384,16 @@ SECTIONS {
 
     KEEP(*(SORT_BY_NAME(.sort.bss.*)))
 
-    KEEP(*(.bssepilogue))
+    /* eXtreme Low Memory w/ Userspace Remapping */
+    . = ALIGN(0x1000);
+    *(.xlm)
+    . = ALIGN(0x1000);
 
-    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
-
-/*END: NT FORK COPYING */
+    . = ALIGN(0x10000); /* for brk()/sbrk() allocation */
+    HIDDEN(_end = .);
+    PROVIDE_HIDDEN(end = .);
   } :Ram
 
-  . = ALIGN(CONSTANT(COMMONPAGESIZE));
-  _end = .;
-  PROVIDE(end = .);
-
 /*END: nt addressability guarantee */
 /*END: bsd addressability guarantee */
 /*END: linux addressability guarantee */
@@ -503,7 +420,6 @@ SECTIONS {
   .debug_line        0 : { *(.debug_line .debug_line.* .debug_line_end ) }
   .debug_frame       0 : { *(.debug_frame) }
   .debug_str         0 : { *(.debug_str) }
-  .debug_line_str    0 : { *(.debug_line_str) }
   .debug_loc         0 : { *(.debug_loc) }
   .debug_macinfo     0 : { *(.debug_macinfo) }
   .debug_weaknames   0 : { *(.debug_weaknames) }
@@ -512,38 +428,19 @@ SECTIONS {
   .debug_varnames    0 : { *(.debug_varnames) }
   .debug_pubtypes    0 : { *(.debug_pubtypes) }
   .debug_ranges      0 : { *(.debug_ranges) }
-  .debug_rnglists    0 : { *(.debug_rnglists) }
   .debug_macro       0 : { *(.debug_macro) }
   .debug_addr        0 : { *(.debug_addr) }
   .gnu.attributes    0 : { KEEP(*(.gnu.attributes)) }
   .GCC.command.line  0 : { *(.GCC.command.line) }
 
-  .zip 0 : {
-    KEEP(*(.zip.file))
-    __zip_cdir_start = .;
-    KEEP(*(.zip.cdir))
-    __zip_cdir_size = . - __zip_cdir_start;
-    KEEP(*(.zip.eocd))
-  }
-
   /DISCARD/ : {
-#if !SupportsWindows()
-    *(.idata.ro);
-    *(.idata.ro.*)
-    *(.piro.data.sort.iat.*)
-#endif
-    *(__patchable_function_entries)
     *(__mcount_loc)
     *(.discard)
     *(.yoink)
+    *(.*)
   }
 }
 
-ape_pe_filealignment = 512;
-ape_pe_sectionalignment = 4096;
-ape_pe_sizeofheaders = SIZEOF(.head);
-ape_pe_sizeofimage = ROUNDUP(_end - __executable_start, ape_pe_sectionalignment);
-
 PFSTUB8(ape_elf_entry, _start);
 PFSTUB8(ape_elf_phoff, RVA(ape_phdrs));
 PFSTUB8(ape_elf_shoff, 0);
@@ -551,101 +448,95 @@ PFSTUB4(ape_elf_phnum, (ape_phdrs_end - ape_phdrs) / 56);
 PFSTUB4(ape_elf_shnum, 0);
 PFSTUB4(ape_elf_shstrndx, 0);
 
-_tls_size = _tbss_end - _tdata_start;
-_tdata_size = _tdata_end - _tdata_start;
-_tbss_size = _tbss_end - _tbss_start;
-_tbss_offset = _tbss_start - _tdata_start;
-_tls_content = (_tdata_end - _tdata_start) + (_tbss_end - _tbss_start);
-_tls_align = 1;
+PFSTUB4(ape_elf32_entry, _start32);
+PFSTUB4(ape_elf32_phoff, RVA(ape_phdrs32));
+PFSTUB4(ape_elf32_shoff, 0);
+PFSTUB4(ape_elf32_phnum, (ape_phdrs32_end - ape_phdrs32) / 32);
+PFSTUB4(ape_elf32_shnum, 0);
+PFSTUB4(ape_elf32_shstrndx, 0);
 
-ape_cod_offset = 0;
-ape_cod_vaddr = ADDR(.head);
-ape_cod_paddr = LOADADDR(.head);
-ape_cod_filesz = ADDR(.rodata) - ADDR(.head);
-ape_cod_memsz = ape_cod_filesz;
-ape_cod_align = CONSTANT(COMMONPAGESIZE);
-ape_cod_rva = RVA(ape_cod_vaddr);
+HIDDEN(__privileged_addr = ROUNDDOWN(__privileged_start, PAGESIZE)); 
+HIDDEN(__privileged_size = (ROUNDUP(__privileged_end, PAGESIZE) -
+                            ROUNDDOWN(__privileged_start, PAGESIZE))); 
 
-ape_rom_vaddr = ADDR(.rodata);
-ape_rom_offset = ape_rom_vaddr - __executable_start;
-ape_rom_paddr = LOADADDR(.rodata);
-ape_rom_filesz = ADDR(.tbss) - ADDR(.rodata);
-ape_rom_memsz = ape_rom_filesz;
-ape_rom_align = CONSTANT(COMMONPAGESIZE);
-ape_rom_rva = RVA(ape_rom_vaddr);
+HIDDEN(ape_rom_offset = 0);
+HIDDEN(ape_rom_vaddr = ADDR(.head));
+HIDDEN(ape_rom_paddr = LOADADDR(.head));
+HIDDEN(ape_rom_filesz = LOADADDR(.data) - ape_rom_paddr);
+HIDDEN(ape_rom_memsz = ADDR(.data) - ADDR(.head));
+HIDDEN(ape_rom_align = PAGESIZE);
+HIDDEN(ape_rom_rva = RVA(ape_rom_vaddr));
 
-ape_ram_vaddr = ADDR(.data);
-ape_ram_offset = ape_ram_vaddr - __executable_start;
-ape_ram_paddr = LOADADDR(.data);
-ape_ram_filesz = ADDR(.bss) - ADDR(.data);
-ape_ram_memsz = _end - ADDR(.data);
-ape_ram_align = CONSTANT(COMMONPAGESIZE);
-ape_ram_rva = RVA(ape_ram_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_memsz = ADDR(.bss) + SIZEOF(.bss) - ape_ram_vaddr);
+HIDDEN(ape_ram_align = PAGESIZE);
+HIDDEN(ape_ram_rva = RVA(ape_ram_vaddr));
 
-ape_stack_pf = DEFINED(ape_stack_pf) ? ape_stack_pf : PF_R | PF_W;
-ape_stack_prot = _PF2PROT(ape_stack_pf);
-ape_stack_offset = 0;
-ape_stack_vaddr = DEFINED(ape_stack_vaddr) ? ape_stack_vaddr : 0x700000000000;
-ape_stack_paddr = ape_ram_paddr + ape_ram_filesz;
-ape_stack_filesz = 0;
-ape_stack_memsz = DEFINED(ape_stack_memsz) ? ape_stack_memsz : 8 * 1024 * 1024;
-ape_stack_align = DEFINED(ape_stack_align) ? ape_stack_align : 16;
-ape_stack_round = -ape_stack_align;
+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);
+HIDDEN(ape_note_filesz = ape_note_end - ape_note);
+HIDDEN(ape_note_memsz = ape_note_filesz);
+HIDDEN(ape_note_align = __SIZEOF_POINTER__);
 
-ape_note_offset = ape_cod_offset + (ape_note - ape_cod_vaddr);
-ape_note_filesz = ape_note_end - ape_note;
-ape_note_memsz = ape_note_filesz;
+HIDDEN(ape_text_offset = ape_rom_offset + LOADADDR(.text) - ape_rom_paddr);
+HIDDEN(ape_text_paddr = LOADADDR(.text));
+HIDDEN(ape_text_vaddr = ADDR(.text));
+HIDDEN(ape_text_filesz = SIZEOF(.text));
+HIDDEN(ape_text_memsz = SIZEOF(.text));
+HIDDEN(ape_text_align = PAGESIZE);
+HIDDEN(ape_text_rva = RVA(ape_text_vaddr));
 
-ape_text_vaddr = ADDR(.text);
-ape_text_offset = ape_text_vaddr - __executable_start;
-ape_text_paddr = LOADADDR(.text);
-ape_text_filesz = ADDR(.rodata) - ADDR(.text);
-ape_text_memsz = ape_text_filesz;
-ape_text_align = CONSTANT(COMMONPAGESIZE);
-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_align = PAGESIZE);
+HIDDEN(ape_data_rva = RVA(ape_data_vaddr));
 
-/* 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, CONSTANT(COMMONPAGESIZE)) / 64
-            : 0);
+HIDDEN(ape_bss_offset = ape_ram_offset + LOADADDR(.bss) - ape_ram_paddr);
+HIDDEN(ape_bss_paddr = LOADADDR(.bss));
+HIDDEN(ape_bss_vaddr = ADDR(.bss));
+HIDDEN(ape_bss_filesz = 0);
+HIDDEN(ape_bss_memsz = SIZEOF(.bss));
+HIDDEN(ape_bss_align = PAGESIZE);
 
-#if defined(APE_IS_SHELL_SCRIPT) && !IsTiny()
+#if SupportsXnu()
+SHSTUB2(ape_macho_dd_skip, RVA(ape_macho) / 8);
+SHSTUB2(ape_macho_dd_count, (ape_macho_end - ape_macho) / 8);
+#endif
 
-#define IDENTITY(X) X
-
-#define APE_DECLARE_FIXED_DECIMAL(F, X)                                                      \
-    X##_quad = DEFINED(X) ? ((F(X) < 1000000000 ? 32 : F(X) / 1000000000 % 10 + 48) << 000 | \
-                             (F(X) < 100000000 ? 32 : F(X) / 100000000 % 10 + 48) << 010 |   \
-                             (F(X) < 10000000 ? 32 : F(X) / 10000000 % 10 + 48) << 020 |     \
-                             (F(X) < 1000000 ? 32 : F(X) / 1000000 % 10 + 48) << 030 |       \
-                             (F(X) < 100000 ? 32 : F(X) / 100000 % 10 + 48) << 040 |         \
-                             (F(X) < 10000 ? 32 : F(X) / 10000 % 10 + 48) << 050 |           \
-                             (F(X) < 1000 ? 32 : F(X) / 1000 % 10 + 48) << 060 |             \
-                             (F(X) < 100 ? 32 : F(X) / 100 % 10 + 48) << 070) : 0;           \
-    X##_short = DEFINED(X) ? ((F(X) < 10 ? 32 : F(X) / 10 % 10 + 48) << 000 |                \
-                              (F(X) % 10 + 48) << 010) : 0
-
-APE_DECLARE_FIXED_DECIMAL(RVA,      blink_linux_aarch64);
-APE_DECLARE_FIXED_DECIMAL(IDENTITY, blink_linux_aarch64_size);
-APE_DECLARE_FIXED_DECIMAL(RVA,      blink_xnu_aarch64);
-APE_DECLARE_FIXED_DECIMAL(IDENTITY, blink_xnu_aarch64_size);
-
-#endif /* APE_IS_SHELL_SCRIPT */
+#if 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
 
 #if SupportsMetal()
-v_ape_realsectors = MIN(0x70000 - IMAGE_BASE_REAL, ROUNDUP(RVA(_ezip), 512)) / 512;
-v_ape_realbytes = v_ape_realsectors * 512;
-v_ape_realdwords = v_ape_realsectors * (512 / 4);
-v_ape_allsectors = ROUNDUP(RVA(_ezip), 512) / 512;
-v_ape_allbytes = v_ape_allsectors * 512;
-v_ape_highsectors = MIN(0xffff, v_ape_allsectors - v_ape_realsectors);
-TSSDESCSTUB2(_tss, _tss, _tss_end ? _tss_end - _tss - 1 : 0);
+HIDDEN(v_ape_realsectors =
+           MIN(REAL_SCRATCH_AREA - IMAGE_BASE_REAL,
+               ROUNDUP(RVA(_edata), 4096)) / 512);
+HIDDEN(v_ape_realpages = v_ape_realsectors / (4096 / 512));
+HIDDEN(v_ape_highsectors =
+           (ROUNDUP(RVA(_edata), 512) / 512) - v_ape_realsectors);
 #endif
 
+/* ZIP End of Central Directory header */
+#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);
+ZIPCONST(v_zip_records, v_zip_cdirsize / kZipCdirHdrLinkableSize);
+ZIPCONST(v_zip_commentsize, _edata - __zip_end - kZipCdirHdrMinSize);
+
 #if SupportsXnu()
 /* Generates deterministic ID. */
 #define PHI 0x9e3779b9925d4c17
@@ -664,8 +555,19 @@ TSSDESCSTUB2(_tss, _tss, _tss_end ? _tss_end - _tss - 1 : 0);
   KMH(ape_uuid1, X);      \
   XORSHIFT(ape_uuid2, X); \
   KMH(ape_uuid2, X)
-ape_uuid1 = 88172645463325252;
-ape_uuid2 = 88172645463325252;
+HIDDEN(ape_uuid1 = 88172645463325252);
+HIDDEN(ape_uuid2 = 88172645463325252);
+CHURN(ape_bss_align);
+CHURN(ape_bss_filesz);
+CHURN(ape_bss_memsz);
+CHURN(ape_bss_offset);
+CHURN(ape_bss_paddr);
+CHURN(ape_data_filesz);
+CHURN(ape_data_memsz);
+CHURN(ape_data_offset);
+CHURN(ape_data_paddr);
+CHURN(ape_data_rva);
+CHURN(ape_data_vaddr);
 CHURN(ape_elf_entry);
 CHURN(ape_elf_phnum);
 CHURN(ape_elf_phoff);
@@ -674,10 +576,13 @@ CHURN(ape_elf_shoff);
 CHURN(ape_elf_shstrndx);
 CHURN(ape_macho_end);
 CHURN(ape_note);
+CHURN(ape_note_align);
 CHURN(ape_note_end);
 CHURN(ape_note_filesz);
 CHURN(ape_note_memsz);
 CHURN(ape_note_offset);
+CHURN(ape_note_paddr);
+CHURN(ape_note_vaddr);
 CHURN(ape_ram_align);
 CHURN(ape_ram_filesz);
 CHURN(ape_ram_memsz);
@@ -691,14 +596,7 @@ CHURN(ape_rom_memsz);
 CHURN(ape_rom_offset);
 CHURN(ape_rom_paddr);
 CHURN(ape_rom_rva);
-CHURN(ape_cod_vaddr);
-CHURN(ape_cod_align);
-CHURN(ape_cod_filesz);
-CHURN(ape_cod_memsz);
-CHURN(ape_cod_offset);
-CHURN(ape_cod_paddr);
-CHURN(ape_cod_rva);
-CHURN(ape_cod_vaddr);
+CHURN(ape_rom_vaddr);
 CHURN(ape_text_align);
 CHURN(ape_text_filesz);
 CHURN(ape_text_memsz);
@@ -710,12 +608,12 @@ CHURN(ADDR(.bss));
 CHURN(_start);
 CHURN(ape_phdrs);
 #if SupportsMetal()
-CHURN(v_ape_allsectors);
+CHURN(v_ape_realsectors);
 #endif
 #if SupportsXnu()
 CHURN(ape_macho);
 #endif
-#if SupportsWindows() || SupportsMetal()
+#if SupportsWindows()
 CHURN(ape_mz);
 CHURN(ape_pe);
 CHURN(ape_pe_offset);
@@ -728,33 +626,6 @@ CHURN(WinMain);
 #endif /* SupportsWindows() */
 #endif /* SupportsXnu() */
 
-#if SupportsWindows() || SupportsMetal()
-#define LINK_WINDOWS (SupportsWindows() && !DEFINED(EfiMain))
-PFSTUB4(ape_pe_offset, ape_pe - ape_mz);
-ape_pe_optsz = ape_pe_sections - (ape_pe + 24);
-ASSERT(ape_pe_optsz % 8 == 0, "SizeOfOptionalHeader must be multiple of 8");
-ape_pe_shnum = (ape_pe_sections_end - ape_pe_sections) / 40;
-ape_pe_base = IMAGE_BASE_VIRTUAL;
-ape_idataz = LINK_WINDOWS ? RVA(ape_idata_iat) : 0;
-ape_idata_iatsize = LINK_WINDOWS ? ape_idata_iatend - ape_idata_iat : 0;
-ape_idata = LINK_WINDOWS ? RVA(ape_idata_idt) : 0;
-ape_idata_idtsize = LINK_WINDOWS ? ape_idata_idtend - ape_idata_idt : 0;
-v_ntversion = LINK_WINDOWS ? 6 : 1;
-v_ntdllchar = LINK_WINDOWS ? 288 : 0;
-v_ntsubversion = LINK_WINDOWS ? 6 : 5;
-v_ntsubsystem = (LINK_WINDOWS
-                 ? (DEFINED(GetMessage)
-                    ? kNtImageSubsystemWindowsGui
-                    : kNtImageSubsystemWindowsCui)
-                 : kNtImageSubsystemEfiApplication);
-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");
@@ -765,16 +636,11 @@ ASSERT(((DEFINED(__init_rodata_end) ? __init_rodata_end : 0) %
 ASSERT((!DEFINED(ape_grub) ? 1 : RVA(ape_grub) < 8192),
        "grub stub needs to be in first 8kb of image");
 
-ASSERT(IS2POW(ape_stack_memsz),
-       "ape_stack_memsz must be a two power");
+ASSERT(DEFINED(_start) || DEFINED(_start16),
+       "please link a _start() or _start16() entrypoint");
 
-ASSERT(ape_stack_vaddr % ape_stack_memsz == 0,
-       "ape_stack_vaddr must have ape_stack_memsz alignment; try using STATIC_STACK_ADDR(0x700000040000 & -ape_stack_memsz);");
-
-ASSERT(ALIGNOF(.tdata) <= TLS_ALIGNMENT && ALIGNOF(.tbss) <= TLS_ALIGNMENT,
-       "_Thread_local _Alignof can't exceed TLS_ALIGNMENT");
-
-ASSERT(DEFINED(main), "main() function not defined");
+ASSERT(!DEFINED(_start16) || REAL(_end) < 65536,
+       "ape won't support non-tiny real mode programs");
 
 /* Let's not be like Knight Capital. */
 /* NOCROSSREFS_TO(.test .text) */

ape/ape.mk

@@ -0,0 +1,54 @@
+#-*-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───────────────────────┘
+#
+# OVERVIEW
+#
+#   αcτµαlly pδrταblε εxεcµταblε
+#
+# DESCRIPTION
+#
+#   This file defines the libraries, runtimes, and build rules needed to
+#   create executables from your Linux workstation that'll run anywhere.
+#   Loading this package will make certain systemic modifications to the
+#   build like turning off the System V "Red Zone" optimization, because
+#   αcτµαlly pδrταblε εxεcµταblεs need to be able to run in kernelspace.
+
+PKGS += APE
+
+APE =	$(APE_DEPS)			\
+	$(APE_OBJS)			\
+	o/$(MODE)/ape/ape.lds
+
+APELINK =				\
+	$(COMPILE)			\
+	-ALINK.ape			\
+	$(LINK)				\
+	$(LINKARGS)			\
+	$(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_CHECKS = $(APE_HDRS:%=o/%.ok)
+
+o/$(MODE)/ape/ape.lds:			\
+		ape/ape.lds		\
+		ape/config.h		\
+		ape/macros.internal.h	\
+		libc/dce.h		\
+		libc/zip.h
+
+o/ape/idata.inc:			\
+		ape/idata.internal.h	\
+		ape/relocations.h
+
+$(APE_OBJS):	$(BUILD_FILES)		\
+		ape/ape.mk
+
+.PHONY: o/$(MODE)/ape
+o/$(MODE)/ape:	$(APE)			\
+		$(APE_CHECKS)		\
+		o/$(MODE)/ape/lib

ape/apeinstall.sh

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

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-PROG=${0##*/}
-MODE=${MODE:-$m}
-COSMO=${COSMO:-/opt/cosmo}
-COSMOS=${COSMOS:-/opt/cosmos}
-
-if [ ! -f ape/loader.c ]; then
-  cd "$COSMO" || exit
-fi
-
-if [ "$UID" = "0" ]; then
-  SUDO=
-else
-  SUDO=sudo
-fi
-
-{
-  echo
-  echo "APE Uninstaller intends to run (in pseudo-shell)"
-  echo
-  echo "    sudo echo -1 into /proc/sys/fs/binfmt_misc/APE*"
-  echo "    sudo rm -f /usr/bin/ape ~/.ape /tmp/.ape # etc."
-  echo
-  echo "You may then use ape/apeinstall.sh to reinstall it"
-  echo
-} >&2
-
-set -ex
-for f in /proc/sys/fs/binfmt_misc/APE*; do
-  if [ -f $f ]; then
-    $SUDO sh -c "echo -1 >$f" || exit
-  fi
-done
-
-# system installation
-if [ -f /usr/bin/ape ]; then
-  $SUDO rm -f /usr/bin/ape
-fi
-if [ -f /usr/local/bin/ape ]; then
-  $SUDO rm -f /usr/local/bin/ape
-fi
-
-# legacy installations
-rm -f o/tmp/ape /tmp/ape "${TMPDIR:-/tmp}/ape"
-
-# ad-hoc installations
-for x in .ape \
-         .ape-1.1 \
-         .ape-1.3 \
-         .ape-1.4 \
-         .ape-1.5 \
-         .ape-1.6 \
-         .ape-1.7 \
-         .ape-1.8 \
-         .ape-1.9 \
-         .ape-1.10 \
-         .ape-blink-0.9.2 \
-         .ape-blink-1.0.0; do
-  rm -f \
-     ~/$x \
-     /tmp/$x \
-     o/tmp/$x \
-     "${TMPDIR:-/tmp}/$x"
-done

ape/config.h

@@ -0,0 +1,118 @@
+#ifndef APE_CONFIG_H_
+#define APE_CONFIG_H_
+#include "ape/relocations.h"
+#include "libc/macros.h"
+
+/*
+ * 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
+
+#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_ */

ape/idata.internal.h

@@ -1,5 +1,5 @@
 /*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
+│vi: set et ft=asm ts=8 sw=8 fenc=utf-8                                     :vi│
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
@@ -31,84 +31,80 @@
 //	@see	libc/nt/master.sh
 //	@see	ape/ape.lds
 //	@see	winimp
-.macro	.imp	dll:req fn:req actual:req
-#ifdef __x86_64__
-	.dll	"\dll"
-	.section ".piro.data.sort.iat.2.\dll\().2.\actual","aw",@progbits
+.macro	.imp	dll:req fn:req actual:req hint
+	.dll	\dll
+	.section .piro.data.sort.iat.2.\dll\().2.\actual,"aw",@progbits
 	.type	\fn,@object
 	.align	__SIZEOF_POINTER__
-\fn:	.quad	RVA(("\dll\().\actual"))
+\fn:	.quad	RVA((\dll\().\actual))
 	.size	\fn,.-\fn
 	.globl	\fn
 	.hidden	\fn
 	.previous
-	.section ".idata.ro.ilt.\dll\().2.\actual","a",@progbits
-"idata.ilt.\dll\().\actual":
-	.quad	RVA("\dll\().\actual")
-	.type	"idata.ilt.\dll\().\actual",@object
-	.size	"idata.ilt.\dll\().\actual",.-"idata.ilt.\dll\().\actual"
+	.section .idata.ro.ilt.\dll\().2.\actual,"a",@progbits
+.Lidata.ilt.\dll\().\actual:
+	.quad	RVA((\dll\().\actual))
+	.type	.Lidata.ilt.\dll\().\actual,@object
+	.size	.Lidata.ilt.\dll\().\actual,.-.Lidata.ilt.\dll\().\actual
 	.previous
-	.section ".idata.ro.hnt.\dll\().2.\actual","a",@progbits
-"\dll\().\actual":
-	.short	0			// hint
+	.section .idata.ro.hnt.\dll\().2.\actual,"a",@progbits
+\dll\().\actual:
+	.ifnb	\hint			# hint i.e. guess function ordinal
+	.short	\hint
+	.else
+	.short	0
+	.endif
 	.asciz	"\actual"
-	.align	2			// documented requirement
-	.globl	"\dll\().\actual"
-	.hidden	"\dll\().\actual"
-	.type	"\dll\().\actual",@object
-	.size	"\dll\().\actual",.-"\dll\().\actual"
+	.align	2			# documented requirement
+	.globl	\dll\().\actual
+	.hidden	\dll\().\actual
+	.type	\dll\().\actual,@object
+	.size	\dll\().\actual,.-\dll\().\actual
 	.previous
-#else
-	.section ".data.nt.\actual","aw",@progbits
-	.globl	"\fn"
-	.balign	8
-	.weak	"\actual"
-"\fn":	.quad	"\actual"
-#endif
 .endm
 
 //	Defines DLL import.
 //	@note	this is an implementation detail of .imp
 .macro	.dll	name:req
-  .section ".idata.ro.idt.2.\name","aG",@progbits,"\name",comdat
-	.equ	".Lidata.idt.\name",.
-	.long	RVA("idata.ilt.\name")		// ImportLookupTable
-	.long	0				// TimeDateStamp
-	.long	0				// ForwarderChain
-	.long	RVA(".Lidata.str.\name")	// DllNameRva
-	.long	RVA("idata.iat.\name")		// ImportAddressTable
-	.type	".Lidata.idt.\name",@object
-	.size	".Lidata.idt.\name",.-".Lidata.idt.\name"
+  .section .idata.ro.idt.2.\name,"aG",@progbits,\name,comdat
+	.equ	.Lidata.idt.\name,.
+	.long	RVA(idata.ilt.\name)		# ImportLookupTable
+	.long	0				# TimeDateStamp
+	.long	0				# ForwarderChain
+	.long	RVA(.Lidata.str.\name)		# DllNameRva
+	.long	RVA(idata.iat.\name)		# ImportAddressTable
+	.type	.Lidata.idt.\name,@object
+	.size	.Lidata.idt.\name,.-.Lidata.idt.\name
   .previous
-  .section ".idata.ro.ilt.\name\().1","aG",@progbits,"\name",comdat
-	.balign	__SIZEOF_POINTER__
-	.type	"idata.ilt.\name",@object
-"idata.ilt.\name":
+  .section .idata.ro.ilt.\name\().1,"aG",@progbits,\name,comdat
+	.align	__SIZEOF_POINTER__
+	.type	idata.ilt.\name,@object
+idata.ilt.\name:
 	.previous/*
 	...
 	decentralized content
 	...
-	*/.section ".idata.ro.ilt.\name\().3","aG",@progbits,"\name",comdat
+	*/.section .idata.ro.ilt.\name\().3,"aG",@progbits,\name,comdat
 	.quad	0
   .previous
-  .section ".idata.ro.hnt.\name\().1","aG",@progbits,"\name",comdat
-	.balign	__SIZEOF_POINTER__
-	.type	"idata.hnt.\name",@object
-	.equ	"idata.hnt.\name",.
+  .section .idata.ro.hnt.\name\().1,"aG",@progbits,\name,comdat
+	.align	__SIZEOF_POINTER__
+	.type	idata.hnt.\name,@object
+	.equ	idata.hnt.\name,.
   .previous
-  .section ".piro.data.sort.iat.2.\name\().1","awG",@progbits,"\name",comdat
-	.balign	__SIZEOF_POINTER__
-	.type	"idata.iat.\name",@object
-"idata.iat.\name":
+  .section .piro.data.sort.iat.2.\name\().1,"awG",@progbits,\name,comdat
+	.align	__SIZEOF_POINTER__
+	.type	idata.iat.\name,@object
+idata.iat.\name:
 	.previous/*
 	...
 	decentralized content
 	...
-	*/.section ".piro.data.sort.iat.2.\name\().3","awG",@progbits,"\name",comdat
+	*/.section .piro.data.sort.iat.2.\name\().3,"awG",@progbits,\name,comdat
 	.quad	0
   .previous
   .section .rodata.str1.1,"aSM",@progbits,1
-".Lidata.str.\name":
+.Lidata.str.\name:
 	.asciz	"\name\().dll"
   .previous
 .endm

ape/launch.S

@@ -1,90 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.internal.h"
-
-//	Calls _start() function of loaded program.
-//
-//	When the program entrypoint is called, all registers shall be
-//	cleared, with the exception of (1) %rdi will be equal to %rsp
-//	on FreeBSD and (2) %cl will contain the detected host OS code
-//
-//	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 because your APE loader
-//	should be compiled using gcc/clang's -mgeneral-regs-only flag
-//
-//	@param	rdi is passed through as-is
-//	@param	rsi is address of entrypoint (becomes zero)
-//	@param	rdx is passed through as-is
-//	@param	rcx is passed through as-is
-//	@param	r8  is stack pointer (becomes zero)
-//	@noreturn
-Launch:
-#ifdef __aarch64__
-
-	mov	x16,x1
-	mov	sp,x4
-	mov	x1,0
-	mov	x4,0
-	mov	x5,0
-	mov	x6,0
-	mov	x7,0
-	mov	x8,0
-	mov	x9,0
-	mov	x10,0
-	mov	x11,0
-	mov	x12,0
-	mov	x13,0
-	mov	x14,0
-	mov	x15,0
-	mov	x17,0
-	mov	x19,0
-	mov	x20,0
-	mov	x21,0
-	mov	x22,0
-	mov	x23,0
-	mov	x24,0
-	mov	x25,0
-	mov	x26,0
-	mov	x27,0
-	mov	x28,0
-	mov	x29,0
-	mov	x30,0
-	br	x16
-
-#else
-
-	mov	%r8,%rsp
-	xor	%r8d,%r8d
-	xor	%r9d,%r9d
-	xor	%r10d,%r10d
-	xor	%r11d,%r11d
-	xor	%r12d,%r12d
-	xor	%r13d,%r13d
-	xor	%r14d,%r14d
-	xor	%r15d,%r15d
-	push	%rsi
-	xor	%esi,%esi
-	xor	%ebp,%ebp
-	xor	%ebx,%ebx
-	xor	%eax,%eax
-	ret
-
-#endif
-	.endfn	Launch,globl

ape/lib/apelib.mk

@@ -0,0 +1,45 @@
+#-*-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

@@ -0,0 +1,58 @@
+/*-*- 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

@@ -0,0 +1,35 @@
+/*-*- 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

@@ -0,0 +1,37 @@
+/*-*- 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

@@ -0,0 +1,55 @@
+/*-*- 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

@@ -0,0 +1,31 @@
+/*-*- 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

@@ -0,0 +1,37 @@
+/*-*- 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

@@ -0,0 +1,42 @@
+/*-*- 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

@@ -0,0 +1,45 @@
+/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
+│vi: set et ft=asm ts=8 tw=8 fenc=utf-8                                     :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "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

@@ -0,0 +1,36 @@
+/*-*- 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

@@ -0,0 +1,26 @@
+/*-*- 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

@@ -0,0 +1,242 @@
+/*-*- 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

@@ -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 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-macho.S

@@ -1,95 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ 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"
-
-//	Apple Mach-O Executable Headers
-//	Fixups are applied by objbincopy.com
-//	There must exist a MAC_LC_SEGMENT_64 for every PT_LOAD
-
-	.section .macho,"a",@progbits
-	.balign	64
-	.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|MAC_SPLIT_SEGS	// 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	0				// vaddr
-	.quad	0				// memsz
-	.quad	0				// file offset
-	.quad	0				// file size
-	.long	0				// maxprot
-	.long	0				// initprot
-	.long	0				// segment section count
-	.long	0				// flags
-30:	.long	MAC_LC_SEGMENT_64
-	.long	40f-30b
-	.ascin	"__RODATA",16
-	.quad	0				// vaddr
-	.quad	0				// memsz
-	.quad	0				// file offset
-	.quad	0				// file size
-	.long	0				// maxprot
-	.long	0				// initprot
-	.long	0				// segment section count
-	.long	0				// flags
-40:	.long	MAC_LC_UUID
-	.long	50f-40b
-	.quad	0x4527148ba7a513ef		// uuid1
-	.quad	0x56fa865940665e8f		// 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	0				// 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	XnuEntrypoint			// rip
-	.quad	0				// rflags
-	.quad	0				// cs
-	.quad	0				// fs
-	.quad	0				// gs
-520:
-60:

ape/loader.lds

@@ -1,95 +0,0 @@
-/*-*- mode: ld-script; indent-tabs-mode: nil; tab-width: 2; coding: utf-8   -*-│
-│ vi: set et sts=2 sw=2 fenc=utf-8                                         :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 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(ElfEntrypoint)
-
-PHDRS {
-  text PT_LOAD FLAGS(1) FILEHDR PHDRS; /* PF_X */
-  rodata PT_LOAD FLAGS(4); /* PF_R */
-  stack PT_GNU_STACK FLAGS(6); /* PF_W|PF_R */
-  note PT_NOTE FLAGS(4); /* PF_R */
-}
-
-SECTIONS {
-
-  . = SEGMENT_START("text-segment", 0x7f000000);
-  __executable_start = .;
-  . += SIZEOF_HEADERS;
-
-  .macho : {
-    KEEP(*(.macho))
-  } :text
-
-  .note : {
-    KEEP(*(.note))
-  } :text :note
-
-  .text : {
-    *(.text .text.* .gnu.linkonce.t.*)
-  } :text
-
-  .rodata ALIGN(CONSTANT(COMMONPAGESIZE)) : {
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-  } :rodata
-
-  .stack : {
-    *(.stack)
-  } :stack
-
-  _end = .;
-
-  .stab               0 : { *(.stab) }
-  .stabstr            0 : { *(.stabstr) }
-  .stab.excl          0 : { *(.stab.excl) }
-  .stab.exclstr       0 : { *(.stab.exclstr) }
-  .stab.index         0 : { *(.stab.index) }
-  .stab.indexstr      0 : { *(.stab.indexstr) }
-  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
-  .debug              0 : { *(.debug) }
-  .line               0 : { *(.line) }
-  .debug_srcinfo      0 : { *(.debug_srcinfo) }
-  .debug_sfnames      0 : { *(.debug_sfnames) }
-  .debug_aranges      0 : { *(.debug_aranges) }
-  .debug_pubnames     0 : { *(.debug_pubnames) }
-  .debug_info         0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev       0 : { *(.debug_abbrev) }
-  .debug_line         0 : { *(.debug_line .debug_line.* .debug_line_end) }
-  .debug_frame        0 : { *(.debug_frame) }
-  .debug_str          0 : { *(.debug_str) }
-  .debug_loc          0 : { *(.debug_loc) }
-  .debug_macinfo      0 : { *(.debug_macinfo) }
-  .debug_weaknames    0 : { *(.debug_weaknames) }
-  .debug_funcnames    0 : { *(.debug_funcnames) }
-  .debug_typenames    0 : { *(.debug_typenames) }
-  .debug_varnames     0 : { *(.debug_varnames) }
-  .debug_pubtypes     0 : { *(.debug_pubtypes) }
-  .debug_ranges       0 : { *(.debug_ranges) }
-  .debug_macro        0 : { *(.debug_macro) }
-  .debug_addr         0 : { *(.debug_addr) }
-  .debug_loclists     0 : { *(.debug_loclists) }
-  .debug_rnglists     0 : { *(.debug_rnglists) }
-  .debug_line_str     0 : { *(.debug_line_str) }
-  .debug_extra        0 : { *(.debug_line_str) }
-  .debug_pubtypes     0 : { *(.debug_pubtypes) }
-  .gnu.attributes     0 : { KEEP(*(.gnu.attributes)) }
-
-  /DISCARD/ : {
-    *(.*)
-  }
-}

ape/macros.internal.h

@@ -1,5 +1,5 @@
 /*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
+│vi: set et ft=asm ts=8 sw=8 fenc=utf-8                                     :vi│
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
@@ -18,10 +18,130 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #ifndef APE_MACROS_H_
 #define APE_MACROS_H_
-#include "libc/macros.internal.h"
+#include "libc/macros.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */
 
+/**
+ * @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
+.macro	rlcall	function:req
+	.byte	0x50                   	# push %[er]ax
+	.byte	0xb8,0,0		# mov $?,%[e]ax
+	jmp	911f
+	.byte	0x58                   	# pop %[er]ax
+	.byte	0xe8			# call Jvds
+	.long	\function\()-.-4
+	jmp	912f
+911:	.byte	0x58                   	# pop %[er]ax
+	.byte	0xe8			# call Jvds
+	.short	\function\()-.-2
+912:
+.endm
+
+//	Loads far (i.e. <1mb) abs constexpr ADDRESS into ES:DI+EDX+RDX.
+//	@mode	long,legacy,real
+.macro	movesdi	address:req
+	.byte	0xbf			# mov $0x????xxxx,%[e]di
+	.short	\address>>4
+	.byte	0x8e,0xc7		# mov %di,%es
+	.byte	0xbf			# mov $0x????xxxx,%[e]di
+	.short	\address&0xf
+	jmp	297f
+	.byte	0xbf			# mov $0x????xxxx,%edi
+	.long	\address
+297:	
+.endm
+
+//	Loads 16-bit CONSTEXPR into Qw-register w/ optional zero-extend.
+//	@mode	long,legacy,real
+.macro	bbmov	constexpr:req abcd abcd.hi:req abcd.lo:req
+ .ifnb	\abcd
+  .if	(\constexpr)<128 && (\constexpr)>=0
+	pushpop	\constexpr,\abcd
+   .exitm
+  .endif
+ .endif
+	movb	$(\constexpr)>>8&0xff,\abcd.hi
+	movb	$(\constexpr)&0xff,\abcd.lo
+.endm
+
+//	Compares 16-bit CONSTEXPR with Qw-register.
+//	@mode	long,legacy,real
+.macro	bbcmp	constexpr:req abcd.hi:req abcd.lo:req
+	cmpb	$(\constexpr)>>8&0xff,\abcd.hi
+	jnz	387f
+	cmpb	$(\constexpr)&0xff,\abcd.lo
+387:
+.endm
+
+//	Adds 16-bit CONSTEXPR to Qw-register.
+//	@mode	long,legacy,real
+.macro	bbadd	constexpr:req abcd.hi:req abcd.lo:req
+	addb	$(\constexpr)&0xff,\abcd.lo
+ .if	(\constexpr) != 0
+	adcb	$(\constexpr)>>8&0xff,\abcd.hi
+ .endif
+.endm
+
+//	Subtracts 16-bit CONSTEXPR from Qw-register.
+//	@mode	long,legacy,real
+.macro	bbsub	constexpr:req abcd.hi:req abcd.lo:req
+	subb	$(\constexpr)&0xff,\abcd.lo
+ .if	(\constexpr) != 0
+	sbbb	$(\constexpr)>>8&0xff,\abcd.hi
+ .endif
+.endm
+
+//	Ands Qw-register with 16-bit CONSTEXPR.
+//	@mode	long,legacy,real
+.macro	bband	constexpr:req abcd.hi:req abcd.lo:req
+ .if	((\constexpr)&0xff) != 0xff || ((\constexpr)>>8&0xff) == 0xff
+	andb	$(\constexpr)&0xff,\abcd.lo
+ .endif
+ .if	((\constexpr)>>8&0xff) != 0xff
+	andb	$(\constexpr)>>8&0xff,\abcd.hi
+ .endif
+.endm
+
+//	Ors Qw-register with 16-bit CONSTEXPR.
+//	@mode	long,legacy,real
+.macro	bbor	constexpr:req abcd.hi:req abcd.lo:req
+ .if	((\constexpr)&0xff) != 0 || ((\constexpr)>>8&0xff) != 0
+	orb	$(\constexpr)&0xff,\abcd.lo
+ .endif
+ .if	((\constexpr)>>8&0xff) != 0
+	orb	$(\constexpr)>>8&0xff,\abcd.hi
+ .endif
+.endm
+
+//	Performs ACTION only if in real mode.
+//	@mode	long,legacy,real
+.macro	rlo	clobber:req action:vararg
+990:	mov	$0,\clobber
+	.if	.-990b!=3
+	.error	"bad clobber or assembler mode"
+	.endif
+991:	\action
+	.rept	2-(.-991b)
+	nop
+	.endr
+	.if	.-991b!=2
+	.error	"ACTION must be 1-2 bytes"
+	.endif
+.endm
+
 //	Initializes real mode stack.
 //	The most holiest of holy code.
 //	@mode	real
@@ -67,20 +187,6 @@
  .stub	\name\()_bcs\n,long
 .endm
 
-//	Task State Segment Descriptor Entries.
-.macro	.tssdescstub name:req
- .ifndef \name
-  .weak	\name
-  .set	\name,0
- .endif
- .ifndef \name\()_end
-  .weak	\name\()_end
-  .set	\name\()_end,0
- .endif
- .stub	\name\()_desc_ent0,quad
- .stub	\name\()_desc_ent1,quad
-.endm
-
 /* clang-format on */
 #elif defined(__LINKER__)
 
@@ -122,58 +228,44 @@
 /**
  * Binary coded decimal support.
  *
- * <p>This allows linker scripts to generate dd commands, e.g. ape.lds.
- * There are a few ways to pad each number to the necessary 8 bytes.
- * Spaces cannot be prepended because busybox refuses to parse them.
- * Zeros cannot be prepended because Mac will take numbers as octal.
- * That leaves appending spaces. The user's shell ought to treat any
- * unquoted run of spaces as if there was only one, so this is safe.
+ * <p>This allows linker scripts to generate dd commands. Leading spaces
+ * need to be inserted so Mac doesn't consider them octal; therefore,
+ * parameters must be quoted; and eight digits should be good enough.
  */
-#define SHSTUB2(SYM, X)             \
-  HIDDEN(SYM##_bcs0 = BCD_LEFT(X)); \
-  HIDDEN(SYM##_bcs1 = BCD_RIGHT(X))
-#define BCD_SMEAR(X) ((X) + (X) * 10000)
-#define BCD_LEFT(X)                                      \
-  (((X)) < 10000     ? BCD_RIGHT(BCD_SMEAR(X)) | 0x10    \
-   : (X) < 100000    ? BCD_RIGHT(BCD_SMEAR((X) / 10))    \
-   : (X) < 1000000   ? BCD_RIGHT(BCD_SMEAR((X) / 100))   \
-   : (X) < 10000000  ? BCD_RIGHT(BCD_SMEAR((X) / 1000))  \
-   : (X) < 100000000 ? BCD_RIGHT(BCD_SMEAR((X) / 10000)) \
-                     : 0xffffffffffffffff)
-#define BCD_RIGHT(X) \
-  (((X)) < 10000     ? 0x20202020                  \
-   : (X) < 100000    ? 0x20202030 +                \
-                       (X) % 10                    \
-   : (X) < 1000000   ? 0x20203030 +                \
-                       ((X) / 10) % 10 +           \
-                       (X) % 10 * 0x100            \
-   : (X) < 10000000  ? 0x20303030 +                \
-                       ((X) / 100) % 10 +          \
-                       ((X) / 10) % 10 * 0x100 +   \
-                       (X) % 10 * 0x10000          \
-   : (X) < 100000000 ? 0x30303030 +                \
-                       ((X) / 1000) % 10 +         \
-                       ((X) / 100) % 10 * 0x100 +  \
-                       ((X) / 10) % 10 * 0x10000 + \
-                       (X) % 10 * 0x1000000        \
-                     : 0xffffffffffffffff)
-
-/**
- * Laying out the GDT entries for a TSS for bare metal operation.
- */
-#define TSSDESCSTUB2(SYM, BASE, LIM)                 \
-  HIDDEN(SYM##_desc_ent0 = TSSDESC_ENT0(BASE, LIM)); \
-  HIDDEN(SYM##_desc_ent1 = TSSDESC_ENT1(BASE));      \
-  ASSERT((LIM) >= 0 && (LIM) <= 0xffff, "bare metal TSS is suspiciously fat")
-#define TSSDESC_ENT0(BASE, LIM)                \
-  (((LIM)        <<  0 & 0x000000000000ffff) | \
-   ((BASE)       << 16 & 0x000000ffffff0000) | \
-    0x89         << 40                       | \
-   ((LIM)  >> 16 << 48 & 0x000f000000000000) | \
-    0x2          << 52                       | \
-   ((BASE) >> 24 << 56 & 0xff00000000000000))
-#define TSSDESC_ENT1(BASE)                     \
-   ((BASE) >> 32 <<  0 & 0x00000000ffffffff)
+#define SHSTUB2(SYM, X)           \
+  HIDDEN(SYM##_bcs0 = BCD10K(X)); \
+  HIDDEN(SYM##_bcs1 = BCD(X))
+#define BCD(X)                                                                 \
+  ((X) == 0                                                                    \
+       ? 0x20202030                                                            \
+       : (X) < 10 ? 0x30202020 + (((X) % 10) << 24)                            \
+                  : (X) < 100 ? 0x30302020 + (((X) % 10) << 24) +              \
+                                    (((X) / 10 % 10) << 16)                    \
+                              : (X) < 1000 ? 0x30303020 + (((X) % 10) << 24) + \
+                                                 (((X) / 10 % 10) << 16) +     \
+                                                 (((X) / 100 % 10) << 8)       \
+                                           : 0x30303030 + (((X) % 10) << 24) + \
+                                                 (((X) / 10 % 10) << 16) +     \
+                                                 (((X) / 100 % 10) << 8) +     \
+                                                 (((X) / 1000 % 10) << 0))
+#define BCD10K(X)                                                          \
+  ((X) < 10000                                                             \
+       ? 0x20202020                                                        \
+       : (X) < 100000                                                      \
+             ? 0x30202020 + (((X) / 10000 % 10) << 24)                     \
+             : (X) < 1000000                                               \
+                   ? 0x30302020 + (((X) / 10000 % 10) << 24) +             \
+                         (((X) / 100000 % 10) << 16)                       \
+                   : (X) < 10000000                                        \
+                         ? 0x30303020 + (((X) / 10000 % 10) << 24) +       \
+                               (((X) / 100000 % 10) << 16) +               \
+                               (((X) / 1000000 % 10) << 8)                 \
+                         : (X) < 100000000                                 \
+                               ? 0x30303030 + (((X) / 10000 % 10) << 24) + \
+                                     (((X) / 100000 % 10) << 16) +         \
+                                     (((X) / 1000000 % 10) << 8) +         \
+                                     (((X) / 10000000 % 10) << 0)          \
+                               : 0xffffffffffffffff)
 
 #endif /* __ASSEMBLER__ */
 #endif /* APE_MACROS_H_ */

ape/public/ape.lds

@@ -1 +0,0 @@
-#include "ape/ape.lds"

ape/relocations.h

@@ -11,8 +11,6 @@
   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
@@ -21,6 +19,26 @@
 #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.
  */
@@ -36,8 +54,8 @@
  */
 #define REAL(x) ((x) - (IMAGE_BASE_VIRTUAL - IMAGE_BASE_REAL))
 
-#if IMAGE_BASE_VIRTUAL % 0x1000 != 0
-#error "IMAGE_BASE_VIRTUAL must be 4kb aligned"
+#if IMAGE_BASE_VIRTUAL % 0x200000 != 0
+#error "IMAGE_BASE_VIRTUAL must be 2mb aligned"
 #endif
 #if IMAGE_BASE_PHYSICAL % 0x1000 != 0
 #error "IMAGE_BASE_PHYSICAL must be 4kb aligned"

ape/sections.internal.h

@@ -1,28 +0,0 @@
-#ifndef COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_
-#define COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_
-COSMOPOLITAN_C_START_
-
-extern const char __comment_start[] __attribute__((__weak__));
-extern unsigned char __executable_start[] __attribute__((__weak__));
-extern unsigned char __privileged_start[] __attribute__((__weak__));
-extern unsigned char _ehead[] __attribute__((__weak__));
-extern unsigned char _etext[] __attribute__((__weak__));
-extern unsigned char _edata[] __attribute__((__weak__));
-extern unsigned char _ezip[] __attribute__((__weak__));
-extern unsigned char _end[] __attribute__((__weak__));
-extern unsigned char _ereal[] __attribute__((__weak__));
-extern unsigned char _tdata_start[] __attribute__((__weak__));
-extern unsigned char _tdata_end[] __attribute__((__weak__));
-extern unsigned char _tbss_start[] __attribute__((__weak__));
-extern unsigned char _tbss_end[] __attribute__((__weak__));
-extern unsigned char _tls_align[] __attribute__((__weak__));
-extern unsigned char __test_start[] __attribute__((__weak__));
-extern unsigned char __ro[] __attribute__((__weak__));
-extern uint8_t __data_start[] __attribute__((__weak__));
-extern uint8_t __data_end[] __attribute__((__weak__));
-extern uint8_t __bss_start[] __attribute__((__weak__));
-extern uint8_t __bss_end[] __attribute__((__weak__));
-extern unsigned char ape_phdrs[] __attribute__((__weak__));
-
-COSMOPOLITAN_C_END_
-#endif /* COSMOPOLITAN_APE_SECTIONS_INTERNAL_H_ */

ape/start.S

@@ -1,74 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 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/dce.h"
-#include "ape/ape.h"
-#include "libc/macros.internal.h"
-
-#ifdef __aarch64__
-
-_start:	mov	x1,sp
-	and     sp,x1,#-16
-	mov	x29,0
-	bl	ApeLoader
-	.endfn	_start,globl
-
-#else
-
-XnuEntrypoint:
-	mov	$_HOSTXNU,%dl			// xnu's not unix!
-ElfEntrypoint:
-	mov	%rsp,%rsi			// save real stack
-	andq    $-16,%rsp                       // force SSE alignment
-	call	ApeLoader
-	.endfn	ElfEntrypoint,globl
-	.endfn	XnuEntrypoint,globl
-
-	.section .note,"a",@progbits
-	.balign	4
-openbsd.ident:
-	.long	2f-1f
-	.long	4f-3f
-	.long	1
-1:	.asciz	"OpenBSD"
-2:	.balign	4
-3:	.long	0
-4:	.size	openbsd.ident,.-openbsd.ident
-	.type	openbsd.ident,@object
-	.balign	4
-netbsd.ident:
-	.long	2f-1f
-	.long	4f-3f
-	.long	1
-1:	.asciz	"NetBSD"
-2:	.balign	4
-3:	.long	901000000
-4:	.size	netbsd.ident,.-netbsd.ident
-	.type	netbsd.ident,@object
-	.balign	4
-ape.ident:
-	.long	2f-1f
-	.long	4f-3f
-	.long	1
-1:	.asciz	"APE"
-2:	.balign	4
-3:	.long	APE_VERSION_NOTE
-4:	.size	ape.ident,.-ape.ident
-	.type	ape.ident,@object
-
-#endif

ape/systemcall.S

@@ -1,49 +0,0 @@
-/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8     -*-│
-│ vi: set noet ft=asm ts=8 sw=8 fenc=utf-8                                 :vi │
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2023 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.internal.h"
-
-//	Invokes system call.
-//
-//	This function has eight parameters. The first seven are for
-//	arguments passed along to the system call. The eight is for
-//	the magic number that indicates which system call is called
-//
-//	The return value follows the Linux kernel convention, where
-//	errors are returned as `-errno`. BSD systems are normalized
-//	to follow this convention automatically.
-SystemCall:
-#ifdef __aarch64__
-	mov	x8,x7
-	mov	x9,0
-	adds	x9,x9,0
-	svc	0
-	bcs	1f
-	ret
-1:	neg	x0,x0
-	ret
-#else
-	mov	%rcx,%r10
-	mov	16(%rsp),%eax
-	clc
-	syscall
-	jnc	1f
-	neg	%rax
-1:	ret
-#endif
-	.endfn	SystemCall,globl

build/actuallynice

@@ -0,0 +1,29 @@
+#!/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/bochs-debugger

@@ -0,0 +1,9 @@
+#!/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

@@ -0,0 +1,51 @@
+#!/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

@@ -0,0 +1,21 @@
+#!/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/config.mk

@@ -1,70 +1,25 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 
 # Default Mode
 #
 #   - `make`
-#   - Optimized
 #   - Backtraces
-#   - Syscall tracing
 #   - Function tracing
-#
+#   - Reasonably small
+#   - Reasonably optimized
+#   - Reasonably debuggable
+
 ifeq ($(MODE),)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CCFLAGS += -O2 $(BACKTRACES)
-CONFIG_CPPFLAGS += -DSYSDEBUG
-TARGET_ARCH ?= -msse3
-endif
-ifeq ($(MODE), x86_64)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CCFLAGS += -O2 $(BACKTRACES)
-CONFIG_CPPFLAGS += -DSYSDEBUG
-endif
-ifeq ($(MODE), aarch64)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CCFLAGS += -O2 $(BACKTRACES)
-CONFIG_CPPFLAGS += -DSYSDEBUG
-endif
 
-# Zero Optimization Mode
-#
-#   - Goes 2x slower
-#   - Supports --strace
-#   - Unsupports --ftrace
-#   - Better GDB debugging
-#
-ifeq ($(MODE), zero)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-OVERRIDE_CFLAGS += -O0
-OVERRIDE_CXXFLAGS += -O0
-CONFIG_CPPFLAGS += -DSYSDEBUG
-endif
-ifeq ($(MODE), aarch64-zero)
-CONFIG_OFLAGS ?= -g
-OVERRIDE_CFLAGS += -O0 -fdce
-OVERRIDE_CXXFLAGS += -O0 -fdce
-CONFIG_CPPFLAGS += -DSYSDEBUG
-endif
+CONFIG_CCFLAGS +=		\
+	$(BACKTRACES)		\
+	$(FTRACE)		\
+	-Og
+
+TARGET_ARCH ?=			\
+	-msse3
 
-# Fast Build Mode
-#
-#   - `make MODE=fastbuild`
-#   - No debugging
-#   - Syscall tracing
-#   - Function tracing
-#   - Some optimizations
-#   - Limited Backtraces
-#
-ifeq ($(MODE), fastbuild)
-ENABLE_FTRACE = 1
-CONFIG_CCFLAGS += $(BACKTRACES) -O
-CONFIG_CPPFLAGS += -DSYSDEBUG -DDWARFLESS
-CONFIG_LDFLAGS += -S
-TARGET_ARCH ?= -msse3
 endif
 
 # Optimized Mode
@@ -72,127 +27,79 @@ 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)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG
-CONFIG_CCFLAGS += $(BACKTRACES) -O3 -fmerge-all-constants
-TARGET_ARCH ?= -march=native
-endif
 
-# Optimized Linux Mode
-# The Fastest Mode of All
-#
-#   - `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_OFLAGS ?= -g
-CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG -DSUPPORT_VECTOR=1
-CONFIG_CCFLAGS += -O3 -fmerge-all-constants
-CONFIG_COPTS += -mred-zone
-TARGET_ARCH ?= -march=native
+ifeq ($(MODE), opt)
+
+CONFIG_CPPFLAGS +=		\
+	-DNDEBUG		\
+	-msse2avx		\
+	-Wa,-msse2avx
+
+CONFIG_CCFLAGS +=		\
+	$(BACKTRACES)		\
+	-O3
+
+TARGET_ARCH ?=			\
+	-march=native
+
 endif
 
 # Release Mode
 #
-# Follows traditional closed source release binary norms.
-#
 #   - `make MODE=rel`
 #   - More optimized
 #   - Reasonably small
 #   - Numeric backtraces
-#   - No DWARF data bloat
 #   - Toilsome debuggability
 #   - assert() statements removed
 #   - DCHECK_xx() statements removed
 #   - No memory corruption detection
 #   - CHECK_xx() won't leak strings into binary
-#
-ifeq ($(MODE), rel)
-CONFIG_CPPFLAGS += -DNDEBUG -DDWARFLESS
-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)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CPPFLAGS += -D__SANITIZE_ADDRESS__
-CONFIG_CCFLAGS += $(BACKTRACES) -O2 -DSYSDEBUG
-CONFIG_COPTS += -fsanitize=address
-TARGET_ARCH ?= -msse3
-QUOTA ?= -C64 -L300
+ifeq ($(MODE), rel)
+
+CONFIG_CPPFLAGS +=		\
+	-DNDEBUG
+
+CONFIG_CCFLAGS +=		\
+	$(BACKTRACES)		\
+	-O2
+
 endif
 
 # Debug Mode
 #
 #   - `make MODE=dbg`
 #   - Backtraces
-#   - Enables asan
-#   - Enables ubsan
-#   - Stack canaries
-#   - No optimization
-#   - Enormous binaries
-#
+#   - Zero optimization
+#   - Enables sanitization
+#   - Enables stack canaries
+#   - Enormous binaries (b/c ubsan suboptimalities)
+
 ifeq ($(MODE), dbg)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_ADDRESS__ -D__SANITIZE_UNDEFINED__
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O0 -fno-inline
-CONFIG_COPTS += -fsanitize=address -fsanitize=undefined
-TARGET_ARCH ?= -msse3
-OVERRIDE_CCFLAGS += -fno-pie
-QUOTA ?= -C64 -L300
-endif
-ifeq ($(MODE), aarch64-dbg)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O0 -fno-inline -fdce
-CONFIG_COPTS += -fsanitize=undefined
-QUOTA ?= -C64 -L300
-endif
+
+CONFIG_CPPFLAGS +=		\
+	-DMODE_DBG
+
+CONFIG_CCFLAGS +=		\
+	$(BACKTRACES)		\
+	$(FTRACE)		\
+	-O2
+
+CONFIG_COPTS +=			\
+	$(SECURITY_BLANKETS)	\
+	$(SANITIZER)
+
+TARGET_ARCH ?=			\
+	-msse3
+
+OVERRIDE_CCFLAGS +=		\
+	-fno-pie
 
-# System Five Mode
-#
-#   - `make MODE=sysv`
-#   - Optimized
-#   - Backtraces
-#   - Debuggable
-#   - Syscall tracing
-#   - Function tracing
-#   - No Windows bloat!
-#
-ifeq ($(MODE), sysv)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g
-CONFIG_CCFLAGS += $(BACKTRACES) -O2
-CONFIG_CPPFLAGS += -DSYSDEBUG -DSUPPORT_VECTOR=121
-TARGET_ARCH ?= -msse3
 endif
 
 # Tiny Mode
@@ -206,73 +113,24 @@ endif
 #   - No backtraces
 #   - 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		\
-	-fschedule-insns2		\
-	-momit-leaf-frame-pointer	\
-	-foptimize-sibling-calls	\
-	-DDWARFLESS
-TARGET_ARCH ?=				\
+CONFIG_CCFLAGS +=		\
+	-Os			\
+	-fno-align-functions	\
+	-fno-align-jumps	\
+	-fno-align-labels	\
+	-fno-align-loops
+TARGET_ARCH ?=			\
 	-msse3
-PYFLAGS +=				\
-	-O2				\
-	-B
-endif
-ifeq ($(MODE), x86_64-tiny)
-CONFIG_CPPFLAGS +=			\
-	-DTINY				\
-	-DNDEBUG			\
-	-DTRUSTWORTHY
-CONFIG_CCFLAGS +=			\
-	-Os				\
-	-fno-align-functions		\
-	-fno-align-jumps		\
-	-fno-align-labels		\
-	-fno-align-loops		\
-	-fschedule-insns2		\
-	-momit-leaf-frame-pointer	\
-	-foptimize-sibling-calls	\
-	-DDWARFLESS
-TARGET_ARCH ?=				\
-	-msse3
-PYFLAGS +=				\
-	-O2				\
-	-B
-endif
-ifeq ($(MODE), aarch64-tiny)
-# TODO(jart): -mcmodel=tiny
-CONFIG_CPPFLAGS +=			\
-	-DTINY				\
-	-DNDEBUG			\
-	-DTRUSTWORTHY
-CONFIG_CCFLAGS +=			\
-	-Os				\
-	-fno-align-functions		\
-	-fno-align-jumps		\
-	-fno-align-labels		\
-	-fno-align-loops		\
-	-fschedule-insns2		\
-	-momit-leaf-frame-pointer	\
-	-foptimize-sibling-calls	\
-	-DDWARFLESS
-PYFLAGS +=				\
-	-O2				\
-	-B
 endif
 
 # Linux-Only Tiny Mode
 #
-#   - `make MODE=tinylinux`
+#   - `make MODE=tiny`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -282,27 +140,25 @@ endif
 #   - No portability
 #   - No algorithmics
 #   - YOLO
-#
 ifeq ($(MODE), tinylinux)
-CONFIG_CPPFLAGS +=			\
-	-DTINY				\
-	-DNDEBUG			\
-	-DTRUSTWORTHY			\
-	-DSUPPORT_VECTOR=1		\
-	-DDWARFLESS
-CONFIG_CCFLAGS +=			\
-	-Os				\
-	-fno-align-functions		\
-	-fno-align-jumps		\
-	-fno-align-labels		\
+CONFIG_CPPFLAGS +=		\
+	-DTINY			\
+	-DNDEBUG		\
+	-DTRUSTWORTHY		\
+	-DSUPPORT_VECTOR=1
+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=tinylinuxbsd`
+#   - `make MODE=tiny`
 #   - No apple
 #   - No checks
 #   - No asserts
@@ -313,14 +169,12 @@ endif
 #   - No backtraces
 #   - No algorithmics
 #   - YOLO
-#
 ifeq ($(MODE), tinylinuxbsd)
 CONFIG_CPPFLAGS +=		\
 	-DTINY			\
 	-DNDEBUG		\
 	-DTRUSTWORTHY		\
-	-DSUPPORT_VECTOR=113	\
-	-DDWARFLESS
+	-DSUPPORT_VECTOR=113
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
@@ -333,7 +187,7 @@ endif
 
 # Unix Tiny Mode
 #
-#   - `make MODE=tinysysv`
+#   - `make MODE=tiny`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -343,14 +197,12 @@ endif
 #   - No backtraces
 #   - No algorithmics
 #   - YOLO
-#
 ifeq ($(MODE), tinysysv)
 CONFIG_CPPFLAGS +=		\
 	-DTINY			\
 	-DNDEBUG		\
 	-DTRUSTWORTHY		\
-	-DSUPPORT_VECTOR=121	\
-	-DDWARFLESS
+	-DSUPPORT_VECTOR=121
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
@@ -363,7 +215,7 @@ endif
 
 # Tiny Metallic Unix Mode
 #
-#   - `make MODE=tinynowin`
+#   - `make MODE=tiny`
 #   - No checks
 #   - No asserts
 #   - No canaries
@@ -373,14 +225,12 @@ endif
 #   - No backtraces
 #   - No algorithmics
 #   - YOLO
-#
 ifeq ($(MODE), tinynowin)
 CONFIG_CPPFLAGS +=		\
 	-DTINY			\
 	-DNDEBUG		\
 	-DTRUSTWORTHY		\
-	-DSUPPORT_VECTOR=251	\
-	-DDWARFLESS
+	-DSUPPORT_VECTOR=251
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
@@ -391,40 +241,10 @@ TARGET_ARCH ?=			\
 	-msse3
 endif
 
-# no x87 instructions mode
-#
-#     export MODE=nox87
-#     make -j8 toolchain
-#     cosmocc -o /tmp/hello.com hello.c
-#
-# lets you shave ~23kb off blink
-#
-#     git clone https://github.com/jart/blink
-#     cd blink
-#     ./configure --disable-x87
-#     make -j8
-#     o//blink/blink /tmp/hello.com
-#
-ifeq ($(MODE), nox87)
-ENABLE_FTRACE = 1
-CONFIG_COPTS += -mlong-double-64
-CONFIG_CCFLAGS += $(BACKTRACES) -O2
-CONFIG_CPPFLAGS += -DSYSDEBUG -DNOX87
-TARGET_ARCH ?= -msse3
-endif
-
 # LLVM Mode
-#
-# We aim to support:
-#
-#     make -j8 m=llvm o/llvm/libc
-#
-# The rest of the monorepo may not work with llvm.
-#
 ifeq ($(MODE), llvm)
-.STRICT = 0
 TARGET_ARCH ?= -msse3
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O2
+CONFIG_CCFLAGS += $(BACKTRACES) $(FTRACE) -O2
 AS = clang
 CC = clang
 CXX = clang++
@@ -462,65 +282,17 @@ 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)
+
 CONFIG_CFLAGS += -std=c11
 #CONFIG_CPPFLAGS += -ansi
 CONFIG_CXXFLAGS += -std=c++11
 TARGET_ARCH ?= -msse3
-endif
 
-ifneq ($(ENABLE_FTRACE),)
-CONFIG_CPPFLAGS += -DFTRACE
-FTRACE_CCFLAGS = -fno-inline-functions-called-once
-OVERRIDE_CFLAGS += $(FTRACE_CCFLAGS)
-OVERRIDE_CXXFLAGS += $(FTRACE_CCFLAGS)
-# function prologue nops for --ftrace
-ifeq ($(ARCH), x86_64)
-# this flag causes gcc to generate functions like this
-#
-#       nop nop nop nop nop nop nop nop nop
-#     func:
-#       nop nop
-#       ...
-#
-# which tool/build/fixupobj.c improves at build time like this
-#
-#       nop nop nop nop nop nop nop nop nop
-#     func:
-#       xchg %ax,%ax
-#       ...
-#
-# which --ftrace morphs at runtime like this
-#
-#       ud2                # 2 bytes
-#       call ftrace_hook   # 5 bytes
-#       jmp +2             # 2 bytes
-#     func:
-#       jmp -7             # 2 bytes
-#       ...
-#
-CONFIG_CCFLAGS += -fpatchable-function-entry=18,16
-endif
-ifeq ($(ARCH), aarch64)
-# this flag causes gcc to generate functions like this
-#
-#       nop nop nop nop nop nop
-#     func:
-#       nop
-#       ...
-#
-# which --ftrace morphs at runtime like this
-#
-#       brk #31337
-#       stp x29,x30,[sp,#-16]!
-#       mov x29,sp
-#       bl  ftrace_hook
-#       ldp x29,x30,[sp],#16
-#       b   +1
-#     func:
-#       b   -5
-#       ...
-#
-CONFIG_CCFLAGS += -fpatchable-function-entry=7,6
-endif
 endif

build/definitions.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 #
 # SYNOPSIS
 #
@@ -33,49 +33,72 @@
 #
 # VARIABLES
 #
-#   Our configuration variables, ordered by increasing preference:
-#
-#     CCFLAGS      frontend flags (.i, .c, .cc, .f, .S, .lds, etc.)
-#     OFLAGS       objectify flags (precludes -S and -E)
+#     CCFLAGS      gcc frontend flags (.i, .c, .cc, .f, .S, .lds, etc.)
 #     CPPFLAGS     preprocessor flags (.h, .c, .cc, .S, .inc, .lds, etc.)
-#     TARGET_ARCH  microarchitecture flags (e.g. -march=native)
-#     COPTS        c/c++ flags (.c, .cc)
 #     CFLAGS       c flags (.c only)
 #     CXXFLAGS     c++ flags (.cc only)
+#     COPTS        c/c++ flags (.c, .cc)
 #     LDFLAGS      linker flags (don't use -Wl, frontend prefix)
 #     ASFLAGS      assembler flags (don't use -Wa, frontend prefix)
-#
-#   For each FOO above, there exists (by increasing preference)
-#
-#     DEFAULT_FOO  see build/definitions.mk
-#     CONFIG_FOO   see build/config.mk
-#     FOO          set ~/.cosmo.mk and target-specific
-#     OVERRIDE_FOO set ~/.cosmo.mk and target-specific (use rarely)
-#
+#     TARGET_ARCH  microarchitecture flags (e.g. -march=native)
 
-ifeq ($(LANDLOCKMAKE_VERSION),)
-TMPSAFE = $(join $(TMPDIR),$(subst /,_,$@)).tmp
-else
-TMPSAFE = $(TMPDIR)/
-endif
+V ?= 1
+LC_ALL = C
+SOURCE_DATE_EPOCH = 0
 
-BACKTRACES =								\
-	-fno-optimize-sibling-calls					\
-	-mno-omit-leaf-frame-pointer
+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
+FC = gfortran  #/opt/cross9f/bin/x86_64-linux-musl-gfortran
 
-ifneq ($(ARCH), aarch64)
-BACKTRACES += -fno-schedule-insns2
-endif
+# see build/compile, etc. which run third_party/gcc/unbundle.sh
+AR = build/bootstrap/ar.com
+PKG = build/bootstrap/package.com
+MKDEPS = build/bootstrap/mkdeps.com
+ZIPOBJ = build/bootstrap/zipobj.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
+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
+HELLO := $(shell build/hello)
+TMPDIR := $(shell build/findtmp)
+COMPILE := $(shell build/getcompile) -V$(shell build/getccversion $(CC))
+
+export ADDR2LINE
+export LC_ALL
+export MODE
+export SOURCE_DATE_EPOCH
+export TMPDIR
+export V
+
+FTRACE =								\
+	-pg
 
 SANITIZER =								\
+	-fsanitize=leak							\
 	-fsanitize=address
 
 NO_MAGIC =								\
-	-ffreestanding							\
+	-mno-fentry							\
 	-fno-stack-protector						\
-	-fwrapv								\
 	-fno-sanitize=all						\
-	-fpatchable-function-entry=0,0
+	-fwrapv
 
 OLD_CODE =								\
 	-fno-strict-aliasing						\
@@ -86,108 +109,79 @@ TRADITIONAL =								\
 	-Wno-return-type						\
 	-Wno-pointer-sign
 
-DEFAULT_CCFLAGS +=							\
+DEFAULT_CCFLAGS =							\
 	-Wall								\
 	-Werror								\
-	-fno-omit-frame-pointer						\
+	-fdebug-prefix-map="$(PWD)"=					\
 	-frecord-gcc-switches
 
-DEFAULT_COPTS ?=							\
+DEFAULT_OFLAGS =							\
+	-g								\
+	-gdescribe-dies
+
+DEFAULT_COPTS =								\
+	-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-omit-frame-pointer						\
 	-fno-semantic-interposition					\
-	-fno-dwarf2-cfi-asm						\
-	-fno-unwind-tables						\
-	-fno-asynchronous-unwind-tables
-
-ifeq ($(ARCH), x86_64)
-# Microsoft says "[a]ny memory below the stack beyond the red zone
-# [note: Windows defines the x64 red zone size as 0] is considered
-# volatile and may be modified by the operating system at any time."
-# https://devblogs.microsoft.com/oldnewthing/20190111-00/?p=100685
-DEFAULT_COPTS +=							\
-	-mno-red-zone							\
-	-mno-tls-direct-seg-refs
-endif
-
-ifeq ($(ARCH), aarch64)
-#
-# - Apple says in "Writing ARM64 code for Apple platforms" that we're
-#   not allowed to use the x18 register.
-#
-# - Cosmopolitan Libc uses x28 for thread-local storage because Apple
-#   forbids us from using tpidr_el0 too.
-#
-# - Cosmopolitan currently lacks an implementation of the runtime
-#   libraries needed by the -moutline-atomics flag
-#
-DEFAULT_COPTS +=							\
-	-ffixed-x18							\
-	-ffixed-x28							\
-	-mno-outline-atomics
-endif
+	-mno-omit-leaf-frame-pointer
 
 MATHEMATICAL =								\
 	-O3								\
 	-fwrapv
 
-DEFAULT_CPPFLAGS +=							\
-	-D_COSMO_SOURCE							\
-	-DMODE='"$(MODE)"'						\
+DEFAULT_CPPFLAGS =							\
+	-DIMAGE_BASE_VIRTUAL=$(IMAGE_BASE_VIRTUAL)			\
 	-nostdinc							\
-	-iquote.							\
-	-isystem libc/isystem
+	-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-literal-suffix
+	-Wno-narrowing
 
 DEFAULT_ASFLAGS =							\
 	-W								\
 	-I.								\
-	--noexecstack
+	--noexecstack							\
+	--nocompress-debug-sections
 
 DEFAULT_LDFLAGS =							\
 	-static								\
 	-nostdlib							\
-	-znorelro							\
+	-m elf_x86_64							\
 	--gc-sections							\
 	--build-id=none							\
-	--no-dynamic-linker
+	--no-dynamic-linker						\
+	-z max-page-size=0x1000
 
-# # generate linker report files
-# DEFAULT_LDFLAGS += --cref [email protected]
-
-ifeq ($(ARCH), aarch64)
-DEFAULT_LDFLAGS +=							\
-	-zmax-page-size=0x4000						\
-	-zcommon-page-size=0x4000					\
-	-znorelro
-else
-DEFAULT_LDFLAGS +=							\
-	-zmax-page-size=0x4000						\
-	-zcommon-page-size=0x1000
-endif
+ZIPOBJ_FLAGS =								\
+	 -b$(IMAGE_BASE_VIRTUAL)
 
 ASONLYFLAGS =								\
 	-c								\
-	-g
+	-g								\
+	--debug-prefix-map="$(PWD)"=
 
 DEFAULT_LDLIBS =
 
 MCA =	llvm-mca-10							\
 	-mtriple=x86_64-pc-linux-gnu					\
+	-iterations=3							\
 	-instruction-info						\
 	-iterations=3							\
 	-all-stats							\
@@ -256,31 +250,40 @@ LD.libs =								\
 	$(CONFIG_LIBS)							\
 	$(LIBS)
 
-COMPILE.c.flags = $(cc.flags) $(copt.flags) $(cpp.flags) $(c.flags)
-COMPILE.cxx.flags = $(cc.flags) $(copt.flags) $(cpp.flags) $(cxx.flags)
+COMPILE.c.flags = $(cc.flags) $(cpp.flags) $(copt.flags) $(c.flags)
+COMPILE.cxx.flags = $(cc.flags) $(cpp.flags) $(copt.flags) $(cxx.flags)
+COMPILE.f.flags = $(cc.flags) $(copt.flags) $(f.flags)
+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 = $(cc.flags) $(o.flags) $(S.flags) $(cpp.flags) $(copt.flags) $(c.flags)
-OBJECTIFY.cxx.flags = $(cc.flags) $(o.flags) $(S.flags) $(cpp.flags) $(copt.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 = $(cc.flags) $(o.flags) $(S.flags) $(cpp.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)
+OBJECTIFY.F.flags = $(OBJECTIFY.f.flags) $(cpp.flags)
 PREPROCESS.flags = -E $(copt.flags) $(cc.flags) $(cpp.flags)
 PREPROCESS.lds.flags = -D__LINKER__ $(filter-out -g%,$(PREPROCESS.flags)) -P -xc
 
 COMPILE.c = $(CC) -S $(COMPILE.c.flags)
 COMPILE.cxx = $(CXX) -S $(COMPILE.cxx.flags)
 COMPILE.i = $(CC) -S $(COMPILE.i.flags)
+COMPILE.f = $(FC) -S $(COMPILE.f.flags)
+COMPILE.F = $(FC) -S $(COMPILE.F.flags)
 OBJECTIFY.s = $(AS) $(OBJECTIFY.s.flags)
 OBJECTIFY.S = $(CC) $(OBJECTIFY.S.flags) -c
+OBJECTIFY.f = $(FC) $(OBJECTIFY.f.flags) -c
+OBJECTIFY.F = $(FC) $(OBJECTIFY.F.flags) -c
 OBJECTIFY.c = $(CC) $(OBJECTIFY.c.flags) -c
 OBJECTIFY.cxx = $(CXX) $(OBJECTIFY.cxx.flags) -c
 PREPROCESS = $(CC) $(PREPROCESS.flags)
 PREPROCESS.lds = $(CC) $(PREPROCESS.lds.flags)
 LINK = $(LD) $(LINK.flags)
 ELF = o/libc/elf/elf.lds
-ELFLINK = $(COMPILE) -ALINK.elf $(LINK) $(LINKARGS) $(OUTPUT_OPTION) && $(COMPILE) -AFIXUP.ape -T$@ $(FIXUPOBJ) $@
+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)
 
 # The compiler won't generate %xmm code for sources extensioned .greg.c,
 # which is needed for C modules wanting to run at the executive level or
@@ -294,8 +297,75 @@ OBJECTIFY.greg.c =							\
 	-fno-instrument-functions					\
 	-fno-optimize-sibling-calls					\
 	-fno-sanitize=all						\
-	-ffreestanding							\
-	-fwrapv								\
+	-c
+
+OBJECTIFY.i386.c =							\
+	$(OBJECTIFY.c)							\
+	-m32								\
+	-wrapper build/i386ify.sh
+
+OBJECTIFY.ansi.c = $(CC) $(OBJECTIFY.c.flags) -ansi -Wextra -Werror -pedantic-errors -c
+OBJECTIFY.c99.c = $(CC) $(OBJECTIFY.c.flags) -std=c99 -Wextra -Werror -pedantic-errors -c
+OBJECTIFY.c11.c = $(CC) $(OBJECTIFY.c.flags) -std=c11 -Wextra -Werror -pedantic-errors -c
+OBJECTIFY.c2x.c = $(CC) $(OBJECTIFY.c.flags) -std=c2x -Wextra -Werror -pedantic-errors -c
+
+OBJECTIFY.real.c =							\
+	$(GCC)								\
+	-x-no-pg							\
+	$(OBJECTIFY.c.flags)						\
+	-wrapper build/realify.sh					\
+	-D__REAL_MODE__							\
+	-ffixed-r8							\
+	-ffixed-r9							\
+	-ffixed-r10							\
+	-ffixed-r11							\
+	-ffixed-r12							\
+	-ffixed-r13							\
+	-ffixed-r14							\
+	-ffixed-r15							\
+	-mno-red-zone							\
+	-fcall-used-rbx							\
+	-fno-jump-tables						\
+	-fno-shrink-wrap						\
+	-fno-schedule-insns2						\
+	-flive-range-shrinkage						\
+	-fno-omit-frame-pointer						\
+	-momit-leaf-frame-pointer					\
+	-mpreferred-stack-boundary=3					\
+	-fno-delete-null-pointer-checks					\
+	-c
+
+OBJECTIFY.ncabi.c =							\
+	$(GCC)								\
+	$(OBJECTIFY.c.flags)						\
+	-mno-sse							\
+	-mfpmath=387							\
+	-mno-fentry							\
+	-fno-stack-protector						\
+	-fno-instrument-functions					\
+	-fno-optimize-sibling-calls					\
+	-fno-sanitize=all						\
+	-fcall-saved-rcx						\
+	-fcall-saved-rdx						\
+	-fcall-saved-rdi						\
+	-fcall-saved-rsi						\
+	-fcall-saved-r8							\
+	-fcall-saved-r9							\
+	-fcall-saved-r10						\
+	-fcall-saved-r11						\
+	-c								\
+	-xc
+
+OBJECTIFY.initabi.c =							\
+	$(GCC)								\
+	$(OBJECTIFY.c.flags)						\
+	-mno-fentry							\
+	-fno-stack-protector						\
+	-fno-instrument-functions					\
+	-fno-optimize-sibling-calls					\
+	-fno-sanitize=all						\
+	-fcall-saved-rdi						\
+	-fcall-saved-rsi						\
 	-c
 
 TAGSFLAGS =								\

build/download-cosmocc.sh

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

build/findtmp

@@ -0,0 +1,17 @@
+#!/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/functions.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 #
 # SYNOPSIS
 #
@@ -12,9 +12,5 @@
 
 tail = $(wordlist 2,$(words $1),$1)
 reverse = $(if $1,$(call reverse,$(call tail,$1)) $(firstword $1))
-uniqr = $(if $1,$(call uniqr,$(filter-out $(firstword $1),$1)) $(firstword $1))
-
-# polyfill uniq native (landlock make 1.4)
-ifneq ($(call uniq,c b c a),c b a)
 uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
-endif
+uniqr = $(if $1,$(call uniqr,$(filter-out $(firstword $1),$1)) $(firstword $1))

build/gdb

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

build/getccversion

@@ -0,0 +1,39 @@
+#!/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

@@ -0,0 +1,12 @@
+#!/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 -n
+  mv -f o/build/bootstrap/compile.$$.com o/build/bootstrap/compile.com
+fi
+
+echo o/build/bootstrap/compile.com

build/hello

@@ -0,0 +1,20 @@
+#!/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
+#
+#   HELLO BUILD
+#
+# OVERVIEW
+#
+#   We generate a line at the start of each Makefile run, because if we
+#   use `make V=0` mode then the terminal logging trick we use in
+#   tool/build/compile.c will delete the previous line, and we'd rather
+#   have that line not be the bash prompt that ran make.
+#
+#   This script is also useful for giving us an indicator each time the
+#   build restarts itself from scratch, which can happen in cases like
+#   when dependencies need to be regenerated by tool/build/mkdeps.c
+
+echo ♥cosmo >&2

build/htags

@@ -1,6 +1,6 @@
 #!/bin/sh
 #-*-mode:sh;indent-tabs-mode:nil;tab-width:2;coding:utf-8-*-┐
-#── vi: set et ft=sh ts=2 sts=2 fenc=utf-8 :vi ─────────────┘
+#───vi: set net ft=sh ts=2 sts=2 fenc=utf-8 :vi─────────────┘
 #
 # OVERVIEW
 #
@@ -43,19 +43,12 @@
 #     '(progn
 #        (add-hook 'c-mode-common-hook 'jart-c-mode-common-hook)))
 
-TAGS="$1"
-shift
-
-# 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) dontthrow nocallback;
+#   bool isheap(void *p) nothrow nocallback;
 set -- --regex-c='/^[_[:alpha:]][_[:alnum:]]*[ *][ *]*\([_[:alpha:]][_[:alnum:]]*[ *][ *]*\)*\([_[:alpha:]][_$[:alnum:]]*\)(.*/\2/b' "$@"
 
 # ctags doesn't understand function pointers, e.g.
@@ -66,7 +59,7 @@ set -- --regex-c='/^extern [^(]*(\*const \([^)]*\))(/\1/b' "$@"
 #   struct WorstSoftwareEver;
 set -- --regex-c='/^struct.*;$/uehocruehcroue/b' "$@"
 
-exec $TAGS                                                        \
+exec ${TAGS:-ctags}                                               \
      -e                                                           \
      --langmap=c:.c.h                                             \
      --exclude=libc/nt/struct/imagefileheader.internal.h          \

build/i386ify.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# SYNOPSIS
+#
+#   gcc -m32 -wrapper build/i386ify.sh -c -o foo.o foo.c
+#
+# OVERVIEW
+#
+#   Compiles 32-bit code inside 64-bit ELF objects.
+
+if [ "${1##*/}" = as ]; then
+  FIRST=0
+  for x; do
+    if [ $FIRST -eq 0 ]; then
+      set --
+      FIRST=1
+    fi
+    if [ "$x" = "--32" ]; then
+      continue
+    fi
+    if [ "${x##*.}" = s ]; then
+      {
+        printf "\t.section .yoink\n"
+        printf "\tnopl\t_start32\n"
+        printf "\t.previous\n"
+        printf "\t.code32\n"
+        cat "$x"
+      } >"$x".tmp
+      mv -f "$x".tmp "$x"
+    fi
+    set -- "$@" "$x"
+  done
+fi
+
+exec "$@"

build/includeall

@@ -0,0 +1,7 @@
+#!/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/objdump

@@ -1,29 +0,0 @@
-#!/bin/sh
-COSMO=${COSMO:-/opt/cosmo}
-
-if [ -n "$OBJDUMP" ]; then
-  exec "$OBJDUMP" "$@"
-fi
-
-find_objdump() {
-  if [ -x cosmocc/3.2/bin/$1-linux-cosmo-objdump ]; then
-    OBJDUMP=cosmocc/3.2/bin/$1-linux-cosmo-objdump
-  elif [ -x cosmocc/3.2/bin/$1-linux-musl-objdump ]; then
-    OBJDUMP=cosmocc/3.2/bin/$1-linux-musl-objdump
-  elif [ -x "$COSMO/cosmocc/3.2/bin/$1-linux-cosmo-objdump" ]; then
-    OBJDUMP="$COSMO/cosmocc/3.2/bin/$1-linux-cosmo-objdump"
-  elif [ -x "$COSMO/cosmocc/3.2/bin/$1-linux-musl-objdump" ]; then
-    OBJDUMP="$COSMO/cosmocc/3.2/bin/$1-linux-musl-objdump"
-  else
-    echo "error: toolchain not found (try running 'cosmocc --update' or 'make' in the cosmo monorepo)" >&2
-    exit 1
-  fi
-}
-
-if printf '%s\n' "$*" | grep aarch64 >/dev/null 2>&1; then
-  find_objdump aarch64
-  exec "$OBJDUMP" "$@"
-else
-  find_objdump x86_64
-  exec "$OBJDUMP" "$@"
-fi

build/online.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 #
 # SYNOPSIS
 #
@@ -23,12 +23,8 @@
 #   - tool/build/runitd.c
 
 .PRECIOUS: o/$(MODE)/%.com.ok
-o/$(MODE)/%.com.ok: private .PLEDGE = stdio rpath wpath cpath proc fattr inet
 o/$(MODE)/%.com.ok:				\
 		o/$(MODE)/tool/build/runit.com	\
 		o/$(MODE)/tool/build/runitd.com	\
 		o/$(MODE)/%.com
-	@$(COMPILE) -wATEST -tT$@ $^ $(HOSTS)
-
-.PHONY:
-o/tiny/tool/build/runit.com:
+	@$(COMPILE) -ATEST -tT$@ $^ $(HOSTS)

build/realify.sed

@@ -1,5 +1,5 @@
 #-*-mode:sed;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: et ft=sed ts=8 sw=8 fenc=utf-8 :vi ────────────────┘
+#───vi: et ft=sed ts=8 tw=8 fenc=utf-8 :vi─────────────────┘
 #
 # SYNOPSIS
 #

build/rollup

@@ -0,0 +1,7 @@
+#!/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

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 #
 # SYNOPSIS
 #
@@ -16,203 +16,68 @@
 
 MAKEFLAGS += --no-builtin-rules
 
-MAKE_ZIPCOPY = $(COMPILE) -AZIPCOPY -wT$@ $(ZIPCOPY) $< $@
-ifneq ($(ARCH), aarch64)
-MAKE_OBJCOPY = $(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ && $(MAKE_ZIPCOPY)
-else
-MAKE_OBJCOPY = $(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S $< $@ && $(MAKE_ZIPCOPY)
-endif
+o/%.a:                             ; @$(COMPILE) -AARCHIVE -T$@ $(AR) $(ARFLAGS) $@ $^
+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/%.i: %.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/%.s: %.i                         ; @$(COMPILE) -ACOMPILE.i $(COMPILE.i) $(OUTPUT_OPTION) $<
+o/%.s: o/%.i                       ; @$(COMPILE) -ACOMPILE.i $(COMPILE.i) $(OUTPUT_OPTION) $<
+o/%.o: %.cc                        ; @$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+o/%.o: o/%.cc                      ; @$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+o/%.lds: %.lds                     ; @$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
+o/%.inc: %.h                       ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) -D__ASSEMBLER__ -P $<
+o/%.pkg:                           ; @$(COMPILE) -APACKAGE -T$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
+o/%.h.ok: %.h                      ; @$(COMPILE) -ACHECK.h $(COMPILE.c) -x c -g0 -o $@ $<
+o/%.h.okk: %.h                     ; @$(COMPILE) -ACHECK.h $(COMPILE.cxx) -x c++ -g0 -o $@ $<
+o/%.greg.o: %.greg.c               ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/%.zip.o: o/%                     ; @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
 
-o/$(MODE)/%: o/$(MODE)/%.dbg
-	@$(MAKE_OBJCOPY)
+o/$(MODE)/%.a:                     ; @$(COMPILE) -AARCHIVE -T$@ $(AR) $(ARFLAGS) $@ $^
+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)/%.s: %.S                 ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.s: o/$(MODE)/%.S       ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.c                 ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) $(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)/%.o: o/$(MODE)/%.c       ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.ss: %.c                ; @$(COMPILE) -ACOMPILE.c $(COMPILE.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.ss: o/$(MODE)/%.c      ; @$(COMPILE) -AOBJECTIFY.s $(COMPILE.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.i: %.S                 ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.i: %.c                 ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.i: %.cc                ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.i: o/$(MODE)/%.c       ; @$(COMPILE) -APREPROCESS $(PREPROCESS) $(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)/%.s: %.i                 ; @$(COMPILE) -ACOMPILE.i $(COMPILE.i) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.s: o/$(MODE)/%.i       ; @$(COMPILE) -ACOMPILE.i $(COMPILE.i) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: %.cc                ; @$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.o: o/$(MODE)/%.cc      ; @$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.lds: %.lds             ; @$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.h.ok: %.h              ; @$(COMPILE) -ACHECK.h $(COMPILE.c) -x c -g0 -o $@ $<
+o/$(MODE)/%.h.okk: %.h             ; @$(COMPILE) -ACHECK.h $(COMPILE.cxx) -x c++ -g0 -o $@ $<
+o/$(MODE)/%.o: %.greg.c            ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.i386.o: %.i386.c       ; @$(COMPILE) -AOBJECTIFY.i386 $(OBJECTIFY.i386.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.greg.o: %.greg.c       ; @$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.ansi.o: %.ansi.c       ; @$(COMPILE) -AOBJECTIFY.ansi $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.ansi.o: %.c            ; @$(COMPILE) -AOBJECTIFY.ansi $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.c99.o: %.c99.c         ; @$(COMPILE) -AOBJECTIFY.c99 $(OBJECTIFY.c99.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.c11.o: %.c11.c         ; @$(COMPILE) -AOBJECTIFY.c11 $(OBJECTIFY.c11.c) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.c2x.o: %.c2x.c         ; @$(COMPILE) -AOBJECTIFY.c2x $(OBJECTIFY.c2x.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)/%.runs: o/$(MODE)/%      ; @$(COMPILE) -ACHECK -tT$@ $< $(TESTARGS)
+o/$(MODE)/%.pkg:                   ; @$(COMPILE) -APACKAGE -T$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
+o/$(MODE)/%.zip.o: %               ; @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%-gcc.asm: %.c           ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
+o/$(MODE)/%-clang.asm: %.c         ; @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
 
-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)/%.h: %.c
-	@$(COMPILE) -AAMALGAMATE $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
-
-o/$(MODE)/%.o: %.cc
-	@$(COMPILE) -AOBJECTIFY.cxx $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-
-o/$(MODE)/%.lds: %.lds
-	@$(COMPILE) -APREPROCESS $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
-
-ifneq ($(ARCH), aarch64)
-o/$(MODE)/%.o: %.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.S
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-else
-o/$(MODE)/%.o: %.S libc/empty.s
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.s) $(OUTPUT_OPTION) libc/empty.s
-o/$(MODE)/%.o: o/$(MODE)/%.S libc/empty.s
-	@$(COMPILE) -AOBJECTIFY.S $(OBJECTIFY.s) $(OUTPUT_OPTION) libc/empty.s
-endif
-
-o/$(MODE)/%.o: %.greg.c
-	@$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
-
-o/$(MODE)/%.greg.o: %.greg.c
-	@$(COMPILE) -AOBJECTIFY.greg $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-	@$(COMPILE) -AFIXUPOBJ -wT$@ $(FIXUPOBJ) $@
-
-o/%.a:
-	$(file >$(TMPDIR)/$(subst /,_,$@),$^)
-	@$(COMPILE) -AARCHIVE -wT$@ $(AR) $(ARFLAGS) $@ @$(TMPDIR)/$(subst /,_,$@)
-
-o/%.pkg:
-	$(file >$(TMPSAFE).args,$(filter %.o,$^))
-	@$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPSAFE).args
-
-o/$(MODE)/%.pkg:
-	$(file >$(TMPSAFE).args,$(filter %.o,$^))
-	@$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPSAFE).args
-
-o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj.com
-	@$(COMPILE) -wAPYOBJ o/$(MODE)/third_party/python/pyobj.com $(PYFLAGS) -o $@ $<
-
-o/$(MODE)/%.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 $<
-
-################################################################################
-# LOCAL UNIT TESTS
-#
-# We always run unit tests as part of the normal `make` invocation. you
-# may override the $(TESTARGS) variable to do things such as enable the
-# benchmarking feature. For example:
-#
-#     TESTARGS = -b
-#
-# May be specified in your ~/.cosmo.mk file. You can also use this to
-# enable things like function tracing. For example:
-#
-#     TESTARGS = ----ftrace
-#     .PLEDGE += prot_exec
-#
-# You could then run a command like:
-#
-#     make -j8 o//test/libc/calls/openbsd_test.com.runs
-#
-# You need PROT_EXEC permission since ftrace morphs the binary. It's
-# also worth mentioning that the pledge.com command can simulate what
-# Landlock Make does:
-#
-#     o//tool/build/pledge.com \
-#       -v. -p 'stdio rpath wpath cpath tty prot_exec' \
-#       o//test/libc/calls/openbsd_test.com \
-#       ----ftrace
-#
-# This is useful in the event a test binary should run by itself, but
-# fails to run beneath Landlock Make. It's also useful sometimes to
-# override the verbosity when running tests:
-#
-#     make V=5 TESTARGS=-b o//test/libc/calls/openbsd_test.com.runs
-#
-# This way, if for some reason a test should fail but calls exit(0),
-# then the stdout/stderr output, which would normally be suppressed,
-# will actually be displayed.
-
-o/$(MODE)/%.runs: o/$(MODE)/%
-	@$(COMPILE) -ACHECK -wtT$@ $< $(TESTARGS)
-
-################################################################################
-# ELF ZIP FILES
-#
-# zipobj.com lets us do fast incremental linking of compressed data.
-# it's nice because if we link a hundred binaries that use the time zone
-# database, then that database only needs to be DEFLATE'd once.
-
-o/%.zip.o: o/%
-	@$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
-
-o/$(MODE)/%.zip.o: %
-	@$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
-
-o/$(MODE)/%.zip.o: %
-	@$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
-
-# an issue with sandboxing arises when creating directory entries in the
-# zip file. we need the trailing slash (e.g. o//foo/.zip.o) but Landlock
-# Make avoids sandboxing directory names that have a trailing slash (so
-# they can be used to watch for deleted files, without creating overly
-# broad unveiling). such rules need to be written more explicitly.
-o/$(MODE)%/.zip.o: %
-	@$(COMPILE) -wAZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
-
-################################################################################
-# STRICT HEADER CHECKING
-#
-# these rules are unsandboxed since they're already a sandboxing test,
-# and it would be too costly in terms of make latency to have every
-# header file depend on $(HDRS) and $(INCS).
-
-o/%.h.ok: private .UNSANDBOXED = 1
-o/%.h.ok: %.h
-	@$(COMPILE) -ACHECK.h $(COMPILE.c) -xc -g0 -o $@ $<
-
-o/$(MODE)/%.h.ok: private .UNSANDBOXED = 1
-o/$(MODE)/%.h.ok: %.h
-	@$(COMPILE) -ACHECK.h $(COMPILE.c) -xc -g0 -o $@ $<
-
-o/$(MODE)/%.hh.ok: private .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: private .UNSANDBOXED = 1
-o/$(MODE)/%.okk: %
-	@$(COMPILE) -ACHECK.h $(COMPILE.cxx) -xc++ -g0 -o $@ $<
-
-################################################################################
-# EXECUTABLE HELPERS
-
-MAKE_SYMTAB_CREATE =				\
-	$(COMPILE) -wASYMTAB			\
-	o/$(MODE)/tool/build/symtab.com		\
-	-o $(TMPSAFE)/.symtab			\
-	$<
-
-MAKE_SYMTAB_ZIP =				\
-	$(COMPILE) -AZIP -T$@			\
-	o/$(MODE)/third_party/zip/zip.com	\
-	-b$(TMPDIR)				\
-	-9qj					\
-	$@					\
-	$(TMPSAFE)/.symtab
-
-################################################################################
-# EMACS ASSEMBLY GENERATION
-
-o/$(MODE)/%-gcc.asm: private .UNSANDBOXED = 1
-o/$(MODE)/%-gcc.asm: %.c
-	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
-
-o/$(MODE)/%-gcc.asm: private .UNSANDBOXED = 1
-o/$(MODE)/%-gcc.asm: %.cc
-	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.cxx) -S -g0 $(OUTPUT_OPTION) $<
-
-o/$(MODE)/%-clang.asm: private .UNSANDBOXED = 1
-o/$(MODE)/%-clang.asm: %.c
-	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
-
-# TODO(jart): Make intrinsics support Clang.
 o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: private .UNSANDBOXED = 1
-o/$(MODE)/%-clang.asm: %.cc
-	@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.cxx) -S -g0 $(OUTPUT_OPTION) $<

build/run

@@ -1,9 +0,0 @@
-#!/bin/sh
-if printf '%s\n' "$*" | grep aarch64 >/dev/null 2>&1; then
-  if [ ! -f o/third_party/qemu/qemu-aarch64 ]; then
-    make -j8 o/third_party/qemu/qemu-aarch64
-  fi
-  exec o/third_party/qemu/qemu-aarch64 "$@"
-else
-  exec "$@"
-fi

build/sanitycheck

@@ -27,37 +27,29 @@ EOF
   exit 1
 fi
 
-if [ ! -f /proc/sys/fs/binfmt_misc/status ]; then
-  exit 0
-fi
-
-if ! build/bootstrap/echo.com -n; then
+build/sanitycheck2
+if [ $? -ne 123 ]; then
   cat <<'EOF' >&2
 
 ERROR
 
-  APE Execution error.
+  Thompson Shell Backwards Compatibility Issue Detected
 
 DETAILS
 
-  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.
+  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.
 
 WORKAROUND
 
-  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.
+  sudo sh -c "echo ':APE:M::MZqFpD::/bin/sh:' >/proc/sys/fs/binfmt_misc/register"
 
 SEE ALSO
 
-  https://justine.lol/ape.html
+  https://justine.storage.googleapis.com/ape.html
 
 EOF
   kill $1

build/sanitycheck2

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

build/ssh

@@ -0,0 +1,14 @@
+#!/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 "$@"

dsp/BUILD.mk

@@ -1,8 +0,0 @@
-#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set noet ft=make ts=8 sw=8 fenc=utf-8 :vi ────────────────────┘
-
-.PHONY:		o/$(MODE)/dsp
-o/$(MODE)/dsp:	o/$(MODE)/dsp/core	\
-		o/$(MODE)/dsp/mpeg	\
-		o/$(MODE)/dsp/scale	\
-		o/$(MODE)/dsp/tty

dsp/bmp/bmp.mk

@@ -1,5 +1,5 @@
 #-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
-#── vi: set et ft=make ts=8 sw=8 fenc=utf-8 :vi ──────────────────────┘
+#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
 
 PKGS += DSP_BMP
 
@@ -25,7 +25,8 @@ DSP_BMP_A_CHECKS =				\
 
 DSP_BMP_A_DIRECTDEPS =				\
 	LIBC_NEXGEN32E				\
-	LIBC_TINYMATH
+	LIBC_TINYMATH				\
+	LIBC_STUBS
 
 DSP_BMP_A_DEPS :=				\
 	$(call uniq,$(foreach x,$(DSP_BMP_A_DIRECTDEPS),$($(x))))
@@ -39,12 +40,12 @@ $(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: private	\
-		CFLAGS +=			\
+o/$(MODE)/dsp/bmp/scalevolume.o:		\
+		OVERRIDE_CFLAGS +=		\
 			$(MATHEMATICAL)
 
-o/tiny/dsp/bmp/scalevolume.o: private		\
-		CFLAGS +=			\
+o/tiny/dsp/bmp/scalevolume.o:			\
+		OVERRIDE_CFLAGS +=		\
 			-Os
 
 DSP_BMP_LIBS = $(foreach x,$(DSP_BMP_ARTIFACTS),$($(x)))