Title: [263049] trunk
Revision
263049
Author
[email protected]
Date
2020-06-15 11:56:04 -0700 (Mon, 15 Jun 2020)

Log Message

JIT thunks should work on arm64_32
https://bugs.webkit.org/show_bug.cgi?id=213103

Reviewed by Saam Barati.

JSTests:

skip test on memory limited since it breaks on watch with JIT.

* stress/array-buffer-view-watchpoint-can-be-fired-in-really-add-in-dfg.js:

Source/_javascript_Core:

This patch fixes various issues when running JSC on arm64_32 with
useJIT=1 and useBaselineJIT=0. In particular this patch makes the
following changes:

1) ScalePtr is now just part of the Scale enum and is set based on
the size of the address space.

2) MacroAssembler::*Ptr functions call 32/64 bit variants based on
Address space size rather than cpu architecture. Vetting of callsites
using Ptr as 64 will happen in future patches since it's hard to
comprehensively vet.

3) Add some missing variants of functions for when pointers are 32-bit.

4) Add a load/storeReg function that stores a full register regardless
of pointer size for storing/loading callee saves.

5) numberOfDFGCompiles should report a big number for
useBaselineJIT=0 as some tests fail by default if useBaselineJIT=0
but useJIT=1.

6) Assert BaseIndex has a scale of PtrSize or TimesOne (for pre-scaled
values) when passed to a load/storePtr function.

* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::timesPtr): Deleted.
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::rotateRightPtr):
(JSC::MacroAssembler::loadPtr):
(JSC::MacroAssembler::loadPtrWithCompactAddressOffsetPatch):
(JSC::MacroAssembler::branchPtr):
(JSC::MacroAssembler::storePtr):
(JSC::MacroAssembler::shouldBlindDouble):
(JSC::MacroAssembler::moveDouble):
(JSC::MacroAssembler::store64):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::add32):
(JSC::MacroAssemblerARM64::signExtend32ToPtr):
(JSC::MacroAssemblerARM64::loadPtr):
(JSC::MacroAssemblerARM64::call):
(JSC::MacroAssemblerARM64::farJump):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::rotateRight32):
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::rotateRight32):
* assembler/MacroAssemblerX86.h:
* assembler/MacroAssemblerX86_64.h:
* b3/B3LowerMacros.cpp:
* b3/testb3_6.cpp:
(testInterpreter):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::emitLoadStructure):
(JSC::AssemblyHelpers::emitAllocateVariableSized):
(JSC::AssemblyHelpers::restoreCalleeSavesFromEntryFrameCalleeSavesBuffer):
(JSC::AssemblyHelpers::copyCalleeSavesToEntryFrameCalleeSavesBufferImpl):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::storeReg):
(JSC::AssemblyHelpers::loadReg):
(JSC::AssemblyHelpers::emitMaterializeTagCheckRegisters):
(JSC::AssemblyHelpers::emitGetFromCallFrameHeaderPtr):
(JSC::AssemblyHelpers::emitGetFromCallFrameHeader32):
(JSC::AssemblyHelpers::emitGetFromCallFrameHeader64):
(JSC::AssemblyHelpers::emitPutToCallFrameHeader):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_enumerator_structure_pname):
(JSC::JIT::emit_op_enumerator_generic_pname):
* jit/ThunkGenerators.cpp:
(JSC::nativeForGenerator):
* runtime/TestRunnerUtils.cpp:
(JSC::numberOfDFGCompiles):

Source/WebCore:

Refactor timesPtr() to ScalePtr.

* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):

Modified Paths

Diff

Modified: trunk/JSTests/ChangeLog (263048 => 263049)


--- trunk/JSTests/ChangeLog	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/JSTests/ChangeLog	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1,3 +1,14 @@
+2020-06-15  Keith Miller  <[email protected]>
+
+        JIT thunks should work on arm64_32
+        https://bugs.webkit.org/show_bug.cgi?id=213103
+
+        Reviewed by Saam Barati.
+
+        skip test on memory limited since it breaks on watch with JIT.
+
+        * stress/array-buffer-view-watchpoint-can-be-fired-in-really-add-in-dfg.js:
+
 2020-06-15  Caitlin Potter  <[email protected]>
 
         [JSC] add machinery to disable JIT tiers when experimental features are enabled

