Changeset 207999 in webkit

Timestamp:

Oct 27, 2016 1:00:38 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

[DOMJIT][CSSJIT] Share code with DOMJIT
​https://bugs.webkit.org/show_bug.cgi?id=164006

Reviewed by Mark Lam.

Move CSSJIT's getDocument function to DOMJIT and share it with DOMJIT.
And rename it to "loadDocument", it is closer name to the JSC's convention.

No behavior change.

• cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasTagName):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsRoot):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsScopeRoot):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
(WebCore::SelectorCompiler::getDocument): Deleted.

• domjit/DOMJITHelpers.h:

(WebCore::DOMJIT::loadDocument):

• domjit/JSNodeDOMJIT.cpp:

(WebCore::NodeOwnerDocumentDOMJIT::callDOM):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• cssjit/SelectorCompiler.cpp (modified) (8 diffs)
• domjit/DOMJITHelpers.h (modified) (2 diffs)
• domjit/JSNodeDOMJIT.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [DOMJIT][CSSJIT] Share code with DOMJIT
+        https://bugs.webkit.org/show_bug.cgi?id=164006
+
+        Reviewed by Mark Lam.
+
+        Move CSSJIT's getDocument function to DOMJIT and share it with DOMJIT.
+        And rename it to "loadDocument", it is closer name to the JSC's convention.
+
+        No behavior change.
+
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasTagName):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsRoot):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsScopeRoot):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
+        (WebCore::SelectorCompiler::getDocument): Deleted.
+        * domjit/DOMJITHelpers.h:
+        (WebCore::DOMJIT::loadDocument):
+        * domjit/JSNodeDOMJIT.cpp:
+        (WebCore::NodeOwnerDocumentDOMJIT::callDOM):
+
 2016-10-27  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/cssjit/SelectorCompiler.cpp

@@ -32 +32 @@
 #include "CSSSelector.h"
 #include "CSSSelectorList.h"
+#include "DOMJITHelpers.h"
 #include "Element.h"
 #include "ElementData.h"
@@ -2312 +2313 @@
 }
 
-static void getDocument(Assembler& assembler, Assembler::RegisterID element, Assembler::RegisterID output)
-{
-    assembler.loadPtr(Assembler::Address(element, Node::treeScopeMemoryOffset()), output);
-    assembler.loadPtr(Assembler::Address(output, TreeScope::documentScopeMemoryOffset()), output);
-}
-
 void SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
 {
@@ -2327 +2322 @@
         static_assert(sizeof(DocumentCompatibilityMode) == 1, "We generate a byte load/test for the compatibility mode.");
         LocalRegister documentAddress(m_registerAllocator);
-        getDocument(m_assembler, elementAddressRegister, documentAddress);
+        DOMJIT::loadDocument(m_assembler, elementAddressRegister, documentAddress);
         failureCases.append(m_assembler.branchTest8(Assembler::NonZero, Assembler::Address(documentAddress, Document::compatibilityModeMemoryOffset()), Assembler::TrustedImm32(static_cast<std::underlying_type<DocumentCompatibilityMode>::type>(DocumentCompatibilityMode::QuirksMode))));
 
@@ -2993 +2988 @@
         {
             LocalRegister document(m_registerAllocator);
-            getDocument(m_assembler, elementAddressRegister, document);
+            DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
             failureCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, document));
         }
@@ -3423 +3418 @@
             {
                 LocalRegister document(m_registerAllocator);
-                getDocument(m_assembler, elementAddressRegister, document);
+                DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
                 caseSensitiveCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, document));
             }
@@ -3781 +3776 @@
 {
     LocalRegister document(m_registerAllocator);
-    getDocument(m_assembler, elementAddressRegister, document);
+    DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
     failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(document, Document::documentElementMemoryOffset()), elementAddressRegister));
 }
@@ -3795 +3790 @@
     Assembler::Jump scopeIsNotNull = m_assembler.branchTestPtr(Assembler::NonZero, scope);
 
-    getDocument(m_assembler, elementAddressRegister, scope);
+    DOMJIT::loadDocument(m_assembler, elementAddressRegister, scope);
     m_assembler.loadPtr(Assembler::Address(scope, Document::documentElementMemoryOffset()), scope);
 
@@ -3805 +3800 @@
 {
     LocalRegister document(m_registerAllocator);
-    getDocument(m_assembler, elementAddressRegister, document);
+    DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
     failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(document, Document::cssTargetMemoryOffset()), elementAddressRegister));
 }

trunk/Source/WebCore/domjit/DOMJITHelpers.h

@@ -38 +38 @@
 using JSC::GPRReg;
 using JSC::JSValueRegs;
+using JSC::MacroAssembler;
+
+static_assert(std::is_same<GPRReg, MacroAssembler::RegisterID>::value, "GPRReg is the alias to the MacroAssembler::RegisterID");
 
 inline CCallHelpers::Jump branchIfNotWorldIsNormal(CCallHelpers& jit, GPRReg globalObject)
@@ -138 +141 @@
 }
 
+inline void loadDocument(MacroAssembler& jit, GPRReg node, GPRReg output)
+{
+    jit.loadPtr(CCallHelpers::Address(node, Node::treeScopeMemoryOffset()), output);
+    jit.loadPtr(CCallHelpers::Address(output, TreeScope::documentScopeMemoryOffset()), output);
+}
+
 } }
 

trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp

@@ -207 +207 @@
         notDocument.link(&jit);
         jit.loadPtr(CCallHelpers::Address(node, JSNode::offsetOfWrapped()), scratch);
-        jit.loadPtr(CCallHelpers::Address(scratch, Node::treeScopeMemoryOffset()), scratch);
-        jit.loadPtr(CCallHelpers::Address(scratch, TreeScope::documentScopeMemoryOffset()), scratch);
-
+        DOMJIT::loadDocument(jit, scratch, scratch);
         DOMJIT::toWrapper<Document>(jit, params, scratch, globalObject, result, toWrapperSlow<Document>, globalObjectValue);
         done.link(&jit);