Cosmopolitan 0.3

If an "index.lua" or "index.html" doesn't exist in zip file or the
filesystem, and no redirects have been defined for it either, then
redbean will render a listing of the zip central directory content
only if the request uri points to the root path.

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [jart]

.travis.yml

@@ -0,0 +1,6 @@
+virt: lxd
+os: linux
+language: c
+script: make -j4 V=0
+notifications:
+  email: false

.vscode/c_cpp_properties.json

@@ -0,0 +1,112 @@
+{
+	"configurations": [
+		{
+			"name": "Win32",
+			"includePath": [
+				"${workspaceFolder}"
+			],
+			"cStandard": "c11",
+			"cppStandard": "c++11",
+			"forcedInclude": ["${workspaceFolder}/.vscode/vscode.h"],
+			"defines": [
+				"libcesque=",
+				"pureconst=",
+				"paramsnonnull(x)=",
+				"alignas(x)",
+				"alignof(x)",
+				"artificial=",
+				"nodiscard=",
+				"mayalias=",
+				"forceinline=",
+				"forcealign(x)=",
+				"scanfesque(x)=",
+				"strftimeesque(x)=",
+				"wontreturn=",
+				"textreal=",
+				"mallocesque=",
+				"callocesque=",
+				"vallocesque=",
+				"reallocesque=",
+				"strlenesque=",
+				"memcpyesque=",
+				"hasatleast=",
+				"noinline=",
+				"textexit=",
+				"returnstwice=",
+				"textwindows=",
+				"privileged=",
+				"compatfn=",
+				"noinstrument=",
+				"nodebuginfo=",
+				"interruptfn=",
+				"optimizespeed=",
+				"forcealignargpointer=",
+				"noasan=",
+				"noubsan=",
+				"testonly=",
+				"donothing=",
+				"nosideeffect=",
+				"unreachable=",
+				"thatispacked=",
+				"nothrow=",
+				"nocallback=",
+				"relegated=",
+				"hidden=",
+				"textstartup=",
+				"initarray=",
+				"returnsnonnull=",
+				"returnspointerwithnoaliases=",
+				"printfesque(x)=",
+				"attributeallocsize(x)=",
+				"returnsaligned(x)=",
+				"attributeallocalign(x)=",
+				"nullterminated(x)="
+			]
+		},
+		{
+			"name": "Linux",
+			"includePath": [
+				"${workspaceFolder}"
+			],
+			"cStandard": "gnu17",
+			"compilerPath": "${workspaceFolder}/o/third_party/gcc/bin/x86_64-linux-musl-gcc",
+			"compilerArgs": [
+				"-Wall",
+				"-Werror",
+				"-fdebug-prefix-map=${workspaceFolder}=",
+				"-frecord-gcc-switches",
+				"-Wa,-W",
+				"-Wa,-I.",
+				"-Wa,--noexecstack",
+				"-Wa,--nocompress-debug-sections",
+				"-Og",
+				"-g",
+				"-gdescribe-dies",
+				"-msse3",
+				"-mno-red-zone",
+				"-fno-math-errno",
+				"-fno-trapping-math",
+				"-fno-fp-int-builtin-inexact",
+				"-fno-ident",
+				"-fno-common",
+				"-fno-gnu-unique",
+				"-fstrict-aliasing",
+				"-fstrict-overflow",
+				"-fno-semantic-interposition",
+				"-mno-omit-leaf-frame-pointer",
+				"-fno-jump-tables",
+				"-nostdinc",
+				"-iquote."
+			],
+			"forcedInclude": [
+				"libc/integral/normalize.inc"
+			],
+			"defines": [
+				"COSMO",
+				"MODE=",
+				"IMAGE_BASE_VIRTUAL=0x400000"
+			]
+		}
+	],
+	"version": 4
+}

.vscode/vscode.h

@@ -0,0 +1,2 @@
+#define __VSCODE_INTELLISENSE__ 1
+#include "libc/integral/normalize.inc"

LICENSE

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

Makefile

@@ -40,8 +40,7 @@
 #   o/dbg/examples/crashreport.com
 #   less examples/crashreport.c
 #
-#   # extremely tiny binaries (scout's honor escape hatch)
-#   # please pay the $1k for commercial license if you can
+#   # extremely tiny binaries
 #   make -j8 -O MODE=tiny				\
 #               LDFLAGS+=-s				\
 #               CPPFLAGS+=-DIM_FEELING_NAUGHTY	        \
@@ -52,7 +51,7 @@
 #
 # TROUBLESHOOTING
 #
-#   make -j8 -O SILENT=0 o//examples/hello.com
+#   make -j8 -O V=1 o//examples/hello.com
 #   make o//examples/life.elf -pn |& less
 #   etc.
 #
@@ -61,7 +60,7 @@
 #   build/config.mk
 
 SHELL         = /bin/sh
-HOSTS        ?= freebsd openbsd rhel7 rhel5 xnu win7 win10
+HOSTS        ?= freebsd openbsd netbsd rhel7 rhel5 xnu win7 win10
 SANITY       := $(shell build/sanitycheck $$PPID)
 GNUMAKEFLAGS += --output-sync
 
@@ -82,45 +81,40 @@ o:	o/$(MODE)/ape		\
 
 PKGS =
 
--include ~/.cosmo.mk				#──No.1
+-include ~/.cosmo.mk
 include build/functions.mk			#─┐
-include build/definitions.mk			# ├──meta
-include build/config.mk				# │
-include build/rules.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/stubs/stubs.mk			#─┘
 include libc/nexgen32e/nexgen32e.mk		#─┐
-include libc/intrin/intrin.mk			# │
-include libc/linux/linux.mk			# │
-include libc/math/math.mk			# ├──metal
-include libc/tinymath/tinymath.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/sysv/sysv.mk			#─┐
-include libc/nt/nt.mk				# ├──system
-include libc/fmt/fmt.mk				# │
-include libc/rand/rand.mk			#─┘
+include ape/ape.mk				# │
+include libc/fmt/fmt.mk				#─┘
 include libc/calls/calls.mk			#─┐
-include libc/runtime/runtime.mk			# ├──systems
-include libc/crt/crt.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		# │
-include libc/zipos/zipos.mk			# │
-include third_party/gdtoa/gdtoa.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/calls/hefty/hefty.mk		# │
 include libc/stdio/stdio.mk			# │
-include third_party/f2c/f2c.mk			# │
-include third_party/blas/blas.mk		# │
 include net/net.mk				# │
 include libc/log/log.mk				# │
 include dsp/core/core.mk			# │
@@ -133,16 +127,15 @@ 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
-include libc/dns/dns.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/lemon/lemon.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 third_party/lua/lua.mk
 include examples/examples.mk
 include third_party/lz4cli/lz4cli.mk
 include tool/build/lib/buildlib.mk
@@ -151,7 +144,6 @@ 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/calc/calc.mk
 include tool/decode/lib/decodelib.mk
 include tool/decode/decode.mk
 include tool/hash/hash.mk
@@ -160,7 +152,6 @@ include tool/viz/viz.mk
 include tool/tool.mk
 include test/libc/alg/test.mk
 include test/libc/tinymath/test.mk
-include test/libc/math/test.mk
 include test/libc/intrin/test.mk
 include test/libc/mem/test.mk
 include test/libc/nexgen32e/test.mk
@@ -180,14 +171,13 @@ 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/net/test.mk
 include test/tool/test.mk
 include test/dsp/core/test.mk
 include test/dsp/scale/test.mk
@@ -201,35 +191,36 @@ 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))
 
 bins:	$(BINS)
 check:	$(CHECKS)
-test:	$(TESTS)
+test:	$(TESTS) all
 depend:	o/$(MODE)/depend
 tags:	TAGS HTAGS
 
 o/$(MODE)/.x:
-	@$(MKDIR) $(@D) && touch $@
+	@mkdir -p $(@D) && touch $@
 
 o/$(MODE)/srcs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(SRCS),$(dir $(x))))
 	$(file >$@) $(foreach x,$(SRCS),$(file >>$@,$(x)))
 
-o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS),$(dir $(x))))
-	$(file >$@) $(foreach x,$(HDRS),$(file >>$@,$(x)))
+o/$(MODE)/hdrs.txt: o/$(MODE)/.x $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x))))
+	$(file >$@) $(foreach x,$(HDRS) $(INCS),$(file >>$@,$(x)))
 
-o/$(MODE)/depend: o/$(MODE)/.x o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt $(SRCS) $(HDRS)
-	@build/mkdeps -o $@ -r o/$(MODE)/ o/$(MODE)/srcs.txt o/$(MODE)/hdrs.txt
+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
 
 TAGS:	o/$(MODE)/srcs.txt $(SRCS)
 	@rm -f $@
-	@ACTION=TAGS TARGET=$@ build/do $(TAGS) $(TAGSFLAGS) -L $< -o $@
+	@$(COMPILE) -ATAGS -T$@ $(TAGS) $(TAGSFLAGS) -L $< -o $@
 
 HTAGS:	o/$(MODE)/hdrs.txt $(HDRS)
 	@rm -f $@
-	@ACTION=TAGS TARGET=$@ build/do build/htags -L $< -o $@
+	@$(COMPILE) -ATAGS -T$@ build/htags -L $< -o $@
 
 loc: o/$(MODE)/tool/build/summy.com
 	find -name \*.h -or -name \*.c -or -name \*.S | \
@@ -243,17 +234,15 @@ COSMOPOLITAN_OBJECTS =		\
 	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		\
-	LIBC_CALLS_HEFTY	\
+	THIRD_PARTY_GDTOA	\
 	THIRD_PARTY_REGEX	\
 	LIBC_ALG		\
 	LIBC_MEM		\
@@ -276,8 +265,8 @@ COSMOPOLITAN_OBJECTS =		\
 	LIBC_FMT		\
 	THIRD_PARTY_COMPILER_RT	\
 	LIBC_TINYMATH		\
-	LIBC_SYSV		\
 	LIBC_STR		\
+	LIBC_SYSV		\
 	LIBC_INTRIN		\
 	LIBC_NT_KERNEL32	\
 	LIBC_NEXGEN32E
@@ -322,7 +311,7 @@ o/cosmopolitan.h:				\
 		o/$(MODE)/tool/build/rollup.com	\
 		libc/integral/normalize.inc	\
 		$(foreach x,$(COSMOPOLITAN_HEADERS),$($(x)_HDRS))
-	@ACTION=ROLLUP TARGET=$@ build/do $^ >$@
+	@$(COMPILE) -AROLLUP -T$@ $^ >$@
 
 o/cosmopolitan.html:							\
 		o/$(MODE)/third_party/chibicc/chibicc.com.dbg		\
@@ -331,6 +320,14 @@ o/cosmopolitan.html:							\
 		-fno-common -include libc/integral/normalize.inc -o $@	\
 		$(filter-out %.s,$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_SRCS)))
 
+$(SRCS):					\
+	libc/integral/normalize.inc		\
+	libc/integral/c.inc			\
+	libc/integral/cxx.inc			\
+	libc/integral/cxxtypescompat.inc	\
+	libc/integral/lp64arg.inc		\
+	libc/integral/lp64.inc
+
 # UNSPECIFIED PREREQUISITES TUTORIAL
 #
 # A build rule must exist for all files that make needs to consider in
