Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (288475 => 288476)
--- trunk/Source/_javascript_Core/ChangeLog 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-01-24 23:20:23 UTC (rev 288476)
@@ -1,3 +1,36 @@
+2022-01-24 Mikhail R. Gadelha <[email protected]>
+
+ [JSC][32bit] Fix regexp crash on ARMv7
+ https://bugs.webkit.org/show_bug.cgi?id=234476
+
+ Reviewed by Yusuke Suzuki.
+
+ This patch fixes several regexp crashes on ARMv7 due to an incorrect
+ offset to retrieve the 5th argument from the stack: in ARMv7, only
+ 4 arguments are passed via registers r0-r3i, and any other argument is
+ placed on the stack, however, YarrJIT was trying to get the 5th arg
+ from a fixed offset, so because the generateEnter() method pushed
+ register into the stack, the offset was wrong. This patch fixes how
+ the offset is calculated for MIPS and ARMv7.
+
+ This patch also introduces some small changes:
+
+ 1. Added static_asserts that the YarrJIT calls do indeed have 5 arguments
+ and that the 5th argument has the type that we expect (MatchingContextHolder*).
+
+ 2. Removed an unnecessary pointer from the MatchingContextHolder
+ constructor.
+
+ 3. Fixed some warnings in the YarrJIT code here and there.
+
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compileRegExpTestInline):
+ * runtime/RegExpInlines.h:
+ (JSC::RegExp::matchInline):
+ * yarr/YarrJIT.cpp:
+ * yarr/YarrMatchingContextHolder.h:
+ (JSC::Yarr::MatchingContextHolder::MatchingContextHolder):
+
2022-01-24 Yusuke Suzuki <[email protected]>
[JSC] Support import assertion syntax
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (288475 => 288476)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2022-01-24 23:20:23 UTC (rev 288476)
@@ -2888,7 +2888,7 @@
{
UNUSED_PARAM(node);
ASSERT_NOT_REACHED();
- return compileRegExpTest(node);
+ compileRegExpTest(node);
}
#endif
Modified: trunk/Source/_javascript_Core/jit/GPRInfo.h (288475 => 288476)
--- trunk/Source/_javascript_Core/jit/GPRInfo.h 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/jit/GPRInfo.h 2022-01-24 23:20:23 UTC (rev 288476)
@@ -626,7 +626,7 @@
public:
typedef GPRReg RegisterType;
static constexpr unsigned numberOfRegisters = 16;
- static constexpr unsigned numberOfArgumentRegisters = 8;
+ static constexpr unsigned numberOfArgumentRegisters = NUMBER_OF_ARGUMENT_REGISTERS;
// These registers match the baseline JIT.
static constexpr GPRReg callFrameRegister = ARM64Registers::fp;
@@ -825,7 +825,7 @@
public:
typedef GPRReg RegisterType;
static constexpr unsigned numberOfRegisters = 13;
- static constexpr unsigned numberOfArgumentRegisters = 8;
+ static constexpr unsigned numberOfArgumentRegisters = NUMBER_OF_ARGUMENT_REGISTERS;
static constexpr GPRReg callFrameRegister = RISCV64Registers::fp;
static constexpr GPRReg numberTagRegister = RISCV64Registers::x25;
Modified: trunk/Source/_javascript_Core/runtime/RegExp.cpp (288475 => 288476)
--- trunk/Source/_javascript_Core/runtime/RegExp.cpp 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/runtime/RegExp.cpp 2022-01-24 23:20:23 UTC (rev 288476)
@@ -448,10 +448,10 @@
break;
case JITCode: {
Yarr::YarrCodeBlock& codeBlock = *m_regExpJITCode.get();
- snprintf(jit8BitMatchOnlyAddr, jitAddrSize, "0x%014lx", reinterpret_cast<uintptr_t>(codeBlock.get8BitMatchOnlyAddr()));
- snprintf(jit16BitMatchOnlyAddr, jitAddrSize, "0x%014lx", reinterpret_cast<uintptr_t>(codeBlock.get16BitMatchOnlyAddr()));
- snprintf(jit8BitMatchAddr, jitAddrSize, "0x%014lx", reinterpret_cast<uintptr_t>(codeBlock.get8BitMatchAddr()));
- snprintf(jit16BitMatchAddr, jitAddrSize, "0x%014lx", reinterpret_cast<uintptr_t>(codeBlock.get16BitMatchAddr()));
+ snprintf(jit8BitMatchOnlyAddr, jitAddrSize, "0x%014" PRIxPTR, reinterpret_cast<uintptr_t>(codeBlock.get8BitMatchOnlyAddr()));
+ snprintf(jit16BitMatchOnlyAddr, jitAddrSize, "0x%014" PRIxPTR, reinterpret_cast<uintptr_t>(codeBlock.get16BitMatchOnlyAddr()));
+ snprintf(jit8BitMatchAddr, jitAddrSize, "0x%014" PRIxPTR, reinterpret_cast<uintptr_t>(codeBlock.get8BitMatchAddr()));
+ snprintf(jit16BitMatchAddr, jitAddrSize, "0x%014" PRIxPTR, reinterpret_cast<uintptr_t>(codeBlock.get16BitMatchAddr()));
break;
}
}
Modified: trunk/Source/_javascript_Core/runtime/RegExpInlines.h (288475 => 288476)
--- trunk/Source/_javascript_Core/runtime/RegExpInlines.h 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/runtime/RegExpInlines.h 2022-01-24 23:20:23 UTC (rev 288476)
@@ -132,12 +132,12 @@
if (m_state == JITCode) {
{
ASSERT(m_regExpJITCode);
- Yarr::MatchingContextHolder regExpContext(vm, m_regExpJITCode.get(), this, matchFrom);
+ Yarr::MatchingContextHolder regExpContext(vm, m_regExpJITCode->usesPatternContextBuffer(), this, matchFrom);
if (s.is8Bit())
- result = m_regExpJITCode->execute(s.characters8(), startOffset, s.length(), offsetVector, regExpContext).start;
+ result = m_regExpJITCode->execute(s.characters8(), startOffset, s.length(), offsetVector, ®ExpContext).start;
else
- result = m_regExpJITCode->execute(s.characters16(), startOffset, s.length(), offsetVector, regExpContext).start;
+ result = m_regExpJITCode->execute(s.characters16(), startOffset, s.length(), offsetVector, ®ExpContext).start;
}
if (result == static_cast<int>(Yarr::JSRegExpResult::JITCodeFailure)) {
@@ -146,7 +146,8 @@
if (m_state == ParseError)
return throwError();
{
- Yarr::MatchingContextHolder regExpContext(vm, nullptr, this, matchFrom);
+ constexpr bool usesPatternContextBuffer = false;
+ Yarr::MatchingContextHolder regExpContext(vm, usesPatternContextBuffer, this, matchFrom);
result = Yarr::interpret(m_regExpBytecode.get(), s, startOffset, reinterpret_cast<unsigned*>(offsetVector));
}
}
@@ -162,7 +163,8 @@
} else
#endif
{
- Yarr::MatchingContextHolder regExpContext(vm, nullptr, this, matchFrom);
+ constexpr bool usesPatternContextBuffer = false;
+ Yarr::MatchingContextHolder regExpContext(vm, usesPatternContextBuffer, this, matchFrom);
result = Yarr::interpret(m_regExpBytecode.get(), s, startOffset, reinterpret_cast<unsigned*>(offsetVector));
}
@@ -266,12 +268,12 @@
MatchResult result;
{
ASSERT(m_regExpJITCode);
- Yarr::MatchingContextHolder regExpContext(vm, m_regExpJITCode.get(), this, matchFrom);
+ Yarr::MatchingContextHolder regExpContext(vm, m_regExpJITCode->usesPatternContextBuffer(), this, matchFrom);
if (s.is8Bit())
- result = m_regExpJITCode->execute(s.characters8(), startOffset, s.length(), regExpContext);
+ result = m_regExpJITCode->execute(s.characters8(), startOffset, s.length(), ®ExpContext);
else
- result = m_regExpJITCode->execute(s.characters16(), startOffset, s.length(), regExpContext);
+ result = m_regExpJITCode->execute(s.characters16(), startOffset, s.length(), ®ExpContext);
}
#if ENABLE(REGEXP_TRACING)
@@ -295,7 +297,8 @@
nonReturnedOvector.grow(offsetVectorSize);
offsetVector = nonReturnedOvector.data();
{
- Yarr::MatchingContextHolder regExpContext(vm, nullptr, this, matchFrom);
+ constexpr bool usesPatternContextBuffer = false;
+ Yarr::MatchingContextHolder regExpContext(vm, usesPatternContextBuffer, this, matchFrom);
result = Yarr::interpret(m_regExpBytecode.get(), s, startOffset, reinterpret_cast<unsigned*>(offsetVector));
}
#if REGEXP_FUNC_TEST_DATA_GEN
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (288475 => 288476)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2022-01-24 23:20:23 UTC (rev 288476)
@@ -27,6 +27,7 @@
#include "config.h"
#include "YarrJIT.h"
+#include "CCallHelpers.h"
#include "LinkBuffer.h"
#include "Options.h"
#include "VM.h"
@@ -186,10 +187,6 @@
template<class YarrJITRegs = YarrJITDefaultRegisters>
class YarrGenerator final : public YarrJITInfo {
-#ifdef JIT_UNICODE_EXPRESSIONS
- const MacroAssembler::TrustedImm32 surrogateTagMask = MacroAssembler::TrustedImm32(0xfffffc00);
-#endif
-
#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
struct ParenContextSizes {
size_t m_numSubpatterns;
@@ -603,7 +600,7 @@
m_jit.load16Unaligned(MacroAssembler::Address(m_regs.regUnicodeInputAndTrail), resultReg);
// Is the character a leading surrogate?
- m_jit.and32(YarrJITDefaultRegisters::surrogateTagMask, resultReg, m_regs.unicodeTemp);
+ m_jit.and32(m_regs.surrogateTagMask, resultReg, m_regs.unicodeTemp);
notUnicode.append(m_jit.branch32(MacroAssembler::NotEqual, m_regs.unicodeTemp, m_regs.leadingSurrogateTag));
// Is the input long enough to read a trailing surrogate?
@@ -612,7 +609,7 @@
// Is the character a trailing surrogate?
m_jit.load16Unaligned(MacroAssembler::Address(m_regs.regUnicodeInputAndTrail), m_regs.regUnicodeInputAndTrail);
- m_jit.and32(YarrJITDefaultRegisters::surrogateTagMask, m_regs.regUnicodeInputAndTrail, m_regs.unicodeTemp);
+ m_jit.and32(m_regs.surrogateTagMask, m_regs.regUnicodeInputAndTrail, m_regs.unicodeTemp);
notUnicode.append(m_jit.branch32(MacroAssembler::NotEqual, m_regs.unicodeTemp, m_regs.trailingSurrogateTag));
// Combine leading and trailing surrogates to produce a code point.
@@ -3961,57 +3958,71 @@
void generateEnter()
{
+ auto pushInEnter = [&](GPRReg gpr) {
+ m_jit.push(gpr);
+ m_pushCountInEnter += 1;
+ };
+
+ auto pushPairInEnter = [&](GPRReg gpr1, GPRReg gpr2) {
+ m_jit.pushPair(gpr1, gpr2);
+ m_pushCountInEnter += 2;
+ };
+
#if CPU(X86_64)
- m_jit.push(X86Registers::ebp);
- m_jit.move(MacroAssembler::stackPointerRegister, X86Registers::ebp);
+ UNUSED_VARIABLE(pushPairInEnter);
+ m_jit.emitFunctionPrologue();
if (m_pattern.m_saveInitialStartValue)
- m_jit.push(X86Registers::ebx);
+ pushInEnter(X86Registers::ebx);
#if OS(WINDOWS)
- m_jit.push(X86Registers::edi);
+ pushInEnter(X86Registers::edi);
#endif
#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
if (m_containsNestedSubpatterns) {
#if OS(WINDOWS)
- m_jit.push(X86Registers::esi);
+ pushInEnter(X86Registers::esi);
#endif
- m_jit.push(X86Registers::r12);
+ pushInEnter(X86Registers::r12);
}
#endif
if (m_decodeSurrogatePairs) {
- m_jit.push(X86Registers::r13);
- m_jit.push(X86Registers::r14);
- m_jit.push(X86Registers::r15);
+ pushInEnter(X86Registers::r13);
+ pushInEnter(X86Registers::r14);
+ pushInEnter(X86Registers::r15);
}
#if OS(WINDOWS)
if (m_compileMode == JITCompileMode::IncludeSubpatterns)
- m_jit.loadPtr(MacroAssembler::Address(X86Registers::ebp, 6 * sizeof(void*)), m_regs.output);
+ m_jit.loadPtr(MacroAssembler::Address(MacroAssembler::framePointerRegister, 6 * sizeof(void*)), m_regs.output);
// rcx is the pointer to the allocated space for result in x64 Windows.
- m_jit.push(X86Registers::ecx);
+ pushInEnter(X86Registers::ecx);
#endif
#elif CPU(ARM64)
+ UNUSED_VARIABLE(pushInEnter);
if (!Options::useJITCage())
m_jit.tagReturnAddress();
if (m_decodeSurrogatePairs) {
if (!Options::useJITCage())
- m_jit.pushPair(MacroAssembler::framePointerRegister, MacroAssembler::linkRegister);
+ pushPairInEnter(MacroAssembler::framePointerRegister, MacroAssembler::linkRegister);
m_jit.move(MacroAssembler::TrustedImm32(0x10000), m_regs.supplementaryPlanesBase);
m_jit.move(MacroAssembler::TrustedImm32(0xd800), m_regs.leadingSurrogateTag);
m_jit.move(MacroAssembler::TrustedImm32(0xdc00), m_regs.trailingSurrogateTag);
}
#elif CPU(ARM_THUMB2)
- m_jit.push(ARMRegisters::r4);
- m_jit.push(ARMRegisters::r5);
- m_jit.push(ARMRegisters::r6);
- m_jit.push(ARMRegisters::r8);
- m_jit.push(ARMRegisters::r10);
+ UNUSED_VARIABLE(pushPairInEnter);
+ pushInEnter(ARMRegisters::r4);
+ pushInEnter(ARMRegisters::r5);
+ pushInEnter(ARMRegisters::r6);
+ pushInEnter(ARMRegisters::r8);
+ pushInEnter(ARMRegisters::r10);
#elif CPU(RISCV64)
+ UNUSED_VARIABLE(pushInEnter);
if (m_decodeSurrogatePairs)
- m_jit.pushPair(MacroAssembler::framePointerRegister, MacroAssembler::linkRegister);
-#elif CPU(MIPS)
- // Do nothing.
+ pushPairInEnter(MacroAssembler::framePointerRegister, MacroAssembler::linkRegister);
+#else
+ UNUSED_VARIABLE(pushInEnter);
+ UNUSED_VARIABLE(pushPairInEnter);
#endif
}
@@ -4052,7 +4063,7 @@
if (m_pattern.m_saveInitialStartValue)
m_jit.pop(X86Registers::ebx);
- m_jit.pop(X86Registers::ebp);
+ m_jit.emitFunctionEpilogue();
#elif CPU(ARM64)
if (m_decodeSurrogatePairs) {
if (!Options::useJITCage())
@@ -4067,9 +4078,8 @@
#elif CPU(RISCV64)
if (m_decodeSurrogatePairs)
m_jit.popPair(MacroAssembler::framePointerRegister, MacroAssembler::linkRegister);
-#elif CPU(MIPS)
- // Do nothing
#endif
+
#if CPU(ARM64E)
if (Options::useJITCage())
m_jit.farJump(MacroAssembler::TrustedImmPtr(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(&vmEntryToYarrJITAfter)), OperationPtrTag);
@@ -4086,7 +4096,7 @@
}
public:
- YarrGenerator(MacroAssembler& jit, const VM* vm, YarrCodeBlock* codeBlock, const YarrJITRegs& regs, YarrPattern& pattern, const String& patternString, CharSize charSize, JITCompileMode compileMode)
+ YarrGenerator(CCallHelpers& jit, const VM* vm, YarrCodeBlock* codeBlock, const YarrJITRegs& regs, YarrPattern& pattern, const String& patternString, CharSize charSize, JITCompileMode compileMode)
: m_jit(jit)
, m_vm(vm)
, m_codeBlock(codeBlock)
@@ -4105,7 +4115,7 @@
m_boyerMooreData = static_cast<YarrBoyerMoyerData*>(m_codeBlock);
}
- YarrGenerator(MacroAssembler& jit, const VM* vm, YarrBoyerMoyerData* yarrBMData, const YarrJITRegs& regs, YarrPattern& pattern, const String& patternString, CharSize charSize, JITCompileMode compileMode)
+ YarrGenerator(CCallHelpers& jit, const VM* vm, YarrBoyerMoyerData* yarrBMData, const YarrJITRegs& regs, YarrPattern& pattern, const String& patternString, CharSize charSize, JITCompileMode compileMode)
: m_jit(jit)
, m_vm(vm)
, m_codeBlock(nullptr)
@@ -4139,6 +4149,13 @@
m_compilationThreadStackChecker = stackChecker;
}
+ template<typename OperationType>
+ static constexpr void functionChecks()
+ {
+ static_assert(FunctionTraits<OperationType>::cCallArity() == 5, "YarrJITCode takes 5 arguments");
+ static_assert(std::is_same<MatchingContextHolder*, typename FunctionTraits<OperationType>::template ArgumentType<4>>::value, "MatchingContextHolder* is expected as the function 5th argument");
+ }
+
void compile(YarrCodeBlock& codeBlock)
{
MacroAssembler::Label startOfMainCode;
@@ -4191,14 +4208,25 @@
if (callFrameSizeInBytes) {
// Check stack size
m_jit.addPtr(MacroAssembler::TrustedImm32(-callFrameSizeInBytes), MacroAssembler::stackPointerRegister, m_regs.regT0);
+
+ // Make sure that the JITed functions have 5 parameters and that the 5th argument is a MatchingContextHolder*
+ functionChecks<YarrCodeBlock::YarrJITCode8>();
+ functionChecks<YarrCodeBlock::YarrJITCode16>();
+ functionChecks<YarrCodeBlock::YarrJITCodeMatchOnly8>();
+ functionChecks<YarrCodeBlock::YarrJITCodeMatchOnly16>();
#if CPU(X86_64) && OS(WINDOWS)
// matchingContext is the 5th argument, it is found on the stack.
MacroAssembler::RegisterID matchingContext = m_regs.regT1;
- m_jit.loadPtr(MacroAssembler::Address(X86Registers::ebp, 7 * sizeof(void*)), matchingContext);
+ m_jit.loadPtr(MacroAssembler::Address(MacroAssembler::framePointerRegister, 7 * sizeof(void*)), matchingContext);
#elif CPU(ARM_THUMB2) || CPU(MIPS)
- // matchingContext is the 5th argument, it is found on the stack.
+ // Not enough argument registers: try to load the 5th argument from the stack
MacroAssembler::RegisterID matchingContext = m_regs.regT1;
- m_jit.loadPtr(MacroAssembler::Address(MacroAssembler::stackPointerRegister, 4 * sizeof(void*)), matchingContext);
+
+ // The argument will be in an offset that depends on the arch and the number of registers we pushed into the stack
+ // POKE_ARGUMENT_OFFSET: MIPS reserves space in the stack for all arguments, so we add +4 offset
+ // m_pushCountInEnter: number of registers pushed into the stack (see generateEnter())
+ unsigned offset = POKE_ARGUMENT_OFFSET + m_pushCountInEnter;
+ m_jit.loadPtr(MacroAssembler::Address(MacroAssembler::stackPointerRegister, offset * sizeof(void*)), matchingContext);
#else
MacroAssembler::RegisterID matchingContext = m_regs.matchingContext;
#endif
@@ -4618,7 +4646,7 @@
}
private:
- MacroAssembler& m_jit;
+ CCallHelpers& m_jit;
const VM* m_vm;
YarrCodeBlock* m_codeBlock;
YarrBoyerMoyerData* m_boyerMooreData;
@@ -4672,6 +4700,12 @@
BacktrackingState m_backtrackingState;
std::unique_ptr<YarrDisassembler> m_disassembler;
+
+ // Member is used to count the number of GPR pushed into the stack when
+ // entering JITed code. It is used to figure out if an function argument
+ // offset in the stack if there wasn't enough registers to pass it, e.g.,
+ // ARMv7 and MIPS only use 4 registers to pass function arguments.
+ unsigned m_pushCountInEnter { 0 };
};
static void dumpCompileFailure(JITFailureReason failure)
@@ -4706,7 +4740,7 @@
void jitCompile(YarrPattern& pattern, String& patternString, CharSize charSize, VM* vm, YarrCodeBlock& codeBlock, JITCompileMode mode)
{
- MacroAssembler masm;
+ CCallHelpers masm;
ASSERT(mode == JITCompileMode::MatchOnly || mode == JITCompileMode::IncludeSubpatterns);
@@ -4727,7 +4761,7 @@
#error "No support for inlined JIT'ing of RegExp.test for this CPU / OS combination."
#endif
-void jitCompileInlinedTest(StackCheck* m_compilationThreadStackChecker, const String& patternString, OptionSet<Yarr::Flags> flags, CharSize charSize, const VM* vm, YarrBoyerMoyerData& boyerMooreData, MacroAssembler& jit, YarrJITRegisters& jitRegisters)
+void jitCompileInlinedTest(StackCheck* m_compilationThreadStackChecker, const String& patternString, OptionSet<Yarr::Flags> flags, CharSize charSize, const VM* vm, YarrBoyerMoyerData& boyerMooreData, CCallHelpers& jit, YarrJITRegisters& jitRegisters)
{
Yarr::ErrorCode errorCode;
Yarr::YarrPattern pattern(patternString, flags, errorCode);
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.h (288475 => 288476)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.h 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.h 2022-01-24 23:20:23 UTC (rev 288476)
@@ -43,9 +43,10 @@
namespace JSC {
-class VM;
+class CCallHelpers;
class ExecutablePool;
class MacroAssembler;
+class VM;
namespace Yarr {
@@ -271,12 +272,12 @@
WTF_MAKE_FAST_ALLOCATED;
WTF_MAKE_NONCOPYABLE(YarrCodeBlock);
- using YarrJITCode8 = SlowPathReturnType (*)(const LChar* input, UCPURegister start, UCPURegister length, int* output, MatchingContextHolder& matchingContext) YARR_CALL;
- using YarrJITCode16 = SlowPathReturnType (*)(const UChar* input, UCPURegister start, UCPURegister length, int* output, MatchingContextHolder& matchingContext) YARR_CALL;
- using YarrJITCodeMatchOnly8 = SlowPathReturnType (*)(const LChar* input, UCPURegister start, UCPURegister length, void*, MatchingContextHolder& matchingContext) YARR_CALL;
- using YarrJITCodeMatchOnly16 = SlowPathReturnType (*)(const UChar* input, UCPURegister start, UCPURegister length, void*, MatchingContextHolder& matchingContext) YARR_CALL;
+public:
+ using YarrJITCode8 = SlowPathReturnType (*)(const LChar* input, UCPURegister start, UCPURegister length, int* output, MatchingContextHolder*) YARR_CALL;
+ using YarrJITCode16 = SlowPathReturnType (*)(const UChar* input, UCPURegister start, UCPURegister length, int* output, MatchingContextHolder*) YARR_CALL;
+ using YarrJITCodeMatchOnly8 = SlowPathReturnType (*)(const LChar* input, UCPURegister start, UCPURegister length, void*, MatchingContextHolder*) YARR_CALL;
+ using YarrJITCodeMatchOnly16 = SlowPathReturnType (*)(const UChar* input, UCPURegister start, UCPURegister length, void*, MatchingContextHolder*) YARR_CALL;
-public:
YarrCodeBlock() = default;
void setFallBackWithFailureReason(JITFailureReason failureReason) { m_failureReason = failureReason; }
@@ -326,42 +327,42 @@
InlineStats& get8BitInlineStats() { return m_matchOnly8Stats; }
InlineStats& get16BitInlineStats() { return m_matchOnly16Stats; }
- MatchResult execute(const LChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder& matchingContext)
+ MatchResult execute(const LChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder* matchingContext)
{
ASSERT(has8BitCode());
#if CPU(ARM64E)
if (Options::useJITCage())
- return MatchResult(vmEntryToYarrJIT(input, start, length, output, &matchingContext, retagCodePtr<Yarr8BitPtrTag, YarrEntryPtrTag>(m_ref8.code().executableAddress())));
+ return MatchResult(vmEntryToYarrJIT(input, start, length, output, matchingContext, retagCodePtr<Yarr8BitPtrTag, YarrEntryPtrTag>(m_ref8.code().executableAddress())));
#endif
return MatchResult(untagCFunctionPtr<YarrJITCode8, Yarr8BitPtrTag>(m_ref8.code().executableAddress())(input, start, length, output, matchingContext));
}
- MatchResult execute(const UChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder& matchingContext)
+ MatchResult execute(const UChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder* matchingContext)
{
ASSERT(has16BitCode());
#if CPU(ARM64E)
if (Options::useJITCage())
- return MatchResult(vmEntryToYarrJIT(input, start, length, output, &matchingContext, retagCodePtr<Yarr16BitPtrTag, YarrEntryPtrTag>(m_ref16.code().executableAddress())));
+ return MatchResult(vmEntryToYarrJIT(input, start, length, output, matchingContext, retagCodePtr<Yarr16BitPtrTag, YarrEntryPtrTag>(m_ref16.code().executableAddress())));
#endif
return MatchResult(untagCFunctionPtr<YarrJITCode16, Yarr16BitPtrTag>(m_ref16.code().executableAddress())(input, start, length, output, matchingContext));
}
- MatchResult execute(const LChar* input, unsigned start, unsigned length, MatchingContextHolder& matchingContext)
+ MatchResult execute(const LChar* input, unsigned start, unsigned length, MatchingContextHolder* matchingContext)
{
ASSERT(has8BitCodeMatchOnly());
#if CPU(ARM64E)
if (Options::useJITCage())
- return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, &matchingContext, retagCodePtr<YarrMatchOnly8BitPtrTag, YarrEntryPtrTag>(m_matchOnly8.code().executableAddress())));
+ return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, matchingContext, retagCodePtr<YarrMatchOnly8BitPtrTag, YarrEntryPtrTag>(m_matchOnly8.code().executableAddress())));
#endif
return MatchResult(untagCFunctionPtr<YarrJITCodeMatchOnly8, YarrMatchOnly8BitPtrTag>(m_matchOnly8.code().executableAddress())(input, start, length, nullptr, matchingContext));
}
- MatchResult execute(const UChar* input, unsigned start, unsigned length, MatchingContextHolder& matchingContext)
+ MatchResult execute(const UChar* input, unsigned start, unsigned length, MatchingContextHolder* matchingContext)
{
ASSERT(has16BitCodeMatchOnly());
#if CPU(ARM64E)
if (Options::useJITCage())
- return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, &matchingContext, retagCodePtr<YarrMatchOnly16BitPtrTag, YarrEntryPtrTag>(m_matchOnly16.code().executableAddress())));
+ return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, matchingContext, retagCodePtr<YarrMatchOnly16BitPtrTag, YarrEntryPtrTag>(m_matchOnly16.code().executableAddress())));
#endif
return MatchResult(untagCFunctionPtr<YarrJITCodeMatchOnly16, YarrMatchOnly16BitPtrTag>(m_matchOnly16.code().executableAddress())(input, start, length, nullptr, matchingContext));
}
@@ -439,7 +440,7 @@
class YarrJITRegisters;
-void jitCompileInlinedTest(StackCheck*, const String&, OptionSet<Yarr::Flags>, CharSize, const VM*, YarrBoyerMoyerData&, MacroAssembler&, YarrJITRegisters&);
+void jitCompileInlinedTest(StackCheck*, const String&, OptionSet<Yarr::Flags>, CharSize, const VM*, YarrBoyerMoyerData&, CCallHelpers&, YarrJITRegisters&);
#endif
} } // namespace JSC::Yarr
Modified: trunk/Source/_javascript_Core/yarr/YarrJITRegisters.h (288475 => 288476)
--- trunk/Source/_javascript_Core/yarr/YarrJITRegisters.h 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/yarr/YarrJITRegisters.h 2022-01-24 23:20:23 UTC (rev 288476)
@@ -206,6 +206,7 @@
const MacroAssembler::TrustedImm32 supplementaryPlanesBase = MacroAssembler::TrustedImm32(0x10000);
const MacroAssembler::TrustedImm32 leadingSurrogateTag = MacroAssembler::TrustedImm32(0xd800);
const MacroAssembler::TrustedImm32 trailingSurrogateTag = MacroAssembler::TrustedImm32(0xdc00);
+ const MacroAssembler::TrustedImm32 surrogateTagMask = MacroAssembler::TrustedImm32(0xfffffc00);
};
#endif
Modified: trunk/Source/_javascript_Core/yarr/YarrMatchingContextHolder.h (288475 => 288476)
--- trunk/Source/_javascript_Core/yarr/YarrMatchingContextHolder.h 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/_javascript_Core/yarr/YarrMatchingContextHolder.h 2022-01-24 23:20:23 UTC (rev 288476)
@@ -37,12 +37,10 @@
namespace Yarr {
-class YarrCodeBlock;
-
class MatchingContextHolder {
WTF_FORBID_HEAP_ALLOCATION;
public:
- MatchingContextHolder(VM&, YarrCodeBlock*, RegExp*, MatchFrom);
+ MatchingContextHolder(VM&, bool, RegExp*, MatchFrom);
~MatchingContextHolder();
static ptrdiff_t offsetOfStackLimit() { return OBJECT_OFFSETOF(MatchingContextHolder, m_stackLimit); }
@@ -61,7 +59,7 @@
MatchFrom m_matchFrom;
};
-inline MatchingContextHolder::MatchingContextHolder(VM& vm, YarrCodeBlock* yarrCodeBlock, RegExp* regExp, MatchFrom matchFrom)
+inline MatchingContextHolder::MatchingContextHolder(VM& vm, bool usesPatternContextBuffer, RegExp* regExp, MatchFrom matchFrom)
: m_vm(vm)
, m_matchFrom(matchFrom)
{
@@ -74,12 +72,12 @@
}
#if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
- if (yarrCodeBlock && yarrCodeBlock->usesPatternContextBuffer()) {
+ if (usesPatternContextBuffer) {
m_patternContextBuffer = m_vm.acquireRegExpPatternContexBuffer();
m_patternContextBufferSize = VM::patternContextBufferSize;
}
#else
- UNUSED_PARAM(yarrCodeBlock);
+ UNUSED_PARAM(usesPatternContextBuffer);
#endif
}
Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (288475 => 288476)
--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2022-01-24 23:02:44 UTC (rev 288475)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2022-01-24 23:20:23 UTC (rev 288476)
@@ -105,7 +105,7 @@
BINLINE void Heap::logStat(size_t value, ssize_t amount, const char* label, const char* note)
{
- fprintf(stderr, "%s: %lu (%ld) %s\n", label, value, amount, note);
+ fprintf(stderr, "%s: %zu (%zd) %s\n", label, value, amount, note);
}
BINLINE void Heap::adjustFreeableMemory(UniqueLockHolder&, ssize_t amount, const char* note)