Modified: trunk/JSTests/stress/array-buffer-view-watchpoint-can-be-fired-in-really-add-in-dfg.js (263048 => 263049)


--- trunk/JSTests/stress/array-buffer-view-watchpoint-can-be-fired-in-really-add-in-dfg.js	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/JSTests/stress/array-buffer-view-watchpoint-can-be-fired-in-really-add-in-dfg.js	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1,3 +1,4 @@
+//@ skip if $memoryLimited
 //@ skip if ["arm", "powerpc", "powerpc64", "s390"].include?($architecture) and $hostOS == "linux"
 //@ requireOptions("-e", "let iterations=40000") if ["mips"].include?($architecture)
 //@ runDefault("--jitPolicyScale=0")

Modified: trunk/Source/_javascript_Core/ChangeLog (263048 => 263049)


--- trunk/Source/_javascript_Core/ChangeLog	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1,3 +1,83 @@
+2020-06-15  Keith Miller  <[email protected]>
+
+        JIT thunks should work on arm64_32
+        https://bugs.webkit.org/show_bug.cgi?id=213103
+
+        Reviewed by Saam Barati.
+
+        This patch fixes various issues when running JSC on arm64_32 with
+        useJIT=1 and useBaselineJIT=0. In particular this patch makes the
+        following changes:
+
+        1) ScalePtr is now just part of the Scale enum and is set based on
+        the size of the address space.
+
+        2) MacroAssembler::*Ptr functions call 32/64 bit variants based on
+        Address space size rather than cpu architecture. Vetting of callsites
+        using Ptr as 64 will happen in future patches since it's hard to
+        comprehensively vet.
+
+        3) Add some missing variants of functions for when pointers are 32-bit.
+
+        4) Add a load/storeReg function that stores a full register regardless
+        of pointer size for storing/loading callee saves.
+
+        5) numberOfDFGCompiles should report a big number for
+        useBaselineJIT=0 as some tests fail by default if useBaselineJIT=0
+        but useJIT=1.
+
+        6) Assert BaseIndex has a scale of PtrSize or TimesOne (for pre-scaled
+        values) when passed to a load/storePtr function.
+
+        * assembler/AbstractMacroAssembler.h:
+        (JSC::AbstractMacroAssembler::timesPtr): Deleted.
+        * assembler/MacroAssembler.h:
+        (JSC::MacroAssembler::rotateRightPtr):
+        (JSC::MacroAssembler::loadPtr):
+        (JSC::MacroAssembler::loadPtrWithCompactAddressOffsetPatch):
+        (JSC::MacroAssembler::branchPtr):
+        (JSC::MacroAssembler::storePtr):
+        (JSC::MacroAssembler::shouldBlindDouble):
+        (JSC::MacroAssembler::moveDouble):
+        (JSC::MacroAssembler::store64):
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::add32):
+        (JSC::MacroAssemblerARM64::signExtend32ToPtr):
+        (JSC::MacroAssemblerARM64::loadPtr):
+        (JSC::MacroAssemblerARM64::call):
+        (JSC::MacroAssemblerARM64::farJump):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::rotateRight32):
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::rotateRight32):
+        * assembler/MacroAssemblerX86.h:
+        * assembler/MacroAssemblerX86_64.h:
+        * b3/B3LowerMacros.cpp:
+        * b3/testb3_6.cpp:
+        (testInterpreter):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
+        * jit/AssemblyHelpers.cpp:
+        (JSC::AssemblyHelpers::emitLoadStructure):
+        (JSC::AssemblyHelpers::emitAllocateVariableSized):
+        (JSC::AssemblyHelpers::restoreCalleeSavesFromEntryFrameCalleeSavesBuffer):
+        (JSC::AssemblyHelpers::copyCalleeSavesToEntryFrameCalleeSavesBufferImpl):
+        * jit/AssemblyHelpers.h:
+        (JSC::AssemblyHelpers::storeReg):
+        (JSC::AssemblyHelpers::loadReg):
+        (JSC::AssemblyHelpers::emitMaterializeTagCheckRegisters):
+        (JSC::AssemblyHelpers::emitGetFromCallFrameHeaderPtr):
+        (JSC::AssemblyHelpers::emitGetFromCallFrameHeader32):
+        (JSC::AssemblyHelpers::emitGetFromCallFrameHeader64):
+        (JSC::AssemblyHelpers::emitPutToCallFrameHeader):
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::emit_op_enumerator_structure_pname):
+        (JSC::JIT::emit_op_enumerator_generic_pname):
+        * jit/ThunkGenerators.cpp:
+        (JSC::nativeForGenerator):
+        * runtime/TestRunnerUtils.cpp:
+        (JSC::numberOfDFGCompiles):
+
 2020-06-15  Caitlin Potter  <[email protected]>
 
         [JSC] add machinery to disable JIT tiers when experimental features are enabled

