Changeset 192842 in webkit for trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

Timestamp:

Nov 30, 2015, 4:07:39 PM (10 years ago)

Author:

[email protected]

Message:

Refactor the op_add, op_sub, and op_mul snippets to use the SnippetOperand class.
​https://bugs.webkit.org/show_bug.cgi?id=151678

Reviewed by Geoffrey Garen.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileValueAdd):
(JSC::DFG::SpeculativeJIT::compileArithSub):

• ftl/FTLCompile.cpp:
• jit/JITAddGenerator.cpp:

(JSC::JITAddGenerator::generateFastPath):

• jit/JITAddGenerator.h:

(JSC::JITAddGenerator::JITAddGenerator):

• jit/JITArithmetic.cpp:

(JSC::JIT::emit_op_add):
(JSC::JIT::emit_op_mul):
(JSC::JIT::emit_op_sub):

• jit/JITMulGenerator.cpp:

(JSC::JITMulGenerator::generateFastPath):

• jit/JITMulGenerator.h:

(JSC::JITMulGenerator::JITMulGenerator):

• jit/JITSubGenerator.cpp:

(JSC::JITSubGenerator::generateFastPath):

• jit/JITSubGenerator.h:

(JSC::JITSubGenerator::JITSubGenerator):

• jit/SnippetOperand.h:

(JSC::SnippetOperand::isPositiveConstInt32):

File:

• trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -2854 +2854 @@
 #endif
 
-    ResultType leftType = m_state.forNode(node->child1()).resultType();
-    ResultType rightType = m_state.forNode(node->child2()).resultType();
-    int32_t leftConstInt32 = 0;
-    int32_t rightConstInt32 = 0;
-
-    ASSERT(!leftIsConstInt32 || !rightIsConstInt32);
-
-    if (leftIsConstInt32) {
-        leftConstInt32 = node->child1()->asInt32();
+    SnippetOperand leftOperand(m_state.forNode(node->child1()).resultType());
+    SnippetOperand rightOperand(m_state.forNode(node->child2()).resultType());
+
+    if (leftIsConstInt32)
+        leftOperand.setConstInt32(node->child1()->asInt32());
+    if (rightIsConstInt32)
+        rightOperand.setConstInt32(node->child2()->asInt32());
+
+    ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
+
+    if (!leftOperand.isConst()) {
+        left = JSValueOperand(this, node->child1());
+        leftRegs = left->jsValueRegs();
+    }
+    if (!rightOperand.isConst()) {
         right = JSValueOperand(this, node->child2());
         rightRegs = right->jsValueRegs();
-    } else if (rightIsConstInt32) {
-        left = JSValueOperand(this, node->child1());
-        leftRegs = left->jsValueRegs();
-        rightConstInt32 = node->child2()->asInt32();
-    } else {
-        left = JSValueOperand(this, node->child1());
-        leftRegs = left->jsValueRegs();
-        right = JSValueOperand(this, node->child2());
-        rightRegs = right->jsValueRegs();
-    }
-
-    JITAddGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
-        leftIsConstInt32, rightIsConstInt32, leftConstInt32, rightConstInt32,
+    }
+
+    JITAddGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
         leftFPR, rightFPR, scratchGPR, scratchFPR);
     gen.generateFastPath(m_jit);
@@ -3217 +3213 @@
         JSValueRegs rightRegs = right.jsValueRegs();
 
-        ResultType leftType = m_state.forNode(node->child1()).resultType();
-        ResultType rightType = m_state.forNode(node->child2()).resultType();
-
         FPRTemporary leftNumber(this);
         FPRTemporary rightNumber(this);
@@ -3240 +3233 @@
 #endif
 
-        JITSubGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
+        SnippetOperand leftOperand(m_state.forNode(node->child1()).resultType());
+        SnippetOperand rightOperand(m_state.forNode(node->child2()).resultType());
+
+        JITSubGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
             leftFPR, rightFPR, scratchGPR, scratchFPR);
         gen.generateFastPath(m_jit);