Changeset 293087 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

Timestamp:

Apr 20, 2022, 12:54:47 AM (3 years ago)

Author:

Mikhail R. Gadelha

Message:

Unify calls and checks for CellTag
​https://bugs.webkit.org/show_bug.cgi?id=238025

Reviewed by Yusuke Suzuki.

This patch moves all the places where cell tags are written and checked
when branching: this will be needed when implementing the concurrency on
32 bits archs, so we can focus on changing storeCell, branchIfNotCell and
branchIfCell to implement the mutex locks/unlocks.

It also reduces the code size in JetStream2 by ~1% on average on 32
bits platforms.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::store8):
(JSC::MacroAssemblerARMv7::storePair32):

• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::storePair32):

• dfg/DFGOSRExit.cpp:

(JSC::DFG::OSRExit::compileExit):

• dfg/DFGOSRExitCompilerCommon.cpp:

(JSC::DFG::reifyInlinedCallFrames):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::checkArgumentTypes):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::fillSpeculateCell):
(JSC::DFG::SpeculativeJIT::compilePeepHoleObjectStrictEquality):

• jit/AssemblyHelpers.cpp:

(JSC::AssemblyHelpers::jitAssertIsCell):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::storeCell):
(JSC::AssemblyHelpers::storeTrustedValue):
(JSC::AssemblyHelpers::branchIfNotCell):
(JSC::AssemblyHelpers::branchIfCell):

• jit/CallFrameShuffler32_64.cpp:

(JSC::CallFrameShuffler::emitStore):

• jit/JSInterfaceJIT.h:

(JSC::JSInterfaceJIT::emitLoadJSCell):

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -1059 +1059 @@
     }
     
-    void store8(RegisterID src, const void *address)
+    void store8(RegisterID src, const void* address)
     {
         store8(src, setupArmAddress(AbsoluteAddress(address)));
     }
     
-    void store8(TrustedImm32 imm, const void *address)
+    void store8(TrustedImm32 imm, const void* address)
     {
         TrustedImm32 imm8(static_cast<int8_t>(imm.m_value));
@@ -1102 +1102 @@
         move(imm, dataTempRegister);
         store16(dataTempRegister, address);
+    }
+
+    void storePair32(RegisterID src1, TrustedImm32 imm, Address address)
+    {
+        RegisterID scratch = getCachedDataTempRegisterIDAndInvalidate();
+        move(imm, scratch);
+        storePair32(src1, scratch, address);
+    }
+
+    void storePair32(TrustedImmPtr immPtr, TrustedImm32 imm32, Address address)
+    {
+        RegisterID scratch1 = getCachedAddressTempRegisterIDAndInvalidate();
+        move(immPtr, scratch1);
+        RegisterID scratch2 = getCachedDataTempRegisterIDAndInvalidate();
+        move(imm32, scratch2);
+        storePair32(scratch1, scratch2, address);
+    }
+
+    void storePair32(TrustedImm32 imm1, TrustedImm32 imm2, Address address)
+    {
+        RegisterID scratch1 = getCachedAddressTempRegisterIDAndInvalidate();
+        move(imm1, scratch1);
+        RegisterID scratch2 = scratch1;
+        if (imm1.m_value != imm2.m_value) {
+            scratch2 = getCachedDataTempRegisterIDAndInvalidate();
+            move(imm2, scratch2);
+        }
+        storePair32(scratch1, scratch2, address);
     }
 
@@ -1139 +1167 @@
         }
         storePair32(src1, src2, Address(scratch, address.offset));
+    }
+
+    void storePair32(TrustedImm32 imm1, TrustedImm32 imm2, BaseIndex address)
+    {
+        // We don't have enough temp registers to move both imm and calculate the address
+        store32(imm1, address);
+        store32(imm2, address.withOffset(4));
+    }
+
+    void storePair32(RegisterID src1, TrustedImm32 imm, const void* address)
+    {
+        ArmAddress armAddress = setupArmAddress(AbsoluteAddress(address));
+        ASSERT(armAddress.type == ArmAddress::HasOffset);
+        RegisterID scratch = getCachedDataTempRegisterIDAndInvalidate();
+        move(imm, scratch);
+        storePair32(src1, scratch, Address(armAddress.base, armAddress.u.offset));
     }