113 lines
5.3 KiB
Diff
113 lines
5.3 KiB
Diff
Source: https://github.com/WebKit/WebKit/commit/6884d13 (tweaked values)
|
|
|
|
diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
|
|
index ead9cdf..86b36ca 100644
|
|
--- Source/JavaScriptCore/runtime/MachineContext.h
|
|
+++ Source/JavaScriptCore/runtime/MachineContext.h
|
|
@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
|
|
#error Unknown Architecture
|
|
#endif
|
|
|
|
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
|
+#elif OS(FUCHSIA) || OS(LINUX)
|
|
|
|
#if CPU(X86)
|
|
return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
|
|
@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
|
|
#error Unknown Architecture
|
|
#endif
|
|
|
|
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
|
+#elif OS(FUCHSIA) || OS(LINUX)
|
|
|
|
// The following sequence depends on glibc's sys/ucontext.h.
|
|
#if CPU(X86)
|
|
@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
|
|
#error Unknown Architecture
|
|
#endif
|
|
|
|
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
|
+#elif OS(FUCHSIA) || OS(LINUX)
|
|
|
|
// The following sequence depends on glibc's sys/ucontext.h.
|
|
#if CPU(X86)
|
|
@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
|
|
#error Unknown Architecture
|
|
#endif
|
|
|
|
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
|
+#elif OS(FUCHSIA) || OS(LINUX)
|
|
|
|
// The following sequence depends on glibc's sys/ucontext.h.
|
|
#if CPU(X86)
|
|
@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
|
|
#error Unknown Architecture
|
|
#endif
|
|
|
|
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
|
+#elif OS(FUCHSIA) || OS(LINUX)
|
|
|
|
// The following sequence depends on glibc's sys/ucontext.h.
|
|
#if CPU(X86)
|
|
diff --git Source/JavaScriptCore/runtime/OptionsList.h Source/JavaScriptCore/runtime/OptionsList.h
|
|
index bc1cedb..f4a86a5 100644
|
|
--- Source/JavaScriptCore/runtime/OptionsList.h
|
|
+++ Source/JavaScriptCore/runtime/OptionsList.h
|
|
@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
|
|
// On instantiation of the first VM instance, the Options will be write protected
|
|
// and cannot be modified thereafter.
|
|
|
|
+#if OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__)
|
|
+// non-glibc/non-android options on linux ( musl )
|
|
+constexpr unsigned jscMaxPerThreadStack = 2 * MB;
|
|
+constexpr unsigned jscSoftReservedZoneSize = 64 * KB;
|
|
+constexpr unsigned jscReservedZoneSize = 32 * KB;
|
|
+#else
|
|
+// default
|
|
+constexpr unsigned jscMaxPerThreadStack = 5 * MB;
|
|
+constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
|
|
+constexpr unsigned jscReservedZoneSize = 64 * KB;
|
|
+#endif
|
|
+
|
|
#define FOR_EACH_JSC_OPTION(v) \
|
|
v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
|
|
v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
|
|
@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
|
|
\
|
|
v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
|
|
\
|
|
- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \
|
|
- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
|
|
- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
|
|
+ v(Unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \
|
|
+ v(Unsigned, softReservedZoneSize, jscSoftReservedZoneSize, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
|
|
+ v(Unsigned, reservedZoneSize, jscReservedZoneSize, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
|
|
\
|
|
v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
|
|
v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
|
|
diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
|
|
index 41afbb4..ab5263c 100644
|
|
--- Source/WTF/wtf/PlatformHave.h
|
|
+++ Source/WTF/wtf/PlatformHave.h
|
|
@@ -206,7 +206,7 @@
|
|
#define HAVE_HOSTED_CORE_ANIMATION 1
|
|
#endif
|
|
|
|
-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
|
|
+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
|
|
#define HAVE_MACHINE_CONTEXT 1
|
|
#endif
|
|
|
|
diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp
|
|
index 99d09c0..723a8f4 100644
|
|
--- Source/WTF/wtf/Threading.cpp
|
|
+++ Source/WTF/wtf/Threading.cpp
|
|
@@ -52,6 +52,8 @@ static Optional<size_t> stackSize(ThreadType threadType)
|
|
#elif OS(DARWIN) && ASAN_ENABLED
|
|
if (threadType == ThreadType::Compiler)
|
|
return 1 * MB; // ASan needs more stack space (especially on Debug builds).
|
|
+#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__) // MUSL default thread stack size.
|
|
+ return 2 * MB;
|
|
#else
|
|
UNUSED_PARAM(threadType);
|
|
#endif
|