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

Timestamp:

Sep 13, 2013, 9:54:54 PM (12 years ago)

Author:

[email protected]

Message:

Rename SpeculativeJIT::integerResult() to int32Result().

Rubber stamped by Mark Hahnenberg.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileGetCharCodeAt):
(JSC::DFG::SpeculativeJIT::compileValueToInt32):
(JSC::DFG::SpeculativeJIT::compileUInt32ToNumber):
(JSC::DFG::SpeculativeJIT::compileDoubleAsInt32):
(JSC::DFG::SpeculativeJIT::compileGetByValOnIntTypedArray):
(JSC::DFG::SpeculativeJIT::compileAdd):
(JSC::DFG::SpeculativeJIT::compileArithSub):
(JSC::DFG::SpeculativeJIT::compileArithNegate):
(JSC::DFG::SpeculativeJIT::compileArithIMul):
(JSC::DFG::SpeculativeJIT::compileArithMul):
(JSC::DFG::SpeculativeJIT::compileArithDiv):
(JSC::DFG::SpeculativeJIT::compileArithMod):
(JSC::DFG::SpeculativeJIT::compileGetTypedArrayByteOffset):
(JSC::DFG::SpeculativeJIT::compileGetArgumentsLength):
(JSC::DFG::SpeculativeJIT::compileGetArrayLength):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::int32Result):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

File:

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

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -1967 +1967 @@
     cont8Bit.link(&m_jit);
 
-    integerResult(scratchReg, m_currentNode);
+    int32Result(scratchReg, m_currentNode);
 }
 
@@ -2147 +2147 @@
         GPRTemporary result(this, Reuse, op1);
         m_jit.move(op1.gpr(), result.gpr());
-        integerResult(result.gpr(), node, op1.format());
+        int32Result(result.gpr(), node, op1.format());
         return;
     }
@@ -2158 +2158 @@
             GPRTemporary result(this, Reuse, op1);
             m_jit.move(op1.gpr(), result.gpr());
-            integerResult(result.gpr(), node, op1.format());
+            int32Result(result.gpr(), node, op1.format());
             return;
         }
@@ -2170 +2170 @@
             addSlowPathGenerator(slowPathCall(notTruncatedToInteger, this, toInt32, gpr, fpr));
 
-            integerResult(gpr, node);
+            int32Result(gpr, node);
             return;
         }
@@ -2282 +2282 @@
             }
 #endif
-            integerResult(resultGpr, node);
+            int32Result(resultGpr, node);
             return;
         }
@@ -2300 +2300 @@
         m_jit.and32(JITCompiler::TrustedImm32(1), result.gpr());
         
-        integerResult(result.gpr(), node);
+        int32Result(result.gpr(), node);
         return;
     }
@@ -2344 +2344 @@
     forwardSpeculationCheck(Overflow, JSValueRegs(), 0, m_jit.branch32(MacroAssembler::LessThan, result.gpr(), TrustedImm32(0)), ValueRecovery::uint32InGPR(result.gpr()));
 
-    integerResult(result.gpr(), node, op1.format());
+    int32Result(result.gpr(), node, op1.format());
 }
 
@@ -2362 +2362 @@
     forwardSpeculationCheck(Overflow, JSValueRegs(), 0, failureCases, ValueRecovery::inFPR(valueFPR));
 
-    integerResult(resultGPR, node);
+    int32Result(resultGPR, node);
 }
 
@@ -2539 +2539 @@
     }
     if (elementSize(type) < 4 || isSigned(type)) {
-        integerResult(resultReg, node);
+        int32Result(resultReg, node);
         return;
     }
@@ -2546 +2546 @@
     if (node->shouldSpeculateInt32()) {
         forwardSpeculationCheck(Overflow, JSValueRegs(), 0, m_jit.branch32(MacroAssembler::LessThan, resultReg, TrustedImm32(0)), ValueRecovery::uint32InGPR(resultReg));
-        integerResult(resultReg, node);
+        int32Result(resultReg, node);
         return;
     }
@@ -2868 +2868 @@
                 speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op2.gpr(), Imm32(imm1), result.gpr()));
 
-            integerResult(result.gpr(), node);
+            int32Result(result.gpr(), node);
             return;
         }
@@ -2883 +2883 @@
                 speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op1.gpr(), Imm32(imm2), result.gpr()));
 