Modified: trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -120,15 +120,9 @@
         TimesTwo,
         TimesFour,
         TimesEight,
+        ScalePtr = isAddress64Bit() ? TimesEight : TimesFour,
     };
     
-    static Scale timesPtr()
-    {
-        if (sizeof(void*) == 4)
-            return TimesFour;
-        return TimesEight;
-    }
-    
     struct BaseIndex;
     
     static RegisterID withSwappedRegister(RegisterID original, RegisterID left, RegisterID right)

Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -95,6 +95,7 @@
 
 class MacroAssembler : public MacroAssemblerBase {
 public:
+    using Base = MacroAssemblerBase;
 
     static constexpr RegisterID nextRegister(RegisterID reg)
     {
@@ -150,6 +151,12 @@
     using MacroAssemblerBase::urshift32;
     using MacroAssemblerBase::xor32;
 
+#if CPU(ARM64) || CPU(X86_64)
+    using MacroAssemblerBase::and64;
+    using MacroAssemblerBase::convertInt32ToDouble;
+    using MacroAssemblerBase::store64;
+#endif
+
     static bool isPtrAlignedAddressOffset(ptrdiff_t value)
     {
         return value == static_cast<int32_t>(value);
@@ -541,8 +548,7 @@
 
     // Ptr methods
     // On 32-bit platforms (i.e. x86), these methods directly map onto their 32-bit equivalents.
-    // FIXME: should this use a test for 32-bitness instead of this specific exception?
-#if !CPU(X86_64) && !CPU(ARM64)
+#if !CPU(ADDRESS64)
     void addPtr(Address src, RegisterID dest)
     {
         add32(src, dest);
@@ -658,6 +664,11 @@
         or32(imm, dest);
     }
 
+    void rotateRightPtr(TrustedImm32 imm, RegisterID srcDst)
+    {
+        rotateRight32(imm, srcDst);
+    }
+
     void subPtr(RegisterID src, RegisterID dest)
     {
         sub32(src, dest);
@@ -700,6 +711,7 @@
 
     void loadPtr(BaseIndex address, RegisterID dest)
     {
+        ASSERT(address.scale == ScalePtr || address.scale == TimesOne);
         load32(address, dest);
     }
 
@@ -729,11 +741,6 @@
     {
         return load32WithCompactAddressOffsetPatch(address, dest);
     }
-
-    void move(ImmPtr imm, RegisterID dest)
-    {
-        move(Imm32(imm.asTrustedImmPtr()), dest);
-    }
     
     void comparePtr(RelationalCondition cond, RegisterID left, TrustedImm32 right, RegisterID dest)
     {
@@ -870,7 +877,7 @@
         return MacroAssemblerBase::branchTest8(cond, Address(address.base, address.offset), mask);
     }
 
-#else // !CPU(X86_64) && !CPU(ARM64)
+#else // !CPU(ADDRESS64)
 
     void addPtr(RegisterID src, RegisterID dest)
     {
@@ -1050,6 +1057,7 @@
 
     void loadPtr(BaseIndex address, RegisterID dest)
     {
+        ASSERT(address.scale == ScalePtr || address.scale == TimesOne);
         load64(address, dest);
     }
 
@@ -1219,9 +1227,29 @@
         return branchSub64(cond, src1, src2, dest);
     }
 
-    using MacroAssemblerBase::and64;
-    using MacroAssemblerBase::convertInt32ToDouble;
-    using MacroAssemblerBase::store64;
+    Jump branchPtr(RelationalCondition cond, RegisterID left, ImmPtr right)
+    {
+        if (shouldBlind(right) && haveScratchRegisterForBlinding()) {
+            RegisterID scratchRegister = scratchRegisterForBlinding();
+            loadRotationBlindedConstant(rotationBlindConstant(right), scratchRegister);
+            return branchPtr(cond, left, scratchRegister);
+        }
+        return branchPtr(cond, left, right.asTrustedImmPtr());
+    }
+
+    void storePtr(ImmPtr imm, Address dest)
+    {
+        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
+            RegisterID scratchRegister = scratchRegisterForBlinding();
+            loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);
+            storePtr(scratchRegister, dest);
+        } else
+            storePtr(imm.asTrustedImmPtr(), dest);
+    }
+
+#endif // !CPU(ADDRESS64)
+
+#if USE(JSVALUE64)
     bool shouldBlindDouble(double value)
     {
         // Don't trust NaN or +/-Infinity
@@ -1415,13 +1443,11 @@
             move(imm.asTrustedImm64(), dest);
     }
 
-#if CPU(X86_64) || CPU(ARM64)
     void moveDouble(Imm64 imm, FPRegisterID dest)
     {
         move(imm, scratchRegister());
         move64ToDouble(scratchRegister(), dest);
     }
-#endif
 
     void and64(Imm32 imm, RegisterID dest)
     {
@@ -1432,39 +1458,8 @@
         } else
             and64(imm.asTrustedImm32(), dest);
     }
+#endif // USE(JSVALUE64)
 
-    Jump branchPtr(RelationalCondition cond, RegisterID left, ImmPtr right)
-    {
-        if (shouldBlind(right) && haveScratchRegisterForBlinding()) {
-            RegisterID scratchRegister = scratchRegisterForBlinding();
-            loadRotationBlindedConstant(rotationBlindConstant(right), scratchRegister);
-            return branchPtr(cond, left, scratchRegister);
-        }
-        return branchPtr(cond, left, right.asTrustedImmPtr());
-    }
-    
-    void storePtr(ImmPtr imm, Address dest)
-    {
-        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
-            RegisterID scratchRegister = scratchRegisterForBlinding();
-            loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);
-            storePtr(scratchRegister, dest);
-        } else
-            storePtr(imm.asTrustedImmPtr(), dest);
-    }
-
-    void store64(Imm64 imm, Address dest)
-    {
-        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
-            RegisterID scratchRegister = scratchRegisterForBlinding();
-            loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);
-            store64(scratchRegister, dest);
-        } else
-            store64(imm.asTrustedImm64(), dest);
-    }
-
-#endif // !CPU(X86_64)
-
 #if !CPU(X86) && !CPU(X86_64) && !CPU(ARM64)
     // We should implement this the right way eventually, but for now, it's fine because it arises so
     // infrequently.
