Title: [270928] trunk/Source/_javascript_Core
Revision
270928
Author
[email protected]
Date
2020-12-16 23:20:31 -0800 (Wed, 16 Dec 2020)

Log Message

[JSC] Not using JITCage trampoline for non JITCage JSC
https://bugs.webkit.org/show_bug.cgi?id=219974

Reviewed by Tadeu Zagallo.

We avoid using JITCage trampoline in YarrJIT if JSC is not using JITCage.

* llint/LowLevelInterpreter.asm:
* yarr/YarrJIT.cpp:
* yarr/YarrJIT.h:
(JSC::Yarr::YarrCodeBlock::execute):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (270927 => 270928)


--- trunk/Source/_javascript_Core/ChangeLog	2020-12-17 06:08:56 UTC (rev 270927)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-12-17 07:20:31 UTC (rev 270928)
@@ -1,3 +1,17 @@
+2020-12-16  Yusuke Suzuki  <[email protected]>
+
+        [JSC] Not using JITCage trampoline for non JITCage JSC
+        https://bugs.webkit.org/show_bug.cgi?id=219974
+
+        Reviewed by Tadeu Zagallo.
+
+        We avoid using JITCage trampoline in YarrJIT if JSC is not using JITCage.
+
+        * llint/LowLevelInterpreter.asm:
+        * yarr/YarrJIT.cpp:
+        * yarr/YarrJIT.h:
+        (JSC::Yarr::YarrCodeBlock::execute):
+
 2020-12-15  Yusuke Suzuki  <[email protected]>
 
         [JSC] Accept arbitrary module namespace identifier names

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (270927 => 270928)


--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2020-12-17 06:08:56 UTC (rev 270927)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2020-12-17 07:20:31 UTC (rev 270928)
@@ -1600,13 +1600,13 @@
 end
     doVMEntry(makeHostFunctionCall)
 
-if ARM64 or ARM64E
+if ARM64E
     global _vmEntryToYarrJITAfter
 end
 global _vmEntryToYarrJIT
 _vmEntryToYarrJIT:
     functionPrologue()
-if ARM64 or ARM64E
+if ARM64E
     jmp t5, YarrEntryPtrTag
     _vmEntryToYarrJITAfter:
 end

Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (270927 => 270928)


--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp	2020-12-17 06:08:56 UTC (rev 270927)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp	2020-12-17 07:20:31 UTC (rev 270928)
@@ -40,7 +40,7 @@
 
 namespace JSC { namespace Yarr {
 
-#if CPU(ARM64)
+#if CPU(ARM64E)
 JSC_ANNOTATE_JIT_OPERATION(_JITTarget_vmEntryToYarrJITAfter, vmEntryToYarrJITAfter);
 #endif
 
@@ -3750,7 +3750,11 @@
         push(X86Registers::ecx);
 #endif
 #elif CPU(ARM64)
+        if (!Options::useJITCage())
+            tagReturnAddress();
         if (m_decodeSurrogatePairs) {
+            if (!Options::useJITCage())
+                pushPair(framePointerRegister, linkRegister);
             move(TrustedImm32(0x10000), supplementaryPlanesBase);
             move(TrustedImm32(0xd800), leadingSurrogateTag);
             move(TrustedImm32(0xdc00), trailingSurrogateTag);
@@ -3805,7 +3809,10 @@
             pop(X86Registers::ebx);
         pop(X86Registers::ebp);
 #elif CPU(ARM64)
-        // Do nothing
+        if (m_decodeSurrogatePairs) {
+            if (!Options::useJITCage())
+                popPair(framePointerRegister, linkRegister);
+        }
 #elif CPU(ARM_THUMB2)
         pop(ARMRegisters::r8);
         pop(ARMRegisters::r6);
@@ -3815,8 +3822,11 @@
         // Do nothing
 #endif
 
-#if CPU(ARM64)
-        farJump(TrustedImmPtr(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(&vmEntryToYarrJITAfter)), OperationPtrTag);
+#if CPU(ARM64E)
+        if (Options::useJITCage())
+            farJump(TrustedImmPtr(retagCodePtr<void*, CFunctionPtrTag, OperationPtrTag>(&vmEntryToYarrJITAfter)), OperationPtrTag);
+        else
+            ret();
 #else
         ret();
 #endif

Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.h (270927 => 270928)


--- trunk/Source/_javascript_Core/yarr/YarrJIT.h	2020-12-17 06:08:56 UTC (rev 270927)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.h	2020-12-17 07:20:31 UTC (rev 270928)
@@ -76,8 +76,10 @@
 #endif
 };
 
+#if CPU(ARM64E)
 extern "C" EncodedMatchResult vmEntryToYarrJIT(const void* input, unsigned start, unsigned length, int* output, MatchingContextHolder* matchingContext, const void* codePtr);
 extern "C" void vmEntryToYarrJITAfter(void);
+#endif
 
 class YarrCodeBlock {
     WTF_MAKE_FAST_ALLOCATED;
@@ -112,41 +114,41 @@
     MatchResult execute(const LChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder& matchingContext)
     {
         ASSERT(has8BitCode());
-#if CPU(ARM64)
-        return MatchResult(vmEntryToYarrJIT(input, start, length, output, &matchingContext, retagCodePtr<Yarr8BitPtrTag, YarrEntryPtrTag>(m_ref8.code().executableAddress())));
-#else
+#if CPU(ARM64E)
+        if (Options::useJITCage())
+            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));
-#endif
     }
 
     MatchResult execute(const UChar* input, unsigned start, unsigned length, int* output, MatchingContextHolder& matchingContext)
     {
         ASSERT(has16BitCode());
-#if CPU(ARM64)
-        return MatchResult(vmEntryToYarrJIT(input, start, length, output, &matchingContext, retagCodePtr<Yarr16BitPtrTag, YarrEntryPtrTag>(m_ref16.code().executableAddress())));
-#else
+#if CPU(ARM64E)
+        if (Options::useJITCage())
+            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));
-#endif
     }
 
     MatchResult execute(const LChar* input, unsigned start, unsigned length, MatchingContextHolder& matchingContext)
     {
         ASSERT(has8BitCodeMatchOnly());
-#if CPU(ARM64)
-        return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, &matchingContext, retagCodePtr<YarrMatchOnly8BitPtrTag, YarrEntryPtrTag>(m_matchOnly8.code().executableAddress())));
-#else
+#if CPU(ARM64E)
+        if (Options::useJITCage())
+            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));
-#endif
     }
 
     MatchResult execute(const UChar* input, unsigned start, unsigned length, MatchingContextHolder& matchingContext)
     {
         ASSERT(has16BitCodeMatchOnly());
-#if CPU(ARM64)
-        return MatchResult(vmEntryToYarrJIT(input, start, length, nullptr, &matchingContext, retagCodePtr<YarrMatchOnly16BitPtrTag, YarrEntryPtrTag>(m_matchOnly16.code().executableAddress())));
-#else
+#if CPU(ARM64E)
+        if (Options::useJITCage())
+            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));
-#endif
     }
 
 #if ENABLE(REGEXP_TRACING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to