Changeset 166463 in webkit for trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp

Timestamp:

Mar 30, 2014, 11:43:41 AM (11 years ago)

Author:

[email protected]

Message:

Land the stackmap register liveness glue with the uses of the liveness disabled
​https://bugs.webkit.org/show_bug.cgi?id=130924

Source/JavaScriptCore:

Reviewed by Oliver Hunt.

Add the liveness and fix other bugs I found.

• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFor):

• ftl/FTLCompile.cpp:

(JSC::FTL::usedRegistersFor):
(JSC::FTL::fixFunctionBasedOnStackMaps):

• ftl/FTLSlowPathCall.cpp:
• ftl/FTLSlowPathCallKey.cpp:

(JSC::FTL::SlowPathCallKey::dump):

• ftl/FTLSlowPathCallKey.h:

(JSC::FTL::SlowPathCallKey::SlowPathCallKey):
(JSC::FTL::SlowPathCallKey::argumentRegisters):
(JSC::FTL::SlowPathCallKey::withCallTarget):

• ftl/FTLStackMaps.cpp:

(JSC::FTL::StackMaps::Record::locationSet):
(JSC::FTL::StackMaps::Record::liveOutsSet):
(JSC::FTL::StackMaps::Record::usedRegisterSet):

• ftl/FTLStackMaps.h:
• ftl/FTLThunks.cpp:

(JSC::FTL::registerClobberCheck):
(JSC::FTL::slowPathCallThunkGenerator):

• jit/RegisterSet.cpp:

(JSC::RegisterSet::stackRegisters):
(JSC::RegisterSet::reservedHardwareRegisters):
(JSC::RegisterSet::runtimeRegisters):
(JSC::RegisterSet::specialRegisters):
(JSC::RegisterSet::dump):

• jit/RegisterSet.h:

(JSC::RegisterSet::RegisterSet):
(JSC::RegisterSet::setAny):
(JSC::RegisterSet::setMany):

• jit/Repatch.cpp:

(JSC::tryCacheGetByID):
(JSC::tryCachePutByID):
(JSC::tryRepatchIn):

• runtime/Options.cpp:

(JSC::recomputeDependentOptions):

• runtime/Options.h:

Tools:

Reviewed by Oliver Hunt.

• Scripts/run-jsc-stress-tests:

File:

• trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp

@@ -68 +68 @@
         
         for (unsigned i = std::min(NUMBER_OF_ARGUMENT_REGISTERS, numArgs); i--;)
-            m_callingConventionRegisters.set(GPRInfo::toArgumentRegister(i));
+            m_argumentRegisters.set(GPRInfo::toArgumentRegister(i));
+        m_callingConventionRegisters.merge(m_argumentRegisters);
         if (returnRegister != InvalidGPRReg)
             m_callingConventionRegisters.set(GPRInfo::returnValueGPR);
@@ -85 +86 @@
             (m_usedRegisters.numberOfSetRegisters() - numberOfCallingConventionRegisters) * wordSize;
         
-        size_t stackAlignment = 16;
-        
-        m_stackBytesNeeded = (m_stackBytesNeeded + stackAlignment - 1) & ~(stackAlignment - 1);
+        m_stackBytesNeeded = (m_stackBytesNeeded + stackAlignmentBytes() - 1) & ~(stackAlignmentBytes() - 1);
         
         m_jit.subPtr(CCallHelpers::TrustedImm32(m_stackBytesNeeded), CCallHelpers::stackPointerRegister);
@@ -134 +133 @@
     SlowPathCallKey keyWithTarget(void* callTarget) const
     {
-        return SlowPathCallKey(usedRegisters(), callTarget, offset());
+        return SlowPathCallKey(usedRegisters(), callTarget, m_argumentRegisters, offset());
     }
     
@@ -150 +149 @@
     State& m_state;
     RegisterSet m_usedRegisters;
+    RegisterSet m_argumentRegisters;
     RegisterSet m_callingConventionRegisters;
     CCallHelpers& m_jit;