Changeset 192856 in webkit for trunk/Source/JavaScriptCore/ftl/FTLLazySlowPath.cpp

Timestamp:

Nov 30, 2015, 8:43:28 PM (10 years ago)

Author:

[email protected]

Message:

FTL lazy slow paths should work with B3
​https://bugs.webkit.org/show_bug.cgi?id=151667

Reviewed by Geoffrey Garen.

This adds all of the glue necessary to make FTL::LazySlowPath work with B3. The B3 approach
allows us to put all of the code in FTL::LowerDFGToLLVM, instead of having supporting data
structures on the side and a bunch of complex code in FTLCompile.cpp.

• b3/B3CheckSpecial.cpp:

(JSC::B3::CheckSpecial::generate):

• b3/B3LowerToAir.cpp:

(JSC::B3::Air::LowerToAir::run):

• b3/B3PatchpointSpecial.cpp:

(JSC::B3::PatchpointSpecial::generate):

• b3/B3StackmapValue.h:
• ftl/FTLJSTailCall.cpp:

(JSC::FTL::DFG::recoveryFor):
(JSC::FTL::JSTailCall::emit):

• ftl/FTLLazySlowPath.cpp:

(JSC::FTL::LazySlowPath::LazySlowPath):
(JSC::FTL::LazySlowPath::generate):

• ftl/FTLLazySlowPath.h:

(JSC::FTL::LazySlowPath::createGenerator):
(JSC::FTL::LazySlowPath::patchableJump):
(JSC::FTL::LazySlowPath::done):
(JSC::FTL::LazySlowPath::patchpoint):
(JSC::FTL::LazySlowPath::usedRegisters):
(JSC::FTL::LazySlowPath::callSiteIndex):
(JSC::FTL::LazySlowPath::stub):

• ftl/FTLLocation.cpp:

(JSC::FTL::Location::forValueRep):
(JSC::FTL::Location::forStackmaps):
(JSC::FTL::Location::dump):
(JSC::FTL::Location::isGPR):
(JSC::FTL::Location::gpr):
(JSC::FTL::Location::isFPR):
(JSC::FTL::Location::fpr):
(JSC::FTL::Location::restoreInto):

• ftl/FTLLocation.h:

(JSC::FTL::Location::Location):
(JSC::FTL::Location::forRegister):
(JSC::FTL::Location::forIndirect):
(JSC::FTL::Location::forConstant):
(JSC::FTL::Location::kind):
(JSC::FTL::Location::hasReg):
(JSC::FTL::Location::reg):
(JSC::FTL::Location::hasOffset):
(JSC::FTL::Location::offset):
(JSC::FTL::Location::hash):
(JSC::FTL::Location::hasDwarfRegNum): Deleted.
(JSC::FTL::Location::dwarfRegNum): Deleted.
(JSC::FTL::Location::hasDwarfReg): Deleted.
(JSC::FTL::Location::dwarfReg): Deleted.

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::DFG::LowerDFGToLLVM::LowerDFGToLLVM):
(JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):

• jit/RegisterSet.cpp:

(JSC::RegisterSet::stubUnavailableRegisters):
(JSC::RegisterSet::macroScratchRegisters):
(JSC::RegisterSet::calleeSaveRegisters):

• jit/RegisterSet.h:

File:

• trunk/Source/JavaScriptCore/ftl/FTLLazySlowPath.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ftl/FTLLazySlowPath.cpp

@@ -35 +35 @@
 
 LazySlowPath::LazySlowPath(
-    CodeLocationLabel patchpoint, CodeLocationLabel exceptionTarget,
-    const RegisterSet& usedRegisters, CallSiteIndex callSiteIndex, RefPtr<Generator> generator,
-    GPRReg newZeroReg, ScratchRegisterAllocator scratchRegisterAllocator)
+#if FTL_USES_B3
+    CodeLocationJump patchableJump, CodeLocationLabel done,
+#else // FTL_USES_B3
+    CodeLocationLabel patchpoint,
+#endif // FTL_USES_B3
+    CodeLocationLabel exceptionTarget,
+    const RegisterSet& usedRegisters, CallSiteIndex callSiteIndex, RefPtr<Generator> generator
+#if !FTL_USES_B3
+    , GPRReg newZeroReg, ScratchRegisterAllocator scratchRegisterAllocator
+#endif // !FTL_USES_B3
+    )
+#if FTL_USES_B3
+    : m_patchableJump(patchableJump)
+    , m_done(done)
+#else // FTL_USES_B3
     : m_patchpoint(patchpoint)
+#endif // FTL_USES_B3
     , m_exceptionTarget(exceptionTarget)
     , m_usedRegisters(usedRegisters)
     , m_callSiteIndex(callSiteIndex)
     , m_generator(generator)
+#if !FTL_USES_B3
     , m_newZeroValueRegister(newZeroReg)
     , m_scratchRegisterAllocator(scratchRegisterAllocator)
+#endif // !FTL_USES_B3
 {
 }
@@ -64 +79 @@
     params.lazySlowPath = this;
 
+#if !FTL_USES_B3
     unsigned bytesSaved = m_scratchRegisterAllocator.preserveReusedRegistersByPushing(jit, ScratchRegisterAllocator::ExtraStackSpace::NoExtraSpace);
     // This is needed because LLVM may create a stackmap location that is the register SP.
@@ -72 +88 @@
     if (m_newZeroValueRegister != InvalidGPRReg)
         jit.move(CCallHelpers::TrustedImm32(0), m_newZeroValueRegister);
+#endif // !FTL_USES_B3
 
     m_generator->run(jit, params);
 
+#if !FTL_USES_B3
     CCallHelpers::Label doneLabel;
     CCallHelpers::Jump jumpToEndOfPatchpoint;
@@ -82 +100 @@
         jumpToEndOfPatchpoint = jit.jump();
     }
+#endif // !FTL_USES_B3
 
     LinkBuffer linkBuffer(vm, jit, codeBlock, JITCompilationMustSucceed);
+#if FTL_USES_B3
+    linkBuffer.link(params.doneJumps, m_done);
+#else // FTL_USES_B3
     if (bytesSaved) {
         linkBuffer.link(params.doneJumps, linkBuffer.locationOf(doneLabel));
@@ -89 +111 @@
     } else
         linkBuffer.link(params.doneJumps, m_patchpoint.labelAtOffset(MacroAssembler::maxJumpReplacementSize()));
+#endif // FTL_USES_B3
     if (m_exceptionTarget)
         linkBuffer.link(exceptionJumps, m_exceptionTarget);
     m_stub = FINALIZE_CODE_FOR(codeBlock, linkBuffer, ("Lazy slow path call stub"));
 
+#if FTL_USES_B3
+    MacroAssembler::repatchJump(m_patchableJump, CodeLocationLabel(m_stub.code()));
+#else // FTL_USES_B3
     MacroAssembler::replaceWithJump(m_patchpoint, CodeLocationLabel(m_stub.code()));
+#endif // FTL_USES_B3
 }