@@ -353,6 +350,7 @@ o/cosmopolitan.html:							\
 ~/.cosmo.mk:
 $(SRCS):
 $(HDRS):
+$(INCS):
 .DEFAULT:
 	@echo >&2
 	@echo NOTE: deleting o/$(MODE)/depend because of an unspecified prerequisite: $@ >&2

NOTICE

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

README.md

@@ -1,11 +1,13 @@
+![Cosmopolitan Honeybadger](usr/share/img/honeybadger.png)
+
 # Cosmopolitan
 
 [Cosmopolitan Libc](https://justine.lol/cosmopolitan/index.html) makes C
 a build-once run-anywhere language, like Java, except it doesn't need an
-interpreter or virtual machine. Instead, it reconfigures stock GCC to
-output a POSIX-approved polyglot format that runs natively on Linux +
-Mac + Windows + FreeBSD + OpenBSD + BIOS with the best possible
-performance and the tiniest footprint imaginable.
+interpreter or virtual machine. Instead, it reconfigures stock GCC and
+Clang to output a POSIX-approved polyglot format that runs natively on
+Linux + Mac + Windows + FreeBSD + OpenBSD + NetBSD + BIOS with the best
+possible performance and the tiniest footprint imaginable.
 
 ## Background
 
@@ -16,25 +18,58 @@ libc](https://justine.lol/cosmopolitan/index.html) website. We also have
 
 ## Getting Started
 
-Here's how to get started with the freestanding hermetically-sealed
-monolithic source repository:
+If you're doing your development work on Linux or BSD then you need just
+five files to get started. Here's what you do on Linux:
 
 ```sh
-tar xf cosmopolitan-0.1.tar.gz  # see our releases page
-cd cosmo
-make -j12
-o//examples/hello.com
+wget https://justine.lol/cosmopolitan/cosmopolitan-amalgamation-0.3.zip
+unzip cosmopolitan-amalgamation-0.3.zip
+printf 'main() { printf("hello world\\n"); }\n' >hello.c
+gcc -g -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \
+  -fno-omit-frame-pointer -pg -mnop-mcount \
+  -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
 ```
 
-Here's how to get started with the amalgamated binaries, which let you
-bring your own build system:
+You now have a portable program. Please note that your APE binary will
+assimilate itself as a conventional resident of your platform after the
+first run, so it can be fast and efficient for subsequent executions.
 
 ```sh
-unzip cosmopolitan-amalgamated-0.1.zip  # see our releases page
-echo 'main() { printf("hello world\n"); }' >hello.c
-gcc -g -O -static -fno-pie -no-pie -mno-red-zone -nostdlib -nostdinc \
-  -o hello.com.dbg hello.c -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 -fuse-ld=bfd \
-  -Wl,-T,ape.lds -include cosmopolitan.h crt.o ape.o cosmopolitan.a
-objcopy -SO binary hello.com.dbg hello.com
 ./hello.com
+bash -c './hello.com'  # zsh/fish workaround (we upstreamed a patch)
 ```
+
+So if you intend to copy the binary to Windows or Mac then please do
+that before you run it, not after.
+
+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.
+
+Cosmopolitan can also be compiled from source on any Linux distro.
+
+```sh
+wget https://justine.lol/cosmopolitan/cosmopolitan-0.3.tar.gz
+tar xf cosmopolitan-0.3.tar.gz  # see releases page
+cd cosmopolitan
+make -j16
+o//examples/hello.com
+find o -name \*.com | xargs ls -rShal | less
+```
+
+## Support Vector
+
+| Platform        | Min Version | Circa |
+| :---            | ---:        | ---:  |
+| AMD             | K8 Venus    | 2005  |
+| Intel           | Core        | 2006  |
+| New Technology  | Vista       | 2006  |
+| GNU/Systemd     | 2.6.18      | 2007  |
+| XNU's Not UNIX! | 15.6        | 2018  |
+| FreeBSD         | 12          | 2018  |
+| OpenBSD         | 6.4         | 2018  |
+| NetBSD          | 9.1         | 2020  |

ape/ape.lds

@@ -36,7 +36,7 @@
   entails two steps: (1) create a .com.dbg binary w/ Linux toolchain and
   then (2) unwrap the .com binary embedded within:
 
-    objcopy -SO binary input.com.dbg output.com
+    objcopy -S -O binary input.com.dbg output.com
 
   Both executables will work fine, but only the .com format is portable.
 
@@ -175,27 +175,13 @@
 
 #ifdef __LINKER__
 #include "ape/macros.internal.h"
-#include "ape/config.h"
+#include "ape/relocations.h"
+#include "libc/dce.h"
 #include "libc/nt/pedef.internal.h"
 #include "libc/zip.h"
 
 ENTRY(_start)
 
-/* Plans real memory solution at linktime. */
-MEMORY {
-  PageZero :    org = 0x0000000000000000,  len = 0x0000000000001000
-  RealBss :     org = XLM_BASE_REAL,       len = XLM_SIZE
-  RealProgram : org = IMAGE_BASE_REAL,     len = 0x0000000000010000 - IMAGE_BASE_REAL
-  RealScratch : org = REAL_SCRATCH_AREA,   len = REAL_STACK_FRAME - REAL_SCRATCH_AREA
-  RealStack :   org = REAL_STACK_FRAME,    len = 0x0000000000010000
-  EbdaMemory :  org = 0x0000000000080000,  len = 0x0000000000020000
-  VideoMemory : org = 0x00000000000a0000,  len = 0x0000000000020000
-  Romz :        org = 0x00000000000c0000,  len = 0x0000000000030000
-  BiosMemory :  org = 0x00000000000f0000,  len = 0x0000000000010000
-  SmallCode :   org = IMAGE_BASE_PHYSICAL, len = 0x0000000040000000 - IMAGE_BASE_PHYSICAL
-  ZipData :     org = 0x0000000040000000,  len = 0x0000000040000000
-}
-
 PHDRS {
   Head PT_LOAD FLAGS(5);
   Rom PT_LOAD FLAGS(5);
@@ -210,43 +196,41 @@ SECTIONS {
 /*BEGIN: linux addressability guarantee */
 /*BEGIN: bsd addressability guarantee */
 
-  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) : {
+  .head SEGMENT_START("text-segment", IMAGE_BASE_VIRTUAL) : AT(IMAGE_BASE_REAL) {
     HIDDEN(_base = .);
 
     /* Real Mode */
     KEEP(*(.head))
-    . += 1;
+    KEEP(*(.text.head))
 
     /* Executable & Linkable Format */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 1);
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_phdrs = .);
     KEEP(*(.elf.phdrs))
-    HIDDEN(.Lape.phdrs.end = .);
-    . += 1;
+    HIDDEN(ape_phdrs_end = .);
 
     /* OpenBSD */
-    . = ALIGN(. != 0 ? __SIZEOF_POINTER__ : 1);
-    HIDDEN(.Lape.note = .);
+    . = ALIGN(__SIZEOF_POINTER__);
+    HIDDEN(ape_note = .);
     KEEP(*(.note.openbsd.ident))
-    HIDDEN(.Lape.note.end = .);
-    . += 1;
+    KEEP(*(.note.netbsd.ident))
+    HIDDEN(ape_note_end = .);
 
     /* Portable Executable */
     KEEP(*(.pe.header))
-    HIDDEN(.Lape.pe.sections = .);
+    HIDDEN(ape_pe_sections = .);
     KEEP(*(.pe.sections))
-    HIDDEN(.Lape.pe.sections_end = .);
-    . += 1;
+    HIDDEN(ape_pe_sections_end = .);
 
     /* Mach-O */
     KEEP(*(.macho))
     . = ALIGN(__SIZEOF_POINTER__);
-    HIDDEN(.Lape.macho.end = .);
-    . += 1;
+    HIDDEN(ape_macho_end = .);
 
     KEEP(*(.ape.pad.head))
-    . = ALIGN(4096); /* alignments only mandatory when impossible otherwise */
+    . = ALIGN(SupportsWindows() || SupportsMetal() ? PAGESIZE : 16);
     HIDDEN(_ehead = .);
-  } AT>SmallCode :Head
+  } :Head
 
 /*BEGIN: nt addressability guarantee */
 
@@ -254,9 +238,8 @@ SECTIONS {
     /* Code that needs to be addressable in Real Mode */
     *(.text.real)
     KEEP(*(SORT_BY_NAME(.sort.text.real.*)))
-    *(.rodata.real)
-    KEEP(*(SORT_BY_NAME(.sort.rodata.real.*)))
     HIDDEN(_ereal = .);
+    . += 1;
 
 /*END: realmode addressability guarantee */
 
@@ -264,7 +247,7 @@ SECTIONS {
     *(.start)
     KEEP(*(.initprologue))
     KEEP(*(SORT_BY_NAME(.init.*)))
-    KEEP(*(SORT_NONE(.init)))
+    KEEP(*(.init))
     KEEP(*(.initepilogue))
     KEEP(*(.pltprologue))
     *(.plt)
@@ -288,44 +271,26 @@ SECTIONS {
     *(.text .stub .text.*)
     KEEP(*(SORT_BY_NAME(.sort.text.*)))
 
-    /* Won't support NX bit DRM for tiny executables */
-    HIDDEN(.Lape.piro.align = ABSOLUTE(. > APE_PIRO_THRESHOLD ? 0x1000 : 8));
-
-    /* Code that musn't be mapped in production */
     KEEP(*(.ape.pad.test));
-    . = ALIGN(.Lape.piro.align);
-    HIDDEN(__test_start = .);
     *(.test.unlikely)
     *(.test .test.*)
 
     /* Privileged code invulnerable to magic */
     KEEP(*(.ape.pad.privileged));
-    . = ALIGN(.Lape.piro.align);
+    . += . > 0 ? 1 : 0;
     HIDDEN(__privileged_start = .);
-    HIDDEN(__test_end = .);
-    . += 1;
+    . += . > 0 ? 1 : 0;
     *(.privileged)
+    HIDDEN(__privileged_end = .);
+    . += . > 0 ? 1 : 0;
 
 /*BEGIN: Read Only Data */
 
     KEEP(*(.ape.pad.rodata));
-    . = ALIGN(.Lape.piro.align);
-    . += 1;
 
-    /* Nonspecific Read-Only Data */
     *(.rodata .rodata.*)
-    . += 1;
-
-    /* Undefined Behavior Sanitizer Types */
-    HIDDEN(__ubsan_types_start = .);
     *(.ubsan.types)
-    HIDDEN(__ubsan_types_end = .);
-    . += 1;
-
-    /* Undefined Behavior Sanitizer Data */
-    HIDDEN(__ubsan_data_start = .);
     *(.ubsan.data)
-    HIDDEN(__ubsan_data_end = .);
 
     /* Unit Test & Fixture Registry */
 
@@ -341,7 +306,22 @@ SECTIONS {
     /* Windows DLL Import Directory */
     KEEP(*(.idata.ro));
     KEEP(*(SORT_BY_NAME(.idata.ro.*)))
-    . += 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))
@@ -350,13 +330,12 @@ SECTIONS {
     KEEP(*(SORT_BY_NAME(.sort.rodata.*)))
 
     KEEP(*(.ape.pad.text))
-    HIDDEN(.Lape.data.align = ABSOLUTE(PAGESIZE));
-    . = ALIGN(.Lape.data.align);
+    . = ALIGN(PAGESIZE);
     HIDDEN(_etext = .);
     PROVIDE_HIDDEN(etext = .);
 /*END: Read Only Data (only needed for initialization) */
 /*END: Read Only Data */
-  } AT>SmallCode :Rom
+  } :Rom
 
   .data . : {
 /*BEGIN: Read/Write Data */
@@ -374,43 +353,34 @@ SECTIONS {
     KEEP(*(.gotpltepilogue))
 
 /*BEGIN: Post-Initialization Read-Only */
-    . = ALIGN(.Lape.piro.align);
-    HIDDEN(__piro_start = .);
-
-    QUAD(IMAGE_BASE_VIRTUAL);
-
-    PROVIDE_HIDDEN(__init_array_start = .);
-    KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*)
-           SORT_BY_INIT_PRIORITY(.ctors.*)))
-    KEEP(*(SORT_NONE(.ctors)))
-    KEEP(*(SORT_NONE(.init_array)))
-    KEEP(*(SORT_NONE(.preinit_array)))
-    PROVIDE_HIDDEN(__init_array_end = .);
-
-    . += 1;
     . = ALIGN(__SIZEOF_POINTER__);