@@ -1719,7 +1714,18 @@
     {
         store64(value, addressForPoke(index));
     }
-#endif // CPU(X86_64)
+
+    void store64(Imm64 imm, Address dest)
+    {
+        if (shouldBlind(imm) && haveScratchRegisterForBlinding()) {
+            RegisterID scratchRegister = scratchRegisterForBlinding();
+            loadRotationBlindedConstant(rotationBlindConstant(imm), scratchRegister);
+            store64(scratchRegister, dest);
+        } else
+            store64(imm.asTrustedImm64(), dest);
+    }
+
+#endif // CPU(X86_64) || CPU(ARM64)
     
     void store32(Imm32 imm, Address dest)
     {

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -89,8 +89,6 @@
     template <Assembler::CopyFunction copy>
     static void link(LinkRecord& record, uint8_t* from, const uint8_t* fromInstruction, uint8_t* to) { return Assembler::link<copy>(record, from, fromInstruction, to); }
 
-    static constexpr Scale ScalePtr = TimesEight;
-
     static bool isCompactPtrAlignedAddressOffset(ptrdiff_t value)
     {
         // This is the largest 32-bit access allowed, aligned to 64-bit boundary.
@@ -152,13 +150,18 @@
 
     void add32(RegisterID a, RegisterID b, RegisterID dest)
     {
-        ASSERT(a != ARM64Registers::sp && b != ARM64Registers::sp);
+        ASSERT(a != ARM64Registers::sp || b != ARM64Registers::sp);
+        if (b == ARM64Registers::sp)
+            std::swap(a, b);
         m_assembler.add<32>(dest, a, b);
     }
 
     void add32(RegisterID src, RegisterID dest)
     {
-        m_assembler.add<32>(dest, dest, src);
+        if (src == ARM64Registers::sp)
+            m_assembler.add<32>(dest, src, dest);
+        else
+            m_assembler.add<32>(dest, dest, src);
     }
 
     void add32(TrustedImm32 imm, RegisterID dest)
@@ -224,6 +227,12 @@
         add32(dataTempRegister, dest);
     }
 
+    void add32(AbsoluteAddress src, RegisterID dest)
+    {
+        load32(src.m_ptr, getCachedDataTempRegisterIDAndInvalidate());
+        add32(dataTempRegister, dest);
+    }
+
     void add64(RegisterID a, RegisterID b, RegisterID dest)
     {
         ASSERT(a != ARM64Registers::sp || b != ARM64Registers::sp);
@@ -2497,9 +2506,9 @@
 
     void signExtend32ToPtr(TrustedImm32 imm, RegisterID dest)
     {
-        move(TrustedImmPtr(reinterpret_cast<void*>(static_cast<intptr_t>(imm.m_value))), dest);
+        move(TrustedImm64(imm.m_value), dest);
     }
-    
+
     void signExtend32ToPtr(RegisterID src, RegisterID dest)
     {
         m_assembler.sxtw(dest, src);
@@ -3324,6 +3333,17 @@
 
     // Jumps, calls, returns
 
+    // duplicate MacroAssembler's loadPtr for loading call targets.
+    template<typename... Args>
+    ALWAYS_INLINE void loadPtr(Args... args)
+    {
+#if CPU(ADDRESS64)
+        load64(args...);
+#else
+        load32(args...);
+#endif
+    }
+
     ALWAYS_INLINE Call call(PtrTag)
     {
         AssemblerLabel pointerLabel = m_assembler.label();
@@ -3344,7 +3364,7 @@
 
     ALWAYS_INLINE Call call(Address address, PtrTag tag)
     {
-        load64(address, getCachedDataTempRegisterIDAndInvalidate());
+        loadPtr(address, getCachedDataTempRegisterIDAndInvalidate());
         return call(dataTempRegister, tag);
     }
 
@@ -3373,13 +3393,13 @@
 
     void farJump(Address address, PtrTag)
     {
-        load64(address, getCachedDataTempRegisterIDAndInvalidate());
+        loadPtr(address, getCachedDataTempRegisterIDAndInvalidate());
         m_assembler.br(dataTempRegister);
     }
     
     void farJump(BaseIndex address, PtrTag)
     {
-        load64(address, getCachedDataTempRegisterIDAndInvalidate());
+        loadPtr(address, getCachedDataTempRegisterIDAndInvalidate());
         m_assembler.br(dataTempRegister);
     }
 
@@ -3386,7 +3406,7 @@
     void farJump(AbsoluteAddress address, PtrTag)
     {
         move(TrustedImmPtr(address.m_ptr), getCachedDataTempRegisterIDAndInvalidate());
-        load64(Address(dataTempRegister), dataTempRegister);
+        loadPtr(Address(dataTempRegister), dataTempRegister);
         m_assembler.br(dataTempRegister);
     }
 

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -105,8 +105,6 @@
     };
     
 public:
-    static constexpr Scale ScalePtr = TimesFour;
-
     enum RelationalCondition {
         Equal = ARMv7Assembler::ConditionEQ,
         NotEqual = ARMv7Assembler::ConditionNE,
@@ -441,6 +439,19 @@
         }
     }
 
+    void rotateRight32(RegisterID src, TrustedImm32 imm, RegisterID dest)
+    {
+        if (!imm.m_value)
+            move(src, dest);
+        else
+            m_assembler.ror(dest, src, imm.m_value & 0x1f);
+    }
+
+    void rotateRight32(TrustedImm32 imm, RegisterID srcDst)
+    {
+        rotateRight32(srcDst, imm, srcDst);
+    }
+
     void rshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest)
     {
         // Clamp the shift to the range 0..31

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -61,8 +61,6 @@
         return getLSBSet(v);
     }
 
-    static constexpr Scale ScalePtr = TimesFour;
-
     // For storing immediate number
     static constexpr RegisterID immTempRegister = MIPSRegisters::t0;
     // For storing data loaded from the memory
@@ -620,6 +618,12 @@
         }
     }
 
