31a209ca42
This commit re-introduces the functionality of __morestack in a way that it was
not originally anticipated. Rust does not currently have segmented stacks,
rather just large stack segments. We do not detect when these stack segments are
overrun currently, but this commit leverages __morestack in order to check this.
This commit purges a lot of the old __morestack and stack limit C++
functionality, migrating the necessary chunks to rust. The stack limit is now
entirely maintained in rust, and the "main logic bits" of __morestack are now
also implemented in rust as well.
I put my best effort into validating that this currently builds and runs successfully on osx and linux 32/64 bit, but I was unable to get this working on windows. We never did have unwinding through __morestack frames, and although I tried poking at it for a bit, I was unable to understand why we don't get unwinding right now.
A focus of this commit is to implement as much of the logic in rust as possible. This involved some liberal usage of `no_split_stack` in various locations, along with some use of the `asm!` macro (scary). I modified a bit of C++ to stop calling `record_sp_limit` because this is no longer defined in C++, rather in rust.
Another consequence of this commit is that `thread_local_storage::{get, set}` must both be flagged with `#[rust_stack]`. I've briefly looked at the implementations on osx/linux/windows to ensure that they're pretty small stacks, and I'm pretty sure that they're definitely less than 20K stacks, so we probably don't have a lot to worry about.
Other things worthy of note:
* The default stack size is now 4MB instead of 2MB. This is so that when we request 2MB to call a C function you don't immediately overflow because you have consumed any stack at all.
* `asm!` is actually pretty cool, maybe we could actually define context switching with it?
* I wanted to add links to the internet about all this jazz of storing information in TLS, but I was only able to find a link for the windows implementation. Otherwise my suggestion is just "disassemble on that arch and see what happens"
* I put my best effort forward on arm/mips to tweak __morestack correctly, we have no ability to test this so an extra set of eyes would be useful on these spots.
* This is all really tricky stuff, so I tried to put as many comments as I thought were necessary, but if anything is still unclear (or I completely forgot to take something into account), I'm willing to write more!
256 lines
8.7 KiB
Makefile
256 lines
8.7 KiB
Makefile
# This is a procedure to define the targets for building
|
|
# the runtime.
|
|
#
|
|
# Argument 1 is the target triple.
|
|
#
|
|
# This is not really the right place to explain this, but
|
|
# for those of you who are not Makefile gurus, let me briefly
|
|
# cover the $ expansion system in use here, because it
|
|
# confused me for a while! The variable DEF_RUNTIME_TARGETS
|
|
# will be defined once and then expanded with different
|
|
# values substituted for $(1) each time it is called.
|
|
# That resulting text is then eval'd.
|
|
#
|
|
# For most variables, you could use a single $ sign. The result
|
|
# is that the substitution would occur when the CALL occurs,
|
|
# I believe. The problem is that the automatic variables $< and $@
|
|
# need to be expanded-per-rule. Therefore, for those variables at
|
|
# least, you need $$< and $$@ in the variable text. This way, after
|
|
# the CALL substitution occurs, you will have $< and $@. This text
|
|
# will then be evaluated, and all will work as you like.
|
|
#
|
|
# Reader beware, this explanantion could be wrong, but it seems to
|
|
# fit the experimental data (i.e., I was able to get the system
|
|
# working under these assumptions).
|
|
|
|
# Hack for passing flags into LIBUV, see below.
|
|
LIBUV_FLAGS_i386 = -m32 -fPIC -I$(S)src/etc/mingw-fix-include
|
|
LIBUV_FLAGS_x86_64 = -m64 -fPIC
|
|
ifeq ($(OSTYPE_$(1)), linux-androideabi)
|
|
LIBUV_FLAGS_arm = -fPIC -DANDROID -std=gnu99
|
|
else
|
|
LIBUV_FLAGS_arm = -fPIC -std=gnu99
|
|
endif
|
|
LIBUV_FLAGS_mips = -fPIC -mips32r2 -msoft-float -mabi=32
|
|
|
|
# when we're doing a snapshot build, we intentionally degrade as many
|
|
# features in libuv and the runtime as possible, to ease portability.
|
|
|
|
SNAP_DEFINES:=
|
|
ifneq ($(strip $(findstring snap,$(MAKECMDGOALS))),)
|
|
SNAP_DEFINES=-DRUST_SNAPSHOT
|
|
endif
|
|
|
|
define DEF_LIBUV_ARCH_VAR
|
|
LIBUV_ARCH_$(1) = $$(subst i386,ia32,$$(subst x86_64,x64,$$(HOST_$(1))))
|
|
endef
|
|
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_LIBUV_ARCH_VAR,$(t))))
|
|
|
|
ifdef CFG_ENABLE_FAST_MAKE
|
|
LIBUV_DEPS := $(S)/.gitmodules
|
|
else
|
|
LIBUV_DEPS := $(wildcard \
|
|
$(S)src/libuv/* \
|
|
$(S)src/libuv/*/* \
|
|
$(S)src/libuv/*/*/* \
|
|
$(S)src/libuv/*/*/*/*)
|
|
endif
|
|
|
|
LIBUV_NO_LOAD = run-benchmarks.target.mk run-tests.target.mk \
|
|
uv_dtrace_header.target.mk uv_dtrace_provider.target.mk
|
|
|
|
export PYTHONPATH := $(PYTHONPATH):$(S)src/gyp/pylib
|
|
|
|
define DEF_RUNTIME_TARGETS
|
|
|
|
######################################################################
|
|
# Runtime (C++) library variables
|
|
######################################################################
|
|
|
|
# $(1) is the target triple
|
|
# $(2) is the stage number
|
|
|
|
RUNTIME_CFLAGS_$(1)_$(2) = -D_RUST_STAGE$(2)
|
|
RUNTIME_CXXFLAGS_$(1)_$(2) = -D_RUST_STAGE$(2)
|
|
|
|
# XXX: Like with --cfg stage0, pass the defines for stage1 to the stage0
|
|
# build of non-build-triple host compilers
|
|
ifeq ($(2),0)
|
|
ifneq ($(strip $(CFG_BUILD_TRIPLE)),$(strip $(1)))
|
|
RUNTIME_CFLAGS_$(1)_$(2) = -D_RUST_STAGE1
|
|
RUNTIME_CXXFLAGS_$(1)_$(2) = -D_RUST_STAGE1
|
|
endif
|
|
endif
|
|
|
|
RUNTIME_CXXS_$(1)_$(2) := \
|
|
rt/sync/lock_and_signal.cpp \
|
|
rt/sync/rust_thread.cpp \
|
|
rt/rust_builtin.cpp \
|
|
rt/rust_upcall.cpp \
|
|
rt/rust_uv.cpp \
|
|
rt/miniz.cpp \
|
|
rt/memory_region.cpp \
|
|
rt/boxed_region.cpp \
|
|
rt/rust_android_dummy.cpp \
|
|
rt/rust_test_helpers.cpp
|
|
|
|
RUNTIME_CS_$(1)_$(2) := rt/sundown/src/autolink.c \
|
|
rt/sundown/src/buffer.c \
|
|
rt/sundown/src/stack.c \
|
|
rt/sundown/src/markdown.c \
|
|
rt/sundown/html/houdini_href_e.c \
|
|
rt/sundown/html/houdini_html_e.c \
|
|
rt/sundown/html/html_smartypants.c \
|
|
rt/sundown/html/html.c
|
|
|
|
RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
|
|
rt/arch/$$(HOST_$(1))/record_sp.S
|
|
|
|
RT_BUILD_DIR_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/stage$(2)
|
|
|
|
RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
|
|
RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
|
|
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
|
|
-I $$(S)src/rt/sundown/src \
|
|
-I $$(S)src/rt/sundown/html \
|
|
-I $$(S)src/libuv/include
|
|
RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
|
|
$$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
|
|
$$(RUNTIME_S_$(1)_$(2):rt/%.S=$$(RT_BUILD_DIR_$(1)_$(2))/%.o)
|
|
ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1)_$(2))
|
|
|
|
MORESTACK_OBJS_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/morestack.o
|
|
ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1)_$(2))
|
|
|
|
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.cpp $$(MKFILE_DEPS)
|
|
@$$(call E, compile: $$@)
|
|
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
|
|
$$(SNAP_DEFINES) $$(RUNTIME_CXXFLAGS_$(1)_$(2))) $$<
|
|
|
|
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.c $$(MKFILE_DEPS)
|
|
@$$(call E, compile: $$@)
|
|
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
|
|
$$(SNAP_DEFINES) $$(RUNTIME_CFLAGS_$(1)_$(2))) $$<
|
|
|
|
$$(RT_BUILD_DIR_$(1)_$(2))/%.o: rt/%.S $$(MKFILE_DEPS) \
|
|
$$(LLVM_CONFIG_$$(CFG_BUILD_TRIPLE))
|
|
@$$(call E, compile: $$@)
|
|
$$(Q)$$(call CFG_ASSEMBLE_$(1),$$@,$$<)
|
|
|
|
$$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJS_$(1)_$(2))
|
|
@$$(call E, link: $$@)
|
|
$$(Q)$(AR_$(1)) rcs $$@ $$^
|
|
|
|
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
|
|
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1))
|
|
@$$(call E, link: $$@)
|
|
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
|
|
$$(LIBUV_LIB_$(1)) \
|
|
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
|
|
|
|
# These could go in rt.mk or rustllvm.mk, they're needed for both.
|
|
|
|
# This regexp has a single $, escaped twice
|
|
$(1)/%.bsd.def: %.def.in $$(MKFILE_DEPS)
|
|
@$$(call E, def: $$@)
|
|
$$(Q)echo "{" > $$@
|
|
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
|
|
$$(Q)echo "};" >> $$@
|
|
|
|
$(1)/%.linux.def: %.def.in $$(MKFILE_DEPS)
|
|
@$$(call E, def: $$@)
|
|
$$(Q)echo "{" > $$@
|
|
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
|
|
$$(Q)echo "};" >> $$@
|
|
|
|
$(1)/%.darwin.def: %.def.in $$(MKFILE_DEPS)
|
|
@$$(call E, def: $$@)
|
|
$$(Q)sed 's/^./_&/' $$< > $$@
|
|
|
|
$(1)/%.android.def: %.def.in $$(MKFILE_DEPS)
|
|
@$$(call E, def: $$@)
|
|
$$(Q)echo "{" > $$@
|
|
$$(Q)sed 's/.$$$$/&;/' $$< >> $$@
|
|
$$(Q)echo "};" >> $$@
|
|
|
|
$(1)/%.mingw32.def: %.def.in $$(MKFILE_DEPS)
|
|
@$$(call E, def: $$@)
|
|
$$(Q)echo LIBRARY $$* > $$@
|
|
$$(Q)echo EXPORTS >> $$@
|
|
$$(Q)sed 's/^./ &/' $$< >> $$@
|
|
|
|
endef
|
|
|
|
|
|
######################################################################
|
|
# Runtime third party targets (libuv, jemalloc, etc.)
|
|
#
|
|
# These targets do not need to be built once per stage, so these
|
|
# rules just build them once and then we're done with them.
|
|
######################################################################
|
|
|
|
define DEF_THIRD_PARTY_TARGETS
|
|
|
|
# $(1) is the target triple
|
|
|
|
RT_OUTPUT_DIR_$(1) := $(1)/rt
|
|
|
|
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
|
|
LIBUV_OSTYPE_$(1) := win
|
|
else ifeq ($(OSTYPE_$(1)), apple-darwin)
|
|
LIBUV_OSTYPE_$(1) := mac
|
|
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
|
|
LIBUV_OSTYPE_$(1) := freebsd
|
|
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
|
|
LIBUV_OSTYPE_$(1) := android
|
|
LIBUV_ARGS_$(1) := PLATFORM=android host=android OS=linux
|
|
else
|
|
LIBUV_OSTYPE_$(1) := linux
|
|
endif
|
|
|
|
LIBUV_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),uv)
|
|
LIBUV_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/libuv/$$(LIBUV_NAME_$(1))
|
|
|
|
LIBUV_MAKEFILE_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv/Makefile
|
|
|
|
$$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS)
|
|
(cd $(S)src/libuv/ && \
|
|
$$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) \
|
|
-D ninja \
|
|
-DOS=$$(LIBUV_OSTYPE_$(1)) \
|
|
-Goutput_dir=$$(@D) --generator-output $$(@D))
|
|
|
|
# Windows has a completely different build system for libuv because of mingw. In
|
|
# theory when we support msvc then we should be using gyp's msvc output instead
|
|
# of mingw's makefile for windows
|
|
ifdef CFG_WINDOWSY_$(1)
|
|
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
|
|
$$(Q)$$(MAKE) -C $$(S)src/libuv -f Makefile.mingw \
|
|
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
|
|
AR="$$(AR_$(1))" \
|
|
V=$$(VERBOSE)
|
|
$$(Q)cp $$(S)src/libuv/libuv.a $$@
|
|
else
|
|
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1))
|
|
$$(Q)$$(MAKE) -C $$(@D) \
|
|
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
|
|
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
|
|
CC="$$(CC_$(1))" \
|
|
CXX="$$(CXX_$(1))" \
|
|
AR="$$(AR_$(1))" \
|
|
$$(LIBUV_ARGS_$(1)) \
|
|
builddir="." \
|
|
BUILDTYPE=Release \
|
|
NO_LOAD="$$(LIBUV_NO_LOAD)" \
|
|
V=$$(VERBOSE)
|
|
endif
|
|
|
|
endef
|
|
|
|
# Instantiate template for all stages/targets
|
|
$(foreach target,$(CFG_TARGET_TRIPLES), \
|
|
$(eval $(call DEF_THIRD_PARTY_TARGETS,$(target))))
|
|
$(foreach stage,$(STAGES), \
|
|
$(foreach target,$(CFG_TARGET_TRIPLES), \
|
|
$(eval $(call DEF_RUNTIME_TARGETS,$(target),$(stage)))))
|