-    PROVIDE_HIDDEN(__fini_array_start = .);
-    KEEP(*(SORT_BY_INIT_PRIORITY(.fini_array.*)
-           SORT_BY_INIT_PRIORITY(.dtors.*)))
-    KEEP(*(SORT_NONE(.dtors)))
-    PROVIDE_HIDDEN(__fini_array_end = .);
-
     KEEP(*(SORT_BY_NAME(.piro.relo.sort.*)))
     PROVIDE_HIDDEN(__relo_end = .);
+    . = ALIGN(__SIZEOF_POINTER__);
     KEEP(*(SORT_BY_NAME(.piro.data.sort.*)))
     KEEP(*(.piro.pad.data))
-    . = ALIGN(.Lape.data.align);
+    . = ALIGN(PAGESIZE);
     HIDDEN(_edata = .);
     PROVIDE_HIDDEN(edata = .);
-  } AT>SmallCode :Ram
+  } :Ram
 
-  .bss . : {
+/*END:   file content that's loaded by o/s */
+/*BEGIN: bss memory void */
+
+  .zip . : {
+    KEEP(*(SORT_BY_NAME(.zip.*)))
+    HIDDEN(_ezip = .);
+  }
+
+/*END:   file content */
+/*BEGIN: bss memory that's addressable */
+
+  .bss ALIGN(__SIZEOF_POINTER__) : {
     KEEP(*(SORT_BY_NAME(.piro.bss.init.*)))
     *(.piro.bss)
     KEEP(*(SORT_BY_NAME(.piro.bss.sort.*)))
-    . += 1;
-    . = ALIGN(.Lape.piro.align);
     HIDDEN(__piro_end = .);
+    . += . > 0 ? 1 : 0;
 /*END: Post-Initialization Read-Only */
 
     /* Statically Allocated Empty Space */
@@ -420,21 +390,19 @@ SECTIONS {
 
     KEEP(*(SORT_BY_NAME(.sort.bss.*)))
 
-    /* eXtreme Low Memory w/ Userspace Remapping */
-    . = ALIGN(0x1000);
-    *(.xlm)
-    . = ALIGN(0x1000);
-
-    . = ALIGN(0x10000); /* for brk()/sbrk() allocation */
+    . = ALIGN(FRAMESIZE); /* for brk()/sbrk() allocation */
     HIDDEN(_end = .);
     PROVIDE_HIDDEN(end = .);
-  } AT>SmallCode :Ram
+  }
 
 /*END: nt addressability guarantee */
 /*END: bsd addressability guarantee */
 /*END: linux addressability guarantee */
 /*END: xnu addressability guarantee */
 
+  .shstrtab            : { *(.shstrtab) }
+  .strtab              : { *(.strtab) }
+  .symtab              : { *(.symtab) }
   .stab              0 : { *(.stab) }
   .stabstr           0 : { *(.stabstr) }
   .stab.excl         0 : { *(.stab.excl) }
@@ -467,94 +435,122 @@ SECTIONS {
   .GCC.command.line  0 : { *(.GCC.command.line) }
 
   /DISCARD/ : {
+    *(__mcount_loc)
     *(.discard)
     *(.yoink)
     *(.*)
   }
 }
 
-PFSTUB8(.Lape.elf.entry, _start);
-PFSTUB8(.Lape.elf.phoff, RVA(ape.phdrs));
-PFSTUB8(.Lape.elf.shoff, 0);
-PFSTUB4(.Lape.elf.phnum, (.Lape.phdrs.end - ape.phdrs) / 56);
-PFSTUB4(.Lape.elf.shnum, 0);
-PFSTUB4(.Lape.elf.shstrndx, 0);
-SHSTUB2(.Lape.macho.dd.skip, RVA(ape.macho) / 8);
-SHSTUB2(.Lape.macho.dd.count, (.Lape.macho.end - ape.macho) / 8);
-PFSTUB4(.Lape.pe.offset, ape.pe - ape.mz);
+PFSTUB8(ape_elf_entry, _start);
+PFSTUB8(ape_elf_phoff, RVA(ape_phdrs));
+PFSTUB8(ape_elf_shoff, 0);
+PFSTUB4(ape_elf_phnum, (ape_phdrs_end - ape_phdrs) / 56);
+PFSTUB4(ape_elf_shnum, 0);
+PFSTUB4(ape_elf_shstrndx, 0);
 
-HIDDEN(.Lape.pe.optsz = .Lape.pe.sections - (ape.pe + 24));
-HIDDEN(.Lape.pe.shnum = (.Lape.pe.sections_end - .Lape.pe.sections) / 40);
-HIDDEN(.Lidata.idtsize = idata.idtend - idata.idt);
-HIDDEN(.Lidata.iatsize = idata.iatend - idata.iat);
+HIDDEN(__privileged_addr = ROUNDDOWN(__privileged_start, PAGESIZE)); 
+HIDDEN(__privileged_size = (ROUNDUP(__privileged_end, PAGESIZE) -
+                            ROUNDDOWN(__privileged_start, PAGESIZE))); 
 
-HIDDEN(.Lape.rom.offset = 0);
-HIDDEN(.Lape.rom.vaddr = ADDR(.head));
-HIDDEN(.Lape.rom.paddr = LOADADDR(.head));
-HIDDEN(.Lape.rom.filesz = LOADADDR(.data) - .Lape.rom.paddr);
-HIDDEN(.Lape.rom.memsz = ADDR(.data) - ADDR(.head));
-HIDDEN(.Lape.rom.align = 0x1000);
-HIDDEN(.Lape.rom.rva = RVA(.Lape.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));
 
-HIDDEN(.Lape.ram.offset = .Lape.rom.offset + .Lape.rom.filesz);
-HIDDEN(.Lape.ram.vaddr = ADDR(.data));
-HIDDEN(.Lape.ram.paddr = LOADADDR(.data));
-HIDDEN(.Lape.ram.filesz = LOADADDR(.bss) - LOADADDR(.data));
-HIDDEN(.Lape.ram.memsz = ADDR(.bss) + SIZEOF(.bss) - .Lape.ram.vaddr);
-HIDDEN(.Lape.ram.align = 0x1000);
-HIDDEN(.Lape.ram.rva = RVA(.Lape.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 = SIZEOF(.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));
 
-HIDDEN(.Lape.note.offset = .Lape.rom.offset + (.Lape.note - .Lape.rom.vaddr));
-HIDDEN(.Lape.note.vaddr = .Lape.note);
-HIDDEN(.Lape.note.paddr = .Lape.rom.paddr + .Lape.note.offset);
-HIDDEN(.Lape.note.filesz = .Lape.note.end - .Lape.note);
-HIDDEN(.Lape.note.memsz = .Lape.note.filesz);
-HIDDEN(.Lape.note.align = __SIZEOF_POINTER__);
+HIDDEN(ape_stack_offset = ape_ram_offset + ape_ram_filesz);
+HIDDEN(ape_stack_vaddr = 0x700000000000 - STACKSIZE);
+HIDDEN(ape_stack_paddr = ape_ram_paddr + ape_ram_filesz);
+HIDDEN(ape_stack_filesz = 0);
+HIDDEN(ape_stack_memsz = STACKSIZE);
+HIDDEN(ape_stack_align = 16);
 
-HIDDEN(.Lape.text.offset = .Lape.rom.offset + LOADADDR(.text) - .Lape.rom.paddr);
-HIDDEN(.Lape.text.paddr = LOADADDR(.text));
-HIDDEN(.Lape.text.vaddr = ADDR(.text));
-HIDDEN(.Lape.text.filesz = SIZEOF(.text));
-HIDDEN(.Lape.text.memsz = SIZEOF(.text));
-HIDDEN(.Lape.text.align = 4096);
-HIDDEN(.Lape.text.rva = RVA(.Lape.text.vaddr));
+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__);
 
-HIDDEN(.Lape.data.offset = .Lape.ram.offset + LOADADDR(.data) - .Lape.ram.paddr);
-HIDDEN(.Lape.data.paddr = LOADADDR(.data));
-HIDDEN(.Lape.data.vaddr = ADDR(.data));
-HIDDEN(.Lape.data.filesz = SIZEOF(.data));
-HIDDEN(.Lape.data.memsz = SIZEOF(.data));
-HIDDEN(.Lape.data.align = 0x1000);
-HIDDEN(.Lape.data.rva = RVA(.Lape.data.vaddr));
+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));
 
-HIDDEN(.Lape.bss.offset = .Lape.ram.offset + LOADADDR(.bss) - .Lape.ram.paddr);
-HIDDEN(.Lape.bss.paddr = LOADADDR(.bss));
-HIDDEN(.Lape.bss.vaddr = ADDR(.bss));
-HIDDEN(.Lape.bss.filesz = 0);
-HIDDEN(.Lape.bss.memsz = SIZEOF(.bss));
-HIDDEN(.Lape.bss.align = .Lape.data.align);
+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));
 
-/* Program Loader Auto-Tune */
+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 SupportsXnu()
+SHSTUB2(ape_macho_dd_skip, RVA(ape_macho) / 8);
+SHSTUB2(ape_macho_dd_count, (ape_macho_end - ape_macho) / 8);
+#endif
+
+#if SupportsWindows() || SupportsMetal()
+#define LINK_WINDOWS (SupportsWindows() && !DEFINED(EfiMain))
+PFSTUB4(ape_pe_offset, ape_pe - ape_mz);
+HIDDEN(ape_pe_optsz = ape_pe_sections - (ape_pe + 24));
+HIDDEN(ape_pe_shnum = (ape_pe_sections_end - ape_pe_sections) / 40);
+HIDDEN(ape_pe_base = IMAGE_BASE_VIRTUAL);
+HIDDEN(ape_idata = LINK_WINDOWS ? RVA(ape_idata_iat) : 0);
+HIDDEN(ape_idata_iatsize = LINK_WINDOWS ? ape_idata_iatend - ape_idata_iat : 0);
+HIDDEN(ape_idata = LINK_WINDOWS ? RVA(ape_idata_idt) : 0);
+HIDDEN(ape_idata_idtsize = LINK_WINDOWS ? ape_idata_idtend - ape_idata_idt : 0);
+HIDDEN(v_ntversion = LINK_WINDOWS ? 6 : 1);
+HIDDEN(v_ntdllchar = LINK_WINDOWS ? 288 : 0);
+HIDDEN(v_ntsubversion = LINK_WINDOWS ? 6 : 5);
+HIDDEN(v_ntsubsystem = (LINK_WINDOWS
+                        ? (DEFINED(GetMessage)
+                           ? kNtImageSubsystemWindowsGui
+                           : kNtImageSubsystemWindowsCui)
+                        : kNtImageSubsystemEfiApplication));
+HIDDEN(ape_pe_entry = LINK_WINDOWS ? WinMain : EfiMain);
+#endif
+
+#if SupportsMetal()
 HIDDEN(v_ape_realsectors =
-           MIN(REAL_SCRATCH_AREA - IMAGE_BASE_REAL,
+           MIN(0x70000 - IMAGE_BASE_REAL,
                ROUNDUP(RVA(_edata), 4096)) / 512);
 HIDDEN(v_ape_realpages = v_ape_realsectors / (4096 / 512));
 HIDDEN(v_ape_highsectors =
            (ROUNDUP(RVA(_edata), 512) / 512) - v_ape_realsectors);
-
-/* Windows NT Auto-Subsystem Embedding */
-HIDDEN(v_ntsubsystem = (DEFINED(GetMessage)
-                        ? kNtImageSubsystemWindowsGui
-                        : kNtImageSubsystemWindowsCui));
+#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);
+ASSERT(v_zip_cdirsize % kZipCdirHdrLinkableSize == 0, "bad zip cdir");
 ZIPCONST(v_zip_records, v_zip_cdirsize / kZipCdirHdrLinkableSize);
-ZIPCONST(v_zip_commentsize, _edata - __zip_end - kZipCdirHdrMinSize);
+ZIPCONST(v_zip_commentsize, _ezip - __zip_end - kZipCdirHdrMinSize);
 
-/* Generates deterministic ID for Mach-O. */
+#if SupportsXnu()
+/* Generates deterministic ID. */
 #define PHI 0x9e3779b9925d4c17
 #define XOR(X,Y) ((X | Y) - (X & Y))
 #define XORSHIFT(X,Y)    \
@@ -567,85 +563,89 @@ ZIPCONST(v_zip_commentsize, _edata - __zip_end - kZipCdirHdrMinSize);
   X = (X + (Y >> 020) & 0xFF) * PHI; \
   X = (X + (Y >> 030) & 0xFF) * PHI
 #define CHURN(X)        \
-  XORSHIFT(uuid1_, X); \
-  KMH(uuid1_, X);      \
-  XORSHIFT(uuid2_, X); \
-  KMH(uuid2_, X)
-
-HIDDEN(uuid1_ = 88172645463325252);
-HIDDEN(uuid2_ = 88172645463325252);
-
-CHURN(.Lape.bss.align);
-CHURN(.Lape.bss.filesz);
-CHURN(.Lape.bss.memsz);
-CHURN(.Lape.bss.offset);
-CHURN(.Lape.bss.paddr);
-CHURN(.Lape.data.align);
-CHURN(.Lape.data.filesz);
-CHURN(.Lape.data.memsz);
-CHURN(.Lape.data.offset);
-CHURN(.Lape.data.paddr);
-CHURN(.Lape.data.rva);
-CHURN(.Lape.data.vaddr);
-CHURN(.Lape.elf.entry);
-CHURN(.Lape.elf.phnum);
-CHURN(.Lape.elf.phoff);
-CHURN(.Lape.elf.shnum);
-CHURN(.Lape.elf.shoff);
-CHURN(.Lape.elf.shstrndx);
-CHURN(.Lape.macho.end);
-CHURN(.Lape.note);
-CHURN(.Lape.note.align);
-CHURN(.Lape.note.end);
-CHURN(.Lape.note.filesz);
-CHURN(.Lape.note.memsz);
-CHURN(.Lape.note.offset);
-CHURN(.Lape.note.paddr);
-CHURN(.Lape.note.vaddr);
-CHURN(.Lape.pe.offset);
-CHURN(.Lape.pe.optsz);
-CHURN(.Lape.pe.sections);
-CHURN(.Lape.pe.sections_end);
-CHURN(.Lape.pe.shnum);
-CHURN(.Lape.phdrs.end);
-CHURN(.Lape.ram.align);
-CHURN(.Lape.ram.filesz);
-CHURN(.Lape.ram.memsz);
-CHURN(.Lape.ram.offset);
-CHURN(.Lape.ram.paddr);
-CHURN(.Lape.ram.rva);
-CHURN(.Lape.ram.vaddr);
-CHURN(.Lape.rom.align);
-CHURN(.Lape.rom.filesz);
-CHURN(.Lape.rom.memsz);
-CHURN(.Lape.rom.offset);
-CHURN(.Lape.rom.paddr);
-CHURN(.Lape.rom.rva);
-CHURN(.Lape.rom.vaddr);
-CHURN(.Lape.text.align);
-CHURN(.Lape.text.filesz);
-CHURN(.Lape.text.memsz);
-CHURN(.Lape.text.offset);
-CHURN(.Lape.text.paddr);
-CHURN(.Lape.text.rva);
-CHURN(.Lape.text.vaddr);
+  XORSHIFT(ape_uuid1, X); \
+  KMH(ape_uuid1, X);      \
+  XORSHIFT(ape_uuid2, X); \
+  KMH(ape_uuid2, X)
+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);
+CHURN(ape_elf_shnum);
+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);
+CHURN(ape_ram_offset);
+CHURN(ape_ram_paddr);
+CHURN(ape_ram_rva);
+CHURN(ape_ram_vaddr);
+CHURN(ape_rom_align);
+CHURN(ape_rom_filesz);
+CHURN(ape_rom_memsz);
+CHURN(ape_rom_offset);
+CHURN(ape_rom_paddr);
+CHURN(ape_rom_rva);
+CHURN(ape_rom_vaddr);
+CHURN(ape_text_align);
+CHURN(ape_text_filesz);
+CHURN(ape_text_memsz);
+CHURN(ape_text_offset);
+CHURN(ape_text_paddr);
+CHURN(ape_text_rva);
+CHURN(ape_text_vaddr);
 CHURN(ADDR(.bss));
-CHURN(WinMain);
 CHURN(_start);
-CHURN(ape.macho);
-CHURN(ape.mz);
-CHURN(ape.pe);
-CHURN(ape.phdrs);
+CHURN(ape_phdrs);
+#if SupportsMetal()
 CHURN(v_ape_realsectors);
+#endif
+#if SupportsXnu()
+CHURN(ape_macho);
+#endif
+#if SupportsWindows() || SupportsMetal()
+CHURN(ape_mz);
+CHURN(ape_pe);
+CHURN(ape_pe_offset);
+CHURN(ape_pe_optsz);
+CHURN(ape_pe_sections);
+CHURN(ape_pe_sections_end);
+CHURN(ape_pe_shnum);
+CHURN(ape_phdrs_end);
+CHURN(WinMain);
+#endif /* SupportsWindows() */
+#endif /* SupportsXnu() */
 
-ASSERT(ape.mz == IMAGE_BASE_VIRTUAL, "linker panic");
+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");
 ASSERT(((DEFINED(__init_rodata_end) ? __init_rodata_end : 0) %
         __SIZEOF_POINTER__ == 0),
        "__init_rodata misalign");
 
