mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-07-08 20:28:30 +00:00
Make more improvements
This change includes many bug fixes, for the NT polyfills, strings, memory, boot, and math libraries which were discovered by adding more tools for recreational programming, such as PC emulation. Lemon has also been vendored because it works so well at parsing languages.
This commit is contained in:
Justine Tunney
parent
416fd86676
commit
23d333c090
201 changed files with 14558 additions and 3082 deletions
|
|
@ -18,7 +18,7 @@ CONFIG_CCFLAGS += \
|
|||
-Og
|
||||
|
||||
TARGET_ARCH ?= \
|
||||
-march=k8-sse3
|
||||
-msse3
|
||||
|
||||
RAGELFLAGS ?= -G2
|
||||
|
||||
|
|
|
|||
|
|
@ -155,8 +155,7 @@ MATHEMATICAL = \
|
|||
DEFAULT_CPPFLAGS = \
|
||||
-DIMAGE_BASE_VIRTUAL=$(IMAGE_BASE_VIRTUAL) \
|
||||
-nostdinc \
|
||||
-iquote . \
|
||||
-include libc/integral/normalize.inc
|
||||
-iquote .
|
||||
|
||||
DEFAULT_CFLAGS = \
|
||||
-std=gnu2x
|
||||
|
|
@ -217,7 +216,8 @@ cpp.flags = \
|
|||
$(DEFAULT_CPPFLAGS) \
|
||||
$(CONFIG_CPPFLAGS) \
|
||||
$(CPPFLAGS) \
|
||||
$(OVERRIDE_CPPFLAGS)
|
||||
$(OVERRIDE_CPPFLAGS) \
|
||||
-include libc/integral/normalize.inc
|
||||
|
||||
copt.flags = \
|
||||
$(TARGET_ARCH) \
|
||||
|
|
@ -317,18 +317,20 @@ OBJECTIFY.c99.c = $(CC) $(OBJECTIFY.c.flags) -std=c99 -Wextra -Werror -pedantic-
|
|||
OBJECTIFY.c11.c = $(CC) $(OBJECTIFY.c.flags) -std=c11 -Wextra -Werror -pedantic-errors -c
|
||||
OBJECTIFY.c2x.c = $(CC) $(OBJECTIFY.c.flags) -std=c2x -Wextra -Werror -pedantic-errors -c
|
||||
|
||||
# No-Clobber ABI (clobbers nothing, except rax and flags)
|
||||
#
|
||||
# This ABI is intended for core library functions that're frequently
|
||||
# called by just about everything, e.g. memcpy, malloc, etc. By offering
|
||||
# this guarantee, callers can optionally call these functions via asm(),
|
||||
# which reduces register allocator pressure at call sites.
|
||||
#
|
||||
# This makes unrelated caller code faster, but the NCABI functions
|
||||
# themselves a tiny bit slower. That's OK, since modern NexGen-32e CPUs
|
||||
# seem to have one fifth of their execution engines devoted to pushing
|
||||
# and popping, probably so legacy IA-32 code keeps going fast; so we use
|
||||
# it to our advantage.
|
||||
OBJECTIFY.real.c = \
|
||||
$(GCC) \
|
||||
$(OBJECTIFY.c.flags) \
|
||||
-wrapper build/realify.sh \
|
||||
-ffixed-r8 \
|
||||
-ffixed-r9 \
|
||||
-ffixed-r10 \
|
||||
-ffixed-r11 \
|
||||
-ffixed-r12 \
|
||||
-ffixed-r13 \
|
||||
-ffixed-r14 \
|
||||
-ffixed-r15 \
|
||||
-c
|
||||
|
||||
OBJECTIFY.ncabi.c = \
|
||||
$(GCC) \
|
||||
$(OBJECTIFY.c.flags) \
|
||||
|
|
@ -350,9 +352,6 @@ OBJECTIFY.ncabi.c = \
|
|||
-c \
|
||||
-xc
|
||||
|
||||
# Initializer ABI
|
||||
#
|
||||
# Doesn't clobber RDI and RSI.
|
||||
OBJECTIFY.initabi.c = \
|
||||
$(GCC) \
|
||||
$(OBJECTIFY.c.flags) \
|
||||
|
|
|
|||
177
build/realify.sed
Normal file
177
build/realify.sed
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
#-*-mode:sed;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
|
||||
#───vi: et ft=sed ts=8 tw=8 fenc=utf-8 :vi─────────────────┘
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# sed -i -f build/realify.sed foo.s
|
||||
#
|
||||
# OVERVIEW
|
||||
#
|
||||
# This converts ints and longs to shorts while preserving System V ABI
|
||||
# x86_64 compatibility. This works better than gcc -m16 because we can
|
||||
# avoid the ASZ and OSZ prefixes in most cases while also avoiding the
|
||||
# legacy 32-bit calling conventions.
|
||||
|
||||
# remove comments
|
||||
s/[ \t][ \t]*#.*//
|
||||
|
||||
# preserve hardcoded stack offsets
|
||||
s/leave\(q\|\)/leavew ; add $6,%sp/
|
||||
s/call\(q\|\)\t/sub $6,%sp ; callw /
|
||||
s/ret\(q\|\)/retw\t$6/
|
||||
s/pushq\t\(.*\)/sub $6,%sp ; push \1/
|
||||
s/popq\t\(.*\)/pop \1 ; add $6,%sp/
|
||||
|
||||
# can be used instead if
|
||||
# 1. functions have 6 args or fewer
|
||||
# 2. long double parameters forceinline
|
||||
#s/leave\(q\|\)/leavew/
|
||||
#s/call\(q\|\)/callw/
|
||||
#s/ret\(q\|\)/retw/
|
||||
#s/popq\t%rbp/pop\t%bp/
|
||||
#s/pushq\t%rbp/push\t%bp/
|
||||
#s/pushq\t\(.*\)/sub $6,%sp ; push \1/
|
||||
#s/popq\t\(.*\)/pop \1 ; add $6,%sp/
|
||||
|
||||
# 32-bitify
|
||||
s/rax/eax/g
|
||||
s/rbx/ebx/g
|
||||
s/rcx/ecx/g
|
||||
s/rdx/edx/g
|
||||
s/rbp/ebp/g
|
||||
s/rdi/edi/g
|
||||
s/rsi/esi/g
|
||||
s/rsp/esp/g
|
||||
|
||||
# unextension
|
||||
s/movswl/mov/
|
||||
s/movzwl/mov/
|
||||
s/movslq/mov/
|
||||
s/movzlq/mov/
|
||||
|
||||
# unsuffix
|
||||
s/^\(\t\(fild\|fist\|fistp\|fiadd\|fisub\|fisubr\|fimul\|fidiv\|fidivr\|ficom\)\)q\t/\1\t/
|
||||
s/^\(\t\(mov\|add\|adc\|cmp\|test\|lea\|sbb\|mul\|imul\|div\|idiv\|in\|out\|xor\|sub\|and\|or\|rol\|ror\|rcl\|rcr\|shl\|shr\|sal\|sar\|inc\|dec\|not\|neg\)\)l\t/\1w\t/
|
||||
s/^\(\t[a-z]*\)q\t/\1w\t/
|
||||
|
||||
# remove fluff
|
||||
s/mov\t%eax,%eax//
|
||||
s/mov\t%ebx,%ebx//
|
||||
s/mov\t%ecx,%ecx//
|
||||
s/mov\t%edx,%edx//
|
||||
s/mov\t%ebp,%ebp//
|
||||
s/mov\t%edi,%edi//
|
||||
s/mov\t%esi,%esi//
|
||||
s/mov\t%esp,%esp//
|
||||
|
||||
# make pic absolute
|
||||
s/(%rip)//
|
||||
|
||||
# legal real mode modrm
|
||||
s/(%ebx)/(%bx)/
|
||||
s/(%edi)/(%di)/
|
||||
s/(%esi)/(%si)/
|
||||
s/(%ebp)/(%bp)/
|
||||
s/(%ebx,%esi\(,1\|\))/(%bx,%si)/
|
||||
s/(%ebx,%edi\(,1\|\))/(%bx,%di)/
|
||||
s/(%ebp,%esi\(,1\|\))/(%bp,%si)/
|
||||
s/(%ebp,%edi\(,1\|\))/(%bp,%di)/
|
||||
|
||||
# we need the asz prefix
|
||||
s/(%eax,%eax/(%EAX,%EAX/
|
||||
s/(%eax,%ebp/(%EAX,%EBP/
|
||||
s/(%eax,%ebx/(%EAX,%EBX/
|
||||
s/(%eax,%ecx/(%EAX,%ECX/
|
||||
s/(%eax,%edi/(%EAX,%EDI/
|
||||
s/(%eax,%edx/(%EAX,%EDX/
|
||||
s/(%eax,%esi/(%EAX,%ESI/
|
||||
s/(%eax,%esp/(%EAX,%ESP/
|
||||
s/(%ebp,%eax/(%EBP,%EAX/
|
||||
s/(%ebp,%ebp/(%EBP,%EBP/
|
||||
s/(%ebp,%ebx/(%EBP,%EBX/
|
||||
s/(%ebp,%ecx/(%EBP,%ECX/
|
||||
s/(%ebp,%edi/(%EBP,%EDI/
|
||||
s/(%ebp,%edx/(%EBP,%EDX/
|
||||
s/(%ebp,%esi/(%EBP,%ESI/
|
||||
s/(%ebp,%esp/(%EBP,%ESP/
|
||||
s/(%ebx,%eax/(%EBX,%EAX/
|
||||
s/(%ebx,%ebp/(%EBX,%EBP/
|
||||
s/(%ebx,%ebx/(%EBX,%EBX/
|
||||
s/(%ebx,%ecx/(%EBX,%ECX/
|
||||
s/(%ebx,%edi/(%EBX,%EDI/
|
||||
s/(%ebx,%edx/(%EBX,%EDX/
|
||||
s/(%ebx,%esi/(%EBX,%ESI/
|
||||
s/(%ebx,%esp/(%EBX,%ESP/
|
||||
s/(%ecx,%eax/(%ECX,%EAX/
|
||||
s/(%ecx,%ebp/(%ECX,%EBP/
|
||||
s/(%ecx,%ebx/(%ECX,%EBX/
|
||||
s/(%ecx,%ecx/(%ECX,%ECX/
|
||||
s/(%ecx,%edi/(%ECX,%EDI/
|
||||
s/(%ecx,%edx/(%ECX,%EDX/
|
||||
s/(%ecx,%esi/(%ECX,%ESI/
|
||||
s/(%ecx,%esp/(%ECX,%ESP/
|
||||
s/(%edi,%eax/(%EDI,%EAX/
|
||||
s/(%edi,%ebp/(%EDI,%EBP/
|
||||
s/(%edi,%ebx/(%EDI,%EBX/
|
||||
s/(%edi,%ecx/(%EDI,%ECX/
|
||||
s/(%edi,%edi/(%EDI,%EDI/
|
||||
s/(%edi,%edx/(%EDI,%EDX/
|
||||
s/(%edi,%esi/(%EDI,%ESI/
|
||||
s/(%edi,%esp/(%EDI,%ESP/
|
||||
s/(%edx,%eax/(%EDX,%EAX/
|
||||
s/(%edx,%ebp/(%EDX,%EBP/
|
||||
s/(%edx,%ebx/(%EDX,%EBX/
|
||||
s/(%edx,%ecx/(%EDX,%ECX/
|
||||
s/(%edx,%edi/(%EDX,%EDI/
|
||||
s/(%edx,%edx/(%EDX,%EDX/
|
||||
s/(%edx,%esi/(%EDX,%ESI/
|
||||
s/(%edx,%esp/(%EDX,%ESP/
|
||||
s/(%esi,%eax/(%ESI,%EAX/
|
||||
s/(%esi,%ebp/(%ESI,%EBP/
|
||||
s/(%esi,%ebx/(%ESI,%EBX/
|
||||
s/(%esi,%ecx/(%ESI,%ECX/
|
||||
s/(%esi,%edi/(%ESI,%EDI/
|
||||
s/(%esi,%edx/(%ESI,%EDX/
|
||||
s/(%esi,%esi/(%ESI,%ESI/
|
||||
s/(%esi,%esp/(%ESI,%ESP/
|
||||
s/(%esp,%eax/(%ESP,%EAX/
|
||||
s/(%esp,%ebp/(%ESP,%EBP/
|
||||
s/(%esp,%ebx/(%ESP,%EBX/
|
||||
s/(%esp,%ecx/(%ESP,%ECX/
|
||||
s/(%esp,%edi/(%ESP,%EDI/
|
||||
s/(%esp,%edx/(%ESP,%EDX/
|
||||
s/(%esp,%esi/(%ESP,%ESI/
|
||||
s/(%esp,%esp/(%ESP,%ESP/
|
||||
s/(,%eax/(,%EAX/
|
||||
s/(,%ebx/(,%EBX/
|
||||
s/(,%ecx/(,%ECX/
|
||||
s/(,%edx/(,%EDX/
|
||||
s/(,%esi/(,%ESI/
|
||||
s/(,%edi/(,%EDI/
|
||||
s/(,%ebp/(,%EBP/
|
||||
s/(,%esp/(,%ESP/
|
||||
s/(%eax)/(%EAX)/
|
||||
s/(%ecx)/(%ECX)/
|
||||
s/(%edx)/(%EDX)/
|
||||
s/(%esp)/(%ESP)/
|
||||
|
||||
# 16bitify
|
||||
s/eax/ax/g
|
||||
s/ebx/bx/g
|
||||
s/ecx/cx/g
|
||||
s/edx/dx/g
|
||||
s/ebp/bp/g
|
||||
s/edi/di/g
|
||||
s/esi/si/g
|
||||
s/esp/sp/g
|
||||
|
||||
# sigh :\
|
||||
# impossible to avoid rex byte access with naive substitution
|
||||
# best workaround is avoid uint8_t* and try using uint16_t* more
|
||||
#s/dil/bl/g
|
||||
#s/sil/bh/g
|
||||
#s/spl/bl/g
|
||||
#s/bpl/bh/g
|
||||
|
||||
# nope
|
||||
s/cltq//
|
||||
23
build/realify.sh
Executable file
23
build/realify.sh
Executable file
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# gcc -g0 -Os -wrapper build/realify.sh -ffixed-r{8,9,1{0,1,2,4,5}}
|
||||
#
|
||||
# OVERVIEW
|
||||
#
|
||||
# Reconfigures x86_64 compiler to emit 16-bit PC boot code.
|
||||
|
||||
if [ "${1##*/}" = as ]; then
|
||||
for x; do
|
||||
if [ "${x##*.}" = s ]; then
|
||||
{
|
||||
printf "\t.code16gcc"
|
||||
sed -f build/realify.sed "$x"
|
||||
} >"$x".tmp
|
||||
mv -f "$x".tmp "$x"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
|
|
@ -72,6 +72,7 @@ o/$(MODE)/%.c11.o: %.c11.c; @ACTION=OBJECTIFY.c11 build/compile $(OBJECTIFY.c11.
|
|||
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/tiny/%.real.o: %.real.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 $(OUTPUT_OPTION) $<
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue