Changeset 228022 in webkit

Timestamp:

Feb 2, 2018 12:24:40 PM (6 years ago)

Author:

mark.lam@apple.com

Message:

More ARM64_32 fixes.
​https://bugs.webkit.org/show_bug.cgi?id=182441
<rdar://problem/37162310>

Reviewed by Dan Bernstein.

Source/JavaScriptCore:

I also disabled more dynamicPoisoning code in ARM64_32. This code assumes a
64-bit pointer which is not applicable here.

• jit/AssemblyHelpers.cpp:

(JSC::AssemblyHelpers::emitDynamicPoison):
(JSC::AssemblyHelpers::emitDynamicPoisonOnLoadedType):
(JSC::AssemblyHelpers::emitDynamicPoisonOnType):

Source/WTF:

My previous speculative ARM64_32 build fix in copyLCharsFromUCharSource() was wrong.
I've now fixed it to choose the default implementation case instead of the ARM64
case if the target is ARM64_32.

• wtf/text/ASCIIFastPath.h:

(WTF::copyLCharsFromUCharSource):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/jit/AssemblyHelpers.cpp (modified) (3 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/ASCIIFastPath.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-02-02  Mark Lam  <mark.lam@apple.com>
+
+        More ARM64_32 fixes.
+        https://bugs.webkit.org/show_bug.cgi?id=182441
+        <rdar://problem/37162310>
+
+        Reviewed by Dan Bernstein.
+
+        I also disabled more dynamicPoisoning code in ARM64_32.  This code assumes a
+        64-bit pointer which is not applicable here.
+
+        * jit/AssemblyHelpers.cpp:
+        (JSC::AssemblyHelpers::emitDynamicPoison):
+        (JSC::AssemblyHelpers::emitDynamicPoisonOnLoadedType):
+        (JSC::AssemblyHelpers::emitDynamicPoisonOnType):
+
 2018-02-02  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp

@@ -1010 +1010 @@
 void AssemblyHelpers::emitDynamicPoison(GPRReg base, GPRReg poisonValue)
 {
-#if CPU(X86_64) || CPU(ARM64)
+#if CPU(X86_64) || (CPU(ARM64) && !defined(__ILP32__))
     lshiftPtr(TrustedImm32(40), poisonValue);
     addPtr(poisonValue, base);
@@ -1021 +1021 @@
 void AssemblyHelpers::emitDynamicPoisonOnLoadedType(GPRReg base, GPRReg actualType, JSType expectedType)
 {
-#if CPU(X86_64) || CPU(ARM64)
+#if CPU(X86_64) || (CPU(ARM64) && !defined(__ILP32__))
     xor32(TrustedImm32(expectedType), actualType);
     emitDynamicPoison(base, actualType);
@@ -1033 +1033 @@
 void AssemblyHelpers::emitDynamicPoisonOnType(GPRReg base, GPRReg scratch, JSType expectedType)
 {
-#if CPU(X86_64) || CPU(ARM64)
+#if CPU(X86_64) || (CPU(ARM64) && !defined(__ILP32__))
     load8(Address(base, JSCell::typeInfoTypeOffset()), scratch);
     emitDynamicPoisonOnLoadedType(base, scratch, expectedType);

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-02-02  Mark Lam  <mark.lam@apple.com>
+
+        More ARM64_32 fixes.
+        https://bugs.webkit.org/show_bug.cgi?id=182441
+        <rdar://problem/37162310>
+
+        Reviewed by Dan Bernstein.
+
+        My previous speculative ARM64_32 build fix in copyLCharsFromUCharSource() was wrong.
+        I've now fixed it to choose the default implementation case instead of the ARM64
+        case if the target is ARM64_32.
+
+        * wtf/text/ASCIIFastPath.h:
+        (WTF::copyLCharsFromUCharSource):
+
 2018-02-02  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/WTF/wtf/text/ASCIIFastPath.h

@@ -140 +140 @@
         destination[i] = static_cast<LChar>(source[i]);
     }
-#elif COMPILER(GCC_OR_CLANG) && CPU(ARM64) && defined(NDEBUG)
+#elif COMPILER(GCC_OR_CLANG) && CPU(ARM64) && !defined(__ILP32__) && defined(NDEBUG)
     const LChar* const end = destination + length;
     const uintptr_t memoryAccessSize = 16;
@@ -151 +151 @@
         const LChar* const simdEnd = destination + (lengthLeft & ~memoryAccessMask);
         do {
-#if defined(__ILP32__)
-            asm("ld2   { v0.16B, v1.16B }, [%w[SOURCE]], #32\n\t"
-                "st1   { v0.16B }, [%w[DESTINATION]], #16\n\t"
-#else
             asm("ld2   { v0.16B, v1.16B }, [%[SOURCE]], #32\n\t"
                 "st1   { v0.16B }, [%[DESTINATION]], #16\n\t"
-#endif
                 : [SOURCE]"+r" (source), [DESTINATION]"+r" (destination)
                 :