-ASSERT((!DEFINED(ape.grub) ? 1 : RVA(ape.grub) < 8192),
+ASSERT((!DEFINED(ape_grub) ? 1 : RVA(ape_grub) < 8192),
        "grub stub needs to be in first 8kb of image");
 
 ASSERT(DEFINED(_start) || DEFINED(_start16),
@@ -657,7 +657,7 @@ ASSERT(!DEFINED(_start16) || REAL(_end) < 65536,
 /* Let's not be like Knight Capital. */
 /* NOCROSSREFS_TO(.test .text) */
 
-/* ASSERT(ape_sysv_start == .Lape.text.vaddr, */
+/* ASSERT(ape_sysv_start == ape_text_vaddr, */
 /*        "ape_sysv_start() must be first in .text"); */
 
 #endif /* __LINKER__ */

ape/ape.mk

@@ -20,24 +20,25 @@ APE =	$(APE_DEPS)			\
 	o/$(MODE)/ape/ape.lds
 
 APELINK =				\
-	ACTION=LINK.ape 		\
-	$(MKDIR) $(@D) &&		\
+	$(COMPILE)			\
+	-ALINK.ape			\
 	$(LINK)				\
 	$(LINKARGS)			\
-	$(OUTPUT_OPTION) &&		\
-	$(STRIP)			\
-	-X $@ &&			\
-	$(GZ)				\
-	$(ZFLAGS)			\
-	-f $@.map
+	$(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/macros.internal.h	\
+		libc/dce.h		\
+		libc/zip.h
+
 o/ape/idata.inc:			\
 		ape/idata.internal.h	\
 		ape/relocations.h
@@ -46,6 +47,4 @@ $(APE_OBJS):	$(BUILD_FILES)		\
 		ape/ape.mk
 
 .PHONY: o/$(MODE)/ape
-o/$(MODE)/ape:	$(APE)			\
-		$(APE_CHECKS)		\
-		o/$(MODE)/ape/lib
+o/$(MODE)/ape: $(APE) $(APE_CHECKS)

ape/config.h

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

@@ -22,15 +22,15 @@
 #include "ape/relocations.h"
 /* clang-format off */
 
-/	Links function from external DLL.
-/
-/	This embeds a function pointer in the binary. The NT Executive
-/	fills its value before control is handed off to the program.
-/
-/	@note	only ELF toolchains are powerful enough to use this
-/	@see	libc/nt/master.sh
-/	@see	ape/ape.lds
-/	@see	winimp
+//	Links function from external DLL.
+//
+//	This embeds a function pointer in the binary. The NT Executive
+//	fills its value before control is handed off to the program.
+//
+//	@note	only ELF toolchains are powerful enough to use this
+//	@see	libc/nt/master.sh
+//	@see	ape/ape.lds
+//	@see	winimp
 .macro	.imp	dll:req fn:req actual:req hint
 	.dll	\dll
 	.section .piro.data.sort.iat.2.\dll\().2.\actual,"aw",@progbits
@@ -63,10 +63,10 @@
 	.previous
 .endm
 
-/	Defines DLL import.
-/	@note	this is an implementation detail of .imp
+//	Defines DLL import.
+//	@note	this is an implementation detail of .imp
 .macro	.dll	name:req
-  .section .idata.ro.idt.2.\name,"aG",\name,comdat
+  .section .idata.ro.idt.2.\name,"aG",@progbits,\name,comdat
 	.equ	.Lidata.idt.\name,.
 	.long	RVA(idata.ilt.\name)		# ImportLookupTable
 	.long	0				# TimeDateStamp
@@ -76,7 +76,7 @@
 	.type	.Lidata.idt.\name,@object
 	.size	.Lidata.idt.\name,.-.Lidata.idt.\name
   .previous
-  .section .idata.ro.ilt.\name\().1,"aG",\name,comdat
+  .section .idata.ro.ilt.\name\().1,"aG",@progbits,\name,comdat
 	.align	__SIZEOF_POINTER__
 	.type	idata.ilt.\name,@object
 idata.ilt.\name:
@@ -84,15 +84,15 @@ idata.ilt.\name:
 	...
 	decentralized content
 	...
-	*/.section .idata.ro.ilt.\name\().3,"aG",\name,comdat
+	*/.section .idata.ro.ilt.\name\().3,"aG",@progbits,\name,comdat
 	.quad	0
   .previous
-  .section .idata.ro.hnt.\name\().1,"aG",\name,comdat
+  .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",\name,comdat
+  .section .piro.data.sort.iat.2.\name\().1,"awG",@progbits,\name,comdat
 	.align	__SIZEOF_POINTER__
 	.type	idata.iat.\name,@object
 idata.iat.\name:
@@ -100,7 +100,7 @@ idata.iat.\name:
 	...
 	decentralized content
 	...
-	*/.section .piro.data.sort.iat.2.\name\().3,"awG",\name,comdat
+	*/.section .piro.data.sort.iat.2.\name\().3,"awG",@progbits,\name,comdat
 	.quad	0
   .previous
   .section .rodata.str1.1,"aSM",@progbits,1

ape/lib/apelib.mk

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

ape/lib/apm.h

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

ape/lib/bootdr.S

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

ape/lib/e820map.S

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

ape/lib/flattenhighmemory.c

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

ape/lib/g_pml4t.S

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

ape/lib/g_ptsp.S

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

ape/lib/getpagetableentry.c

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

ape/lib/kbiosdataarea.S

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

ape/lib/mapimage.c

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

ape/lib/pageunmap.c

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

ape/lib/pc.h

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

ape/lib/smapsort.c

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

ape/macros.internal.h

@@ -1,6 +1,24 @@
+/*-*- 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.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
 #ifndef APE_MACROS_H_
 #define APE_MACROS_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */
 
@@ -8,9 +26,9 @@
  * @fileoverview Macros relevant to αcτµαlly pδrταblε εxεcµταblε.
  */
 
-/	Calls near (i.e. pc+pcrel<64kB) FUNCTION.
-/	@mode	long,legacy,real
-/	@cost	9 bytes overhead
+//	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
@@ -25,8 +43,8 @@
 912:
 .endm
 
-/	Loads far (i.e. <1mb) abs constexpr ADDRESS into ES:DI+EDX+RDX.
-/	@mode	long,legacy,real
+//	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
@@ -39,8 +57,8 @@
 297:	
 .endm
 
-/	Loads 16-bit CONSTEXPR into Qw-register w/ optional zero-extend.
-/	@mode	long,legacy,real
+//	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
@@ -52,8 +70,8 @@
 	movb	$(\constexpr)&0xff,\abcd.lo
 .endm
 
-/	Compares 16-bit CONSTEXPR with Qw-register.
-/	@mode	long,legacy,real
+//	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
@@ -61,8 +79,8 @@
 387:
 .endm
 
-/	Adds 16-bit CONSTEXPR to Qw-register.
-/	@mode	long,legacy,real
+//	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
@@ -70,8 +88,8 @@
  .endif
 .endm
 
-/	Subtracts 16-bit CONSTEXPR from Qw-register.
-/	@mode	long,legacy,real
+//	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
@@ -79,8 +97,8 @@
  .endif
 .endm
 
-/	Ands Qw-register with 16-bit CONSTEXPR.
-/	@mode	long,legacy,real
+//	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
@@ -90,8 +108,8 @@
  .endif
 .endm
 
-/	Ors Qw-register with 16-bit CONSTEXPR.
-/	@mode	long,legacy,real
+//	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
@@ -101,8 +119,8 @@
  .endif
 .endm
 
-/	Performs ACTION only if in real mode.
-/	@mode	long,legacy,real
+//	Performs ACTION only if in real mode.
+//	@mode	long,legacy,real
 .macro	rlo	clobber:req action:vararg
 990:	mov	$0,\clobber
 	.if	.-990b!=3
@@ -117,10 +135,10 @@
 	.endif
 .endm
 
-/	Initializes real mode stack.
-/	The most holiest of holy code.
-/	@mode	real
-/	@see	www.pcjs.org/pubs/pc/reference/intel/8086/
+//	Initializes real mode stack.
+//	The most holiest of holy code.
+//	@mode	real
+//	@see	www.pcjs.org/pubs/pc/reference/intel/8086/
 .macro	rlstack	seg:req addr:req
 	cli
 	mov	\seg,%ss
@@ -128,7 +146,7 @@
 	sti
 .endm
 
-/	Symbolic Linker-Defined Binary Content.
+//	Symbolic Linker-Defined Binary Content.
 .macro	.stub	name:req kind:req default type=@object
  .ifnb	\default
   .equ	\name,\default
@@ -139,17 +157,17 @@
 .hidden	\name
 .endm
 
-/	Symbolic Linker-Defined Binary-Encoded-Bourne Content.
-/	@param	units is the number of encoded 32-bit values to insert,
-/		e.g. \000 can be encoded as 0x3030305c.
-.macro	.shstub	name:req units:req
+//	Symbolic Linker-Defined Binary-Encoded-Bourne Content.
+//	@param	units is the number of encoded 32-bit values to insert,
+//		e.g. \000 can be encoded as 0x3030305c.
+.macro	.shstub	name:req num:req
  ss	\name,0
- .if	\units>1
+ .if	\num>1
   ss	\name,1
-   .if	\units>2
+   .if	\num>2
     ss	\name,2
     ss	\name,3
-    .if	\units>4
+    .if	\num>4
      ss	\name,4
      ss	\name,5
      ss	\name,6
@@ -166,8 +184,8 @@
 #elif defined(__LINKER__)
 
 #define BCX_NIBBLE(X) ((((X)&0xf) > 0x9) ? ((X)&0xf) + 0x37 : ((X)&0xf) + 0x30)
-#define BCX_OCTET(X) ((BCX_NIBBLE((X) >> 4) << 8) | (BCX_NIBBLE((X) >> 0) << 0))
-#define BCX_INT16(X) ((BCX_OCTET((X) >> 8) << 16) | (BCX_OCTET((X) >> 0) << 0))
+#define BCX_OCTET(X)  ((BCX_NIBBLE((X) >> 4) << 8) | (BCX_NIBBLE((X) >> 0) << 0))
+#define BCX_INT16(X)  ((BCX_OCTET((X) >> 8) << 16) | (BCX_OCTET((X) >> 0) << 0))
 #define BCXSTUB(SYM, X)                      \
   HIDDEN(SYM##_bcx0 = BCX_INT16((X) >> 48)); \
   HIDDEN(SYM##_bcx1 = BCX_INT16((X) >> 32)); \

ape/relocations.h

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

build/actuallynice

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

build/archive

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

build/assemble

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

build/bochs-debugger

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

build/bochs-scriptable

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

build/catcode

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

build/compile

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

build/config.mk

@@ -20,8 +20,6 @@ CONFIG_CCFLAGS +=		\
 TARGET_ARCH ?=			\
 	-msse3
 
-RAGELFLAGS ?= -G2
-
 endif
 
 # Optimized Mode
@@ -48,8 +46,6 @@ CONFIG_CCFLAGS +=		\
 TARGET_ARCH ?=			\
 	-march=native
 
-RAGELFLAGS ?= -G2
-
 endif
 
 # Release Mode
@@ -73,8 +69,6 @@ CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
 	-O2
 
-RAGELFLAGS = -G2
-
 endif
 
 # Debug Mode
@@ -94,15 +88,12 @@ CONFIG_CPPFLAGS +=		\
 CONFIG_CCFLAGS +=		\
 	$(BACKTRACES)		\
 	$(FTRACE)		\
-	-fno-inline
+	-O2
 
 CONFIG_COPTS +=			\
 	$(SECURITY_BLANKETS)	\
 	$(SANITIZER)
 
-CONFIG_COPTS +=			\
-	-ftrapv
-
 TARGET_ARCH ?=			\
 	-msse3
 
@@ -122,24 +113,149 @@ endif
 #   - No backtraces
 #   - No algorithmics
 #   - YOLO
-
 ifeq ($(MODE), tiny)
-
 CONFIG_CPPFLAGS +=		\
 	-DTINY			\
 	-DNDEBUG		\
 	-DTRUSTWORTHY
-
 CONFIG_CCFLAGS +=		\
 	-Os			\
 	-fno-align-functions	\
 	-fno-align-jumps	\
 	-fno-align-labels	\
 	-fno-align-loops
-
 TARGET_ARCH ?=			\
 	-msse3
+endif
 
+# Linux-Only Tiny Mode
+#
+#   - `make MODE=tinylinux`
+#   - No checks
+#   - No asserts
+#   - No canaries
+#   - No paranoia
+#   - No avx hooks
+#   - No backtraces
+#   - No portability
+#   - No algorithmics
+#   - YOLO
+ifeq ($(MODE), tinylinux)
+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 ?=			\
+	-msse3
+endif
+
+# Linux+BSD Tiny Mode
+#
+#   - `make MODE=tinylinuxbsd`
+#   - No apple
+#   - No checks
+#   - No asserts
+#   - No canaries
+#   - No paranoia
+#   - No microsoft
+#   - No avx hooks
+#   - No backtraces
+#   - No algorithmics
+#   - YOLO
+ifeq ($(MODE), tinylinuxbsd)
+CONFIG_CPPFLAGS +=		\
+	-DTINY			\
+	-DNDEBUG		\
+	-DTRUSTWORTHY		\
+	-DSUPPORT_VECTOR=113
+CONFIG_CCFLAGS +=		\
+	-Os			\
+	-fno-align-functions	\
+	-fno-align-jumps	\
+	-fno-align-labels	\
+	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
+endif
+
+# Unix Tiny Mode
+#
+#   - `make MODE=tinysysv`
+#   - No checks
+#   - No asserts
+#   - No canaries
+#   - No paranoia
+#   - No microsoft
+#   - No avx hooks
+#   - No backtraces
+#   - No algorithmics
+#   - YOLO
+ifeq ($(MODE), tinysysv)
+CONFIG_CPPFLAGS +=		\
+	-DTINY			\
+	-DNDEBUG		\
+	-DTRUSTWORTHY		\
+	-DSUPPORT_VECTOR=121
+CONFIG_CCFLAGS +=		\
+	-Os			\
+	-fno-align-functions	\
+	-fno-align-jumps	\
+	-fno-align-labels	\
+	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
+endif
+
+# Tiny Metallic Unix Mode
+#
+#   - `make MODE=tinynowin`
+#   - No checks
+#   - No asserts
+#   - No canaries
+#   - No paranoia
+#   - No microsoft
+#   - No avx hooks
+#   - No backtraces
+#   - No algorithmics
+#   - YOLO
+ifeq ($(MODE), tinynowin)
+CONFIG_CPPFLAGS +=		\
+	-DTINY			\
+	-DNDEBUG		\
+	-DTRUSTWORTHY		\
+	-DSUPPORT_VECTOR=251
+CONFIG_CCFLAGS +=		\
+	-Os			\
+	-fno-align-functions	\
+	-fno-align-jumps	\
+	-fno-align-labels	\
+	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
+endif
+
+# LLVM Mode
+ifeq ($(MODE), llvm)
+TARGET_ARCH ?= -msse3
+CONFIG_CCFLAGS += $(BACKTRACES) $(FTRACE) -O2
+AS = clang
+CC = clang
+CXX = clang++
+CXXFILT = llvm-c++filt
+LD = ld.lld
+NM = llvm-nm
+GCC = clang
+STRIP = llvm-strip
+OBJCOPY = llvm-objcopy
+OBJDUMP = llvm-objdump
+ADDR2LINE = llvm-addr2line
 endif
 
 # ANSI Mode
@@ -166,11 +282,6 @@ endif
 # such as MSVC or XCode. You can run your binary objects through a tool
 # like objconv to convert them to COFF or MachO. Then use ANSI mode to
 # rollup one header file that'll enable linkage with minimal issues.
-#
-# Lastly note that in some cases, such as gc(), there simply isn't any
-# ANSI workaround available. It's only in cases like that when we'll use
-# the __asm__() header workaround, rather than simply removing it. We do
-# however try to do that much less often than mainstream C libraries.
 
 ifeq ($(MODE), ansi)
 

build/definitions.mk

@@ -13,8 +13,8 @@
 #
 #   When tuning the variables below, please note they're interpreted in
 #   the strictest sense. For example, we don't pass CFLAGS to gcc if we
-#   know it's compiling a .S file. This allows our `make SILENT=0` logs
-#   to be succinct and informative, at the cost of being less forgiving.
+#   know it's compiling a .S file.  This enables our `make V=0` logging
+#   to be succinct and informative at the cost of being less forgiving.
 #
 #   Further note that link order is equally unforgiving in repositories
 #   of this scale. We approach that by over-specifying dependencies, in
@@ -42,29 +42,29 @@
 #     ASFLAGS      assembler flags (don't use -Wa, frontend prefix)
 #     TARGET_ARCH  microarchitecture flags (e.g. -march=native)
 
-DD ?= /bin/dd
-CP ?= /bin/cp -f
-RM ?= /bin/rm -f
-SED ?= /bin/sed
-MKDIR ?= /bin/mkdir -p
+V ?= 1
+LC_ALL = C
+SOURCE_DATE_EPOCH = 0
+
 TAGS ?= /usr/bin/ctags  # emacs source builds or something breaks it
 ARFLAGS = rcsD
-SILENT ?= 1
 ZFLAGS ?=
 XARGS ?= xargs -P4 -rs8000
-NICE ?= build/actuallynice
 DOT ?= dot
 GZ ?= gzip
-CLANG = clang-10
+CLANG = clang
 FC = gfortran  #/opt/cross9f/bin/x86_64-linux-musl-gfortran
 
 # 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
-AR = build/archive
 NM = o/third_party/gcc/bin/x86_64-linux-musl-nm
 GCC = o/third_party/gcc/bin/x86_64-linux-musl-gcc
 STRIP = o/third_party/gcc/bin/x86_64-linux-musl-strip
@@ -75,43 +75,28 @@ 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)
-LOGFMT := $(shell build/getlogfmt)
-CCNAME := $(shell build/getccname $(CC))
-CCVERSION := $(shell build/getccversion $(CC))
-BLAH1 := $(shell build/zipobj 2>/dev/null)
-BLAH2 := $(shell build/package 2>/dev/null)
+COMPILE := $(shell build/getcompile) -V$(shell build/getccversion $(CC))
 
 export ADDR2LINE
-export OBJDUMP
-export CCNAME
-export CCVERSION
-export CP
-export DD
-export GZ
-export IMAGE_BASE_VIRTUAL
-export LOGFMT
-export MKDIR
+export LC_ALL
 export MODE
-export RM
-export SED
-export SILENT
+export SOURCE_DATE_EPOCH
 export TMPDIR
-export ZFLAGS
+export V
 
 FTRACE =								\
 	-pg
 
 SANITIZER =								\
-	-fsanitize=leak							\
-	-fsanitize=undefined						\
-	-fsanitize=implicit-signed-integer-truncation			\
-	-fsanitize=implicit-integer-sign-change
+	-fsanitize=address
 
 NO_MAGIC =								\
 	-mno-fentry							\
 	-fno-stack-protector						\
-	-fno-sanitize=all
+	-fno-sanitize=all						\
+	-fwrapv
 
 OLD_CODE =								\
 	-fno-strict-aliasing						\
@@ -151,10 +136,11 @@ MATHEMATICAL =								\
 	-fwrapv
 
 DEFAULT_CPPFLAGS =							\
+	-DCOSMO								\
+	-DMODE='"$(MODE)"'						\
 	-DIMAGE_BASE_VIRTUAL=$(IMAGE_BASE_VIRTUAL)			\
 	-nostdinc							\
-	-iquote -							\
-	-iquote .
+	-iquote.
 
 DEFAULT_CFLAGS =							\
 	-std=gnu2x
@@ -180,15 +166,14 @@ DEFAULT_LDFLAGS =							\
 	-m elf_x86_64							\
 	--gc-sections							\
 	--build-id=none							\
-	--cref -Map=$@.map						\
 	--no-dynamic-linker						\
-	-z max-page-size=0x1000						\
-	-Ttext-segment=$(IMAGE_BASE_VIRTUAL)
+	-z max-page-size=0x1000
 
 ZIPOBJ_FLAGS =								\
 	 -b$(IMAGE_BASE_VIRTUAL)
 
 ASONLYFLAGS =								\
+	-c								\
 	-g								\
 	--debug-prefix-map="$(PWD)"=
 
@@ -272,8 +257,8 @@ COMPILE.F.flags = $(cc.flags) $(cpp.flags) $(copt.flags) $(f.flags)
 COMPILE.i.flags = $(cc.flags) $(copt.flags) $(c.flags)
 COMPILE.ii.flags = $(cc.flags) $(copt.flags) $(cxx.flags)
 LINK.flags = $(DEFAULT_LDFLAGS) $(CONFIG_LDFLAGS) $(LDFLAGS)
-OBJECTIFY.c.flags = $(OBJECTIFY.S.flags) $(c.flags)
-OBJECTIFY.cxx.flags = $(OBJECTIFY.S.flags) $(cxx.flags)
+OBJECTIFY.c.flags = $(OBJECTIFY.S.flags) $(copt.flags) $(c.flags)
+OBJECTIFY.cxx.flags = $(OBJECTIFY.S.flags) $(copt.flags) $(cxx.flags)
 OBJECTIFY.s.flags = $(ASONLYFLAGS) $(s.flags)
 OBJECTIFY.S.flags = $(copt.flags) $(cc.flags) $(o.flags) $(cpp.flags) $(S.flags)
 OBJECTIFY.f.flags = $(copt.flags) $(cc.flags) $(o.flags) $(copt.flags) $(S.flags) $(f.flags)
@@ -294,10 +279,9 @@ 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 = build/link $(LD) $(LINK.flags)
+LINK = $(LD) $(LINK.flags)
 ELF = o/libc/elf/elf.lds
-ELFLINK = ACTION=LINK.elf $(LINK) $(LINKARGS) $(OUTPUT_OPTION)
-ARCHIVE = $(AR) $(ARFLAGS)
+ELFLINK = $(COMPILE) -ALINK.elf $(LINK) $(LINKARGS) $(OUTPUT_OPTION)
 LINKARGS = $(patsubst %.lds,-T %.lds,$(call uniqr,$(LD.libs) $(filter-out %.pkg,$^)))
 LOLSAN = build/lolsan -b $(IMAGE_BASE_VIRTUAL)
 

build/do

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

build/findtmp

@@ -13,7 +13,5 @@
 #   environment variable. Many programs use it under the hood, e.g. gcc,
 #   so it grants many small performance improvements.
 
-MKDIR=${MKDIR:-$(command -v mkdir) -p} || exit
-
-$MKDIR o/tmp
+mkdir -p o/tmp
 echo o/tmp

build/gdb

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

build/getccname

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

build/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/getlogfmt

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

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/includeall

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

build/link

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

build/mkdeps

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

build/objdump

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

build/online.mk

@@ -23,9 +23,8 @@
 #   - tool/build/runitd.c
 
 .PRECIOUS: o/$(MODE)/%.com.ok
-o/$(MODE)/%.com.ok:					\
-		o/$(MODE)/tool/build/runit.com.dbg	\
-		o/$(MODE)/tool/build/runitd.com		\
+o/$(MODE)/%.com.ok:				\
+		o/$(MODE)/tool/build/runit.com	\
+		o/$(MODE)/tool/build/runitd.com	\
 		o/$(MODE)/%.com
-	@ACTION=TEST TARGET=$@ build/do $^ $(HOSTS)
-	@touch $@
+	@$(COMPILE) -ATEST -tT$@ $^ $(HOSTS)

build/package

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

build/rollup

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

build/rules.mk

@@ -16,73 +16,67 @@
 
 MAKEFLAGS += --no-builtin-rules
 
-o/%.a:; @$(ARCHIVE) $@ $^
-o/%.o: %.s; @TARGET=$@ build/assemble $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/%.o: o/%.s; @TARGET=$@ build/assemble $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/%.s: %.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.s: o/%.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.i: %.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/%.o: %.S; @ACTION=OBJECTIFY.S build/compile $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/%.o: o/%.S; @ACTION=OBJECTIFY.S build/compile $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/%.s: %.i; @ACTION=COMPILE.i build/compile $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/%.s: o/%.i; @ACTION=COMPILE.i build/compile $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/%.o: %.cc; @ACTION=OBJECTIFY.cxx build/compile $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/%.o: o/%.cc; @ACTION=OBJECTIFY.cxx build/compile $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/%.lds: %.lds; @ACTION=PREPROCESS build/compile $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
-o/%.inc: %.h; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) -D__ASSEMBLER__ -P $<
-o/%.pkg:; @build/package $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
-o/%.h.ok: %.h; @ACTION=CHECK.h build/compile $(COMPILE.c) -x c -g0 -o $@ $<
-o/%.h.okk: %.h; @ACTION=CHECK.h build/compile $(COMPILE.cxx) -x c++ -g0 -o $@ $<
-o/%.greg.o: %.greg.c; @ACTION=OBJECTIFY.greg build/compile $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/%.zip.o: o/%; @build/zipobj $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+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)/%.a:; @$(ARCHIVE) $@ $^
-o/$(MODE)/%: o/$(MODE)/%.dbg; @ACTION=OBJCOPY TARGET=$@ build/do $(OBJCOPY) -SO binary $< $@
-o/$(MODE)/%.o: %.s; @TARGET=$@ build/assemble $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.s; @TARGET=$@ build/assemble $(OBJECTIFY.s) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: %.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: o/$(MODE)/%.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.c; @ACTION=OBJECTIFY.c build/compile $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.f; @ACTION=OBJECTIFY.f build/compile $(OBJECTIFY.f) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.F; @ACTION=OBJECTIFY.F build/compile $(OBJECTIFY.F) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.c; @ACTION=OBJECTIFY.c build/compile $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ss: %.c; @ACTION=COMPILE.c build/compile $(COMPILE.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ss: o/$(MODE)/%.c; @ACTION=OBJECTIFY.s build/compile $(COMPILE.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.S; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.c; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: %.cc; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.i: o/$(MODE)/%.c; @ACTION=PREPROCESS build/compile $(PREPROCESS) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.h: %.c; @ACTION=AMALGAMATE build/compile $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
-o/$(MODE)/%.h: o/$(MODE)/%.c; @ACTION=AMALGAMATE build/compile $(PREPROCESS) $(OUTPUT_OPTION) -fdirectives-only -P $<
-o/$(MODE)/%.o: %.S; @ACTION=OBJECTIFY.S build/compile $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.S; @ACTION=OBJECTIFY.S build/compile $(OBJECTIFY.S) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: %.i; @ACTION=COMPILE.i build/compile $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.s: o/$(MODE)/%.i; @ACTION=COMPILE.i build/compile $(COMPILE.i) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: %.cc; @ACTION=OBJECTIFY.cxx build/compile $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.o: o/$(MODE)/%.cc; @ACTION=OBJECTIFY.cxx build/compile $(OBJECTIFY.cxx) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.lds: %.lds; @ACTION=PREPROCESS build/compile $(PREPROCESS.lds) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.h.ok: %.h; @ACTION=CHECK.h build/compile $(COMPILE.c) -x c -g0 -o $@ $<
-o/$(MODE)/%.h.okk: %.h; @ACTION=CHECK.h build/compile $(COMPILE.cxx) -x c++ -g0 -o $@ $<
-o/$(MODE)/%.o: %.greg.c; @ACTION=OBJECTIFY.greg build/compile $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.greg.o: %.greg.c; @ACTION=OBJECTIFY.greg build/compile $(OBJECTIFY.greg.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ansi.o: %.ansi.c; @ACTION=OBJECTIFY.ansi build/compile $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ansi.o: %.c; @ACTION=OBJECTIFY.ansi build/compile $(OBJECTIFY.ansi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c99.o: %.c99.c; @ACTION=OBJECTIFY.c99 build/compile $(OBJECTIFY.c99.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c11.o: %.c11.c; @ACTION=OBJECTIFY.c11 build/compile $(OBJECTIFY.c11.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.c2x.o: %.c2x.c; @ACTION=OBJECTIFY.c2x build/compile $(OBJECTIFY.c2x.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.initabi.o: %.initabi.c; @ACTION=OBJECTIFY.init build/compile $(OBJECTIFY.initabi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.ncabi.o: %.ncabi.c; @ACTION=OBJECTIFY.nc build/compile $(OBJECTIFY.ncabi.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.real.o: %.c; @ACTION=OBJECTIFY.real build/compile $(OBJECTIFY.real.c) $(OUTPUT_OPTION) $<
-o/$(MODE)/%.runs: o/$(MODE)/%; @ACTION=CHECK.runs TARGET=$< build/runcom $< $(TESTARGS) && touch $@
-o/$(MODE)/%.pkg:; @build/package $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) $(filter %.o,$^)
-o/$(MODE)/%.zip.o: %; @build/zipobj $(ZIPOBJ_FLAGS) $(OUTPUT_OPTION) $<
+o/$(MODE)/%.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)/%.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)/%-gcc.asm: %.c; @ACTION=OBJECTIFY.c build/compile $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $<
 o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.c; @ACTION=OBJECTIFY.c build/compile $(OBJECTIFY.c) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
-o/$(MODE)/%-gcc.asm: %.f; @ACTION=OBJECTIFY.f build/compile $(OBJECTIFY.f) -S -g0 $(OUTPUT_OPTION) $<
-o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.f; @ACTION=OBJECTIFY.f build/compile $(OBJECTIFY.f) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@
-o/$(MODE)/%-gcc.asm: %.F; @ACTION=OBJECTIFY.F build/compile $(OBJECTIFY.F) -S -g0 $(OUTPUT_OPTION) $<
-o/$(MODE)/%-clang.asm: CC = $(CLANG)
-o/$(MODE)/%-clang.asm: %.F; @ACTION=OBJECTIFY.F build/compile $(OBJECTIFY.F) -S -g0 $(OUTPUT_OPTION) $< || echo / need $(CLANG) >$@

build/runcom

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

build/ssh

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

build/zipobj

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

dsp/core/c161.h

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

dsp/core/c161s.h

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

dsp/core/core.mk

@@ -24,8 +24,10 @@ DSP_CORE_A_CHECKS =				\
 	$(DSP_CORE_A_HDRS:%=o/$(MODE)/%.ok)
 
 DSP_CORE_A_DIRECTDEPS =				\
-	LIBC_NEXGEN32E				\
+	LIBC_INTRIN				\
 	LIBC_MEM				\
+	LIBC_NEXGEN32E				\
+	LIBC_STR				\
 	LIBC_TINYMATH				\
 	LIBC_STUBS
 
@@ -57,12 +59,6 @@ o/$(MODE)/dsp/core/det3.o:			\
 		OVERRIDE_CFLAGS +=		\
 			-ffast-math
 
-# ifeq (,$(MODE))
-# $(DSP_CORE_OBJS):				\
-# 		OVERRIDE_CFLAGS +=		\
-# 			-fsanitize=address
-# endif
-
 DSP_CORE_LIBS = $(foreach x,$(DSP_CORE_ARTIFACTS),$($(x)))
 DSP_CORE_SRCS = $(foreach x,$(DSP_CORE_ARTIFACTS),$($(x)_SRCS))
 DSP_CORE_HDRS = $(foreach x,$(DSP_CORE_ARTIFACTS),$($(x)_HDRS))

dsp/core/double2byte.c

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

dsp/core/float2short.c

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

dsp/core/getintegercoefficients.c

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

dsp/core/getintegercoefficients8.c

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

dsp/core/half.h

@@ -1,12 +1,12 @@
 #ifndef COSMOPOLITAN_DSP_CORE_HALF_H_
 #define COSMOPOLITAN_DSP_CORE_HALF_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**
  * Divides integer in half w/ rounding.
  */
-#define HALF(X) (((X) + 1) / (2 / TYPE_INTEGRAL(typeof(X))))
+#define HALF(X) (((X) + 1) / 2)
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_DSP_CORE_HALF_H_ */

dsp/core/ks8.h

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

dsp/core/kss8.h

@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_KSS8_H_
 #define COSMOPOLITAN_DSP_CORE_KSS8_H_
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**

dsp/core/mulaw.S

@@ -16,22 +16,22 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 #define BIAS 0x84
 
-/	Encodes audio sample with µ-Law.
-/
-/	This is both the highest quality and most widely supported
-/	telephony codec, whose use was phased out in the 2000's in
-/	favor of cost-saving GSM audio compression that was so bad
-/	consumers were willing to pay more cash, for the privilege
-/	of saving telcos even more money w/ text messaging. Mu Law
-/	reduces PCM data to half its original size, by diminishing
-/	audio bands not vocalized by human voice.
-/
-/	@param	%edi is pcm sample
-/	@return	%eax is uint8_t encoded sample
+//	Encodes audio sample with µ-Law.
+//
+//	This is both the highest quality and most widely supported
+//	telephony codec, whose use was phased out in the 2000's in
+//	favor of cost-saving GSM audio compression that was so bad
+//	consumers were willing to pay more cash, for the privilege
+//	of saving telcos even more money w/ text messaging. Mu Law
+//	reduces PCM data to half its original size, by diminishing
+//	audio bands not vocalized by human voice.
+//
+//	@param	%edi is pcm sample
+//	@return	%eax is uint8_t encoded sample
 mulaw:	.leafprologue
 	.profilable
 	mov	$BIAS,%eax

dsp/core/q.h

@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_Q_H_
 #define COSMOPOLITAN_DSP_CORE_Q_H_
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 

dsp/core/sad16x8n.S

@@ -16,14 +16,14 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .align	16
 
-/	Mixes audio.
-/
-/	@param	rdi is # aligned int16[16] sample chunks to process
-/	@param	rsi points to aligned pcm s16le input/output memory
-/	@param	rdx points to aligned pcm s16le [0..1] input memory
+//	Mixes audio.
+//
+//	@param	rdi is # aligned int16[16] sample chunks to process
+//	@param	rsi points to aligned pcm s16le input/output memory
+//	@param	rdx points to aligned pcm s16le [0..1] input memory
 sad16x8n:
 	.leafprologue
 	.profilable

dsp/core/scalevolume.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 
 /**

dsp/mpeg/clamp4int256-core.S

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 clamp4int256$core:

dsp/mpeg/mpeg1.c

@@ -35,7 +35,7 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"

dsp/mpeg/slowrgb.c

@@ -28,7 +28,7 @@
 │  SOFTWARE.                                                                   │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/mpeg/mpeg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 asm(".ident\t\"\\n\\n\
 PL_MPEG (MIT License)\\n\

dsp/scale/gyarados.c

@@ -24,11 +24,11 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
-#include "libc/runtime/gc.h"
+#include "libc/runtime/gc.internal.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"

dsp/scale/magikarp.c

@@ -20,7 +20,7 @@
 #include "dsp/core/ks8.h"
 #include "dsp/core/kss8.h"
 #include "dsp/scale/cdecimate2xuint8x8.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"

dsp/scale/scale.mk

@@ -30,6 +30,7 @@ DSP_SCALE_A_DIRECTDEPS =			\
 	LIBC_MEM				\
 	LIBC_NEXGEN32E				\
 	LIBC_RUNTIME				\
+	LIBC_STR				\
 	LIBC_STUBS				\
 	LIBC_STUBS				\
 	LIBC_TIME				\

dsp/tty/hidecursor.c

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

dsp/tty/ident.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/bits/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"

dsp/tty/mpsadbw.S

@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
-/	TODO(jart): write me
+//	TODO(jart): write me
 
 	movdqa	a,%xmm0
 	mpsadbw $0,inv,%xmm0

dsp/tty/quant.h

@@ -72,6 +72,7 @@ void ttyquantsetup(enum TtyQuantizationAlgorithm, enum TtyQuantizationChannels,
 extern char *ttyraster(char *, const struct TtyRgb *, size_t, size_t,
                        struct TtyRgb, struct TtyRgb);
 
+#ifndef ttyquant
 #define ttyquant()    (&g_ttyquant_)
 #define TTYQUANT()    VEIL("r", &g_ttyquant_)
 #define rgb2tty(...)  (ttyquant()->rgb2tty(__VA_ARGS__))
@@ -81,6 +82,7 @@ extern char *ttyraster(char *, const struct TtyRgb *, size_t, size_t,
 #define setbg(...)    (ttyquant()->setbg(__VA_ARGS__))
 #define setfg(...)    (ttyquant()->setfg(__VA_ARGS__))
 #define setbgfg(...)  (ttyquant()->setbgfg(__VA_ARGS__))
+#endif /* ttyquant */
 
 forceinline bool ttyeq(struct TtyRgb x, struct TtyRgb y) {
   return x.r == y.r && x.g == y.g && x.b == y.b;

dsp/tty/rgb2ansi.c

@@ -22,7 +22,7 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 

dsp/tty/rgb2ttyi2f.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 struct TtyRgb rgb2ttyi2f_(int r, int g, int b) {
   return rgb2ttyf((__m128){r, g, b} / 255);

dsp/tty/rgb2xterm24.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 struct TtyRgb rgb2xterm24_(int r, int g, int b) {
   return (struct TtyRgb){MAX(MIN(r, 255), 0), MAX(MIN(g, 255), 0),

dsp/tty/sendtitle.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/runtime/gc.h"
+#include "libc/runtime/gc.internal.h"
 #include "libc/x/x.h"
 
 /* TODO(jart): DELETE */

dsp/tty/tty.mk

@@ -59,12 +59,6 @@ o/$(MODE)/dsp/tty/ttyraster.o:			\
 		OVERRIDE_CFLAGS +=		\
 			$(MATHEMATICAL)
 
-# ifeq (,$(MODE))
-# $(DSP_TTY_OBJS):				\
-# 		OVERRIDE_CFLAGS +=		\
-# 			-fsanitize=address
-# endif
-
 DSP_TTY_LIBS = $(foreach x,$(DSP_TTY_ARTIFACTS),$($(x)))
 DSP_TTY_SRCS = $(foreach x,$(DSP_TTY_ARTIFACTS),$($(x)_SRCS))
 DSP_TTY_HDRS = $(foreach x,$(DSP_TTY_ARTIFACTS),$($(x)_HDRS))

dsp/tty/ttymove.c

@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/itoa8.h"
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 

dsp/tty/ttyraster.c

@@ -23,11 +23,11 @@
 #include "dsp/tty/windex.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/runtime/runtime.h"

dsp/tty/ttyraw.c

@@ -26,8 +26,8 @@
 #include "libc/calls/typedef/sigaction_f.h"
 #include "libc/calls/ucontext.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
-#include "libc/runtime/gc.h"
+#include "libc/macros.internal.h"
+#include "libc/runtime/gc.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/fileno.h"

dsp/tty/windex-avx2.S

@@ -16,15 +16,15 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-/	Returns index of minimum uint16 in array.
-/
-/	@param	rdi points to nonempty array
-/	@param	rsi is item count divisible by 16
-/	@note	needs avx2 (haswell+)
-windex$avx2:
+//	Returns index of minimum uint16 in array.
+//
+//	@param	rdi points to nonempty array
+//	@param	rsi is item count divisible by 16
+//	@note	needs avx2 (haswell+)
+windex_avx2:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
@@ -64,7 +64,7 @@ windex$avx2:
 5:	vzeroupper
 	leave
 	ret
-	.endfn	windex$avx2,globl
+	.endfn	windex_avx2,globl
 
 	.rodata.cst32
 .Lidx:	.short	0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

dsp/tty/windex-k8.c

@@ -19,7 +19,7 @@
 #include "dsp/tty/tty.h"
 #include "libc/assert.h"
 
-unsigned windex$k8(short *a, size_t n) {
+unsigned windex_k8(short *a, size_t n) {
   unsigned short min, res, i;
   res = 0;
   min = a[0];

dsp/tty/windex-sse4.S

@@ -16,15 +16,15 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-/	Returns index of minimum positive int16 in array.
-/
-/	@param	rdi points to nonempty array
-/	@param	esi is 16-byte aligned 8+ / 8 multiple array item count
-/	@note	needs sse4 (nehalem+)
-windex$sse4:
+//	Returns index of minimum positive int16 in array.
+//
+//	@param	rdi points to nonempty array
+//	@param	esi is 16-byte aligned 8+ / 8 multiple array item count
+//	@note	needs sse4 (nehalem+)
+windex_sse4:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
@@ -54,7 +54,7 @@ windex$sse4:
 	movzwl	-32(%rbp,%rax,2),%eax
 	leave
 	ret
-	.endfn	windex$sse4,globl
+	.endfn	windex_sse4,globl
 
 	.rodata.cst16
 .Lidx:	.short	0,1,2,3,4,5,6,7

dsp/tty/windex.S

@@ -17,24 +17,24 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-/	Dispatches to fastest windex() implementation.
+//	Dispatches to fastest windex() implementation.
 	.initbss 300,_init_windex
 windex:	.quad	0
 	.endobj	windex,globl
 	.previous
 
 	.init.start 300,_init_windex
-	ezlea	windex$avx2,ax
+	ezlea	windex_avx2,ax
 #if !X86_NEED(AVX2)
-	ezlea	windex$sse4,dx
+	ezlea	windex_sse4,dx
 	testb	X86_HAVE(AVX2)+kCpuids(%rip)
 	cmovz	%rdx,%rax
-#endif /* AVX */
+#endif /* AVX2 */
 #if !X86_NEED(SSE4_2)
-	ezlea	windex$k8,dx
+	ezlea	windex_k8,dx
 	testb	X86_HAVE(SSE4_2)+kCpuids(%rip)
 	cmovz	%rdx,%rax
 #endif /* SSE4 */

examples/cp.c

@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/calls/calls.h"
-#include "libc/calls/hefty/copyfile.h"
+#include "libc/calls/copyfile.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
@@ -73,7 +73,7 @@ void GetOpts(int argc, char *argv[]) {
 
 int cp(const char *src, const char *dst) {
   if (endswith(dst, "/") || isdirectory(dst)) {
-    dst = gc(xasprintf("%s/%s", dst, basename));
+    dst = _gc(xasprintf("%s/%s", dst, basename));
   }
   if (!force && access(dst, W_OK) == -1 && errno != ENOENT) goto OnFail;
   if (copyfile(src, dst, flags) == -1) goto OnFail;

examples/cplusplus.cc

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 
@@ -48,6 +48,6 @@ int main(int argc, char *argv[]) {
   for (int i = 0; i < min(64, argc); ++i) g_log.x()[i] += argc;
   printf("%p %d %d %d\n", (void *)(intptr_t)g_log.x(), g_log.x()[0],
          g_log.x()[0], g_log.x()[0]);
-  delete x;
+  delete[] x;
   return 0;
 }

examples/crashreport.c

@@ -7,88 +7,23 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/pushpop.h"
-#include "libc/calls/calls.h"
-#include "libc/calls/ucontext.h"
 #include "libc/log/log.h"
-#include "libc/math.h"
-#include "libc/nt/enum/errormodeflags.h"
-#include "libc/nt/signals.h"
-#include "libc/runtime/runtime.h"
-#include "libc/stdio/stdio.h"
 
 /**
- * @fileoverview Demonstrates SEGFAULT via NULL pointer dereference.
+ * @fileoverview How to print backtraces and cpu state on crash.
  *
- * In MODE=dbg mode, UBSAN should catch this and display a backtrace.
- * In most other modes, e.g. MODE=balanced, the oncrash.c sig handler
- * will either launch GDB or display a very fancy report.
- *
- *     make -j8 -O MODE=opt o/opt/examples/crashreportdemo.com
- *     o/opt/examples/crashreportdemo.com
+ *     make -j8 -O o//examples/crashreport.com
+ *     o//examples/crashreport.com
  *
  * To prevent the GDB GUI from popping up:
  *
- *     export GDB=""
- *     make -j8 -O MODE=opt o/opt/examples/crashreportdemo.com
- *     o/opt/examples/crashreportdemo.com
+ *     export GDB=
+ *     make -j8 -O o//examples/crashreport.com
+ *     o//examples/crashreport.com
  */
 
-int boo;
-
-void boop(void);
-
 int main(int argc, char *argv[]) {
-  int64_t res;
+  volatile int64_t x;
   showcrashreports();
-  res = 0;
-
-  asm volatile("mov\t$0x1111111111111111,%rax\n\t"
-               "mov\t$0x3333333333333333,%rcx\n\t"
-               "mov\t$0x4444444444444444,%rdx\n\t"
-               "mov\t$0x8888888888888888,%r8\n\t"
-               "mov\t$0x9999999999999999,%r9d\n\t"
-               "mov\t$0xaaaaaaaaaaaaaaaa,%r10d\n\t"
-               "mov\t$0xbbbbbbbbbbbbbbbb,%r11d\n\t"
-               "mov\t$0x0000000000000000,%rax\n\t"
-               "movd\t%rax,%xmm0\n\t"
-               "mov\t$0x1111111111111111,%rax\n\t"
-               "push\t%rax\n\t"
-               "push\t%rax\n\t"
-               "movdqu\t(%rsp),%xmm1\n\t"
-               "pop\t%rax\n\t"
-               "pop\t%rax\n\t"
-               "mov\t$0x2222222222220022,%rax\n\t"
-               "movd\t%rax,%xmm2\n\t"
-               "mov\t$0x3333333333333333,%rax\n\t"
-               "movd\t%rax,%xmm3\n\t"
-               "mov\t$0x4444444444444444,%rax\n\t"
-               "movd\t%rax,%xmm4\n\t"
-               "mov\t$0x5555555555555555,%rax\n\t"
-               "movd\t%rax,%xmm5\n\t"
-               "mov\t$0x6666666666666666,%rax\n\t"
-               "movd\t%rax,%xmm6\n\t"
-               "mov\t$0x7777777777777777,%rax\n\t"
-               "movd\t%rax,%xmm7\n\t"
-               "mov\t$0x8888888888888888,%rax\n\t"
-               "movd\t%rax,%xmm8\n\t"
-               "mov\t$0x9999999999999999,%rax\n\t"
-               "movd\t%rax,%xmm9\n\t"
-               "mov\t$0xaaaaaaaaaaaaaaaa,%rax\n\t"
-               "movd\t%rax,%xmm10\n\t"
-               "mov\t$0xbbbbbbbbbbbbbbbb,%rax\n\t"
-               "movd\t%rax,%xmm11\n\t"
-               "mov\t$0xcccccccccccccccc,%rax\n\t"
-               "movd\t%rax,%xmm12\n\t"
-               "mov\t$0xdddddddddddddddd,%rax\n\t"
-               "movd\t%rax,%xmm13\n\t"
-               "mov\t$0xeeeeeeeeeeeeeeee,%rax\n\t"
-               "movd\t%rax,%xmm14\n\t"
-               "mov\t$0xffffffffffffffff,%rax\n\t"
-               "movd\t%rax,%xmm15\n\t"
-               "fldpi\n\t");
-
-  res = *(int *)(intptr_t)boo / boo;
-
-  return res;
+  return 1 / (x = 0);
 }