Changeset 194042 in webkit

Timestamp:

Dec 14, 2015 11:44:56 AM (8 years ago)

Author:

mark.lam@apple.com

Message:

Misc. small fixes in snippet related code.
​https://bugs.webkit.org/show_bug.cgi?id=152259

Reviewed by Saam Barati.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileArithMul):

• When loading a constant JSValue for a node, use the one that the node already provides instead of reconstructing it. This is not a bug, but the fix makes the code cleaner.

• jit/JITBitAndGenerator.cpp:

(JSC::JITBitAndGenerator::generateFastPath):

• No need to do a bitand with a constant int 0xffffffff operand.

• jit/JITBitOrGenerator.cpp:

(JSC::JITBitOrGenerator::generateFastPath):

• Fix comments: bitor is '|', not '&'.
• No need to do a bitor with a constant int 0 operand.

• jit/JITBitXorGenerator.cpp:

(JSC::JITBitXorGenerator::generateFastPath):

• Fix comments: bitxor is '^{', not '&'.}

• jit/JITRightShiftGenerator.cpp:

(JSC::JITRightShiftGenerator::generateFastPath):

• Renamed a jump target name to be clearer about its purpose.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (1 diff)
• jit/JITBitAndGenerator.cpp (modified) (1 diff)
• jit/JITBitOrGenerator.cpp (modified) (1 diff)
• jit/JITBitXorGenerator.cpp (modified) (2 diffs)
• jit/JITRightShiftGenerator.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-12-14  Mark Lam  <mark.lam@apple.com>
+
+        Misc. small fixes in snippet related code.
+        https://bugs.webkit.org/show_bug.cgi?id=152259
+
+        Reviewed by Saam Barati.
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileArithMul):
+        - When loading a constant JSValue for a node, use the one that the node already
+          provides instead of reconstructing it.  This is not a bug, but the fix makes
+          the code cleaner.
+
+        * jit/JITBitAndGenerator.cpp:
+        (JSC::JITBitAndGenerator::generateFastPath):
+        - No need to do a bitand with a constant int 0xffffffff operand.
+
+        * jit/JITBitOrGenerator.cpp:
+        (JSC::JITBitOrGenerator::generateFastPath):
+        - Fix comments: bitor is '|', not '&'.
+        - No need to do a bitor with a constant int 0 operand.
+
+        * jit/JITBitXorGenerator.cpp:
+        (JSC::JITBitXorGenerator::generateFastPath):
+        - Fix comments: bitxor is '^', not '&'.
+
+        * jit/JITRightShiftGenerator.cpp:
+        (JSC::JITRightShiftGenerator::generateFastPath):
+        - Renamed a jump target name to be clearer about its purpose.
+
 2015-12-14  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -3579 +3579 @@
         if (leftOperand.isPositiveConstInt32()) {
             leftRegs = resultRegs;
-            int64_t leftConst = leftOperand.asConstInt32();
-            m_jit.moveValue(JSValue(leftConst), leftRegs);
+            m_jit.moveValue(leftChild->asJSValue(), leftRegs);
         } else if (rightOperand.isPositiveConstInt32()) {
             rightRegs = resultRegs;
-            int64_t rightConst = rightOperand.asConstInt32();
-            m_jit.moveValue(JSValue(rightConst), rightRegs);
+            m_jit.moveValue(rightChild->asJSValue(), rightRegs);
         }
 

trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.cpp

@@ -53 +53 @@
         
         jit.moveValueRegs(var, m_result);
+        if (constOpr.asConstInt32() != static_cast<int32_t>(0xffffffff)) {
 #if USE(JSVALUE64)
-        jit.and64(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
-        if (constOpr.asConstInt32() >= 0)
-            jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
+            jit.and64(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+            if (constOpr.asConstInt32() >= 0)
+                jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
 #else
-        jit.and32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+            jit.and32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
 #endif
-        
+        }
+
     } else {
         ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());

trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.cpp

@@ -41 +41 @@
         SnippetOperand& constOpr = m_leftOperand.isConstInt32() ? m_leftOperand : m_rightOperand;
         
-        // Try to do intVar & intConstant.
+        // Try to do intVar | intConstant.
         m_slowPathJumpList.append(jit.branchIfNotInt32(var));
         
         jit.moveValueRegs(var, m_result);
+        if (constOpr.asConstInt32()) {
 #if USE(JSVALUE64)
-        jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
-        jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
+            jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+            jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
 #else
-        jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+            jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
 #endif
-        
+        }
+
     } else {
         ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
         
-        // Try to do intVar & intVar.
+        // Try to do intVar | intVar.
         m_slowPathJumpList.append(jit.branchIfNotInt32(m_left));
         m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));

trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.cpp

@@ -41 +41 @@
         SnippetOperand& constOpr = m_leftOperand.isConstInt32() ? m_leftOperand : m_rightOperand;
         
-        // Try to do intVar & intConstant.
+        // Try to do intVar ^ intConstant.
         m_slowPathJumpList.append(jit.branchIfNotInt32(var));
         
@@ -55 +55 @@
         ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
         
-        // Try to do intVar & intVar.
+        // Try to do intVar ^ intVar.
         m_slowPathJumpList.append(jit.branchIfNotInt32(m_left));
         m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));

trunk/Source/JavaScriptCore/jit/JITRightShiftGenerator.cpp

@@ -88 +88 @@
         m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));
 
-        CCallHelpers::Jump notInt;
+        CCallHelpers::Jump leftNotInt;
         if (m_leftOperand.isConstInt32()) {
 #if USE(JSVALUE32_64)
@@ -95 +95 @@
             jit.move(CCallHelpers::Imm32(m_leftOperand.asConstInt32()), m_result.payloadGPR());
         } else {
-            notInt = jit.branchIfNotInt32(m_left);
+            leftNotInt = jit.branchIfNotInt32(m_left);
             jit.moveValueRegs(m_left, m_result);
         }
@@ -113 +113 @@
 
             // Try to do (doubleVar >> intVar).
-            notInt.link(&jit);
+            leftNotInt.link(&jit);
 
             m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
@@ -126 +126 @@
 
         } else
-            m_slowPathJumpList.append(notInt);
+            m_slowPathJumpList.append(leftNotInt);
     }
 }