-            integerResult(result.gpr(), node);
+            int32Result(result.gpr(), node);
             return;
         }
@@ -2913 +2913 @@
         }
 
-        integerResult(gprResult, node);
+        int32Result(gprResult, node);
         return;
     }
@@ -3028 +3028 @@
             }
 
-            integerResult(result.gpr(), node);
+            int32Result(result.gpr(), node);
             return;
         }
@@ -3043 +3043 @@
                 speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchSub32(MacroAssembler::Overflow, op2.gpr(), result.gpr()));
                 
-            integerResult(result.gpr(), node);
+            int32Result(result.gpr(), node);
             return;
         }
@@ -3057 +3057 @@
             speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchSub32(MacroAssembler::Overflow, op1.gpr(), op2.gpr(), result.gpr()));
 
-        integerResult(result.gpr(), node);
+        int32Result(result.gpr(), node);
         return;
     }
@@ -3097 +3097 @@
         }
 
-        integerResult(result.gpr(), node);
+        int32Result(result.gpr(), node);
         return;
     }
@@ -3127 +3127 @@
     m_jit.move(reg1, result.gpr());
     m_jit.mul32(reg2, result.gpr());
-    integerResult(result.gpr(), node);
+    int32Result(result.gpr(), node);
     return;
 }
@@ -3162 +3162 @@
         }
 
-        integerResult(result.gpr(), node);
+        int32Result(result.gpr(), node);
         return;
     }
@@ -3271 +3271 @@
         
         done.link(&m_jit);
-        integerResult(eax.gpr(), node);
+        int32Result(eax.gpr(), node);
 #elif CPU(APPLE_ARMV7S)
         SpeculateInt32Operand op1(this, node->child1());
@@ -3297 +3297 @@
         }
 
-        integerResult(quotient.gpr(), node);
+        int32Result(quotient.gpr(), node);
 #else
         RELEASE_ASSERT_NOT_REACHED();
@@ -3388 +3388 @@
                 }
 
-                integerResult(resultGPR, node);
+                int32Result(resultGPR, node);
                 return;
             }
@@ -3427 +3427 @@
                     unlock(op1SaveGPR);
 
-                integerResult(edx.gpr(), node);
+                int32Result(edx.gpr(), node);
                 return;
             }
@@ -3524 +3524 @@
             
         done.link(&m_jit);
-        integerResult(edx.gpr(), node);
+        int32Result(edx.gpr(), node);
 
 #elif CPU(APPLE_ARMV7S)
@@ -3548 +3548 @@
         }
 
-        integerResult(quotientThenRemainderGPR, node);
+        int32Result(quotientThenRemainderGPR, node);
 #else // not architecture that can do integer division
         RELEASE_ASSERT_NOT_REACHED();
@@ -3993 +3993 @@
     done.link(&m_jit);
     
-    integerResult(vectorGPR, node);
+    int32Result(vectorGPR, node);
 }
 
@@ -4084 +4084 @@
         MacroAssembler::Address(baseReg, OBJECT_OFFSETOF(Arguments, m_numArguments)),
         resultReg);
-    integerResult(resultReg, node);
+    int32Result(resultReg, node);
 }
 
@@ -4099 +4099 @@
         m_jit.load32(MacroAssembler::Address(storageReg, Butterfly::offsetOfPublicLength()), resultReg);
             
-        integerResult(resultReg, node);
+        int32Result(resultReg, node);
         break;
     }
@@ -4112 +4112 @@
         speculationCheck(Uncountable, JSValueRegs(), 0, m_jit.branch32(MacroAssembler::LessThan, resultReg, MacroAssembler::TrustedImm32(0)));
             
-        integerResult(resultReg, node);
+        int32Result(resultReg, node);
         break;
     }
@@ -4121 +4121 @@
         GPRReg resultGPR = result.gpr();
         m_jit.load32(MacroAssembler::Address(baseGPR, JSString::offsetOfLength()), resultGPR);
-        integerResult(resultGPR, node);
+        int32Result(resultGPR, node);
         break;
     }
@@ -4135 +4135 @@
         GPRReg resultGPR = result.gpr();
         m_jit.load32(MacroAssembler::Address(baseGPR, JSArrayBufferView::offsetOfLength()), resultGPR);
-        integerResult(resultGPR, node);
+        int32Result(resultGPR, node);
         break;
     } }