+    // This is only referenced by code intented for ARM64_32.
+    void rotateRight32(TrustedImm32, RegisterID)
+    {
+        UNREACHABLE_FOR_PLATFORM();
+    }
+
     void rshift32(RegisterID shiftAmount, RegisterID dest)
     {
         m_assembler.srav(dest, dest, shiftAmount);

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -36,8 +36,6 @@
     static constexpr unsigned numGPRs = 8;
     static constexpr unsigned numFPRs = 8;
     
-    static constexpr Scale ScalePtr = TimesFour;
-
     using MacroAssemblerX86Common::add32;
     using MacroAssemblerX86Common::and32;
     using MacroAssemblerX86Common::branchAdd32;

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h (263048 => 263049)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -40,8 +40,6 @@
     static constexpr unsigned numGPRs = 16;
     static constexpr unsigned numFPRs = 16;
     
-    static constexpr Scale ScalePtr = TimesEight;
-
     static constexpr RegisterID InvalidGPRReg = X86Registers::InvalidGPRReg;
 
     using MacroAssemblerX86Common::add32;

Modified: trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/b3/B3LowerMacros.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -539,7 +539,7 @@
                         GPRReg scratch = params.gpScratch(0);
 
                         jit.move(CCallHelpers::TrustedImmPtr(jumpTable), scratch);
-                        jit.load64(CCallHelpers::BaseIndex(scratch, index, CCallHelpers::timesPtr()), scratch);
+                        jit.load64(CCallHelpers::BaseIndex(scratch, index, CCallHelpers::ScalePtr), scratch);
                         jit.farJump(scratch, JSSwitchPtrTag);
 
                         // These labels are guaranteed to be populated before either late paths or

Modified: trunk/Source/_javascript_Core/b3/testb3_6.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/b3/testb3_6.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/b3/testb3_6.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1679,7 +1679,7 @@
             GPRReg scratch = params.gpScratch(0);
 
             jit.move(CCallHelpers::TrustedImmPtr(jumpTable), scratch);
-            jit.load64(CCallHelpers::BaseIndex(scratch, params[0].gpr(), CCallHelpers::timesPtr()), scratch);
+            jit.load64(CCallHelpers::BaseIndex(scratch, params[0].gpr(), CCallHelpers::ScalePtr), scratch);
             jit.farJump(scratch, B3CompilationPtrTag);
 
             jit.addLinkTask(

Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -11243,7 +11243,7 @@
         m_jit.branch32(JITCompiler::AboveOrEqual, value, Imm32(table.ctiOffsets.size())),
         data->fallThrough.block);
     m_jit.move(TrustedImmPtr(table.ctiOffsets.begin()), scratch);
-    m_jit.loadPtr(JITCompiler::BaseIndex(scratch, value, JITCompiler::timesPtr()), scratch);
+    m_jit.loadPtr(JITCompiler::BaseIndex(scratch, value, JITCompiler::ScalePtr), scratch);
     
     m_jit.farJump(scratch, JSSwitchPtrTag);
     data->didUseJumpTable = true;

Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -382,7 +382,7 @@
     load32(MacroAssembler::Address(source, JSCell::structureIDOffset()), scratch2);
     loadPtr(vm.heap.structureIDTable().base(), scratch);
     rshift32(scratch2, TrustedImm32(StructureIDTable::s_numberOfEntropyBits), dest);
-    loadPtr(MacroAssembler::BaseIndex(scratch, dest, MacroAssembler::TimesEight), dest);
+    loadPtr(MacroAssembler::BaseIndex(scratch, dest, MacroAssembler::ScalePtr), dest);
     lshiftPtr(TrustedImm32(StructureIDTable::s_entropyBitsShiftForStructurePointer), scratch2);
     xorPtr(scratch2, dest);
 #else // not USE(JSVALUE64)
@@ -572,7 +572,7 @@
     urshift32(TrustedImm32(stepShift), scratchGPR1);
     slowPath.append(branch32(Above, scratchGPR1, TrustedImm32(MarkedSpace::largeCutoff >> stepShift)));
     move(TrustedImmPtr(subspace.allocatorForSizeStep()), scratchGPR2);
-    loadPtr(BaseIndex(scratchGPR2, scratchGPR1, timesPtr()), scratchGPR1);
+    loadPtr(BaseIndex(scratchGPR2, scratchGPR1, ScalePtr), scratchGPR1);
     
     emitAllocate(resultGPR, JITAllocator::variable(), scratchGPR1, scratchGPR2, slowPath);
 }
@@ -608,11 +608,9 @@
         RegisterAtOffset entry = allCalleeSaves->at(i);
         if (dontRestoreRegisters.get(entry.reg()))
             continue;
-        if (entry.reg().isGPR()) {
-            if (i != scratchGPREntryIndex)
-                loadPtr(Address(scratch, entry.offset()), entry.reg().gpr());
-        } else
-            loadDouble(Address(scratch, entry.offset()), entry.reg().fpr());
+        if (i == scratchGPREntryIndex)
+            continue;
+        loadReg(Address(scratch, entry.offset()), entry.reg());
     }
 
     // Restore the callee save value of the scratch.
@@ -620,7 +618,7 @@
     ASSERT(!dontRestoreRegisters.get(entry.reg()));
     ASSERT(entry.reg().isGPR());
     ASSERT(scratch == entry.reg().gpr());
-    loadPtr(Address(scratch, entry.offset()), scratch);
+    loadReg(Address(scratch, entry.offset()), scratch);
 #else
     UNUSED_PARAM(topEntryFrame);
 #endif
@@ -988,10 +986,7 @@
         RegisterAtOffset entry = allCalleeSaves->at(i);
         if (dontCopyRegisters.get(entry.reg()))
             continue;
-        if (entry.reg().isGPR())
-            storePtr(entry.reg().gpr(), Address(calleeSavesBuffer, entry.offset()));
-        else
-            storeDouble(entry.reg().fpr(), Address(calleeSavesBuffer, entry.offset()));
+        storeReg(entry.reg(), Address(calleeSavesBuffer, entry.offset()));
     }
 #else
     UNUSED_PARAM(calleeSavesBuffer);

Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (263048 => 263049)


--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h	2020-06-15 18:56:04 UTC (rev 263049)
@@ -102,7 +102,16 @@
             store32(src.gpr(), dst);
     }
 
+    void storeReg(Reg src, Address dst)
+    {
 #if USE(JSVALUE64)
+        store64FromReg(src, dst);
+#else
+        store32FromReg(src, dst);
+#endif
+    }
+
+#if USE(JSVALUE64)
     void load64ToReg(Address src, Reg dst)
     {
         if (dst.isFPR())
@@ -120,6 +129,15 @@
             load32(src, dst.gpr());
     }
 
+    void loadReg(Address src, Reg dst)
+    {
+#if USE(JSVALUE64)
+        load64ToReg(src, dst);
+#else
+        load32ToReg(src, dst);
+#endif
+    }
+
     template<typename T>
     void storeCell(T cell, Address address)
     {
@@ -498,7 +516,7 @@
     {
 #if USE(JSVALUE64)
         move(MacroAssembler::TrustedImm64(JSValue::NumberTag), GPRInfo::numberTagRegister);
-        orPtr(MacroAssembler::TrustedImm32(JSValue::OtherTag), GPRInfo::numberTagRegister, GPRInfo::notCellMaskRegister);
+        or64(MacroAssembler::TrustedImm32(JSValue::OtherTag), GPRInfo::numberTagRegister, GPRInfo::notCellMaskRegister);
 #endif
     }
 
@@ -625,25 +643,30 @@
 
     void emitGetFromCallFrameHeaderPtr(VirtualRegister entry, GPRReg to, GPRReg from = GPRInfo::callFrameRegister)
     {
+        ASSERT(entry.isHeader());
         loadPtr(Address(from, entry.offset() * sizeof(Register)), to);
     }
     void emitGetFromCallFrameHeader32(VirtualRegister entry, GPRReg to, GPRReg from = GPRInfo::callFrameRegister)
     {
+        ASSERT(entry.isHeader());
         load32(Address(from, entry.offset() * sizeof(Register)), to);
     }
 #if USE(JSVALUE64)
     void emitGetFromCallFrameHeader64(VirtualRegister entry, GPRReg to, GPRReg from = GPRInfo::callFrameRegister)
     {
+        ASSERT(entry.isHeader());
         load64(Address(from, entry.offset() * sizeof(Register)), to);
     }
 #endif // USE(JSVALUE64)
     void emitPutToCallFrameHeader(GPRReg from, VirtualRegister entry)
     {
+        ASSERT(entry.isHeader());
         storePtr(from, Address(GPRInfo::callFrameRegister, entry.offset() * sizeof(Register)));
     }
 
     void emitPutToCallFrameHeader(void* value, VirtualRegister entry)
     {
+        ASSERT(entry.isHeader());
         storePtr(TrustedImmPtr(value), Address(GPRInfo::callFrameRegister, entry.offset() * sizeof(Register)));
     }
 

Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1320,7 +1320,7 @@
     inBounds.link(this);
 
     loadPtr(Address(regT1, JSPropertyNameEnumerator::cachedPropertyNamesVectorOffset()), regT1);
-    loadPtr(BaseIndex(regT1, regT0, timesPtr()), regT0);
+    loadPtr(BaseIndex(regT1, regT0, ScalePtr), regT0);
     move(TrustedImm32(JSValue::CellTag), regT2);
 
     done.link(this);
@@ -1345,7 +1345,7 @@
     inBounds.link(this);
 
     loadPtr(Address(regT1, JSPropertyNameEnumerator::cachedPropertyNamesVectorOffset()), regT1);
-    loadPtr(BaseIndex(regT1, regT0, timesPtr()), regT0);
+    loadPtr(BaseIndex(regT1, regT0, ScalePtr), regT0);
     move(TrustedImm32(JSValue::CellTag), regT2);
     
     done.link(this);

Modified: trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/jit/ThunkGenerators.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -302,8 +302,8 @@
 
     // Check for an exception
 #if USE(JSVALUE64)
-    jit.load64(vm.addressOfException(), JSInterfaceJIT::regT2);
-    JSInterfaceJIT::Jump exceptionHandler = jit.branchTest64(JSInterfaceJIT::NonZero, JSInterfaceJIT::regT2);
+    jit.loadPtr(vm.addressOfException(), JSInterfaceJIT::regT2);
+    JSInterfaceJIT::Jump exceptionHandler = jit.branchTestPtr(JSInterfaceJIT::NonZero, JSInterfaceJIT::regT2);
 #else
     JSInterfaceJIT::Jump exceptionHandler = jit.branch32(
         JSInterfaceJIT::NotEqual,

Modified: trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp (263048 => 263049)


--- trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/_javascript_Core/runtime/TestRunnerUtils.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -65,7 +65,7 @@
 {
     bool pretendToHaveManyCompiles = false;
 #if ENABLE(DFG_JIT)
-    if (!Options::useJIT() || !Options::useDFGJIT())
+    if (!Options::useJIT() || !Options::useBaselineJIT() || !Options::useDFGJIT())
         pretendToHaveManyCompiles = true;
 #else
     pretendToHaveManyCompiles = true;

Modified: trunk/Source/WebCore/ChangeLog (263048 => 263049)


--- trunk/Source/WebCore/ChangeLog	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/WebCore/ChangeLog	2020-06-15 18:56:04 UTC (rev 263049)
@@ -1,3 +1,15 @@
+2020-06-15  Keith Miller  <[email protected]>
+
+        JIT thunks should work on arm64_32
+        https://bugs.webkit.org/show_bug.cgi?id=213103
+
+        Reviewed by Saam Barati.
+
+        Refactor timesPtr() to ScalePtr.
+
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasClasses):
+
 2020-06-15  Sihui Liu  <[email protected]>
 
         Text manipulation does not observe newly displayed element inside previously observed content

Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (263048 => 263049)


--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2020-06-15 18:52:14 UTC (rev 263048)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp	2020-06-15 18:56:04 UTC (rev 263049)
@@ -3501,7 +3501,7 @@
         Assembler::Label loopStart(m_assembler.label());
 
         // If the pointers match, proceed to the next matcher.
-        Assembler::Jump classFound = m_assembler.branchPtr(Assembler::Equal, Assembler::BaseIndex(spaceSplitStringData, indexRegister, Assembler::timesPtr(), SpaceSplitStringData::tokensMemoryOffset()), classNameToMatch);
+        Assembler::Jump classFound = m_assembler.branchPtr(Assembler::Equal, Assembler::BaseIndex(spaceSplitStringData, indexRegister, Assembler::ScalePtr, SpaceSplitStringData::tokensMemoryOffset()), classNameToMatch);
 
         // Increment the index.
         m_assembler.add32(Assembler::TrustedImm32(1), indexRegister);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to